diff --git a/LibHac/SdFs.cs b/LibHac/SwitchFs.cs
similarity index 99%
rename from LibHac/SdFs.cs
rename to LibHac/SwitchFs.cs
index 07afc1ac..931518e5 100644
--- a/LibHac/SdFs.cs
+++ b/LibHac/SwitchFs.cs
@@ -8,7 +8,7 @@ using LibHac.Streams;
 
 namespace LibHac
 {
-    public class SdFs : IDisposable
+    public class SwitchFs : IDisposable
     {
         public Keyset Keyset { get; }
         public IFileSystem Fs { get; }
@@ -18,7 +18,7 @@ namespace LibHac
         public Dictionary<ulong, Title> Titles { get; } = new Dictionary<ulong, Title>();
         public Dictionary<ulong, Application> Applications { get; } = new Dictionary<ulong, Application>();
 
-        public SdFs(Keyset keyset, IFileSystem fs)
+        public SwitchFs(Keyset keyset, IFileSystem fs)
         {
             Fs = fs;
             Keyset = keyset;
diff --git a/NandReader/Program.cs b/NandReader/Program.cs
index c8b7ddbd..e5fc75a6 100644
--- a/NandReader/Program.cs
+++ b/NandReader/Program.cs
@@ -48,7 +48,7 @@ namespace NandReader
                 var keyset = OpenKeyset();
                 var nand = new Nand(stream, keyset);
                 var user = nand.OpenSystemPartition();
-                var sdfs = new SdFs(keyset, user);
+                var sdfs = new SwitchFs(keyset, user);
             }
         }
 
diff --git a/hactoolnet/Program.cs b/hactoolnet/Program.cs
index 0eb86ebc..1778bfce 100644
--- a/hactoolnet/Program.cs
+++ b/hactoolnet/Program.cs
@@ -154,7 +154,7 @@ namespace hactoolnet
 
         private static void ProcessSwitchFs(Context ctx)
         {
-            var switchFs = new SdFs(ctx.Keyset, new FileSystem(ctx.Options.InFile));
+            var switchFs = new SwitchFs(ctx.Keyset, new FileSystem(ctx.Options.InFile));
 
             if (ctx.Options.ListTitles)
             {
@@ -510,7 +510,7 @@ namespace hactoolnet
 
         }
 
-        private static void SaveTitle(Context ctx, SdFs switchFs)
+        private static void SaveTitle(Context ctx, SwitchFs switchFs)
         {
             var id = ctx.Options.TitleId;
             if (id == 0)
@@ -540,7 +540,7 @@ namespace hactoolnet
             }
         }
 
-        private static void CreateNsp(Context ctx, SdFs switchFs)
+        private static void CreateNsp(Context ctx, SwitchFs switchFs)
         {
             var id = ctx.Options.TitleId;
             if (id == 0)
@@ -587,7 +587,7 @@ namespace hactoolnet
             }
         }
 
-        static void ListTitles(SdFs sdfs)
+        static void ListTitles(SwitchFs sdfs)
         {
             foreach (var title in sdfs.Titles.Values.OrderBy(x => x.Id))
             {
@@ -614,7 +614,7 @@ namespace hactoolnet
             }
         }
 
-        static string ListApplications(SdFs sdfs)
+        static string ListApplications(SwitchFs sdfs)
         {
             var sb = new StringBuilder();