4 files changed, 15 insertions, 15 deletions
diff --git a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java
index 22ae6f29c6..edd41535e7 100644
--- a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java
+++ b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java
@@ -7,7 +7,7 @@ import gtPlusPlus.api.interfaces.IPlugin;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.plugin.fixes.interfaces.IBugFix;
 import gtPlusPlus.plugin.fixes.vanilla.music.MusicTocker;
-import gtPlusPlus.preloader.CORE_Preloader;
+import gtPlusPlus.preloader.PreloaderCore;
 
 public class VanillaBackgroundMusicFix implements IBugFix {
 
@@ -17,11 +17,11 @@ public class VanillaBackgroundMusicFix implements IBugFix {
 
     public VanillaBackgroundMusicFix(IPlugin minstance) {
         mParent = minstance;
-        if (CORE_Preloader.enableWatchdogBGM > 0 && Utils.isClient()) {
+        if (PreloaderCore.enableWatchdogBGM > 0 && Utils.isClient()) {
             mParent.log("[BGM] Registering BGM delay Fix.");
             enabled = true;
             mFixInstance = new MusicTocker(mParent);
-        } else if (CORE_Preloader.enableWatchdogBGM > 0 && Utils.isServer()) {
+        } else if (PreloaderCore.enableWatchdogBGM > 0 && Utils.isServer()) {
             mParent.log("[BGM] Tried registering BGM delay Fix on Server, disabling.");
             enabled = false;
         } else {
@@ -36,7 +36,7 @@ public class VanillaBackgroundMusicFix implements IBugFix {
     }
 
     public void manage() {
-        if (CORE_Preloader.enableWatchdogBGM > 0 && Utils.isClient()) {
+        if (PreloaderCore.enableWatchdogBGM > 0 && Utils.isClient()) {
             TimerTask task = new ManageTask(this.mFixInstance);
             Timer timer = new Timer("BGM-WatchDog");
             long delay = 1000 * 60;
@@ -54,7 +54,7 @@ public class VanillaBackgroundMusicFix implements IBugFix {
 
         @Override
         public void run() {
-            if (CORE_Preloader.enableWatchdogBGM > 0 && Utils.isClient()) {
+            if (PreloaderCore.enableWatchdogBGM > 0 && Utils.isClient()) {
                 if (!A.mVanillaManager) {
                     A.run();
                 }
diff --git a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java
index 60ab048ca3..bf69ead5e2 100644
--- a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java
+++ b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java
@@ -13,7 +13,7 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.plugin.fixes.interfaces.IBugFix;
-import gtPlusPlus.preloader.CORE_Preloader;
+import gtPlusPlus.preloader.PreloaderCore;
 
 public class VanillaBedHeightFix implements IBugFix {
 
@@ -23,7 +23,7 @@ public class VanillaBedHeightFix implements IBugFix {
     public VanillaBedHeightFix(IPlugin minstance) {
         mParent = minstance;
         Method m;
-        if (!CORE_Preloader.DEV_ENVIRONMENT) {
+        if (!PreloaderCore.DEV_ENVIRONMENT) {
             m = ReflectionUtils.getMethod(EntityPlayer.class, "func_71018_a", int.class, int.class, int.class);
         } else {
             m = ReflectionUtils.getMethod(
diff --git a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/Core_VanillaFixes.java b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaFixesCore.java
index cc181756c0..b6cfb9d3ba 100644
--- a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/Core_VanillaFixes.java
+++ b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaFixesCore.java
@@ -6,25 +6,25 @@ import net.minecraft.item.ItemStack;
 
 import gtPlusPlus.api.interfaces.IPlugin;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.plugin.manager.Core_Manager;
+import gtPlusPlus.plugin.manager.CoreManager;
 
 // Called by Core_Manager#veryEarlyInit
 @SuppressWarnings("unused")
-public class Core_VanillaFixes implements IPlugin {
+public class VanillaFixesCore implements IPlugin {
 
-    static final Core_VanillaFixes mInstance;
+    static final VanillaFixesCore mInstance;
     static final VanillaBedHeightFix mBedFixInstance;
     static final VanillaBackgroundMusicFix mMusicFixInstance;
 
     static {
-        mInstance = new Core_VanillaFixes();
+        mInstance = new VanillaFixesCore();
         mBedFixInstance = new VanillaBedHeightFix(mInstance);
         mMusicFixInstance = new VanillaBackgroundMusicFix(mInstance);
         mInstance.log("Preparing " + mInstance.getPluginName() + " for use.");
     }
 
-    Core_VanillaFixes() {
-        Core_Manager.registerPlugin(this);
+    VanillaFixesCore() {
+        CoreManager.registerPlugin(this);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java
index c669f93f62..b0e0474bdd 100644
--- a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java
+++ b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java
@@ -15,7 +15,7 @@ import gregtech.api.objects.XSTR;
 import gtPlusPlus.api.interfaces.IPlugin;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.preloader.CORE_Preloader;
+import gtPlusPlus.preloader.PreloaderCore;
 
 @SideOnly(Side.CLIENT)
 public class MusicTocker extends MusicTicker implements Runnable {
@@ -37,7 +37,7 @@ public class MusicTocker extends MusicTicker implements Runnable {
     }
 
     private static int getDelay() {
-        return CORE_Preloader.enableWatchdogBGM;
+        return PreloaderCore.enableWatchdogBGM;
     }
 
     private boolean inject() {