diff --git a/Source/Project64-core/N64System/Mips/Eeprom.cpp b/Source/Project64-core/N64System/Mips/Eeprom.cpp
index 16a272783..bde183adc 100644
--- a/Source/Project64-core/N64System/Mips/Eeprom.cpp
+++ b/Source/Project64-core/N64System/Mips/Eeprom.cpp
@@ -143,13 +143,11 @@ void CEeprom::LoadEeprom()
 {
     memset(m_EEPROM, 0xFF, sizeof(m_EEPROM));
 
-    CPath FileName(g_Settings->LoadStringVal(Directory_NativeSave).c_str(), "");
+    CPath FileName(g_Settings->LoadStringVal(Directory_NativeSave).c_str(), stdstr_f("%s.eep", g_Settings->LoadStringVal(Game_GameName).c_str()).c_str());
     if (g_Settings->LoadBool(Setting_UniqueSaveDir))
     {
         FileName.AppendDirectory(g_Settings->LoadStringVal(Game_UniqueSaveDir).c_str());
     }
-    FileName.SetName(g_Settings->LoadStringVal(Game_GameName).c_str());
-    FileName.SetExtension("eep");
 
     if (!FileName.DirectoryExists())
     {
diff --git a/Source/Project64-core/N64System/Mips/FlashRam.cpp b/Source/Project64-core/N64System/Mips/FlashRam.cpp
index c1c697f24..0c1e8f7a2 100644
--- a/Source/Project64-core/N64System/Mips/FlashRam.cpp
+++ b/Source/Project64-core/N64System/Mips/FlashRam.cpp
@@ -120,13 +120,11 @@ uint32_t CFlashram::ReadFromFlashStatus(uint32_t PAddr)
 
 bool CFlashram::LoadFlashram()
 {
-    CPath FileName(g_Settings->LoadStringVal(Directory_NativeSave).c_str());
+    CPath FileName(g_Settings->LoadStringVal(Directory_NativeSave).c_str(), stdstr_f("%s.fla", g_Settings->LoadStringVal(Game_GameName).c_str()).c_str());
     if (g_Settings->LoadBool(Setting_UniqueSaveDir))
     {
         FileName.AppendDirectory(g_Settings->LoadStringVal(Game_UniqueSaveDir).c_str());
     }
-    FileName.SetName(g_Settings->LoadStringVal(Game_GameName).c_str());
-    FileName.SetExtension("fla");
 
     if (!FileName.DirectoryExists())
     {
diff --git a/Source/Project64-core/N64System/Mips/Sram.cpp b/Source/Project64-core/N64System/Mips/Sram.cpp
index bc4404a64..1d9525f05 100644
--- a/Source/Project64-core/N64System/Mips/Sram.cpp
+++ b/Source/Project64-core/N64System/Mips/Sram.cpp
@@ -23,13 +23,11 @@ CSram::~CSram()
 
 bool CSram::LoadSram()
 {
-    CPath FileName(g_Settings->LoadStringVal(Directory_NativeSave).c_str(), "");
+    CPath FileName(g_Settings->LoadStringVal(Directory_NativeSave).c_str(), stdstr_f("%s.sra", g_Settings->LoadStringVal(Game_GameName).c_str()).c_str());
     if (g_Settings->LoadBool(Setting_UniqueSaveDir))
     {
         FileName.AppendDirectory(g_Settings->LoadStringVal(Game_UniqueSaveDir).c_str());
     }
-    FileName.SetName(g_Settings->LoadStringVal(Game_GameName).c_str());
-    FileName.SetExtension("sra");
 
     if (!FileName.DirectoryExists())
     {