diff --git a/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java b/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java
index cf2eff007..a8852f0a8 100644
--- a/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java
+++ b/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java
@@ -23,12 +23,14 @@ import java.util.EnumSet;
 
 import com.google.common.base.Optional;
 
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.common.registry.GameData;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.fml.relauncher.Side;
 
 import appeng.api.definitions.ITileDefinition;
 import appeng.block.AEBaseTileBlock;
+import appeng.core.AppEng;
 import appeng.core.CommonHelper;
 import appeng.core.CreativeTab;
 import appeng.tile.AEBaseTile;
@@ -79,11 +81,11 @@ public final class AETileBlockFeatureHandler implements IFeatureHandler
 				CommonHelper.proxy.bindTileEntitySpecialRenderer( this.featured.getTileEntityClass(), this.featured );
 			}
 
-			final String registryName = "tile." + name;
+			final ResourceLocation registryName = new ResourceLocation( AppEng.MOD_ID, "tile." + name );
 
 			// Bypass the forge magic with null to register our own itemblock later.
-			GameRegistry.registerBlock( this.featured, null, registryName );
-			GameRegistry.registerItem( this.definition.maybeItem().get(), registryName );
+			GameRegistry.register( this.featured.setRegistryName( registryName ) );
+			GameRegistry.register( this.definition.maybeItem().get().setRegistryName( registryName ) );
 			AEBaseTile.registerTileItem( this.featured.getTileEntityClass(), new BlockStackSrc( this.featured, 0, ActivityState.from( this.isFeatureAvailable() ) ) );
 
 			// register the block/item conversion...
diff --git a/src/main/java/appeng/core/features/ItemFeatureHandler.java b/src/main/java/appeng/core/features/ItemFeatureHandler.java
index 656539db3..f2ef6c404 100644
--- a/src/main/java/appeng/core/features/ItemFeatureHandler.java
+++ b/src/main/java/appeng/core/features/ItemFeatureHandler.java
@@ -28,6 +28,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.fml.relauncher.Side;
 
 import appeng.api.definitions.IItemDefinition;
+import appeng.core.AppEng;
 import appeng.core.CommonHelper;
 import appeng.core.CreativeTab;
 import appeng.core.CreativeTabFacade;
@@ -93,7 +94,7 @@ public final class ItemFeatureHandler implements IFeatureHandler
 			}
 
 			// "item." +
-			GameRegistry.registerItem( this.item, name );
+			GameRegistry.register( this.item.setRegistryName( AppEng.MOD_ID, name ) );
 		}
 	}
 
diff --git a/src/main/java/appeng/core/features/StairBlockFeatureHandler.java b/src/main/java/appeng/core/features/StairBlockFeatureHandler.java
index 3e9324832..45190ceb5 100644
--- a/src/main/java/appeng/core/features/StairBlockFeatureHandler.java
+++ b/src/main/java/appeng/core/features/StairBlockFeatureHandler.java
@@ -30,6 +30,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.fml.relauncher.Side;
 
 import appeng.api.definitions.IBlockDefinition;
+import appeng.core.AppEng;
 import appeng.core.CommonHelper;
 import appeng.core.CreativeTab;
 
@@ -72,7 +73,7 @@ public class StairBlockFeatureHandler implements IFeatureHandler
 			this.stairs.setCreativeTab( CreativeTab.instance );
 			this.stairs.setUnlocalizedName( "appliedenergistics2." + name );
 
-			GameRegistry.registerBlock( this.stairs, name );
+			GameRegistry.register( this.stairs.setRegistryName( AppEng.MOD_ID, name ) );
 		}
 	}
 }