diff --git a/Dalamud/Game/Internal/DalamudCompletion.cs b/Dalamud/Game/Internal/DalamudCompletion.cs
index ec5652b3c..e3564c823 100644
--- a/Dalamud/Game/Internal/DalamudCompletion.cs
+++ b/Dalamud/Game/Internal/DalamudCompletion.cs
@@ -114,7 +114,7 @@ internal sealed unsafe class DalamudCompletion : IInternalDisposableService
         this.ResetCompletionData();
         this.ClearCachedCommands();
 
-        var currentText = component->UnkText1.StringPtr.ExtractText();
+        var currentText = component->EvaluatedString.StringPtr.ExtractText();
 
         var commands = this.commandManager.Commands
             .Where(kv => kv.Value.ShowInHelp && (currentText.Length == 0 || kv.Key.StartsWith(currentText)))
@@ -195,7 +195,7 @@ internal sealed unsafe class DalamudCompletion : IInternalDisposableService
 
         component = (AtkComponentTextInput*)componentBase;
 
-        addon = component->ContainingAddon;
+        addon = component->OwnerAddon;
 
         if (addon == null)
             addon = component->ContainingAddon2;
diff --git a/Dalamud/Interface/Internal/Asserts/AssertHandler.cs b/Dalamud/Interface/Internal/Asserts/AssertHandler.cs
index a905ec132..276dddb57 100644
--- a/Dalamud/Interface/Internal/Asserts/AssertHandler.cs
+++ b/Dalamud/Interface/Internal/Asserts/AssertHandler.cs
@@ -110,7 +110,6 @@ internal class AssertHandler : IDisposable
         return new StackTrace(frames);
     }
 
-
     private unsafe void OnImGuiAssert(void* pExpr, void* pFile, int line)
     {
         var expr = Marshal.PtrToStringAnsi(new IntPtr(pExpr));
diff --git a/Dalamud/Interface/Internal/UiDebug.cs b/Dalamud/Interface/Internal/UiDebug.cs
index 82aec5c41..1211b505d 100644
--- a/Dalamud/Interface/Internal/UiDebug.cs
+++ b/Dalamud/Interface/Internal/UiDebug.cs
@@ -414,11 +414,11 @@ internal unsafe class UiDebug
                     var textInputComponent = (AtkComponentTextInput*)compNode->Component;
                     ImGui.Text("InputBase Text1: "u8);
                     ImGui.SameLine();
-                    Service<SeStringRenderer>.Get().Draw(textInputComponent->AtkComponentInputBase.UnkText1);
+                    Service<SeStringRenderer>.Get().Draw(textInputComponent->AtkComponentInputBase.EvaluatedString);
 
                     ImGui.Text("InputBase Text2: "u8);
                     ImGui.SameLine();
-                    Service<SeStringRenderer>.Get().Draw(textInputComponent->AtkComponentInputBase.UnkText2);
+                    Service<SeStringRenderer>.Get().Draw(textInputComponent->AtkComponentInputBase.RawString);
 
                     ImGui.Text("Text1: "u8);
                     ImGui.SameLine();
diff --git a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Component.cs b/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Component.cs
index b3e7d1b21..a35195498 100644
--- a/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Component.cs
+++ b/Dalamud/Interface/Internal/UiDebug2/Browsing/NodeTree.Component.cs
@@ -90,9 +90,9 @@ internal unsafe class ComponentNodeTree : ResNodeTree
             case TextInput:
                 var textInputComponent = (AtkComponentTextInput*)this.Component;
                 ImGui.Text(
-                    $"InputBase Text1: {Marshal.PtrToStringAnsi(new(textInputComponent->AtkComponentInputBase.UnkText1.StringPtr))}");
+                    $"InputBase Text1: {Marshal.PtrToStringAnsi(new(textInputComponent->AtkComponentInputBase.EvaluatedString.StringPtr))}");
                 ImGui.Text(
-                    $"InputBase Text2: {Marshal.PtrToStringAnsi(new(textInputComponent->AtkComponentInputBase.UnkText2.StringPtr))}");
+                    $"InputBase Text2: {Marshal.PtrToStringAnsi(new(textInputComponent->AtkComponentInputBase.RawString.StringPtr))}");
                 ImGui.Text(
                     $"Text1: {Marshal.PtrToStringAnsi(new(textInputComponent->UnkText01.StringPtr))}");
                 ImGui.Text(