diff --git a/File_Format_Library/FileFormats/Archives/SARC.cs b/File_Format_Library/FileFormats/Archives/SARC.cs
index 6abbbb01..cd80d3ae 100644
--- a/File_Format_Library/FileFormats/Archives/SARC.cs
+++ b/File_Format_Library/FileFormats/Archives/SARC.cs
@@ -182,18 +182,9 @@ namespace FirstPlugin
                 string NewActorName = dialog.textBox1.Text;
                 FileName = NewActorName + ".szs";
 
-                foreach (var file in files)
-                {
-                    string NodeName = Path.GetFileNameWithoutExtension(file.FileName);
-                    string ext = Utils.GetExtension(file.FileName);
-                    if (NodeName == ActorName)
-                    {
-                        file.FileName = $"{NewActorName}{ext}";
-                    }
-                    else if (file.FileName.Contains("Attribute.byml"))
-                    {
-                        file.FileName = $"{NewActorName}Attribute.byml";
-                    }
+                foreach (var file in files) {
+                    file.FileName = file.FileName.Replace(ActorName, NewActorName);
+                    file.UpdateWrapper();
                 }
             }
         }
diff --git a/Switch_Toolbox_Library/Interfaces/FileFormatting/IArchiveFile.cs b/Switch_Toolbox_Library/Interfaces/FileFormatting/IArchiveFile.cs
index e35dd71a..22038b17 100644
--- a/Switch_Toolbox_Library/Interfaces/FileFormatting/IArchiveFile.cs
+++ b/Switch_Toolbox_Library/Interfaces/FileFormatting/IArchiveFile.cs
@@ -75,6 +75,15 @@ namespace Toolbox.Library
         [Browsable(false)]
         public virtual bool CanLoadFile { get; set; } = true;
 
+        [Browsable(false)]
+        public ArchiveFileWrapper FileWrapper;
+
+        public void UpdateWrapper()
+        {
+            if (FileWrapper == null) return;
+
+            FileWrapper.Text = Path.GetFileName(FileName);
+        }
 
         [Browsable(false)]
         public virtual IFileFormat OpenFile()
@@ -276,6 +285,7 @@ namespace Toolbox.Library
         public void AddFileNode(ArchiveFileWrapper fileWrapper)
         {
             FileNodes.Add(Tuple.Create(fileWrapper.ArchiveFileInfo, (TreeNode)fileWrapper));
+            fileWrapper.ArchiveFileInfo.FileWrapper = fileWrapper;
 
             string FullName = SetFullPath(fileWrapper, this);
             if (FullName != string.Empty)