48 files changed, 915 insertions, 937 deletions

diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java b/src/main/java/gregtech/common/covers/CoverArm.java
index 51f330e8df..fef9ef1327 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java
+++ b/src/main/java/gregtech/common/covers/CoverArm.java
@@ -12,19 +12,19 @@ import com.gtnewhorizons.modularui.api.NumberFormatMUI;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_NumericWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerNumericWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 
-public class GT_Cover_Arm extends GT_CoverBehavior {
+public class CoverArm extends CoverBehavior {
 
     public final int mTickRate;
     // msb converted, 2nd : direction (1=export)
@@ -34,7 +34,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
     protected static final int SLOT_ID_MIN = 0;
     protected static final int CONVERTED_BIT = 0x80000000;
 
-    public GT_Cover_Arm(int aTickRate, ITexture coverTexture) {
+    public CoverArm(int aTickRate, ITexture coverTexture) {
         super(coverTexture);
         this.mTickRate = aTickRate;
     }
@@ -78,7 +78,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
 
         if (fromSlot > 0 && toSlot > 0) {
             if (fromTile instanceof IInventory fromInventory && toTile instanceof IInventory toInventory)
-                GT_Utility.moveFromSlotToSlot(
+                GTUtility.moveFromSlotToSlot(
                     fromInventory,
                     toInventory,
                     fromSlot - 1,
@@ -93,7 +93,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
             final ForgeDirection toSide;
             if ((aCoverVariable & EXPORT_MASK) > 0) toSide = side;
             else toSide = side.getOpposite();
-            GT_Utility.moveOneItemStackIntoSlot(
+            GTUtility.moveOneItemStackIntoSlot(
                 fromTile,
                 toTile,
                 toSide,
@@ -108,7 +108,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
             final ForgeDirection toSide;
             if ((aCoverVariable & EXPORT_MASK) > 0) toSide = side;
             else toSide = side.getOpposite();
-            if (fromTile instanceof IInventory) GT_Utility.moveFromSlotToSide(
+            if (fromTile instanceof IInventory) GTUtility.moveFromSlotToSide(
                 (IInventory) fromTile,
                 toTile,
                 fromSlot - 1,
@@ -129,7 +129,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
                 fromSide = side.getOpposite();
                 toSide = side;
             }
-            GT_Utility.moveOneItemStack(
+            GTUtility.moveOneItemStack(
                 fromTile,
                 toTile,
                 fromSide,
@@ -149,7 +149,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
     public int onCoverScrewdriverclick(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
         EntityPlayer aPlayer, float aX, float aY, float aZ) {
         int step = 0;
-        if (GT_Utility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) {
+        if (GTUtility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) {
             step += aPlayer.isSneaking() ? 256 : 16;
         } else {
             step -= aPlayer.isSneaking() ? 256 : 16;
@@ -163,7 +163,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
     protected boolean onCoverRightClickImpl(ForgeDirection side, int aCoverID,
         ISerializableObject.LegacyCoverData aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX,
         float aY, float aZ) {
-        int step = (GT_Utility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) ? 1 : -1;
+        int step = (GTUtility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) ? 1 : -1;
         int tCoverVariable = getNewVar(aCoverVariable.get(), step);
         sendMessageToPlayer(aPlayer, tCoverVariable);
         aCoverVariable.set(tCoverVariable);
@@ -174,7 +174,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
     @SuppressWarnings("deprecation")
     public boolean onCoverRightclick(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
         EntityPlayer aPlayer, float aX, float aY, float aZ) {
-        final int step = (GT_Utility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) ? 1 : -1;
+        final int step = (GTUtility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) ? 1 : -1;
         aCoverVariable = getNewVar(aCoverVariable, step);
         sendMessageToPlayer(aPlayer, aCoverVariable);
         aTileEntity.setCoverDataAtSide(side, aCoverVariable);
@@ -188,11 +188,11 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
     }
 
     private void sendMessageToPlayer(EntityPlayer aPlayer, int var) {
-        if ((var & EXPORT_MASK) != 0) GT_Utility.sendChatToPlayer(
+        if ((var & EXPORT_MASK) != 0) GTUtility.sendChatToPlayer(
             aPlayer,
-            GT_Utility.trans("001", "Puts out into adjacent Slot #") + (((var >> 14) & SLOT_ID_MASK) - 1));
-        else GT_Utility
-            .sendChatToPlayer(aPlayer, GT_Utility.trans("002", "Grabs in for own Slot #") + ((var & SLOT_ID_MASK) - 1));
+            GTUtility.trans("001", "Puts out into adjacent Slot #") + (((var >> 14) & SLOT_ID_MASK) - 1));
+        else GTUtility
+            .sendChatToPlayer(aPlayer, GTUtility.trans("002", "Grabs in for own Slot #") + ((var & SLOT_ID_MASK) - 1));
     }
 
     private int getNewVar(int var, int step) {
@@ -277,7 +277,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new ArmUIFactory(buildContext).createWindow();
     }
 
@@ -298,14 +298,14 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
             @Override
             public StringBuffer format(double number, StringBuffer toAppendTo, FieldPosition pos) {
                 if (number < 0) {
-                    return toAppendTo.append(GT_Utility.trans("ANY", "Any"));
+                    return toAppendTo.append(GTUtility.trans("ANY", "Any"));
                 } else {
                     return super.format(number, toAppendTo, pos);
                 }
             }
         };
 
-        protected ArmUIFactory(GT_CoverUIBuildContext buildContext) {
+        protected ArmUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -314,8 +314,8 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
         protected void addUIWidgets(ModularWindow.Builder builder) {
             maxSlot = getMaxSlot();
             builder.widget(
-                new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_Arm.this).addFollower(
-                    CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, CoverArm.this).addFollower(
+                    CoverDataFollowerToggleButtonWidget.ofDisableable(),
                     coverData -> getFlagExport(convert(coverData)) > 0,
                     (coverData, state) -> {
                         if (state) {
@@ -326,11 +326,11 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
                                 convert(coverData) & ~EXPORT_MASK | CONVERTED_BIT);
                         }
                     },
-                    widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EXPORT)
-                        .addTooltip(GT_Utility.trans("006", "Export"))
+                    widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_EXPORT)
+                        .addTooltip(GTUtility.trans("006", "Export"))
                         .setPos(spaceX * 0, spaceY * 0))
                     .addFollower(
-                        CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                        CoverDataFollowerToggleButtonWidget.ofDisableable(),
                         coverData -> getFlagExport(convert(coverData)) == 0,
                         (coverData, state) -> {
                             if (state) {
@@ -341,11 +341,11 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
                                     convert(coverData) | EXPORT_MASK | CONVERTED_BIT);
                             }
                         },
-                        widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_IMPORT)
-                            .addTooltip(GT_Utility.trans("007", "Import"))
+                        widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_IMPORT)
+                            .addTooltip(GTUtility.trans("007", "Import"))
                             .setPos(spaceX * 1, spaceY * 0))
                     .addFollower(
-                        new CoverDataFollower_NumericWidget<>(),
+                        new CoverDataFollowerNumericWidget<>(),
                         coverData -> (double) (getFlagInternalSlot(convert(coverData)) - 1),
                         (coverData, state) -> {
                             final int coverVariable = convert(coverData);
@@ -361,7 +361,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
                             .setPos(spaceX * 0, spaceY * 1 + 2)
                             .setSize(spaceX * 2 + 5, 12))
                     .addFollower(
-                        new CoverDataFollower_NumericWidget<>(),
+                        new CoverDataFollowerNumericWidget<>(),
                         coverData -> (double) (getFlagAdjacentSlot(convert(coverData)) - 1),
                         (coverData, state) -> {
                             final int coverVariable = convert(coverData);
@@ -395,15 +395,15 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
                 .widget(
                     new TextWidget()
                         .setStringSupplier(
-                            () -> (convert(getCoverData()) & EXPORT_MASK) > 0 ? GT_Utility.trans("006", "Export")
-                                : GT_Utility.trans("007", "Import"))
+                            () -> (convert(getCoverData()) & EXPORT_MASK) > 0 ? GTUtility.trans("006", "Export")
+                                : GTUtility.trans("007", "Import"))
                         .setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 3, 4 + startY + spaceY * 0))
                 .widget(
-                    new TextWidget(GT_Utility.trans("254.1", "Internal slot#")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("254.1", "Internal slot#")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 3, 4 + startY + spaceY * 1))
                 .widget(
-                    new TextWidget(GT_Utility.trans("255", "Adjacent slot#")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("255", "Adjacent slot#")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 3, 4 + startY + spaceY * 2));
         }
 
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Chest.java b/src/main/java/gregtech/common/covers/CoverChest.java
index 36e441102b..4afc3b9578 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Chest.java
+++ b/src/main/java/gregtech/common/covers/CoverChest.java
@@ -20,20 +20,20 @@ import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.SlotGroup;
 
 import cpw.mods.fml.common.network.ByteBufUtils;
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_CoverBehaviorBase;
+import gregtech.api.util.CoverBehaviorBase;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Cover_Chest extends GT_CoverBehaviorBase<GT_Cover_Chest.ChestInventory> {
+public class CoverChest extends CoverBehaviorBase<CoverChest.ChestInventory> {
 
     private final int slots;
     private final int stackSizeLimit = 1;
 
-    public GT_Cover_Chest(int slots, ITexture coverTexture) {
+    public CoverChest(int slots, ITexture coverTexture) {
         super(ChestInventory.class, coverTexture);
         if (slots <= 0) throw new IllegalArgumentException("slots must be greater than 0");
         this.slots = slots;
@@ -109,7 +109,7 @@ public class GT_Cover_Chest extends GT_CoverBehaviorBase<GT_Cover_Chest.ChestInv
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new ChestUIFactory(buildContext).createWindow();
     }
 
@@ -118,7 +118,7 @@ public class GT_Cover_Chest extends GT_CoverBehaviorBase<GT_Cover_Chest.ChestInv
         private static final int spaceX = 18;
         private static final int spaceY = 18;
 
-        public ChestUIFactory(GT_CoverUIBuildContext buildContext) {
+        public ChestUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -149,7 +149,7 @@ public class GT_Cover_Chest extends GT_CoverBehaviorBase<GT_Cover_Chest.ChestInv
             CoverDataControllerWidget<ChestInventory> w = new CoverDataControllerWidget<>(
                 this::getCoverData,
                 this::setCoverData,
-                GT_Cover_Chest.this);
+                CoverChest.this);
             ChestInventory d = getCoverData();
             LimitingItemStackHandler h;
             if (d == null) {
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java b/src/main/java/gregtech/common/covers/CoverControlsWork.java
index 2c51cdc355..6c92c61351 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java
+++ b/src/main/java/gregtech/common/covers/CoverControlsWork.java
@@ -8,21 +8,21 @@ import net.minecraftforge.fluids.Fluid;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.covers.IControlsWorkCover;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 
-public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControlsWorkCover {
+public class CoverControlsWork extends CoverBehavior implements IControlsWorkCover {
 
-    public GT_Cover_ControlsWork(ITexture coverTexture) {
+    public CoverControlsWork(ITexture coverTexture) {
         super(coverTexture);
     }
 
@@ -47,7 +47,7 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControls
                         if (player != null) {
                             lastPlayer = null;
                             mPlayerNotified = true;
-                            GT_Utility.sendChatToPlayer(
+                            GTUtility.sendChatToPlayer(
                                 player,
                                 aTileEntity.getInventoryName() + "at "
                                     + String.format(
@@ -135,19 +135,19 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControls
             aCoverVariable = 2;
         }
         if (aCoverVariable == 0) {
-            GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("003", "Enable with Signal"));
+            GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("003", "Enable with Signal"));
         }
         if (aCoverVariable == 1) {
-            GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("004", "Disable with Signal"));
+            GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("004", "Disable with Signal"));
         }
         if (aCoverVariable == 2) {
-            GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("005", "Disabled"));
+            GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("005", "Disabled"));
         }
         if (aCoverVariable == 3) {
-            GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("505", "Enable with Signal (Safe)"));
+            GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("505", "Enable with Signal (Safe)"));
         }
         if (aCoverVariable == 4) {
-            GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("506", "Disable with Signal (Safe)"));
+            GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("506", "Disable with Signal (Safe)"));
         }
         // TODO: Set lastPlayer
         return aCoverVariable;
@@ -177,7 +177,7 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControls
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new ControlsWorkUIFactory(buildContext).createWindow();
     }
 
@@ -188,7 +188,7 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControls
         private static final int spaceX = 18;
         private static final int spaceY = 18;
 
-        public ControlsWorkUIFactory(GT_CoverUIBuildContext buildContext) {
+        public ControlsWorkUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -200,48 +200,48 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControls
                     new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>(
                         this::getCoverData,
                         this::setCoverData,
-                        GT_Cover_ControlsWork.this,
+                        CoverControlsWork.this,
                         (id, coverData) -> !getClickable(id, convert(coverData)),
                         (id, coverData) -> new ISerializableObject.LegacyCoverData(
                             getNewCoverVariable(id, convert(coverData))))
                                 .addToggleButton(
                                     0,
-                                    CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                                    widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_REDSTONE_ON)
+                                    CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                                    widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_REDSTONE_ON)
                                         .setPos(spaceX * 0, spaceY * 0))
                                 .addToggleButton(
                                     1,
-                                    CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                                    widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_REDSTONE_OFF)
+                                    CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                                    widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_REDSTONE_OFF)
                                         .setPos(spaceX * 0, spaceY * 1))
                                 .addToggleButton(
                                     2,
-                                    CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                                    widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CROSS)
+                                    CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                                    widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_CROSS)
                                         .setPos(spaceX * 0, spaceY * 2))
                                 .setPos(startX, startY))
                 .widget(
-                    new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_ControlsWork.this)
+                    new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, CoverControlsWork.this)
                         .addFollower(
-                            CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(),
+                            CoverDataFollowerToggleButtonWidget.ofCheckAndCross(),
                             coverData -> convert(coverData) > 2,
                             (coverData, state) -> new ISerializableObject.LegacyCoverData(
                                 adjustCoverVariable(state, convert(coverData))),
                             widget -> widget.setPos(spaceX * 0, spaceY * 3))
                         .setPos(startX, startY))
                 .widget(
-                    new TextWidget(GT_Utility.trans("243", "Enable with Redstone"))
+                    new TextWidget(GTUtility.trans("243", "Enable with Redstone"))
                         .setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 0))
                 .widget(
-                    new TextWidget(GT_Utility.trans("244", "Disable with Redstone"))
+                    new TextWidget(GTUtility.trans("244", "Disable with Redstone"))
                         .setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 1))
                 .widget(
-                    new TextWidget(GT_Utility.trans("245", "Disable machine")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("245", "Disable machine")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 2))
                 .widget(
-                    new TextWidget(GT_Utility.trans("507", "Safe Mode")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("507", "Safe Mode")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 3));
         }
 
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java b/src/main/java/gregtech/common/covers/CoverConveyor.java
index b7eb782bbf..cb2690d95b 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java
+++ b/src/main/java/gregtech/common/covers/CoverConveyor.java
@@ -1,6 +1,6 @@
 package gregtech.common.covers;
 
-import static gregtech.api.util.GT_Utility.moveMultipleItemStacks;
+import static gregtech.api.util.GTUtility.moveMultipleItemStacks;
 
 import java.util.Arrays;
 
@@ -12,23 +12,23 @@ import net.minecraftforge.fluids.Fluid;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 
-public class GT_Cover_Conveyor extends GT_CoverBehavior {
+public class CoverConveyor extends CoverBehavior {
 
     public final int mTickRate;
     private final int mMaxStacks;
 
-    public GT_Cover_Conveyor(int aTickRate, int maxStacks, ITexture coverTexture) {
+    public CoverConveyor(int aTickRate, int maxStacks, ITexture coverTexture) {
         super(coverTexture);
         this.mTickRate = aTickRate;
         this.mMaxStacks = maxStacks;
@@ -78,21 +78,18 @@ public class GT_Cover_Conveyor extends GT_CoverBehavior {
             aCoverVariable = 11;
         }
         switch (aCoverVariable) {
-            case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("006", "Export"));
-            case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("007", "Import"));
-            case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("008", "Export (conditional)"));
-            case 3 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("009", "Import (conditional)"));
-            case 4 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("010", "Export (invert cond)"));
-            case 5 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("011", "Import (invert cond)"));
-            case 6 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("012", "Export allow Input"));
-            case 7 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("013", "Import allow Output"));
-            case 8 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("014", "Export allow Input (conditional)"));
-            case 9 -> GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("015", "Import allow Output (conditional)"));
-            case 10 -> GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("016", "Export allow Input (invert cond)"));
-            case 11 -> GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("017", "Import allow Output (invert cond)"));
+            case 0 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("006", "Export"));
+            case 1 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("007", "Import"));
+            case 2 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("008", "Export (conditional)"));
+            case 3 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("009", "Import (conditional)"));
+            case 4 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("010", "Export (invert cond)"));
+            case 5 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("011", "Import (invert cond)"));
+            case 6 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("012", "Export allow Input"));
+            case 7 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("013", "Import allow Output"));
+            case 8 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("014", "Export allow Input (conditional)"));
+            case 9 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("015", "Import allow Output (conditional)"));
+            case 10 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("016", "Export allow Input (invert cond)"));
+            case 11 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("017", "Import allow Output (invert cond)"));
         }
         return aCoverVariable;
     }
@@ -159,7 +156,7 @@ public class GT_Cover_Conveyor extends GT_CoverBehavior {
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new ConveyorUIFactory(buildContext).createWindow();
     }
 
@@ -170,10 +167,10 @@ public class GT_Cover_Conveyor extends GT_CoverBehavior {
         private static final int spaceX = 18;
         private static final int spaceY = 18;
 
-        private CoverDataFollower_ToggleButtonWidget<ISerializableObject.LegacyCoverData> mBlockWidget = null;
-        private CoverDataFollower_ToggleButtonWidget<ISerializableObject.LegacyCoverData> mAllowWidget = null;
+        private CoverDataFollowerToggleButtonWidget<ISerializableObject.LegacyCoverData> mBlockWidget = null;
+        private CoverDataFollowerToggleButtonWidget<ISerializableObject.LegacyCoverData> mAllowWidget = null;
 
-        public ConveyorUIFactory(GT_CoverUIBuildContext buildContext) {
+        public ConveyorUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -184,86 +181,86 @@ public class GT_Cover_Conveyor extends GT_CoverBehavior {
                 new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>(
                     this::getCoverData,
                     this::setCoverData,
-                    GT_Cover_Conveyor.this,
+                    CoverConveyor.this,
                     (id, coverData) -> !getClickable(id, convert(coverData)),
                     (id, coverData) -> new ISerializableObject.LegacyCoverData(
                         getNewCoverVariable(id, convert(coverData))))
                             .addToggleButton(
                                 0,
-                                CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                                widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EXPORT)
-                                    .addTooltip(GT_Utility.trans("006", "Export"))
+                                CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                                widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_EXPORT)
+                                    .addTooltip(GTUtility.trans("006", "Export"))
                                     .setPos(spaceX * 0, spaceY * 0))
                             .addToggleButton(
                                 1,
-                                CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                                widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_IMPORT)
-                                    .addTooltip(GT_Utility.trans("007", "Import"))
+                                CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                                widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_IMPORT)
+                                    .addTooltip(GTUtility.trans("007", "Import"))
                                     .setPos(spaceX * 1, spaceY * 0))
                             .addToggleButton(
                                 2,
-                                CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                                widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK)
-                                    .addTooltip(GT_Utility.trans("224", "Always On"))
+                                CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                                widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_CHECKMARK)
+                                    .addTooltip(GTUtility.trans("224", "Always On"))
                                     .setPos(spaceX * 0, spaceY * 1))
                             .addToggleButton(
                                 3,
-                                CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                                widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_USE_PROCESSING_STATE)
-                                    .addTooltip(GT_Utility.trans("343", "Use Machine Processing State"))
+                                CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                                widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_USE_PROCESSING_STATE)
+                                    .addTooltip(GTUtility.trans("343", "Use Machine Processing State"))
                                     .setPos(spaceX * 1, spaceY * 1))
                             .addToggleButton(
                                 4,
-                                CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                                CoverDataFollowerToggleButtonWidget.ofDisableable(),
                                 widget -> widget
-                                    .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_USE_INVERTED_PROCESSING_STATE)
-                                    .addTooltip(GT_Utility.trans("343.1", "Use Inverted Machine Processing State"))
+                                    .setStaticTexture(GTUITextures.OVERLAY_BUTTON_USE_INVERTED_PROCESSING_STATE)
+                                    .addTooltip(GTUtility.trans("343.1", "Use Inverted Machine Processing State"))
                                     .setPos(spaceX * 2, spaceY * 1))
-                            .addToggleButton(5, CoverDataFollower_ToggleButtonWidget.ofDisableable(), widget -> {
+                            .addToggleButton(5, CoverDataFollowerToggleButtonWidget.ofDisableable(), widget -> {
                                 mAllowWidget = widget;
                                 widget.setTextureGetter(i -> {
                                     ISerializableObject.LegacyCoverData coverData = getCoverData();
                                     return coverData == null || coverData.get() % 2 == 0
-                                        ? GT_UITextures.OVERLAY_BUTTON_ALLOW_INPUT
-                                        : GT_UITextures.OVERLAY_BUTTON_ALLOW_OUTPUT;
+                                        ? GTUITextures.OVERLAY_BUTTON_ALLOW_INPUT
+                                        : GTUITextures.OVERLAY_BUTTON_ALLOW_OUTPUT;
                                 })
                                     .dynamicTooltip(() -> {
                                         ISerializableObject.LegacyCoverData coverData = getCoverData();
                                         return Arrays.asList(
                                             coverData == null || coverData.get() % 2 == 0
-                                                ? GT_Utility.trans("314", "Allow Input")
-                                                : GT_Utility.trans("312", "Allow Output"));
+                                                ? GTUtility.trans("314", "Allow Input")
+                                                : GTUtility.trans("312", "Allow Output"));
                                     })
                                     .setPos(spaceX * 0, spaceY * 2);
                             })
-                            .addToggleButton(6, CoverDataFollower_ToggleButtonWidget.ofDisableable(), widget -> {
+                            .addToggleButton(6, CoverDataFollowerToggleButtonWidget.ofDisableable(), widget -> {
                                 mBlockWidget = widget;
                                 widget.setTextureGetter(i -> {
                                     ISerializableObject.LegacyCoverData coverData = getCoverData();
                                     return coverData == null || coverData.get() % 2 == 0
-                                        ? GT_UITextures.OVERLAY_BUTTON_BLOCK_INPUT
-                                        : GT_UITextures.OVERLAY_BUTTON_BLOCK_OUTPUT;
+                                        ? GTUITextures.OVERLAY_BUTTON_BLOCK_INPUT
+                                        : GTUITextures.OVERLAY_BUTTON_BLOCK_OUTPUT;
                                 })
                                     .dynamicTooltip(() -> {
                                         ISerializableObject.LegacyCoverData coverData = getCoverData();
                                         return Arrays.asList(
                                             coverData == null || coverData.get() % 2 == 0
-                                                ? GT_Utility.trans("313", "Block Input")
-                                                : GT_Utility.trans("311", "Block Output"));
+                                                ? GTUtility.trans("313", "Block Input")
+                                                : GTUtility.trans("311", "Block Output"));
                                     })
                                     .setPos(spaceX * 1, spaceY * 2);
                             })
                             .setPos(startX, startY))
                 .widget(
-                    new TextWidget(GT_Utility.trans("229", "Export/Import")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("229", "Export/Import")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 3, 4 + startY + spaceY * 0))
                 .widget(
-                    new TextWidget(GT_Utility.trans("230", "Conditional")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("230", "Conditional")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 3, 4 + startY + spaceY * 1))
                 .widget(TextWidget.dynamicString(() -> {
                     ISerializableObject.LegacyCoverData coverData = getCoverData();
-                    return coverData == null || coverData.get() % 2 == 0 ? GT_Utility.trans("344", "Input Blocking")
-                        : GT_Utility.trans("344.1", "Output Blocking");
+                    return coverData == null || coverData.get() % 2 == 0 ? GTUtility.trans("344", "Input Blocking")
+                        : GTUtility.trans("344.1", "Output Blocking");
                 })
                     .setSynced(false)
                     .setDefaultColor(COLOR_TEXT_GRAY.get())
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Crafting.java b/src/main/java/gregtech/common/covers/CoverCrafting.java
index f492542fa9..10da32033c 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Crafting.java
+++ b/src/main/java/gregtech/common/covers/CoverCrafting.java
@@ -8,12 +8,12 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_CoverBehavior;
+import gregtech.api.util.CoverBehavior;
 import gregtech.api.util.ISerializableObject;
 
-public class GT_Cover_Crafting extends GT_CoverBehavior {
+public class CoverCrafting extends CoverBehavior {
 
-    public GT_Cover_Crafting(ITexture coverTexture) {
+    public CoverCrafting(ITexture coverTexture) {
         super(coverTexture);
     }
 
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java b/src/main/java/gregtech/common/covers/CoverDoesWork.java
index 96ef77f207..1575f243ab 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java
+++ b/src/main/java/gregtech/common/covers/CoverDoesWork.java
@@ -7,24 +7,24 @@ import net.minecraftforge.fluids.Fluid;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 
-public class GT_Cover_DoesWork extends GT_CoverBehavior {
+public class CoverDoesWork extends CoverBehavior {
 
     private static int FLAG_INVERTED = 0x1;
     private static int FLAG_PROGRESS = 0x2;
     private static int FLAG_ENABLED = 0x4;
 
-    public GT_Cover_DoesWork(ITexture coverTexture) {
+    public CoverDoesWork(ITexture coverTexture) {
         super(coverTexture);
     }
 
@@ -71,17 +71,17 @@ public class GT_Cover_DoesWork extends GT_CoverBehavior {
             aCoverVariable = 5;
         }
         switch (aCoverVariable) {
-            case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("018", "Normal"));
+            case 0 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("018", "Normal"));
             // Progress scaled
-            case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("019", "Inverted"));
+            case 1 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("019", "Inverted"));
             // ^ inverted
-            case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("020", "Ready to work"));
+            case 2 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("020", "Ready to work"));
             // Not Running
-            case 3 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("021", "Not ready to work"));
+            case 3 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("021", "Not ready to work"));
             // Running
-            case 4 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("028", "Machine Enabled"));
+            case 4 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("028", "Machine Enabled"));
             // Enabled
