diff --git a/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ConnectQueryPacket.cs b/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ConnectQuery.cs
similarity index 89%
rename from src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ConnectQueryPacket.cs
rename to src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ConnectQuery.cs
index 65bbd14..91bd18f 100644
--- a/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ConnectQueryPacket.cs
+++ b/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ConnectQuery.cs
@@ -3,10 +3,10 @@
 namespace Syroot.Worms.OnlineWorms.Server.Net
 {
     /// <summary>
-    /// Represents the client request for a <see cref="ConnectReplyPacket"/>.
+    /// Represents the client request for a <see cref="ConnectReply"/>.
     /// </summary>
     [Packet(0x800E)]
-    internal class ConnectQueryPacket : Packet
+    internal class ConnectQuery : Packet
     {
         // ---- METHODS (INTERNAL) -------------------------------------------------------------------------------------
 
diff --git a/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ConnectReplyPacket.cs b/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ConnectReply.cs
similarity index 94%
rename from src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ConnectReplyPacket.cs
rename to src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ConnectReply.cs
index 7fe33a4..e510f2d 100644
--- a/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ConnectReplyPacket.cs
+++ b/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ConnectReply.cs
@@ -4,10 +4,10 @@ using Syroot.BinaryData;
 namespace Syroot.Worms.OnlineWorms.Server.Net
 {
     /// <summary>
-    /// Represents the server response to a <see cref="ConnectQueryPacket"/>.
+    /// Represents the server response to a <see cref="ConnectQuery"/>.
     /// </summary>
     [Packet(0x800F)]
-    internal class ConnectReplyPacket : Packet
+    internal class ConnectReply : Packet
     {
         // ---- PROPERTIES ---------------------------------------------------------------------------------------------
 
diff --git a/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/LoginQueryPacket.cs b/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/LoginQuery.cs
similarity index 96%
rename from src/Syroot.Worms.OnlineWorms.Server/Net/Packets/LoginQueryPacket.cs
rename to src/Syroot.Worms.OnlineWorms.Server/Net/Packets/LoginQuery.cs
index 1aeb292..2029cc6 100644
--- a/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/LoginQueryPacket.cs
+++ b/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/LoginQuery.cs
@@ -5,10 +5,10 @@ using Syroot.BinaryData;
 namespace Syroot.Worms.OnlineWorms.Server.Net
 {
     /// <summary>
-    /// Represents the client request for a <see cref="LoginReplyPacket"/>.
+    /// Represents the client request for a <see cref="LoginReply"/>.
     /// </summary>
     [Packet(0x8000)]
-    internal class LoginQueryPacket : Packet
+    internal class LoginQuery : Packet
     {
         // ---- PROPERTIES ---------------------------------------------------------------------------------------------
 
diff --git a/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/LoginReplyPacket.cs b/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/LoginReply.cs
similarity index 97%
rename from src/Syroot.Worms.OnlineWorms.Server/Net/Packets/LoginReplyPacket.cs
rename to src/Syroot.Worms.OnlineWorms.Server/Net/Packets/LoginReply.cs
index 456ed42..a128406 100644
--- a/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/LoginReplyPacket.cs
+++ b/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/LoginReply.cs
@@ -4,10 +4,10 @@ using Syroot.BinaryData;
 namespace Syroot.Worms.OnlineWorms.Server.Net
 {
     /// <summary>
-    /// Represents the server response to a <see cref="LoginQueryPacket"/>.
+    /// Represents the server response to a <see cref="LoginQuery"/>.
     /// </summary>
     [Packet(0x8001)]
-    internal class LoginReplyPacket : Packet
+    internal class LoginReply : Packet
     {
         // ---- PROPERTIES ---------------------------------------------------------------------------------------------
 
@@ -42,6 +42,12 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
         }
     }
 
+    internal class LoginPlayerInfo
+    {
+        internal string ID { get; set; }
+        internal ushort Rank { get; set; }
+    }
+
     internal enum LoginResult : byte
     {
         Success = 0,
@@ -55,10 +61,4 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
         PublicAccessBanned = 12,
         TemporarilyBannedID = 13
     }
-
-    internal class LoginPlayerInfo
-    {
-        internal string ID { get; set; }
-        internal ushort Rank { get; set; }
-    }
 }
diff --git a/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/RawQueryPacket.cs b/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/RawQuery.cs
similarity index 92%
rename from src/Syroot.Worms.OnlineWorms.Server/Net/Packets/RawQueryPacket.cs
rename to src/Syroot.Worms.OnlineWorms.Server/Net/Packets/RawQuery.cs
index 4ddee44..e20e868 100644
--- a/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/RawQueryPacket.cs
+++ b/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/RawQuery.cs
@@ -4,11 +4,11 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
     /// <summary>
     /// Represents a special fallback packet which simply stores any ID and the raw client packet data.
     /// </summary>
-    internal class RawQueryPacket : Packet
+    internal class RawQuery : Packet
     {
         // ---- CONSTRUCTORS & DESTRUCTOR ------------------------------------------------------------------------------
 
-        internal RawQueryPacket(ushort id)
+        internal RawQuery(ushort id)
         {
             ID = id;
         }
diff --git a/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ServerInfoReplyPacket.cs b/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ServerInfoReply.cs
similarity index 90%
rename from src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ServerInfoReplyPacket.cs
rename to src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ServerInfoReply.cs
index 0d10354..17a6094 100644
--- a/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ServerInfoReplyPacket.cs
+++ b/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ServerInfoReply.cs
@@ -3,11 +3,11 @@
 namespace Syroot.Worms.OnlineWorms.Server.Net
 {
     /// <summary>
-    /// Represents an additional server response to a <see cref="LoginQueryPacket"/>, providing informational server
+    /// Represents an additional server response to a <see cref="LoginQuery"/>, providing informational server
     /// screen text.
     /// </summary>
     [Packet(0x8033)]
-    internal class ServerInfoReplyPacket : Packet
+    internal class ServerInfoReply : Packet
     {
         // ---- PROPERTIES ---------------------------------------------------------------------------------------------