diff --git a/SabreTools.Library/DatFiles/ClrMamePro.cs b/SabreTools.Library/DatFiles/ClrMamePro.cs
index 16ee9968..143ddbd4 100644
--- a/SabreTools.Library/DatFiles/ClrMamePro.cs
+++ b/SabreTools.Library/DatFiles/ClrMamePro.cs
@@ -898,7 +898,7 @@ namespace SabreTools.Library.DatFiles
 				string state = "";
 
 				// Pre-process the item name
-				rom.Name = CreatePrefixPostfix(rom, true) + rom.Name + CreatePrefixPostfix(rom, false);
+				rom.Name = CreatePrefixPostfix(rom, true) + (GameName ? Path.Combine(rom.MachineName, rom.Name) : rom.Name) + CreatePrefixPostfix(rom, false);
 				rom.Name = rom.Name.Replace("\"", ""); // Quotes are not needed here
 
 				switch (rom.Type)
diff --git a/SabreTools.Library/DatFiles/DatFile.cs b/SabreTools.Library/DatFiles/DatFile.cs
index 10850f7d..55ed55a0 100644
--- a/SabreTools.Library/DatFiles/DatFile.cs
+++ b/SabreTools.Library/DatFiles/DatFile.cs
@@ -544,28 +544,7 @@ namespace SabreTools.Library.DatFiles
 			get { return _mergedBy; }
 		}
 
-		// Data specific to the Miss DAT type
-		public bool UseRomName
-		{
-			get
-			{
-				if (_datHeader == null)
-				{
-					_datHeader = new DatHeader();
-				}
-
-				return _datHeader.UseRomName;
-			}
-			set
-			{
-				if (_datHeader == null)
-				{
-					_datHeader = new DatHeader();
-				}
-
-				_datHeader.UseRomName = value;
-			}
-		}
+		// Write pre-processing
 		public string Prefix
 		{
 			get
@@ -608,6 +587,27 @@ namespace SabreTools.Library.DatFiles
 				_datHeader.Postfix = value;
 			}
 		}
+		public bool GameName
+		{
+			get
+			{
+				if (_datHeader == null)
+				{
+					_datHeader = new DatHeader();
+				}
+
+				return _datHeader.GameName;
+			}
+			set
+			{
+				if (_datHeader == null)
+				{
+					_datHeader = new DatHeader();
+				}
+
+				_datHeader.GameName = value;
+			}
+		}
 		public bool Quotes
 		{
 			get
@@ -629,6 +629,29 @@ namespace SabreTools.Library.DatFiles
 				_datHeader.Quotes = value;
 			}
 		}
+
+		// Data specific to the Miss DAT type
+		public bool UseRomName
+		{
+			get
+			{
+				if (_datHeader == null)
+				{
+					_datHeader = new DatHeader();
+				}
+
+				return _datHeader.UseRomName;
+			}
+			set
+			{
+				if (_datHeader == null)
+				{
+					_datHeader = new DatHeader();
+				}
+
+				_datHeader.UseRomName = value;
+			}
+		}
 		public string ReplaceExtension
 		{
 			get
@@ -692,27 +715,6 @@ namespace SabreTools.Library.DatFiles
 				_datHeader.RemoveExtension = value;
 			}
 		}
