diff --git a/asm/non_matchings/controller_pak/func_80072348.s b/asm/non_matchings/save_data/func_80072348.s
similarity index 100%
rename from asm/non_matchings/controller_pak/func_80072348.s
rename to asm/non_matchings/save_data/func_80072348.s
diff --git a/asm/non_matchings/controller_pak/func_80072424.s b/asm/non_matchings/save_data/func_80072424.s
similarity index 100%
rename from asm/non_matchings/controller_pak/func_80072424.s
rename to asm/non_matchings/save_data/func_80072424.s
diff --git a/asm/non_matchings/controller_pak/func_80072578.s b/asm/non_matchings/save_data/func_80072578.s
similarity index 100%
rename from asm/non_matchings/controller_pak/func_80072578.s
rename to asm/non_matchings/save_data/func_80072578.s
diff --git a/asm/non_matchings/controller_pak/func_80072718.s b/asm/non_matchings/save_data/func_80072718.s
similarity index 100%
rename from asm/non_matchings/controller_pak/func_80072718.s
rename to asm/non_matchings/save_data/func_80072718.s
diff --git a/asm/non_matchings/controller_pak/func_80072C54.s b/asm/non_matchings/save_data/func_80072C54.s
similarity index 100%
rename from asm/non_matchings/controller_pak/func_80072C54.s
rename to asm/non_matchings/save_data/func_80072C54.s
diff --git a/asm/non_matchings/controller_pak/func_80072E28.s b/asm/non_matchings/save_data/func_80072E28.s
similarity index 100%
rename from asm/non_matchings/controller_pak/func_80072E28.s
rename to asm/non_matchings/save_data/func_80072E28.s
diff --git a/asm/non_matchings/controller_pak/func_8007306C.s b/asm/non_matchings/save_data/func_8007306C.s
similarity index 100%
rename from asm/non_matchings/controller_pak/func_8007306C.s
rename to asm/non_matchings/save_data/func_8007306C.s
diff --git a/asm/non_matchings/controller_pak/func_800732E8.s b/asm/non_matchings/save_data/func_800732E8.s
similarity index 100%
rename from asm/non_matchings/controller_pak/func_800732E8.s
rename to asm/non_matchings/save_data/func_800732E8.s
diff --git a/asm/non_matchings/controller_pak/func_80073588.s b/asm/non_matchings/save_data/func_80073588.s
similarity index 100%
rename from asm/non_matchings/controller_pak/func_80073588.s
rename to asm/non_matchings/save_data/func_80073588.s
diff --git a/asm/non_matchings/controller_pak/func_800738A4.s b/asm/non_matchings/save_data/func_800738A4.s
similarity index 100%
rename from asm/non_matchings/controller_pak/func_800738A4.s
rename to asm/non_matchings/save_data/func_800738A4.s
diff --git a/asm/non_matchings/controller_pak/func_80073C5C.s b/asm/non_matchings/save_data/func_80073C5C.s
similarity index 100%
rename from asm/non_matchings/controller_pak/func_80073C5C.s
rename to asm/non_matchings/save_data/func_80073C5C.s
diff --git a/asm/non_matchings/controller_pak/func_80074204.s b/asm/non_matchings/save_data/func_80074204.s
similarity index 100%
rename from asm/non_matchings/controller_pak/func_80074204.s
rename to asm/non_matchings/save_data/func_80074204.s
diff --git a/asm/non_matchings/controller_pak/func_8007431C.s b/asm/non_matchings/save_data/func_8007431C.s
similarity index 100%
rename from asm/non_matchings/controller_pak/func_8007431C.s
rename to asm/non_matchings/save_data/func_8007431C.s
diff --git a/asm/non_matchings/controller_pak/func_80074B34.s b/asm/non_matchings/save_data/func_80074B34.s
similarity index 100%
rename from asm/non_matchings/controller_pak/func_80074B34.s
rename to asm/non_matchings/save_data/func_80074B34.s
diff --git a/asm/non_matchings/controller_pak/func_80074EB8.s b/asm/non_matchings/save_data/func_80074EB8.s
similarity index 100%
rename from asm/non_matchings/controller_pak/func_80074EB8.s
rename to asm/non_matchings/save_data/func_80074EB8.s
diff --git a/asm/non_matchings/controller_pak/func_80075000.s b/asm/non_matchings/save_data/func_80075000.s
similarity index 100%
rename from asm/non_matchings/controller_pak/func_80075000.s
rename to asm/non_matchings/save_data/func_80075000.s
diff --git a/asm/non_matchings/controller_pak/func_800753D8.s b/asm/non_matchings/save_data/func_800753D8.s
similarity index 100%
rename from asm/non_matchings/controller_pak/func_800753D8.s
rename to asm/non_matchings/save_data/func_800753D8.s
diff --git a/asm/non_matchings/controller_pak/func_800756D4.s b/asm/non_matchings/save_data/func_800756D4.s
similarity index 100%
rename from asm/non_matchings/controller_pak/func_800756D4.s
rename to asm/non_matchings/save_data/func_800756D4.s
diff --git a/asm/non_matchings/controller_pak/init_controller_paks.s b/asm/non_matchings/save_data/init_controller_paks.s
similarity index 100%
rename from asm/non_matchings/controller_pak/init_controller_paks.s
rename to asm/non_matchings/save_data/init_controller_paks.s
diff --git a/src/game.c b/src/game.c
index 171f08d1..739cf265 100644
--- a/src/game.c
+++ b/src/game.c
@@ -24,7 +24,7 @@
 #include "audio.h"
 #include "unknown_00BC20.h"
 #include "camera.h"
