diff --git a/Dalamud/Game/ChatHandlers.cs b/Dalamud/Game/ChatHandlers.cs
index 61001fe4b..5fdb28b73 100644
--- a/Dalamud/Game/ChatHandlers.cs
+++ b/Dalamud/Game/ChatHandlers.cs
@@ -104,8 +104,8 @@ namespace Dalamud.Game
         {
             this.dalamud = dalamud;
 
-            dalamud.Framework.Gui.Chat.OnCheckMessageHandled += this.OnCheckMessageHandled;
-            dalamud.Framework.Gui.Chat.OnChatMessage += this.OnChatMessage;
+            dalamud.Framework.Gui.Chat.CheckMessageHandled += this.OnCheckMessageHandled;
+            dalamud.Framework.Gui.Chat.ChatMessage += this.OnChatMessage;
 
             this.openInstallerWindowLink = this.dalamud.Framework.Gui.Chat.AddChatLinkHandler("Dalamud", 1001, (i, m) =>
             {
diff --git a/Dalamud/Game/Command/CommandManager.cs b/Dalamud/Game/Command/CommandManager.cs
index 6c31e2444..48364715f 100644
--- a/Dalamud/Game/Command/CommandManager.cs
+++ b/Dalamud/Game/Command/CommandManager.cs
@@ -47,7 +47,7 @@ namespace Dalamud.Game.Command
                     break;
             }
 
-            dalamud.Framework.Gui.Chat.OnCheckMessageHandled += this.OnCheckMessageHandled;
+            dalamud.Framework.Gui.Chat.CheckMessageHandled += this.OnCheckMessageHandled;
         }
 
         /// <summary>
diff --git a/Dalamud/Game/Gui/ChatGui.cs b/Dalamud/Game/Gui/ChatGui.cs
index 09f5d2a2a..5895404ab 100644
--- a/Dalamud/Game/Gui/ChatGui.cs
+++ b/Dalamud/Game/Gui/ChatGui.cs
@@ -50,7 +50,7 @@ namespace Dalamud.Game.Gui
         }
 
         /// <summary>
-        /// A delegate type used with the <see cref="OnChatMessage"/> event.
+        /// A delegate type used with the <see cref="ChatGui.ChatMessage"/> event.
         /// </summary>
         /// <param name="type">The type of chat.</param>
         /// <param name="senderId">The sender ID.</param>
@@ -60,7 +60,7 @@ namespace Dalamud.Game.Gui
         public delegate void OnMessageDelegate(XivChatType type, uint senderId, ref SeString sender, ref SeString message, ref bool isHandled);
 
         /// <summary>
-        /// A delegate type used with the <see cref="OnCheckMessageHandled"/> event.
+        /// A delegate type used with the <see cref="ChatGui.CheckMessageHandled"/> event.
         /// </summary>
         /// <param name="type">The type of chat.</param>
         /// <param name="senderId">The sender ID.</param>
@@ -70,7 +70,7 @@ namespace Dalamud.Game.Gui
         public delegate void OnCheckMessageHandledDelegate(XivChatType type, uint senderId, ref SeString sender, ref SeString message, ref bool isHandled);
 
         /// <summary>
-        /// A delegate type used with the <see cref="OnChatMessageHandled"/> event.
+        /// A delegate type used with the <see cref="ChatGui.ChatMessageHandled"/> event.
         /// </summary>
         /// <param name="type">The type of chat.</param>
         /// <param name="senderId">The sender ID.</param>
@@ -79,7 +79,7 @@ namespace Dalamud.Game.Gui
         public delegate void OnMessageHandledDelegate(XivChatType type, uint senderId, SeString sender, SeString message);
 
         /// <summary>
-        /// A delegate type used with the <see cref="OnChatMessageUnhandled"/> event.
+        /// A delegate type used with the <see cref="ChatGui.ChatMessageUnhandled"/> event.
         /// </summary>
         /// <param name="type">The type of chat.</param>
         /// <param name="senderId">The sender ID.</param>