-            case 5 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("029", "Machine Disabled"));
+            case 5 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("029", "Machine Disabled"));
             // Disabled
         }
         return aCoverVariable;
@@ -140,7 +140,7 @@ public class GT_Cover_DoesWork extends GT_CoverBehavior {
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new DoesWorkUIFactory(buildContext).createWindow();
     }
 
@@ -155,7 +155,7 @@ public class GT_Cover_DoesWork extends GT_CoverBehavior {
         private static final int spaceX = 18;
         private static final int spaceY = 18;
 
-        public DoesWorkUIFactory(GT_CoverUIBuildContext buildContext) {
+        public DoesWorkUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -167,39 +167,39 @@ public class GT_Cover_DoesWork extends GT_CoverBehavior {
                     new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>(
                         this::getCoverData,
                         this::setCoverData,
-                        GT_Cover_DoesWork.this,
+                        CoverDoesWork.this,
                         (id, coverData) -> isEnabled(id, convert(coverData)),
                         (id, coverData) -> new ISerializableObject.LegacyCoverData(
                             getNewCoverVariable(id, convert(coverData))))
                                 .addToggleButton(
                                     0,
-                                    CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                                    widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_PROGRESS)
+                                    CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                                    widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_PROGRESS)
                                         .setPos(spaceX * 0, spaceY * 0))
                                 .addToggleButton(
                                     1,
-                                    CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                                    widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK)
+                                    CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                                    widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_CHECKMARK)
                                         .setPos(spaceX * 1, spaceY * 0))
                                 .addToggleButton(
                                     2,
-                                    CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                                    widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_POWER_SWITCH_ON)
+                                    CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                                    widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_POWER_SWITCH_ON)
                                         .setPos(spaceX * 2, spaceY * 0))
                                 .addToggleButton(
                                     3,
-                                    CoverDataFollower_ToggleButtonWidget.ofRedstone(),
+                                    CoverDataFollowerToggleButtonWidget.ofRedstone(),
                                     widget -> widget.setPos(spaceX * 0, spaceY * 1))
                                 .setPos(startX, startY))
                 .widget(TextWidget.dynamicString(() -> {
                     int coverVariable = convert(getCoverData());
 
                     if (isFlagSet(coverVariable, FLAG_ENABLED)) {
-                        return GT_Utility.trans("271", "Machine enabled");
+                        return GTUtility.trans("271", "Machine enabled");
                     } else if (isFlagSet(coverVariable, FLAG_PROGRESS)) {
-                        return GT_Utility.trans("242", "Machine idle");
+                        return GTUtility.trans("242", "Machine idle");
                     } else {
-                        return GT_Utility.trans("241", "Recipe progress");
+                        return GTUtility.trans("241", "Recipe progress");
                     }
 
                 })
@@ -210,8 +210,8 @@ public class GT_Cover_DoesWork extends GT_CoverBehavior {
                     TextWidget
                         .dynamicString(
                             () -> isFlagSet(convert(getCoverData()), FLAG_INVERTED)
-                                ? GT_Utility.trans("INVERTED", "Inverted")
-                                : GT_Utility.trans("NORMAL", "Normal"))
+                                ? GTUtility.trans("INVERTED", "Inverted")
+                                : GTUtility.trans("NORMAL", "Normal"))
                         .setSynced(false)
                         .setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 3, 4 + startY + spaceY * 1));
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Drain.java b/src/main/java/gregtech/common/covers/CoverDrain.java
index 2590f8e7ae..ff10c3a992 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Drain.java
+++ b/src/main/java/gregtech/common/covers/CoverDrain.java
@@ -13,12 +13,12 @@ import gregtech.api.enums.Materials;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.GTUtility;
 
-public class GT_Cover_Drain extends GT_CoverBehavior {
+public class CoverDrain extends CoverBehavior {
 
-    public GT_Cover_Drain(ITexture coverTexture) {
+    public CoverDrain(ITexture coverTexture) {
         super(coverTexture);
     }
 
@@ -112,12 +112,12 @@ public class GT_Cover_Drain extends GT_CoverBehavior {
             aCoverVariable = 5;
         }
         switch (aCoverVariable) {
-            case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("022", "Import"));
-            case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("023", "Import (conditional)"));
-            case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("024", "Import (invert cond)"));
-            case 3 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("025", "Keep Liquids Away"));
-            case 4 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("026", "Keep Liquids Away (conditional)"));
-            case 5 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("027", "Keep Liquids Away (invert cond)"));
+            case 0 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("022", "Import"));
+            case 1 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("023", "Import (conditional)"));
+            case 2 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("024", "Import (invert cond)"));
+            case 3 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("025", "Keep Liquids Away"));
+            case 4 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("026", "Keep Liquids Away (conditional)"));
+            case 5 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("027", "Keep Liquids Away (invert cond)"));
         }
         return aCoverVariable;
     }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java b/src/main/java/gregtech/common/covers/CoverEUMeter.java
index 5b1f48d04f..07f54012d5 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java
+++ b/src/main/java/gregtech/common/covers/CoverEUMeter.java
@@ -17,25 +17,25 @@ import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicBatteryBuffer;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.metatileentity.implementations.MTEBasicBatteryBuffer;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_CycleButtonWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_NumericWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerCycleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerNumericWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMeterData> {
+public class CoverEUMeter extends CoverBehaviorBase<CoverEUMeter.EUMeterData> {
 
-    public GT_Cover_EUMeter(ITexture coverTexture) {
+    public CoverEUMeter(ITexture coverTexture) {
         super(EUMeterData.class, coverTexture);
     }
 
@@ -90,21 +90,20 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMe
         int num = (aCoverVariable.getNum() + (aPlayer.isSneaking() ? -1 : 1) + EnergyType.values().length * 2)
             % (EnergyType.values().length * 2);
         switch (num) {
-            case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("031", "Normal Universal Storage"));
-            case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("032", "Inverted Universal Storage"));
-            case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("033", "Normal Electricity Storage"));
-            case 3 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("034", "Inverted Electricity Storage"));
-            case 4 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("035", "Normal Steam Storage"));
-            case 5 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("036", "Inverted Steam Storage"));
-            case 6 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("037", "Normal Average Electric Input"));
-            case 7 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("038", "Inverted Average Electric Input"));
-            case 8 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("039", "Normal Average Electric Output"));
-            case 9 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("040", "Inverted Average Electric Output"));
-            case 10 -> GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("041", "Normal Electricity Storage(Including Batteries)"));
-            case 11 -> GT_Utility.sendChatToPlayer(
-                aPlayer,
-                GT_Utility.trans("042", "Inverted Electricity Storage(Including Batteries)"));
+            case 0 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("031", "Normal Universal Storage"));
+            case 1 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("032", "Inverted Universal Storage"));
+            case 2 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("033", "Normal Electricity Storage"));
+            case 3 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("034", "Inverted Electricity Storage"));
+            case 4 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("035", "Normal Steam Storage"));
+            case 5 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("036", "Inverted Steam Storage"));
+            case 6 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("037", "Normal Average Electric Input"));
+            case 7 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("038", "Inverted Average Electric Input"));
+            case 8 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("039", "Normal Average Electric Output"));
+            case 9 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("040", "Inverted Average Electric Output"));
+            case 10 -> GTUtility
+                .sendChatToPlayer(aPlayer, GTUtility.trans("041", "Normal Electricity Storage(Including Batteries)"));
+            case 11 -> GTUtility
+                .sendChatToPlayer(aPlayer, GTUtility.trans("042", "Inverted Electricity Storage(Including Batteries)"));
         }
         aCoverVariable.setNum(num);
         return aCoverVariable;
@@ -173,7 +172,7 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMe
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new EUMeterUIFactory(buildContext).createWindow();
     }
 
@@ -184,35 +183,34 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMe
         private static final int spaceX = 18;
         private static final int spaceY = 18;
 
