diff --git a/src/com/sk89q/worldedit/WorldEditController.java b/src/com/sk89q/worldedit/WorldEdit.java
similarity index 97%
rename from src/com/sk89q/worldedit/WorldEditController.java
rename to src/com/sk89q/worldedit/WorldEdit.java
index a406dbada..f07298b5f 100644
--- a/src/com/sk89q/worldedit/WorldEditController.java
+++ b/src/com/sk89q/worldedit/WorldEdit.java
@@ -49,7 +49,7 @@ import com.sk89q.worldedit.patterns.*;
  *
  * @author sk89q
  */
-public class WorldEditController {
+public class WorldEdit {
     private static final Logger logger = Logger.getLogger("Minecraft.WorldEdit");
     
     private ServerInterface server;
@@ -77,7 +77,7 @@ public class WorldEditController {
      * @param server
      * @param config
      */
-    public WorldEditController(ServerInterface server, LocalConfiguration config) {
+    public WorldEdit(ServerInterface server, LocalConfiguration config) {
         this.server = server;
         this.config = config;
         
@@ -2217,7 +2217,7 @@ public class WorldEditController {
             InputStream file;
             
             if (!f.exists()) {
-                file = WorldEditController.class.getResourceAsStream(
+                file = WorldEdit.class.getResourceAsStream(
                         "craftscripts/" + filename);
                 
                 if (file == null) {
diff --git a/src/com/sk89q/worldedit/bukkit/WorldEditPlugin.java b/src/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
index 2bc58dd60..281b6e063 100644
--- a/src/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
+++ b/src/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
@@ -45,7 +45,7 @@ public class WorldEditPlugin extends JavaPlugin {
     private static final Logger logger = Logger.getLogger("Minecraft.WorldEdit");
     
     public final ServerInterface server;
-    public final WorldEditController controller;
+    public final WorldEdit controller;
     public final WorldEditAPI api;
     
     private final LocalConfiguration config;
@@ -74,7 +74,7 @@ public class WorldEditPlugin extends JavaPlugin {
         loadConfiguration();
         
         server = new BukkitServerInterface(getServer());
-        controller = new WorldEditController(server, config);
+        controller = new WorldEdit(server, config);
         api = new WorldEditAPI(this);
 
         registerEvents();
diff --git a/src/com/sk89q/worldedit/scripting/CraftScriptContext.java b/src/com/sk89q/worldedit/scripting/CraftScriptContext.java
index e055dcc67..b3c51a6cf 100644
--- a/src/com/sk89q/worldedit/scripting/CraftScriptContext.java
+++ b/src/com/sk89q/worldedit/scripting/CraftScriptContext.java
@@ -33,7 +33,7 @@ import com.sk89q.worldedit.LocalPlayer;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.ServerInterface;
 import com.sk89q.worldedit.UnknownItemException;
-import com.sk89q.worldedit.WorldEditController;
+import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.patterns.Pattern;
 
@@ -46,7 +46,7 @@ public class CraftScriptContext extends CraftScriptEnvironment {
     private List<EditSession> editSessions = new ArrayList<EditSession>();
     private String[] args;
     
-    public CraftScriptContext(WorldEditController controller,
+    public CraftScriptContext(WorldEdit controller,
             ServerInterface server, LocalConfiguration config,
             LocalSession session, LocalPlayer player, String[] args) {
         super(controller, server, config, session, player);
diff --git a/src/com/sk89q/worldedit/scripting/CraftScriptEnvironment.java b/src/com/sk89q/worldedit/scripting/CraftScriptEnvironment.java
index 06a83b600..2c98aaf39 100644
--- a/src/com/sk89q/worldedit/scripting/CraftScriptEnvironment.java
+++ b/src/com/sk89q/worldedit/scripting/CraftScriptEnvironment.java
@@ -23,16 +23,16 @@ import com.sk89q.worldedit.LocalConfiguration;
 import com.sk89q.worldedit.LocalPlayer;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.ServerInterface;
-import com.sk89q.worldedit.WorldEditController;
+import com.sk89q.worldedit.WorldEdit;
 
 public abstract class CraftScriptEnvironment {
-    protected WorldEditController controller;
+    protected WorldEdit controller;
     protected LocalPlayer player;
     protected LocalConfiguration config;
     protected LocalSession session;
     protected ServerInterface server;
     
-    public CraftScriptEnvironment(WorldEditController controller, ServerInterface server,
+    public CraftScriptEnvironment(WorldEdit controller, ServerInterface server,
             LocalConfiguration config, LocalSession session, LocalPlayer player) {
         this.controller = controller;
         this.player = player;
diff --git a/src/com/sk89q/worldedit/scripting/SunRhinoCraftScriptEngine.java b/src/com/sk89q/worldedit/scripting/SunRhinoCraftScriptEngine.java
index 825096215..4706b69e4 100644
--- a/src/com/sk89q/worldedit/scripting/SunRhinoCraftScriptEngine.java
+++ b/src/com/sk89q/worldedit/scripting/SunRhinoCraftScriptEngine.java
@@ -21,7 +21,7 @@ package com.sk89q.worldedit.scripting;
 
 import java.util.Map;
 import javax.script.ScriptException;
-import com.sk89q.worldedit.WorldEditController;
+import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.WorldEditException;
 import sun.org.mozilla.javascript.internal.*;
 
@@ -43,7 +43,7 @@ public class SunRhinoCraftScriptEngine implements CraftScriptEngine {
             final Map<String, Object> args)
             throws ScriptException, Throwable {
         SunRhinoContextFactory factory = new SunRhinoContextFactory(timeLimit);
-        factory.initApplicationClassLoader(WorldEditController.class.getClassLoader());
+        factory.initApplicationClassLoader(WorldEdit.class.getClassLoader());
         
         try {
             return factory.call(new ContextAction() {