diff --git a/protocol/src/protocol/packet.rs b/protocol/src/protocol/packet.rs
index 56c1231..25e5c33 100644
--- a/protocol/src/protocol/packet.rs
+++ b/protocol/src/protocol/packet.rs
@@ -843,13 +843,13 @@ state_packets!(
             /// ServerMessage is a message sent by the server. It could be from a player
             /// or just a system message. The Type field controls the location the
             /// message is displayed at and when the message is displayed.
-            packet ServerMessage_UUID {
+            packet ServerMessage_Sender {
                 field message: format::Component =,
                 /// 0 - Chat message, 1 - System message, 2 - Action bar message
                 field position: u8 =,
                 field sender: UUID =,
             }
-            packet ServerMessage {
+            packet ServerMessage_Position {
                 field message: format::Component =,
                 /// 0 - Chat message, 1 - System message, 2 - Action bar message
                 field position: u8 =,
diff --git a/protocol/src/protocol/versions/v15w39c.rs b/protocol/src/protocol/versions/v15w39c.rs
index 074ff1d..4f70808 100644
--- a/protocol/src/protocol/versions/v15w39c.rs
+++ b/protocol/src/protocol/versions/v15w39c.rs
@@ -52,7 +52,7 @@ protocol_packet_ids!(
             0x0c => BossBar
             0x0d => ServerDifficulty
             0x0e => TabCompleteReply
-            0x0f => ServerMessage
+            0x0f => ServerMessage_Position
             0x10 => MultiBlockChange_VarInt
             0x11 => ConfirmTransaction
             0x12 => WindowClose
diff --git a/protocol/src/protocol/versions/v18w50a.rs b/protocol/src/protocol/versions/v18w50a.rs
index 5265768..03921e2 100644
--- a/protocol/src/protocol/versions/v18w50a.rs
+++ b/protocol/src/protocol/versions/v18w50a.rs
@@ -67,7 +67,7 @@ protocol_packet_ids!(
             0x0b => BlockChange_VarInt
             0x0c => BossBar
             0x0d => ServerDifficulty
-            0x0e => ServerMessage
+            0x0e => ServerMessage_Position
             0x0f => MultiBlockChange_VarInt
             0x10 => TabCompleteReply
             0x11 => DeclareCommands
diff --git a/protocol/src/protocol/versions/v19w02a.rs b/protocol/src/protocol/versions/v19w02a.rs
index 3cf8760..5c2024c 100644
--- a/protocol/src/protocol/versions/v19w02a.rs
+++ b/protocol/src/protocol/versions/v19w02a.rs
@@ -67,7 +67,7 @@ protocol_packet_ids!(
             0x0b => BlockChange_VarInt
             0x0c => BossBar
             0x0d => ServerDifficulty
-            0x0e => ServerMessage
+            0x0e => ServerMessage_Position
             0x0f => MultiBlockChange_VarInt
             0x10 => TabCompleteReply
             0x11 => DeclareCommands
diff --git a/protocol/src/protocol/versions/v1_10_2.rs b/protocol/src/protocol/versions/v1_10_2.rs
index 78d279c..96e6c94 100644
--- a/protocol/src/protocol/versions/v1_10_2.rs
+++ b/protocol/src/protocol/versions/v1_10_2.rs
@@ -55,7 +55,7 @@ protocol_packet_ids!(
             0x0c => BossBar
             0x0d => ServerDifficulty
             0x0e => TabCompleteReply
-            0x0f => ServerMessage
+            0x0f => ServerMessage_Position
             0x10 => MultiBlockChange_VarInt
             0x11 => ConfirmTransaction
             0x12 => WindowClose
diff --git a/protocol/src/protocol/versions/v1_11_2.rs b/protocol/src/protocol/versions/v1_11_2.rs
index d7c83d2..e03abd1 100644
--- a/protocol/src/protocol/versions/v1_11_2.rs
+++ b/protocol/src/protocol/versions/v1_11_2.rs
@@ -55,7 +55,7 @@ protocol_packet_ids!(
             0x0c => BossBar
             0x0d => ServerDifficulty
             0x0e => TabCompleteReply
-            0x0f => ServerMessage
+            0x0f => ServerMessage_Position
             0x10 => MultiBlockChange_VarInt
             0x11 => ConfirmTransaction
             0x12 => WindowClose
diff --git a/protocol/src/protocol/versions/v1_12_2.rs b/protocol/src/protocol/versions/v1_12_2.rs
index 012b1d6..77e0acb 100644
--- a/protocol/src/protocol/versions/v1_12_2.rs
+++ b/protocol/src/protocol/versions/v1_12_2.rs
@@ -58,7 +58,7 @@ protocol_packet_ids!(
             0x0c => BossBar
             0x0d => ServerDifficulty
             0x0e => TabCompleteReply
-            0x0f => ServerMessage
+            0x0f => ServerMessage_Position
             0x10 => MultiBlockChange_VarInt
             0x11 => ConfirmTransaction
             0x12 => WindowClose
diff --git a/protocol/src/protocol/versions/v1_13_2.rs b/protocol/src/protocol/versions/v1_13_2.rs
index 6ebbbd3..8e7561a 100644
--- a/protocol/src/protocol/versions/v1_13_2.rs
+++ b/protocol/src/protocol/versions/v1_13_2.rs
@@ -67,7 +67,7 @@ protocol_packet_ids!(
             0x0b => BlockChange_VarInt
             0x0c => BossBar
             0x0d => ServerDifficulty
-            0x0e => ServerMessage
+            0x0e => ServerMessage_Position
             0x0f => MultiBlockChange_VarInt
             0x10 => TabCompleteReply
             0x11 => DeclareCommands
diff --git a/protocol/src/protocol/versions/v1_14.rs b/protocol/src/protocol/versions/v1_14.rs
index 99eb1a5..bb168f1 100644
--- a/protocol/src/protocol/versions/v1_14.rs
+++ b/protocol/src/protocol/versions/v1_14.rs
@@ -70,7 +70,7 @@ protocol_packet_ids!(
             0x0b => BlockChange_VarInt
             0x0c => BossBar
             0x0d => ServerDifficulty_Locked
-            0x0e => ServerMessage
+            0x0e => ServerMessage_Position
             0x0f => MultiBlockChange_VarInt
             0x10 => TabCompleteReply
             0x11 => DeclareCommands
diff --git a/protocol/src/protocol/versions/v1_14_1.rs b/protocol/src/protocol/versions/v1_14_1.rs
index 99eb1a5..bb168f1 100644
--- a/protocol/src/protocol/versions/v1_14_1.rs
+++ b/protocol/src/protocol/versions/v1_14_1.rs
@@ -70,7 +70,7 @@ protocol_packet_ids!(
             0x0b => BlockChange_VarInt
             0x0c => BossBar
             0x0d => ServerDifficulty_Locked
-            0x0e => ServerMessage
+            0x0e => ServerMessage_Position
             0x0f => MultiBlockChange_VarInt
             0x10 => TabCompleteReply
             0x11 => DeclareCommands
diff --git a/protocol/src/protocol/versions/v1_14_2.rs b/protocol/src/protocol/versions/v1_14_2.rs
index 99eb1a5..bb168f1 100644
--- a/protocol/src/protocol/versions/v1_14_2.rs
+++ b/protocol/src/protocol/versions/v1_14_2.rs
@@ -70,7 +70,7 @@ protocol_packet_ids!(
             0x0b => BlockChange_VarInt
             0x0c => BossBar
             0x0d => ServerDifficulty_Locked
-            0x0e => ServerMessage
+            0x0e => ServerMessage_Position
             0x0f => MultiBlockChange_VarInt
             0x10 => TabCompleteReply
             0x11 => DeclareCommands
diff --git a/protocol/src/protocol/versions/v1_14_3.rs b/protocol/src/protocol/versions/v1_14_3.rs
index 35c1b8f..ce1c1ac 100644
--- a/protocol/src/protocol/versions/v1_14_3.rs
+++ b/protocol/src/protocol/versions/v1_14_3.rs
@@ -70,7 +70,7 @@ protocol_packet_ids!(
             0x0b => BlockChange_VarInt
             0x0c => BossBar
             0x0d => ServerDifficulty_Locked
-            0x0e => ServerMessage
+            0x0e => ServerMessage_Position
             0x0f => MultiBlockChange_VarInt
             0x10 => TabCompleteReply
             0x11 => DeclareCommands
diff --git a/protocol/src/protocol/versions/v1_14_4.rs b/protocol/src/protocol/versions/v1_14_4.rs
index c7ef802..4d55d7b 100644
--- a/protocol/src/protocol/versions/v1_14_4.rs
+++ b/protocol/src/protocol/versions/v1_14_4.rs
@@ -70,7 +70,7 @@ protocol_packet_ids!(
             0x0b => BlockChange_VarInt
             0x0c => BossBar
             0x0d => ServerDifficulty_Locked
-            0x0e => ServerMessage
+            0x0e => ServerMessage_Position
             0x0f => MultiBlockChange_VarInt
             0x10 => TabCompleteReply
             0x11 => DeclareCommands
diff --git a/protocol/src/protocol/versions/v1_15.rs b/protocol/src/protocol/versions/v1_15.rs
index d77074e..226c91c 100644
--- a/protocol/src/protocol/versions/v1_15.rs
+++ b/protocol/src/protocol/versions/v1_15.rs
@@ -71,7 +71,7 @@ protocol_packet_ids!(
             0x0c => BlockChange_VarInt
             0x0d => BossBar
             0x0e => ServerDifficulty_Locked
-            0x0f => ServerMessage
+            0x0f => ServerMessage_Position
             0x10 => MultiBlockChange_VarInt
             0x11 => TabCompleteReply
             0x12 => DeclareCommands
diff --git a/protocol/src/protocol/versions/v1_16_1.rs b/protocol/src/protocol/versions/v1_16_1.rs
index 23f9278..a67903a 100644
--- a/protocol/src/protocol/versions/v1_16_1.rs
+++ b/protocol/src/protocol/versions/v1_16_1.rs
@@ -71,7 +71,7 @@ protocol_packet_ids!(
             0x0b => BlockChange_VarInt
             0x0c => BossBar
             0x0d => ServerDifficulty_Locked
-            0x0e => ServerMessage_UUID
+            0x0e => ServerMessage_Sender
             0x0f => MultiBlockChange_VarInt
             0x10 => TabCompleteReply
             0x11 => DeclareCommands
diff --git a/protocol/src/protocol/versions/v1_8_9.rs b/protocol/src/protocol/versions/v1_8_9.rs
index 9e6d181..bbc6d60 100644
--- a/protocol/src/protocol/versions/v1_8_9.rs
+++ b/protocol/src/protocol/versions/v1_8_9.rs
@@ -38,7 +38,7 @@ protocol_packet_ids!(
         clientbound Clientbound {
             0x00 => KeepAliveClientbound_VarInt
             0x01 => JoinGame_i8
-            0x02 => ServerMessage
+            0x02 => ServerMessage_Position
             0x03 => TimeUpdate
             0x04 => EntityEquipment_u16
             0x05 => SpawnPosition
diff --git a/protocol/src/protocol/versions/v1_9.rs b/protocol/src/protocol/versions/v1_9.rs
index e6f1376..3d081f6 100644
--- a/protocol/src/protocol/versions/v1_9.rs
+++ b/protocol/src/protocol/versions/v1_9.rs
@@ -55,7 +55,7 @@ protocol_packet_ids!(
             0x0c => BossBar
             0x0d => ServerDifficulty
             0x0e => TabCompleteReply
-            0x0f => ServerMessage
+            0x0f => ServerMessage_Position
             0x10 => MultiBlockChange_VarInt
             0x11 => ConfirmTransaction
             0x12 => WindowClose
diff --git a/protocol/src/protocol/versions/v1_9_2.rs b/protocol/src/protocol/versions/v1_9_2.rs
index 1d2964a..faa149c 100644
--- a/protocol/src/protocol/versions/v1_9_2.rs
+++ b/protocol/src/protocol/versions/v1_9_2.rs
@@ -55,7 +55,7 @@ protocol_packet_ids!(
             0x0c => BossBar
             0x0d => ServerDifficulty
             0x0e => TabCompleteReply
-            0x0f => ServerMessage
+            0x0f => ServerMessage_Position
             0x10 => MultiBlockChange_VarInt
             0x11 => ConfirmTransaction
             0x12 => WindowClose