diff --git a/src/main/java/org/bukkit/ArrowEntity.java b/src/main/java/org/bukkit/Arrow.java
similarity index 58%
rename from src/main/java/org/bukkit/ArrowEntity.java
rename to src/main/java/org/bukkit/Arrow.java
index d1b24c29..bdbe263b 100644
--- a/src/main/java/org/bukkit/ArrowEntity.java
+++ b/src/main/java/org/bukkit/Arrow.java
@@ -5,5 +5,5 @@ package org.bukkit;
  * 
  * @author sk89q
  */
-public interface ArrowEntity extends Entity {
+public interface Arrow extends Entity {
 }
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index acbfbacc..deef7314 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -53,7 +53,7 @@ public interface World {
      * @param spread a reasonable spread is 12
      * @return the arrow entity
      */
-    public ArrowEntity spawnArrow(Location loc, Vector velocity,
+    public Arrow spawnArrow(Location loc, Vector velocity,
             float speed, float spread);
     
     /**