diff --git a/Dalamud/Interface/Internal/UiDebug2/Browsing/AddonTree.AtkValues.cs b/Dalamud/Interface/Internal/UiDebug/Browsing/AddonTree.AtkValues.cs
similarity index 97%
rename from Dalamud/Interface/Internal/UiDebug2/Browsing/AddonTree.AtkValues.cs
rename to Dalamud/Interface/Internal/UiDebug/Browsing/AddonTree.AtkValues.cs
index ed9ed2150..646d4e3ad 100644
--- a/Dalamud/Interface/Internal/UiDebug2/Browsing/AddonTree.AtkValues.cs
+++ b/Dalamud/Interface/Internal/UiDebug/Browsing/AddonTree.AtkValues.cs
@@ -1,7 +1,7 @@
 using System.Numerics;
 
 using Dalamud.Bindings.ImGui;
-using Dalamud.Interface.Internal.UiDebug2.Utility;
+using Dalamud.Interface.Internal.UiDebug.Utility;
 using Dalamud.Interface.Utility.Raii;
 using Dalamud.Utility;
 
@@ -9,7 +9,7 @@ using FFXIVClientStructs.FFXIV.Component.GUI;
 
 using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.ValueType;
 
-namespace Dalamud.Interface.Internal.UiDebug2.Browsing;
+namespace Dalamud.Interface.Internal.UiDebug.Browsing;
 
 /// <inheritdoc cref="AddonTree"/>
 public unsafe partial class AddonTree
diff --git a/Dalamud/Interface/Internal/UiDebug2/Browsing/AddonTree.FieldNames.cs b/Dalamud/Interface/Internal/UiDebug/Browsing/AddonTree.FieldNames.cs
similarity index 98%
rename from Dalamud/Interface/Internal/UiDebug2/Browsing/AddonTree.FieldNames.cs
rename to Dalamud/Interface/Internal/UiDebug/Browsing/AddonTree.FieldNames.cs
index 6ff58d657..3470b724b 100644
--- a/Dalamud/Interface/Internal/UiDebug2/Browsing/AddonTree.FieldNames.cs
+++ b/Dalamud/Interface/Internal/UiDebug/Browsing/AddonTree.FieldNames.cs
@@ -7,9 +7,9 @@ using FFXIVClientStructs.Attributes;
 using FFXIVClientStructs.FFXIV.Component.GUI;
 
 using static System.Reflection.BindingFlags;
-using static Dalamud.Interface.Internal.UiDebug2.UiDebug2;
+using static Dalamud.Interface.Internal.UiDebug.UiDebug;
 
-namespace Dalamud.Interface.Internal.UiDebug2.Browsing;
+namespace Dalamud.Interface.Internal.UiDebug.Browsing;
 
 /// <inheritdoc cref="AddonTree"/>
 public unsafe partial class AddonTree
diff --git a/Dalamud/Interface/Internal/UiDebug2/Browsing/AddonTree.cs b/Dalamud/Interface/Internal/UiDebug/Browsing/AddonTree.cs
similarity index 96%
rename from Dalamud/Interface/Internal/UiDebug2/Browsing/AddonTree.cs
rename to Dalamud/Interface/Internal/UiDebug/Browsing/AddonTree.cs
index 2e0874206..954755708 100644
--- a/Dalamud/Interface/Internal/UiDebug2/Browsing/AddonTree.cs
+++ b/Dalamud/Interface/Internal/UiDebug/Browsing/AddonTree.cs
@@ -8,12 +8,12 @@ using Dalamud.Interface.Components;
 using FFXIVClientStructs.FFXIV.Component.GUI;
 
 using static Dalamud.Interface.FontAwesomeIcon;
-using static Dalamud.Interface.Internal.UiDebug2.ElementSelector;
-using static Dalamud.Interface.Internal.UiDebug2.UiDebug2;
-using static Dalamud.Interface.Internal.UiDebug2.Utility.Gui;
+using static Dalamud.Interface.Internal.UiDebug.ElementSelector;
+using static Dalamud.Interface.Internal.UiDebug.UiDebug;
+using static Dalamud.Interface.Internal.UiDebug.Utility.Gui;
 using static Dalamud.Utility.Util;
 
-namespace Dalamud.Interface.Internal.UiDebug2.Browsing;
+namespace Dalamud.Interface.Internal.UiDebug.Browsing;
 
 /// <summary>
 /// A class representing an <see cref="AtkUnitBase"/>, allowing it to be browsed within an ImGui window.
