diff --git a/src/main/java/org/bukkit/event/block/BlockListener.java b/src/main/java/org/bukkit/event/block/BlockListener.java
index 39c7bc2e..6cb36b46 100644
--- a/src/main/java/org/bukkit/event/block/BlockListener.java
+++ b/src/main/java/org/bukkit/event/block/BlockListener.java
@@ -33,7 +33,7 @@ public class BlockListener implements Listener {
      *
      * @param event Relevant event details
      */
-    public void onBlockFlow(BlockFromToEvent event) {
+    public void onBlockFromTo(BlockFromToEvent event) {
     }
 
     /**
diff --git a/src/main/java/org/bukkit/event/player/PlayerCommandPreprocessEvent.java b/src/main/java/org/bukkit/event/player/PlayerCommandPreprocessEvent.java
new file mode 100644
index 00000000..9dbe8b44
--- /dev/null
+++ b/src/main/java/org/bukkit/event/player/PlayerCommandPreprocessEvent.java
@@ -0,0 +1,9 @@
+package org.bukkit.event.player;
+
+import org.bukkit.entity.Player;
+
+public class PlayerCommandPreprocessEvent extends PlayerChatEvent {
+    public PlayerCommandPreprocessEvent(Player player, String message) {
+        super(player, message);
+    }
+}
diff --git a/src/main/java/org/bukkit/event/player/PlayerListener.java b/src/main/java/org/bukkit/event/player/PlayerListener.java
index 798aa216..e9abb2dc 100644
--- a/src/main/java/org/bukkit/event/player/PlayerListener.java
+++ b/src/main/java/org/bukkit/event/player/PlayerListener.java
@@ -23,7 +23,7 @@ public class PlayerListener implements Listener {
      *
      * @param event Relevant event details
      */
-    public void onPlayerQuit(PlayerEvent event) {
+    public void onPlayerQuit(PlayerQuitEvent event) {
     }
 
     /**
@@ -48,7 +48,7 @@ public class PlayerListener implements Listener {
      *
      * @param event Relevant event details
      */
-    public void onPlayerCommandPreprocess(PlayerChatEvent event) {
+    public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
     }
 
     /**
@@ -64,7 +64,7 @@ public class PlayerListener implements Listener {
      *
      * @param event Relevant event details
      */
-    public void onPlayerTeleport(PlayerMoveEvent event) {
+    public void onPlayerTeleport(PlayerTeleportEvent event) {
     }
 
     /**
diff --git a/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java b/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java
new file mode 100644
index 00000000..5a63dc1d
--- /dev/null
+++ b/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java
@@ -0,0 +1,9 @@
+package org.bukkit.event.player;
+
+import org.bukkit.entity.Player;
+
+public class PlayerQuitEvent extends PlayerEvent {
+    public PlayerQuitEvent(Player who) {
+        super(Type.PLAYER_QUIT, who);
+    }
+}
diff --git a/src/main/java/org/bukkit/event/player/PlayerTeleportEvent.java b/src/main/java/org/bukkit/event/player/PlayerTeleportEvent.java
new file mode 100644
index 00000000..93fde074
--- /dev/null
+++ b/src/main/java/org/bukkit/event/player/PlayerTeleportEvent.java
@@ -0,0 +1,10 @@
+package org.bukkit.event.player;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+
+public class PlayerTeleportEvent extends PlayerMoveEvent {
+    public PlayerTeleportEvent(Player player, Location from, Location to) {
+        super(player, from, to);
+    }
+}
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index eba23eb9..bed11a9e 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -96,7 +96,7 @@ public final class JavaPluginLoader implements PluginLoader {
 
             Constructor<? extends JavaPlugin> constructor = plugin.getConstructor();
             result = constructor.newInstance();
-            
+
             result.initialize(this, server, description, dataFolder, file, loader);
         } catch (Throwable ex) {
             throw new InvalidPluginException(ex);
@@ -169,7 +169,7 @@ public final class JavaPluginLoader implements PluginLoader {
         case PLAYER_QUIT:
             return new EventExecutor() {
                 public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerQuit((PlayerEvent) event);
+                    ((PlayerListener) listener).onPlayerQuit((PlayerQuitEvent) event);
                 }
             };
         case PLAYER_RESPAWN:
@@ -187,7 +187,7 @@ public final class JavaPluginLoader implements PluginLoader {
         case PLAYER_COMMAND_PREPROCESS:
             return new EventExecutor() {
                 public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerCommandPreprocess((PlayerChatEvent) event);
+                    ((PlayerListener) listener).onPlayerCommandPreprocess((PlayerCommandPreprocessEvent) event);
                 }
             };
         case PLAYER_CHAT:
@@ -205,7 +205,7 @@ public final class JavaPluginLoader implements PluginLoader {
         case PLAYER_TELEPORT:
             return new EventExecutor() {
                 public void execute(Listener listener, Event event) {
-                    ((PlayerListener) listener).onPlayerTeleport((PlayerMoveEvent) event);
+                    ((PlayerListener) listener).onPlayerTeleport((PlayerTeleportEvent) event);
                 }
             };
         case PLAYER_INTERACT:
@@ -303,7 +303,7 @@ public final class JavaPluginLoader implements PluginLoader {
         case BLOCK_FROMTO:
             return new EventExecutor() {
                 public void execute(Listener listener, Event event) {
-                    ((BlockListener) listener).onBlockFlow((BlockFromToEvent) event);
+                    ((BlockListener) listener).onBlockFromTo((BlockFromToEvent) event);
                 }
             };
         case LEAVES_DECAY:
@@ -539,3 +539,4 @@ public final class JavaPluginLoader implements PluginLoader {
         }
     }
 }
+