diff --git a/src/GameServer/RemoteView/ChatCommandListViewPlugIn.cs b/src/GameServer/RemoteView/ChatCommandListViewPlugIn.cs
index 1c93027..b444137 100644
--- a/src/GameServer/RemoteView/ChatCommandListViewPlugIn.cs
+++ b/src/GameServer/RemoteView/ChatCommandListViewPlugIn.cs
@@ -55,9 +55,9 @@ public class ChatCommandListViewPlugIn : IChatCommandListViewPlugIn
 
         int Write()
         {
-            var size = ChatCommandInfoRef.GetRequiredSize(parameters.Count);
+            var size = AvailableChatCommandRef.GetRequiredSize(parameters.Count);
             var span = connection.Output.GetSpan(size)[..size];
-            var packet = new ChatCommandInfoRef(span)
+            var packet = new AvailableChatCommandRef(span)
             {
                 Index = index,
                 Count = count,
diff --git a/src/Network/Packets/ClientToServer/ClientToServerPackets.xml b/src/Network/Packets/ClientToServer/ClientToServerPackets.xml
index 1cc0c02..da44ebc 100644
--- a/src/Network/Packets/ClientToServer/ClientToServerPackets.xml
+++ b/src/Network/Packets/ClientToServer/ClientToServerPackets.xml
@@ -4277,7 +4277,7 @@
       <Length>4</Length>
       <Direction>ClientToServer</Direction>
       <SentWhen>A client which supports a user interface for chat commands requests the list of commands which are available to the player. It's usually sent after the character entered the game world.</SentWhen>
-      <CausedReaction>The server sends a ChatCommandInfo for each available chat command.</CausedReaction>
+      <CausedReaction>The server sends an AvailableChatCommand message for each available chat command.</CausedReaction>
       <Fields />
     </Packet>
   </Packets>
diff --git a/src/Network/Packets/ServerToClient/ServerToClientPackets.xml b/src/Network/Packets/ServerToClient/ServerToClientPackets.xml
index 5ee31db..fcc6233 100644
--- a/src/Network/Packets/ServerToClient/ServerToClientPackets.xml
+++ b/src/Network/Packets/ServerToClient/ServerToClientPackets.xml
@@ -11244,7 +11244,7 @@
       <HeaderType>C2HeaderWithSubCode</HeaderType>
       <Code>F5</Code>
       <SubCode>01</SubCode>
-      <Name>ChatCommandInfo</Name>
+      <Name>AvailableChatCommand</Name>
       <Direction>ServerToClient</Direction>
       <SentWhen>After the client requested the list of available chat commands. One message is sent for each command which is available to the player.</SentWhen>
       <CausedReaction>The client adds the command to its list of known commands, so that it can offer them to the player without requiring him to know or type them.</CausedReaction>
diff --git a/tests/MUnique.OpenMU.Tests/ChatCommandPacketTest.cs b/tests/MUnique.OpenMU.Tests/ChatCommandPacketTest.cs
index effb27d..e561b61 100644
--- a/tests/MUnique.OpenMU.Tests/ChatCommandPacketTest.cs
+++ b/tests/MUnique.OpenMU.Tests/ChatCommandPacketTest.cs
@@ -17,12 +17,12 @@ public class ChatCommandPacketTest
     /// none of the fields overlaps another one.
     /// </summary>
     [Test]
-    public void ChatCommandInfoKeepsItsValues()
+    public void AvailableChatCommandKeepsItsValues()
     {
         const int parameterCount = 3;
-        var data = new byte[ChatCommandInfoRef.GetRequiredSize(parameterCount)];
+        var data = new byte[AvailableChatCommandRef.GetRequiredSize(parameterCount)];
 
-        var written = new ChatCommandInfoRef(data)
+        var written = new AvailableChatCommandRef(data)
         {
             Index = 7,
             Count = 42,
@@ -50,7 +50,7 @@ public class ChatCommandPacketTest
         skill.ShortName = "sk";
         skill.Type = ChatCommandParameterType.Boolean;
 
-        var read = new ChatCommandInfoRef(data);
+        var read = new AvailableChatCommandRef(data);
 
         Assert.That(read.Header.Code, Is.EqualTo(0xF5));
         Assert.That(read.Header.SubCode, Is.EqualTo(0x01));
@@ -81,11 +81,11 @@ public class ChatCommandPacketTest
     /// don't overlap the fields before them.
     /// </summary>
     [Test]
-    public void ChatCommandInfoSizeDependsOnParameterCount()
+    public void AvailableChatCommandSizeDependsOnParameterCount()
     {
-        var withoutParameters = ChatCommandInfoRef.GetRequiredSize(0);
-        var withOneParameter = ChatCommandInfoRef.GetRequiredSize(1);
+        var withoutParameters = AvailableChatCommandRef.GetRequiredSize(0);
+        var withOneParameter = AvailableChatCommandRef.GetRequiredSize(1);
 
-        Assert.That(withOneParameter - withoutParameters, Is.EqualTo(ChatCommandInfo.ChatCommandParameter.Length));
+        Assert.That(withOneParameter - withoutParameters, Is.EqualTo(AvailableChatCommand.ChatCommandParameter.Length));
     }
 }