diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo
index 2c5a0702..3fdc9346 100644
Binary files a/.vs/Switch_Toolbox/v15/.suo and b/.vs/Switch_Toolbox/v15/.suo differ
diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide
index 0253edf6..1241a6bd 100644
Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide differ
diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal
index 5fd088e1..c508ef8b 100644
Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal differ
diff --git a/Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FMAA.cs b/Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FMAA.cs
index 190747ba..0f21e220 100644
--- a/Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FMAA.cs	
+++ b/Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FMAA.cs	
@@ -24,6 +24,25 @@ namespace Bfres.Structs
         private static readonly string VisibiltyAnimType = "_fvm";
         private static readonly string VisibiltyAnimType2 = "_vm";
 
+        public string GetTypeExtension()
+        {
+            if (Parent == null)
+                return "";
+
+            BFRESGroupNode AnimFolder = (BFRESGroupNode)Parent;
+
+            switch (AnimFolder.Type)
+            {
+                case BRESGroupType.TexPatAnim: return TexturePatternAnimType;
+                case BRESGroupType.ShaderParamAnim: return ShaderParamAnimType;
+                case BRESGroupType.TexSrtAnim: return TextureSrtAnimType;
+                case BRESGroupType.ColorAnim: return ColorAnimType;
+                case BRESGroupType.MatVisAnim: return VisibiltyAnimType;
+                default:
+                    return "";
+            }
+        }
+
         public static bool IsShaderParamAnimation(string name) {
             return name.Contains(ShaderParamAnimType) ||
                    name.Contains(ShaderParamAnimType2);
@@ -709,20 +728,20 @@ namespace Bfres.Structs
             if (ext == ".bfmaa")
             {
                 MaterialAnim.Import(FileName);
-                MaterialAnim.Name = Text;
+                MaterialAnim.Name = Text + GetTypeExtension();
                 LoadAnim(MaterialAnim);
             }
             else if (ext == ".yaml")
             {
                 MaterialAnim = YamlFmaa.FromYaml(FileName);
-                MaterialAnim.Name = Text;
+                MaterialAnim.Name = Text + GetTypeExtension();
                 LoadAnim(MaterialAnim);
             }
             else if (ext == ".gif" || ext == ".png" || ext == ".apng")
             {
                 BNTX bntx = PluginRuntime.bntxContainers[0];
                 GifToTexturePatternAnimation anim = new GifToTexturePatternAnimation(FileName, bntx, this);
-                MaterialAnim.Name = Text;
+                MaterialAnim.Name = Text + GetTypeExtension();
                 LoadAnim(MaterialAnim);
             }
         }
diff --git a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache
index 669d76d2..c6862cf2 100644
Binary files a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache differ