-        public EUMeterUIFactory(GT_CoverUIBuildContext buildContext) {
+        public EUMeterUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
         @SuppressWarnings("PointlessArithmeticExpression")
         @Override
         protected void addUIWidgets(ModularWindow.Builder builder) {
-            final String INVERTED = GT_Utility.trans("INVERTED", "Inverted");
-            final String NORMAL = GT_Utility.trans("NORMAL", "Normal");
+            final String INVERTED = GTUtility.trans("INVERTED", "Inverted");
+            final String NORMAL = GTUtility.trans("NORMAL", "Normal");
 
-            final CoverDataFollower_NumericWidget<EUMeterData> numericWidget = new CoverDataFollower_NumericWidget<>();
+            final CoverDataFollowerNumericWidget<EUMeterData> numericWidget = new CoverDataFollowerNumericWidget<>();
 
             builder.widget(
-                new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_EUMeter.this)
-                    .addFollower(
-                        new CoverDataFollower_CycleButtonWidget<>(),
-                        coverData -> coverData.type.ordinal(),
-                        (coverData, state) -> {
-                            coverData.type = EnergyType.getEnergyType(state);
-                            return coverData;
-                        },
-                        widget -> widget.setLength(EnergyType.values().length)
-                            .addTooltip(
-                                state -> EnergyType.getEnergyType(state)
-                                    .getTooltip())
-                            .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CYCLIC)
-                            .setPos(spaceX * 0, spaceY * 0))
+                new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, CoverEUMeter.this).addFollower(
+                    new CoverDataFollowerCycleButtonWidget<>(),
+                    coverData -> coverData.type.ordinal(),
+                    (coverData, state) -> {
+                        coverData.type = EnergyType.getEnergyType(state);
+                        return coverData;
+                    },
+                    widget -> widget.setLength(EnergyType.values().length)
+                        .addTooltip(
+                            state -> EnergyType.getEnergyType(state)
+                                .getTooltip())
+                        .setStaticTexture(GTUITextures.OVERLAY_BUTTON_CYCLIC)
+                        .setPos(spaceX * 0, spaceY * 0))
                     .addFollower(
-                        CoverDataFollower_ToggleButtonWidget.ofRedstone(),
+                        CoverDataFollowerToggleButtonWidget.ofRedstone(),
                         coverData -> coverData.inverted,
                         (coverData, state) -> {
                             coverData.inverted = state;
@@ -242,7 +240,7 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMe
                         .setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX, 4 + startY + spaceY))
                 .widget(
-                    new TextWidget(GT_Utility.trans("222.1", "Energy threshold")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("222.1", "Energy threshold")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX, startY + spaceY * 3 + 4))
 
                 .widget(
@@ -337,22 +335,22 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMe
 
     private enum EnergyType {
 
-        UNIVERSAL_STORAGE(GT_Utility.trans("301", "Universal"), GT_Utility.trans("256", "Universal Storage"),
+        UNIVERSAL_STORAGE(GTUtility.trans("301", "Universal"), GTUtility.trans("256", "Universal Storage"),
             ICoverable::getUniversalEnergyStored, ICoverable::getUniversalEnergyCapacity),
-        ELECTRICITY_STORAGE(GT_Utility.trans("302", "Int. EU"), GT_Utility.trans("257", "Electricity Storage"),
+        ELECTRICITY_STORAGE(GTUtility.trans("302", "Int. EU"), GTUtility.trans("257", "Electricity Storage"),
             ICoverable::getStoredEU, ICoverable::getEUCapacity),
-        STEAM_STORAGE(GT_Utility.trans("303", "Steam"), GT_Utility.trans("258", "Steam Storage"),
+        STEAM_STORAGE(GTUtility.trans("303", "Steam"), GTUtility.trans("258", "Steam Storage"),
             ICoverable::getStoredSteam, ICoverable::getSteamCapacity),
-        AVERAGE_ELECTRIC_INPUT(GT_Utility.trans("304", "Avg. Input"), GT_Utility.trans("259", "Average Electric Input"),
+        AVERAGE_ELECTRIC_INPUT(GTUtility.trans("304", "Avg. Input"), GTUtility.trans("259", "Average Electric Input"),
             ICoverable::getAverageElectricInput, (te) -> te.getInputVoltage() * te.getInputAmperage()),
-        AVERAGE_ELECTRIC_OUTPUT(GT_Utility.trans("305", "Avg. Output"),
-            GT_Utility.trans("260", "Average Electric Output"), ICoverable::getAverageElectricOutput,
+        AVERAGE_ELECTRIC_OUTPUT(GTUtility.trans("305", "Avg. Output"),
+            GTUtility.trans("260", "Average Electric Output"), ICoverable::getAverageElectricOutput,
             (te) -> te.getOutputVoltage() * te.getOutputAmperage()),
-        ELECTRICITY_STORAGE_INCLUDING_BATTERIES(GT_Utility.trans("306", "EU stored"),
-            GT_Utility.trans("261", "Electricity Storage(Including Batteries)"), (te) -> {
+        ELECTRICITY_STORAGE_INCLUDING_BATTERIES(GTUtility.trans("306", "EU stored"),
+            GTUtility.trans("261", "Electricity Storage(Including Batteries)"), (te) -> {
                 if (te instanceof IGregTechTileEntity) {
                     IMetaTileEntity mte = ((IGregTechTileEntity) te).getMetaTileEntity();
-                    if (mte instanceof GT_MetaTileEntity_BasicBatteryBuffer buffer) {
+                    if (mte instanceof MTEBasicBatteryBuffer buffer) {
                         return buffer.getStoredEnergy()[0];
                     }
                 }
@@ -360,7 +358,7 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMe
             }, (te) -> {
                 if (te instanceof IGregTechTileEntity) {
                     IMetaTileEntity mte = ((IGregTechTileEntity) te).getMetaTileEntity();
-                    if (mte instanceof GT_MetaTileEntity_BasicBatteryBuffer buffer) {
+                    if (mte instanceof MTEBasicBatteryBuffer buffer) {
                         return buffer.getStoredEnergy()[1];
                     }
                 }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FacadeAE.java b/src/main/java/gregtech/common/covers/CoverFacadeAE.java
index da6c2c9cfa..2104f711c5 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_FacadeAE.java
+++ b/src/main/java/gregtech/common/covers/CoverFacadeAE.java
@@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack;
 
 import appeng.facade.IFacadeItem;
 
-public class GT_Cover_FacadeAE extends GT_Cover_FacadeBase {
+public class CoverFacadeAE extends CoverFacadeBase {
 
     @Override
     protected Block getTargetBlock(ItemStack aFacadeStack) {
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java b/src/main/java/gregtech/common/covers/CoverFacadeBase.java
index 4d7d0eb7ee..b5aa93d530 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java
+++ b/src/main/java/gregtech/common/covers/CoverFacadeBase.java
@@ -18,24 +18,24 @@ import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
 import cpw.mods.fml.common.network.ByteBufUtils;
 import gregtech.api.enums.Textures;
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_RenderingWorld;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTRenderingWorld;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 import io.netty.buffer.ByteBuf;
 
-public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_FacadeBase.FacadeData> {
+public abstract class CoverFacadeBase extends CoverBehaviorBase<CoverFacadeBase.FacadeData> {
 
     /**
      * This is the Dummy, if there is a generic Cover without behavior
      */
-    public GT_Cover_FacadeBase() {
+    public CoverFacadeBase() {
         super(FacadeData.class);
     }
 
@@ -58,12 +58,12 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_
     protected FacadeData onCoverScrewdriverClickImpl(ForgeDirection side, int aCoverID, FacadeData aCoverVariable,
         ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         aCoverVariable.mFlags = ((aCoverVariable.mFlags + 1) & 15);
-        GT_Utility.sendChatToPlayer(
+        GTUtility.sendChatToPlayer(
             aPlayer,
-            ((aCoverVariable.mFlags & 1) != 0 ? GT_Utility.trans("128.1", "Redstone ") : "")
-                + ((aCoverVariable.mFlags & 2) != 0 ? GT_Utility.trans("129.1", "Energy ") : "")
-                + ((aCoverVariable.mFlags & 4) != 0 ? GT_Utility.trans("130.1", "Fluids ") : "")
-                + ((aCoverVariable.mFlags & 8) != 0 ? GT_Utility.trans("131.1", "Items ") : ""));
+            ((aCoverVariable.mFlags & 1) != 0 ? GTUtility.trans("128.1", "Redstone ") : "")
+                + ((aCoverVariable.mFlags & 2) != 0 ? GTUtility.trans("129.1", "Energy ") : "")
+                + ((aCoverVariable.mFlags & 4) != 0 ? GTUtility.trans("130.1", "Fluids ") : "")
+                + ((aCoverVariable.mFlags & 8) != 0 ? GTUtility.trans("131.1", "Items ") : ""));
         return aCoverVariable;
     }
 
@@ -119,10 +119,10 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_
     public void placeCover(ForgeDirection side, ItemStack aCover, ICoverable aTileEntity) {
         aTileEntity.setCoverIdAndDataAtSide(
             side,
-            GT_Utility.stackToInt(aCover),
-            new FacadeData(GT_Utility.copyAmount(1, aCover), 0));
+            GTUtility.stackToInt(aCover),
+            new FacadeData(GTUtility.copyAmount(1, aCover), 0));
 
-        if (aTileEntity.isClientSide()) GT_RenderingWorld.getInstance()
+        if (aTileEntity.isClientSide()) GTRenderingWorld.getInstance()
             .register(
                 aTileEntity.getXCoord(),
                 aTileEntity.getYCoord(),
@@ -146,7 +146,7 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_
     @Override
     protected ITexture getSpecialCoverTextureImpl(ForgeDirection side, int aCoverID, FacadeData aCoverVariable,
         ICoverable aTileEntity) {
-        if (GT_Utility.isStackInvalid(aCoverVariable.mStack)) return Textures.BlockIcons.ERROR_RENDERING[0];
+        if (GTUtility.isStackInvalid(aCoverVariable.mStack)) return Textures.BlockIcons.ERROR_RENDERING[0];
         Block block = getTargetBlock(aCoverVariable.mStack);
         if (block == null) return Textures.BlockIcons.ERROR_RENDERING[0];
         // TODO: change this when *someone* made the block render in both pass
@@ -161,14 +161,14 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_
     @Override
     protected Block getFacadeBlockImpl(ForgeDirection side, int aCoverID, FacadeData aCoverVariable,
         ICoverable aTileEntity) {
-        if (GT_Utility.isStackInvalid(aCoverVariable.mStack)) return null;
+        if (GTUtility.isStackInvalid(aCoverVariable.mStack)) return null;
         return getTargetBlock(aCoverVariable.mStack);
     }
 
     @Override
     protected int getFacadeMetaImpl(ForgeDirection side, int aCoverID, FacadeData aCoverVariable,
         ICoverable aTileEntity) {
-        if (GT_Utility.isStackInvalid(aCoverVariable.mStack)) return 0;
+        if (GTUtility.isStackInvalid(aCoverVariable.mStack)) return 0;
         return getTargetMeta(aCoverVariable.mStack);
     }
 
@@ -185,7 +185,7 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_
     @Override
     protected void onDataChangedImpl(ForgeDirection side, int aCoverID, FacadeData aCoverVariable,
         ICoverable aTileEntity) {
-        if (aTileEntity.isClientSide()) GT_RenderingWorld.getInstance()
+        if (aTileEntity.isClientSide()) GTRenderingWorld.getInstance()
             .register(
                 aTileEntity.getXCoord(),
                 aTileEntity.getYCoord(),
@@ -200,11 +200,11 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_
             for (final ForgeDirection iSide : ForgeDirection.VALID_DIRECTIONS) {
                 if (iSide == side) continue;
                 // since we do not allow multiple type of facade per block, this check would be enough.
-                if (aTileEntity.getCoverBehaviorAtSideNew(iSide) instanceof GT_Cover_FacadeBase) return;
+                if (aTileEntity.getCoverBehaviorAtSideNew(iSide) instanceof CoverFacadeBase) return;
             }
             if (aCoverVariable.mStack != null)
                 // mStack == null -> cover removed before data reach client
-                GT_RenderingWorld.getInstance()
+                GTRenderingWorld.getInstance()
                     .unregister(
                         aTileEntity.getXCoord(),
                         aTileEntity.getYCoord(),
@@ -303,7 +303,7 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new FacadeBaseUIFactory(buildContext).createWindow();
     }
 
@@ -314,7 +314,7 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_
         private static final int spaceX = 18;
         private static final int spaceY = 18;
 
-        public FacadeBaseUIFactory(GT_CoverUIBuildContext buildContext) {
+        public FacadeBaseUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -325,26 +325,26 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_
                 new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>(
                     this::getCoverData,
                     this::setCoverData,
-                    GT_Cover_FacadeBase.this,
+                    CoverFacadeBase.this,
                     this::isEnabled,
                     (id, coverData) -> {
                         coverData.mFlags = getNewCoverVariable(id, coverData);
                         return coverData;
                     }).addToggleButton(
                         0,
-                        CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(),
+                        CoverDataFollowerToggleButtonWidget.ofCheckAndCross(),
                         widget -> widget.setPos(spaceX * 0, spaceY * 0))
                         .addToggleButton(
                             1,
-                            CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(),
+                            CoverDataFollowerToggleButtonWidget.ofCheckAndCross(),
                             widget -> widget.setPos(spaceX * 0, spaceY * 1))
                         .addToggleButton(
                             2,
-                            CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(),
+                            CoverDataFollowerToggleButtonWidget.ofCheckAndCross(),
                             widget -> widget.setPos(spaceX * 0, spaceY * 2))
                         .addToggleButton(
                             3,
-                            CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(),
+                            CoverDataFollowerToggleButtonWidget.ofCheckAndCross(),
                             widget -> widget.setPos(spaceX * 0, spaceY * 3))
                         .setPos(startX, startY))
                 .widget(
@@ -357,16 +357,16 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_
                         .setDefaultColor(COLOR_TITLE.get())
                         .setPos(25, 9))
                 .widget(
-                    new TextWidget(GT_Utility.trans("128", "Redstone")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("128", "Redstone")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 0))
                 .widget(
-                    new TextWidget(GT_Utility.trans("129", "Energy")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("129", "Energy")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 1))
                 .widget(
-                    new TextWidget(GT_Utility.trans("130", "Fluids")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("130", "Fluids")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 2))
                 .widget(
-                    new TextWidget(GT_Utility.trans("131", "Items")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("131", "Items")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 3));
         }
 
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java b/src/main/java/gregtech/common/covers/CoverFluidLimiter.java
index e7d8288ccf..4669a3a442 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java
+++ b/src/main/java/gregtech/common/covers/CoverFluidLimiter.java
@@ -16,22 +16,22 @@ import com.google.common.io.ByteArrayDataInput;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_NumericWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerNumericWidget;
 import io.netty.buffer.ByteBuf;
 
 /***
  * @author TrainerSnow#5086
  */
-public class GT_Cover_FluidLimiter extends GT_CoverBehaviorBase<GT_Cover_FluidLimiter.FluidLimiterData> {
+public class CoverFluidLimiter extends CoverBehaviorBase<CoverFluidLimiter.FluidLimiterData> {
 
-    public GT_Cover_FluidLimiter(ITexture coverTexture) {
+    public CoverFluidLimiter(ITexture coverTexture) {
         super(FluidLimiterData.class, coverTexture);
     }
 
@@ -40,7 +40,7 @@ public class GT_Cover_FluidLimiter extends GT_CoverBehaviorBase<GT_Cover_FluidLi
         FluidLimiterData aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         if (aTileEntity instanceof IFluidHandler) {
             adjustThreshold(aCoverVariable, !aPlayer.isSneaking());
-            GT_Utility.sendChatToPlayer(aPlayer, String.format("Threshold: %f", aCoverVariable.threshold));
+            GTUtility.sendChatToPlayer(aPlayer, String.format("Threshold: %f", aCoverVariable.threshold));
         }
         return aCoverVariable;
     }
@@ -164,7 +164,7 @@ public class GT_Cover_FluidLimiter extends GT_CoverBehaviorBase<GT_Cover_FluidLi
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new FluidLimiterUIFactory(buildContext).createWindow();
     }
 
@@ -175,16 +175,16 @@ public class GT_Cover_FluidLimiter extends GT_CoverBehaviorBase<GT_Cover_FluidLi
         private static final int spaceX = 18;
         private static final int spaceY = 18;
 
-        public FluidLimiterUIFactory(GT_CoverUIBuildContext buildContext) {
+        public FluidLimiterUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
         @Override
         protected void addUIWidgets(ModularWindow.Builder builder) {
             builder.widget(
-                new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_FluidLimiter.this)
+                new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, CoverFluidLimiter.this)
                     .addFollower(
-                        new CoverDataFollower_NumericWidget<>(),
+                        new CoverDataFollowerNumericWidget<>(),
                         coverData -> (double) Math.round(coverData.threshold * 100),
                         (coverData, val) -> {
                             coverData.threshold = val.floatValue() / 100;
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java b/src/main/java/gregtech/common/covers/CoverFluidRegulator.java
index 3805dfe2de..a41ed08320 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java
+++ b/src/main/java/gregtech/common/covers/CoverFluidRegulator.java
@@ -20,17 +20,17 @@ import com.gtnewhorizons.modularui.api.drawable.Text;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_NumericWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerNumericWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 import io.netty.buffer.ByteBuf;
 
 /**
@@ -49,7 +49,7 @@ import io.netty.buffer.ByteBuf;
  * speed is negative. This way, `0` means 1tick interval, while `-1` means 1 tick interval as well, preserving the
  * legacy behavior.
  */
-public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_FluidRegulator.FluidRegulatorData> {
+public class CoverFluidRegulator extends CoverBehaviorBase<CoverFluidRegulator.FluidRegulatorData> {
 
     private static final int SPEED_LENGTH = 20;
     private static final int TICK_RATE_LENGTH = Integer.SIZE - SPEED_LENGTH - 1;
@@ -60,7 +60,7 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid
     public final int mTransferRate;
     private boolean allowFluid = false;
 
-    public GT_Cover_FluidRegulator(int aTransferRate, ITexture coverTexture) {
+    public CoverFluidRegulator(int aTransferRate, ITexture coverTexture) {
         super(FluidRegulatorData.class, coverTexture);
         if (aTransferRate > (-1 >>> (Integer.SIZE - SPEED_LENGTH)))
             throw new IllegalArgumentException("aTransferRate too big: " + aTransferRate);
@@ -107,7 +107,7 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid
             }
             if (tTank1 != null && tTank2 != null) {
                 allowFluid = true;
-                GT_Utility
+                GTUtility
                     .moveFluid(tTank1, tTank2, directionFrom, Math.abs(aCoverVariable.speed), this::canTransferFluid);
                 allowFluid = false;
             }
@@ -121,20 +121,20 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid
         int tTickRate = aCoverVariable.tickRate;
         if (Math.abs(tSpeed) > mTransferRate * tTickRate) {
             tSpeed = mTransferRate * tTickRate * (tSpeed > 0 ? 1 : -1);
-            GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("316", "Pump speed limit reached!"));
+            GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("316", "Pump speed limit reached!"));
         }
         if (tTickRate == 1) {
-            GT_Utility.sendChatToPlayer(
+            GTUtility.sendChatToPlayer(
                 aPlayer,
-                GT_Utility.trans("048", "Pump speed: ") + tSpeed
-                    + GT_Utility.trans("049", "L/tick ")
+                GTUtility.trans("048", "Pump speed: ") + tSpeed
+                    + GTUtility.trans("049", "L/tick ")
                     + tSpeed * 20
-                    + GT_Utility.trans("050", "L/sec"));
+                    + GTUtility.trans("050", "L/sec"));
         } else {
-            GT_Utility.sendChatToPlayer(
+            GTUtility.sendChatToPlayer(
                 aPlayer,
                 String.format(
-                    GT_Utility.trans("207", "Pump speed: %dL every %d ticks, %.2f L/sec on average"),
+                    GTUtility.trans("207", "Pump speed: %dL every %d ticks, %.2f L/sec on average"),
                     tSpeed,
                     tTickRate,
                     tSpeed * 20d / tTickRate));
@@ -144,7 +144,7 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid
     @Override
     public FluidRegulatorData onCoverScrewdriverClickImpl(ForgeDirection side, int aCoverID,
         FluidRegulatorData aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) {
-        if (GT_Utility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) {
+        if (GTUtility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) {
             adjustSpeed(aPlayer, aCoverVariable, aPlayer.isSneaking() ? 256 : 16);
         } else {
             adjustSpeed(aPlayer, aCoverVariable, aPlayer.isSneaking() ? -256 : -16);
@@ -224,7 +224,7 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new FluidRegulatorUIFactory(buildContext).createWindow();
     }
 
@@ -241,7 +241,7 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid
             numberFormat.setMaximumFractionDigits(2);
         }
 
-        public FluidRegulatorUIFactory(GT_CoverUIBuildContext buildContext) {
+        public FluidRegulatorUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -251,59 +251,59 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid
             AtomicBoolean warn = new AtomicBoolean(false);
 
             builder.widget(
-                new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_FluidRegulator.this)
+                new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, CoverFluidRegulator.this)
                     .addFollower(
-                        CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                        CoverDataFollowerToggleButtonWidget.ofDisableable(),
                         coverData -> coverData.speed >= 0,
                         (coverData, state) -> {
                             coverData.speed = Math.abs(coverData.speed);
                             return coverData;
                         },
-                        widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EXPORT)
-                            .addTooltip(GT_Utility.trans("006", "Export"))
+                        widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_EXPORT)
+                            .addTooltip(GTUtility.trans("006", "Export"))
                             .setPos(spaceX * 0, spaceY * 0))
                     .addFollower(
-                        CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                        CoverDataFollowerToggleButtonWidget.ofDisableable(),
                         coverData -> coverData.speed <= 0,
                         (coverData, state) -> {
                             coverData.speed = -Math.abs(coverData.speed);
                             return coverData;
                         },
-                        widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_IMPORT)
-                            .addTooltip(GT_Utility.trans("007", "Import"))
+                        widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_IMPORT)
+                            .addTooltip(GTUtility.trans("007", "Import"))
                             .setPos(spaceX * 1, spaceY * 0))
                     .addFollower(
-                        CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                        CoverDataFollowerToggleButtonWidget.ofDisableable(),
                         coverData -> coverData.condition == Conditional.Always,
                         (coverData, state) -> {
                             coverData.condition = Conditional.Always;
                             return coverData;
                         },
-                        widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK)
-                            .addTooltip(GT_Utility.trans("224", "Always On"))
+                        widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_CHECKMARK)
+                            .addTooltip(GTUtility.trans("224", "Always On"))
                             .setPos(spaceX * 0, spaceY * 1))
                     .addFollower(
-                        CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                        CoverDataFollowerToggleButtonWidget.ofDisableable(),
                         coverData -> coverData.condition == Conditional.Conditional,
                         (coverData, state) -> {
                             coverData.condition = Conditional.Conditional;
                             return coverData;
                         },
-                        widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_USE_PROCESSING_STATE)
-                            .addTooltip(GT_Utility.trans("343", "Use Machine Processing State"))
+                        widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_USE_PROCESSING_STATE)
+                            .addTooltip(GTUtility.trans("343", "Use Machine Processing State"))
                             .setPos(spaceX * 1, spaceY * 1))
                     .addFollower(
-                        CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                        CoverDataFollowerToggleButtonWidget.ofDisableable(),
                         coverData -> coverData.condition == Conditional.Inverted,
                         (coverData, state) -> {
                             coverData.condition = Conditional.Inverted;
                             return coverData;
                         },
-                        widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_USE_INVERTED_PROCESSING_STATE)
-                            .addTooltip(GT_Utility.trans("343.1", "Use Inverted Machine Processing State"))
+                        widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_USE_INVERTED_PROCESSING_STATE)
+                            .addTooltip(GTUtility.trans("343.1", "Use Inverted Machine Processing State"))
                             .setPos(spaceX * 2, spaceY * 1))
                     .addFollower(
-                        new CoverDataFollower_NumericWidget<>(),
+                        new CoverDataFollowerNumericWidget<>(),
                         coverData -> (double) coverData.speed,
                         (coverData, state) -> {
                             coverData.speed = state.intValue();
@@ -313,7 +313,7 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid
                             .setValidator(val -> {
                                 final int tickRate = getCoverData() != null ? getCoverData().tickRate : 0;
                                 final long maxFlow = (long) mTransferRate
-                                    * GT_Utility.clamp(tickRate, TICK_RATE_MIN, TICK_RATE_MAX);
+                                    * GTUtility.clamp(tickRate, TICK_RATE_MIN, TICK_RATE_MAX);
                                 warn.set(false);
                                 if (val > maxFlow) {
                                     val = maxFlow;
@@ -329,7 +329,7 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid
                             .setPos(spaceX * 0, spaceY * 2 + 2)
                             .setSize(spaceX * 4 - 3, 12))
                     .addFollower(
-                        new CoverDataFollower_NumericWidget<>(),
+                        new CoverDataFollowerNumericWidget<>(),
                         coverData -> (double) coverData.tickRate,
                         (coverData, state) -> {
                             coverData.tickRate = state.intValue();
@@ -355,26 +355,26 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid
                             .setSize(spaceX * 2 - 3, 12))
                     .setPos(startX, startY))
                 .widget(
-                    new TextWidget(GT_Utility.trans("229", "Export/Import")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("229", "Export/Import")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 4, 4 + startY + spaceY * 0))
                 .widget(
-                    new TextWidget(GT_Utility.trans("230", "Conditional")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("230", "Conditional")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 4, 4 + startY + spaceY * 1))
                 .widget(
-                    new TextWidget(GT_Utility.trans("208", " L")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("208", " L")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 4, 4 + startY + spaceY * 2))
                 .widget(
-                    new TextWidget(GT_Utility.trans("209", " ticks")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("209", " ticks")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 7, 4 + startY + spaceY * 2))
                 .widget(new TextWidget().setTextSupplier(() -> {
                     FluidRegulatorData coverVariable = getCoverData();
                     if (coverVariable == null) return new Text("");
                     return new Text(
-                        GT_Utility.trans("210.1", "Average:") + " "
+                        GTUtility.trans("210.1", "Average:") + " "
                             + numberFormat.format(
                                 coverVariable.tickRate == 0 ? 0 : coverVariable.speed * 20d / coverVariable.tickRate)
                             + " "
-                            + GT_Utility.trans("210.2", "L/sec"))
+                            + GTUtility.trans("210.2", "L/sec"))
                                 .color(warn.get() ? COLOR_TEXT_WARN.get() : COLOR_TEXT_GRAY.get());
                 })
                     .setPos(startX + spaceX * 0, 4 + startY + spaceY * 3));
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidStorageMonitor.java b/src/main/java/gregtech/common/covers/CoverFluidStorageMonitor.java
index 7f9fda7cbc..bf829f1f1d 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_FluidStorageMonitor.java
+++ b/src/main/java/gregtech/common/covers/CoverFluidStorageMonitor.java
@@ -45,17 +45,17 @@ import gregtech.api.interfaces.ITextureBuilder;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
-import gregtech.common.tileentities.storage.GT_MetaTileEntity_DigitalTankBase;
+import gregtech.common.tileentities.storage.MTEDigitalTankBase;
 import io.netty.buffer.ByteBuf;
 
 /**
  * TODO: Implement overlay rendering only with
- * {@link GT_CoverBehaviorBase#getSpecialCoverFGTextureImpl(ForgeDirection, int, ISerializableObject, ICoverable)}
+ * {@link CoverBehaviorBase#getSpecialCoverFGTextureImpl(ForgeDirection, int, ISerializableObject, ICoverable)}
  */
-public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_FluidStorageMonitor.FluidStorageData> {
+public class CoverFluidStorageMonitor extends CoverBehaviorBase<CoverFluidStorageMonitor.FluidStorageData> {
 
     private static final IIconContainer[] icons = new IIconContainer[] { OVERLAY_FLUID_STORAGE_MONITOR0,
         OVERLAY_FLUID_STORAGE_MONITOR1, OVERLAY_FLUID_STORAGE_MONITOR2, OVERLAY_FLUID_STORAGE_MONITOR3,
@@ -64,7 +64,7 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_
         OVERLAY_FLUID_STORAGE_MONITOR10, OVERLAY_FLUID_STORAGE_MONITOR11, OVERLAY_FLUID_STORAGE_MONITOR12,
         OVERLAY_FLUID_STORAGE_MONITOR13, OVERLAY_FLUID_STORAGE_MONITOR14, };
 
-    public GT_Cover_FluidStorageMonitor() {
+    public CoverFluidStorageMonitor() {
         super(FluidStorageData.class);
     }
 
@@ -164,7 +164,7 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_
         }
         IFluidHandler tankHandler = (IFluidHandler) aTileEntity;
 
-        final ItemStack heldItemSizedOne = GT_Utility.copyAmount(1, heldItem);
+        final ItemStack heldItemSizedOne = GTUtility.copyAmount(1, heldItem);
         if (heldItemSizedOne == null || heldItemSizedOne.stackSize <= 0) {
             return false;
         }
@@ -185,7 +185,7 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_
 
     protected static ItemStack fillToTank(@Nonnull ItemStack container, @Nonnull IFluidHandler tank,
         ForgeDirection side) {
-        final FluidStack fluidToFill = GT_Utility.getFluidForFilledItem(container, true);
+        final FluidStack fluidToFill = GTUtility.getFluidForFilledItem(container, true);
         if (fluidToFill == null || fluidToFill.getFluid() == null || fluidToFill.amount <= 0) {
             return null;
         }
@@ -206,7 +206,7 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_
                 return null;
             }
             tank.fill(side, fluidToFill, true);
-            return GT_Utility.getContainerForFilledItem(container, false);
+            return GTUtility.getContainerForFilledItem(container, false);
         }
     }
 
@@ -227,7 +227,7 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_
                             side,
                             new FluidStack(tankInfo.fluid.getFluid(), containerItem.getCapacity(container)),
                             false))
-                    .filter(fs -> GT_Utility.areFluidsEqual(fs, tankInfo.fluid))
+                    .filter(fs -> GTUtility.areFluidsEqual(fs, tankInfo.fluid))
                     .map(fs -> fs.amount)
                     .orElse(0),
                 containerItem.fill(
@@ -241,16 +241,16 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_
             tank.drain(side, new FluidStack(tankInfo.fluid.getFluid(), filled), true);
             return container;
         } else {
-            final ItemStack filledContainer = GT_Utility.fillFluidContainer(tankInfo.fluid, container, false, false);
+            final ItemStack filledContainer = GTUtility.fillFluidContainer(tankInfo.fluid, container, false, false);
             if (filledContainer == null) {
                 return null;
             }
-            final FluidStack filledFluid = GT_Utility.getFluidForFilledItem(filledContainer, false);
+            final FluidStack filledFluid = GTUtility.getFluidForFilledItem(filledContainer, false);
             if (filledFluid == null || filledFluid.getFluid() == null || filledFluid.amount <= 0) {
                 return null;
             }
             if (Optional.ofNullable(tank.drain(side, filledFluid, false))
-                .filter(fs -> GT_Utility.areFluidsEqual(fs, filledFluid))
+                .filter(fs -> GTUtility.areFluidsEqual(fs, filledFluid))
                 .map(fs -> fs.amount)
                 .orElse(0) != filledFluid.amount) {
                 return null;
@@ -263,7 +263,7 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_
     protected static void replaceHeldItemStack(@Nonnull EntityPlayer player, @Nonnull ItemStack heldItem,
         @Nonnull ItemStack result) {
         heldItem.stackSize--;
-        GT_Utility.addItemToPlayerInventory(player, result);
+        GTUtility.addItemToPlayerInventory(player, result);
         player.inventoryContainer.detectAndSendChanges();
     }
 
@@ -274,7 +274,7 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_
             aCoverVariable
                 .setSide(ForgeDirection.values()[(aCoverVariable.side.ordinal() + 1) % ForgeDirection.values().length])
                 .setSlot(0);
-            GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("SIDE", "Side: ") + aCoverVariable.side.name());
+            GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("SIDE", "Side: ") + aCoverVariable.side.name());
             return aCoverVariable;
         }
         final FluidTankInfo[] tanks = getValidFluidTankInfos(aTileEntity, aCoverVariable.side);
@@ -288,7 +288,7 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_
             aCoverVariable
                 .setSlot((aCoverVariable.slot + tanks.length + (aPlayer.isSneaking() ? -1 : 1)) % tanks.length);
         }
-        GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("053", "Slot: ") + aCoverVariable.slot);
+        GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("053", "Slot: ") + aCoverVariable.slot);
         return aCoverVariable;
     }
 
@@ -332,7 +332,7 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_
     protected static FluidTankInfo[] getValidFluidTankInfosForDisplay(@Nullable ICoverable tileEntity,
         @Nonnull ForgeDirection side) {
         if (tileEntity instanceof IGregTechTileEntity baseMetaTileEntity
-            && baseMetaTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_DigitalTankBase digitalTank) {
+            && baseMetaTileEntity.getMetaTileEntity() instanceof MTEDigitalTankBase digitalTank) {
             return digitalTank.getRealTankInfo(side);
         }
         return getValidFluidTankInfos(tileEntity, side);
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java b/src/main/java/gregtech/common/covers/CoverFluidfilter.java
index 44e264c8e8..630a7c9ddf 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
+++ b/src/main/java/gregtech/common/covers/CoverFluidfilter.java
@@ -1,6 +1,6 @@
 package gregtech.common.covers;
 
-import static gregtech.api.enums.GT_Values.E;
+import static gregtech.api.enums.GTValues.E;
 
 import javax.annotation.Nonnull;
 
@@ -21,19 +21,19 @@ import com.gtnewhorizons.modularui.api.forge.ItemStackHandler;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_SlotWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerSlotWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfilter.FluidFilterData> {
+public class CoverFluidfilter extends CoverBehaviorBase<CoverFluidfilter.FluidFilterData> {
 
     // Uses the lower 3 bits of the cover variable, so we have 8 options to work with (0-7)
     private final int FILTER_INPUT_DENY_OUTPUT = 0; // 000
@@ -45,7 +45,7 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil
     private final int ANY_INPUT_FILTER_OUTPUT = 6; // 110
     private final int ANY_INPUT_INVERT_OUTPUT = 7; // 111
 
-    public GT_Cover_Fluidfilter(ITexture coverTexture) {
+    public CoverFluidfilter(ITexture coverTexture) {
         super(FluidFilterData.class, coverTexture);
     }
 
@@ -84,14 +84,14 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil
 
     public String getFilterMode(int aFilterMode) {
         return switch (aFilterMode) {
-            case FILTER_INPUT_DENY_OUTPUT -> GT_Utility.trans("043", "Filter input, Deny output");
-            case INVERT_INPUT_DENY_OUTPUT -> GT_Utility.trans("044", "Invert input, Deny output");
-            case FILTER_INPUT_ANY_OUTPUT -> GT_Utility.trans("045", "Filter input, Permit any output");
-            case INVERT_INPUT_ANY_OUTPUT -> GT_Utility.trans("046", "Invert input, Permit any output");
-            case DENY_INPUT_FILTER_OUTPUT -> GT_Utility.trans("307", "Deny input, Filter output");
-            case DENY_INPUT_INVERT_OUTPUT -> GT_Utility.trans("308", "Deny input, Invert output");
-            case ANY_INPUT_FILTER_OUTPUT -> GT_Utility.trans("309", "Permit any input, Filter output");
-            case ANY_INPUT_INVERT_OUTPUT -> GT_Utility.trans("310", "Permit any input, Invert output");
+            case FILTER_INPUT_DENY_OUTPUT -> GTUtility.trans("043", "Filter input, Deny output");
+            case INVERT_INPUT_DENY_OUTPUT -> GTUtility.trans("044", "Invert input, Deny output");
+            case FILTER_INPUT_ANY_OUTPUT -> GTUtility.trans("045", "Filter input, Permit any output");
+            case INVERT_INPUT_ANY_OUTPUT -> GTUtility.trans("046", "Invert input, Permit any output");
+            case DENY_INPUT_FILTER_OUTPUT -> GTUtility.trans("307", "Deny input, Filter output");
+            case DENY_INPUT_INVERT_OUTPUT -> GTUtility.trans("308", "Deny input, Invert output");
+            case ANY_INPUT_FILTER_OUTPUT -> GTUtility.trans("309", "Permit any input, Filter output");
+            case ANY_INPUT_INVERT_OUTPUT -> GTUtility.trans("310", "Permit any input, Invert output");
             default -> ("UNKNOWN");
         };
     }
@@ -104,7 +104,7 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil
             aCoverVariable.mFilterMode = 7;
         }
 
-        GT_Utility.sendChatToPlayer(aPlayer, getFilterMode(aCoverVariable.mFilterMode));
+        GTUtility.sendChatToPlayer(aPlayer, getFilterMode(aCoverVariable.mFilterMode));
 
         return aCoverVariable;
     }
@@ -119,14 +119,14 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil
             final ItemStack tStack = aPlayer.inventory.getCurrentItem();
             if (tStack == null) return true;
 
-            final FluidStack tFluid = GT_Utility.getFluidForFilledItem(tStack, true);
+            final FluidStack tFluid = GTUtility.getFluidForFilledItem(tStack, true);
             if (tFluid != null) {
                 final int aFluid = tFluid.getFluidID();
                 aCoverVariable.mFluidID = aFluid;
                 aTileEntity.setCoverDataAtSide(side, aCoverVariable);
                 final FluidStack sFluid = new FluidStack(FluidRegistry.getFluid(aFluid), 1000);
-                GT_Utility
-                    .sendChatToPlayer(aPlayer, GT_Utility.trans("047", "Filter Fluid: ") + sFluid.getLocalizedName());
+                GTUtility
+                    .sendChatToPlayer(aPlayer, GTUtility.trans("047", "Filter Fluid: ") + sFluid.getLocalizedName());
             }
             return true;
         }
@@ -219,7 +219,7 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new FluidFilterUIFactory(buildContext).createWindow();
     }
 
@@ -230,7 +230,7 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil
         private static final int spaceX = 18;
         private static final int spaceY = 18;
 
-        public FluidFilterUIFactory(GT_CoverUIBuildContext buildContext) {
+        public FluidFilterUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -241,85 +241,82 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil
                 new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>(
                     this::getCoverData,
                     this::setCoverData,
-                    GT_Cover_Fluidfilter.this,
+                    CoverFluidfilter.this,
                     (id, coverData) -> !getClickable(id, coverData),
                     (id, coverData) -> {
                         coverData.mFilterMode = getNewFilterMode(id, coverData);
                         return coverData;
                     }).addToggleButton(
                         0,
-                        CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                        widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_IMPORT)
-                            .addTooltip(GT_Utility.trans("232", "Filter Input"))
+                        CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                        widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_IMPORT)
+                            .addTooltip(GTUtility.trans("232", "Filter Input"))
                             .setPos(spaceX * 0, spaceY * 0))
                         .addToggleButton(
                             1,
-                            CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                            widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EXPORT)
-                                .addTooltip(GT_Utility.trans("233", "Filter Output"))
+                            CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                            widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_EXPORT)
+                                .addTooltip(GTUtility.trans("233", "Filter Output"))
                                 .setPos(spaceX * 1, spaceY * 0))
                         .addToggleButton(
                             2,
-                            CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                            widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_BLOCK_INPUT)
-                                .addTooltip(GT_Utility.trans("234", "Block Output"))
+                            CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                            widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_BLOCK_INPUT)
+                                .addTooltip(GTUtility.trans("234", "Block Output"))
                                 .setPos(spaceX * 0, spaceY * 2))
                         .addToggleButton(
                             3,
-                            CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                            widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_ALLOW_INPUT)
-                                .addTooltip(GT_Utility.trans("235", "Allow Output"))
+                            CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                            widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_ALLOW_INPUT)
+                                .addTooltip(GTUtility.trans("235", "Allow Output"))
                                 .setPos(spaceX * 1, spaceY * 2))
                         .addToggleButton(
                             4,
-                            CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                            widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_WHITELIST)
-                                .addTooltip(GT_Utility.trans("236", "Whitelist Fluid"))
+                            CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                            widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_WHITELIST)
+                                .addTooltip(GTUtility.trans("236", "Whitelist Fluid"))
                                 .setPos(spaceX * 0, spaceY * 1))
                         .addToggleButton(
                             5,
-                            CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                            widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_BLACKLIST)
-                                .addTooltip(GT_Utility.trans("237", "Blacklist Fluid"))
+                            CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                            widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_BLACKLIST)
+                                .addTooltip(GTUtility.trans("237", "Blacklist Fluid"))
                                 .setPos(spaceX * 1, spaceY * 1))
-                        .addFollower(
-                            new CoverDataFollower_SlotWidget<FluidFilterData>(new ItemStackHandler(), 0, true) {
-
-                                @Override
-                                protected void putClickedStack(ItemStack stack, int mouseButton) {
-                                    if (stack != null && GT_Utility.getFluidFromContainerOrFluidDisplay(stack) == null)
-                                        return;
-                                    super.putClickedStack(
-                                        GT_Utility.getFluidDisplayStack(
-                                            GT_Utility.getFluidFromContainerOrFluidDisplay(stack),
-                                            false),
-                                        mouseButton);
+                        .addFollower(new CoverDataFollowerSlotWidget<FluidFilterData>(new ItemStackHandler(), 0, true) {
+
+                            @Override
+                            protected void putClickedStack(ItemStack stack, int mouseButton) {
+                                if (stack != null && GTUtility.getFluidFromContainerOrFluidDisplay(stack) == null)
+                                    return;
+                                super.putClickedStack(
+                                    GTUtility.getFluidDisplayStack(
+                                        GTUtility.getFluidFromContainerOrFluidDisplay(stack),
+                                        false),
+                                    mouseButton);
+                            }
+                        }, this::getFluidDisplayItem, (coverData, stack) -> {
+                            if (stack == null) {
+                                coverData.mFluidID = -1;
+                            } else {
+                                FluidStack fluid = GTUtility.getFluidFromDisplayStack(stack);
+                                if (fluid != null && fluid.getFluid() != null) {
+                                    coverData.mFluidID = fluid.getFluid()
+                                        .getID();
                                 }
-                            },
-                            this::getFluidDisplayItem,
-                            (coverData, stack) -> {
-                                if (stack == null) {
-                                    coverData.mFluidID = -1;
-                                } else {
-                                    FluidStack fluid = GT_Utility.getFluidFromDisplayStack(stack);
-                                    if (fluid != null && fluid.getFluid() != null) {
-                                        coverData.mFluidID = fluid.getFluid()
-                                            .getID();
-                                    }
-                                }
-                                return coverData;
-                            },
+                            }
+                            return coverData;
+                        },
                             widget -> widget.setBackground(ModularUITextures.FLUID_SLOT)
                                 .setPos(0, spaceY * 3 + 2))
                         .setPos(startX, startY))
                 .widget(
-                    new TextWidget(GT_Utility.trans("238", "Filter Direction")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("238", "Filter Direction")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 2, 3 + startY + spaceY * 0))
                 .widget(
-                    new TextWidget(GT_Utility.trans("239", "Filter Type")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("239", "Filter Type")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 2, 3 + startY + spaceY * 1))
                 .widget(
-                    new TextWidget(GT_Utility.trans("240", "Block Flow")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("240", "Block Flow")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 2, 3 + startY + spaceY * 2))
                 .widget(TextWidget.dynamicString(() -> {
                     if (getCoverData() != null) {
@@ -328,7 +325,7 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil
                             return fluidDisplay.getDisplayName();
                         }
                     }
-                    return GT_Utility.trans("315", "Filter Empty");
+                    return GTUtility.trans("315", "Filter Empty");
                 })
                     .setSynced(false)
                     .setDefaultColor(COLOR_TITLE.get())
@@ -358,7 +355,7 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil
 
         private ItemStack getFluidDisplayItem(FluidFilterData coverData) {
             Fluid fluid = FluidRegistry.getFluid(coverData.mFluidID);
-            return GT_Utility.getFluidDisplayStack(fluid);
+            return GTUtility.getFluidDisplayStack(fluid);
         }
     }
 
diff --git a/src/main/java/gregtech/common/covers/CoverInfo.java b/src/main/java/gregtech/common/covers/CoverInfo.java
index 48f6dd9748..0a3ef3a07b 100644
--- a/src/main/java/gregtech/common/covers/CoverInfo.java
+++ b/src/main/java/gregtech/common/covers/CoverInfo.java
@@ -15,12 +15,12 @@ import org.jetbrains.annotations.NotNull;
 
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
+import gregtech.api.GregTechAPI;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 
 public final class CoverInfo {
@@ -33,7 +33,7 @@ public final class CoverInfo {
     public static final CoverInfo EMPTY_INFO = new CoverInfo(ForgeDirection.UNKNOWN, null);
     private final ForgeDirection coverSide;
     private int coverID = 0;
-    private GT_CoverBehaviorBase<?> coverBehavior;
+    private CoverBehaviorBase<?> coverBehavior;
     private ISerializableObject coverData;
     private final WeakReference<ICoverable> coveredTile;
     private boolean needsUpdate = false;
@@ -43,13 +43,13 @@ public final class CoverInfo {
     public CoverInfo(ForgeDirection side, ICoverable aTile) {
         coverSide = side;
         coveredTile = new WeakReference<>(aTile);
-        coverBehavior = GregTech_API.sNoBehavior;
+        coverBehavior = GregTechAPI.sNoBehavior;
     }
 
     public CoverInfo(ForgeDirection side, int aID, ICoverable aTile, ISerializableObject aCoverData) {
         coverSide = side;
         coverID = aID;
-        coverBehavior = GregTech_API.getCoverBehaviorNew(aID);
+        coverBehavior = GregTechAPI.getCoverBehaviorNew(aID);
         coverData = aCoverData == null ? coverBehavior.createDataObject() : aCoverData;
         coveredTile = new WeakReference<>(aTile);
     }
@@ -57,7 +57,7 @@ public final class CoverInfo {
     public CoverInfo(ICoverable aTile, NBTTagCompound aNBT) {
         coverSide = ForgeDirection.getOrientation(aNBT.getByte(NBT_SIDE));
         coverID = aNBT.getInteger(NBT_ID);
-        coverBehavior = GregTech_API.getCoverBehaviorNew(coverID);
+        coverBehavior = GregTechAPI.getCoverBehaviorNew(coverID);
         coverData = aNBT.hasKey(NBT_DATA) ? coverBehavior.createDataObject(aNBT.getTag(NBT_DATA))
             : coverBehavior.createDataObject();
         coveredTile = new WeakReference<>(aTile);
@@ -89,13 +89,13 @@ public final class CoverInfo {
         needsUpdate = aUpdate;
     }
 
-    public GT_CoverBehaviorBase<?> getCoverBehavior() {
+    public CoverBehaviorBase<?> getCoverBehavior() {
         return coverBehavior;
     }
 
     public ISerializableObject getCoverData() {
         if (coverData != null) return coverData;
-        return GregTech_API.sNoBehavior.createDataObject();
+        return GregTechAPI.sNoBehavior.createDataObject();
     }
 
     public boolean onCoverRemoval(boolean aForced) {
@@ -160,7 +160,7 @@ public final class CoverInfo {
     }
 
     public void updateCoverBehavior() {
-        coverBehavior = GregTech_API.getCoverBehaviorNew(coverID);
+        coverBehavior = GregTechAPI.getCoverBehaviorNew(coverID);
     }
 
     public void preDataChanged(int aCoverID, ISerializableObject aCoverData) {
@@ -176,7 +176,7 @@ public final class CoverInfo {
     }
 
     public ModularWindow createWindow(EntityPlayer player) {
-        final GT_CoverUIBuildContext buildContext = new GT_CoverUIBuildContext(
+        final CoverUIBuildContext buildContext = new CoverUIBuildContext(
             player,
             coverID,
             coverSide,
@@ -246,7 +246,7 @@ public final class CoverInfo {
     public void onCoverJackhammer(EntityPlayer aPlayer) {
         adjustTickRateMultiplier(aPlayer.isSneaking());
 
-        GT_Utility.sendChatToPlayer(
+        GTUtility.sendChatToPlayer(
             aPlayer,
             StatCollector.translateToLocalFormatted("gt.cover.info.chat.tick_rate", getCurrentTickRateFormatted()));
     }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java b/src/main/java/gregtech/common/covers/CoverItemFilter.java
index 2274722c9a..acdbda795b 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java
+++ b/src/main/java/gregtech/common/covers/CoverItemFilter.java
@@ -1,7 +1,7 @@
 package gregtech.common.covers;
 
-import static gregtech.api.util.GT_Utility.intToStack;
-import static gregtech.api.util.GT_Utility.moveMultipleItemStacks;
+import static gregtech.api.util.GTUtility.intToStack;
+import static gregtech.api.util.GTUtility.moveMultipleItemStacks;
 
 import java.util.Collections;
 import java.util.List;
@@ -24,23 +24,23 @@ import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
 import cpw.mods.fml.common.network.ByteBufUtils;
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_SlotWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerSlotWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Cover_ItemFilter extends GT_CoverBehaviorBase<GT_Cover_ItemFilter.ItemFilterData> {
+public class CoverItemFilter extends CoverBehaviorBase<CoverItemFilter.ItemFilterData> {
 
     private final boolean mExport;
 
-    public GT_Cover_ItemFilter(boolean isExport, ITexture coverTexture) {
+    public CoverItemFilter(boolean isExport, ITexture coverTexture) {
         super(ItemFilterData.class, coverTexture);
         this.mExport = isExport;
     }
@@ -94,10 +94,10 @@ public class GT_Cover_ItemFilter extends GT_CoverBehaviorBase<GT_Cover_ItemFilte
         final ItemStack tStack = aPlayer.inventory.getCurrentItem();
         if (tStack != null) {
             aCoverVariable.mFilter = tStack;
-            GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("299", "Item Filter: ") + tStack.getDisplayName());
+            GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("299", "Item Filter: ") + tStack.getDisplayName());
         } else {
             aCoverVariable.mFilter = null;
-            GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("300", "Filter Cleared!"));
+            GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("300", "Filter Cleared!"));
         }
         return true;
     }
@@ -106,10 +106,10 @@ public class GT_Cover_ItemFilter extends GT_CoverBehaviorBase<GT_Cover_ItemFilte
     protected ItemFilterData onCoverScrewdriverClickImpl(ForgeDirection side, int aCoverID,
         ItemFilterData aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         aCoverVariable.mWhitelist = !aCoverVariable.mWhitelist;
-        GT_Utility.sendChatToPlayer(
+        GTUtility.sendChatToPlayer(
             aPlayer,
-            aCoverVariable.mWhitelist ? GT_Utility.trans("125.1", "Whitelist Mode")
-                : GT_Utility.trans("124.1", "Blacklist Mode"));
+            aCoverVariable.mWhitelist ? GTUtility.trans("125.1", "Whitelist Mode")
+                : GTUtility.trans("124.1", "Blacklist Mode"));
         return aCoverVariable;
     }
 
@@ -181,7 +181,7 @@ public class GT_Cover_ItemFilter extends GT_CoverBehaviorBase<GT_Cover_ItemFilte
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new ItemFilterUIFactory(buildContext).createWindow();
     }
 
@@ -192,7 +192,7 @@ public class GT_Cover_ItemFilter extends GT_CoverBehaviorBase<GT_Cover_ItemFilte
         private static final int spaceX = 18;
         private static final int spaceY = 18;
 
-        public ItemFilterUIFactory(GT_CoverUIBuildContext buildContext) {
+        public ItemFilterUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -204,9 +204,9 @@ public class GT_Cover_ItemFilter extends GT_CoverBehaviorBase<GT_Cover_ItemFilte
                 filterInvHandler.setStackInSlot(0, setStackSize1(getCoverData().mFilter));
             }
             builder.widget(
-                new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_ItemFilter.this)
+                new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, CoverItemFilter.this)
                     .addFollower(
-                        new CoverDataFollower_ToggleButtonWidget<>(),
+                        new CoverDataFollowerToggleButtonWidget<>(),
                         coverData -> coverData.mWhitelist,
                         (coverData, state) -> {
                             coverData.mWhitelist = state;
@@ -214,26 +214,26 @@ public class GT_Cover_ItemFilter extends GT_CoverBehaviorBase<GT_Cover_ItemFilte
                         },
                         widget -> widget
                             .setToggleTexture(
-                                GT_UITextures.OVERLAY_BUTTON_BLACKLIST,
-                                GT_UITextures.OVERLAY_BUTTON_WHITELIST)
-                            .addTooltip(0, GT_Utility.trans("125.1", "Whitelist Mode"))
-                            .addTooltip(1, GT_Utility.trans("124.1", "Blacklist Mode"))
+                                GTUITextures.OVERLAY_BUTTON_BLACKLIST,
+                                GTUITextures.OVERLAY_BUTTON_WHITELIST)
+                            .addTooltip(0, GTUtility.trans("125.1", "Whitelist Mode"))
+                            .addTooltip(1, GTUtility.trans("124.1", "Blacklist Mode"))
                             .setPos(spaceX * 0, spaceY * 0))
                     .addFollower(
-                        new CoverDataFollower_SlotWidget<>(filterInvHandler, 0, true),
+                        new CoverDataFollowerSlotWidget<>(filterInvHandler, 0, true),
                         coverData -> setStackSize1(coverData.mFilter),
                         (coverData, stack) -> {
                             coverData.mFilter = setStackSize1(stack);
                             return coverData;
                         },
-                        widget -> widget.setBackground(GT_UITextures.SLOT_DARK_GRAY)
+                        widget -> widget.setBackground(GTUITextures.SLOT_DARK_GRAY)
                             .setPos(spaceX * 0, spaceY * 2))
                     .setPos(startX, startY))
                 .widget(
-                    new TextWidget(GT_Utility.trans("317", "Filter: ")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("317", "Filter: ")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 0, 3 + startY + spaceY * 1))
                 .widget(
-                    new TextWidget(GT_Utility.trans("318", "Check Mode")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("318", "Check Mode")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 2, 3 + startY + spaceY * 0));
         }
 
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java b/src/main/java/gregtech/common/covers/CoverItemMeter.java
index 46be8daddd..376a93682c 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java
+++ b/src/main/java/gregtech/common/covers/CoverItemMeter.java
@@ -18,30 +18,30 @@ import com.gtnewhorizons.modularui.api.NumberFormatMUI;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_NumericWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerNumericWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 import gregtech.common.gui.modularui.widget.ItemWatcherSlotWidget;
-import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_OutputBus_ME;
-import gregtech.common.tileentities.storage.GT_MetaTileEntity_DigitalChestBase;
+import gregtech.common.tileentities.machines.MTEHatchOutputBusME;
+import gregtech.common.tileentities.storage.MTEDigitalChestBase;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter.ItemMeterData> {
+public class CoverItemMeter extends CoverBehaviorBase<CoverItemMeter.ItemMeterData> {
 
     // Legacy data format
     private static final int SLOT_MASK = 0x3FFFFFFF; // 0 = all, 1 = 0 ...
     private static final int CONVERTED_BIT = 0x80000000;
     private static final int INVERT_BIT = 0x40000000;
 
-    public GT_Cover_ItemMeter(ITexture coverTexture) {
+    public CoverItemMeter(ITexture coverTexture) {
         super(ItemMeterData.class, coverTexture);
     }
 
@@ -74,11 +74,11 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter.
         long max = 0;
         long used = 0;
         final IMetaTileEntity mte = ((IGregTechTileEntity) tileEntity).getMetaTileEntity();
-        if (mte instanceof GT_MetaTileEntity_DigitalChestBase dc) {
+        if (mte instanceof MTEDigitalChestBase dc) {
             max = dc.getMaxItemCount();
             used = dc.getProgresstime();
-        } else if (mte instanceof GT_MetaTileEntity_Hatch_OutputBus_ME) {
-            if (((GT_MetaTileEntity_Hatch_OutputBus_ME) mte).canAcceptItem()) {
+        } else if (mte instanceof MTEHatchOutputBusME) {
+            if (((MTEHatchOutputBusME) mte).canAcceptItem()) {
                 max = 64;
                 used = 0;
             }
@@ -94,7 +94,7 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter.
             }
         }
 
-        return GT_Utility.convertRatioToRedstone(used, max, threshold, inverted);
+        return GTUtility.convertRatioToRedstone(used, max, threshold, inverted);
     }
 
     @Override
@@ -117,18 +117,18 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter.
         if (aPlayer.isSneaking()) {
             if (aCoverVariable.inverted) {
                 aCoverVariable.inverted = false;
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("055", "Normal"));
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("055", "Normal"));
             } else {
                 aCoverVariable.inverted = true;
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("054", "Inverted"));
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("054", "Inverted"));
             }
         } else {
             aCoverVariable.slot++;
             if (aCoverVariable.slot > aTileEntity.getSizeInventory()) aCoverVariable.slot = -1;
 
-            if (aCoverVariable.slot == -1) GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("053", "Slot: ") + GT_Utility.trans("ALL", "All"));
-            else GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("053", "Slot: ") + aCoverVariable.slot);
+            if (aCoverVariable.slot == -1)
+                GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("053", "Slot: ") + GTUtility.trans("ALL", "All"));
+            else GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("053", "Slot: ") + aCoverVariable.slot);
         }
 
         return aCoverVariable;
@@ -190,7 +190,7 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter.
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new ItemMeterUIFactory(buildContext).createWindow();
     }
 
@@ -209,7 +209,7 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter.
             @Override
             public StringBuffer format(double number, StringBuffer toAppendTo, FieldPosition pos) {
                 if (number < 0) {
-                    return toAppendTo.append(GT_Utility.trans("ALL", "All"));
+                    return toAppendTo.append(GTUtility.trans("ALL", "All"));
                 } else {
                     return super.format(number, toAppendTo, pos);
                 }
@@ -219,22 +219,22 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter.
         private int maxSlot;
         private int maxThreshold;
 
-        public ItemMeterUIFactory(GT_CoverUIBuildContext buildContext) {
+        public ItemMeterUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
         @Override
         protected void addUIWidgets(ModularWindow.Builder builder) {
-            final String INVERTED = GT_Utility.trans("INVERTED", "Inverted");
-            final String NORMAL = GT_Utility.trans("NORMAL", "Normal");
+            final String INVERTED = GTUtility.trans("INVERTED", "Inverted");
+            final String NORMAL = GTUtility.trans("NORMAL", "Normal");
 
             setMaxSlot();
             setMaxThreshold();
 
             builder.widget(
-                new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_ItemMeter.this)
+                new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, CoverItemMeter.this)
                     .addFollower(
-                        CoverDataFollower_ToggleButtonWidget.ofRedstone(),
+                        CoverDataFollowerToggleButtonWidget.ofRedstone(),
                         coverData -> coverData.inverted,
                         (coverData, state) -> {
                             coverData.inverted = state;
@@ -244,7 +244,7 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter.
                             .addTooltip(1, INVERTED)
                             .setPos(0, 0))
                     .addFollower(
-                        new CoverDataFollower_NumericWidget<>(),
+                        new CoverDataFollowerNumericWidget<>(),
                         coverData -> (double) coverData.threshold,
                         (coverData, state) -> {
                             coverData.threshold = state.intValue();
@@ -256,7 +256,7 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter.
                             .setPos(0, 2 + spaceY)
                             .setSize(spaceX * 4 + 5, 12))
                     .addFollower(
-                        new CoverDataFollower_NumericWidget<>(),
+                        new CoverDataFollowerNumericWidget<>(),
                         coverData -> (double) coverData.slot,
                         (coverData, state) -> {
                             coverData.slot = state.intValue();
@@ -279,17 +279,17 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter.
                         .setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX, 4 + startY))
                 .widget(
-                    new TextWidget(GT_Utility.trans("254", "Detect slot #")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("254", "Detect slot #")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 4 + 9, 4 + startY + spaceY * 2))
                 .widget(
-                    new TextWidget(GT_Utility.trans("221", "Item threshold")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("221", "Item threshold")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 4 + 9, 4 + startY + spaceY));
         }
 
         private void setMaxSlot() {
             final ICoverable tile = getUIBuildContext().getTile();
             if (!tile.isDead() && tile instanceof IGregTechTileEntity gtTile
-                && !(gtTile.getMetaTileEntity() instanceof GT_MetaTileEntity_DigitalChestBase)) {
+                && !(gtTile.getMetaTileEntity() instanceof MTEDigitalChestBase)) {
                 maxSlot = Math.min(tile.getSizeInventory() - 1, SLOT_MASK - 1);
             } else {
                 maxSlot = -1;
@@ -299,7 +299,7 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter.
         private void setMaxThreshold() {
             final ICoverable tile = getUIBuildContext().getTile();
             if (!tile.isDead() && tile instanceof IGregTechTileEntity gtTile
-                && gtTile.getMetaTileEntity() instanceof GT_MetaTileEntity_DigitalChestBase) {
+                && gtTile.getMetaTileEntity() instanceof MTEDigitalChestBase) {
                 maxThreshold = gtTile.getMaxItemCount();
             } else {
                 maxThreshold = maxSlot > 0 ? maxSlot * 64 : Integer.MAX_VALUE;
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Lens.java b/src/main/java/gregtech/common/covers/CoverLens.java
index 94794e5892..37c257ff4d 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Lens.java
+++ b/src/main/java/gregtech/common/covers/CoverLens.java
@@ -4,13 +4,13 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_CoverBehavior;
+import gregtech.api.util.CoverBehavior;
 
-public class GT_Cover_Lens extends GT_CoverBehavior {
+public class CoverLens extends CoverBehavior {
 
     private final byte mColor;
 
-    public GT_Cover_Lens(byte aColor, ITexture coverTexture) {
+    public CoverLens(byte aColor, ITexture coverTexture) {
         super(coverTexture);
         this.mColor = aColor;
     }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java b/src/main/java/gregtech/common/covers/CoverLiquidMeter.java
index f7c8bb8cd3..2f13f25421 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java
+++ b/src/main/java/gregtech/common/covers/CoverLiquidMeter.java
@@ -18,26 +18,26 @@ import com.google.common.io.ByteArrayDataInput;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_NumericWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
-import gregtech.common.tileentities.storage.GT_MetaTileEntity_DigitalTankBase;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerNumericWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
+import gregtech.common.tileentities.storage.MTEDigitalTankBase;
 import io.netty.buffer.ByteBuf;
 
 /**
  * TODO: Implement overlay rendering only with
- * {@link GT_CoverBehaviorBase#getSpecialCoverFGTextureImpl(ForgeDirection, int, ISerializableObject, ICoverable)}
+ * {@link CoverBehaviorBase#getSpecialCoverFGTextureImpl(ForgeDirection, int, ISerializableObject, ICoverable)}
  */
-public class GT_Cover_LiquidMeter extends GT_CoverBehaviorBase<GT_Cover_LiquidMeter.LiquidMeterData> {
+public class CoverLiquidMeter extends CoverBehaviorBase<CoverLiquidMeter.LiquidMeterData> {
 
-    public GT_Cover_LiquidMeter(ITexture coverTexture) {
+    public CoverLiquidMeter(ITexture coverTexture) {
         super(LiquidMeterData.class, coverTexture);
     }
 
@@ -65,10 +65,10 @@ public class GT_Cover_LiquidMeter extends GT_CoverBehaviorBase<GT_Cover_LiquidMe
             if (tanks != null) {
                 for (FluidTankInfo tank : tanks) {
                     if (tank != null) {
-                        if (tileEntity instanceof BaseMetaTileEntity && ((BaseMetaTileEntity) tileEntity)
-                            .getMetaTileEntity() instanceof GT_MetaTileEntity_DigitalTankBase) {
-                            max += ((GT_MetaTileEntity_DigitalTankBase) ((BaseMetaTileEntity) tileEntity)
-                                .getMetaTileEntity()).getRealCapacity();
+                        if (tileEntity instanceof BaseMetaTileEntity
+                            && ((BaseMetaTileEntity) tileEntity).getMetaTileEntity() instanceof MTEDigitalTankBase) {
+                            max += ((MTEDigitalTankBase) ((BaseMetaTileEntity) tileEntity).getMetaTileEntity())
+                                .getRealCapacity();
                         } else max += tank.capacity;
                         FluidStack tLiquid = tank.fluid;
                         if (tLiquid != null) {
@@ -78,7 +78,7 @@ public class GT_Cover_LiquidMeter extends GT_CoverBehaviorBase<GT_Cover_LiquidMe
                 }
             }
 
-            return GT_Utility.convertRatioToRedstone(used, max, threshold, inverted);
+            return GTUtility.convertRatioToRedstone(used, max, threshold, inverted);
         } else {
             return 0;
         }
@@ -98,10 +98,10 @@ public class GT_Cover_LiquidMeter extends GT_CoverBehaviorBase<GT_Cover_LiquidMe
         LiquidMeterData aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         if (aCoverVariable.inverted) {
             aCoverVariable.inverted = false;
-            GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("055", "Normal"));
+            GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("055", "Normal"));
         } else {
             aCoverVariable.inverted = true;
-            GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("054", "Inverted"));
+            GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("054", "Inverted"));
         }
         return aCoverVariable;
     }
@@ -162,7 +162,7 @@ public class GT_Cover_LiquidMeter extends GT_CoverBehaviorBase<GT_Cover_LiquidMe
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new LiquidMeterUIFactory(buildContext).createWindow();
     }
 
@@ -174,22 +174,22 @@ public class GT_Cover_LiquidMeter extends GT_CoverBehaviorBase<GT_Cover_LiquidMe
         private static final int spaceY = 18;
         private int maxCapacity;
 
-        public LiquidMeterUIFactory(GT_CoverUIBuildContext buildContext) {
+        public LiquidMeterUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
         @SuppressWarnings("PointlessArithmeticExpression")
         @Override
         protected void addUIWidgets(ModularWindow.Builder builder) {
-            final String INVERTED = GT_Utility.trans("INVERTED", "Inverted");
-            final String NORMAL = GT_Utility.trans("NORMAL", "Normal");
+            final String INVERTED = GTUtility.trans("INVERTED", "Inverted");
+            final String NORMAL = GTUtility.trans("NORMAL", "Normal");
 
             setMaxCapacity();
 
             builder.widget(
-                new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_LiquidMeter.this)
+                new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, CoverLiquidMeter.this)
                     .addFollower(
-                        CoverDataFollower_ToggleButtonWidget.ofRedstone(),
+                        CoverDataFollowerToggleButtonWidget.ofRedstone(),
                         coverData -> coverData.inverted,
                         (coverData, state) -> {
                             coverData.inverted = state;
@@ -199,7 +199,7 @@ public class GT_Cover_LiquidMeter extends GT_CoverBehaviorBase<GT_Cover_LiquidMe
                             .addTooltip(1, INVERTED)
                             .setPos(spaceX * 0, spaceY * 0))
                     .addFollower(
-                        new CoverDataFollower_NumericWidget<>(),
+                        new CoverDataFollowerNumericWidget<>(),
                         coverData -> (double) coverData.threshold,
                         (coverData, state) -> {
                             coverData.threshold = state.intValue();
@@ -218,7 +218,7 @@ public class GT_Cover_LiquidMeter extends GT_CoverBehaviorBase<GT_Cover_LiquidMe
                         .setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 1, 4 + startY + spaceY * 0))
                 .widget(
-                    new TextWidget(GT_Utility.trans("222", "Fluid threshold")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("222", "Fluid threshold")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 5 - 10, startY + spaceY * 1 + 4));
         }
 
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Metrics_Transmitter.java b/src/main/java/gregtech/common/covers/CoverMetricsTransmitter.java
index 6d3cf529d3..9715fd11f0 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Metrics_Transmitter.java
+++ b/src/main/java/gregtech/common/covers/CoverMetricsTransmitter.java
@@ -26,7 +26,7 @@ import gregtech.api.interfaces.metatileentity.IMetricsExporter;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregTechDeviceInformation;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
-import gregtech.api.util.GT_CoverBehaviorBase;
+import gregtech.api.util.CoverBehaviorBase;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.events.MetricsCoverDataEvent;
 import gregtech.common.events.MetricsCoverSelfDestructEvent;
@@ -41,8 +41,7 @@ import io.netty.buffer.ByteBuf;
  * This cover will retrieve information, preferentially, using {@link IMetricsExporter#reportMetrics()}. Absent this
  * method, it will resort to {@link BaseMetaTileEntity#getInfoData()} instead.
  */
-public class GT_Cover_Metrics_Transmitter
-    extends GT_CoverBehaviorBase<GT_Cover_Metrics_Transmitter.MetricsTransmitterData> {
+public class CoverMetricsTransmitter extends CoverBehaviorBase<CoverMetricsTransmitter.MetricsTransmitterData> {
 
     @SuppressWarnings("SpellCheckingInspection")
     public static final String FREQUENCY_MSB_KEY = "gt.metricscover.freq_msb";
@@ -52,11 +51,11 @@ public class GT_Cover_Metrics_Transmitter
     public static final String CARD_STATE_KEY = "card_state";
 
     @SuppressWarnings("unused")
-    public GT_Cover_Metrics_Transmitter() {
+    public CoverMetricsTransmitter() {
         this(null);
     }
 
-    public GT_Cover_Metrics_Transmitter(ITexture coverTexture) {
+    public CoverMetricsTransmitter(ITexture coverTexture) {
         super(MetricsTransmitterData.class, coverTexture);
     }
 
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java b/src/main/java/gregtech/common/covers/CoverNeedMaintainance.java
index cf51f9bdea..f137ce5844 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java
+++ b/src/main/java/gregtech/common/covers/CoverNeedMaintainance.java
@@ -8,27 +8,27 @@ import net.minecraftforge.fluids.Fluid;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.metatileentity.implementations.MTEMultiBlockBase;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 
-public class GT_Cover_NeedMaintainance extends GT_CoverBehavior {
+public class CoverNeedMaintainance extends CoverBehavior {
 
-    public GT_Cover_NeedMaintainance(ITexture coverTexture) {
+    public CoverNeedMaintainance(ITexture coverTexture) {
         super(coverTexture);
     }
 
     public static boolean isRotor(ItemStack rotor) {
-        return (rotor != null && rotor.getItem() instanceof GT_MetaGenerated_Tool
+        return (rotor != null && rotor.getItem() instanceof MetaGeneratedTool
             && rotor.getItemDamage() >= 170
             && rotor.getItemDamage() <= 176);
     }
@@ -45,7 +45,7 @@ public class GT_Cover_NeedMaintainance extends GT_CoverBehavior {
         boolean needsRepair = false;
         if (aTileEntity instanceof IGregTechTileEntity tTileEntity) {
             final IMetaTileEntity mTileEntity = tTileEntity.getMetaTileEntity();
-            if (mTileEntity instanceof GT_MetaTileEntity_MultiBlockBase multi) {
+            if (mTileEntity instanceof MTEMultiBlockBase multi) {
                 final int ideal = multi.getIdealStatus();
                 final int real = multi.getRepairStatus();
                 final ItemStack tRotor = multi.getRealInventory()[1];
@@ -54,8 +54,8 @@ public class GT_Cover_NeedMaintainance extends GT_CoverBehavior {
                     if (ideal - real > coverVar) needsRepair = true;
                 } else if (coverVar == 5 || coverVar == 6) {
                     if (isRotor(tRotor)) {
-                        long tMax = GT_MetaGenerated_Tool.getToolMaxDamage(tRotor);
-                        long tCur = GT_MetaGenerated_Tool.getToolDamage(tRotor);
+                        long tMax = MetaGeneratedTool.getToolMaxDamage(tRotor);
+                        long tCur = MetaGeneratedTool.getToolDamage(tRotor);
                         if (coverVar == 5) {
                             needsRepair = (tCur >= tMax * 8 / 10);
                         } else {
@@ -88,32 +88,31 @@ public class GT_Cover_NeedMaintainance extends GT_CoverBehavior {
             aCoverVariable = 13;
         }
         switch (aCoverVariable) {
-            case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("056", "Emit if 1 Maintenance Needed"));
-            case 1 -> GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("057", "Emit if 1 Maintenance Needed(inverted)"));
-            case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("058", "Emit if 2 Maintenance Needed"));
-            case 3 -> GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("059", "Emit if 2 Maintenance Needed(inverted)"));
-            case 4 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("060", "Emit if 3 Maintenance Needed"));
-            case 5 -> GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("061", "Emit if 3 Maintenance Needed(inverted)"));
-            case 6 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("062", "Emit if 4 Maintenance Needed"));
-            case 7 -> GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("063", "Emit if 4 Maintenance Needed(inverted)"));
-            case 8 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("064", "Emit if 5 Maintenance Needed"));
-            case 9 -> GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("065", "Emit if 5 Maintenance Needed(inverted)"));
-            case 10 -> GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("066", "Emit if rotor needs maintenance low accuracy mod"));
-            case 11 -> GT_Utility.sendChatToPlayer(
+            case 0 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("056", "Emit if 1 Maintenance Needed"));
+            case 1 -> GTUtility
+                .sendChatToPlayer(aPlayer, GTUtility.trans("057", "Emit if 1 Maintenance Needed(inverted)"));
+            case 2 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("058", "Emit if 2 Maintenance Needed"));
+            case 3 -> GTUtility
+                .sendChatToPlayer(aPlayer, GTUtility.trans("059", "Emit if 2 Maintenance Needed(inverted)"));
+            case 4 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("060", "Emit if 3 Maintenance Needed"));
+            case 5 -> GTUtility
+                .sendChatToPlayer(aPlayer, GTUtility.trans("061", "Emit if 3 Maintenance Needed(inverted)"));
+            case 6 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("062", "Emit if 4 Maintenance Needed"));
+            case 7 -> GTUtility
+                .sendChatToPlayer(aPlayer, GTUtility.trans("063", "Emit if 4 Maintenance Needed(inverted)"));
+            case 8 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("064", "Emit if 5 Maintenance Needed"));
+            case 9 -> GTUtility
+                .sendChatToPlayer(aPlayer, GTUtility.trans("065", "Emit if 5 Maintenance Needed(inverted)"));
+            case 10 -> GTUtility
+                .sendChatToPlayer(aPlayer, GTUtility.trans("066", "Emit if rotor needs maintenance low accuracy mod"));
+            case 11 -> GTUtility.sendChatToPlayer(
                 aPlayer,
-                GT_Utility.trans("067", "Emit if rotor needs maintenance low accuracy mod(inverted)"));
-            case 12 -> GT_Utility.sendChatToPlayer(
+                GTUtility.trans("067", "Emit if rotor needs maintenance low accuracy mod(inverted)"));
+            case 12 -> GTUtility
+                .sendChatToPlayer(aPlayer, GTUtility.trans("068", "Emit if rotor needs maintenance high accuracy mod"));
+            case 13 -> GTUtility.sendChatToPlayer(
                 aPlayer,
-                GT_Utility.trans("068", "Emit if rotor needs maintenance high accuracy mod"));
-            case 13 -> GT_Utility.sendChatToPlayer(
-                aPlayer,
-                GT_Utility.trans("069", "Emit if rotor needs maintenance high accuracy mod(inverted)"));
+                GTUtility.trans("069", "Emit if rotor needs maintenance high accuracy mod(inverted)"));
         }
         return aCoverVariable;
     }
@@ -171,7 +170,7 @@ public class GT_Cover_NeedMaintainance extends GT_CoverBehavior {
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new NeedMaintainanceUIFactory(buildContext).createWindow();
     }
 
@@ -182,74 +181,74 @@ public class GT_Cover_NeedMaintainance extends GT_CoverBehavior {
         private static final int spaceX = 18;
         private static final int spaceY = 18;
 
-        public NeedMaintainanceUIFactory(GT_CoverUIBuildContext buildContext) {
+        public NeedMaintainanceUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
         @SuppressWarnings("PointlessArithmeticExpression")
         @Override
         protected void addUIWidgets(ModularWindow.Builder builder) {
-            final String[] tooltipText = { GT_Utility.trans("056", "Emit if 1 Maintenance Needed"),
-                GT_Utility.trans("058", "Emit if 2 Maintenance Needed"),
-                GT_Utility.trans("060", "Emit if 3 Maintenance Needed"),
-                GT_Utility.trans("062", "Emit if 4 Maintenance Needed"),
-                GT_Utility.trans("064", "Emit if 5 Maintenance Needed"),
-                GT_Utility.trans("066", "Emit if rotor needs maintenance low accuracy mod"),
-                GT_Utility.trans("068", "Emit if rotor needs maintenance high accuracy mod"), };
+            final String[] tooltipText = { GTUtility.trans("056", "Emit if 1 Maintenance Needed"),
+                GTUtility.trans("058", "Emit if 2 Maintenance Needed"),
+                GTUtility.trans("060", "Emit if 3 Maintenance Needed"),
+                GTUtility.trans("062", "Emit if 4 Maintenance Needed"),
+                GTUtility.trans("064", "Emit if 5 Maintenance Needed"),
+                GTUtility.trans("066", "Emit if rotor needs maintenance low accuracy mod"),
+                GTUtility.trans("068", "Emit if rotor needs maintenance high accuracy mod"), };
 
-            final String[] buttonText = { GT_Utility.trans("247", "1 Issue"), GT_Utility.trans("248", "2 Issues"),
-                GT_Utility.trans("249", "3 Issues"), GT_Utility.trans("250", "4 Issues"),
-                GT_Utility.trans("251", "5 Issues"), GT_Utility.trans("252", "Rotor < 20%"),
-                GT_Utility.trans("253", "Rotor ≈ 0%"), GT_Utility.trans("INVERTED", "Inverted"),
-                GT_Utility.trans("NORMAL", "Normal"), };
+            final String[] buttonText = { GTUtility.trans("247", "1 Issue"), GTUtility.trans("248", "2 Issues"),
+                GTUtility.trans("249", "3 Issues"), GTUtility.trans("250", "4 Issues"),
+                GTUtility.trans("251", "5 Issues"), GTUtility.trans("252", "Rotor < 20%"),
+                GTUtility.trans("253", "Rotor ≈ 0%"), GTUtility.trans("INVERTED", "Inverted"),
+                GTUtility.trans("NORMAL", "Normal"), };
 
             builder
                 .widget(
                     new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>(
                         this::getCoverData,
                         this::setCoverData,
-                        GT_Cover_NeedMaintainance.this,
+                        CoverNeedMaintainance.this,
                         (index, coverData) -> isEnabled(index, convert(coverData)),
                         (index, coverData) -> new ISerializableObject.LegacyCoverData(
                             getNewCoverVariable(index, convert(coverData))))
                                 .addToggleButton(
                                     0,
-                                    CoverDataFollower_ToggleButtonWidget.ofCheck(),
+                                    CoverDataFollowerToggleButtonWidget.ofCheck(),
                                     widget -> widget.addTooltip(tooltipText[0])
                                         .setPos(spaceX * 0, spaceY * 0))
                                 .addToggleButton(
                                     1,
-                                    CoverDataFollower_ToggleButtonWidget.ofCheck(),
+                                    CoverDataFollowerToggleButtonWidget.ofCheck(),
                                     widget -> widget.addTooltip(tooltipText[1])
                                         .setPos(spaceX * 0, spaceY * 1))
                                 .addToggleButton(
                                     2,
-                                    CoverDataFollower_ToggleButtonWidget.ofCheck(),
+                                    CoverDataFollowerToggleButtonWidget.ofCheck(),
                                     widget -> widget.addTooltip(tooltipText[2])
                                         .setPos(spaceX * 0, spaceY * 2))
                                 .addToggleButton(
                                     3,
-                                    CoverDataFollower_ToggleButtonWidget.ofCheck(),
+                                    CoverDataFollowerToggleButtonWidget.ofCheck(),
                                     widget -> widget.addTooltip(tooltipText[3])
                                         .setPos(spaceX * 0, spaceY * 3))
                                 .addToggleButton(
                                     4,
-                                    CoverDataFollower_ToggleButtonWidget.ofCheck(),
+                                    CoverDataFollowerToggleButtonWidget.ofCheck(),
                                     widget -> widget.addTooltip(tooltipText[4])
                                         .setPos(spaceX * 4 + 4, spaceY * 0))
                                 .addToggleButton(
                                     5,
-                                    CoverDataFollower_ToggleButtonWidget.ofCheck(),
+                                    CoverDataFollowerToggleButtonWidget.ofCheck(),
                                     widget -> widget.addTooltip(tooltipText[5])
                                         .setPos(spaceX * 4 + 4, spaceY * 1))
                                 .addToggleButton(
                                     6,
-                                    CoverDataFollower_ToggleButtonWidget.ofCheck(),
+                                    CoverDataFollowerToggleButtonWidget.ofCheck(),
                                     widget -> widget.addTooltip(tooltipText[6])
                                         .setPos(spaceX * 4 + 4, spaceY * 2))
                                 .addToggleButton(
                                     7,
-                                    CoverDataFollower_ToggleButtonWidget.ofRedstone(),
+                                    CoverDataFollowerToggleButtonWidget.ofRedstone(),
                                     widget -> widget.setPos(spaceX * 4 + 4, spaceY * 3))
                                 .setPos(startX, startY))
                 .widget(
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java b/src/main/java/gregtech/common/covers/CoverPlayerDetector.java
index 600e167f2d..48fe9260bb 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java
+++ b/src/main/java/gregtech/common/covers/CoverPlayerDetector.java
@@ -8,22 +8,22 @@ import net.minecraftforge.fluids.Fluid;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 
-public class GT_Cover_PlayerDetector extends GT_CoverBehavior {
+public class CoverPlayerDetector extends CoverBehavior {
 
     private String placer = "";
     private int range = 8;
 
-    public GT_Cover_PlayerDetector(ITexture coverTexture) {
+    public CoverPlayerDetector(ITexture coverTexture) {
         super(coverTexture);
     }
 
@@ -86,9 +86,9 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior {
             aCoverVariable = 2;
         }
         switch (aCoverVariable) {
-            case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("068.1", "Emit if any Player is close"));
-            case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("069.1", "Emit if other Player is close"));
-            case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("070", "Emit if you are close"));
+            case 0 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("068.1", "Emit if any Player is close"));
+            case 1 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("069.1", "Emit if other Player is close"));
+            case 2 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("070", "Emit if you are close"));
         }
         return aCoverVariable;
     }
@@ -146,7 +146,7 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior {
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new PlayerDetectorUIFactory(buildContext).createWindow();
     }
 
@@ -157,7 +157,7 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior {
         private static final int spaceX = 18;
         private static final int spaceY = 18;
 
-        public PlayerDetectorUIFactory(GT_CoverUIBuildContext buildContext) {
+        public PlayerDetectorUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -169,33 +169,33 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior {
                     new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>(
                         this::getCoverData,
                         this::setCoverData,
-                        GT_Cover_PlayerDetector.this,
+                        CoverPlayerDetector.this,
                         (index, coverData) -> index == convert(coverData),
                         (index, coverData) -> new ISerializableObject.LegacyCoverData(index))
                             .addToggleButton(
                                 0,
-                                CoverDataFollower_ToggleButtonWidget.ofCheck(),
-                                widget -> widget.addTooltip(GT_Utility.trans("068.1", "Emit if any Player is close"))
+                                CoverDataFollowerToggleButtonWidget.ofCheck(),
+                                widget -> widget.addTooltip(GTUtility.trans("068.1", "Emit if any Player is close"))
                                     .setPos(spaceX * 0, spaceY * 0))
                             .addToggleButton(
                                 1,
-                                CoverDataFollower_ToggleButtonWidget.ofCheck(),
-                                widget -> widget.addTooltip(GT_Utility.trans("069.1", "Emit if other Player is close"))
+                                CoverDataFollowerToggleButtonWidget.ofCheck(),
+                                widget -> widget.addTooltip(GTUtility.trans("069.1", "Emit if other Player is close"))
                                     .setPos(spaceX * 0, spaceY * 1))
                             .addToggleButton(
                                 2,
-                                CoverDataFollower_ToggleButtonWidget.ofCheck(),
-                                widget -> widget.addTooltip(GT_Utility.trans("070", "Emit if you are close"))
+                                CoverDataFollowerToggleButtonWidget.ofCheck(),
+                                widget -> widget.addTooltip(GTUtility.trans("070", "Emit if you are close"))
                                     .setPos(spaceX * 0, spaceY * 2))
                             .setPos(startX, startY))
                 .widget(
-                    new TextWidget(GT_Utility.trans("319", "Any player")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("319", "Any player")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 1, 4 + startY + spaceY * 0))
                 .widget(
-                    new TextWidget(GT_Utility.trans("320", "Other players")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("320", "Other players")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 1, 4 + startY + spaceY * 1))
                 .widget(
-                    new TextWidget(GT_Utility.trans("321", "Only owner")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("321", "Only owner")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 1, 4 + startY + spaceY * 2));
         }
     }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java b/src/main/java/gregtech/common/covers/CoverPump.java
index c4671f586e..99d39dccad 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java
+++ b/src/main/java/gregtech/common/covers/CoverPump.java
@@ -11,22 +11,22 @@ import net.minecraftforge.fluids.IFluidHandler;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 
-public class GT_Cover_Pump extends GT_CoverBehavior {
+public class CoverPump extends CoverBehavior {
 
     public final int mTransferRate;
 
-    public GT_Cover_Pump(int aTransferRate, ITexture coverTexture) {
+    public CoverPump(int aTransferRate, ITexture coverTexture) {
         super(coverTexture);
         this.mTransferRate = aTransferRate;
     }
@@ -59,7 +59,7 @@ public class GT_Cover_Pump extends GT_CoverBehavior {
         IFluidHandler source = export ? current : toAccess;
         IFluidHandler dest = export ? toAccess : current;
         ForgeDirection drainSide = export ? side : side.getOpposite();
-        GT_Utility.moveFluid(source, dest, drainSide, mTransferRate, this::canTransferFluid);
+        GTUtility.moveFluid(source, dest, drainSide, mTransferRate, this::canTransferFluid);
     }
 
     protected boolean canTransferFluid(FluidStack fluid) {
@@ -74,21 +74,18 @@ public class GT_Cover_Pump extends GT_CoverBehavior {
             aCoverVariable = 11;
         }
         switch (aCoverVariable) {
-            case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("006", "Export"));
-            case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("007", "Import"));
-            case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("008", "Export (conditional)"));
-            case 3 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("009", "Import (conditional)"));
-            case 4 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("010", "Export (invert cond)"));
-            case 5 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("011", "Import (invert cond)"));
-            case 6 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("012", "Export allow Input"));
-            case 7 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("013", "Import allow Output"));
-            case 8 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("014", "Export allow Input (conditional)"));
-            case 9 -> GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("015", "Import allow Output (conditional)"));
-            case 10 -> GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("016", "Export allow Input (invert cond)"));
-            case 11 -> GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("017", "Import allow Output (invert cond)"));
+            case 0 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("006", "Export"));
+            case 1 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("007", "Import"));
+            case 2 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("008", "Export (conditional)"));
+            case 3 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("009", "Import (conditional)"));
+            case 4 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("010", "Export (invert cond)"));
+            case 5 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("011", "Import (invert cond)"));
+            case 6 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("012", "Export allow Input"));
+            case 7 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("013", "Import allow Output"));
+            case 8 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("014", "Export allow Input (conditional)"));
+            case 9 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("015", "Import allow Output (conditional)"));
+            case 10 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("016", "Export allow Input (invert cond)"));
+            case 11 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("017", "Import allow Output (invert cond)"));
         }
         return aCoverVariable;
     }