-#include "controller_pak.h"
+#include "save_data.h"
 #include "unknown_078050.h"
 #include "unknown_003260.h"
 #include "unknown_032760.h"
diff --git a/src/menu.c b/src/menu.c
index 07ce9d0c..1630499a 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -23,7 +23,7 @@
 #include "unknown_00BC20.h"
 #include "game.h"
 #include "unknown_078050.h"
-#include "controller_pak.h"
+#include "save_data.h"
 #include "object_functions.h"
 #include "unknown_003260.h"
 
diff --git a/src/racer.c b/src/racer.c
index be69b842..d0cd090a 100644
--- a/src/racer.c
+++ b/src/racer.c
@@ -10,7 +10,7 @@
 #include "macros.h"
 #include "structs.h"
 #include "asset_sections.h"
-#include "controller_pak.h"
+#include "save_data.h"
 #include "unknown_008C40.h"
 #include "unknown_00BC20.h"
 #include "audio.h"
diff --git a/src/controller_pak.c b/src/save_data.c
similarity index 96%
rename from src/controller_pak.c
rename to src/save_data.c
index f5ab99e8..68cab6bc 100644
--- a/src/controller_pak.c
+++ b/src/save_data.c
@@ -1,7 +1,7 @@
 /* The comment below is needed for this file to be picked up by generate_ld */
 /* RAM_POS: 0x80072250 */
 
-#include "controller_pak.h"
+#include "save_data.h"
 #include "memory.h"
 #include "PR/pfs.h"
 #include "PR/os_cont.h"
@@ -168,18 +168,18 @@ void func_80072348(s16 arg0, u8 arg1) {
     }
 }
 #else
-GLOBAL_ASM("asm/non_matchings/controller_pak/func_80072348.s")
+GLOBAL_ASM("asm/non_matchings/save_data/func_80072348.s")
 #endif
 
-GLOBAL_ASM("asm/non_matchings/controller_pak/func_80072424.s")
-GLOBAL_ASM("asm/non_matchings/controller_pak/func_80072578.s")
+GLOBAL_ASM("asm/non_matchings/save_data/func_80072424.s")
+GLOBAL_ASM("asm/non_matchings/save_data/func_80072578.s")
 
 void func_80072708(void) {
     D_800DE48C = 3;
 }
 
 //Rumbles controller?
