diff --git a/Dalamud/Game/ClientState/ClientState.cs b/Dalamud/Game/ClientState/ClientState.cs
index 4a82b96d5..acfb704a5 100644
--- a/Dalamud/Game/ClientState/ClientState.cs
+++ b/Dalamud/Game/ClientState/ClientState.cs
@@ -90,12 +90,12 @@ namespace Dalamud.Game.ClientState
         /// <summary>
         /// Event that fires when a character is logging in.
         /// </summary>
-        public event EventHandler OnLogin;
+        public event EventHandler Login;
 
         /// <summary>
         /// Event that fires when a character is logging out.
         /// </summary>
-        public event EventHandler OnLogout;
+        public event EventHandler Logout;
 
         /// <summary>
         /// Event that gets fired when a duty is ready.
@@ -216,7 +216,7 @@ namespace Dalamud.Game.ClientState
                 Log.Debug("Is login");
                 this.lastConditionNone = false;
                 this.IsLoggedIn = true;
-                this.OnLogin?.Invoke(this, null);
+                this.Login?.Invoke(this, null);
             }
 
             if (!this.Condition.Any() && this.lastConditionNone == false)
@@ -224,7 +224,7 @@ namespace Dalamud.Game.ClientState
                 Log.Debug("Is logout");
                 this.lastConditionNone = true;
                 this.IsLoggedIn = false;
-                this.OnLogout?.Invoke(this, null);
+                this.Logout?.Invoke(this, null);
             }
         }
     }
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LoginEventAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LoginEventAgingStep.cs
index 27297083c..648b42e63 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LoginEventAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LoginEventAgingStep.cs
@@ -22,13 +22,13 @@ namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
 
             if (!this.subscribed)
             {
-                dalamud.ClientState.OnLogin += this.ClientStateOnOnLogin;
+                dalamud.ClientState.Login += this.ClientStateOnOnLogin;
                 this.subscribed = true;
             }
 
             if (this.hasPassed)
             {
-                dalamud.ClientState.OnLogin -= this.ClientStateOnOnLogin;
+                dalamud.ClientState.Login -= this.ClientStateOnOnLogin;
                 this.subscribed = false;
                 return SelfTestStepResult.Pass;
             }
@@ -41,7 +41,7 @@ namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
         {
             if (this.subscribed)
             {
-                dalamud.ClientState.OnLogin -= this.ClientStateOnOnLogin;
+                dalamud.ClientState.Login -= this.ClientStateOnOnLogin;
                 this.subscribed = false;
             }
         }
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LogoutEventAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LogoutEventAgingStep.cs
index 0356c0dd2..6b6ce78fe 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LogoutEventAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LogoutEventAgingStep.cs
@@ -22,13 +22,13 @@ namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
 
             if (!this.subscribed)
             {
-                dalamud.ClientState.OnLogout += this.ClientStateOnOnLogout;
+                dalamud.ClientState.Logout += this.ClientStateOnOnLogout;
                 this.subscribed = true;
             }
 
             if (this.hasPassed)
             {
-                dalamud.ClientState.OnLogout -= this.ClientStateOnOnLogout;
+                dalamud.ClientState.Logout -= this.ClientStateOnOnLogout;
                 this.subscribed = false;
                 return SelfTestStepResult.Pass;
             }
@@ -41,7 +41,7 @@ namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
         {
             if (this.subscribed)
             {
-                dalamud.ClientState.OnLogout -= this.ClientStateOnOnLogout;
+                dalamud.ClientState.Logout -= this.ClientStateOnOnLogout;
                 this.subscribed = false;
             }
         }