@@ -165,7 +162,7 @@ public class GT_Cover_Pump extends GT_CoverBehavior {
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new PumpUIFactory(buildContext).createWindow();
     }
 
@@ -176,10 +173,10 @@ public class GT_Cover_Pump extends GT_CoverBehavior {
         private static final int spaceX = 18;
         private static final int spaceY = 18;
 
-        private CoverDataFollower_ToggleButtonWidget<ISerializableObject.LegacyCoverData> mBlockWidget = null;
-        private CoverDataFollower_ToggleButtonWidget<ISerializableObject.LegacyCoverData> mAllowWidget = null;
+        private CoverDataFollowerToggleButtonWidget<ISerializableObject.LegacyCoverData> mBlockWidget = null;
+        private CoverDataFollowerToggleButtonWidget<ISerializableObject.LegacyCoverData> mAllowWidget = null;
 
-        public PumpUIFactory(GT_CoverUIBuildContext buildContext) {
+        public PumpUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -190,86 +187,86 @@ public class GT_Cover_Pump extends GT_CoverBehavior {
                 new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>(
                     this::getCoverData,
                     this::setCoverData,
-                    GT_Cover_Pump.this,
+                    CoverPump.this,
                     (id, coverData) -> !getClickable(id, convert(coverData)),
                     (id, coverData) -> new ISerializableObject.LegacyCoverData(
                         getNewCoverVariable(id, convert(coverData))))
                             .addToggleButton(
                                 0,
-                                CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                                widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EXPORT)
-                                    .addTooltip(GT_Utility.trans("006", "Export"))
+                                CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                                widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_EXPORT)
+                                    .addTooltip(GTUtility.trans("006", "Export"))
                                     .setPos(spaceX * 0, spaceY * 0))
                             .addToggleButton(
                                 1,
-                                CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                                widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_IMPORT)
-                                    .addTooltip(GT_Utility.trans("007", "Import"))
+                                CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                                widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_IMPORT)
+                                    .addTooltip(GTUtility.trans("007", "Import"))
                                     .setPos(spaceX * 1, spaceY * 0))
                             .addToggleButton(
                                 2,
-                                CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                                widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK)
-                                    .addTooltip(GT_Utility.trans("224", "Always On"))
+                                CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                                widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_CHECKMARK)
+                                    .addTooltip(GTUtility.trans("224", "Always On"))
                                     .setPos(spaceX * 0, spaceY * 1))
                             .addToggleButton(
                                 3,
-                                CoverDataFollower_ToggleButtonWidget.ofDisableable(),
-                                widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_USE_PROCESSING_STATE)
-                                    .addTooltip(GT_Utility.trans("343", "Use Machine Processing State"))
+                                CoverDataFollowerToggleButtonWidget.ofDisableable(),
+                                widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_USE_PROCESSING_STATE)
+                                    .addTooltip(GTUtility.trans("343", "Use Machine Processing State"))
                                     .setPos(spaceX * 1, spaceY * 1))
                             .addToggleButton(
                                 4,
-                                CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                                CoverDataFollowerToggleButtonWidget.ofDisableable(),
                                 widget -> widget
-                                    .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_USE_INVERTED_PROCESSING_STATE)
-                                    .addTooltip(GT_Utility.trans("343.1", "Use Inverted Machine Processing State"))
+                                    .setStaticTexture(GTUITextures.OVERLAY_BUTTON_USE_INVERTED_PROCESSING_STATE)
+                                    .addTooltip(GTUtility.trans("343.1", "Use Inverted Machine Processing State"))
                                     .setPos(spaceX * 2, spaceY * 1))