-		public bool GameName
-		{
-			get
-			{
-				if (_datHeader == null)
-				{
-					_datHeader = new DatHeader();
-				}
-
-				return _datHeader.GameName;
-			}
-			set
-			{
-				if (_datHeader == null)
-				{
-					_datHeader = new DatHeader();
-				}
-
-				_datHeader.GameName = value;
-			}
-		}
 		public bool Romba
 		{
 			get
diff --git a/SabreTools.Library/DatFiles/DosCenter.cs b/SabreTools.Library/DatFiles/DosCenter.cs
index f7503965..953908fc 100644
--- a/SabreTools.Library/DatFiles/DosCenter.cs
+++ b/SabreTools.Library/DatFiles/DosCenter.cs
@@ -271,7 +271,7 @@ namespace SabreTools.Library.DatFiles
 				string state = "";
 
 				// Pre-process the item name
-				rom.Name = CreatePrefixPostfix(rom, true) + rom.Name + CreatePrefixPostfix(rom, false);
+				rom.Name = CreatePrefixPostfix(rom, true) + (GameName ? Path.Combine(rom.MachineName, rom.Name) : rom.Name) + CreatePrefixPostfix(rom, false);
 				rom.Name = rom.Name.Replace("\"", ""); // Quotes are not needed here
 
 				switch (rom.Type)
diff --git a/SabreTools.Library/DatFiles/Hashfile.cs b/SabreTools.Library/DatFiles/Hashfile.cs
index 62bd6bd8..563b2262 100644
--- a/SabreTools.Library/DatFiles/Hashfile.cs
+++ b/SabreTools.Library/DatFiles/Hashfile.cs
@@ -201,7 +201,7 @@ namespace SabreTools.Library.DatFiles
 				string state = "";
 
 				// Pre-process the item name
-				rom.Name = CreatePrefixPostfix(rom, true) + rom.Name + CreatePrefixPostfix(rom, false);
+				rom.Name = CreatePrefixPostfix(rom, true) + (GameName ? Path.Combine(rom.MachineName, rom.Name) : rom.Name) + CreatePrefixPostfix(rom, false);
 				rom.Name = rom.Name.Replace("\"", ""); // Quotes are not needed here
 
 				switch (_hash)
diff --git a/SabreTools.Library/DatFiles/Listrom.cs b/SabreTools.Library/DatFiles/Listrom.cs
index e4e2a2a8..939fff45 100644
--- a/SabreTools.Library/DatFiles/Listrom.cs
+++ b/SabreTools.Library/DatFiles/Listrom.cs
@@ -410,7 +410,7 @@ namespace SabreTools.Library.DatFiles
 				string state = "";
 
 				// Pre-process the item name
-				rom.Name = CreatePrefixPostfix(rom, true) + rom.Name + CreatePrefixPostfix(rom, false);
+				rom.Name = CreatePrefixPostfix(rom, true) + (GameName ? Path.Combine(rom.MachineName, rom.Name) : rom.Name) + CreatePrefixPostfix(rom, false);
 				rom.Name = rom.Name.Replace("\"", ""); // Quotes are not needed here
 
 				switch (rom.Type)
diff --git a/SabreTools.Library/DatFiles/Listxml.cs b/SabreTools.Library/DatFiles/Listxml.cs
index 35193d17..a2129271 100644
--- a/SabreTools.Library/DatFiles/Listxml.cs
+++ b/SabreTools.Library/DatFiles/Listxml.cs
@@ -783,7 +783,7 @@ namespace SabreTools.Library.DatFiles
 				string state = "";
 
 				// Pre-process the item name
-				rom.Name = CreatePrefixPostfix(rom, true) + rom.Name + CreatePrefixPostfix(rom, false);
+				rom.Name = CreatePrefixPostfix(rom, true) + (GameName ? Path.Combine(rom.MachineName, rom.Name) : rom.Name) + CreatePrefixPostfix(rom, false);
 				rom.Name = rom.Name.Replace("\"", ""); // Quotes are not needed here
 
 				switch (rom.Type)
diff --git a/SabreTools.Library/DatFiles/Logiqx.cs b/SabreTools.Library/DatFiles/Logiqx.cs
index 5c4d1cb0..d175d7b1 100644
--- a/SabreTools.Library/DatFiles/Logiqx.cs
+++ b/SabreTools.Library/DatFiles/Logiqx.cs
@@ -892,7 +892,7 @@ namespace SabreTools.Library.DatFiles
 				string state = "";
 
 				// Pre-process the item name
-				rom.Name = CreatePrefixPostfix(rom, true) + rom.Name + CreatePrefixPostfix(rom, false);
+				rom.Name = CreatePrefixPostfix(rom, true) + (GameName ? Path.Combine(rom.MachineName, rom.Name) : rom.Name) + CreatePrefixPostfix(rom, false);
 				rom.Name = rom.Name.Replace("\"", ""); // Quotes are not needed here
 
 				switch (rom.Type)
diff --git a/SabreTools.Library/DatFiles/OfflineList.cs b/SabreTools.Library/DatFiles/OfflineList.cs
index 1a98f3cd..d4809724 100644
--- a/SabreTools.Library/DatFiles/OfflineList.cs
+++ b/SabreTools.Library/DatFiles/OfflineList.cs
@@ -956,7 +956,7 @@ namespace SabreTools.Library.DatFiles
 				string state = "";
 
 				// Pre-process the item name
-				rom.Name = CreatePrefixPostfix(rom, true) + rom.Name + CreatePrefixPostfix(rom, false);
+				rom.Name = CreatePrefixPostfix(rom, true) + (GameName ? Path.Combine(rom.MachineName, rom.Name) : rom.Name) + CreatePrefixPostfix(rom, false);
 				rom.Name = rom.Name.Replace("\"", ""); // Quotes are not needed here
 
 				state += "\t\t<game>\n"
diff --git a/SabreTools.Library/DatFiles/RomCenter.cs b/SabreTools.Library/DatFiles/RomCenter.cs
index f19d169d..23acc1bd 100644
--- a/SabreTools.Library/DatFiles/RomCenter.cs
+++ b/SabreTools.Library/DatFiles/RomCenter.cs
@@ -341,7 +341,7 @@ namespace SabreTools.Library.DatFiles
 				string state = "";
 
 				// Pre-process the item name
-				rom.Name = CreatePrefixPostfix(rom, true) + rom.Name + CreatePrefixPostfix(rom, false);
+				rom.Name = CreatePrefixPostfix(rom, true) + (GameName ? Path.Combine(rom.MachineName, rom.Name) : rom.Name) + CreatePrefixPostfix(rom, false);
 				rom.Name = rom.Name.Replace("\"", ""); // Quotes are not needed here
 
 				if (rom.Type == ItemType.Rom)
diff --git a/SabreTools.Library/DatFiles/SabreDat.cs b/SabreTools.Library/DatFiles/SabreDat.cs
index c9a38c9d..463c55ed 100644
--- a/SabreTools.Library/DatFiles/SabreDat.cs
+++ b/SabreTools.Library/DatFiles/SabreDat.cs
@@ -831,7 +831,7 @@ namespace SabreTools.Library.DatFiles
 				string state = "", prefix = "";
 
 				// Pre-process the item name
-				rom.Name = CreatePrefixPostfix(rom, true) + rom.Name + CreatePrefixPostfix(rom, false);
+				rom.Name = CreatePrefixPostfix(rom, true) + (GameName ? Path.Combine(rom.MachineName, rom.Name) : rom.Name) + CreatePrefixPostfix(rom, false);
 				rom.Name = rom.Name.Replace("\"", ""); // Quotes are not needed here
 
 				for (int i = 0; i < depth; i++)
diff --git a/SabreTools.Library/DatFiles/SoftwareList.cs b/SabreTools.Library/DatFiles/SoftwareList.cs
index fe6ffeac..22b4b349 100644
--- a/SabreTools.Library/DatFiles/SoftwareList.cs
+++ b/SabreTools.Library/DatFiles/SoftwareList.cs
@@ -787,7 +787,7 @@ namespace SabreTools.Library.DatFiles
 				string state = "";
 
 				// Pre-process the item name
-				rom.Name = CreatePrefixPostfix(rom, true) + rom.Name + CreatePrefixPostfix(rom, false);
+				rom.Name = CreatePrefixPostfix(rom, true) + (GameName ? Path.Combine(rom.MachineName, rom.Name) : rom.Name) + CreatePrefixPostfix(rom, false);
 				rom.Name = rom.Name.Replace("\"", ""); // Quotes are not needed here
 
 				state += "\t\t<part name=\"" + rom.PartName + "\" interface=\"" + rom.PartInterface + "\">\n";