diff --git a/MCGalaxy/Commands/CPE/CustomBlockCommand.cs b/MCGalaxy/Commands/CPE/CustomBlockCommand.cs
index 50281b3ac..ecd67ef9c 100644
--- a/MCGalaxy/Commands/CPE/CustomBlockCommand.cs
+++ b/MCGalaxy/Commands/CPE/CustomBlockCommand.cs
@@ -807,7 +807,7 @@ namespace MCGalaxy.Commands.CPE {
         internal static void Help(Player p, string cmd, string args) {
             if (args.CaselessEq("2")) { 
                 p.Message("%H{0} help page 2:", cmd.Substring(1));
-                p.Message("%T{0} copyall [map] %H- clones all custom blocks from [map]", cmd);                
+                p.Message("%T{0} copyall [level] %H- clones all custom blocks from [level]", cmd);                
                 p.Message("%T{0} list <offset> %H- lists all custom blocks", cmd);
                 p.Message("%T{0} info [id] %H- shows info about that custom block", cmd);
                 p.Message("%HYou may edit, remove or see info for multiple IDs at once.");
diff --git a/MCGalaxy/Commands/Fun/ZombieSurvival/CmdQueue.cs b/MCGalaxy/Commands/Fun/ZombieSurvival/CmdQueue.cs
index 850d64335..60ccd8c28 100644
--- a/MCGalaxy/Commands/Fun/ZombieSurvival/CmdQueue.cs
+++ b/MCGalaxy/Commands/Fun/ZombieSurvival/CmdQueue.cs
@@ -55,8 +55,8 @@ namespace MCGalaxy.Commands.Fun {
         public override void Help(Player p) {
             p.Message("%T/Queue zombie [name]");
             p.Message("%HNext round [name] will be infected/start zombie");
-            p.Message("%T/Queue level [map]");
-            p.Message("%HNext round [map] will be the level used");
+            p.Message("%T/Queue level [level]");
+            p.Message("%HNext round [level] will be the level used");
         }
     }
 }
diff --git a/MCGalaxy/Commands/Information/CmdMapInfo.cs b/MCGalaxy/Commands/Information/CmdMapInfo.cs
index 27496f209..2dca8147f 100644
--- a/MCGalaxy/Commands/Information/CmdMapInfo.cs
+++ b/MCGalaxy/Commands/Information/CmdMapInfo.cs
@@ -231,10 +231,10 @@ namespace MCGalaxy.Commands.Info {
         }
         
         public override void Help(Player p)  {
-            p.Message("%T/MapInfo [map]");
-            p.Message("%HDisplay details of [map]");
-            p.Message("%T/MapInfo env [map]");
-            p.Message("%HDisplay environment details of [map]");
+            p.Message("%T/MapInfo [level]");
+            p.Message("%HDisplay details of [level]");
+            p.Message("%T/MapInfo env [level]");
+            p.Message("%HDisplay environment details of [level]");
         }
     }
 }
diff --git a/MCGalaxy/Commands/Maintenance/CmdBlockDB.cs b/MCGalaxy/Commands/Maintenance/CmdBlockDB.cs
index 487a2103f..6ac98939b 100644
--- a/MCGalaxy/Commands/Maintenance/CmdBlockDB.cs
+++ b/MCGalaxy/Commands/Maintenance/CmdBlockDB.cs
@@ -64,13 +64,13 @@ namespace MCGalaxy.Commands.Maintenance {
         }
         
         public override void Help(Player p) {
-            p.Message("%T/BlockDB clear [map]");
-            p.Message("%HClears the BlockDB (block changes stored in /about) for [map]");
-            p.Message("%T/BlockDB disable [map]");
-            p.Message("%HDisables recording block changes to the BlockDB for [map]");
-            p.Message("%T/BlockDB enable [map]");
-            p.Message("%HEnables %Hrecording block changes to the BlockDB for [map]");
-            p.Message("%HIf no map name is given, uses your current map.");
+            p.Message("%T/BlockDB clear [level]");
+            p.Message("%HClears the BlockDB (block changes stored in /b) for [level]");
+            p.Message("%T/BlockDB disable [level]");
+            p.Message("%HDisables recording block changes to the BlockDB for [level]");
+            p.Message("%T/BlockDB enable [level]");
+            p.Message("%HEnables %Hrecording block changes to the BlockDB for [level]");
+            p.Message("%HIf [level] is not given, uses your current level.");
             p.Message("%WUse these commands with great caution!");
         }
     }