diff --git a/Dalamud/Interface/Internal/UiDebug2/Browsing/Events.cs b/Dalamud/Interface/Internal/UiDebug/Browsing/Events.cs
similarity index 97%
rename from Dalamud/Interface/Internal/UiDebug2/Browsing/Events.cs
rename to Dalamud/Interface/Internal/UiDebug/Browsing/Events.cs
index ed1926ce9..6e56c75f8 100644
--- a/Dalamud/Interface/Internal/UiDebug2/Browsing/Events.cs
+++ b/Dalamud/Interface/Internal/UiDebug/Browsing/Events.cs
@@ -9,7 +9,7 @@ using FFXIVClientStructs.FFXIV.Component.GUI;
 using static Dalamud.Bindings.ImGui.ImGuiTableColumnFlags;
 using static Dalamud.Bindings.ImGui.ImGuiTableFlags;
 
-namespace Dalamud.Interface.Internal.UiDebug2.Browsing;
+namespace Dalamud.Interface.Internal.UiDebug.Browsing;
 
 /// <summary>
 /// Class that prints the events table for a node, where applicable.
diff --git a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.ClippingMask.cs b/Dalamud/Interface/Internal/UiDebug/Browsing/NodeTree.ClippingMask.cs
similarity index 95%
rename from Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.ClippingMask.cs
rename to Dalamud/Interface/Internal/UiDebug/Browsing/NodeTree.ClippingMask.cs
index cfba1a2bc..f9fb3b73d 100644
--- a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.ClippingMask.cs
+++ b/Dalamud/Interface/Internal/UiDebug/Browsing/NodeTree.ClippingMask.cs
@@ -2,7 +2,7 @@ using FFXIVClientStructs.FFXIV.Component.GUI;
 
 using static Dalamud.Utility.Util;
 
-namespace Dalamud.Interface.Internal.UiDebug2.Browsing;
+namespace Dalamud.Interface.Internal.UiDebug.Browsing;
 
 /// <summary>
 /// A tree for an <see cref="AtkClippingMaskNode"/> that can be printed and browsed via ImGui.
diff --git a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Collision.cs b/Dalamud/Interface/Internal/UiDebug/Browsing/NodeTree.Collision.cs
similarity index 93%
rename from Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Collision.cs
rename to Dalamud/Interface/Internal/UiDebug/Browsing/NodeTree.Collision.cs
index c447afac9..d6370d33f 100644
--- a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Collision.cs
+++ b/Dalamud/Interface/Internal/UiDebug/Browsing/NodeTree.Collision.cs
@@ -2,7 +2,7 @@ using FFXIVClientStructs.FFXIV.Component.GUI;
 
 using static Dalamud.Utility.Util;
 
-namespace Dalamud.Interface.Internal.UiDebug2.Browsing;
+namespace Dalamud.Interface.Internal.UiDebug.Browsing;
 
 /// <summary>
 /// A tree for an <see cref="AtkCollisionNode"/> that can be printed and browsed via ImGui.
diff --git a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Component.cs b/Dalamud/Interface/Internal/UiDebug/Browsing/NodeTree.Component.cs
similarity index 99%
rename from Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Component.cs
rename to Dalamud/Interface/Internal/UiDebug/Browsing/NodeTree.Component.cs
index 13d559c11..fb4444be1 100644
--- a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Component.cs
+++ b/Dalamud/Interface/Internal/UiDebug/Browsing/NodeTree.Component.cs
@@ -6,11 +6,11 @@ using FFXIVClientStructs.FFXIV.Component.GUI;
 
 using Lumina.Text.ReadOnly;
 
-using static Dalamud.Interface.Internal.UiDebug2.Utility.Gui;
+using static Dalamud.Interface.Internal.UiDebug.Utility.Gui;
 using static Dalamud.Utility.Util;
 using static FFXIVClientStructs.FFXIV.Component.GUI.ComponentType;
 
-namespace Dalamud.Interface.Internal.UiDebug2.Browsing;
+namespace Dalamud.Interface.Internal.UiDebug.Browsing;
 
 /// <summary>
 /// A tree for an <see cref="AtkComponentNode"/> that can be printed and browsed via ImGui.
diff --git a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Counter.cs b/Dalamud/Interface/Internal/UiDebug/Browsing/NodeTree.Counter.cs
similarity index 90%
rename from Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Counter.cs
rename to Dalamud/Interface/Internal/UiDebug/Browsing/NodeTree.Counter.cs
index 2b2adbcee..2ffcad5de 100644
--- a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Counter.cs
+++ b/Dalamud/Interface/Internal/UiDebug/Browsing/NodeTree.Counter.cs
@@ -2,10 +2,10 @@ using FFXIVClientStructs.FFXIV.Component.GUI;
 
 using Lumina.Text.ReadOnly;
 
