diff --git a/src/main/java/appeng/core/features/AEBlockFeatureHandler.java b/src/main/java/appeng/core/features/AEBlockFeatureHandler.java
index 00813a03..1af21e09 100644
--- a/src/main/java/appeng/core/features/AEBlockFeatureHandler.java
+++ b/src/main/java/appeng/core/features/AEBlockFeatureHandler.java
@@ -81,7 +81,6 @@ public final class AEBlockFeatureHandler implements IFeatureHandler
 			final String name = this.extractor.get();
 			this.featured.setCreativeTab( CreativeTab.instance );
 			this.featured.setUnlocalizedName( "appliedenergistics2." + name );
-			this.featured.setBlockTextureName( name );
 
 			registryName = new ResourceLocation( AppEng.MOD_ID, name );
 			GameRegistry.register( this.featured.setRegistryName( registryName ) );
diff --git a/src/main/java/appeng/core/features/AECableBusFeatureHandler.java b/src/main/java/appeng/core/features/AECableBusFeatureHandler.java
index 846e3920..5201c055 100644
--- a/src/main/java/appeng/core/features/AECableBusFeatureHandler.java
+++ b/src/main/java/appeng/core/features/AECableBusFeatureHandler.java
@@ -84,7 +84,6 @@ public final class AECableBusFeatureHandler implements IFeatureHandler
 			final String name = this.extractor.get();
 			this.featured.setCreativeTab( CreativeTab.instance );
 			this.featured.setUnlocalizedName( /* "tile." */"appliedenergistics2." + name );
-			this.featured.setBlockTextureName( name );
 
 			if( Platform.isClient() )
 			{
diff --git a/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java b/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java
index 4597a349..4553475e 100644
--- a/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java
+++ b/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java
@@ -89,7 +89,6 @@ public final class AETileBlockFeatureHandler implements IFeatureHandler
 			final String name = this.extractor.get();
 			this.featured.setCreativeTab( CreativeTab.instance );
 			this.featured.setUnlocalizedName( /* "tile." */"appliedenergistics2." + name );
-			this.featured.setBlockTextureName( name );
 
 			if( Platform.isClient() )
 			{
@@ -140,7 +139,7 @@ public final class AETileBlockFeatureHandler implements IFeatureHandler
 		Set<ModelResourceLocation> keys = Sets.newHashSet( modelRegistry.getKeys() );
 		for( ModelResourceLocation model : keys )
 		{
-			if( model.getResourcePath().equals( registryName.getResourcePath() ) )
+			if( model.getResourceDomain().equals( registryName.getResourceDomain() ) && model.getResourcePath().equals( registryName.getResourcePath() ) )
 			{
 				modelRegistry.putObject( model, new CachingRotatingBakedModel( modelRegistry.getObject( model ) ) );
 			}
diff --git a/src/main/java/appeng/decorative/solid/QuartzLampBlock.java b/src/main/java/appeng/decorative/solid/QuartzLampBlock.java
index bdcb6112..f4ce0d0f 100644
--- a/src/main/java/appeng/decorative/solid/QuartzLampBlock.java
+++ b/src/main/java/appeng/decorative/solid/QuartzLampBlock.java
@@ -39,7 +39,6 @@ public class QuartzLampBlock extends QuartzGlassBlock
 	public QuartzLampBlock()
 	{
 		this.setLightLevel( 1.0f );
-		this.setBlockTextureName( "BlockQuartzGlass" );
 		this.setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks, AEFeature.DecorativeLights ) );
 	}