@@ -99,22 +99,22 @@ namespace Dalamud.Game.Gui
         /// <summary>
         /// Event that will be fired when a chat message is sent to chat by the game.
         /// </summary>
-        public event OnMessageDelegate OnChatMessage;
+        public event OnMessageDelegate ChatMessage;
 
         /// <summary>
         /// Event that allows you to stop messages from appearing in chat by setting the isHandled parameter to true.
         /// </summary>
-        public event OnCheckMessageHandledDelegate OnCheckMessageHandled;
+        public event OnCheckMessageHandledDelegate CheckMessageHandled;
 
         /// <summary>
         /// Event that will be fired when a chat message is handled by Dalamud or a Plugin.
         /// </summary>
-        public event OnMessageHandledDelegate OnChatMessageHandled;
+        public event OnMessageHandledDelegate ChatMessageHandled;
 
         /// <summary>
         /// Event that will be fired when a chat message is not handled by Dalamud or a Plugin.
         /// </summary>
-        public event OnMessageUnhandledDelegate OnChatMessageUnhandled;
+        public event OnMessageUnhandledDelegate ChatMessageUnhandled;
 
         /// <summary>
         /// Gets the ID of the last linked item.
@@ -365,11 +365,11 @@ namespace Dalamud.Game.Gui
 
                 // Call events
                 var isHandled = false;
-                this.OnCheckMessageHandled?.Invoke(chattype, senderid, ref parsedSender, ref parsedMessage, ref isHandled);
+                this.CheckMessageHandled?.Invoke(chattype, senderid, ref parsedSender, ref parsedMessage, ref isHandled);
 
                 if (!isHandled)
                 {
-                    this.OnChatMessage?.Invoke(chattype, senderid, ref parsedSender, ref parsedMessage, ref isHandled);
+                    this.ChatMessage?.Invoke(chattype, senderid, ref parsedSender, ref parsedMessage, ref isHandled);
                 }
 
                 var newEdited = parsedMessage.Encode();
@@ -395,12 +395,12 @@ namespace Dalamud.Game.Gui
                 // Print the original chat if it's handled.
                 if (isHandled)
                 {
-                    this.OnChatMessageHandled?.Invoke(chattype, senderid, parsedSender, parsedMessage);
+                    this.ChatMessageHandled?.Invoke(chattype, senderid, parsedSender, parsedMessage);
                 }
                 else
                 {
                     retVal = this.printMessageHook.Original(manager, chattype, pSenderName, messagePtr, senderid, parameter);
-                    this.OnChatMessageUnhandled?.Invoke(chattype, senderid, parsedSender, parsedMessage);
+                    this.ChatMessageUnhandled?.Invoke(chattype, senderid, parsedSender, parsedMessage);
                 }
 
                 if (this.baseAddress == IntPtr.Zero)
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ChatAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ChatAgingStep.cs
index 6c58da6b4..d6d2197e8 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ChatAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ChatAgingStep.cs
@@ -33,12 +33,12 @@ namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
                     if (!this.subscribed)
                     {
                         this.subscribed = true;
-                        dalamud.Framework.Gui.Chat.OnChatMessage += this.ChatOnOnChatMessage;
+                        dalamud.Framework.Gui.Chat.ChatMessage += this.ChatOnOnChatMessage;
                     }
 
                     if (this.hasPassed)
                     {
-                        dalamud.Framework.Gui.Chat.OnChatMessage -= this.ChatOnOnChatMessage;
+                        dalamud.Framework.Gui.Chat.ChatMessage -= this.ChatOnOnChatMessage;
                         this.subscribed = false;
                         return SelfTestStepResult.Pass;
                     }
@@ -52,7 +52,7 @@ namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
         /// <inheritdoc/>
         public void CleanUp(Dalamud dalamud)
         {
-            dalamud.Framework.Gui.Chat.OnChatMessage -= this.ChatOnOnChatMessage;
+            dalamud.Framework.Gui.Chat.ChatMessage -= this.ChatOnOnChatMessage;
             this.subscribed = false;
         }