-using static Dalamud.Interface.Internal.UiDebug2.Utility.Gui;
+using static Dalamud.Interface.Internal.UiDebug.Utility.Gui;
 using static Dalamud.Utility.Util;
 
-namespace Dalamud.Interface.Internal.UiDebug2.Browsing;
+namespace Dalamud.Interface.Internal.UiDebug.Browsing;
 
 /// <summary>
 /// A tree for an <see cref="AtkCounterNode"/> that can be printed and browsed via ImGui.
diff --git a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Editor.cs b/Dalamud/Interface/Internal/UiDebug/Browsing/NodeTree.Editor.cs
similarity index 98%
rename from Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Editor.cs
rename to Dalamud/Interface/Internal/UiDebug/Browsing/NodeTree.Editor.cs
index d4e8e61ab..d9dd1378c 100644
--- a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Editor.cs
+++ b/Dalamud/Interface/Internal/UiDebug/Browsing/NodeTree.Editor.cs
@@ -3,7 +3,7 @@ using System.Numerics;
 
 using Dalamud.Bindings.ImGui;
 using Dalamud.Interface.Components;
-using Dalamud.Interface.Internal.UiDebug2.Utility;
+using Dalamud.Interface.Internal.UiDebug.Utility;
 using Dalamud.Interface.Utility.Raii;
 
 using FFXIVClientStructs.FFXIV.Component.GUI;
@@ -16,10 +16,10 @@ using static Dalamud.Bindings.ImGui.ImGuiTableColumnFlags;
 using static Dalamud.Bindings.ImGui.ImGuiTableFlags;
 using static Dalamud.Interface.ColorHelpers;
 using static Dalamud.Interface.FontAwesomeIcon;
-using static Dalamud.Interface.Internal.UiDebug2.Utility.Gui;
+using static Dalamud.Interface.Internal.UiDebug.Utility.Gui;
 using static Dalamud.Interface.Utility.ImGuiHelpers;
 
-namespace Dalamud.Interface.Internal.UiDebug2.Browsing;
+namespace Dalamud.Interface.Internal.UiDebug.Browsing;
 
 /// <inheritdoc cref="ResNodeTree"/>
 internal unsafe partial class ResNodeTree
diff --git a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Image.cs b/Dalamud/Interface/Internal/UiDebug/Browsing/NodeTree.Image.cs
similarity index 98%
rename from Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Image.cs
rename to Dalamud/Interface/Internal/UiDebug/Browsing/NodeTree.Image.cs
index 45dd63b53..949197f50 100644
--- a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Image.cs
+++ b/Dalamud/Interface/Internal/UiDebug/Browsing/NodeTree.Image.cs
@@ -11,11 +11,11 @@ using static Dalamud.Bindings.ImGui.ImGuiTableColumnFlags;
 using static Dalamud.Bindings.ImGui.ImGuiTableFlags;
 using static Dalamud.Bindings.ImGui.ImGuiTreeNodeFlags;
 using static Dalamud.Interface.ColorHelpers;
-using static Dalamud.Interface.Internal.UiDebug2.Utility.Gui;
+using static Dalamud.Interface.Internal.UiDebug.Utility.Gui;
 using static Dalamud.Utility.Util;
 using static FFXIVClientStructs.FFXIV.Component.GUI.TextureType;
 
-namespace Dalamud.Interface.Internal.UiDebug2.Browsing;
+namespace Dalamud.Interface.Internal.UiDebug.Browsing;
 
 /// <summary>
 /// A tree for an <see cref="AtkImageNode"/> that can be printed and browsed via ImGui.
diff --git a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.NineGrid.cs b/Dalamud/Interface/Internal/UiDebug/Browsing/NodeTree.NineGrid.cs
similarity index 98%
rename from Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.NineGrid.cs
rename to Dalamud/Interface/Internal/UiDebug/Browsing/NodeTree.NineGrid.cs
index 1c06dfb40..7d241ebdb 100644
--- a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.NineGrid.cs
+++ b/Dalamud/Interface/Internal/UiDebug/Browsing/NodeTree.NineGrid.cs
@@ -1,5 +1,5 @@
 using Dalamud.Bindings.ImGui;
-using Dalamud.Interface.Internal.UiDebug2.Utility;
+using Dalamud.Interface.Internal.UiDebug.Utility;
 
 using FFXIVClientStructs.FFXIV.Component.GUI;
 
@@ -9,7 +9,7 @@ using static Dalamud.Utility.Util;
 using Vector2 = System.Numerics.Vector2;
 using Vector4 = System.Numerics.Vector4;
 
