diff --git a/src/com/sk89q/worldedit/LocalSession.java b/src/com/sk89q/worldedit/LocalSession.java
index 0cf1140fd..9282e5326 100644
--- a/src/com/sk89q/worldedit/LocalSession.java
+++ b/src/com/sk89q/worldedit/LocalSession.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map;
 import com.sk89q.worldedit.snapshots.Snapshot;
-import com.sk89q.worldedit.tools.Brush;
+import com.sk89q.worldedit.tools.BrushTool;
 import com.sk89q.worldedit.tools.SinglePickaxe;
 import com.sk89q.worldedit.tools.BlockTool;
 import com.sk89q.worldedit.tools.Tool;
@@ -433,15 +433,15 @@ public class LocalSession {
      * @return the tool
      * @throws InvalidToolBindException 
      */
-    public Brush getBrushTool(int item) throws InvalidToolBindException {
+    public BrushTool getBrushTool(int item) throws InvalidToolBindException {
         Tool tool = getTool(item);
         
-        if (tool == null || !(tool instanceof Brush)) {
-            tool = new Brush();
+        if (tool == null || !(tool instanceof BrushTool)) {
+            tool = new BrushTool();
             setTool(item, tool);
         }
         
-        return (Brush)tool;
+        return (BrushTool)tool;
     }
 
     /**
diff --git a/src/com/sk89q/worldedit/commands/BrushCommands.java b/src/com/sk89q/worldedit/commands/BrushCommands.java
index 1918d1ac7..e53c22a36 100644
--- a/src/com/sk89q/worldedit/commands/BrushCommands.java
+++ b/src/com/sk89q/worldedit/commands/BrushCommands.java
@@ -31,7 +31,7 @@ import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.patterns.Pattern;
-import com.sk89q.worldedit.tools.Brush;
+import com.sk89q.worldedit.tools.BrushTool;
 import com.sk89q.worldedit.tools.brushes.ClipboardBrush;
 import com.sk89q.worldedit.tools.brushes.CylinderBrush;
 import com.sk89q.worldedit.tools.brushes.HollowCylinderBrush;
@@ -66,7 +66,7 @@ public class BrushCommands {
             return;
         }
 
-        Brush tool = session.getBrushTool(player.getItemInHand());
+        BrushTool tool = session.getBrushTool(player.getItemInHand());
         Pattern fill = we.getBlockPattern(player, args.getString(0));
         tool.setFill(fill);
         tool.setSize(radius);
@@ -110,7 +110,7 @@ public class BrushCommands {
             return;
         }
 
-        Brush tool = session.getBrushTool(player.getItemInHand());
+        BrushTool tool = session.getBrushTool(player.getItemInHand());
         Pattern fill = we.getBlockPattern(player, args.getString(0));
         tool.setFill(fill);
         tool.setSize(radius);
@@ -157,7 +157,7 @@ public class BrushCommands {
             return;
         }
 
-        Brush tool = session.getBrushTool(player.getItemInHand());
+        BrushTool tool = session.getBrushTool(player.getItemInHand());
         tool.setBrush(new ClipboardBrush(clipboard, args.hasFlag('a')));
         
         player.print("Clipboard brush shape equipped.");
diff --git a/src/com/sk89q/worldedit/tools/Brush.java b/src/com/sk89q/worldedit/tools/BrushTool.java
similarity index 90%
rename from src/com/sk89q/worldedit/tools/Brush.java
rename to src/com/sk89q/worldedit/tools/BrushTool.java
index 2c27197bc..f354abb5b 100644
--- a/src/com/sk89q/worldedit/tools/Brush.java
+++ b/src/com/sk89q/worldedit/tools/BrushTool.java
@@ -26,7 +26,7 @@ import com.sk89q.worldedit.blocks.BlockID;
 import com.sk89q.worldedit.masks.Mask;
 import com.sk89q.worldedit.patterns.Pattern;
 import com.sk89q.worldedit.patterns.SingleBlockPattern;
-import com.sk89q.worldedit.tools.brushes.BrushShape;
+import com.sk89q.worldedit.tools.brushes.Brush;
 import com.sk89q.worldedit.tools.brushes.SphereBrush;
 
 /**
@@ -34,9 +34,9 @@ import com.sk89q.worldedit.tools.brushes.SphereBrush;
  * 
  * @author sk89q
  */
-public class Brush implements TraceTool {
+public class BrushTool implements TraceTool {
     private Mask mask = null;
-    private BrushShape brush = new SphereBrush();
+    private Brush brush = new SphereBrush();
     private Pattern material = new SingleBlockPattern(new BaseBlock(BlockID.COBBLESTONE));
     private int size = 1;
     
@@ -63,7 +63,7 @@ public class Brush implements TraceTool {
      * 
      * @param brush
      */
-    public void setBrush(BrushShape brush) {
+    public void setBrush(Brush brush) {
         this.brush = brush;
     }
     
@@ -72,7 +72,7 @@ public class Brush implements TraceTool {
      * 
      * @return
      */
-    public BrushShape getBrush() {
+    public Brush getBrush() {
         return brush;
     }
     
diff --git a/src/com/sk89q/worldedit/tools/brushes/BrushShape.java b/src/com/sk89q/worldedit/tools/brushes/Brush.java
similarity index 92%
rename from src/com/sk89q/worldedit/tools/brushes/BrushShape.java
rename to src/com/sk89q/worldedit/tools/brushes/Brush.java
index 1f474cea2..815681a6e 100644
--- a/src/com/sk89q/worldedit/tools/brushes/BrushShape.java
+++ b/src/com/sk89q/worldedit/tools/brushes/Brush.java
@@ -25,11 +25,11 @@ import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.patterns.Pattern;
 
 /**
- * Represents a shape.
+ * Represents a brush.
  *
  * @author sk89q
  */
-public interface BrushShape {
+public interface Brush {
     /**
      * Build the object.
      * 
diff --git a/src/com/sk89q/worldedit/tools/brushes/ClipboardBrush.java b/src/com/sk89q/worldedit/tools/brushes/ClipboardBrush.java
index 9dddc9323..baf636364 100644
--- a/src/com/sk89q/worldedit/tools/brushes/ClipboardBrush.java
+++ b/src/com/sk89q/worldedit/tools/brushes/ClipboardBrush.java
@@ -25,7 +25,7 @@ import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.patterns.Pattern;
 
-public class ClipboardBrush implements BrushShape {
+public class ClipboardBrush implements Brush {
     private CuboidClipboard clipboard;
     private boolean noAir;
     
diff --git a/src/com/sk89q/worldedit/tools/brushes/CylinderBrush.java b/src/com/sk89q/worldedit/tools/brushes/CylinderBrush.java
index cfc80e4d6..e7794e732 100644
--- a/src/com/sk89q/worldedit/tools/brushes/CylinderBrush.java
+++ b/src/com/sk89q/worldedit/tools/brushes/CylinderBrush.java
@@ -24,7 +24,7 @@ import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.patterns.Pattern;
 
-public class CylinderBrush implements BrushShape {
+public class CylinderBrush implements Brush {
     private int height;
     
     public CylinderBrush(int height) {
diff --git a/src/com/sk89q/worldedit/tools/brushes/HollowCylinderBrush.java b/src/com/sk89q/worldedit/tools/brushes/HollowCylinderBrush.java
index e7ddaa685..6984058f1 100644
--- a/src/com/sk89q/worldedit/tools/brushes/HollowCylinderBrush.java
+++ b/src/com/sk89q/worldedit/tools/brushes/HollowCylinderBrush.java
@@ -24,7 +24,7 @@ import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.patterns.Pattern;
 
-public class HollowCylinderBrush implements BrushShape {
+public class HollowCylinderBrush implements Brush {
     private int height;
     
     public HollowCylinderBrush(int height) {
diff --git a/src/com/sk89q/worldedit/tools/brushes/HollowSphereBrush.java b/src/com/sk89q/worldedit/tools/brushes/HollowSphereBrush.java
index 576f12192..f383b5c44 100644
--- a/src/com/sk89q/worldedit/tools/brushes/HollowSphereBrush.java
+++ b/src/com/sk89q/worldedit/tools/brushes/HollowSphereBrush.java
@@ -24,7 +24,7 @@ import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.patterns.Pattern;
 
-public class HollowSphereBrush implements BrushShape {
+public class HollowSphereBrush implements Brush {
     public HollowSphereBrush() {
     }
     
diff --git a/src/com/sk89q/worldedit/tools/brushes/SphereBrush.java b/src/com/sk89q/worldedit/tools/brushes/SphereBrush.java
index 82f9af81a..98fe4d9db 100644
--- a/src/com/sk89q/worldedit/tools/brushes/SphereBrush.java
+++ b/src/com/sk89q/worldedit/tools/brushes/SphereBrush.java
@@ -24,7 +24,7 @@ import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.patterns.Pattern;
 
-public class SphereBrush implements BrushShape {
+public class SphereBrush implements Brush {
     public SphereBrush() {
     }