diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java
index 4f1220a18..5a135fdca 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java
@@ -30,7 +30,7 @@ import net.minecraftforge.items.IItemHandler;
 public abstract class BlockBase extends Block {
     public static final PropertyDirection DIRECTION = PropertyDirection.create("direction");
 
-    private String name;
+    private final String name;
 
     public BlockBase(String name) {
         super(Material.ROCK);
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/RSMCMPAddon.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/RSMCMPAddon.java
index 3c13d479a..226b56258 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/RSMCMPAddon.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/RSMCMPAddon.java
@@ -2,6 +2,7 @@ package com.raoulvdberge.refinedstorage.integration.mcmp;
 
 import com.raoulvdberge.refinedstorage.RSBlocks;
 import com.raoulvdberge.refinedstorage.block.BlockCable;
+import com.raoulvdberge.refinedstorage.tile.*;
 import mcmultipart.api.addon.IMCMPAddon;
 import mcmultipart.api.addon.MCMPAddon;
 import mcmultipart.api.container.IPartInfo;
@@ -56,14 +57,25 @@ public class RSMCMPAddon implements IMCMPAddon {
 
     @SubscribeEvent
     public void onAttachCapability(AttachCapabilitiesEvent<TileEntity> e) {
-        register(e, "cable");
-        register(e, "constructor");
-        register(e, "destructor");
-        register(e, "importer");
-        register(e, "exporter");
-        register(e, "external_storage");
-        register(e, "reader");
-        register(e, "writer");
+        TileEntity tile = e.getObject();
+
+        if (tile instanceof TileCable) {
+            register(e, "cable");
+        } else if (tile instanceof TileConstructor) {
+            register(e, "constructor");
+        } else if (tile instanceof TileDestructor) {
+            register(e, "destructor");
+        } else if (tile instanceof TileImporter) {
+            register(e, "importer");
+        } else if (tile instanceof TileExporter) {
+            register(e, "exporter");
+        } else if (tile instanceof TileExternalStorage) {
+            register(e, "external_storage");
+        } else if (tile instanceof TileReader) {
+            register(e, "reader");
+        } else if (tile instanceof TileWriter) {
+            register(e, "writer");
+        }
     }
 
     private void register(AttachCapabilitiesEvent<TileEntity> e, String id) {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBase.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBase.java
index 39cf9c466..72182cff5 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBase.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBase.java
@@ -5,7 +5,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
 public abstract class ItemBase extends Item {
-    private String name;
+    private final String name;
 
     public ItemBase(String name) {
         this.name = name;