diff --git a/MCGalaxy/Commands/World/CmdCopyLVL.cs b/MCGalaxy/Commands/World/CmdCopyLVL.cs
index 473b31e84..6f482f744 100644
--- a/MCGalaxy/Commands/World/CmdCopyLVL.cs
+++ b/MCGalaxy/Commands/World/CmdCopyLVL.cs
@@ -46,13 +46,13 @@ namespace MCGalaxy.Commands.World {
             if (!Formatter.ValidMapName(p, dst)) return;
 
             if (!LevelActions.Copy(p, src, dst)) return;
-            Chat.MessageGlobal("Map {0} %Swas copied to {1}", cfg.Color + src, cfg.Color + dst);
+            Chat.MessageGlobal("Level {0} %Swas copied to {1}", cfg.Color + src, cfg.Color + dst);
         }
         
         public override void Help(Player p) {
-            p.Message("%T/CopyLvl [map] [copied map]");
-            p.Message("%HMakes a copy of [map] called [copied map].");
-            p.Message("%HNote: The map's BlockDB is not copied.");
+            p.Message("%T/CopyLvl [level] [copied level]");
+            p.Message("%HMakes a copy of [level] called [copied level].");
+            p.Message("%HNote: The level's BlockDB is not copied.");
         }
     }
 }
diff --git a/MCGalaxy/Commands/World/CmdDeleteLvl.cs b/MCGalaxy/Commands/World/CmdDeleteLvl.cs
index 1200c7fa2..b0473c6f3 100644
--- a/MCGalaxy/Commands/World/CmdDeleteLvl.cs
+++ b/MCGalaxy/Commands/World/CmdDeleteLvl.cs
@@ -38,13 +38,13 @@ namespace MCGalaxy.Commands.World {
             if (!LevelInfo.Check(p, data.Rank, map, "delete this map",out cfg)) return;
 
             if (!LevelActions.Delete(p, map)) return;
-            Chat.MessageGlobal("Map {0} %Swas deleted", cfg.Color + map);
+            Chat.MessageGlobal("Level {0} %Swas deleted", cfg.Color + map);
         }
         
         public override void Help(Player p) {
-            p.Message("%T/DeleteLvl [map]");
-            p.Message("%HCompletely deletes [map] (portals, MBs, everything)");
-            p.Message("%HA backup of the map is made in the levels/deleted folder");
+            p.Message("%T/DeleteLvl [level]");
+            p.Message("%HCompletely deletes [level] (portals, MBs, everything)");
+            p.Message("%HA backup of the level is made in the levels/deleted folder");
         }
     }
 }
diff --git a/MCGalaxy/Commands/World/CmdLockdown.cs b/MCGalaxy/Commands/World/CmdLockdown.cs
index c5822cb5a..7b063b5b1 100644
--- a/MCGalaxy/Commands/World/CmdLockdown.cs
+++ b/MCGalaxy/Commands/World/CmdLockdown.cs
@@ -51,9 +51,9 @@ namespace MCGalaxy.Commands.World {
         }
         
         public override void Help(Player p) {
-            p.Message("%T/Lockdown [map]");
-            p.Message("%HPrevents new players from joining that map.");
-            p.Message("%HUsing /lockdown again will unlock that map");
+            p.Message("%T/Lockdown [level]");
+            p.Message("%HPrevents new players from joining that level.");
+            p.Message("%HUsing /lockdown again will unlock that level");
         }
     }
 }
diff --git a/MCGalaxy/Commands/World/CmdMain.cs b/MCGalaxy/Commands/World/CmdMain.cs
index e549a1759..b3da71fbb 100644
--- a/MCGalaxy/Commands/World/CmdMain.cs
+++ b/MCGalaxy/Commands/World/CmdMain.cs
@@ -54,8 +54,8 @@ namespace MCGalaxy.Commands.World {
         public override void Help(Player p) {
             p.Message("%T/Main");
             p.Message("%HSends you to the main level.");
-            p.Message("%T/Main [map]");
-            p.Message("%HSets the main level to that map.");
+            p.Message("%T/Main [level]");
+            p.Message("%HSets the main level to that level.");
         }
     }
 }
diff --git a/MCGalaxy/Commands/World/CmdMap.cs b/MCGalaxy/Commands/World/CmdMap.cs
index c00eb707b..8883ae760 100644
--- a/MCGalaxy/Commands/World/CmdMap.cs
+++ b/MCGalaxy/Commands/World/CmdMap.cs
@@ -118,7 +118,7 @@ namespace MCGalaxy.Commands.World {
         static string GetBool(bool value) { return value ? "&aON" : "&cOFF"; }
 
         public override void Help(Player p) {
-            p.Message("%T/Map [map] [option] <value> %H- Sets [option] on that map");
+            p.Message("%T/Map [level] [option] <value> %H- Sets [option] on that level");
             p.Message("%HUse %T/Help map options %Hfor a list of options");
             p.Message("%HUse %T/Help map [option] %Hto see description for that option");
         }
diff --git a/MCGalaxy/Commands/World/CmdMuseum.cs b/MCGalaxy/Commands/World/CmdMuseum.cs
index 3881a16b8..933c0b3a2 100644
--- a/MCGalaxy/Commands/World/CmdMuseum.cs
+++ b/MCGalaxy/Commands/World/CmdMuseum.cs
@@ -71,8 +71,8 @@ namespace MCGalaxy.Commands.World {
         }
         
         public override void Help(Player p) {
-            p.Message("%T/Museum [map] [backup]");
-            p.Message("%HTeleports you to a backup of the given map.");
+            p.Message("%T/Museum [level] [backup]");
+            p.Message("%HTeleports you to a backup of the given level.");
         }
     }
 }
