diff --git a/Assets/dll/bsnes.wbx.zst b/Assets/dll/bsnes.wbx.zst
index 140cfc3578..38d7d50a1f 100644
Binary files a/Assets/dll/bsnes.wbx.zst and b/Assets/dll/bsnes.wbx.zst differ
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/BsnesApi.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/BsnesApi.cs
index 353cd8aad3..5b2f5094bf 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/BsnesApi.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/BsnesApi.cs
@@ -81,7 +81,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.BSNES
 		[BizImport(CallingConvention.Cdecl)]
 		public abstract void snes_load_cartridge_super_gameboy(byte[] romData, byte[] sgbRomData, int romSize, int sgbRomSize);
 		[BizImport(CallingConvention.Cdecl)]
-		public abstract void snes_load_cartridge_bsx(byte[] romData, byte[] bsxRomData, int romSize, int bsxRomSize);
+		public abstract void snes_load_cartridge_bsmemory(byte[] romData, byte[] bsmemoryRomData, int romSize, int bsmemoryRomSize);
 
 		[BizImport(CallingConvention.Cdecl)]
 		public abstract void snes_get_cpu_registers(ref BsnesApi.CpuRegisters registers);
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/BsnesApi_Enums.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/BsnesApi_Enums.cs
index 494b61909b..12a89b168d 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/BsnesApi_Enums.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/BsnesApi_Enums.cs
@@ -92,8 +92,8 @@
 			CARTRAM,
 			CARTROM,
 
-			BSX_RAM,
-			BSX_PRAM,
+			BSMEMORY_ROM,
+			BSMEMORY_PSRAM,
 			SUFAMI_TURBO_A_RAM,
 			SUFAMI_TURBO_B_RAM,
 			SA1_IRAM,
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/BsnesCore.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/BsnesCore.cs
index da99ed5a6e..ee927198c2 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/BsnesCore.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/BsnesCore.cs
@@ -99,7 +99,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.BSNES
 			}
 			else if (IsBSX)
 			{
-				Api.core.snes_load_cartridge_bsx(bsxRomData, loadParameters.Roms[0].RomData,
+				Api.core.snes_load_cartridge_bsmemory(bsxRomData, loadParameters.Roms[0].RomData,
 					bsxRomData!.Length, loadParameters.Roms[0].RomData.Length);
 			}
 			else
diff --git a/waterbox/bsnescore/bsnes/target-bsnescore/bsnescore.cpp b/waterbox/bsnescore/bsnes/target-bsnescore/bsnescore.cpp
index 17acf1cfee..dabd237e22 100644
--- a/waterbox/bsnescore/bsnes/target-bsnescore/bsnescore.cpp
+++ b/waterbox/bsnescore/bsnes/target-bsnescore/bsnescore.cpp
@@ -220,16 +220,16 @@ EXPORT void snes_load_cartridge_super_gameboy(
     program->load();
 }
 
-EXPORT void snes_load_cartridge_bsx(
-  const uint8_t* rom_data, const uint8_t* bsx_rom_data, int rom_size, int bsx_rom_size
+EXPORT void snes_load_cartridge_bsmemory(
+  const uint8_t* rom_data, const uint8_t* bsmemory_rom_data, int rom_size, int bsmemory_rom_size
 ) {
     emulator->connect(ID::Port::Expansion, ID::Device::Satellaview);
 
     program->superFamicom.raw_data.resize(rom_size);
     memcpy(program->superFamicom.raw_data.data(), rom_data, rom_size);
 
-    program->bsMemory.program.resize(bsx_rom_size);
-    memcpy(program->bsMemory.program.data(), bsx_rom_data, bsx_rom_size);
+    program->bsMemory.program.resize(bsmemory_rom_size);
+    memcpy(program->bsMemory.program.data(), bsmemory_rom_data, bsmemory_rom_size);
 
     program->load();
 }
@@ -350,12 +350,12 @@ EXPORT void* snes_get_memory_region(int id, int* size, int* word_size)
             *word_size = 1;
             return program->superFamicom.program.data();
 
-        case SNES_MEMORY::BSX_RAM:
+        case SNES_MEMORY::BSMEMORY_ROM:
             if (!cartridge.has.BSMemorySlot) break;
-            *size = mcc.rom.size();
+            *size = bsmemory.memory.size();
             *word_size = 1;
-            return mcc.rom.data();
-        case SNES_MEMORY::BSX_PRAM:
+            return bsmemory.memory.data();
+        case SNES_MEMORY::BSMEMORY_PSRAM:
             if (!cartridge.has.BSMemorySlot) break;
             *size = mcc.psram.size();
             *word_size = 1;
diff --git a/waterbox/bsnescore/bsnes/target-bsnescore/bsnescore.hpp b/waterbox/bsnescore/bsnes/target-bsnescore/bsnescore.hpp
index a16be323ea..d3476a32e5 100644
--- a/waterbox/bsnescore/bsnes/target-bsnescore/bsnescore.hpp
+++ b/waterbox/bsnescore/bsnes/target-bsnescore/bsnescore.hpp
@@ -10,9 +10,9 @@ enum SNES_MEMORY {
     CARTRIDGE_RAM,
     CARTRIDGE_ROM,
 
+    BSMEMORY_ROM,
+    BSMEMORY_PSRAM,
     // sufamiturbo unused cause unsupported by frontend
-    BSX_RAM,
-    BSX_PRAM,
     SUFAMI_TURBO_A_RAM,
     SUFAMI_TURBO_B_RAM,
     SA1_IRAM,