diff --git a/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java b/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
index 72c8421..86d425a 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
@@ -21,7 +21,6 @@ package de.steamwar.bausystem;
 
 import de.steamwar.bausystem.commands.*;
 import de.steamwar.bausystem.world.*;
-import de.steamwar.core.CommandRemover;
 import de.steamwar.core.Core;
 import de.steamwar.core.VersionedRunnable;
 import de.steamwar.scoreboard.SWScoreboard;
@@ -44,7 +43,6 @@ import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitTask;
 
 import java.util.UUID;
-import java.util.logging.Level;
 
 public class BauSystem extends JavaPlugin implements Listener {
     private static BauSystem plugin;
@@ -92,7 +90,7 @@ public class BauSystem extends JavaPlugin implements Listener {
         new CommandSimulator();
         new CommandRedstoneTester();
         new CommandGUI();
-        new CommandSpawn();
+        new CommandWorldSpawn();
 
         Bukkit.getPluginManager().registerEvents(this, this);
         Bukkit.getPluginManager().registerEvents(new RegionListener(), this);
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandSpawn.java b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandWorldSpawn.java
similarity index 87%
rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandSpawn.java
rename to BauSystem_Main/src/de/steamwar/bausystem/commands/CommandWorldSpawn.java
index 8d40a75..2f9c134 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandSpawn.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandWorldSpawn.java
@@ -25,17 +25,17 @@ import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerTeleportEvent;
 
-public class CommandSpawn extends SWCommand {
+public class CommandWorldSpawn extends SWCommand {
 
     private World world = Bukkit.getWorlds().get(0);
 
-    public CommandSpawn() {
-        super("spawn");
+    public CommandWorldSpawn() {
+        super("worldspawn");
     }
 
     @Register(help = true)
     public void genericHelp(Player p, String... args) {
-        p.sendMessage("§8/§espawn §8- §7Teleportiere dich zum Spawn");
+        p.sendMessage("§8/§eworldspawn §8- §7Teleportiere dich zum Spawn");
     }
 
     @Register