diff --git a/Ryujinx.HLE/FileSystem/SaveHelper.cs b/Ryujinx.HLE/FileSystem/SaveHelper.cs
index abe8da06f0..67f010169c 100644
--- a/Ryujinx.HLE/FileSystem/SaveHelper.cs
+++ b/Ryujinx.HLE/FileSystem/SaveHelper.cs
@@ -36,8 +36,8 @@ namespace Ryujinx.HLE.FileSystem
             }
 
             string SavePath = Path.Combine(BaseSavePath,
-                SaveMetaData.SaveID.ToString("x16"),
-                SaveMetaData.UserID.ToString(),
+                SaveMetaData.SaveId.ToString("x16"),
+                SaveMetaData.UserId.ToString(),
                 SaveMetaData.SaveDataType == SaveDataType.SaveData ? CurrentTitleId.ToString("x16") : string.Empty);
 
             return SavePath;
diff --git a/Ryujinx.HLE/FileSystem/SaveInfo.cs b/Ryujinx.HLE/FileSystem/SaveInfo.cs
index bc8edad604..0547c71127 100644
--- a/Ryujinx.HLE/FileSystem/SaveInfo.cs
+++ b/Ryujinx.HLE/FileSystem/SaveInfo.cs
@@ -1,24 +1,27 @@
-using Ryujinx.HLE.HOS;
-using Ryujinx.HLE.HOS.SystemState;
+using Ryujinx.HLE.HOS.SystemState;
 
 namespace Ryujinx.HLE.FileSystem
 {
     struct SaveInfo
     {
         public long   TitleId { get; private set; }
-        public long   SaveID  { get; private set; }
-        public UserId UserID  { get; private set; }
+        public long   SaveId  { get; private set; }
+        public UserId UserId  { get; private set; }
 
         public SaveDataType SaveDataType { get; private set; }
         public SaveSpaceId  SaveSpaceId  { get; private set; }
 
-        public SaveInfo(ServiceCtx Context, SaveSpaceId SaveSpaceId)
+        public SaveInfo(long TitleId,
+            long         SaveId,
+            SaveDataType SaveDataType,
+            UserId       UserId,
+            SaveSpaceId SaveSpaceId)
         {
-            TitleId          = Context.RequestData.ReadInt64();
-            UserID           = new UserId(Context.RequestData.ReadInt64(), Context.RequestData.ReadInt64());
-            SaveID           = Context.RequestData.ReadInt64();
-            SaveDataType     = (SaveDataType)Context.RequestData.ReadByte();
-            this.SaveSpaceId = SaveSpaceId;
+            this.TitleId      = TitleId;
+            this.UserId       = UserId;
+            this.SaveId       = SaveId;
+            this.SaveDataType = SaveDataType;
+            this.SaveSpaceId  = SaveSpaceId;
         }
     }
 }
diff --git a/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystemProxy.cs b/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystemProxy.cs
index 71091f1a00..f21c9b4492 100644
--- a/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystemProxy.cs
+++ b/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystemProxy.cs
@@ -76,7 +76,15 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
         {
             SaveSpaceId SaveSpaceId = (SaveSpaceId)Context.RequestData.ReadInt64();
 
-            SaveInfo SaveInfo = new SaveInfo(Context, SaveSpaceId);
+            long TitleId = Context.RequestData.ReadInt64();
+
+            UserId UserId = new UserId(Context.RequestData.ReadInt64(), Context.RequestData.ReadInt64());
+
+            long SaveId = Context.RequestData.ReadInt64();
+
+            SaveDataType SaveDataType = (SaveDataType)Context.RequestData.ReadByte();
+
+            SaveInfo SaveInfo = new SaveInfo(TitleId, SaveId, SaveDataType, UserId, SaveSpaceId);
 
             MakeObject(Context, new IFileSystem(Context.Device.FileSystem.GetGameSavePath(SaveInfo, Context)));
         }