7 files changed, 30 insertions, 30 deletions
diff --git a/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectManager.java b/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectManager.java
index 323b22e20a..a076a05c9a 100644
--- a/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectManager.java
+++ b/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectManager.java
@@ -12,7 +12,7 @@ import net.minecraftforge.fluids.FluidStack;
 import org.apache.commons.lang3.tuple.Pair;
 
 import gregtech.api.recipe.RecipeMaps;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTRecipe;
 import gregtech.common.misc.spaceprojects.interfaces.ISpaceBody;
 import gregtech.common.misc.spaceprojects.interfaces.ISpaceProject;
 
@@ -187,7 +187,7 @@ public class SpaceProjectManager {
 
     // #region Project Helper methods
 
-    public static class FakeSpaceProjectRecipe extends GT_Recipe {
+    public static class FakeSpaceProjectRecipe extends GTRecipe {
 
         public final String projectName;
 
diff --git a/src/main/java/gregtech/common/misc/spaceprojects/base/SP_Requirements.java b/src/main/java/gregtech/common/misc/spaceprojects/base/SPRequirements.java
index b910b5e344..dc92d8bebf 100644
--- a/src/main/java/gregtech/common/misc/spaceprojects/base/SP_Requirements.java
+++ b/src/main/java/gregtech/common/misc/spaceprojects/base/SPRequirements.java
@@ -13,7 +13,7 @@ import gregtech.common.misc.spaceprojects.interfaces.ISpaceProject.ISP_Upgrade;
 /**
  * @author BlueWeabo
  */
-public class SP_Requirements implements ISP_Requirements {
+public class SPRequirements implements ISP_Requirements {
 
     // #region Variables
 
@@ -50,22 +50,22 @@ public class SP_Requirements implements ISP_Requirements {
 
     // #region Setters/Builder
 
-    public SP_Requirements setSpaceBodyType(SpaceBodyType spaceBodyType) {
+    public SPRequirements setSpaceBodyType(SpaceBodyType spaceBodyType) {
         spaceBody = spaceBodyType;
         return this;
     }
 
-    public SP_Requirements setStarType(StarType starType) {
+    public SPRequirements setStarType(StarType starType) {
         star = starType;
         return this;
     }
 
-    public SP_Requirements setUpgrades(ISP_Upgrade... requirementUpgrades) {
+    public SPRequirements setUpgrades(ISP_Upgrade... requirementUpgrades) {
         upgrades.addAll(Arrays.asList(requirementUpgrades));
         return this;
     }
 
-    public SP_Requirements setSpaceProjects(ISpaceProject... requirementProjects) {
+    public SPRequirements setSpaceProjects(ISpaceProject... requirementProjects) {
         spaceProjects.addAll(Arrays.asList(requirementProjects));
         return this;
     }
diff --git a/src/main/java/gregtech/common/misc/spaceprojects/base/SP_Upgrade.java b/src/main/java/gregtech/common/misc/spaceprojects/base/SPUpgrade.java
index 835a57f277..b07ff7905a 100644
--- a/src/main/java/gregtech/common/misc/spaceprojects/base/SP_Upgrade.java
+++ b/src/main/java/gregtech/common/misc/spaceprojects/base/SPUpgrade.java
@@ -15,7 +15,7 @@ import gregtech.common.misc.spaceprojects.interfaces.ISpaceProject.ISP_Upgrade;
 /**
  * @author BlueWeabo
  */
-public class SP_Upgrade implements ISP_Upgrade {
+public class SPUpgrade implements ISP_Upgrade {
 
     // #region Variables
 
@@ -27,7 +27,7 @@ public class SP_Upgrade implements ISP_Upgrade {
     protected int currentStage;
     protected int buildTime;
     protected long voltage;
-    protected SP_Requirements requirements;
+    protected SPRequirements requirements;
     protected ISpaceProject projectBelongingTo;
 
     // #endregion
@@ -219,7 +219,7 @@ public class SP_Upgrade implements ISP_Upgrade {
     }
 
     @Override
-    public SP_Requirements getUpgradeRequirements() {
+    public SPRequirements getUpgradeRequirements() {
         return requirements;
     }
 
@@ -232,44 +232,44 @@ public class SP_Upgrade implements ISP_Upgrade {
 
     // #region Setter/Builder
 
-    public SP_Upgrade() {}
+    public SPUpgrade() {}
 
-    public SP_Upgrade setUpgradeName(String upgradeName) {
+    public SPUpgrade setUpgradeName(String upgradeName) {
         name = upgradeName;
         return this;
     }
 
-    public SP_Upgrade setUpgradeUnlocalizedName(String upgradeUnlocalizedName) {
+    public SPUpgrade setUpgradeUnlocalizedName(String upgradeUnlocalizedName) {
         unlocalizedName = upgradeUnlocalizedName;
         return this;
     }
 
-    public SP_Upgrade setUpgradeItemsCost(ItemStack... upgradeItemsCost) {
+    public SPUpgrade setUpgradeItemsCost(ItemStack... upgradeItemsCost) {
         itemsCost = upgradeItemsCost;
         return this;
     }
 
-    public SP_Upgrade setUpgradeFluidsCost(FluidStack... upgradeFluidsCost) {
+    public SPUpgrade setUpgradeFluidsCost(FluidStack... upgradeFluidsCost) {
         fluidsCost = upgradeFluidsCost;
         return this;
     }
 
-    public SP_Upgrade setUpgradeRequirements(SP_Requirements upgradeRequirements) {
+    public SPUpgrade setUpgradeRequirements(SPRequirements upgradeRequirements) {
         requirements = upgradeRequirements;
         return this;
     }
 
-    public SP_Upgrade setUpgradeTotalStages(int upgradeTotalStages) {
+    public SPUpgrade setUpgradeTotalStages(int upgradeTotalStages) {
         totalStages = upgradeTotalStages;
         return this;
     }
 
-    public SP_Upgrade setUpgradeBuildTime(int upgradeBuildTime) {
+    public SPUpgrade setUpgradeBuildTime(int upgradeBuildTime) {
         buildTime = upgradeBuildTime;
         return this;
     }
 
-    public SP_Upgrade setUpgradeVoltage(long upgradeVoltage) {
+    public SPUpgrade setUpgradeVoltage(long upgradeVoltage) {
         voltage = upgradeVoltage;
         return this;
     }
@@ -333,8 +333,8 @@ public class SP_Upgrade implements ISP_Upgrade {
     }
 
     @Override
-    public SP_Upgrade copy() {
-        return new SP_Upgrade().setUpgradeName(name)
+    public SPUpgrade copy() {
+        return new SPUpgrade().setUpgradeName(name)
             .setUpgradeUnlocalizedName(unlocalizedName)
             .setUpgradeBuildTime(buildTime)
             .setUpgradeFluidsCost(fluidsCost)
diff --git a/src/main/java/gregtech/common/misc/spaceprojects/base/SpaceProject.java b/src/main/java/gregtech/common/misc/spaceprojects/base/SpaceProject.java
index 201b7c27a9..d682dd6c01 100644
--- a/src/main/java/gregtech/common/misc/spaceprojects/base/SpaceProject.java
+++ b/src/main/java/gregtech/common/misc/spaceprojects/base/SpaceProject.java
@@ -378,7 +378,7 @@ public class SpaceProject implements ISpaceProject {
             .setProjectTexture(texture)
             .setProjectRequirements(requirements);
         if (upgradesAvailable != null) {
-            ISP_Upgrade[] upgrades = new SP_Upgrade[upgradesAvailable.size()];
+            ISP_Upgrade[] upgrades = new SPUpgrade[upgradesAvailable.size()];
             int index = 0;
             for (ISP_Upgrade upgrade : upgradesAvailable.values()) {
                 upgrades[index++] = upgrade.copy();
diff --git a/src/main/java/gregtech/common/misc/spaceprojects/commands/SP_Command.java b/src/main/java/gregtech/common/misc/spaceprojects/commands/SPCommand.java
index 3c4ad00932..39332818fe 100644
--- a/src/main/java/gregtech/common/misc/spaceprojects/commands/SP_Command.java
+++ b/src/main/java/gregtech/common/misc/spaceprojects/commands/SPCommand.java
@@ -17,13 +17,13 @@ import net.minecraft.util.EnumChatFormatting;
 
 import org.apache.commons.lang3.tuple.Pair;
 
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gregtech.common.misc.spaceprojects.SpaceProjectManager;
 
 /**
  * @author BlueWeabo
  */
-public class SP_Command extends CommandBase {
+public class SPCommand extends CommandBase {
 
     private static final Set<Pair<EntityPlayerMP, EntityPlayerMP>> invite = Collections
         .newSetFromMap(new WeakHashMap<>());
@@ -82,7 +82,7 @@ public class SP_Command extends CommandBase {
             + EnumChatFormatting.GOLD
             + " /sp accept "
             + teamLeader.getCommandSenderName();
-        GT_Utility.sendChatToPlayer(teamMember, message);
+        GTUtility.sendChatToPlayer(teamMember, message);
     }
 
     private void processAccept(ICommandSender sender, String playerInviter) {
@@ -93,7 +93,7 @@ public class SP_Command extends CommandBase {
                 + EnumChatFormatting.RESET
                 + " has accepted the invite.";
             SpaceProjectManager.putInTeam(teamMember.getUniqueID(), teamLeader.getUniqueID());
-            GT_Utility.sendChatToPlayer(teamLeader, message);
+            GTUtility.sendChatToPlayer(teamLeader, message);
             invite.remove(Pair.of(teamMember, teamLeader));
         }
     }
@@ -105,7 +105,7 @@ public class SP_Command extends CommandBase {
             + "/sp confirm"
             + EnumChatFormatting.RESET
             + " to confirm this. This does nothing if you are the team leader.";
-        GT_Utility.sendChatToPlayer(player, message);
+        GTUtility.sendChatToPlayer(player, message);
         confirm.add(player);
     }
 
@@ -114,7 +114,7 @@ public class SP_Command extends CommandBase {
         if (confirm.contains(player)) {
             String message = "Successfully left the team.";
             SpaceProjectManager.putInTeam(player.getUniqueID(), player.getUniqueID());
-            GT_Utility.sendChatToPlayer(player, message);
+            GTUtility.sendChatToPlayer(player, message);
             confirm.remove(player);
         }
     }
diff --git a/src/main/java/gregtech/common/misc/spaceprojects/commands/SPM_Command.java b/src/main/java/gregtech/common/misc/spaceprojects/commands/SPMCommand.java
index 896c7e1052..8379162f84 100644
--- a/src/main/java/gregtech/common/misc/spaceprojects/commands/SPM_Command.java
+++ b/src/main/java/gregtech/common/misc/spaceprojects/commands/SPMCommand.java
@@ -20,7 +20,7 @@ import gregtech.common.misc.spaceprojects.interfaces.ISpaceProject;
 /**
  * @author BlueWeabo
  */
-public class SPM_Command extends CommandBase {
+public class SPMCommand extends CommandBase {
 
     private static final String RESET = "reset";
     private static final String UNLOCK = "unlock";
diff --git a/src/main/java/gregtech/common/misc/spaceprojects/commands/SpaceProject_Command.java b/src/main/java/gregtech/common/misc/spaceprojects/commands/SpaceProjectCommand.java
index 2f36175069..bd1408d80e 100644
--- a/src/main/java/gregtech/common/misc/spaceprojects/commands/SpaceProject_Command.java
+++ b/src/main/java/gregtech/common/misc/spaceprojects/commands/SpaceProjectCommand.java
@@ -1,6 +1,6 @@
 package gregtech.common.misc.spaceprojects.commands;
 
-public class SpaceProject_Command extends SP_Command {
+public class SpaceProjectCommand extends SPCommand {
 
     @Override
     public String getCommandName() {