-                            .addToggleButton(5, CoverDataFollower_ToggleButtonWidget.ofDisableable(), widget -> {
+                            .addToggleButton(5, CoverDataFollowerToggleButtonWidget.ofDisableable(), widget -> {
                                 mAllowWidget = widget;
                                 widget.setTextureGetter(i -> {
                                     ISerializableObject.LegacyCoverData coverData = getCoverData();
                                     return coverData == null || coverData.get() % 2 == 0
-                                        ? GT_UITextures.OVERLAY_BUTTON_ALLOW_INPUT
-                                        : GT_UITextures.OVERLAY_BUTTON_ALLOW_OUTPUT;
+                                        ? GTUITextures.OVERLAY_BUTTON_ALLOW_INPUT
+                                        : GTUITextures.OVERLAY_BUTTON_ALLOW_OUTPUT;
                                 })
                                     .dynamicTooltip(() -> {
                                         ISerializableObject.LegacyCoverData coverData = getCoverData();
                                         return Arrays.asList(
                                             coverData == null || coverData.get() % 2 == 0
-                                                ? GT_Utility.trans("314", "Allow Input")
-                                                : GT_Utility.trans("312", "Allow Output"));
+                                                ? GTUtility.trans("314", "Allow Input")
+                                                : GTUtility.trans("312", "Allow Output"));
                                     })
                                     .setPos(spaceX * 0, spaceY * 2);
                             })
-                            .addToggleButton(6, CoverDataFollower_ToggleButtonWidget.ofDisableable(), widget -> {
+                            .addToggleButton(6, CoverDataFollowerToggleButtonWidget.ofDisableable(), widget -> {
                                 mBlockWidget = widget;
                                 widget.setTextureGetter(i -> {
                                     ISerializableObject.LegacyCoverData coverData = getCoverData();
                                     return coverData == null || coverData.get() % 2 == 0
-                                        ? GT_UITextures.OVERLAY_BUTTON_BLOCK_INPUT
-                                        : GT_UITextures.OVERLAY_BUTTON_BLOCK_OUTPUT;
+                                        ? GTUITextures.OVERLAY_BUTTON_BLOCK_INPUT
+                                        : GTUITextures.OVERLAY_BUTTON_BLOCK_OUTPUT;
                                 })
                                     .dynamicTooltip(() -> {
                                         ISerializableObject.LegacyCoverData coverData = getCoverData();
                                         return Arrays.asList(
                                             coverData == null || coverData.get() % 2 == 0
-                                                ? GT_Utility.trans("313", "Block Input")
-                                                : GT_Utility.trans("311", "Block Output"));
+                                                ? GTUtility.trans("313", "Block Input")
+                                                : GTUtility.trans("311", "Block Output"));
                                     })
                                     .setPos(spaceX * 1, spaceY * 2);
                             })
                             .setPos(startX, startY))
                 .widget(
-                    new TextWidget(GT_Utility.trans("229", "Export/Import")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("229", "Export/Import")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 3, 4 + startY + spaceY * 0))
                 .widget(
-                    new TextWidget(GT_Utility.trans("230", "Conditional")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("230", "Conditional")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 3, 4 + startY + spaceY * 1))
                 .widget(TextWidget.dynamicString(() -> {
                     ISerializableObject.LegacyCoverData coverData = getCoverData();
-                    return coverData == null || coverData.get() % 2 == 0 ? GT_Utility.trans("344", "Input Blocking")
-                        : GT_Utility.trans("344.1", "Output Blocking");
+                    return coverData == null || coverData.get() % 2 == 0 ? GTUtility.trans("344", "Input Blocking")
+                        : GTUtility.trans("344.1", "Output Blocking");
                 })
                     .setSynced(false)
                     .setDefaultColor(COLOR_TEXT_GRAY.get())
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java b/src/main/java/gregtech/common/covers/CoverRedstoneConductor.java
index edaec13a81..a85a20b703 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java
+++ b/src/main/java/gregtech/common/covers/CoverRedstoneConductor.java
@@ -6,13 +6,13 @@ import net.minecraftforge.fluids.Fluid;
 
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.GTUtility;
 
 @SuppressWarnings("unused") // Legacy from GT4. TODO: Consider re-enable registration
-public class GT_Cover_RedstoneConductor extends GT_CoverBehavior {
+public class CoverRedstoneConductor extends CoverBehavior {
 
-    GT_Cover_RedstoneConductor(ITexture coverTexture) {
+    CoverRedstoneConductor(ITexture coverTexture) {
         super(coverTexture);
     }
 
@@ -43,13 +43,13 @@ public class GT_Cover_RedstoneConductor extends GT_CoverBehavior {
             aCoverVariable = 6;
         }
         switch (aCoverVariable) {
-            case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("071", "Conducts strongest Input"));
-            case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("072", "Conducts from bottom Input"));
-            case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("073", "Conducts from top Input"));
-            case 3 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("074", "Conducts from north Input"));
-            case 4 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("075", "Conducts from south Input"));
-            case 5 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("076", "Conducts from west Input"));
-            case 6 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("077", "Conducts from east Input"));
+            case 0 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("071", "Conducts strongest Input"));
+            case 1 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("072", "Conducts from bottom Input"));
+            case 2 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("073", "Conducts from top Input"));
+            case 3 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("074", "Conducts from north Input"));
+            case 4 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("075", "Conducts from south Input"));
+            case 5 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("076", "Conducts from west Input"));
+            case 6 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("077", "Conducts from east Input"));
         }
         return aCoverVariable;
     }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverExternal.java b/src/main/java/gregtech/common/covers/CoverRedstoneReceiverExternal.java
