diff --git a/src/main/java/refinedstorage/RS.java b/src/main/java/refinedstorage/RS.java
index 9931bbadd..c144fcbaf 100755
--- a/src/main/java/refinedstorage/RS.java
+++ b/src/main/java/refinedstorage/RS.java
@@ -13,25 +13,27 @@ import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.network.NetworkRegistry;
 import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
-import refinedstorage.proxy.CommonProxy;
+import refinedstorage.proxy.ProxyCommon;
 
 @Mod(modid = RS.ID, version = RS.VERSION, guiFactory = RS.GUI_FACTORY, dependencies = RS.DEPENDENCIES)
 public final class RS {
+    static {
+        FluidRegistry.enableUniversalBucket();
+    }
+
     public static final String ID = "refinedstorage";
     public static final String VERSION = "1.2";
     public static final String DEPENDENCIES = "required-after:Forge@[12.18.1.2088,);required-after:mcmultipart@[1.2.1,);after:JEI@[3.12.0,);";
     public static final String GUI_FACTORY = "refinedstorage.gui.config.ModGuiFactory";
 
-    @SidedProxy(clientSide = "refinedstorage.proxy.ClientProxy", serverSide = "refinedstorage.proxy.ServerProxy")
-    public static CommonProxy PROXY;
+    @SidedProxy(clientSide = "refinedstorage.proxy.ProxyClient", serverSide = "refinedstorage.proxy.ProxyCommon")
+    public static ProxyCommon PROXY;
 
     @Instance
     public static RS INSTANCE;
 
     public RSConfig config;
-
     public final SimpleNetworkWrapper network = NetworkRegistry.INSTANCE.newSimpleChannel(ID);
-
     public final CreativeTabs tab = new CreativeTabs(ID) {
         @Override
         public ItemStack getIconItemStack() {
@@ -44,10 +46,6 @@ public final class RS {
         }
     };
 
-    static {
-        FluidRegistry.enableUniversalBucket();
-    }
-
     @EventHandler
     public void preInit(FMLPreInitializationEvent e) {
         config = new RSConfig(e.getSuggestedConfigurationFile());
diff --git a/src/main/java/refinedstorage/network/MessageGridCraftingPreviewResponse.java b/src/main/java/refinedstorage/network/MessageGridCraftingPreviewResponse.java
index ca1f0852a..5fdfd7b8c 100755
--- a/src/main/java/refinedstorage/network/MessageGridCraftingPreviewResponse.java
+++ b/src/main/java/refinedstorage/network/MessageGridCraftingPreviewResponse.java
@@ -6,7 +6,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
 import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
 import refinedstorage.api.autocrafting.preview.ICraftingPreviewStack;
 import refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewStack;
-import refinedstorage.proxy.ClientProxy;
+import refinedstorage.proxy.ProxyClient;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -53,7 +53,7 @@ public class MessageGridCraftingPreviewResponse implements IMessage, IMessageHan
 
     @Override
     public IMessage onMessage(MessageGridCraftingPreviewResponse message, MessageContext ctx) {
-        ClientProxy.onReceiveCraftingPreviewResponse(message);
+        ProxyClient.onReceiveCraftingPreviewResponse(message);
         
         return null;
     }
diff --git a/src/main/java/refinedstorage/proxy/ClientProxy.java b/src/main/java/refinedstorage/proxy/ProxyClient.java
similarity index 99%
rename from src/main/java/refinedstorage/proxy/ClientProxy.java
rename to src/main/java/refinedstorage/proxy/ProxyClient.java
index 183698647..5f2c8dc10 100755
--- a/src/main/java/refinedstorage/proxy/ClientProxy.java
+++ b/src/main/java/refinedstorage/proxy/ProxyClient.java
@@ -39,7 +39,7 @@ import refinedstorage.tile.TileController;
 
 import java.util.List;
 
-public class ClientProxy extends CommonProxy {
+public class ProxyClient extends ProxyCommon {
     @SubscribeEvent
     public void onModelBake(ModelBakeEvent e) {
         for (ModelResourceLocation model : e.getModelRegistry().getKeys()) {
diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/ProxyCommon.java
similarity index 99%
rename from src/main/java/refinedstorage/proxy/CommonProxy.java
rename to src/main/java/refinedstorage/proxy/ProxyCommon.java
index d76163bab..77a89ee04 100755
--- a/src/main/java/refinedstorage/proxy/CommonProxy.java
+++ b/src/main/java/refinedstorage/proxy/ProxyCommon.java
@@ -41,7 +41,7 @@ import refinedstorage.tile.grid.TileGrid;
 import java.util.ArrayList;
 import java.util.List;
 
-public class CommonProxy {
+public class ProxyCommon {
     protected List<BlockCable> cableTypes = new ArrayList<>();
 
     public void preInit(FMLPreInitializationEvent e) {
diff --git a/src/main/java/refinedstorage/proxy/ServerProxy.java b/src/main/java/refinedstorage/proxy/ServerProxy.java
deleted file mode 100755
index ba894b981..000000000
--- a/src/main/java/refinedstorage/proxy/ServerProxy.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package refinedstorage.proxy;
-
-public class ServerProxy extends CommonProxy {
-}