diff --git a/src/Syroot.Worms.OnlineWorms.Server/Client.cs b/src/Syroot.Worms.OnlineWorms.Server/Client.cs
index 110dd0c..14ceee1 100644
--- a/src/Syroot.Worms.OnlineWorms.Server/Client.cs
+++ b/src/Syroot.Worms.OnlineWorms.Server/Client.cs
@@ -144,10 +144,10 @@ namespace Syroot.Worms.OnlineWorms.Server
             });
         }
 
-        public void HandleChannelTop20Players(ChannelTop20PlayersQuery packet)
+        public void HandleChannelTop20(ChannelTop20Query packet)
         {
             // Send some simulated player rank infos.
-            ChannelTop20PlayersReply reply = new ChannelTop20PlayersReply
+            ChannelTop20Reply reply = new ChannelTop20Reply
             {
                 UnknownA = "Test",
                 Top20 = new List<ChannelTop20Player>(20)
@@ -156,8 +156,8 @@ namespace Syroot.Worms.OnlineWorms.Server
             {
                 reply.Top20.Add(new ChannelTop20Player
                 {
-                    Rank = (ushort)((i + 6) / 3),
                     Name = $"GoodPlayer{(char)('A' + i)}",
+                    Rank = (ushort)((i + 6) / 3),
                     Experience = (ulong)(20 - i) * 957
                 });
             }
diff --git a/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ChannelEnterFinishReply.cs b/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ChannelEnterFinishReply.cs
index f6603b0..3edd749 100644
--- a/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ChannelEnterFinishReply.cs
+++ b/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ChannelEnterFinishReply.cs
@@ -3,7 +3,7 @@
 namespace Syroot.Worms.OnlineWorms.Server.Net
 {
     /// <summary>
-    /// Represents an additional server response to a <see cref="ChannelTop20PlayersQuery"/>, causing the client to switch
+    /// Represents an additional server response to a <see cref="ChannelTop20Query"/>, causing the client to switch
     /// to the channel screen (game lobby).
     /// </summary>
     [Packet(PacketType.Channel, 0x44)]
diff --git a/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ChannelTop20PlayersQuery.cs b/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ChannelTop20Query.cs
similarity index 94%
rename from src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ChannelTop20PlayersQuery.cs
rename to src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ChannelTop20Query.cs
index 6bd4190..fa80f1d 100644
--- a/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ChannelTop20PlayersQuery.cs
+++ b/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ChannelTop20Query.cs
@@ -7,7 +7,7 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
     /// Represents the client request for a <see cref="ChannelConnectReply"/>.
     /// </summary>
     [Packet(PacketType.Channel, 0x37)]
-    internal class ChannelTop20PlayersQuery : Packet
+    internal class ChannelTop20Query : Packet
     {
         // ---- PROPERTIES ---------------------------------------------------------------------------------------------
 
diff --git a/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ChannelTop20PlayersReply.cs b/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ChannelTop20Reply.cs
similarity index 95%
rename from src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ChannelTop20PlayersReply.cs
rename to src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ChannelTop20Reply.cs
index 46794bb..54ca28e 100644
--- a/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ChannelTop20PlayersReply.cs
+++ b/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ChannelTop20Reply.cs
@@ -5,10 +5,10 @@ using Syroot.BinaryData;
 namespace Syroot.Worms.OnlineWorms.Server.Net
 {
     /// <summary>
-    /// Represents the server response to a <see cref="ChannelTop20PlayersQuery"/>.
+    /// Represents the server response to a <see cref="ChannelTop20Query"/>.
     /// </summary>
     [Packet(PacketType.Channel, 0x36)]
-    internal class ChannelTop20PlayersReply : Packet
+    internal class ChannelTop20Reply : Packet
     {
         // ---- PROPERTIES ---------------------------------------------------------------------------------------------