diff --git a/SabreTools.Library/DatFiles/AttractMode.cs b/SabreTools.Library/DatFiles/AttractMode.cs
index cd5e88d9..d8a00da4 100644
--- a/SabreTools.Library/DatFiles/AttractMode.cs
+++ b/SabreTools.Library/DatFiles/AttractMode.cs
@@ -46,7 +46,7 @@ namespace SabreTools.Library.DatFiles
 		/// <param name="keep">True if full pathnames are to be kept, false otherwise (default)</param>
 		/// <param name="clean">True if game names are sanitized, false otherwise (default)</param>
 		/// <param name="remUnicode">True if we should remove non-ASCII characters from output, false otherwise (default)</param>
-		public void Parse(
+		public void ParseFile(
 			// Standard Dat parsing
 			string filename,
 			int sysid,
diff --git a/SabreTools.Library/DatFiles/ClrMamePro.cs b/SabreTools.Library/DatFiles/ClrMamePro.cs
index 5d240d84..37e17ba6 100644
--- a/SabreTools.Library/DatFiles/ClrMamePro.cs
+++ b/SabreTools.Library/DatFiles/ClrMamePro.cs
@@ -47,7 +47,7 @@ namespace SabreTools.Library.DatFiles
 		/// <param name="keep">True if full pathnames are to be kept, false otherwise (default)</param>
 		/// <param name="clean">True if game names are sanitized, false otherwise (default)</param>
 		/// <param name="remUnicode">True if we should remove non-ASCII characters from output, false otherwise (default)</param>
-		public void Parse(
+		public void ParseFile(
 			// Standard Dat parsing
 			string filename,
 			int sysid,
diff --git a/SabreTools.Library/DatFiles/DatFile.cs b/SabreTools.Library/DatFiles/DatFile.cs
index 89729802..a59664e8 100644
--- a/SabreTools.Library/DatFiles/DatFile.cs
+++ b/SabreTools.Library/DatFiles/DatFile.cs
@@ -3131,55 +3131,55 @@ namespace SabreTools.Library.DatFiles
 				switch (Utilities.GetDatFormat(filename))
 				{
 					case DatFormat.AttractMode:
-						new AttractMode(this).Parse(filename, sysid, srcid, keep, clean, remUnicode);
+						new AttractMode(this).ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
 						break;
 					case DatFormat.ClrMamePro:
-						new ClrMamePro(this).Parse(filename, sysid, srcid, keep, clean, remUnicode);
+						new ClrMamePro(this).ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
 						break;
 					case DatFormat.CSV:
-						new SeparatedValue(this).Parse(filename, sysid, srcid, ',', keep, clean, remUnicode);
+						new SeparatedValue(this).ParseFile(filename, sysid, srcid, ',', keep, clean, remUnicode);
 						break;
 					case DatFormat.DOSCenter:
-						new DosCenter(this).Parse(filename, sysid, srcid, keep, clean, remUnicode);
+						new DosCenter(this).ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
 						break;
 					case DatFormat.Listroms:
-						new Listroms(this).Parse(filename, sysid, srcid, keep, clean, remUnicode);
+						new Listroms(this).ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
 						break;
 					case DatFormat.Logiqx:
-						new Logiqx(this).Parse(filename, sysid, srcid, keep, clean, remUnicode);
+						new Logiqx(this).ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
 						break;
 					case DatFormat.OfflineList:
-						new OfflineList(this).Parse(filename, sysid, srcid, keep, clean, remUnicode);
+						new OfflineList(this).ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
 						break;
 					case DatFormat.RedumpMD5:
-						new Hashfile(this).Parse(filename, sysid, srcid, Hash.MD5, clean, remUnicode);
+						new Hashfile(this).ParseFile(filename, sysid, srcid, Hash.MD5, clean, remUnicode);
 						break;
 					case DatFormat.RedumpSFV:
-						new Hashfile(this).Parse(filename, sysid, srcid, Hash.CRC, clean, remUnicode);
+						new Hashfile(this).ParseFile(filename, sysid, srcid, Hash.CRC, clean, remUnicode);
 						break;
 					case DatFormat.RedumpSHA1:
-						new Hashfile(this).Parse(filename, sysid, srcid, Hash.SHA1, clean, remUnicode);
+						new Hashfile(this).ParseFile(filename, sysid, srcid, Hash.SHA1, clean, remUnicode);
 						break;
 					case DatFormat.RedumpSHA256:
-						new Hashfile(this).Parse(filename, sysid, srcid, Hash.SHA256, clean, remUnicode);
+						new Hashfile(this).ParseFile(filename, sysid, srcid, Hash.SHA256, clean, remUnicode);
 						break;
 					case DatFormat.RedumpSHA384:
-						new Hashfile(this).Parse(filename, sysid, srcid, Hash.SHA384, clean, remUnicode);
+						new Hashfile(this).ParseFile(filename, sysid, srcid, Hash.SHA384, clean, remUnicode);
 						break;
 					case DatFormat.RedumpSHA512:
-						new Hashfile(this).Parse(filename, sysid, srcid, Hash.SHA512, clean, remUnicode);
+						new Hashfile(this).ParseFile(filename, sysid, srcid, Hash.SHA512, clean, remUnicode);
 						break;
 					case DatFormat.RomCenter:
-						new RomCenter(this).Parse(filename, sysid, srcid, clean, remUnicode);
+						new RomCenter(this).ParseFile(filename, sysid, srcid, clean, remUnicode);
 						break;
 					case DatFormat.SabreDat:
-						new SabreDat(this).Parse(filename, sysid, srcid, keep, clean, remUnicode);
+						new SabreDat(this).ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
 						break;
 					case DatFormat.SoftwareList:
-						new SoftwareList(this).Parse(filename, sysid, srcid, keep, clean, remUnicode);
+						new SoftwareList(this).ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
 						break;
 					case DatFormat.TSV:
-						new SeparatedValue(this).Parse(filename, sysid, srcid, '\t', keep, clean, remUnicode);
+						new SeparatedValue(this).ParseFile(filename, sysid, srcid, '\t', keep, clean, remUnicode);
 						break;
 					default:
 						return;
diff --git a/SabreTools.Library/DatFiles/DosCenter.cs b/SabreTools.Library/DatFiles/DosCenter.cs
index ebeae8c0..0b332283 100644
--- a/SabreTools.Library/DatFiles/DosCenter.cs
+++ b/SabreTools.Library/DatFiles/DosCenter.cs
@@ -45,7 +45,7 @@ namespace SabreTools.Library.DatFiles
 		/// <param name="keep">True if full pathnames are to be kept, false otherwise (default)</param>
 		/// <param name="clean">True if game names are sanitized, false otherwise (default)</param>
 		/// <param name="remUnicode">True if we should remove non-ASCII characters from output, false otherwise (default)</param>
-		public void Parse(
+		public void ParseFile(
 			// Standard Dat parsing
 			string filename,
 			int sysid,
@@ -57,7 +57,7 @@ namespace SabreTools.Library.DatFiles
 			bool remUnicode)
 		{
 			// ClrMamePro and DosCenter parsing are identical so it just calls one implementation
-			(this as DatFile as ClrMamePro).Parse(filename, sysid, srcid, keep, clean, remUnicode);
+			(this as DatFile as ClrMamePro).ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
 		}
 
 
diff --git a/SabreTools.Library/DatFiles/Hashfile.cs b/SabreTools.Library/DatFiles/Hashfile.cs
index a4b7c8f1..7d4f151a 100644
--- a/SabreTools.Library/DatFiles/Hashfile.cs
+++ b/SabreTools.Library/DatFiles/Hashfile.cs
@@ -46,7 +46,7 @@ namespace SabreTools.Library.DatFiles
 		/// <param name="hashtype">Hash type that should be assumed</param>
 		/// <param name="clean">True if game names are sanitized, false otherwise (default)</param>
 		/// <param name="remUnicode">True if we should remove non-ASCII characters from output, false otherwise (default)</param>
-		public void Parse(
+		public void ParseFile(
 			// Standard Dat parsing
 			string filename,
 			int sysid,
diff --git a/SabreTools.Library/DatFiles/Listroms.cs b/SabreTools.Library/DatFiles/Listroms.cs
index 2f4b9b50..89450d49 100644
--- a/SabreTools.Library/DatFiles/Listroms.cs
+++ b/SabreTools.Library/DatFiles/Listroms.cs
@@ -56,7 +56,7 @@ namespace SabreTools.Library.DatFiles
 		/// 6331.sound-u8                            32 BAD CRC(1d298cb0) SHA1(bb0bb62365402543e3154b9a77be9c75010e6abc) BAD_DUMP
 		/// 16v8h-blue.u24                          279 NO GOOD DUMP KNOWN
 		/// </remarks>
-		public void Parse(
+		public void ParseFile(
 			// Standard Dat parsing
 			string filename,
 			int sysid,
diff --git a/SabreTools.Library/DatFiles/Logiqx.cs b/SabreTools.Library/DatFiles/Logiqx.cs
index 5187c191..2fd675d4 100644
--- a/SabreTools.Library/DatFiles/Logiqx.cs
+++ b/SabreTools.Library/DatFiles/Logiqx.cs
@@ -50,7 +50,7 @@ namespace SabreTools.Library.DatFiles
 		/// <param name="remUnicode">True if we should remove non-ASCII characters from output, false otherwise (default)</param>
 		/// <remarks>
 		/// </remarks>
-		public void Parse(
+		public void ParseFile(
 			// Standard Dat parsing
 			string filename,
 			int sysid,
diff --git a/SabreTools.Library/DatFiles/OfflineList.cs b/SabreTools.Library/DatFiles/OfflineList.cs
index c9ebf8e9..8cb5baf7 100644
--- a/SabreTools.Library/DatFiles/OfflineList.cs
+++ b/SabreTools.Library/DatFiles/OfflineList.cs
@@ -48,7 +48,7 @@ namespace SabreTools.Library.DatFiles
 		/// <param name="remUnicode">True if we should remove non-ASCII characters from output, false otherwise (default)</param>
 		/// <remarks>
 		/// </remarks>
-		public void Parse(
+		public void ParseFile(
 			// Standard Dat parsing
 			string filename,
 			int sysid,
@@ -60,7 +60,7 @@ namespace SabreTools.Library.DatFiles
 			bool remUnicode)
 		{
 			// All XML-derived DATs share a lot in common so it just calls one implementation
-			(this as DatFile as Logiqx).Parse(filename, sysid, srcid, keep, clean, remUnicode);
+			(this as DatFile as Logiqx).ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
 		}
 
 		/// <summary>
diff --git a/SabreTools.Library/DatFiles/RomCenter.cs b/SabreTools.Library/DatFiles/RomCenter.cs
index 22893d52..4b156c7b 100644
--- a/SabreTools.Library/DatFiles/RomCenter.cs
+++ b/SabreTools.Library/DatFiles/RomCenter.cs
@@ -46,7 +46,7 @@ namespace SabreTools.Library.DatFiles
 		/// <param name="srcid">Source ID for the DAT</param>
 		/// <param name="clean">True if game names are sanitized, false otherwise (default)</param>
 		/// <param name="remUnicode">True if we should remove non-ASCII characters from output, false otherwise (default)</param>
-		public void Parse(
+		public void ParseFile(
 			// Standard Dat parsing
 			string filename,
 			int sysid,
diff --git a/SabreTools.Library/DatFiles/SabreDat.cs b/SabreTools.Library/DatFiles/SabreDat.cs
index 67c86e57..f5b58fb5 100644
--- a/SabreTools.Library/DatFiles/SabreDat.cs
+++ b/SabreTools.Library/DatFiles/SabreDat.cs
@@ -48,7 +48,7 @@ namespace SabreTools.Library.DatFiles
 		/// <param name="remUnicode">True if we should remove non-ASCII characters from output, false otherwise (default)</param>
 		/// <remarks>
 		/// </remarks>
-		public void Parse(
+		public void ParseFile(
 			// Standard Dat parsing
 			string filename,
 			int sysid,
@@ -60,7 +60,7 @@ namespace SabreTools.Library.DatFiles
 			bool remUnicode)
 		{
 			// All XML-derived DATs share a lot in common so it just calls one implementation
-			(this as DatFile as Logiqx).Parse(filename, sysid, srcid, keep, clean, remUnicode);
+			(this as DatFile as Logiqx).ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
 		}
 
 		/// <summary>
diff --git a/SabreTools.Library/DatFiles/SeparatedValue.cs b/SabreTools.Library/DatFiles/SeparatedValue.cs
index 46b01947..c739a1ae 100644
--- a/SabreTools.Library/DatFiles/SeparatedValue.cs
+++ b/SabreTools.Library/DatFiles/SeparatedValue.cs
@@ -45,7 +45,7 @@ namespace SabreTools.Library.DatFiles
 		/// <param name="keep">True if full pathnames are to be kept, false otherwise (default)</param>
 		/// <param name="clean">True if game names are sanitized, false otherwise (default)</param>
 		/// <param name="remUnicode">True if we should remove non-ASCII characters from output, false otherwise (default)</param>
-		public void Parse(
+		public void ParseFile(
 			// Standard Dat parsing
 			string filename,
 			int sysid,
diff --git a/SabreTools.Library/DatFiles/SoftwareList.cs b/SabreTools.Library/DatFiles/SoftwareList.cs
index 0a162bfe..05489221 100644
--- a/SabreTools.Library/DatFiles/SoftwareList.cs
+++ b/SabreTools.Library/DatFiles/SoftwareList.cs
@@ -48,9 +48,7 @@ namespace SabreTools.Library.DatFiles
 		/// <param name="remUnicode">True if we should remove non-ASCII characters from output, false otherwise (default)</param>
 		/// <remarks>
 		/// </remarks>
-		public void Parse(
-			DatFile datFile,
-
+		public void ParseFile(
 			// Standard Dat parsing
 			string filename,
 			int sysid,
@@ -62,7 +60,7 @@ namespace SabreTools.Library.DatFiles
 			bool remUnicode)
 		{
 			// All XML-derived DATs share a lot in common so it just calls one implementation
-			(this as DatFile as Logiqx).Parse(filename, sysid, srcid, keep, clean, remUnicode);
+			(this as DatFile as Logiqx).ParseFile(filename, sysid, srcid, keep, clean, remUnicode);
 		}
 
 		/// <summary>