diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ActorTableAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ActorTableAgingStep.cs
index 4d927b010..ee956de44 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ActorTableAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ActorTableAgingStep.cs
@@ -1,4 +1,4 @@
-using Dalamud.Utility;
+using Dalamud.Utility;
 using ImGuiNET;
 
 namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
@@ -18,12 +18,12 @@ namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
         {
             ImGui.Text("Checking actor table...");
 
-            if (this.index == dalamud.ClientState.Actors.Length - 1)
+            if (this.index == dalamud.ClientState.Objects.Length - 1)
             {
                 return SelfTestStepResult.Pass;
             }
 
-            var actor = dalamud.ClientState.Actors[this.index];
+            var actor = dalamud.ClientState.Objects[this.index];
             this.index++;
 
             if (actor == null)
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/TargetAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/TargetAgingStep.cs
index c2dde87a2..d6f0e6365 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/TargetAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/TargetAgingStep.cs
@@ -1,5 +1,5 @@
-using Dalamud.Game.ClientState.Actors.Types;
-using Dalamud.Game.ClientState.Actors.Types.NonPlayer;
+using Dalamud.Game.ClientState.Objects.SubKinds;
+using Dalamud.Game.ClientState.Objects.Types;
 using ImGuiNET;
 
 namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
@@ -20,7 +20,7 @@ namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
             switch (this.step)
             {
                 case 0:
-                    dalamud.ClientState.Targets.ClearCurrentTarget();
+                    dalamud.ClientState.Targets.ClearTarget();
                     dalamud.ClientState.Targets.ClearFocusTarget();
 
                     this.step++;
@@ -30,7 +30,7 @@ namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
                 case 1:
                     ImGui.Text("Target a player...");
 
-                    var cTarget = dalamud.ClientState.Targets.CurrentTarget;
+                    var cTarget = dalamud.ClientState.Targets.Target;
                     if (cTarget is PlayerCharacter)
                     {
                         this.step++;