diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/SelfTestWindow.cs b/Dalamud/Interface/Internal/Windows/SelfTest/SelfTestWindow.cs
index 1be6f31a3..77d30b08e 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/SelfTestWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/SelfTestWindow.cs
@@ -4,7 +4,7 @@ using System.Numerics;
 
 using Dalamud.Interface.Colors;
 using Dalamud.Interface.Components;
-using Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+using Dalamud.Interface.Internal.Windows.SelfTest.Steps;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface.Windowing;
 using Dalamud.Logging.Internal;
@@ -20,40 +20,40 @@ internal class SelfTestWindow : Window
 {
     private static readonly ModuleLog Log = new("AGING");
 
-    private readonly List<IAgingStep> steps =
+    private readonly List<ISelfTestStep> steps =
         new()
         {
-            new LoginEventAgingStep(),
-            new WaitFramesAgingStep(1000),
-            new EnterTerritoryAgingStep(148, "Central Shroud"),
-            new ItemPayloadAgingStep(),
-            new ContextMenuAgingStep(),
-            new NamePlateAgingStep(),
-            new ActorTableAgingStep(),
-            new FateTableAgingStep(),
-            new AetheryteListAgingStep(),
-            new ConditionAgingStep(),
-            new ToastAgingStep(),
-            new TargetAgingStep(),
-            new KeyStateAgingStep(),
-            new GamepadStateAgingStep(),
-            new ChatAgingStep(),
-            new HoverAgingStep(),
-            new LuminaAgingStep<Item>(true),
-            new LuminaAgingStep<Level>(true),
-            new LuminaAgingStep<Lumina.Excel.Sheets.Action>(true),
-            new LuminaAgingStep<Quest>(true),
-            new LuminaAgingStep<TerritoryType>(false),
-            new AddonLifecycleAgingStep(),
-            new PartyFinderAgingStep(),
-            new HandledExceptionAgingStep(),
-            new DutyStateAgingStep(),
-            new GameConfigAgingStep(),
-            new MarketBoardAgingStep(),
-            new SheetRedirectResolverAgingStep(),
-            new NounProcessorAgingStep(),
-            new SeStringEvaluatorAgingStep(),
-            new LogoutEventAgingStep(),
+            new LoginEventSelfTestStep(),
+            new WaitFramesSelfTestStep(1000),
+            new EnterTerritorySelfTestStep(148, "Central Shroud"),
+            new ItemPayloadSelfTestStep(),
+            new ContextMenuSelfTestStep(),
+            new NamePlateSelfTestStep(),
+            new ActorTableSelfTestStep(),
+            new FateTableSelfTestStep(),
+            new AetheryteListSelfTestStep(),
+            new ConditionSelfTestStep(),
+            new ToastSelfTestStep(),
+            new TargetSelfTestStep(),
+            new KeyStateSelfTestStep(),
+            new GamepadStateSelfTestStep(),
+            new ChatSelfTestStep(),
+            new HoverSelfTestStep(),
+            new LuminaSelfTestStep<Item>(true),
+            new LuminaSelfTestStep<Level>(true),
+            new LuminaSelfTestStep<Lumina.Excel.Sheets.Action>(true),
+            new LuminaSelfTestStep<Quest>(true),
+            new LuminaSelfTestStep<TerritoryType>(false),
+            new AddonLifecycleSelfTestStep(),
+            new PartyFinderSelfTestStep(),
+            new HandledExceptionSelfTestStep(),
+            new DutyStateSelfTestStep(),
+            new GameConfigSelfTestStep(),
+            new MarketBoardSelfTestStep(),
+            new SheetRedirectResolverSelfTestStep(),
+            new NounProcessorSelfTestStep(),
+            new SeStringEvaluatorSelfTestStep(),
+            new LogoutEventSelfTestStep(),
         };
 
     private readonly List<(SelfTestStepResult Result, TimeSpan? Duration)> stepResults = new();
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ActorTableAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ActorTableSelfTestStep.cs
similarity index 88%
rename from Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ActorTableAgingStep.cs
rename to Dalamud/Interface/Internal/Windows/SelfTest/Steps/ActorTableSelfTestStep.cs
index 242e93a49..f246cb940 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ActorTableAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ActorTableSelfTestStep.cs
@@ -2,12 +2,12 @@ using Dalamud.Game.ClientState.Objects;
 using Dalamud.Utility;
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;
 
 /// <summary>
 /// Test setup for the Actor Table.
 /// </summary>
-internal class ActorTableAgingStep : IAgingStep
+internal class ActorTableSelfTestStep : ISelfTestStep
 {
     private int index = 0;
 
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/AddonLifecycleAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/AddonLifecycleSelfTestStep.cs
similarity index 93%
rename from Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/AddonLifecycleAgingStep.cs
rename to Dalamud/Interface/Internal/Windows/SelfTest/Steps/AddonLifecycleSelfTestStep.cs
index 28edab88a..458edfaff 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/AddonLifecycleAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/AddonLifecycleSelfTestStep.cs
@@ -5,23 +5,23 @@ using Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
 
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;
 
 /// <summary>
 /// Test setup AddonLifecycle Service.
 /// </summary>
-internal class AddonLifecycleAgingStep : IAgingStep
+internal class AddonLifecycleSelfTestStep : ISelfTestStep
 {
     private readonly List<AddonLifecycleEventListener> listeners;
-    
+
     private AddonLifecycle? service;
     private TestStep currentStep = TestStep.CharacterRefresh;
     private bool listenersRegistered;
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="AddonLifecycleAgingStep"/> class.
+    /// Initializes a new instance of the <see cref="AddonLifecycleSelfTestStep"/> class.
     /// </summary>
-    public AddonLifecycleAgingStep()
+    public AddonLifecycleSelfTestStep()
     {
         this.listeners = new List<AddonLifecycleEventListener>
         {
@@ -33,7 +33,7 @@ internal class AddonLifecycleAgingStep : IAgingStep
             new(AddonEvent.PreFinalize, "Character", this.PreFinalize),
         };
     }
-    
+
     private enum TestStep
     {
         CharacterRefresh,
@@ -44,10 +44,10 @@ internal class AddonLifecycleAgingStep : IAgingStep
         CharacterFinalize,
         Complete,
     }
-    
+
     /// <inheritdoc/>
     public string Name => "Test AddonLifecycle";
-    
+
     /// <inheritdoc/>
     public SelfTestStepResult RunStep()
     {
@@ -60,7 +60,7 @@ internal class AddonLifecycleAgingStep : IAgingStep
             {
                 this.service.RegisterListener(listener);
             }
-            
+
             this.listenersRegistered = true;
         }
 
@@ -89,7 +89,7 @@ internal class AddonLifecycleAgingStep : IAgingStep
                 // Nothing to report to tester.
                 break;
         }
-        
+
         return this.currentStep is TestStep.Complete ? SelfTestStepResult.Pass : SelfTestStepResult.Waiting;
     }
 
@@ -101,32 +101,32 @@ internal class AddonLifecycleAgingStep : IAgingStep
             this.service?.UnregisterListener(listener);
         }
     }
