diff --git a/src/BizHawk.Client.Common/RomLoader.cs b/src/BizHawk.Client.Common/RomLoader.cs
index 71638d82b6..b72a7567b6 100644
--- a/src/BizHawk.Client.Common/RomLoader.cs
+++ b/src/BizHawk.Client.Common/RomLoader.cs
@@ -29,7 +29,7 @@ namespace BizHawk.Client.Common
 			public byte[] RomData { get; set; }
 			public byte[] FileData { get; set; }
 			public string Extension { get; set; }
-			public string RomDirectory { get; set; }
+			public string RomPath { get; set; }
 			public GameInfo Game { get; set; }
 		}
 		private class CoreInventoryParameters : ICoreInventoryParameters
@@ -482,7 +482,7 @@ namespace BizHawk.Client.Common
 						RomData = rom.RomData,
 						FileData = rom.FileData,
 						Extension = rom.Extension,
-						RomDirectory = file.Directory,
+						RomPath = file.FullPathWithoutMember,
 						Game = game
 					}
 				},
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/BsnesCore.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/BsnesCore.cs
index 542b59d680..44f271d331 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/BsnesCore.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/BsnesCore.cs
@@ -19,7 +19,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.BSNES
 			var ser = new BasicServiceProvider(this);
 			ServiceProvider = ser;
 
-			this._romPath = Path.Combine(loadParameters.Roms[0].RomDirectory, loadParameters.Game.Name);
+			this._romPath = Path.ChangeExtension(loadParameters.Roms[0].RomPath, null);
 			CoreComm = loadParameters.Comm;
 			_settings = loadParameters.Settings ?? new SnesSettings();
 			_syncSettings = loadParameters.SyncSettings ?? new SnesSyncSettings();
diff --git a/src/BizHawk.Emulation.Cores/CoreInventory.cs b/src/BizHawk.Emulation.Cores/CoreInventory.cs
index 6bf4a51156..3228e38231 100644
--- a/src/BizHawk.Emulation.Cores/CoreInventory.cs
+++ b/src/BizHawk.Emulation.Cores/CoreInventory.cs
@@ -26,7 +26,7 @@ namespace BizHawk.Emulation.Cores
 				public byte[] RomData { get; set; }
 				public byte[] FileData { get; set; }
 				public string Extension { get; set; }
-				public string RomDirectory { get; set; }
+				public string RomPath { get; set; }
 				public GameInfo Game { get; set; }
 			}
 
diff --git a/src/BizHawk.Emulation.Cores/CoreLoadParameters.cs b/src/BizHawk.Emulation.Cores/CoreLoadParameters.cs
index f223cf31f5..36b31b7cf5 100644
--- a/src/BizHawk.Emulation.Cores/CoreLoadParameters.cs
+++ b/src/BizHawk.Emulation.Cores/CoreLoadParameters.cs
@@ -9,7 +9,7 @@ namespace BizHawk.Emulation.Cores
 		byte[] RomData { get; }
 		byte[] FileData { get; }
 		string Extension { get; }
-		public string RomDirectory { get; }
+		public string RomPath { get; }
 		/// <summary>
 		/// GameInfo for this individual asset.  Doesn't make sense a lot of the time;
 		/// only use this if your individual rom assets are full proper games when considered alone.