diff --git a/MCGalaxy/Commands/World/CmdOverseer.SubCommands.cs b/MCGalaxy/Commands/World/CmdOverseer.SubCommands.cs
index 841c134b7..0d4188672 100644
--- a/MCGalaxy/Commands/World/CmdOverseer.SubCommands.cs
+++ b/MCGalaxy/Commands/World/CmdOverseer.SubCommands.cs
@@ -187,11 +187,7 @@ namespace MCGalaxy.Commands.World {
                 p.Message("To delete your current map, type %T/os map delete");
                 return;
             }
-            
-            string map = p.level.name;
-            if (LevelActions.Delete(p, map)) {
-                p.Message("Map " + map + " was removed.");
-            }
+            UseCommand(p, "DeleteLvl", p.level.name);
         }
 
 
diff --git a/MCGalaxy/Commands/World/CmdPause.cs b/MCGalaxy/Commands/World/CmdPause.cs
index 2de8a863c..2e860cb9c 100644
--- a/MCGalaxy/Commands/World/CmdPause.cs
+++ b/MCGalaxy/Commands/World/CmdPause.cs
@@ -67,9 +67,9 @@ namespace MCGalaxy.Commands.World {
         }
         
         public override void Help(Player p) {
-            p.Message("%T/Pause [map] [seconds]");
-            p.Message("%HPauses physics on the given map for the specified number of seconds.");
-            p.Message("%H  If [map] is not given, pauses physics on the current map.");
+            p.Message("%T/Pause [level] [seconds]");
+            p.Message("%HPauses physics on the given level for the given number of seconds.");
+            p.Message("%H  If [level] is not given, pauses physics on the current level.");
             p.Message("%H  If [seconds] is not given, pauses physics for 30 seconds.");
         }
     }
diff --git a/MCGalaxy/Commands/World/CmdPhysics.cs b/MCGalaxy/Commands/World/CmdPhysics.cs
index 41c4b9c0b..94dce3a19 100644
--- a/MCGalaxy/Commands/World/CmdPhysics.cs
+++ b/MCGalaxy/Commands/World/CmdPhysics.cs
@@ -78,9 +78,9 @@ namespace MCGalaxy.Commands.World {
         }
 
         public override void Help(Player p) {
-            p.Message("%T/Physics [map] [0/1/2/3/4/5]");
-            p.Message("%HSets the physics state for the given map.");
-            p.Message("%H  If no map name is given, uses the current map.");
+            p.Message("%T/Physics [level] [0/1/2/3/4/5]");
+            p.Message("%HSets the physics state for the given level.");
+            p.Message("%H  If [level] is not given, uses the current level.");
             p.Message("%H  0 = off, 1 = on, 2 = advanced, 3 = hardcore, 4 = instant, 5 = doors only");
             p.Message("%T/Physics kill %H- Sets physics to 0 on all loaded levels.");
         }
diff --git a/MCGalaxy/Commands/World/CmdReload.cs b/MCGalaxy/Commands/World/CmdReload.cs
index fdaf8bfba..21155711f 100644
--- a/MCGalaxy/Commands/World/CmdReload.cs
+++ b/MCGalaxy/Commands/World/CmdReload.cs
@@ -56,7 +56,7 @@ namespace MCGalaxy.Commands.World {
         public override void Help(Player p) {
             p.Message("%T/Reload %H- Reloads the map you are in, just for you.");
             p.Message("%T/Reload all %H- Reloads for all players in map you are in.");
-            p.Message("%T/Reload all [map] %H- Reloads for all players in [map]");
+            p.Message("%T/Reload all [level] %H- Reloads for all players in [level]");
         }
     }
 }
