diff --git a/src/main/java/org/dynmap/bukkit/BukkitWorld.java b/src/main/java/org/dynmap/bukkit/BukkitWorld.java
index 3084fb8a..9873d5f5 100644
--- a/src/main/java/org/dynmap/bukkit/BukkitWorld.java
+++ b/src/main/java/org/dynmap/bukkit/BukkitWorld.java
@@ -15,7 +15,7 @@ public class BukkitWorld extends DynmapWorld {
     private World world;
     
     public BukkitWorld(World w) {
-        super(normalizeWorldName(w.getName()), w.getMaxHeight(), w.getSeaLevel());
+        super(w.getName(), w.getMaxHeight(), w.getSeaLevel());
         
         world = w;
     }
@@ -93,8 +93,4 @@ public class BukkitWorld extends DynmapWorld {
     public World getWorld() {
         return world;
     }
-    
-    public static String normalizeWorldName(String n) {
-        return n.replace('/', '-');
-    }
 }
diff --git a/src/main/java/org/dynmap/bukkit/DynmapPlugin.java b/src/main/java/org/dynmap/bukkit/DynmapPlugin.java
index 9fc79d71..c6144ca7 100644
--- a/src/main/java/org/dynmap/bukkit/DynmapPlugin.java
+++ b/src/main/java/org/dynmap/bukkit/DynmapPlugin.java
@@ -610,7 +610,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
     }
     
     private static DynmapLocation toLoc(Location l) {
-        return new DynmapLocation(BukkitWorld.normalizeWorldName(l.getWorld().getName()), l.getBlockX(), l.getBlockY(), l.getBlockZ());
+        return new DynmapLocation(DynmapWorld.normalizeWorldName(l.getWorld().getName()), l.getBlockX(), l.getBlockY(), l.getBlockZ());
     }
     
     private void registerPlayerLoginListener() {