index eabf90f4de..aeaacb3404 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverExternal.java
+++ b/src/main/java/gregtech/common/covers/CoverRedstoneReceiverExternal.java
@@ -2,13 +2,13 @@ package gregtech.common.covers;
 
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 
-public class GT_Cover_RedstoneReceiverExternal extends GT_Cover_RedstoneWirelessBase {
+public class CoverRedstoneReceiverExternal extends CoverRedstoneWirelessBase {
 
-    public GT_Cover_RedstoneReceiverExternal(ITexture coverTexture) {
+    public CoverRedstoneReceiverExternal(ITexture coverTexture) {
         super(coverTexture);
     }
 
@@ -23,8 +23,8 @@ public class GT_Cover_RedstoneReceiverExternal extends GT_Cover_RedstoneWireless
         ICoverable aTileEntity, long aTimer) {
         aTileEntity.setOutputRedstoneSignal(
             side,
-            GregTech_API.sWirelessRedstone.get(aCoverVariable) == null ? 0
-                : GregTech_API.sWirelessRedstone.get(aCoverVariable));
+            GregTechAPI.sWirelessRedstone.get(aCoverVariable) == null ? 0
+                : GregTechAPI.sWirelessRedstone.get(aCoverVariable));
         return aCoverVariable;
     }
 
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverInternal.java b/src/main/java/gregtech/common/covers/CoverRedstoneReceiverInternal.java
index 3edd7f7e43..0fc5802ba4 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverInternal.java
+++ b/src/main/java/gregtech/common/covers/CoverRedstoneReceiverInternal.java
@@ -2,15 +2,15 @@ package gregtech.common.covers;
 
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
 import gregtech.api.util.ISerializableObject;
 
-public class GT_Cover_RedstoneReceiverInternal extends GT_Cover_RedstoneWirelessBase {
+public class CoverRedstoneReceiverInternal extends CoverRedstoneWirelessBase {
 
-    public GT_Cover_RedstoneReceiverInternal(ITexture coverTexture) {
+    public CoverRedstoneReceiverInternal(ITexture coverTexture) {
         super(coverTexture);
     }
 
@@ -35,8 +35,8 @@ public class GT_Cover_RedstoneReceiverInternal extends GT_Cover_RedstoneWireless
     @Override
     public byte getRedstoneInput(ForgeDirection side, byte aInputRedstone, int aCoverID, int aCoverVariable,
         ICoverable aTileEntity) {
-        return GregTech_API.sWirelessRedstone.get(aCoverVariable) == null ? 0
-            : GregTech_API.sWirelessRedstone.get(aCoverVariable);
+        return GregTechAPI.sWirelessRedstone.get(aCoverVariable) == null ? 0
+            : GregTechAPI.sWirelessRedstone.get(aCoverVariable);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java b/src/main/java/gregtech/common/covers/CoverRedstoneSignalizer.java
index 4eead134c8..0f3937044a 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java
+++ b/src/main/java/gregtech/common/covers/CoverRedstoneSignalizer.java
@@ -7,13 +7,13 @@ import net.minecraftforge.fluids.Fluid;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.GTUtility;
 
 @SuppressWarnings("unused") // TODO: Consider re-registering this
-public class GT_Cover_RedstoneSignalizer extends GT_CoverBehavior {
+public class CoverRedstoneSignalizer extends CoverBehavior {
 
-    GT_Cover_RedstoneSignalizer(ITexture coverTexture) {
+    CoverRedstoneSignalizer(ITexture coverTexture) {
         super(coverTexture);
     }
 
@@ -28,13 +28,12 @@ public class GT_Cover_RedstoneSignalizer extends GT_CoverBehavior {
         EntityPlayer aPlayer, float aX, float aY, float aZ) {
         aCoverVariable = (aCoverVariable + 1) % 48;
         switch (aCoverVariable / 16) {
-            case 0 -> GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("078", "Signal = ") + (aCoverVariable & 0xF));
-            case 1 -> GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("079", "Conditional Signal = ") + (aCoverVariable & 0xF));
-            case 2 -> GT_Utility.sendChatToPlayer(
+            case 0 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("078", "Signal = ") + (aCoverVariable & 0xF));
+            case 1 -> GTUtility
+                .sendChatToPlayer(aPlayer, GTUtility.trans("079", "Conditional Signal = ") + (aCoverVariable & 0xF));
+            case 2 -> GTUtility.sendChatToPlayer(
                 aPlayer,
-                GT_Utility.trans("080", "Inverted Conditional Signal = ") + (aCoverVariable & 0xF));
+                GTUtility.trans("080", "Inverted Conditional Signal = ") + (aCoverVariable & 0xF));
         }
         return aCoverVariable;
     }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterExternal.java b/src/main/java/gregtech/common/covers/CoverRedstoneTransmitterExternal.java
index 1ee0a05837..130ba4c5d7 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterExternal.java
+++ b/src/main/java/gregtech/common/covers/CoverRedstoneTransmitterExternal.java
@@ -3,15 +3,15 @@ package gregtech.common.covers;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.covers.IControlsWorkCover;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.util.ISerializableObject;
 
-public class GT_Cover_RedstoneTransmitterExternal extends GT_Cover_RedstoneWirelessBase {
+public class CoverRedstoneTransmitterExternal extends CoverRedstoneWirelessBase {
 
-    public GT_Cover_RedstoneTransmitterExternal(ITexture coverTexture) {
+    public CoverRedstoneTransmitterExternal(ITexture coverTexture) {
         super(coverTexture);
     }
 
@@ -20,7 +20,7 @@ public class GT_Cover_RedstoneTransmitterExternal extends GT_Cover_RedstoneWirel
         ICoverable aTileEntity, long aTimer) {
         // TODO remove next line after 2.3.0
         if (!IControlsWorkCover.makeSureOnlyOne(side, aTileEntity)) return aCoverVariable;
-        GregTech_API.sWirelessRedstone.put(aCoverVariable, aInputRedstone);
+        GregTechAPI.sWirelessRedstone.put(aCoverVariable, aInputRedstone);
         return aCoverVariable;
     }
 
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java b/src/main/java/gregtech/common/covers/CoverRedstoneTransmitterInternal.java
index a812a49990..10a63a6642 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java
+++ b/src/main/java/gregtech/common/covers/CoverRedstoneTransmitterInternal.java
@@ -2,13 +2,13 @@ package gregtech.common.covers;
 
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 
-public class GT_Cover_RedstoneTransmitterInternal extends GT_Cover_RedstoneWirelessBase {
+public class CoverRedstoneTransmitterInternal extends CoverRedstoneWirelessBase {
 
-    public GT_Cover_RedstoneTransmitterInternal(ITexture coverTexture) {
+    public CoverRedstoneTransmitterInternal(ITexture coverTexture) {
         super(coverTexture);
     }
 
@@ -21,7 +21,7 @@ public class GT_Cover_RedstoneTransmitterInternal extends GT_Cover_RedstoneWirel
     @Override
     public int doCoverThings(ForgeDirection side, byte aInputRedstone, int aCoverID, int aCoverVariable,
         ICoverable aTileEntity, long aTimer) {
-        GregTech_API.sWirelessRedstone.put(aCoverVariable, aTileEntity.getOutputRedstoneSignal(side));
+        GregTechAPI.sWirelessRedstone.put(aCoverVariable, aTileEntity.getOutputRedstoneSignal(side));
         return aCoverVariable;
     }
 
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java b/src/main/java/gregtech/common/covers/CoverRedstoneWirelessBase.java
index 54d025898a..0ec962fc02 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java
+++ b/src/main/java/gregtech/common/covers/CoverRedstoneWirelessBase.java
@@ -7,32 +7,32 @@ import net.minecraftforge.fluids.Fluid;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
+import gregtech.api.GregTechAPI;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_NumericWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerNumericWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 
-public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior {
+public abstract class CoverRedstoneWirelessBase extends CoverBehavior {
 
     private static final int MAX_CHANNEL = 65535;
     private static final int PRIVATE_MASK = 0xFFFE0000;
     private static final int PUBLIC_MASK = 0x0000FFFF;
     private static final int CHECKBOX_MASK = 0x00010000;
 
-    public GT_Cover_RedstoneWirelessBase(ITexture coverTexture) {
+    public CoverRedstoneWirelessBase(ITexture coverTexture) {
         super(coverTexture);
     }
 
     @Override
     public boolean onCoverRemoval(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
         boolean aForced) {
-        GregTech_API.sWirelessRedstone.put(aCoverVariable, (byte) 0);
+        GregTechAPI.sWirelessRedstone.put(aCoverVariable, (byte) 0);
         return true;
     }
 
@@ -41,11 +41,11 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior {
         ISerializableObject.LegacyCoverData aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX,
         float aY, float aZ) {
         if (((aX > 0.375D) && (aX < 0.625D)) || ((side.offsetX != 0) && ((aY > 0.375D) && (aY < 0.625D)))) {
-            GregTech_API.sWirelessRedstone.put(aCoverVariable.get(), (byte) 0);
+            GregTechAPI.sWirelessRedstone.put(aCoverVariable.get(), (byte) 0);
             aCoverVariable.set(
                 (aCoverVariable.get() & (PRIVATE_MASK | CHECKBOX_MASK))
-                    | (((Integer) GT_Utility.stackToInt(aPlayer.inventory.getCurrentItem())).hashCode() & PUBLIC_MASK));
-            GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("081", "Frequency: ") + aCoverVariable);
+                    | (((Integer) GTUtility.stackToInt(aPlayer.inventory.getCurrentItem())).hashCode() & PUBLIC_MASK));
+            GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("081", "Frequency: ") + aCoverVariable);
             return true;
         }
         return false;
@@ -56,17 +56,15 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior {
     public boolean onCoverRightclick(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
         EntityPlayer aPlayer, float aX, float aY, float aZ) {
         if (((aX > 0.375D) && (aX < 0.625D)) || ((side.offsetX != 0) && ((aY > 0.375D) && (aY < 0.625D)))) {
-            GregTech_API.sWirelessRedstone.put(aCoverVariable, (byte) 0);
+            GregTechAPI.sWirelessRedstone.put(aCoverVariable, (byte) 0);
 
-            int val = GT_Utility.stackToInt(aPlayer.inventory.getCurrentItem())
-                * (1 + aPlayer.inventory.getCurrentItem()
-                    .getItemDamage());
+            int val = GTUtility.stackToInt(aPlayer.inventory.getCurrentItem()) * (1 + aPlayer.inventory.getCurrentItem()
+                .getItemDamage());
 
             aCoverVariable = (aCoverVariable & (PRIVATE_MASK | CHECKBOX_MASK)) | (val & PUBLIC_MASK);
 
             aTileEntity.setCoverDataAtSide(side, aCoverVariable);
-            GT_Utility
-                .sendChatToPlayer(aPlayer, GT_Utility.trans("081", "Frequency: ") + (aCoverVariable & PUBLIC_MASK));
+            GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("081", "Frequency: ") + (aCoverVariable & PUBLIC_MASK));
             return true;
         }
         return false;
@@ -83,8 +81,8 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior {
         EntityPlayer aPlayer, float aX, float aY, float aZ) {
         if (((aX > 0.375D) && (aX < 0.625D))
             || ((side.offsetX == 0) || (((aY > 0.375D) && (aY < 0.625D)) || ((((aZ <= 0.375D) || (aZ >= 0.625D))))))) {
-            GregTech_API.sWirelessRedstone.put(aCoverVariable, (byte) 0);
-            final float[] tCoords = GT_Utility.getClickedFacingCoords(side, aX, aY, aZ);
+            GregTechAPI.sWirelessRedstone.put(aCoverVariable, (byte) 0);
+            final float[] tCoords = GTUtility.getClickedFacingCoords(side, aX, aY, aZ);
 
             final short tAdjustVal = switch ((byte) ((byte) (int) (tCoords[0] * 2.0F)
                 + 2 * (byte) (int) (tCoords[1] * 2.0F))) {
@@ -105,7 +103,7 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior {
                 aCoverVariable = (aCoverVariable & (PRIVATE_MASK | CHECKBOX_MASK)) | tPublicChannel;
             }
         }
-        GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("081", "Frequency: ") + (aCoverVariable & PUBLIC_MASK));
+        GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("081", "Frequency: ") + (aCoverVariable & PUBLIC_MASK));
         return aCoverVariable;
     }
 
@@ -145,7 +143,7 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior {
 
     @Override
     public String getDescription(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
-        return GT_Utility.trans("081", "Frequency: ") + aCoverVariable;
+        return GTUtility.trans("081", "Frequency: ") + aCoverVariable;
     }
 
     @Override
@@ -161,7 +159,7 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior {
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new RedstoneWirelessBaseUIFactory(buildContext).createWindow();
     }
 
@@ -172,7 +170,7 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior {
         private static final int spaceX = 18;
         private static final int spaceY = 18;
 
-        public RedstoneWirelessBaseUIFactory(GT_CoverUIBuildContext buildContext) {
+        public RedstoneWirelessBaseUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -184,35 +182,31 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior {
         @SuppressWarnings("PointlessArithmeticExpression")
         @Override
         protected void addUIWidgets(ModularWindow.Builder builder) {
-            builder
+            builder.widget(
+                new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, CoverRedstoneWirelessBase.this)
+
+                    .addFollower(
+                        new CoverDataFollowerNumericWidget<>(),
+                        coverData -> (double) getFlagFrequency(convert(coverData)),
+                        (coverData, state) -> new ISerializableObject.LegacyCoverData(
+                            state.intValue() | getFlagCheckbox(convert(coverData))),
+                        widget -> widget.setBounds(0, MAX_CHANNEL)
+                            .setScrollValues(1, 1000, 10)
+                            .setFocusOnGuiOpen(true)
+                            .setPos(spaceX * 0, spaceY * 0 + 2)
+                            .setSize(spaceX * 4 - 3, 12))
+                    .addFollower(
+                        CoverDataFollowerToggleButtonWidget.ofCheck(),
+                        coverData -> getFlagCheckbox(convert(coverData)) > 0,
+                        (coverData, state) -> new ISerializableObject.LegacyCoverData(
+                            getFlagFrequency(convert(coverData)) | (state ? CHECKBOX_MASK : 0)),
+                        widget -> widget.setPos(spaceX * 0, spaceY * 2))
+                    .setPos(startX, startY))
                 .widget(
-                    new CoverDataControllerWidget<>(
-                        this::getCoverData,
-                        this::setCoverData,
-                        GT_Cover_RedstoneWirelessBase.this)
-
-                            .addFollower(
-                                new CoverDataFollower_NumericWidget<>(),
-                                coverData -> (double) getFlagFrequency(convert(coverData)),
-                                (coverData, state) -> new ISerializableObject.LegacyCoverData(
-                                    state.intValue() | getFlagCheckbox(convert(coverData))),
-                                widget -> widget.setBounds(0, MAX_CHANNEL)
-                                    .setScrollValues(1, 1000, 10)
-                                    .setFocusOnGuiOpen(true)
-                                    .setPos(spaceX * 0, spaceY * 0 + 2)
-                                    .setSize(spaceX * 4 - 3, 12))
-                            .addFollower(
-                                CoverDataFollower_ToggleButtonWidget.ofCheck(),
-                                coverData -> getFlagCheckbox(convert(coverData)) > 0,
-                                (coverData, state) -> new ISerializableObject.LegacyCoverData(
-                                    getFlagFrequency(convert(coverData)) | (state ? CHECKBOX_MASK : 0)),
-                                widget -> widget.setPos(spaceX * 0, spaceY * 2))
-                            .setPos(startX, startY))
-                .widget(
-                    new TextWidget(GT_Utility.trans("246", "Frequency")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("246", "Frequency")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 4, 4 + startY + spaceY * 0))
                 .widget(
-                    new TextWidget(GT_Utility.trans("602", "Use Private Frequency"))
+                    new TextWidget(GTUtility.trans("602", "Use Private Frequency"))
                         .setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 1, startY + spaceY * 2 + 4));
         }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Screen.java b/src/main/java/gregtech/common/covers/CoverScreen.java
index fab2b81b0b..09f45730d8 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Screen.java
+++ b/src/main/java/gregtech/common/covers/CoverScreen.java
@@ -6,11 +6,11 @@ import net.minecraftforge.fluids.Fluid;
 
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_CoverBehavior;
+import gregtech.api.util.CoverBehavior;
 
-public class GT_Cover_Screen extends GT_CoverBehavior {
+public class CoverScreen extends CoverBehavior {
 
-    public GT_Cover_Screen(ITexture coverTexture) {
+    public CoverScreen(ITexture coverTexture) {
         super(coverTexture);
     }
 
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java b/src/main/java/gregtech/common/covers/CoverShutter.java
index 40fad1c537..480062d430 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java
+++ b/src/main/java/gregtech/common/covers/CoverShutter.java
@@ -7,20 +7,20 @@ import net.minecraftforge.fluids.Fluid;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 
-public class GT_Cover_Shutter extends GT_CoverBehavior {
+public class CoverShutter extends CoverBehavior {
 
-    public GT_Cover_Shutter(ITexture coverTexture) {
+    public CoverShutter(ITexture coverTexture) {
         super(coverTexture);
     }
 
@@ -44,10 +44,10 @@ public class GT_Cover_Shutter extends GT_CoverBehavior {
             aCoverVariable = 3;
         }
         switch (aCoverVariable) {
-            case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("082", "Open if work enabled"));
-            case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("083", "Open if work disabled"));
-            case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("084", "Only Output allowed"));
-            case 3 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("085", "Only Input allowed"));
+            case 0 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("082", "Open if work enabled"));
+            case 1 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("083", "Open if work disabled"));
+            case 2 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("084", "Only Output allowed"));
+            case 3 -> GTUtility.sendChatToPlayer(aPlayer, GTUtility.trans("085", "Only Input allowed"));
         }
         if (aTileEntity instanceof BaseMetaPipeEntity) {
             ((BaseMetaPipeEntity) aTileEntity).reloadLocks();
@@ -133,7 +133,7 @@ public class GT_Cover_Shutter extends GT_CoverBehavior {
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new ShutterUIFactory(buildContext).createWindow();
     }
 
@@ -144,7 +144,7 @@ public class GT_Cover_Shutter extends GT_CoverBehavior {
         private static final int spaceX = 18;
         private static final int spaceY = 18;
 
-        public ShutterUIFactory(GT_CoverUIBuildContext buildContext) {
+        public ShutterUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -156,40 +156,39 @@ public class GT_Cover_Shutter extends GT_CoverBehavior {
                     new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>(
                         this::getCoverData,
                         this::setCoverData,
-                        GT_Cover_Shutter.this,
+                        CoverShutter.this,
                         (index, coverData) -> index == convert(coverData),
                         (index, coverData) -> new ISerializableObject.LegacyCoverData(index))
                             .addToggleButton(
                                 0,
-                                CoverDataFollower_ToggleButtonWidget.ofCheck(),
+                                CoverDataFollowerToggleButtonWidget.ofCheck(),
                                 widget -> widget.setPos(spaceX * 0, spaceY * 0))
                             .addToggleButton(
                                 1,
-                                CoverDataFollower_ToggleButtonWidget.ofCheck(),
+                                CoverDataFollowerToggleButtonWidget.ofCheck(),
                                 widget -> widget.setPos(spaceX * 0, spaceY * 1))
                             .addToggleButton(
                                 2,
-                                CoverDataFollower_ToggleButtonWidget.ofCheck(),
+                                CoverDataFollowerToggleButtonWidget.ofCheck(),
                                 widget -> widget.setPos(spaceX * 0, spaceY * 2))
                             .addToggleButton(
                                 3,
-                                CoverDataFollower_ToggleButtonWidget.ofCheck(),
+                                CoverDataFollowerToggleButtonWidget.ofCheck(),
                                 widget -> widget.setPos(spaceX * 0, spaceY * 3))
                             .setPos(startX, startY))
                 .widget(
-                    new TextWidget(GT_Utility.trans("082", "Open if work enabled"))
+                    new TextWidget(GTUtility.trans("082", "Open if work enabled"))
                         .setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 0))
                 .widget(
-                    new TextWidget(GT_Utility.trans("083", "Open if work disabled"))
+                    new TextWidget(GTUtility.trans("083", "Open if work disabled"))
                         .setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 1))
                 .widget(
-                    new TextWidget(GT_Utility.trans("084", "Only Output allowed"))
-                        .setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("084", "Only Output allowed")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 2))
                 .widget(
-                    new TextWidget(GT_Utility.trans("085", "Only Input allowed")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("085", "Only Input allowed")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 3));
         }
     }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java b/src/main/java/gregtech/common/covers/CoverSolarPanel.java
index 4b88a90194..f0b544633d 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java
+++ b/src/main/java/gregtech/common/covers/CoverSolarPanel.java
@@ -8,15 +8,15 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 
-public class GT_Cover_SolarPanel extends GT_CoverBehavior {
+public class CoverSolarPanel extends CoverBehavior {
 
     private final int mVoltage;
 
-    public GT_Cover_SolarPanel(int aVoltage) {
+    public CoverSolarPanel(int aVoltage) {
         this.mVoltage = aVoltage;
     }
 
@@ -75,7 +75,7 @@ public class GT_Cover_SolarPanel extends GT_CoverBehavior {
         ISerializableObject.LegacyCoverData aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX,
         float aY, float aZ) {
         if (aPlayer.capabilities.isCreativeMode) {
-            GT_Utility.sendChatToPlayer(aPlayer, "Cleaned solar panel from " + (aCoverVariable.get() >> 2) + "% dirt");
+            GTUtility.sendChatToPlayer(aPlayer, "Cleaned solar panel from " + (aCoverVariable.get() >> 2) + "% dirt");
             aCoverVariable.set(aCoverVariable.get() & 0x3);
             return true;
         }
@@ -86,13 +86,13 @@ public class GT_Cover_SolarPanel extends GT_CoverBehavior {
                 .equals(new ItemStack(Items.water_bucket).getUnlocalizedName())) {
                 aPlayer.inventory.mainInventory[i] = new ItemStack(Items.bucket);
                 if (aPlayer.inventoryContainer != null) aPlayer.inventoryContainer.detectAndSendChanges();
-                GT_Utility
+                GTUtility
                     .sendChatToPlayer(aPlayer, "Cleaned solar panel from " + (aCoverVariable.get() >> 2) + "% dirt");
                 aCoverVariable.set(aCoverVariable.get() & 0x3);
                 return true;
             }
         }
-        GT_Utility.sendChatToPlayer(aPlayer, "You need water bucket in inventory to clean the panel.");
+        GTUtility.sendChatToPlayer(aPlayer, "You need water bucket in inventory to clean the panel.");
         return false;
     }
 
@@ -101,7 +101,7 @@ public class GT_Cover_SolarPanel extends GT_CoverBehavior {
     public boolean onCoverRightclick(ForgeDirection side, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
         EntityPlayer aPlayer, float aX, float aY, float aZ) {
         if (aPlayer.capabilities.isCreativeMode) {
-            GT_Utility.sendChatToPlayer(aPlayer, "Cleaned solar panel from " + (aCoverVariable >> 2) + "% dirt");
+            GTUtility.sendChatToPlayer(aPlayer, "Cleaned solar panel from " + (aCoverVariable >> 2) + "% dirt");
             aTileEntity.setCoverDataAtSide(side, (aCoverVariable & 0x3));
             return true;
         }
@@ -112,12 +112,12 @@ public class GT_Cover_SolarPanel extends GT_CoverBehavior {
                 .equals(new ItemStack(Items.water_bucket).getUnlocalizedName())) {
                 aPlayer.inventory.mainInventory[i] = new ItemStack(Items.bucket);
                 if (aPlayer.inventoryContainer != null) aPlayer.inventoryContainer.detectAndSendChanges();
-                GT_Utility.sendChatToPlayer(aPlayer, "Cleaned solar panel from " + (aCoverVariable >> 2) + "% dirt");
+                GTUtility.sendChatToPlayer(aPlayer, "Cleaned solar panel from " + (aCoverVariable >> 2) + "% dirt");
                 aTileEntity.setCoverDataAtSide(side, (aCoverVariable & 0x3));
                 return true;
             }
         }
-        GT_Utility.sendChatToPlayer(aPlayer, "You need water bucket in inventory to clean the panel.");
+        GTUtility.sendChatToPlayer(aPlayer, "You need water bucket in inventory to clean the panel.");
         return false;
     }
 
diff --git a/src/main/java/gregtech/common/covers/CoverSteamRegulator.java b/src/main/java/gregtech/common/covers/CoverSteamRegulator.java
new file mode 100644
index 0000000000..413e835ad2
--- /dev/null
+++ b/src/main/java/gregtech/common/covers/CoverSteamRegulator.java
@@ -0,0 +1,18 @@
+package gregtech.common.covers;
+
+import net.minecraftforge.fluids.FluidStack;
+
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.util.GTModHandler;
+
+public class CoverSteamRegulator extends CoverFluidRegulator {
+
+    public CoverSteamRegulator(int aTransferRate, ITexture coverTexture) {
+        super(aTransferRate, coverTexture);
+    }
+
+    @Override
+    protected boolean canTransferFluid(FluidStack fluid) {
+        return GTModHandler.isAnySteam(fluid) || GTModHandler.isSuperHeatedSteam(fluid);
+    }
+}
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_SteamValve.java b/src/main/java/gregtech/common/covers/CoverSteamValve.java
index 5787a99c0b..329cf634a7 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_SteamValve.java
+++ b/src/main/java/gregtech/common/covers/CoverSteamValve.java
@@ -5,11 +5,11 @@ import net.minecraftforge.fluids.FluidStack;
 
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GTModHandler;
 
-public class GT_Cover_SteamValve extends GT_Cover_Pump {
+public class CoverSteamValve extends CoverPump {
 
-    public GT_Cover_SteamValve(int aTransferRate, ITexture coverTexture) {
+    public CoverSteamValve(int aTransferRate, ITexture coverTexture) {
         super(aTransferRate, coverTexture);
     }
 
@@ -21,6 +21,6 @@ public class GT_Cover_SteamValve extends GT_Cover_Pump {
 
     @Override
     protected boolean canTransferFluid(FluidStack fluid) {
-        return GT_ModHandler.isAnySteam(fluid) || GT_ModHandler.isSuperHeatedSteam(fluid);
+        return GTModHandler.isAnySteam(fluid) || GTModHandler.isSuperHeatedSteam(fluid);
     }
 }
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Vent.java b/src/main/java/gregtech/common/covers/CoverVent.java
index e2be64b475..02907da4c2 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Vent.java
+++ b/src/main/java/gregtech/common/covers/CoverVent.java
@@ -13,16 +13,16 @@ import net.minecraftforge.fluids.IFluidHandler;
 
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehavior;
+import gregtech.api.util.GTUtility;
 
-public class GT_Cover_Vent extends GT_CoverBehavior {
+public class CoverVent extends CoverBehavior {
 
     private final int mEfficiency;
     private final Fluid IC2_HOT_COOLANT = FluidRegistry.getFluid("ic2hotcoolant");
     private final Fluid IC2_COOLANT = FluidRegistry.getFluid("ic2coolant");
 
-    public GT_Cover_Vent(int aEfficiency) {
+    public CoverVent(int aEfficiency) {
         this.mEfficiency = aEfficiency;
     }
 
@@ -63,7 +63,7 @@ public class GT_Cover_Vent extends GT_CoverBehavior {
         final int offsetZ = aTileEntity.getOffsetZ(side, 1);
         final World world = aTileEntity.getWorld();
         if (aTileEntity.hasThingsToDo() && aCoverVariable != aTileEntity.getProgress()
-            && !GT_Utility.hasBlockHitBox(world, offsetX, offsetY, offsetZ)) {
+            && !GTUtility.hasBlockHitBox(world, offsetX, offsetY, offsetZ)) {
             aTileEntity.increaseProgress(this.mEfficiency);
         }
         return aTileEntity.getProgress();
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_SteamRegulator.java b/src/main/java/gregtech/common/covers/GT_Cover_SteamRegulator.java
deleted file mode 100644
index e67e8b05d1..0000000000
--- a/src/main/java/gregtech/common/covers/GT_Cover_SteamRegulator.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package gregtech.common.covers;
-
-import net.minecraftforge.fluids.FluidStack;
-
-import gregtech.api.interfaces.ITexture;
-import gregtech.api.util.GT_ModHandler;
-
-public class GT_Cover_SteamRegulator extends GT_Cover_FluidRegulator {
-
-    public GT_Cover_SteamRegulator(int aTransferRate, ITexture coverTexture) {
-        super(aTransferRate, coverTexture);
-    }
-
-    @Override
-    protected boolean canTransferFluid(FluidStack fluid) {
-        return GT_ModHandler.isAnySteam(fluid) || GT_ModHandler.isSuperHeatedSteam(fluid);
-    }
-}
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverBase.java b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneReceiverBase.java
index afd0f67b37..68564e33e5 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverBase.java
+++ b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneReceiverBase.java
@@ -13,19 +13,19 @@ import com.google.common.io.ByteArrayDataInput;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 import io.netty.buffer.ByteBuf;
 
-public abstract class GT_Cover_AdvancedRedstoneReceiverBase
-    extends GT_Cover_AdvancedWirelessRedstoneBase<GT_Cover_AdvancedRedstoneReceiverBase.ReceiverData> {
+public abstract class CoverAdvancedRedstoneReceiverBase
+    extends CoverAdvancedWirelessRedstoneBase<CoverAdvancedRedstoneReceiverBase.ReceiverData> {
 
-    public GT_Cover_AdvancedRedstoneReceiverBase(ITexture coverTexture) {
+    public CoverAdvancedRedstoneReceiverBase(ITexture coverTexture) {
         super(ReceiverData.class, coverTexture);
     }
 
@@ -42,13 +42,13 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase
     // GUI stuff
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new AdvancedRedstoneReceiverBaseUIFactory(buildContext).createWindow();
     }
 
     private class AdvancedRedstoneReceiverBaseUIFactory extends AdvancedWirelessRedstoneBaseUIFactory {
 
-        public AdvancedRedstoneReceiverBaseUIFactory(GT_CoverUIBuildContext buildContext) {
+        public AdvancedRedstoneReceiverBaseUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -71,7 +71,7 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase
         protected void addUIWidgets(ModularWindow.Builder builder) {
             super.addUIWidgets(builder);
             builder.widget(
-                new TextWidget(GT_Utility.trans("335", "Gate Mode")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                new TextWidget(GTUtility.trans("335", "Gate Mode")).setDefaultColor(COLOR_TEXT_GRAY.get())
                     .setPos(startX + spaceX * 5, 4 + startY + spaceY * 2));
         }
 
@@ -80,53 +80,53 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase
         protected void addUIForDataController(CoverDataControllerWidget<ReceiverData> controller) {
             super.addUIForDataController(controller);
             controller.addFollower(
-                CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                CoverDataFollowerToggleButtonWidget.ofDisableable(),
                 coverData -> coverData.mode == GateMode.AND,
                 (coverData, state) -> {
                     coverData.mode = GateMode.AND;
                     return coverData;
                 },
-                widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_AND)
-                    .addTooltip(GT_Utility.trans("331", "AND Gate"))
+                widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_GATE_AND)
+                    .addTooltip(GTUtility.trans("331", "AND Gate"))
                     .setPos(spaceX * 0, spaceY * 2))
                 .addFollower(
-                    CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                    CoverDataFollowerToggleButtonWidget.ofDisableable(),
                     coverData -> coverData.mode == GateMode.NAND,
                     (coverData, state) -> {
                         coverData.mode = GateMode.NAND;
                         return coverData;
                     },
-                    widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_NAND)
-                        .addTooltip(GT_Utility.trans("332", "NAND Gate"))
+                    widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_GATE_NAND)
+                        .addTooltip(GTUtility.trans("332", "NAND Gate"))
                         .setPos(spaceX * 1, spaceY * 2))
                 .addFollower(
-                    CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                    CoverDataFollowerToggleButtonWidget.ofDisableable(),
                     coverData -> coverData.mode == GateMode.OR,
                     (coverData, state) -> {
                         coverData.mode = GateMode.OR;
                         return coverData;
                     },
-                    widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_OR)
-                        .addTooltip(GT_Utility.trans("333", "OR Gate"))
+                    widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_GATE_OR)
+                        .addTooltip(GTUtility.trans("333", "OR Gate"))
                         .setPos(spaceX * 2, spaceY * 2))
                 .addFollower(
-                    CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                    CoverDataFollowerToggleButtonWidget.ofDisableable(),
                     coverData -> coverData.mode == GateMode.NOR,
                     (coverData, state) -> {
                         coverData.mode = GateMode.NOR;
                         return coverData;
                     },
-                    widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_NOR)
-                        .addTooltip(GT_Utility.trans("334", "NOR Gate"))
+                    widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_GATE_NOR)
+                        .addTooltip(GTUtility.trans("334", "NOR Gate"))
                         .setPos(spaceX * 3, spaceY * 2))
                 .addFollower(
-                    CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                    CoverDataFollowerToggleButtonWidget.ofDisableable(),
                     coverData -> coverData.mode == GateMode.SINGLE_SOURCE,
                     (coverData, state) -> {
                         coverData.mode = GateMode.SINGLE_SOURCE;
                         return coverData;
                     },
-                    widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_ANALOG)
+                    widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_ANALOG)
                         .addTooltips(
                             Arrays.asList(
                                 "ANALOG Mode",
@@ -144,7 +144,7 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase
         SINGLE_SOURCE
     }
 
-    public static class ReceiverData extends GT_Cover_AdvancedWirelessRedstoneBase.WirelessData {
+    public static class ReceiverData extends CoverAdvancedWirelessRedstoneBase.WirelessData {
 
         private GateMode mode;
 
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverExternal.java b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneReceiverExternal.java
index a8a30de9b1..5473ab3fec 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverExternal.java
+++ b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneReceiverExternal.java
@@ -5,9 +5,9 @@ import net.minecraftforge.common.util.ForgeDirection;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 
-public class GT_Cover_AdvancedRedstoneReceiverExternal extends GT_Cover_AdvancedRedstoneReceiverBase {
+public class CoverAdvancedRedstoneReceiverExternal extends CoverAdvancedRedstoneReceiverBase {
 
-    public GT_Cover_AdvancedRedstoneReceiverExternal(ITexture coverTexture) {
+    public CoverAdvancedRedstoneReceiverExternal(ITexture coverTexture) {
         super(coverTexture);
     }
 
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneReceiverInternal.java
index 5553cb7c9c..f22a81bdba 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java
+++ b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneReceiverInternal.java
@@ -6,9 +6,9 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
 
-public class GT_Cover_AdvancedRedstoneReceiverInternal extends GT_Cover_AdvancedRedstoneReceiverBase {
+public class CoverAdvancedRedstoneReceiverInternal extends CoverAdvancedRedstoneReceiverBase {
 
-    public GT_Cover_AdvancedRedstoneReceiverInternal(ITexture coverTexture) {
+    public CoverAdvancedRedstoneReceiverInternal(ITexture coverTexture) {
         super(coverTexture);
     }
 
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneTransmitterBase.java
index 3417542bec..cfa5461305 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java
+++ b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneTransmitterBase.java
@@ -15,19 +15,19 @@ import com.google.common.io.ByteArrayDataInput;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 import io.netty.buffer.ByteBuf;
 
-public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData>
-    extends GT_Cover_AdvancedWirelessRedstoneBase<T> {
+public abstract class CoverAdvancedRedstoneTransmitterBase<T extends CoverAdvancedRedstoneTransmitterBase.TransmitterData>
+    extends CoverAdvancedWirelessRedstoneBase<T> {
 
-    public GT_Cover_AdvancedRedstoneTransmitterBase(Class<T> typeToken, ITexture coverTexture) {
+    public CoverAdvancedRedstoneTransmitterBase(Class<T> typeToken, ITexture coverTexture) {
         super(typeToken, coverTexture);
     }
 
@@ -53,9 +53,9 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cove
     protected T onCoverScrewdriverClickImpl(ForgeDirection side, int aCoverID, T aCoverVariable, ICoverable aTileEntity,
         EntityPlayer aPlayer, float aX, float aY, float aZ) {
         aCoverVariable.invert = !aCoverVariable.invert;
-        GT_Utility.sendChatToPlayer(
+        GTUtility.sendChatToPlayer(
             aPlayer,
-            aCoverVariable.invert ? GT_Utility.trans("054", "Inverted") : GT_Utility.trans("055", "Normal"));
+            aCoverVariable.invert ? GTUtility.trans("054", "Inverted") : GTUtility.trans("055", "Normal"));
 
         return aCoverVariable;
     }
@@ -69,7 +69,7 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cove
         }
     }
 
-    public static class TransmitterData extends GT_Cover_AdvancedWirelessRedstoneBase.WirelessData {
+    public static class TransmitterData extends CoverAdvancedWirelessRedstoneBase.WirelessData {
 
         protected boolean invert;
 
@@ -128,13 +128,13 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cove
     // GUI stuff
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new AdvancedRedstoneTransmitterBaseUIFactory(buildContext).createWindow();
     }
 
     protected class AdvancedRedstoneTransmitterBaseUIFactory extends AdvancedWirelessRedstoneBaseUIFactory {
 
-        public AdvancedRedstoneTransmitterBaseUIFactory(GT_CoverUIBuildContext buildContext) {
+        public AdvancedRedstoneTransmitterBaseUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -159,8 +159,8 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cove
             builder.widget(TextWidget.dynamicString(() -> {
                 T coverData = getCoverData();
                 if (coverData != null) {
-                    return getCoverData().invert ? GT_Utility.trans("INVERTED", "Inverted")
-                        : GT_Utility.trans("NORMAL", "Normal");
+                    return getCoverData().invert ? GTUtility.trans("INVERTED", "Inverted")
+                        : GTUtility.trans("NORMAL", "Normal");
                 } else {
                     return "";
                 }
@@ -174,14 +174,14 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cove
         protected void addUIForDataController(CoverDataControllerWidget<T> controller) {
             super.addUIForDataController(controller);
             controller.addFollower(
-                CoverDataFollower_ToggleButtonWidget.ofRedstone(),
+                CoverDataFollowerToggleButtonWidget.ofRedstone(),
                 coverData -> coverData.invert,
                 (coverData, state) -> {
                     coverData.invert = state;
                     return coverData;
                 },
-                widget -> widget.addTooltip(0, GT_Utility.trans("NORMAL", "Normal"))
-                    .addTooltip(1, GT_Utility.trans("INVERTED", "Inverted"))
+                widget -> widget.addTooltip(0, GTUtility.trans("NORMAL", "Normal"))
+                    .addTooltip(1, GTUtility.trans("INVERTED", "Inverted"))
                     .setPos(spaceX * 9, spaceY * getButtonRow()));
         }
     }
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterExternal.java b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneTransmitterExternal.java
index 139ec64843..71003974c5 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterExternal.java
+++ b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneTransmitterExternal.java
@@ -5,10 +5,10 @@ import net.minecraftforge.common.util.ForgeDirection;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 
-public class GT_Cover_AdvancedRedstoneTransmitterExternal
-    extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData> {
+public class CoverAdvancedRedstoneTransmitterExternal
+    extends CoverAdvancedRedstoneTransmitterBase<CoverAdvancedRedstoneTransmitterBase.TransmitterData> {
 
-    public GT_Cover_AdvancedRedstoneTransmitterExternal(ITexture coverTexture) {
+    public CoverAdvancedRedstoneTransmitterExternal(ITexture coverTexture) {
         super(TransmitterData.class, coverTexture);
     }
 
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterInternal.java b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneTransmitterInternal.java
index 01a46fcc86..ab368e0c5b 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterInternal.java
+++ b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedRedstoneTransmitterInternal.java
@@ -5,10 +5,10 @@ import net.minecraftforge.common.util.ForgeDirection;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 
-public class GT_Cover_AdvancedRedstoneTransmitterInternal
-    extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData> {
+public class CoverAdvancedRedstoneTransmitterInternal
+    extends CoverAdvancedRedstoneTransmitterBase<CoverAdvancedRedstoneTransmitterBase.TransmitterData> {
 
-    public GT_Cover_AdvancedRedstoneTransmitterInternal(ITexture coverTexture) {
+    public CoverAdvancedRedstoneTransmitterInternal(ITexture coverTexture) {
         super(TransmitterData.class, coverTexture);
     }
 
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedWirelessRedstoneBase.java
index 6ee9e2480f..963678a24c 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java
+++ b/src/main/java/gregtech/common/covers/redstone/CoverAdvancedWirelessRedstoneBase.java
@@ -16,27 +16,27 @@ import com.google.common.io.ByteArrayDataInput;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
+import gregtech.api.GregTechAPI;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_CoverBehaviorBase;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.CoverBehaviorBase;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_NumericWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerNumericWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 import io.netty.buffer.ByteBuf;
 
-public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_AdvancedWirelessRedstoneBase.WirelessData>
-    extends GT_CoverBehaviorBase<T> {
+public abstract class CoverAdvancedWirelessRedstoneBase<T extends CoverAdvancedWirelessRedstoneBase.WirelessData>
+    extends CoverBehaviorBase<T> {
 
-    public GT_Cover_AdvancedWirelessRedstoneBase(Class<T> typeToken, ITexture coverTexture) {
+    public CoverAdvancedWirelessRedstoneBase(Class<T> typeToken, ITexture coverTexture) {
         super(typeToken, coverTexture);
     }
 
-    public static Byte getSignalAt(UUID uuid, int frequency, GT_Cover_AdvancedRedstoneReceiverBase.GateMode mode) {
-        Map<Integer, Map<Long, Byte>> frequencies = GregTech_API.sAdvancedWirelessRedstone.get(String.valueOf(uuid));
+    public static Byte getSignalAt(UUID uuid, int frequency, CoverAdvancedRedstoneReceiverBase.GateMode mode) {
+        Map<Integer, Map<Long, Byte>> frequencies = GregTechAPI.sAdvancedWirelessRedstone.get(String.valueOf(uuid));
         if (frequencies == null) return 0;
 
         Map<Long, Byte> signals = frequencies.get(frequency);
@@ -83,7 +83,7 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A
     }
 
     public static void removeSignalAt(UUID uuid, int frequency, long hash) {
-        Map<Integer, Map<Long, Byte>> frequencies = GregTech_API.sAdvancedWirelessRedstone.get(String.valueOf(uuid));
+        Map<Integer, Map<Long, Byte>> frequencies = GregTechAPI.sAdvancedWirelessRedstone.get(String.valueOf(uuid));
         if (frequencies == null) return;
         frequencies.computeIfPresent(frequency, (freq, longByteMap) -> {
             longByteMap.remove(hash);
@@ -92,7 +92,7 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A
     }
 
     public static void setSignalAt(UUID uuid, int frequency, long hash, byte value) {
-        Map<Integer, Map<Long, Byte>> frequencies = GregTech_API.sAdvancedWirelessRedstone
+        Map<Integer, Map<Long, Byte>> frequencies = GregTechAPI.sAdvancedWirelessRedstone
             .computeIfAbsent(String.valueOf(uuid), k -> new ConcurrentHashMap<>());
         Map<Long, Byte> signals = frequencies.computeIfAbsent(frequency, k -> new ConcurrentHashMap<>());
         signals.put(hash, value);
@@ -143,7 +143,7 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A
 
     @Override
     public String getDescriptionImpl(ForgeDirection side, int aCoverID, T aCoverVariable, ICoverable aTileEntity) {
-        return GT_Utility.trans("081", "Frequency: ") + aCoverVariable.frequency
+        return GTUtility.trans("081", "Frequency: ") + aCoverVariable.frequency
             + ", Transmission: "
             + (aCoverVariable.uuid == null ? "Public" : "Private");
     }
@@ -232,7 +232,7 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A
         protected static final int spaceX = 18;
         protected static final int spaceY = 18;
 
-        public AdvancedWirelessRedstoneBaseUIFactory(GT_CoverUIBuildContext buildContext) {
+        public AdvancedWirelessRedstoneBaseUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -248,23 +248,23 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A
             CoverDataControllerWidget<T> dataController = new CoverDataControllerWidget<>(
                 this::getCoverData,
                 this::setCoverData,
-                GT_Cover_AdvancedWirelessRedstoneBase.this);
+                CoverAdvancedWirelessRedstoneBase.this);
             dataController.setPos(startX, startY);
             addUIForDataController(dataController);
 
             builder.widget(dataController)
                 .widget(
-                    new TextWidget(GT_Utility.trans("246", "Frequency")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("246", "Frequency")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 5, 4 + startY + spaceY * getFrequencyRow()))
                 .widget(
-                    new TextWidget(GT_Utility.trans("602", "Use Private Frequency"))
+                    new TextWidget(GTUtility.trans("602", "Use Private Frequency"))
                         .setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * privateExtraColumn, 4 + startY + spaceY * getButtonRow()));
         }
 
         protected void addUIForDataController(CoverDataControllerWidget<T> controller) {
             controller.addFollower(
-                new CoverDataFollower_NumericWidget<>(),
+                new CoverDataFollowerNumericWidget<>(),
                 coverData -> (double) coverData.frequency,
                 (coverData, state) -> {
                     coverData.frequency = state.intValue();
@@ -275,7 +275,7 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A
                     .setPos(1, 2 + spaceY * getFrequencyRow())
                     .setSize(spaceX * 5 - 4, 12))
                 .addFollower(
-                    CoverDataFollower_ToggleButtonWidget.ofCheck(),
+                    CoverDataFollowerToggleButtonWidget.ofCheck(),
                     coverData -> coverData.uuid != null,
                     (coverData, state) -> {
                         if (state) {
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessDoesWorkDetector.java b/src/main/java/gregtech/common/covers/redstone/CoverWirelessDoesWorkDetector.java
index 724f12b8f8..ed55280b7f 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessDoesWorkDetector.java
+++ b/src/main/java/gregtech/common/covers/redstone/CoverWirelessDoesWorkDetector.java
@@ -13,22 +13,21 @@ import com.google.common.io.ByteArrayDataInput;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IMachineProgress;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
-import gregtech.common.covers.redstone.GT_Cover_WirelessDoesWorkDetector.ActivityMode;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Cover_WirelessDoesWorkDetector
-    extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_WirelessDoesWorkDetector.ActivityTransmitterData> {
+public class CoverWirelessDoesWorkDetector
+    extends CoverAdvancedRedstoneTransmitterBase<CoverWirelessDoesWorkDetector.ActivityTransmitterData> {
 
-    public GT_Cover_WirelessDoesWorkDetector(ITexture coverTexture) {
+    public CoverWirelessDoesWorkDetector(ITexture coverTexture) {
         super(ActivityTransmitterData.class, coverTexture);
     }
 
@@ -105,7 +104,7 @@ public class GT_Cover_WirelessDoesWorkDetector
         MACHINE_ENABLED,
     }
 
-    public static class ActivityTransmitterData extends GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData {
+    public static class ActivityTransmitterData extends CoverAdvancedRedstoneTransmitterBase.TransmitterData {
 
         private ActivityMode mode;
 
@@ -159,13 +158,13 @@ public class GT_Cover_WirelessDoesWorkDetector
     }
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new WirelessActivityDetectorUIFactory(buildContext).createWindow();
     }
 
     private class WirelessActivityDetectorUIFactory extends AdvancedRedstoneTransmitterBaseUIFactory {
 
-        public WirelessActivityDetectorUIFactory(GT_CoverUIBuildContext buildContext) {
+        public WirelessActivityDetectorUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -192,11 +191,11 @@ public class GT_Cover_WirelessDoesWorkDetector
                 ActivityMode mode = getCoverData().mode;
 
                 if (mode == ActivityMode.MACHINE_ENABLED) {
-                    return GT_Utility.trans("271", "Machine enabled");
+                    return GTUtility.trans("271", "Machine enabled");
                 } else if (mode == ActivityMode.MACHINE_IDLE) {
-                    return GT_Utility.trans("242", "Machine idle");
+                    return GTUtility.trans("242", "Machine idle");
                 } else {
-                    return GT_Utility.trans("241", "Recipe progress");
+                    return GTUtility.trans("241", "Recipe progress");
                 }
 
             })
@@ -210,34 +209,34 @@ public class GT_Cover_WirelessDoesWorkDetector
             super.addUIForDataController(controller);
 
             controller.addFollower(
-                CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                CoverDataFollowerToggleButtonWidget.ofDisableable(),
                 coverData -> coverData.mode == ActivityMode.RECIPE_PROGRESS,
                 (coverData, state) -> {
                     coverData.mode = ActivityMode.RECIPE_PROGRESS;
                     return coverData;
                 },
-                widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_PROGRESS)
-                    .addTooltip(GT_Utility.trans("241", "Recipe progress"))
+                widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_PROGRESS)
+                    .addTooltip(GTUtility.trans("241", "Recipe progress"))
                     .setPos(spaceX * 0, spaceY * 2))
                 .addFollower(
-                    CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                    CoverDataFollowerToggleButtonWidget.ofDisableable(),
                     coverData -> coverData.mode == ActivityMode.MACHINE_IDLE,
                     (coverData, state) -> {
                         coverData.mode = ActivityMode.MACHINE_IDLE;
                         return coverData;
                     },
-                    widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK)
-                        .addTooltip(GT_Utility.trans("242", "Machine idle"))
+                    widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_CHECKMARK)
+                        .addTooltip(GTUtility.trans("242", "Machine idle"))
                         .setPos(spaceX * 1, spaceY * 2))
                 .addFollower(
-                    CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                    CoverDataFollowerToggleButtonWidget.ofDisableable(),
                     coverData -> coverData.mode == ActivityMode.MACHINE_ENABLED,
                     (coverData, state) -> {
                         coverData.mode = ActivityMode.MACHINE_ENABLED;
                         return coverData;
                     },
-                    widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_POWER_SWITCH_ON)
-                        .addTooltip(GT_Utility.trans("271", "Machine enabled"))
+                    widget -> widget.setStaticTexture(GTUITextures.OVERLAY_BUTTON_POWER_SWITCH_ON)
+                        .addTooltip(GTUtility.trans("271", "Machine enabled"))
                         .setPos(spaceX * 2, spaceY * 2));
         }
     }
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessFluidDetector.java b/src/main/java/gregtech/common/covers/redstone/CoverWirelessFluidDetector.java
index 9a9d419be6..cfea9b7b28 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessFluidDetector.java
+++ b/src/main/java/gregtech/common/covers/redstone/CoverWirelessFluidDetector.java
@@ -16,20 +16,20 @@ import com.google.common.io.ByteArrayDataInput;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
-import gregtech.common.covers.GT_Cover_LiquidMeter;
+import gregtech.common.covers.CoverLiquidMeter;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_NumericWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerNumericWidget;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Cover_WirelessFluidDetector
-    extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_WirelessFluidDetector.FluidTransmitterData> {
+public class CoverWirelessFluidDetector
+    extends CoverAdvancedRedstoneTransmitterBase<CoverWirelessFluidDetector.FluidTransmitterData> {
 
-    public GT_Cover_WirelessFluidDetector(ITexture coverTexture) {
+    public CoverWirelessFluidDetector(ITexture coverTexture) {
         super(FluidTransmitterData.class, coverTexture);
     }
 
@@ -46,7 +46,7 @@ public class GT_Cover_WirelessFluidDetector
     @Override
     public FluidTransmitterData doCoverThingsImpl(ForgeDirection side, byte aInputRedstone, int aCoverID,
         FluidTransmitterData aCoverVariable, ICoverable aTileEntity, long aTimer) {
-        final byte signal = GT_Cover_LiquidMeter
+        final byte signal = CoverLiquidMeter
             .computeSignalBasedOnFluid(aTileEntity, aCoverVariable.invert, aCoverVariable.threshold);
         final long hash = hashCoverCoords(aTileEntity, side);
         setSignalAt(aCoverVariable.getUuid(), aCoverVariable.getFrequency(), hash, signal);
@@ -66,7 +66,7 @@ public class GT_Cover_WirelessFluidDetector
         return true;
     }
 
-    public static class FluidTransmitterData extends GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData {
+    public static class FluidTransmitterData extends CoverAdvancedRedstoneTransmitterBase.TransmitterData {
 
         /** The special value {@code 0} means threshold check is disabled. */
         private int threshold;
@@ -123,7 +123,7 @@ public class GT_Cover_WirelessFluidDetector
     // GUI stuff
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new WirelessFluidDetectorUIFactory(buildContext).createWindow();
     }
 
@@ -131,7 +131,7 @@ public class GT_Cover_WirelessFluidDetector
 
         private int maxCapacity;
 
-        public WirelessFluidDetectorUIFactory(GT_CoverUIBuildContext buildContext) {
+        public WirelessFluidDetectorUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -150,7 +150,7 @@ public class GT_Cover_WirelessFluidDetector
             setMaxCapacity();
             super.addUIWidgets(builder);
             builder.widget(
-                new TextWidget(GT_Utility.trans("222", "Fluid threshold")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                new TextWidget(GTUtility.trans("222", "Fluid threshold")).setDefaultColor(COLOR_TEXT_GRAY.get())
                     .setPos(startX + spaceX * 5, 4 + startY + spaceY * 2));
         }
 
@@ -158,7 +158,7 @@ public class GT_Cover_WirelessFluidDetector
         protected void addUIForDataController(CoverDataControllerWidget<FluidTransmitterData> controller) {
             super.addUIForDataController(controller);
             controller.addFollower(
-                new CoverDataFollower_NumericWidget<>(),
+                new CoverDataFollowerNumericWidget<>(),
                 coverData -> (double) coverData.threshold,
                 (coverData, state) -> {
                     coverData.threshold = state.intValue();
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java b/src/main/java/gregtech/common/covers/redstone/CoverWirelessItemDetector.java
index 3cc7f60984..19cefdabcf 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java
+++ b/src/main/java/gregtech/common/covers/redstone/CoverWirelessItemDetector.java
@@ -17,23 +17,23 @@ import com.gtnewhorizons.modularui.api.NumberFormatMUI;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.ISerializableObject;
-import gregtech.common.covers.GT_Cover_ItemMeter;
+import gregtech.common.covers.CoverItemMeter;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_NumericWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerNumericWidget;
 import gregtech.common.gui.modularui.widget.ItemWatcherSlotWidget;
-import gregtech.common.tileentities.storage.GT_MetaTileEntity_DigitalChestBase;
+import gregtech.common.tileentities.storage.MTEDigitalChestBase;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Cover_WirelessItemDetector
-    extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_WirelessItemDetector.ItemTransmitterData> {
+public class CoverWirelessItemDetector
+    extends CoverAdvancedRedstoneTransmitterBase<CoverWirelessItemDetector.ItemTransmitterData> {
 
-    public GT_Cover_WirelessItemDetector(ITexture coverTexture) {
+    public CoverWirelessItemDetector(ITexture coverTexture) {
         super(ItemTransmitterData.class, coverTexture);
     }
 
@@ -50,7 +50,7 @@ public class GT_Cover_WirelessItemDetector
     @Override
     public ItemTransmitterData doCoverThingsImpl(ForgeDirection side, byte aInputRedstone, int aCoverID,
         ItemTransmitterData aCoverVariable, ICoverable aTileEntity, long aTimer) {
-        byte signal = GT_Cover_ItemMeter.computeSignalBasedOnItems(
+        byte signal = CoverItemMeter.computeSignalBasedOnItems(
             aTileEntity,
             aCoverVariable.invert,
             aCoverVariable.threshold,
@@ -74,7 +74,7 @@ public class GT_Cover_WirelessItemDetector
         return true;
     }
 
-    public static class ItemTransmitterData extends GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData {
+    public static class ItemTransmitterData extends CoverAdvancedRedstoneTransmitterBase.TransmitterData {
 
         /**
          * The special value {@code -1} means all slots.
@@ -143,7 +143,7 @@ public class GT_Cover_WirelessItemDetector
     // GUI stuff
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new WirelessItemDetectorUIFactory(buildContext).createWindow();
     }
 
@@ -159,14 +159,14 @@ public class GT_Cover_WirelessItemDetector
             @Override
             public StringBuffer format(double number, StringBuffer toAppendTo, FieldPosition pos) {
                 if (number < 0) {
-                    return toAppendTo.append(GT_Utility.trans("ALL", "All"));
+                    return toAppendTo.append(GTUtility.trans("ALL", "All"));
                 } else {
                     return super.format(number, toAppendTo, pos);
                 }
             }
         };
 
-        public WirelessItemDetectorUIFactory(GT_CoverUIBuildContext buildContext) {
+        public WirelessItemDetectorUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -189,10 +189,10 @@ public class GT_Cover_WirelessItemDetector
                 new ItemWatcherSlotWidget().setGetter(this::getTargetItem)
                     .setPos(startX + spaceX * 4 - 1, startY + spaceY * 3))
                 .widget(
-                    new TextWidget(GT_Utility.trans("221", "Item threshold")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("221", "Item threshold")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 5, 4 + startY + spaceY * 2))
                 .widget(
-                    new TextWidget(GT_Utility.trans("254", "Detect Slot #")).setDefaultColor(COLOR_TEXT_GRAY.get())
+                    new TextWidget(GTUtility.trans("254", "Detect Slot #")).setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 5, 4 + startY + spaceY * 3));
         }
 
@@ -200,7 +200,7 @@ public class GT_Cover_WirelessItemDetector
         protected void addUIForDataController(CoverDataControllerWidget<ItemTransmitterData> controller) {
             super.addUIForDataController(controller);
             controller.addFollower(
-                new CoverDataFollower_NumericWidget<>(),
+                new CoverDataFollowerNumericWidget<>(),
                 coverData -> (double) coverData.threshold,
                 (coverData, state) -> {
                     coverData.threshold = state.intValue();
@@ -212,7 +212,7 @@ public class GT_Cover_WirelessItemDetector
                     .setPos(1, 2 + spaceY * 2)
                     .setSize(spaceX * 5 - 4, 12))
                 .addFollower(
-                    new CoverDataFollower_NumericWidget<>(),
+                    new CoverDataFollowerNumericWidget<>(),
                     coverData -> (double) coverData.slot,
                     (coverData, state) -> {
                         coverData.slot = state.intValue();
@@ -229,7 +229,7 @@ public class GT_Cover_WirelessItemDetector
         private void setMaxSlot() {
             final ICoverable tile = getUIBuildContext().getTile();
             if (!tile.isDead() && tile instanceof IGregTechTileEntity gtTile
-                && !(gtTile.getMetaTileEntity() instanceof GT_MetaTileEntity_DigitalChestBase)) {
+                && !(gtTile.getMetaTileEntity() instanceof MTEDigitalChestBase)) {
                 maxSlot = tile.getSizeInventory() - 1;
             } else {
                 maxSlot = -1;
@@ -239,7 +239,7 @@ public class GT_Cover_WirelessItemDetector
         private void setMaxThreshold() {
             final ICoverable tile = getUIBuildContext().getTile();
             if (!tile.isDead() && tile instanceof IGregTechTileEntity gtTile
-                && gtTile.getMetaTileEntity() instanceof GT_MetaTileEntity_DigitalChestBase) {
+                && gtTile.getMetaTileEntity() instanceof MTEDigitalChestBase) {
                 maxThreshold = gtTile.getMaxItemCount();
             } else {
                 maxThreshold = maxSlot > 0 ? maxSlot * 64 : Integer.MAX_VALUE;
diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java b/src/main/java/gregtech/common/covers/redstone/CoverWirelessMaintenanceDetector.java
index f6c76591df..f3d62f2c81 100644
--- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java
+++ b/src/main/java/gregtech/common/covers/redstone/CoverWirelessMaintenanceDetector.java
@@ -14,24 +14,24 @@ import com.google.common.io.ByteArrayDataInput;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
-import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.gui.modularui.CoverUIBuildContext;
+import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
+import gregtech.api.items.MetaGeneratedTool;
+import gregtech.api.metatileentity.implementations.MTEMultiBlockBase;
 import gregtech.api.util.ISerializableObject;
-import gregtech.common.covers.GT_Cover_NeedMaintainance;
+import gregtech.common.covers.CoverNeedMaintainance;
 import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
-import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
 import io.netty.buffer.ByteBuf;
 
-public class GT_Cover_WirelessMaintenanceDetector
-    extends GT_Cover_AdvancedRedstoneTransmitterBase<GT_Cover_WirelessMaintenanceDetector.MaintenanceTransmitterData> {
+public class CoverWirelessMaintenanceDetector
+    extends CoverAdvancedRedstoneTransmitterBase<CoverWirelessMaintenanceDetector.MaintenanceTransmitterData> {
 
-    public GT_Cover_WirelessMaintenanceDetector(ITexture coverTexture) {
+    public CoverWirelessMaintenanceDetector(ITexture coverTexture) {
         super(MaintenanceTransmitterData.class, coverTexture);
     }
 
@@ -51,7 +51,7 @@ public class GT_Cover_WirelessMaintenanceDetector
 
         if (tileEntity instanceof IGregTechTileEntity) {
             IMetaTileEntity metaTE = ((IGregTechTileEntity) tileEntity).getMetaTileEntity();
-            if (metaTE instanceof GT_MetaTileEntity_MultiBlockBase multiTE) {
+            if (metaTE instanceof MTEMultiBlockBase multiTE) {
                 int ideal = multiTE.getIdealStatus();
                 int real = multiTE.getRepairStatus();
 
@@ -61,9 +61,9 @@ public class GT_Cover_WirelessMaintenanceDetector
                         >= coverVariable.mode.ordinal();
                     case ROTOR_80, ROTOR_100 -> {
                         ItemStack rotor = multiTE.getRealInventory()[1];
-                        if (GT_Cover_NeedMaintainance.isRotor(rotor)) {
-                            long max = GT_MetaGenerated_Tool.getToolMaxDamage(rotor);
-                            long current = GT_MetaGenerated_Tool.getToolDamage(rotor);
+                        if (CoverNeedMaintainance.isRotor(rotor)) {
+                            long max = MetaGeneratedTool.getToolMaxDamage(rotor);
+                            long current = MetaGeneratedTool.getToolDamage(rotor);
 
                             if (coverVariable.mode == MaintenanceMode.ROTOR_80) {
                                 signal = current >= max * 8 / 10;
@@ -128,7 +128,7 @@ public class GT_Cover_WirelessMaintenanceDetector
         ROTOR_100
     }
 
-    public static class MaintenanceTransmitterData extends GT_Cover_AdvancedRedstoneTransmitterBase.TransmitterData {
+    public static class MaintenanceTransmitterData extends CoverAdvancedRedstoneTransmitterBase.TransmitterData {
 
         private MaintenanceMode mode;
 
@@ -187,13 +187,13 @@ public class GT_Cover_WirelessMaintenanceDetector
         ">= 4 Issues", ">= 5 Issues", "Rotor < 20%", "Rotor ≈ 0%" };
 
     @Override
-    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+    public ModularWindow createWindow(CoverUIBuildContext buildContext) {
         return new WirelessMaintenanceDetectorUIFactory(buildContext).createWindow();
     }
 
     private class WirelessMaintenanceDetectorUIFactory extends AdvancedRedstoneTransmitterBaseUIFactory {
 
-        public WirelessMaintenanceDetectorUIFactory(GT_CoverUIBuildContext buildContext) {
+        public WirelessMaintenanceDetectorUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
         }
 
@@ -228,13 +228,13 @@ public class GT_Cover_WirelessMaintenanceDetector
             for (int i = 0; i < 8; i++) {
                 final int index = i;
                 controller.addFollower(
-                    CoverDataFollower_ToggleButtonWidget.ofDisableable(),
+                    CoverDataFollowerToggleButtonWidget.ofDisableable(),
                     coverData -> coverData.mode == MaintenanceMode.values()[index],
                     (coverData, state) -> {
                         coverData.mode = MaintenanceMode.values()[index];
                         return coverData;
                     },
-                    widget -> widget.setToggleTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK, GT_UITextures.TRANSPARENT)
+                    widget -> widget.setToggleTexture(GTUITextures.OVERLAY_BUTTON_CHECKMARK, GTUITextures.TRANSPARENT)
                         .setPos(spaceX * (index % 2 == 0 ? 0 : 6), spaceY * (2 + index / 2)));
             }
         }