diff --git a/nx/include/switch/services/fs.h b/nx/include/switch/services/fs.h
index 8b773379..f4025e85 100644
--- a/nx/include/switch/services/fs.h
+++ b/nx/include/switch/services/fs.h
@@ -78,16 +78,15 @@ typedef struct
 } FsSave;
 
 /// SaveCreate Struct
-typedef struct
-{
-    u64 size;
-    u64 journalSize;
-    u64 blockSize;
-    u64 ownerId;
-    u32 flags;
-    u8 SaveDataSpaceId;
-    u8 unk_x25;
-    u8 padding[0x1A];
+typedef struct {
+    u64 size;           ///< Size of the save data.
+    u64 journalSize;    ///< Journal size of the save data.
+    u64 blockSize;      ///< Block size of the save data.
+    u64 ownerId;        ///< Id of the save data's owner.
+    u32 flags;          ///< Save data flags.
+    u8 SaveDataSpaceId; ///< See \ref FsSaveDataSpaceId.
+    u8 unk;             ///< 0 for SystemSaveData.
+    u8 padding[0x1A];   ///< Uninitialized for SystemSaveData.
 } FsSaveCreate;
 
 typedef struct
@@ -265,8 +264,8 @@ Result fsDisableAutoSaveDataCreation(void);
 // todo: Rest of commands here
 
 // Wrapper(s) for fsCreateSaveDataFileSystemBySystemSaveDataId.
-Result fsCreate_SystemSaveDataWithOwner(FsSaveDataSpaceId space_id, u64 save_data_id, u64 user_id, u64 owner_id, u64 size, u64 journal_size, u32 flags);
-Result fsCreate_SystemSaveData(FsSaveDataSpaceId space_id, u64 save_data_id, u64 size, u64 journal_size, u32 flags);
+Result fsCreate_SystemSaveDataWithOwner(FsSaveDataSpaceId SaveDataSpaceId, u64 saveID, u128 userID, u64 ownerId, u64 size, u64 journalSize, u32 flags);
+Result fsCreate_SystemSaveData(FsSaveDataSpaceId SaveDataSpaceId, u64 saveID, u64 size, u64 journalSize, u32 flags);
 
 /// FsFileSystem can be mounted with fs_dev for use with stdio, see fs_dev.h.
 
diff --git a/nx/source/services/fs.c b/nx/source/services/fs.c
index 1d510eec..fa14b042 100644
--- a/nx/source/services/fs.c
+++ b/nx/source/services/fs.c
@@ -701,20 +701,20 @@ Result fsIsExFatSupported(bool* out)
 }
 
 // Wrapper(s) for fsCreateSaveDataFileSystemBySystemSaveDataId.
-Result fsCreate_SystemSaveDataWithOwner(FsSaveDataSpaceId space_id, u64 save_data_id, u64 user_id, u64 owner_id, u64 size, u64 journal_size, u32 flags) {
+Result fsCreate_SystemSaveDataWithOwner(FsSaveDataSpaceId SaveDataSpaceId, u64 saveID, u128 userID, u64 ownerId, u64 size, u64 journalSize, u32 flags) {
     FsSave save;
     FsSaveCreate create;
 
     memset(&save, 0, sizeof(save));
-    save.userID = (u128)user_id | ((u128)owner_id << 64);
-    save.saveID = save_data_id;
+    save.userID = userID;
+    save.saveID = saveID;
     memset(&create, 0, sizeof(create));
     create.size = size;
-    create.journalSize = journal_size;
+    create.journalSize = journalSize;
     create.blockSize = 0x4000;
-    create.ownerId = owner_id; 
+    create.ownerId = ownerId; 
     create.flags = flags;
-    create.SaveDataSpaceId = space_id;
+    create.SaveDataSpaceId = SaveDataSpaceId;
 
     return fsCreateSaveDataFileSystemBySystemSaveDataId(&save, &create);
 }