-namespace Dalamud.Interface.Internal.UiDebug2.Browsing;
+namespace Dalamud.Interface.Internal.UiDebug.Browsing;
 
 /// <summary>
 /// A tree for an <see cref="AtkNineGridNode"/> that can be printed and browsed via ImGui.
diff --git a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Res.cs b/Dalamud/Interface/Internal/UiDebug/Browsing/NodeTree.Res.cs
similarity index 97%
rename from Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Res.cs
rename to Dalamud/Interface/Internal/UiDebug/Browsing/NodeTree.Res.cs
index 086a41efc..3ff64fd24 100644
--- a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Res.cs
+++ b/Dalamud/Interface/Internal/UiDebug/Browsing/NodeTree.Res.cs
@@ -4,7 +4,7 @@ using System.Runtime.InteropServices;
 
 using Dalamud.Bindings.ImGui;
 using Dalamud.Interface.Components;
-using Dalamud.Interface.Internal.UiDebug2.Utility;
+using Dalamud.Interface.Internal.UiDebug.Utility;
 using Dalamud.Interface.Utility.Raii;
 
 using FFXIVClientStructs.FFXIV.Component.GUI;
@@ -13,14 +13,14 @@ using static Dalamud.Bindings.ImGui.ImGuiCol;
 using static Dalamud.Bindings.ImGui.ImGuiTreeNodeFlags;
 using static Dalamud.Interface.ColorHelpers;
 using static Dalamud.Interface.FontAwesomeIcon;
-using static Dalamud.Interface.Internal.UiDebug2.Browsing.Events;
-using static Dalamud.Interface.Internal.UiDebug2.ElementSelector;
-using static Dalamud.Interface.Internal.UiDebug2.UiDebug2;
-using static Dalamud.Interface.Internal.UiDebug2.Utility.Gui;
+using static Dalamud.Interface.Internal.UiDebug.Browsing.Events;
+using static Dalamud.Interface.Internal.UiDebug.ElementSelector;
+using static Dalamud.Interface.Internal.UiDebug.UiDebug;
+using static Dalamud.Interface.Internal.UiDebug.Utility.Gui;
 using static Dalamud.Utility.Util;
 using static FFXIVClientStructs.FFXIV.Component.GUI.NodeFlags;
 
-namespace Dalamud.Interface.Internal.UiDebug2.Browsing;
+namespace Dalamud.Interface.Internal.UiDebug.Browsing;
 
 /// <summary>
 /// A tree for an <see cref="AtkResNode"/> that can be printed and browsed via ImGui.
diff --git a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Text.cs b/Dalamud/Interface/Internal/UiDebug/Browsing/NodeTree.Text.cs
similarity index 96%
rename from Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Text.cs
rename to Dalamud/Interface/Internal/UiDebug/Browsing/NodeTree.Text.cs
index 7ae0d8fca..74e14b683 100644
--- a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Text.cs
+++ b/Dalamud/Interface/Internal/UiDebug/Browsing/NodeTree.Text.cs
@@ -12,10 +12,10 @@ using FFXIVClientStructs.FFXIV.Component.GUI;
 using Lumina.Text.ReadOnly;
 
 using static Dalamud.Interface.ColorHelpers;
-using static Dalamud.Interface.Internal.UiDebug2.Utility.Gui;
+using static Dalamud.Interface.Internal.UiDebug.Utility.Gui;
 using static Dalamud.Utility.Util;
 
-namespace Dalamud.Interface.Internal.UiDebug2.Browsing;
+namespace Dalamud.Interface.Internal.UiDebug.Browsing;
 
 /// <summary>
 /// A tree for an <see cref="AtkTextNode"/> that can be printed and browsed via ImGui.
diff --git a/Dalamud/Interface/Internal/UiDebug2/Browsing/TimelineTree.KeyGroupColumn.cs b/Dalamud/Interface/Internal/UiDebug/Browsing/TimelineTree.KeyGroupColumn.cs
similarity index 98%
rename from Dalamud/Interface/Internal/UiDebug2/Browsing/TimelineTree.KeyGroupColumn.cs
rename to Dalamud/Interface/Internal/UiDebug/Browsing/TimelineTree.KeyGroupColumn.cs
index 71323088b..910762d97 100644
--- a/Dalamud/Interface/Internal/UiDebug2/Browsing/TimelineTree.KeyGroupColumn.cs
+++ b/Dalamud/Interface/Internal/UiDebug/Browsing/TimelineTree.KeyGroupColumn.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 
 using Dalamud.Bindings.ImGui;
 
