diff --git a/src/main/java/info/jbcs/minecraft/chisel/BlockNameConversion.java b/src/main/java/info/jbcs/minecraft/chisel/BlockNameConversion.java
new file mode 100644
index 00000000..e10518f2
--- /dev/null
+++ b/src/main/java/info/jbcs/minecraft/chisel/BlockNameConversion.java
@@ -0,0 +1,105 @@
+package info.jbcs.minecraft.chisel;
+
+import info.jbcs.minecraft.utilities.General;
+
+import java.util.HashMap;
+
+import cpw.mods.fml.common.FMLLog;
+import cpw.mods.fml.common.registry.GameRegistry;
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+
+public class BlockNameConversion
+{
+    static final private HashMap<String, String> namingConversion = new HashMap<String, String>();
+
+    public static class NameConversions
+    {
+        public final static int MAX = 5;
+
+        protected static String conversion(String oldname, int step)
+        {
+            oldname = General.cleanTags(oldname);
+            String newname = null;
+            switch (step) {
+                case 0: // lookup list
+                    return namingConversion.get(oldname);
+                case 1: // simple lower case
+                    return oldname.toLowerCase();
+                case 2: // rename "marbleSlab" -> "marble_slab", "blockRedstone" -> "redstone_block"
+                    newname = oldname.replaceAll("([a-z]+)([A-Z])", "$1_$2").toLowerCase();
+                    if (newname.startsWith("block_"))
+                    {
+                        newname = newname.replaceFirst("block_([a-z_]+)", "$1_block");
+                    }
+                    else if (newname.startsWith("snakestone_"))
+                    {
+                        newname = newname.replaceFirst("snakestone_([a-z_]+)", "$1_snakestone");
+                    }
+                    return newname;
+                case 3: // rename "wood-dark-oak" -> "dark_oak_planks"
+                    newname = oldname.replaceAll("([a-z]+)([A-Z])", "$1_$2").toLowerCase().replace('-', '_');
+                    if (newname.contains("wood_"))
+                    {
+                        newname = newname.replaceFirst("wood_([a-z_]+)", "$1_planks");
+                    }
+                    return newname;
+                case (MAX - 1): // ALWAYS last: rename "blockYxx" -> "yxx" (e.g. "blockDirt" -> "dirt").
+                                // This can be dangerous in cases like "blockCarpet" (a block) -> "carpet" (NO block)
+                    return oldname.replaceAll("([a-z]+)([A-Z])", "$1_$2").toLowerCase().replaceFirst("block_", "");
+                default:
+                    throw new IndexOutOfBoundsException("conversion got invalid parameter step=" + step);
+            }
+        }
+    }
+
+    static public void init()
+    {
+        namingConversion.put("blockCobble", "cobblestone");
+        namingConversion.put("iron", "iron_block");
+        namingConversion.put("gold", "gold_block");
+        namingConversion.put("diamond", "diamond_block");
+        namingConversion.put("lightstone", "glowstone");
+        namingConversion.put("lapis", "lapis_block");
+        namingConversion.put("emerald", "emerald_block");
+        namingConversion.put("hellrock", "netherrack");
+        namingConversion.put("stoneMoss", "mossy_cobblestone");
+        namingConversion.put("stoneBrick", "stonebrick");
+        namingConversion.put("fenceIron", "iron_bars");
+        namingConversion.put("blockFft", "fantasyblock");
+        namingConversion.put("blockCarpetFloor", "carpet");
+        namingConversion.put("blockTemple", "templeblock");
+        namingConversion.put("blockTempleMossy", "mossy_templeblock");
+        namingConversion.put("blockFactory", "factoryblock");
+        namingConversion.put("blockLaboratory", "laboratoryblock");
+        // "LightGray" is unfortunately converted to "light_gray"
+        namingConversion.put("stainedGlassLightGray", "stained_glass_lightgray");
+        namingConversion.put("stainedGlassPaneLightGray", "stained_glass_pane_lightgray");
+    }
+
+    public static Item findItem(String oldname)
+    {
+        FMLLog.getLogger().trace("findItem() START " + oldname);
+        Item item = null;
+        for (int i = 0; i < NameConversions.MAX && item == null; i++)
+        {
+            FMLLog.getLogger().trace("findItem()       Checking for " + NameConversions.conversion(oldname, i));
+            item = GameRegistry.findItem(Chisel.MOD_ID, NameConversions.conversion(oldname, i));
+        }
+
+        return item;
+    }
+
+    public static Block findBlock(String oldname)
+    {
+        FMLLog.getLogger().trace("findBlock() START: " + oldname);
+        Block block = null;
+        for (int i = 0; i < NameConversions.MAX && block == null; i++)
+        {
+            FMLLog.getLogger().trace("findBlock()       Checking for " + NameConversions.conversion(oldname, i));
+            block = GameRegistry.findBlock(Chisel.MOD_ID, NameConversions.conversion(oldname, i));
+        }
+
+        return block;
+    }
+}
diff --git a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java
index ca5f7e69..0f0adbe9 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java
@@ -74,6 +74,8 @@ public class Chisel
     @EventHandler
     public void missingMapping(FMLMissingMappingsEvent event)
     {
+        BlockNameConversion.init();
+
         for(MissingMapping m : event.get())
         {
             // This bug was introduced along with Chisel 1.5.2, and was fixed in 1.5.3.
@@ -87,8 +89,7 @@ public class Chisel
             // Fix mapping of snakestoneSand, snakestoneStone, limestoneStairs, marbleStairs when loading an old (1.5.4) save
             else if(m.type == Type.BLOCK)
             {
-                Block block = null;
-                block = GameRegistry.findBlock(Chisel.MOD_ID, General.cleanTags(m.name));
+                final Block block = BlockNameConversion.findBlock(m.name);
 
                 if(block != null)
                 {
@@ -98,8 +99,7 @@ public class Chisel
                     FMLLog.getLogger().warn("Block " + m.name + " could not get remapped.");
             } else if(m.type == Type.ITEM)
             {
-                Item item = null;
-                item = GameRegistry.findItem(Chisel.MOD_ID, General.cleanTags(m.name));
+                final Item item = BlockNameConversion.findItem(m.name);
 
                 if(item != null)
                 {