diff --git a/src/main/java/refinedstorage/gui/grid/GuiGrid.java b/src/main/java/refinedstorage/gui/grid/GuiGrid.java
index 9ae48aa9d..0b637bd8e 100755
--- a/src/main/java/refinedstorage/gui/grid/GuiGrid.java
+++ b/src/main/java/refinedstorage/gui/grid/GuiGrid.java
@@ -28,7 +28,7 @@ import refinedstorage.gui.grid.stack.ClientStackItem;
 import refinedstorage.gui.grid.stack.IClientStack;
 import refinedstorage.gui.sidebutton.*;
 import refinedstorage.integration.jei.IntegrationJEI;
-import refinedstorage.integration.jei.RefinedStorageJEIPlugin;
+import refinedstorage.integration.jei.RSJEIPlugin;
 import refinedstorage.network.*;
 import refinedstorage.tile.grid.IGrid;
 import refinedstorage.tile.grid.TileGrid;
@@ -417,7 +417,7 @@ public class GuiGrid extends GuiBase {
 
     private void updateJEI() {
         if (IntegrationJEI.isLoaded() && (grid.getSearchBoxMode() == TileGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED || grid.getSearchBoxMode() == TileGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED)) {
-            RefinedStorageJEIPlugin.INSTANCE.getRuntime().getItemListOverlay().setFilterText(searchField.getText());
+            RSJEIPlugin.INSTANCE.getRuntime().getItemListOverlay().setFilterText(searchField.getText());
         }
     }
 
diff --git a/src/main/java/refinedstorage/integration/jei/RefinedStorageJEIPlugin.java b/src/main/java/refinedstorage/integration/jei/RSJEIPlugin.java
similarity index 92%
rename from src/main/java/refinedstorage/integration/jei/RefinedStorageJEIPlugin.java
rename to src/main/java/refinedstorage/integration/jei/RSJEIPlugin.java
index 033db65dc..fd483b9c9 100755
--- a/src/main/java/refinedstorage/integration/jei/RefinedStorageJEIPlugin.java
+++ b/src/main/java/refinedstorage/integration/jei/RSJEIPlugin.java
@@ -9,8 +9,8 @@ import refinedstorage.RSBlocks;
 import refinedstorage.container.ContainerSolderer;
 
 @JEIPlugin
-public class RefinedStorageJEIPlugin extends BlankModPlugin {
-    public static RefinedStorageJEIPlugin INSTANCE;
+public class RSJEIPlugin extends BlankModPlugin {
+    public static RSJEIPlugin INSTANCE;
 
     private IJeiRuntime runtime;
 
diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java
index 8f1b73958..0d871840d 100755
--- a/src/main/java/refinedstorage/tile/TileController.java
+++ b/src/main/java/refinedstorage/tile/TileController.java
@@ -57,7 +57,7 @@ import refinedstorage.network.MessageGridItemUpdate;
 import refinedstorage.tile.config.IRedstoneConfigurable;
 import refinedstorage.tile.config.RedstoneMode;
 import refinedstorage.tile.data.ITileDataProducer;
-import refinedstorage.tile.data.RefinedStorageSerializers;
+import refinedstorage.tile.data.RSSerializers;
 import refinedstorage.tile.data.TileDataParameter;
 import refinedstorage.tile.externalstorage.FluidStorageExternal;
 import refinedstorage.tile.externalstorage.ItemStorageExternal;
@@ -91,7 +91,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
         }
     });
 