-    
+
     private void PostSetup(AddonEvent eventType, AddonArgs addonInfo)
-    {        
+    {
         if (this.currentStep is TestStep.CharacterSetup) this.currentStep++;
     }
-    
+
     private void PostUpdate(AddonEvent eventType, AddonArgs addonInfo)
     {
         if (this.currentStep is TestStep.CharacterUpdate) this.currentStep++;
     }
-    
+
     private void PostDraw(AddonEvent eventType, AddonArgs addonInfo)
     {
         if (this.currentStep is TestStep.CharacterDraw) this.currentStep++;
     }
-    
+
     private void PostRefresh(AddonEvent eventType, AddonArgs addonInfo)
     {
         if (this.currentStep is TestStep.CharacterRefresh) this.currentStep++;
     }
-    
+
     private void PostRequestedUpdate(AddonEvent eventType, AddonArgs addonInfo)
     {
         if (this.currentStep is TestStep.CharacterRequestedUpdate) this.currentStep++;
     }
-    
+
     private void PreFinalize(AddonEvent eventType, AddonArgs addonInfo)
     {
         if (this.currentStep is TestStep.CharacterFinalize) this.currentStep++;
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/AetheryteListAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/AetheryteListSelfTestStep.cs
similarity index 89%
rename from Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/AetheryteListAgingStep.cs
rename to Dalamud/Interface/Internal/Windows/SelfTest/Steps/AetheryteListSelfTestStep.cs
index 6a4519eab..207f718ff 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/AetheryteListAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/AetheryteListSelfTestStep.cs
@@ -2,12 +2,12 @@ using Dalamud.Game.ClientState.Aetherytes;
 using Dalamud.Utility;
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;
 
 /// <summary>
 /// Test setup for the Aetheryte List.
 /// </summary>
-internal class AetheryteListAgingStep : IAgingStep
+internal class AetheryteListSelfTestStep : ISelfTestStep
 {
     private int index = 0;
 
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ChatAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ChatSelfTestStep.cs
similarity index 93%
rename from Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ChatAgingStep.cs
rename to Dalamud/Interface/Internal/Windows/SelfTest/Steps/ChatSelfTestStep.cs
index 2fdd8c060..8ab1809ad 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ChatAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ChatSelfTestStep.cs
@@ -4,12 +4,12 @@ using Dalamud.Game.Text.SeStringHandling;
 
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;
 
 /// <summary>
 /// Test setup for Chat.
 /// </summary>
-internal class ChatAgingStep : IAgingStep
+internal class ChatSelfTestStep : ISelfTestStep
 {
     private int step = 0;
     private bool subscribed = false;
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ConditionAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ConditionSelfTestStep.cs
similarity index 86%
rename from Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ConditionAgingStep.cs
rename to Dalamud/Interface/Internal/Windows/SelfTest/Steps/ConditionSelfTestStep.cs
index 8ce2111c9..2d49fbdcd 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ConditionAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ConditionSelfTestStep.cs
@@ -3,12 +3,12 @@ using Dalamud.Game.ClientState.Conditions;
 using ImGuiNET;
 using Serilog;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;
 
 /// <summary>
 /// Test setup for Condition.
 /// </summary>
-internal class ConditionAgingStep : IAgingStep
+internal class ConditionSelfTestStep : ISelfTestStep
 {
     /// <inheritdoc/>
     public string Name => "Test Condition";
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ContextMenuAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ContextMenuSelfTestStep.cs
similarity index 99%
rename from Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ContextMenuAgingStep.cs
rename to Dalamud/Interface/Internal/Windows/SelfTest/Steps/ContextMenuSelfTestStep.cs
index 992448913..0e2f61aba 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ContextMenuAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ContextMenuSelfTestStep.cs
@@ -12,12 +12,12 @@ using Lumina.Excel;
 using Lumina.Excel.Sheets;
 using Serilog;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;
 
 /// <summary>
 /// Tests for context menu.
 /// </summary>
-internal class ContextMenuAgingStep : IAgingStep
+internal class ContextMenuSelfTestStep : ISelfTestStep
 {
     private SubStep currentSubStep;
 
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/DutyStateAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/DutyStateSelfTestStep.cs
similarity index 90%
rename from Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/DutyStateAgingStep.cs
rename to Dalamud/Interface/Internal/Windows/SelfTest/Steps/DutyStateSelfTestStep.cs
index 19e218ecb..4c33347fc 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/DutyStateAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/DutyStateSelfTestStep.cs
@@ -2,12 +2,12 @@
 
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;
 
 /// <summary>
 /// Test setup for the DutyState service class.
 /// </summary>
-internal class DutyStateAgingStep : IAgingStep
+internal class DutyStateSelfTestStep : ISelfTestStep
 {
     private bool subscribed = false;
     private bool hasPassed = false;
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/EnterTerritoryAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/EnterTerritorySelfTestStep.cs
similarity index 88%
rename from Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/EnterTerritoryAgingStep.cs
rename to Dalamud/Interface/Internal/Windows/SelfTest/Steps/EnterTerritorySelfTestStep.cs
index a61af7f94..04c8eda5e 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/EnterTerritoryAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/EnterTerritorySelfTestStep.cs
@@ -2,12 +2,12 @@ using Dalamud.Game.ClientState;
 
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;
 
 /// <summary>
 /// Test setup for Territory Change.
 /// </summary>
-internal class EnterTerritoryAgingStep : IAgingStep
+internal class EnterTerritorySelfTestStep : ISelfTestStep
 {
     private readonly ushort territory;
     private readonly string terriName;
@@ -15,11 +15,11 @@ internal class EnterTerritoryAgingStep : IAgingStep
     private bool hasPassed = false;
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="EnterTerritoryAgingStep"/> class.
+    /// Initializes a new instance of the <see cref="EnterTerritorySelfTestStep"/> class.
     /// </summary>
     /// <param name="terri">The territory to check for.</param>
     /// <param name="name">Name to show.</param>
-    public EnterTerritoryAgingStep(ushort terri, string name)
+    public EnterTerritorySelfTestStep(ushort terri, string name)
     {
         this.terriName = name;
         this.territory = terri;
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/FateTableAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/FateTableSelfTestStep.cs
similarity index 89%
rename from Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/FateTableAgingStep.cs
rename to Dalamud/Interface/Internal/Windows/SelfTest/Steps/FateTableSelfTestStep.cs
index eef986302..982633dcb 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/FateTableAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/FateTableSelfTestStep.cs
@@ -2,12 +2,12 @@ using Dalamud.Game.ClientState.Fates;
 using Dalamud.Utility;
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;
 
 /// <summary>
 /// Test setup for the Fate Table.
 /// </summary>
-internal class FateTableAgingStep : IAgingStep
+internal class FateTableSelfTestStep : ISelfTestStep
 {
     private byte index = 0;
 
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/GameConfigAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/GameConfigSelfTestStep.cs
similarity index 95%
rename from Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/GameConfigAgingStep.cs
rename to Dalamud/Interface/Internal/Windows/SelfTest/Steps/GameConfigSelfTestStep.cs
index 97c163590..440ec9f5d 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/GameConfigAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/GameConfigSelfTestStep.cs
@@ -2,12 +2,12 @@
 
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;
 
 /// <summary>
 /// Test of GameConfig.
 /// </summary>
-internal class GameConfigAgingStep : IAgingStep
+internal class GameConfigSelfTestStep : ISelfTestStep
 {
     private bool started;
     private bool isStartedLegacy;
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/GamepadStateAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/GamepadStateSelfTestStep.cs
similarity index 93%
rename from Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/GamepadStateAgingStep.cs
rename to Dalamud/Interface/Internal/Windows/SelfTest/Steps/GamepadStateSelfTestStep.cs
index 323d82bbc..04684d521 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/GamepadStateAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/GamepadStateSelfTestStep.cs
@@ -7,12 +7,12 @@ using Lumina.Text.Payloads;
 
 using LSeStringBuilder = Lumina.Text.SeStringBuilder;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;
 
 /// <summary>
 /// Test setup for the Gamepad State.
 /// </summary>
-internal class GamepadStateAgingStep : IAgingStep
+internal class GamepadStateSelfTestStep : ISelfTestStep
 {
     /// <inheritdoc/>
     public string Name => "Test GamePadState";
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/HandledExceptionAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/HandledExceptionSelfTestStep.cs
similarity index 82%
rename from Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/HandledExceptionAgingStep.cs
rename to Dalamud/Interface/Internal/Windows/SelfTest/Steps/HandledExceptionSelfTestStep.cs
index 5d2173ad5..9757481e4 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/HandledExceptionAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/HandledExceptionSelfTestStep.cs
@@ -1,11 +1,11 @@
 using System.Runtime.InteropServices;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;
 
 /// <summary>
 /// Test dedicated to handling of Access Violations.
 /// </summary>
-internal class HandledExceptionAgingStep : IAgingStep
+internal class HandledExceptionSelfTestStep : ISelfTestStep
 {
     /// <inheritdoc/>
     public string Name => "Test Handled Exception";
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/HoverAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/HoverSelfTestStep.cs
similarity index 91%
rename from Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/HoverAgingStep.cs
rename to Dalamud/Interface/Internal/Windows/SelfTest/Steps/HoverSelfTestStep.cs
index 8f509b8e7..85b5d3784 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/HoverAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/HoverSelfTestStep.cs
@@ -2,12 +2,12 @@ using Dalamud.Game.Gui;
 
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;
 
 /// <summary>
 /// Test setup for the Hover events.
 /// </summary>
-internal class HoverAgingStep : IAgingStep
+internal class HoverSelfTestStep : ISelfTestStep
 {
     private bool clearedItem = false;
     private bool clearedAction = false;
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/IAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ISelfTestStep.cs
similarity index 85%
rename from Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/IAgingStep.cs
rename to Dalamud/Interface/Internal/Windows/SelfTest/Steps/ISelfTestStep.cs
index 680961344..529d788ab 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/IAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ISelfTestStep.cs
@@ -1,9 +1,9 @@
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;
 
 /// <summary>
 /// Interface for test implementations.
 /// </summary>
-internal interface IAgingStep
+internal interface ISelfTestStep
 {
     /// <summary>
     /// Gets the name of the test.
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ItemPayloadAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ItemPayloadSelfTestStep.cs
similarity index 97%
rename from Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ItemPayloadAgingStep.cs
rename to Dalamud/Interface/Internal/Windows/SelfTest/Steps/ItemPayloadSelfTestStep.cs
index 1ccb5934f..0988413b0 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ItemPayloadAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ItemPayloadSelfTestStep.cs
@@ -4,12 +4,12 @@ using Dalamud.Game.Text.SeStringHandling.Payloads;
 
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;
 
 /// <summary>
 /// Test setup for item payloads.
 /// </summary>
-internal class ItemPayloadAgingStep : IAgingStep
+internal class ItemPayloadSelfTestStep : ISelfTestStep
 {
     private SubStep currentSubStep;
 
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/KeyStateAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/KeyStateSelfTestStep.cs
similarity index 86%
rename from Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/KeyStateAgingStep.cs
rename to Dalamud/Interface/Internal/Windows/SelfTest/Steps/KeyStateSelfTestStep.cs
index 522943e87..667f3adc4 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/KeyStateAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/KeyStateSelfTestStep.cs
@@ -2,12 +2,12 @@ using Dalamud.Game.ClientState.Keys;
 
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;
 
 /// <summary>
 /// Test setup for the Key State.
 /// </summary>
-internal class KeyStateAgingStep : IAgingStep
+internal class KeyStateSelfTestStep : ISelfTestStep
 {
     /// <inheritdoc/>
     public string Name => "Test KeyState";
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LoginEventAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/LoginEventSelfTestStep.cs
similarity index 90%
rename from Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LoginEventAgingStep.cs
rename to Dalamud/Interface/Internal/Windows/SelfTest/Steps/LoginEventSelfTestStep.cs
index d755e95ef..9540c636a 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LoginEventAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/LoginEventSelfTestStep.cs
@@ -2,12 +2,12 @@ using Dalamud.Game.ClientState;
 
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;
 
 /// <summary>
 /// Test setup for the login events.
 /// </summary>
-internal class LoginEventAgingStep : IAgingStep
+internal class LoginEventSelfTestStep : ISelfTestStep
 {
     private bool subscribed = false;
     private bool hasPassed = false;
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LogoutEventAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/LogoutEventSelfTestStep.cs
similarity index 91%
rename from Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LogoutEventAgingStep.cs
rename to Dalamud/Interface/Internal/Windows/SelfTest/Steps/LogoutEventSelfTestStep.cs
index 723182111..13bcfcf35 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LogoutEventAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/LogoutEventSelfTestStep.cs
@@ -2,12 +2,12 @@ using Dalamud.Game.ClientState;
 
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;
 
 /// <summary>
 /// Test setup for the login events.
 /// </summary>
-internal class LogoutEventAgingStep : IAgingStep
+internal class LogoutEventSelfTestStep : ISelfTestStep
 {
     private bool subscribed = false;
     private bool hasPassed = false;
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LuminaAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/LuminaSelfTestStep.cs
similarity index 90%
rename from Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LuminaAgingStep.cs
rename to Dalamud/Interface/Internal/Windows/SelfTest/Steps/LuminaSelfTestStep.cs
index 0f411b8f1..3fbc4361f 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LuminaAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/LuminaSelfTestStep.cs
@@ -2,14 +2,14 @@ using Dalamud.Data;
 using Dalamud.Utility;
 using Lumina.Excel;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;
 
 /// <summary>
 /// Test setup for Lumina.
 /// </summary>
 /// <typeparam name="T">ExcelRow to run test on.</typeparam>
 /// <param name="isLargeSheet">Whether or not the sheet is large. If it is large, the self test will iterate through the full sheet in one frame and benchmark the time taken.</param>
-internal class LuminaAgingStep<T>(bool isLargeSheet) : IAgingStep
+internal class LuminaSelfTestStep<T>(bool isLargeSheet) : ISelfTestStep
     where T : struct, IExcelRow<T>
 {
     private int step = 0;
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/MarketBoardAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/MarketBoardSelfTestStep.cs
similarity index 98%
rename from Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/MarketBoardAgingStep.cs
rename to Dalamud/Interface/Internal/Windows/SelfTest/Steps/MarketBoardSelfTestStep.cs
index 513141fa9..4a6dd185f 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/MarketBoardAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/MarketBoardSelfTestStep.cs
@@ -5,12 +5,12 @@ using Dalamud.Game.MarketBoard;
 using Dalamud.Game.Network.Structures;
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;
 
 /// <summary>
 /// Tests the various market board events.
 /// </summary>
-internal class MarketBoardAgingStep : IAgingStep
+internal class MarketBoardSelfTestStep : ISelfTestStep
 {
     private SubStep currentSubStep;
     private bool eventsSubscribed;
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/NamePlateAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/NamePlateSelfTestStep.cs
similarity index 97%
rename from Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/NamePlateAgingStep.cs
rename to Dalamud/Interface/Internal/Windows/SelfTest/Steps/NamePlateSelfTestStep.cs
index 5a03a6dc2..e7ce8e42a 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/NamePlateAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/NamePlateSelfTestStep.cs
@@ -6,12 +6,12 @@ using Dalamud.Game.Text.SeStringHandling.Payloads;
 
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;
 
 /// <summary>
 /// Tests for nameplates.
 /// </summary>
-internal class NamePlateAgingStep : IAgingStep
+internal class NamePlateSelfTestStep : ISelfTestStep
 {
     private SubStep currentSubStep;
     private Dictionary<ulong, int>? updateCount;
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/NounProcessorAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/NounProcessorSelfTestStep.cs
similarity index 99%
rename from Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/NounProcessorAgingStep.cs
rename to Dalamud/Interface/Internal/Windows/SelfTest/Steps/NounProcessorSelfTestStep.cs
index 4bea503d9..7319eec7b 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/NounProcessorAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/NounProcessorSelfTestStep.cs
@@ -6,12 +6,12 @@ using ImGuiNET;
 
 using LSheets = Lumina.Excel.Sheets;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;
 
 /// <summary>
 /// Test setup for NounProcessor.
 /// </summary>
-internal class NounProcessorAgingStep : IAgingStep
+internal class NounProcessorSelfTestStep : ISelfTestStep
 {
     private NounTestEntry[] tests =
     [
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/PartyFinderAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/PartyFinderSelfTestStep.cs
similarity index 92%
rename from Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/PartyFinderAgingStep.cs
rename to Dalamud/Interface/Internal/Windows/SelfTest/Steps/PartyFinderSelfTestStep.cs
index d6f38092b..475412e70 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/PartyFinderAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/PartyFinderSelfTestStep.cs
@@ -3,12 +3,12 @@ using Dalamud.Game.Gui.PartyFinder.Types;
 
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;
 
 /// <summary>
 /// Test setup for Party Finder events.
 /// </summary>
-internal class PartyFinderAgingStep : IAgingStep
+internal class PartyFinderSelfTestStep : ISelfTestStep
 {
     private bool subscribed = false;
     private bool hasPassed = false;
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/SeStringEvaluatorAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/SeStringEvaluatorSelfTestStep.cs
similarity index 96%
rename from Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/SeStringEvaluatorAgingStep.cs
rename to Dalamud/Interface/Internal/Windows/SelfTest/Steps/SeStringEvaluatorSelfTestStep.cs
index 3a0a7d546..423a56172 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/SeStringEvaluatorAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/SeStringEvaluatorSelfTestStep.cs
@@ -5,12 +5,12 @@ using ImGuiNET;
 
 using Lumina.Text.ReadOnly;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;
 
 /// <summary>
 /// Test setup for SeStringEvaluator.
 /// </summary>
-internal class SeStringEvaluatorAgingStep : IAgingStep
+internal class SeStringEvaluatorSelfTestStep : ISelfTestStep
 {
     private int step = 0;
 
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/SheetRedirectResolverAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/SheetRedirectResolverSelfTestStep.cs
similarity index 97%
rename from Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/SheetRedirectResolverAgingStep.cs
rename to Dalamud/Interface/Internal/Windows/SelfTest/Steps/SheetRedirectResolverSelfTestStep.cs
index 0c9dc763f..6ab08cd91 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/SheetRedirectResolverAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/SheetRedirectResolverSelfTestStep.cs
@@ -8,12 +8,12 @@ using FFXIVClientStructs.FFXIV.Client.UI.Misc;
 
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;
 
 /// <summary>
 /// Test setup for SheetRedirectResolver.
 /// </summary>
-internal class SheetRedirectResolverAgingStep : IAgingStep
+internal class SheetRedirectResolverSelfTestStep : ISelfTestStep
 {
     private RedirectEntry[] redirects =
     [
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/TargetAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/TargetSelfTestStep.cs
similarity index 93%
rename from Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/TargetAgingStep.cs
rename to Dalamud/Interface/Internal/Windows/SelfTest/Steps/TargetSelfTestStep.cs
index f8767ad53..b56b08ed5 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/TargetAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/TargetSelfTestStep.cs
@@ -4,12 +4,12 @@ using Dalamud.Game.ClientState.Objects.Types;
 
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;
 
 /// <summary>
 /// Test setup for targets.
 /// </summary>
-internal class TargetAgingStep : IAgingStep
+internal class TargetSelfTestStep : ISelfTestStep
 {
     private int step = 0;
 
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ToastAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ToastSelfTestStep.cs
similarity index 81%
rename from Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ToastAgingStep.cs
rename to Dalamud/Interface/Internal/Windows/SelfTest/Steps/ToastSelfTestStep.cs
index f02eafc99..1c82e274c 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ToastAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/ToastSelfTestStep.cs
@@ -1,11 +1,11 @@
 using Dalamud.Game.Gui.Toast;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;
 
 /// <summary>
 /// Test setup for toasts.
 /// </summary>
-internal class ToastAgingStep : IAgingStep
+internal class ToastSelfTestStep : ISelfTestStep
 {
     /// <inheritdoc/>
     public string Name => "Test Toasts";
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/WaitFramesAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/WaitFramesSelfTestStep.cs
similarity index 72%
rename from Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/WaitFramesAgingStep.cs
rename to Dalamud/Interface/Internal/Windows/SelfTest/Steps/WaitFramesSelfTestStep.cs
index 54aeee145..35c64376d 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/WaitFramesAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/WaitFramesSelfTestStep.cs
@@ -1,18 +1,18 @@
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;
 
 /// <summary>
 /// Test that waits N frames.
 /// </summary>
-internal class WaitFramesAgingStep : IAgingStep
+internal class WaitFramesSelfTestStep : ISelfTestStep
 {
     private readonly int frames;
     private int cFrames;
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="WaitFramesAgingStep"/> class.
+    /// Initializes a new instance of the <see cref="WaitFramesSelfTestStep"/> class.
     /// </summary>
     /// <param name="frames">Amount of frames to wait.</param>
-    public WaitFramesAgingStep(int frames)
+    public WaitFramesSelfTestStep(int frames)
     {
         this.frames = frames;
         this.cFrames = frames;