diff --git a/MCGalaxy/Commands/World/CmdRenameLvl.cs b/MCGalaxy/Commands/World/CmdRenameLvl.cs
index 9581f2e73..75b928b18 100644
--- a/MCGalaxy/Commands/World/CmdRenameLvl.cs
+++ b/MCGalaxy/Commands/World/CmdRenameLvl.cs
@@ -41,12 +41,12 @@ namespace MCGalaxy.Commands.World {
             if (!Formatter.ValidMapName(p, dst)) return;
 
             if (!LevelActions.Rename(p, src, dst)) return;
-            Chat.MessageGlobal("Map {0} %Swas renamed to {1}", cfg.Color + src, cfg.Color + dst);
+            Chat.MessageGlobal("Level {0} %Swas renamed to {1}", cfg.Color + src, cfg.Color + dst);
         }
         
         public override void Help(Player p) {
-            p.Message("%T/RenameLvl [map] [new name]");
-            p.Message("%HRenames [map] to [new name]");
+            p.Message("%T/RenameLvl [level] [new name]");
+            p.Message("%HRenames [level] to [new name]");
         }
     }
 }
diff --git a/MCGalaxy/Commands/World/CmdRestore.cs b/MCGalaxy/Commands/World/CmdRestore.cs
index e0de7eb56..98c992b5b 100644
--- a/MCGalaxy/Commands/World/CmdRestore.cs
+++ b/MCGalaxy/Commands/World/CmdRestore.cs
@@ -95,10 +95,10 @@ namespace MCGalaxy.Commands.World {
         }
 
         public override void Help(Player p) {
-            p.Message("%T/Restore %H- lists all backups for the current map");
-            p.Message("%T/Restore [number] <map>");
-            p.Message("%HRestores a previous backup for the given map.");
-            p.Message("%H  If <map> is not given, your current map is used.");
+            p.Message("%T/Restore %H- lists all backups for the current level");
+            p.Message("%T/Restore [number] <level>");
+            p.Message("%HRestores a previous backup for the given level.");
+            p.Message("%H  If <level> is not given, the current level is used.");
         }
     }
 }
diff --git a/MCGalaxy/Commands/World/CmdSave.cs b/MCGalaxy/Commands/World/CmdSave.cs
index f1214d29a..3a2a39cbf 100644
--- a/MCGalaxy/Commands/World/CmdSave.cs
+++ b/MCGalaxy/Commands/World/CmdSave.cs
@@ -88,8 +88,8 @@ namespace MCGalaxy.Commands.World {
         public override void Help(Player p) {
             p.Message("%T/Save %H- Saves the level you are currently in");
             p.Message("%T/Save all %H- Saves all loaded levels.");
-            p.Message("%T/Save [map] %H- Saves the specified map.");
-            p.Message("%T/Save [map] [name] %H- Backups the map with a given restore name");
+            p.Message("%T/Save [level] %H- Saves the specified level.");
+            p.Message("%T/Save [level] [name] %H- Backups the level with a given restore name");
         }
     }
 }
diff --git a/MCGalaxy/Commands/World/PermissionCmds.cs b/MCGalaxy/Commands/World/PermissionCmds.cs
index 0217b58d3..92c06edd7 100644
--- a/MCGalaxy/Commands/World/PermissionCmds.cs
+++ b/MCGalaxy/Commands/World/PermissionCmds.cs
@@ -96,13 +96,13 @@ namespace MCGalaxy.Commands.World {
         }      
 
         protected void ShowHelp(Player p, string action, string action2) {
-            p.Message("%T/{0} [map] [rank]", name);
-            p.Message("%HSets the lowest rank able to {0} the given map.", action);
-            p.Message("%T/{0} -max [map] [Rank]", name);
-            p.Message("%HSets the highest rank able to {0} the given map.", action);
-            p.Message("%T/{0} [map] +[name]", name);
+            p.Message("%T/{0} [level] [rank]", name);
+            p.Message("%HSets the lowest rank able to {0} the given level.", action);
+            p.Message("%T/{0} -max [level] [Rank]", name);
+            p.Message("%HSets the highest rank able to {0} the given level.", action);
+            p.Message("%T/{0} [level] +[name]", name);
             p.Message("%HAllows [name] to {0}, even if their rank cannot.", action2);
-            p.Message("%T/{0} [map] -[name]", name);
+            p.Message("%T/{0} [level] -[name]", name);
             p.Message("%HPrevents [name] from {0}ing, even if their rank can.", action2);
         }
     }
diff --git a/MCGalaxy/Economy/ZombieItems.cs b/MCGalaxy/Economy/ZombieItems.cs
index 95e195bcc..21158ebf7 100644
--- a/MCGalaxy/Economy/ZombieItems.cs
+++ b/MCGalaxy/Economy/ZombieItems.cs
@@ -76,7 +76,7 @@ namespace MCGalaxy.Eco {
         }
         
         protected internal override void OnStoreCommand(Player p) {
-            p.Message("%T/Buy {0} [map]", Name);
+            p.Message("%T/Buy {0} [level]", Name);
             OutputItemInfo(p);
             p.Message("The map used for the next round of " +
                            "zombie survival will be the given map.");