diff --git a/src/content_mapnode.cpp b/src/content_mapnode.cpp
index eb8e4002a..cddc552d4 100644
--- a/src/content_mapnode.cpp
+++ b/src/content_mapnode.cpp
@@ -260,46 +260,46 @@ class NewNameGetter
 public:
 	NewNameGetter()
 	{
-		old_to_new["CONTENT_STONE"] = "";
-		old_to_new["CONTENT_WATER"] = "";
-		old_to_new["CONTENT_TORCH"] = "";
-		old_to_new["CONTENT_WATERSOURCE"] = "";
-		old_to_new["CONTENT_SIGN_WALL"] = "";
-		old_to_new["CONTENT_CHEST"] = "";
-		old_to_new["CONTENT_FURNACE"] = "";
-		old_to_new["CONTENT_LOCKABLE_CHEST"] = "";
-		old_to_new["CONTENT_FENCE"] = "";
-		old_to_new["CONTENT_RAIL"] = "";
-		old_to_new["CONTENT_LADDER"] = "";
-		old_to_new["CONTENT_LAVA"] = "";
-		old_to_new["CONTENT_LAVASOURCE"] = "";
-		old_to_new["CONTENT_GRASS"] = "";
-		old_to_new["CONTENT_TREE"] = "";
-		old_to_new["CONTENT_LEAVES"] = "";
-		old_to_new["CONTENT_GRASS_FOOTSTEPS"] = "";
-		old_to_new["CONTENT_MESE"] = "";
-		old_to_new["CONTENT_MUD"] = "";
-		old_to_new["CONTENT_CLOUD"] = "";
-		old_to_new["CONTENT_COALSTONE"] = "";
-		old_to_new["CONTENT_WOOD"] = "";
-		old_to_new["CONTENT_SAND"] = "";
-		old_to_new["CONTENT_COBBLE"] = "";
-		old_to_new["CONTENT_STEEL"] = "";
-		old_to_new["CONTENT_GLASS"] = "";
-		old_to_new["CONTENT_MOSSYCOBBLE"] = "";
-		old_to_new["CONTENT_GRAVEL"] = "";
-		old_to_new["CONTENT_SANDSTONE"] = "";
-		old_to_new["CONTENT_CACTUS"] = "";
-		old_to_new["CONTENT_BRICK"] = "";
-		old_to_new["CONTENT_CLAY"] = "";
-		old_to_new["CONTENT_PAPYRUS"] = "";
-		old_to_new["CONTENT_BOOKSHELF"] = "";
-		old_to_new["CONTENT_JUNGLETREE"] = "";
-		old_to_new["CONTENT_JUNGLEGRASS"] = "";
-		old_to_new["CONTENT_NC"] = "";
-		old_to_new["CONTENT_NC_RB"] = "";
-		old_to_new["CONTENT_APPLE"] = "";
-		old_to_new["CONTENT_SAPLING"] = "";
+		old_to_new["CONTENT_STONE"] = "stone";
+		old_to_new["CONTENT_WATER"] = "water_flowing";
+		old_to_new["CONTENT_TORCH"] = "torch";
+		old_to_new["CONTENT_WATERSOURCE"] = "water_source";
+		old_to_new["CONTENT_SIGN_WALL"] = "sign_wall";
+		old_to_new["CONTENT_CHEST"] = "chest";
+		old_to_new["CONTENT_FURNACE"] = "furnace";
+		old_to_new["CONTENT_LOCKABLE_CHEST"] = "locked_chest";
+		old_to_new["CONTENT_FENCE"] = "wooden_fence";
+		old_to_new["CONTENT_RAIL"] = "rail";
+		old_to_new["CONTENT_LADDER"] = "ladder";
+		old_to_new["CONTENT_LAVA"] = "lava_flowing";
+		old_to_new["CONTENT_LAVASOURCE"] = "lava_source";
+		old_to_new["CONTENT_GRASS"] = "dirt_with_grass";
+		old_to_new["CONTENT_TREE"] = "tree";
+		old_to_new["CONTENT_LEAVES"] = "leaves";
+		old_to_new["CONTENT_GRASS_FOOTSTEPS"] = "dirt_with_grass_footsteps";
+		old_to_new["CONTENT_MESE"] = "mese";
+		old_to_new["CONTENT_MUD"] = "dirt";
+		old_to_new["CONTENT_CLOUD"] = "cloud";
+		old_to_new["CONTENT_COALSTONE"] = "coalstone";
+		old_to_new["CONTENT_WOOD"] = "wood";
+		old_to_new["CONTENT_SAND"] = "sand";
+		old_to_new["CONTENT_COBBLE"] = "cobble";
+		old_to_new["CONTENT_STEEL"] = "steel";
+		old_to_new["CONTENT_GLASS"] = "glass";
+		old_to_new["CONTENT_MOSSYCOBBLE"] = "mossycobble";
+		old_to_new["CONTENT_GRAVEL"] = "gravel";
+		old_to_new["CONTENT_SANDSTONE"] = "sandstone";
+		old_to_new["CONTENT_CACTUS"] = "cactus";
+		old_to_new["CONTENT_BRICK"] = "brick";
+		old_to_new["CONTENT_CLAY"] = "clay";
+		old_to_new["CONTENT_PAPYRUS"] = "papyrus";
+		old_to_new["CONTENT_BOOKSHELF"] = "bookshelf";
+		old_to_new["CONTENT_JUNGLETREE"] = "jungletree";
+		old_to_new["CONTENT_JUNGLEGRASS"] = "junglegrass";
+		old_to_new["CONTENT_NC"] = "nyancat";
+		old_to_new["CONTENT_NC_RB"] = "nyancat_rainbow";
+		old_to_new["CONTENT_APPLE"] = "apple";
+		old_to_new["CONTENT_SAPLING"] = "sapling";
 		// Just in case
 		old_to_new["CONTENT_IGNORE"] = "ignore";
 		old_to_new["CONTENT_AIR"] = "air";