diff --git a/src/org/apollo/game/message/impl/MouseClickMessage.java b/src/org/apollo/game/message/impl/FlaggedMouseEventMessage.java
similarity index 92%
rename from src/org/apollo/game/message/impl/MouseClickMessage.java
rename to src/org/apollo/game/message/impl/FlaggedMouseEventMessage.java
index 4af02429..9f427d19 100644
--- a/src/org/apollo/game/message/impl/MouseClickMessage.java
+++ b/src/org/apollo/game/message/impl/FlaggedMouseEventMessage.java
@@ -7,7 +7,7 @@ import org.apollo.game.message.Message;
  * 
  * @author Major
  */
-public final class MouseClickMessage extends Message {
+public final class FlaggedMouseEventMessage extends Message {
 
 	/**
 	 * The number of clicks on this point (i.e. the point ({@link #x}, {@link #y})).
@@ -38,7 +38,7 @@ public final class MouseClickMessage extends Message {
 	 * @param y The y coordinate of the mouse click.
 	 * @param delta If the coordinates represent a change in x/y, rather than the values themselves.
 	 */
-	public MouseClickMessage(int clickCount, int x, int y, boolean delta) {
+	public FlaggedMouseEventMessage(int clickCount, int x, int y, boolean delta) {
 		this.clickCount = clickCount;
 		this.x = x;
 		this.y = y;
diff --git a/src/org/apollo/net/release/r317/MouseClickMessageDecoder.java b/src/org/apollo/net/release/r317/FlaggedMouseEventMessageDecoder.java
similarity index 63%
rename from src/org/apollo/net/release/r317/MouseClickMessageDecoder.java
rename to src/org/apollo/net/release/r317/FlaggedMouseEventMessageDecoder.java
index 717d3b70..4279ca05 100644
--- a/src/org/apollo/net/release/r317/MouseClickMessageDecoder.java
+++ b/src/org/apollo/net/release/r317/FlaggedMouseEventMessageDecoder.java
@@ -1,20 +1,20 @@
 package org.apollo.net.release.r317;
 
-import org.apollo.game.message.impl.MouseClickMessage;
+import org.apollo.game.message.impl.FlaggedMouseEventMessage;
 import org.apollo.net.codec.game.DataType;
 import org.apollo.net.codec.game.GamePacket;
 import org.apollo.net.codec.game.GamePacketReader;
 import org.apollo.net.release.MessageDecoder;
 
 /**
- * A {@link MessageDecoder} for the {@link MouseClickMessage}.
+ * A {@link MessageDecoder} for the {@link org.apollo.game.message.impl.FlaggedMouseEventMessage}.
  * 
  * @author Major
  */
-public final class MouseClickMessageDecoder extends MessageDecoder<MouseClickMessage> {
+public final class FlaggedMouseEventMessageDecoder extends MessageDecoder<FlaggedMouseEventMessage> {
 
 	@Override
-	public MouseClickMessage decode(GamePacket packet) {
+	public FlaggedMouseEventMessage decode(GamePacket packet) {
 		GamePacketReader reader = new GamePacketReader(packet);
 		int read;
 		if (reader.getLength() == 2) {
@@ -22,7 +22,7 @@ public final class MouseClickMessageDecoder extends MessageDecoder<MouseClickMes
 			int clicks = (read >> 12);
 			int dX = (read >> 6) & 0x3f;
 			int dY = read & 0x3f;
-			return new MouseClickMessage(clicks, dX, dY, true);
+			return new FlaggedMouseEventMessage(clicks, dX, dY, true);
 		} else if (reader.getLength() == 3) {
 			read = (int) reader.getUnsigned(DataType.TRI_BYTE) & ~0x800000;
 		} else {
@@ -33,7 +33,7 @@ public final class MouseClickMessageDecoder extends MessageDecoder<MouseClickMes
 		int x = (read & 0x7f) % 765;
 		int y = (read & 0x7f) / 765;
 
-		return new MouseClickMessage(clicks, x, y, false);
+		return new FlaggedMouseEventMessage(clicks, x, y, false);
 	}
 
 }
\ No newline at end of file
diff --git a/src/org/apollo/net/release/r317/Release317.java b/src/org/apollo/net/release/r317/Release317.java
index ccfa5d8a..4c4c1e49 100644
--- a/src/org/apollo/net/release/r317/Release317.java
+++ b/src/org/apollo/net/release/r317/Release317.java
@@ -128,7 +128,7 @@ public final class Release317 extends Release {
 		register(237, new MagicOnItemMessageDecoder());
 
 		register(3, new FocusUpdateMessageDecoder());
-		register(45, new MouseClickMessageDecoder());
+		register(45, new FlaggedMouseEventMessageDecoder());
 		register(86, new ArrowKeyMessageDecoder());
 		register(95, new PrivacyOptionMessageDecoder());
 
diff --git a/src/org/apollo/net/release/r377/MouseClickMessageDecoder.java b/src/org/apollo/net/release/r377/FlaggedMouseEventMessageDecoder.java
similarity index 63%
rename from src/org/apollo/net/release/r377/MouseClickMessageDecoder.java
rename to src/org/apollo/net/release/r377/FlaggedMouseEventMessageDecoder.java
index bd189275..a499c6af 100644
--- a/src/org/apollo/net/release/r377/MouseClickMessageDecoder.java
+++ b/src/org/apollo/net/release/r377/FlaggedMouseEventMessageDecoder.java
@@ -1,20 +1,20 @@
 package org.apollo.net.release.r377;
 
-import org.apollo.game.message.impl.MouseClickMessage;
+import org.apollo.game.message.impl.FlaggedMouseEventMessage;
 import org.apollo.net.codec.game.DataType;
 import org.apollo.net.codec.game.GamePacket;
 import org.apollo.net.codec.game.GamePacketReader;
 import org.apollo.net.release.MessageDecoder;
 
 /**
- * A {@link MessageDecoder} for the {@link MouseClickMessage}.
+ * A {@link MessageDecoder} for the {@link org.apollo.game.message.impl.FlaggedMouseEventMessage}.
  * 
  * @author Major
  */
-public final class MouseClickMessageDecoder extends MessageDecoder<MouseClickMessage> {
+public final class FlaggedMouseEventMessageDecoder extends MessageDecoder<FlaggedMouseEventMessage> {
 
 	@Override
-	public MouseClickMessage decode(GamePacket packet) {
+	public FlaggedMouseEventMessage decode(GamePacket packet) {
 		GamePacketReader reader = new GamePacketReader(packet);
 		int read, clicks, x, y;
 
@@ -23,7 +23,7 @@ public final class MouseClickMessageDecoder extends MessageDecoder<MouseClickMes
 			clicks = (read >> 12);
 			x = (read >> 6) & 0x3f;
 			y = read & 0x3f;
-			return new MouseClickMessage(clicks, x, y, true);
+			return new FlaggedMouseEventMessage(clicks, x, y, true);
 		} else if (reader.getLength() == 3) {
 			read = (int) reader.getUnsigned(DataType.TRI_BYTE) & ~0x800000;
 		} else {
@@ -33,7 +33,7 @@ public final class MouseClickMessageDecoder extends MessageDecoder<MouseClickMes
 		clicks = (read >> 19);
 		x = (read & 0x7f) % 765;
 		y = (read & 0x7f) / 765;
-		return new MouseClickMessage(clicks, x, y, false);
+		return new FlaggedMouseEventMessage(clicks, x, y, false);
 	}
 
 }
\ No newline at end of file
diff --git a/src/org/apollo/net/release/r377/Release377.java b/src/org/apollo/net/release/r377/Release377.java
index 303854f9..75bccec9 100644
--- a/src/org/apollo/net/release/r377/Release377.java
+++ b/src/org/apollo/net/release/r377/Release377.java
@@ -128,7 +128,7 @@ public final class Release377 extends Release {
 		register(36, new MagicOnItemMessageDecoder());
 
 		register(187, new FocusUpdateMessageDecoder());
-		register(19, new MouseClickMessageDecoder());
+		register(19, new FlaggedMouseEventMessageDecoder());
 		register(140, new ArrowKeyMessageDecoder());
 		register(176, new PrivacyOptionMessageDecoder());