-    public static final TileDataParameter<List<ClientNode>> NODES = new TileDataParameter<>(RefinedStorageSerializers.CLIENT_NODE_SERIALIZER, new ArrayList<>(), new ITileDataProducer<List<ClientNode>, TileController>() {
+    public static final TileDataParameter<List<ClientNode>> NODES = new TileDataParameter<>(RSSerializers.CLIENT_NODE_SERIALIZER, new ArrayList<>(), new ITileDataProducer<List<ClientNode>, TileController>() {
         @Override
         public List<ClientNode> getValue(TileController tile) {
             List<ClientNode> nodes = new ArrayList<>();
diff --git a/src/main/java/refinedstorage/tile/TileCraftingMonitor.java b/src/main/java/refinedstorage/tile/TileCraftingMonitor.java
index 0d7adf808..fc7e8043e 100755
--- a/src/main/java/refinedstorage/tile/TileCraftingMonitor.java
+++ b/src/main/java/refinedstorage/tile/TileCraftingMonitor.java
@@ -3,7 +3,7 @@ package refinedstorage.tile;
 import refinedstorage.RS;
 import refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement;
 import refinedstorage.tile.data.ITileDataProducer;
-import refinedstorage.tile.data.RefinedStorageSerializers;
+import refinedstorage.tile.data.RSSerializers;
 import refinedstorage.tile.data.TileDataParameter;
 
 import java.util.Collections;
@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 public class TileCraftingMonitor extends TileNode {
-    public static final TileDataParameter<List<ICraftingMonitorElement>> ELEMENTS = new TileDataParameter<>(RefinedStorageSerializers.CRAFTING_MONITOR_ELEMENT_SERIALIZER, Collections.emptyList(), new ITileDataProducer<List<ICraftingMonitorElement>, TileCraftingMonitor>() {
+    public static final TileDataParameter<List<ICraftingMonitorElement>> ELEMENTS = new TileDataParameter<>(RSSerializers.CRAFTING_MONITOR_ELEMENT_SERIALIZER, Collections.emptyList(), new ITileDataProducer<List<ICraftingMonitorElement>, TileCraftingMonitor>() {
         @Override
         public List<ICraftingMonitorElement> getValue(TileCraftingMonitor tile) {
             if (tile.connected) {
diff --git a/src/main/java/refinedstorage/tile/TileFluidInterface.java b/src/main/java/refinedstorage/tile/TileFluidInterface.java
index a71f24756..56971dfde 100755
--- a/src/main/java/refinedstorage/tile/TileFluidInterface.java
+++ b/src/main/java/refinedstorage/tile/TileFluidInterface.java
@@ -17,7 +17,7 @@ import refinedstorage.inventory.ItemHandlerUpgrade;
 import refinedstorage.item.ItemUpgrade;
 import refinedstorage.tile.config.IComparable;
 import refinedstorage.tile.data.ITileDataProducer;
-import refinedstorage.tile.data.RefinedStorageSerializers;
+import refinedstorage.tile.data.RSSerializers;
 import refinedstorage.tile.data.TileDataParameter;
 
 public class TileFluidInterface extends TileNode implements IComparable {
@@ -25,14 +25,14 @@ public class TileFluidInterface extends TileNode implements IComparable {
 
     public static final TileDataParameter<Integer> COMPARE = IComparable.createParameter();
 
-    public static final TileDataParameter<FluidStack> TANK_IN = new TileDataParameter<>(RefinedStorageSerializers.FLUID_STACK_SERIALIZER, null, new ITileDataProducer<FluidStack, TileFluidInterface>() {
+    public static final TileDataParameter<FluidStack> TANK_IN = new TileDataParameter<>(RSSerializers.FLUID_STACK_SERIALIZER, null, new ITileDataProducer<FluidStack, TileFluidInterface>() {
         @Override
         public FluidStack getValue(TileFluidInterface tile) {
             return tile.tankIn.getFluid();
         }
     });
 
-    public static final TileDataParameter<FluidStack> TANK_OUT = new TileDataParameter<>(RefinedStorageSerializers.FLUID_STACK_SERIALIZER, null, new ITileDataProducer<FluidStack, TileFluidInterface>() {
+    public static final TileDataParameter<FluidStack> TANK_OUT = new TileDataParameter<>(RSSerializers.FLUID_STACK_SERIALIZER, null, new ITileDataProducer<FluidStack, TileFluidInterface>() {
         @Override
         public FluidStack getValue(TileFluidInterface tile) {
             return tile.tankOut.getFluid();
diff --git a/src/main/java/refinedstorage/tile/data/RefinedStorageSerializers.java b/src/main/java/refinedstorage/tile/data/RSSerializers.java
similarity index 98%
rename from src/main/java/refinedstorage/tile/data/RefinedStorageSerializers.java
rename to src/main/java/refinedstorage/tile/data/RSSerializers.java
index ce765381f..73269248c 100755
--- a/src/main/java/refinedstorage/tile/data/RefinedStorageSerializers.java
+++ b/src/main/java/refinedstorage/tile/data/RSSerializers.java
@@ -16,7 +16,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Function;
 
-public final class RefinedStorageSerializers {
+public final class RSSerializers {
     public static final DataSerializer<List<ClientNode>> CLIENT_NODE_SERIALIZER = new DataSerializer<List<ClientNode>>() {
         @Override
         public void write(PacketBuffer buf, List<ClientNode> nodes) {