-namespace Dalamud.Interface.Internal.UiDebug2.Browsing;
+namespace Dalamud.Interface.Internal.UiDebug.Browsing;
 
 /// <inheritdoc cref="TimelineTree"/>
 public readonly partial struct TimelineTree
diff --git a/Dalamud/Interface/Internal/UiDebug2/Browsing/TimelineTree.cs b/Dalamud/Interface/Internal/UiDebug/Browsing/TimelineTree.cs
similarity index 99%
rename from Dalamud/Interface/Internal/UiDebug2/Browsing/TimelineTree.cs
rename to Dalamud/Interface/Internal/UiDebug/Browsing/TimelineTree.cs
index 10d3d9362..a4d7151c0 100644
--- a/Dalamud/Interface/Internal/UiDebug2/Browsing/TimelineTree.cs
+++ b/Dalamud/Interface/Internal/UiDebug/Browsing/TimelineTree.cs
@@ -13,12 +13,12 @@ using static Dalamud.Bindings.ImGui.ImGuiTableColumnFlags;
 using static Dalamud.Bindings.ImGui.ImGuiTableFlags;
 using static Dalamud.Bindings.ImGui.ImGuiTreeNodeFlags;
 using static Dalamud.Interface.ColorHelpers;
-using static Dalamud.Interface.Internal.UiDebug2.Utility.Gui;
+using static Dalamud.Interface.Internal.UiDebug.Utility.Gui;
 using static Dalamud.Utility.Util;
 using static FFXIVClientStructs.FFXIV.Component.GUI.NodeType;
 
 // ReSharper disable SuggestBaseTypeForParameter
-namespace Dalamud.Interface.Internal.UiDebug2.Browsing;
+namespace Dalamud.Interface.Internal.UiDebug.Browsing;
 
 /// <summary>
 /// A struct allowing a node's animation timeline to be printed and browsed.
diff --git a/Dalamud/Interface/Internal/UiDebug2/ElementSelector.cs b/Dalamud/Interface/Internal/UiDebug/ElementSelector.cs
similarity index 95%
rename from Dalamud/Interface/Internal/UiDebug2/ElementSelector.cs
rename to Dalamud/Interface/Internal/UiDebug/ElementSelector.cs
index 46e0c1f8f..808ff25d7 100644
--- a/Dalamud/Interface/Internal/UiDebug2/ElementSelector.cs
+++ b/Dalamud/Interface/Internal/UiDebug/ElementSelector.cs
@@ -5,8 +5,8 @@ using System.Numerics;
 
 using Dalamud.Bindings.ImGui;
 using Dalamud.Interface.Components;
-using Dalamud.Interface.Internal.UiDebug2.Browsing;
-using Dalamud.Interface.Internal.UiDebug2.Utility;
+using Dalamud.Interface.Internal.UiDebug.Browsing;
+using Dalamud.Interface.Internal.UiDebug.Utility;
 using Dalamud.Interface.Utility.Raii;
 
 using FFXIVClientStructs.FFXIV.Component.GUI;
@@ -16,7 +16,7 @@ using static System.Globalization.NumberFormatInfo;
 using static Dalamud.Bindings.ImGui.ImGuiCol;
 using static Dalamud.Bindings.ImGui.ImGuiWindowFlags;
 using static Dalamud.Interface.FontAwesomeIcon;
-using static Dalamud.Interface.Internal.UiDebug2.UiDebug2;
+using static Dalamud.Interface.Internal.UiDebug.UiDebug;
 using static Dalamud.Interface.UiBuilder;
 using static Dalamud.Interface.Utility.ImGuiHelpers;
 using static FFXIVClientStructs.FFXIV.Component.GUI.NodeFlags;
@@ -25,7 +25,7 @@ using static FFXIVClientStructs.FFXIV.Component.GUI.NodeFlags;
 
 #pragma warning disable CS0659
 
-namespace Dalamud.Interface.Internal.UiDebug2;
+namespace Dalamud.Interface.Internal.UiDebug;
 
 /// <summary>
 /// A tool that enables the user to select UI elements within the inspector by mousing over them onscreen.