-GLOBAL_ASM("asm/non_matchings/controller_pak/func_80072718.s")
+GLOBAL_ASM("asm/non_matchings/save_data/func_80072718.s")
 
 #ifdef NON_EQUIVALENT
 u16 func_80072C54(s32 arg0) {
@@ -327,18 +327,18 @@ u16 func_80072C54(s32 arg0) {
     return v1;
 }
 #else
-GLOBAL_ASM("asm/non_matchings/controller_pak/func_80072C54.s")
+GLOBAL_ASM("asm/non_matchings/save_data/func_80072C54.s")
 #endif
 
-GLOBAL_ASM("asm/non_matchings/controller_pak/func_80072E28.s")
-GLOBAL_ASM("asm/non_matchings/controller_pak/func_8007306C.s")
-GLOBAL_ASM("asm/non_matchings/controller_pak/func_800732E8.s")
+GLOBAL_ASM("asm/non_matchings/save_data/func_80072E28.s")
+GLOBAL_ASM("asm/non_matchings/save_data/func_8007306C.s")
+GLOBAL_ASM("asm/non_matchings/save_data/func_800732E8.s")
 
 //arg1 is eepromData, from read_eeprom_data
 //arg2 seems to be a flag for either lap times or course initials?
-GLOBAL_ASM("asm/non_matchings/controller_pak/func_80073588.s")
+GLOBAL_ASM("asm/non_matchings/save_data/func_80073588.s")
 
-GLOBAL_ASM("asm/non_matchings/controller_pak/func_800738A4.s")
+GLOBAL_ASM("asm/non_matchings/save_data/func_800738A4.s")
 
 s32 get_game_data_file_size(void) {
     return 256;
@@ -350,7 +350,7 @@ s32 get_time_data_file_size(void) {
 
 //Probably get_file_extension
 //func_80073C5C(s32 controllerIndex, s32 fileType, u8 **fileExt);
-GLOBAL_ASM("asm/non_matchings/controller_pak/func_80073C5C.s")
+GLOBAL_ASM("asm/non_matchings/save_data/func_80073C5C.s")
 
 //Read DKRACING-ADV data into settings?
 s32 read_game_data_from_controller_pak(s32 controllerIndex, u8 *fileExt, Settings *settings) {
@@ -490,8 +490,8 @@ s32 write_time_data_to_controller_pak(s32 controllerIndex, Settings *arg1) {
     return ret;
 }
 
-GLOBAL_ASM("asm/non_matchings/controller_pak/func_80074204.s")
-GLOBAL_ASM("asm/non_matchings/controller_pak/func_8007431C.s")
+GLOBAL_ASM("asm/non_matchings/save_data/func_80074204.s")
+GLOBAL_ASM("asm/non_matchings/save_data/func_8007431C.s")
 
 // Writes Eeprom in 5 block chunks of data starting at either 0x0, 0x5, or 0xA
 // Educated guess says this might be for one of three save files
@@ -691,11 +691,11 @@ s32 func_80074B1C(void) {
     return (&x)[0] * 6 + 0x100;
 }
 
-GLOBAL_ASM("asm/non_matchings/controller_pak/func_80074B34.s")
-GLOBAL_ASM("asm/non_matchings/controller_pak/func_80074EB8.s")
-GLOBAL_ASM("asm/non_matchings/controller_pak/func_80075000.s")
-GLOBAL_ASM("asm/non_matchings/controller_pak/func_800753D8.s")
-GLOBAL_ASM("asm/non_matchings/controller_pak/func_800756D4.s")
+GLOBAL_ASM("asm/non_matchings/save_data/func_80074B34.s")
+GLOBAL_ASM("asm/non_matchings/save_data/func_80074EB8.s")
+GLOBAL_ASM("asm/non_matchings/save_data/func_80075000.s")
+GLOBAL_ASM("asm/non_matchings/save_data/func_800753D8.s")
+GLOBAL_ASM("asm/non_matchings/save_data/func_800756D4.s")
 
 SIDeviceStatus get_si_device_status(s32 controllerIndex) {
     OSMesg unusedMsg;
@@ -811,7 +811,7 @@ void init_controller_paks(void) {
     osContStartReadData(sControllerMesgQueue);
 }
 #else
-GLOBAL_ASM("asm/non_matchings/controller_pak/init_controller_paks.s")
+GLOBAL_ASM("asm/non_matchings/save_data/init_controller_paks.s")
 #endif
 
 UNUSED SIDeviceStatus check_for_rumble_pak(s32 controllerIndex) {
diff --git a/src/controller_pak.h b/src/save_data.h
similarity index 100%
rename from src/controller_pak.h
rename to src/save_data.h
diff --git a/src/thread0_epc.c b/src/thread0_epc.c
index 0796e90b..ef23e61c 100644
--- a/src/thread0_epc.c
+++ b/src/thread0_epc.c
@@ -5,7 +5,7 @@
 #include "types.h"
 #include "macros.h"
 #include "menu.h"
-#include "controller_pak.h"
+#include "save_data.h"
 #include "printf.h"
 #include "unknown_00BC20.h"
 #include "controller.h"
diff --git a/src/unknown_00BC20.c b/src/unknown_00BC20.c
index 7168c4ae..9499a56c 100644
--- a/src/unknown_00BC20.c
+++ b/src/unknown_00BC20.c
@@ -11,7 +11,7 @@
 #include "asset_sections.h"
 #include "asset_loading.h"
 #include "thread0_epc.h"
-#include "controller_pak.h"
+#include "save_data.h"
 #include "menu.h"
 #include "game.h"
 #include "racer.h"