@@ -34,7 +34,7 @@ internal unsafe class ElementSelector : IDisposable
 {
     private const int UnitListCount = 18;
 
-    private readonly UiDebug2 uiDebug2;
+    private readonly UiDebug uiDebug;
 
     private string addressSearchInput = string.Empty;
 
@@ -43,10 +43,10 @@ internal unsafe class ElementSelector : IDisposable
     /// <summary>
     /// Initializes a new instance of the <see cref="ElementSelector"/> class.
     /// </summary>
-    /// <param name="uiDebug2">The instance of <see cref="UiDebug2"/> this Element Selector belongs to.</param>
-    internal ElementSelector(UiDebug2 uiDebug2)
+    /// <param name="uiDebug">The instance of <see cref="UiDebug"/> this Element Selector belongs to.</param>
+    internal ElementSelector(UiDebug uiDebug)
     {
-        this.uiDebug2 = uiDebug2;
+        this.uiDebug = uiDebug;
     }
 
     /// <summary>
@@ -181,7 +181,7 @@ internal unsafe class ElementSelector : IDisposable
                         {
                             this.Active = false;
 
-                            this.uiDebug2.SelectedAddonName = a.Addon->NameString;
+                            this.uiDebug.SelectedAddonName = a.Addon->NameString;
 
                             var ptrList = new List<nint> { (nint)n.Node };
 
@@ -420,7 +420,7 @@ internal unsafe class ElementSelector : IDisposable
                 var addon = unitManager->Entries[j].Value;
                 if ((nint)addon == address || FindByAddress(addon, address))
                 {
-                    this.uiDebug2.SelectedAddonName = addon->NameString;
+                    this.uiDebug.SelectedAddonName = addon->NameString;
                     return;
                 }
             }
diff --git a/Dalamud/Interface/Internal/UiDebug2/Popout.Addon.cs b/Dalamud/Interface/Internal/UiDebug/Popout.Addon.cs
similarity index 93%
rename from Dalamud/Interface/Internal/UiDebug2/Popout.Addon.cs
rename to Dalamud/Interface/Internal/UiDebug/Popout.Addon.cs
index 69fbc17fb..cc80a27c4 100644
--- a/Dalamud/Interface/Internal/UiDebug2/Popout.Addon.cs
+++ b/Dalamud/Interface/Internal/UiDebug/Popout.Addon.cs
@@ -1,11 +1,11 @@
 using System.Numerics;
 
 using Dalamud.Bindings.ImGui;
-using Dalamud.Interface.Internal.UiDebug2.Browsing;
+using Dalamud.Interface.Internal.UiDebug.Browsing;
 using Dalamud.Interface.Utility.Raii;
 using Dalamud.Interface.Windowing;
 
-namespace Dalamud.Interface.Internal.UiDebug2;
+namespace Dalamud.Interface.Internal.UiDebug;
 
 /// <summary>
 /// A popout window for an <see cref="AddonTree"/>.
diff --git a/Dalamud/Interface/Internal/UiDebug2/Popout.Node.cs b/Dalamud/Interface/Internal/UiDebug/Popout.Node.cs
similarity index 93%
rename from Dalamud/Interface/Internal/UiDebug2/Popout.Node.cs
rename to Dalamud/Interface/Internal/UiDebug/Popout.Node.cs
index de476983f..7d955f7f5 100644
--- a/Dalamud/Interface/Internal/UiDebug2/Popout.Node.cs
+++ b/Dalamud/Interface/Internal/UiDebug/Popout.Node.cs
@@ -1,15 +1,15 @@
 using System.Numerics;
 
 using Dalamud.Bindings.ImGui;
-using Dalamud.Interface.Internal.UiDebug2.Browsing;
+using Dalamud.Interface.Internal.UiDebug.Browsing;
 using Dalamud.Interface.Utility.Raii;
 using Dalamud.Interface.Windowing;
 
 using FFXIVClientStructs.FFXIV.Component.GUI;
 
-using static Dalamud.Interface.Internal.UiDebug2.UiDebug2;
+using static Dalamud.Interface.Internal.UiDebug.UiDebug;
 
-namespace Dalamud.Interface.Internal.UiDebug2;
+namespace Dalamud.Interface.Internal.UiDebug;
 
 /// <summary>
 /// A popout window for a <see cref="ResNodeTree"/>.
diff --git a/Dalamud/Interface/Internal/UiDebug2/UiDebug2.Sidebar.cs b/Dalamud/Interface/Internal/UiDebug/UiDebug.Sidebar.cs
similarity index 98%
rename from Dalamud/Interface/Internal/UiDebug2/UiDebug2.Sidebar.cs
rename to Dalamud/Interface/Internal/UiDebug/UiDebug.Sidebar.cs
index 14da58d94..0a24d4572 100644
--- a/Dalamud/Interface/Internal/UiDebug2/UiDebug2.Sidebar.cs
+++ b/Dalamud/Interface/Internal/UiDebug/UiDebug.Sidebar.cs
@@ -12,10 +12,10 @@ using static System.StringComparison;
 
 using static Dalamud.Interface.FontAwesomeIcon;
 
-namespace Dalamud.Interface.Internal.UiDebug2;
+namespace Dalamud.Interface.Internal.UiDebug;
 
-/// <inheritdoc cref="UiDebug2"/>
-internal unsafe partial class UiDebug2
+/// <inheritdoc cref="UiDebug"/>
+internal unsafe partial class UiDebug
 {
     /// <summary>
     /// All unit lists to check for addons.
diff --git a/Dalamud/Interface/Internal/UiDebug2/UiDebug2.cs b/Dalamud/Interface/Internal/UiDebug/UiDebug.cs
similarity index 92%
rename from Dalamud/Interface/Internal/UiDebug2/UiDebug2.cs
rename to Dalamud/Interface/Internal/UiDebug/UiDebug.cs
index 2aaef9256..bd7426466 100644
--- a/Dalamud/Interface/Internal/UiDebug2/UiDebug2.cs
+++ b/Dalamud/Interface/Internal/UiDebug/UiDebug.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 
 using Dalamud.Bindings.ImGui;
 using Dalamud.Game.Gui;
-using Dalamud.Interface.Internal.UiDebug2.Browsing;
+using Dalamud.Interface.Internal.UiDebug.Browsing;
 using Dalamud.Interface.Utility.Raii;
 using Dalamud.Interface.Windowing;
 using Dalamud.Logging.Internal;
@@ -12,7 +12,7 @@ using FFXIVClientStructs.FFXIV.Component.GUI;
 
 using static Dalamud.Bindings.ImGui.ImGuiWindowFlags;
 
-namespace Dalamud.Interface.Internal.UiDebug2;
+namespace Dalamud.Interface.Internal.UiDebug;
 
 // Original version by aers https://github.com/aers/FFXIVUIDebug
 // Also incorporates features from Caraxi's fork https://github.com/Caraxi/SimpleTweaksPlugin/blob/main/Debugging/UIDebug.cs
@@ -20,17 +20,17 @@ namespace Dalamud.Interface.Internal.UiDebug2;
 /// <summary>
 /// A tool for browsing the contents and structure of UI elements.
 /// </summary>
-internal partial class UiDebug2 : IDisposable
+internal partial class UiDebug : IDisposable
 {
     /// <inheritdoc cref="ModuleLog"/>
-    internal static readonly ModuleLog Log = ModuleLog.Create<UiDebug2>();
+    internal static readonly ModuleLog Log = ModuleLog.Create<UiDebug>();
 
     private readonly ElementSelector elementSelector;
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="UiDebug2"/> class.
+    /// Initializes a new instance of the <see cref="UiDebug"/> class.
     /// </summary>
-    internal UiDebug2()
+    internal UiDebug()
     {
         this.elementSelector = new(this);
     }
diff --git a/Dalamud/Interface/Internal/UiDebug2/Utility/Gui.cs b/Dalamud/Interface/Internal/UiDebug/Utility/Gui.cs
similarity index 97%
rename from Dalamud/Interface/Internal/UiDebug2/Utility/Gui.cs
rename to Dalamud/Interface/Internal/UiDebug/Utility/Gui.cs
index adfbfa81c..2c02fd793 100644
--- a/Dalamud/Interface/Internal/UiDebug2/Utility/Gui.cs
+++ b/Dalamud/Interface/Internal/UiDebug/Utility/Gui.cs
@@ -9,10 +9,10 @@ using FFXIVClientStructs.FFXIV.Client.Graphics;
 using static Dalamud.Bindings.ImGui.ImGuiCol;
 using static Dalamud.Interface.ColorHelpers;
 
-namespace Dalamud.Interface.Internal.UiDebug2.Utility;
+namespace Dalamud.Interface.Internal.UiDebug.Utility;
 
 /// <summary>
-/// Miscellaneous ImGui tools used by <see cref="UiDebug2"/>.
+/// Miscellaneous ImGui tools used by <see cref="UiDebug"/>.
 /// </summary>
 internal static class Gui
 {
diff --git a/Dalamud/Interface/Internal/UiDebug2/Utility/NodeBounds.cs b/Dalamud/Interface/Internal/UiDebug/Utility/NodeBounds.cs
similarity index 99%
rename from Dalamud/Interface/Internal/UiDebug2/Utility/NodeBounds.cs
rename to Dalamud/Interface/Internal/UiDebug/Utility/NodeBounds.cs
index 20feb903f..414d49cf5 100644
--- a/Dalamud/Interface/Internal/UiDebug2/Utility/NodeBounds.cs
+++ b/Dalamud/Interface/Internal/UiDebug/Utility/NodeBounds.cs
@@ -11,7 +11,7 @@ using static System.MathF;
 
 using static Dalamud.Interface.ColorHelpers;
 
-namespace Dalamud.Interface.Internal.UiDebug2.Utility;
+namespace Dalamud.Interface.Internal.UiDebug.Utility;
 
 /// <summary>
 /// A struct representing the perimeter of an <see cref="AtkResNode"/>, accounting for all transformations.
diff --git a/Dalamud/Interface/Internal/Windows/Data/DataWindow.cs b/Dalamud/Interface/Internal/Windows/Data/DataWindow.cs
index f5dc19f3f..64de5e87d 100644
--- a/Dalamud/Interface/Internal/Windows/Data/DataWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/Data/DataWindow.cs
@@ -20,7 +20,7 @@ internal class DataWindow : Window, IDisposable
 {
     private readonly IDataWindowWidget[] modules =
     [
-        new AddonInspectorWidget2(),
+        new AddonInspectorWidget(),
         new AddonLifecycleWidget(),
         new AddonWidget(),
         new AddressesWidget(),
diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/AddonInspectorWidget2.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/AddonInspectorWidget.cs
similarity index 50%
rename from Dalamud/Interface/Internal/Windows/Data/Widgets/AddonInspectorWidget2.cs
rename to Dalamud/Interface/Internal/Windows/Data/Widgets/AddonInspectorWidget.cs
index 6cd6ecb0b..95a5616b1 100644
--- a/Dalamud/Interface/Internal/Windows/Data/Widgets/AddonInspectorWidget2.cs
+++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/AddonInspectorWidget.cs
@@ -3,15 +3,15 @@ namespace Dalamud.Interface.Internal.Windows.Data.Widgets;
 /// <summary>
 /// Widget for displaying addon inspector.
 /// </summary>
-internal class AddonInspectorWidget2 : IDataWindowWidget
+internal class AddonInspectorWidget : IDataWindowWidget
 {
-    private UiDebug2.UiDebug2? addonInspector2;
+    private UiDebug.UiDebug? addonInspector;
 
     /// <inheritdoc/>
-    public string[]? CommandShortcuts { get; init; } = ["ai2", "addoninspector2"];
+    public string[]? CommandShortcuts { get; init; } = ["ai", "addoninspector"];
 
     /// <inheritdoc/>
-    public string DisplayName { get; init; } = "Addon Inspector v2 (Testing)";
+    public string DisplayName { get; init; } = "Addon Inspector";
 
     /// <inheritdoc/>
     public bool Ready { get; set; }
@@ -19,9 +19,9 @@ internal class AddonInspectorWidget2 : IDataWindowWidget
     /// <inheritdoc/>
     public void Load()
     {
-        this.addonInspector2 = new UiDebug2.UiDebug2();
+        this.addonInspector = new UiDebug.UiDebug();
 
-        if (this.addonInspector2 is not null)
+        if (this.addonInspector is not null)
         {
             this.Ready = true;
         }
@@ -30,6 +30,6 @@ internal class AddonInspectorWidget2 : IDataWindowWidget
     /// <inheritdoc/>
     public void Draw()
     {
-        this.addonInspector2?.Draw();
+        this.addonInspector?.Draw();
     }
 }
diff --git a/Dalamud/Plugin/Services/ITextureProvider.cs b/Dalamud/Plugin/Services/ITextureProvider.cs
index 392a5c42f..a4d1dcbd2 100644
--- a/Dalamud/Plugin/Services/ITextureProvider.cs
+++ b/Dalamud/Plugin/Services/ITextureProvider.cs
@@ -322,7 +322,7 @@ public interface ITextureProvider : IDalamudService
     /// <param name="leaveWrapOpen">Whether to leave <paramref name="wrap"/> non-disposed when the returned
     /// <see cref="Task{TResult}"/> completes.</param>
     /// <returns>Address of the new <see cref="FFXIVClientStructs.FFXIV.Client.Graphics.Kernel.Texture"/>.</returns>
-    /// <example>See <c>PrintTextureInfo</c> in <see cref="Interface.Internal.UiDebug2.Browsing.ImageNodeTre"/> for an example
+    /// <example>See <c>PrintTextureInfo</c> in <see cref="Interface.Internal.UiDebug.Browsing.ImageNodeTre"/> for an example
     /// of replacing the texture of an image node.</example>
     /// <remarks>
     /// <para>If the returned kernel texture is to be destroyed, call the fourth function in its vtable, by calling