diff --git a/RombaSharp/Features/BaseFeature.cs b/RombaSharp/Features/BaseFeature.cs
index e13af8c8..bb0ec63c 100644
--- a/RombaSharp/Features/BaseFeature.cs
+++ b/RombaSharp/Features/BaseFeature.cs
@@ -465,8 +465,8 @@ Possible values are: Verbose, User, Warning, Error");
         public void EnsureDatabase(string db, string connectionString)
         {
             // Make sure the file exists
-            if (!File.Exists(db))
-                File.Create(db);
+            if (!System.IO.File.Exists(db))
+                System.IO.File.Create(db);
 
             // Open the database connection
             SqliteConnection dbc = new SqliteConnection(connectionString);
@@ -734,16 +734,16 @@ CREATE TABLE IF NOT EXISTS dat (
                 if (!Directory.Exists(key))
                 {
                     Directory.CreateDirectory(key);
-                    File.CreateText(Path.Combine(key, ".romba_size"));
-                    File.CreateText(Path.Combine(key, ".romba_size.backup"));
+                    System.IO.File.CreateText(Path.Combine(key, ".romba_size"));
+                    System.IO.File.CreateText(Path.Combine(key, ".romba_size.backup"));
                 }
                 else
                 {
-                    if (!File.Exists(Path.Combine(key, ".romba_size")))
-                        File.CreateText(Path.Combine(key, ".romba_size"));
+                    if (!System.IO.File.Exists(Path.Combine(key, ".romba_size")))
+                        System.IO.File.CreateText(Path.Combine(key, ".romba_size"));
 
-                    if (!File.Exists(Path.Combine(key, ".romba_size.backup")))
-                        File.CreateText(Path.Combine(key, ".romba_size.backup"));
+                    if (!System.IO.File.Exists(Path.Combine(key, ".romba_size.backup")))
+                        System.IO.File.CreateText(Path.Combine(key, ".romba_size.backup"));
                 }
             }
 
diff --git a/RombaSharp/Features/RefreshDats.cs b/RombaSharp/Features/RefreshDats.cs
index c8ac8e30..0eeb0398 100644
--- a/RombaSharp/Features/RefreshDats.cs
+++ b/RombaSharp/Features/RefreshDats.cs
@@ -55,7 +55,7 @@ contents of any changed dats.";
             }
 
             // Make sure the file exists
-            if (!File.Exists(_db))
+            if (!System.IO.File.Exists(_db))
                 EnsureDatabase(_db, _connectionString);
 
             // Make sure the dats dir is set
diff --git a/SabreTools.DatFiles/Formats/ArchiveDotOrg.cs b/SabreTools.DatFiles/Formats/ArchiveDotOrg.cs
index e035adb5..7b6dc978 100644
--- a/SabreTools.DatFiles/Formats/ArchiveDotOrg.cs
+++ b/SabreTools.DatFiles/Formats/ArchiveDotOrg.cs
@@ -278,7 +278,7 @@ namespace SabreTools.DatFiles.Formats
             try
             {
                 logger.User($"Writing to '{outfile}'...");
-                FileStream fs = File.Create(outfile);
+                FileStream fs = System.IO.File.Create(outfile);
 
                 // If we get back null for some reason, just log and return
                 if (fs == null)
diff --git a/SabreTools.DatFiles/Formats/AttractMode.cs b/SabreTools.DatFiles/Formats/AttractMode.cs
index 04291079..0abc8369 100644
--- a/SabreTools.DatFiles/Formats/AttractMode.cs
+++ b/SabreTools.DatFiles/Formats/AttractMode.cs
@@ -30,7 +30,7 @@ namespace SabreTools.DatFiles.Formats
         {
             // Open a file reader
             Encoding enc = filename.GetEncoding();
-            SeparatedValueReader svr = new SeparatedValueReader(File.OpenRead(filename), enc)
+            SeparatedValueReader svr = new SeparatedValueReader(System.IO.File.OpenRead(filename), enc)
             {
                 Header = true,
                 Quotes = false,
@@ -125,7 +125,7 @@ namespace SabreTools.DatFiles.Formats
             try
             {
                 logger.User($"Writing to '{outfile}'...");
-                FileStream fs = File.Create(outfile);
+                FileStream fs = System.IO.File.Create(outfile);
 
                 // If we get back null for some reason, just log and return
                 if (fs == null)
diff --git a/SabreTools.DatFiles/Formats/ClrMamePro.cs b/SabreTools.DatFiles/Formats/ClrMamePro.cs
index 1065f6b1..2325ce81 100644
--- a/SabreTools.DatFiles/Formats/ClrMamePro.cs
+++ b/SabreTools.DatFiles/Formats/ClrMamePro.cs
@@ -42,7 +42,7 @@ namespace SabreTools.DatFiles.Formats
         {
             // Open a file reader
             Encoding enc = filename.GetEncoding();
-            ClrMameProReader cmpr = new ClrMameProReader(File.OpenRead(filename), enc)
+            ClrMameProReader cmpr = new ClrMameProReader(System.IO.File.OpenRead(filename), enc)
             {
                 DosCenter = false,
                 Quotes = Quotes,
@@ -446,7 +446,7 @@ namespace SabreTools.DatFiles.Formats
             try
             {
                 logger.User($"Writing to '{outfile}'...");
-                FileStream fs = File.Create(outfile);
+                FileStream fs = System.IO.File.Create(outfile);
 
                 // If we get back null for some reason, just log and return
                 if (fs == null)
diff --git a/SabreTools.DatFiles/Formats/DosCenter.cs b/SabreTools.DatFiles/Formats/DosCenter.cs
index 00fc461e..fe2acef3 100644
--- a/SabreTools.DatFiles/Formats/DosCenter.cs
+++ b/SabreTools.DatFiles/Formats/DosCenter.cs
@@ -32,7 +32,7 @@ namespace SabreTools.DatFiles.Formats
         {
             // Open a file reader
             Encoding enc = filename.GetEncoding();
-            ClrMameProReader cmpr = new ClrMameProReader(File.OpenRead(filename), enc)
+            ClrMameProReader cmpr = new ClrMameProReader(System.IO.File.OpenRead(filename), enc)
             {
                 DosCenter = true
             };
@@ -271,7 +271,7 @@ namespace SabreTools.DatFiles.Formats
             try
             {
                 logger.User($"Writing to '{outfile}'...");
-                FileStream fs = File.Create(outfile);
+                FileStream fs = System.IO.File.Create(outfile);
 
                 // If we get back null for some reason, just log and return
                 if (fs == null)
diff --git a/SabreTools.DatFiles/Formats/EverdriveSmdb.cs b/SabreTools.DatFiles/Formats/EverdriveSmdb.cs
index 8949653e..e39ea63b 100644
--- a/SabreTools.DatFiles/Formats/EverdriveSmdb.cs
+++ b/SabreTools.DatFiles/Formats/EverdriveSmdb.cs
@@ -31,7 +31,7 @@ namespace SabreTools.DatFiles.Formats
         {
             // Open a file reader
             Encoding enc = filename.GetEncoding();
-            SeparatedValueReader svr = new SeparatedValueReader(File.OpenRead(filename), enc)
+            SeparatedValueReader svr = new SeparatedValueReader(System.IO.File.OpenRead(filename), enc)
             {
                 Header = false,
                 Quotes = false,
@@ -122,7 +122,7 @@ namespace SabreTools.DatFiles.Formats
             try
             {
                 logger.User($"Writing to '{outfile}'...");
-                FileStream fs = File.Create(outfile);
+                FileStream fs = System.IO.File.Create(outfile);
 
                 // If we get back null for some reason, just log and return
                 if (fs == null)
diff --git a/SabreTools.DatFiles/Formats/Hashfile.cs b/SabreTools.DatFiles/Formats/Hashfile.cs
index d91c6756..b4d86408 100644
--- a/SabreTools.DatFiles/Formats/Hashfile.cs
+++ b/SabreTools.DatFiles/Formats/Hashfile.cs
@@ -34,7 +34,7 @@ namespace SabreTools.DatFiles.Formats
         {
             // Open a file reader
             Encoding enc = filename.GetEncoding();
-            StreamReader sr = new StreamReader(File.OpenRead(filename), enc);
+            StreamReader sr = new StreamReader(System.IO.File.OpenRead(filename), enc);
 
             while (!sr.EndOfStream)
             {
@@ -250,7 +250,7 @@ namespace SabreTools.DatFiles.Formats
             try
             {
                 logger.User($"Writing to '{outfile}'...");
-                FileStream fs = File.Create(outfile);
+                FileStream fs = System.IO.File.Create(outfile);
 
                 // If we get back null for some reason, just log and return
                 if (fs == null)
diff --git a/SabreTools.DatFiles/Formats/Listrom.cs b/SabreTools.DatFiles/Formats/Listrom.cs
index f5899b26..28c7e1f4 100644
--- a/SabreTools.DatFiles/Formats/Listrom.cs
+++ b/SabreTools.DatFiles/Formats/Listrom.cs
@@ -39,7 +39,7 @@ namespace SabreTools.DatFiles.Formats
         {
             // Open a file reader
             Encoding enc = filename.GetEncoding();
-            StreamReader sr = new StreamReader(File.OpenRead(filename), enc);
+            StreamReader sr = new StreamReader(System.IO.File.OpenRead(filename), enc);
 
             string gamename = string.Empty;
             while (!sr.EndOfStream)
@@ -278,7 +278,7 @@ namespace SabreTools.DatFiles.Formats
             try
             {
                 logger.User($"Writing to '{outfile}'...");
-                FileStream fs = File.Create(outfile);
+                FileStream fs = System.IO.File.Create(outfile);
 
                 // If we get back null for some reason, just log and return
                 if (fs == null)
diff --git a/SabreTools.DatFiles/Formats/Listxml.cs b/SabreTools.DatFiles/Formats/Listxml.cs
index f2827434..c795d6bb 100644
--- a/SabreTools.DatFiles/Formats/Listxml.cs
+++ b/SabreTools.DatFiles/Formats/Listxml.cs
@@ -1361,7 +1361,7 @@ namespace SabreTools.DatFiles.Formats
             try
             {
                 logger.User($"Writing to '{outfile}'...");
-                FileStream fs = File.Create(outfile);
+                FileStream fs = System.IO.File.Create(outfile);
 
                 // If we get back null for some reason, just log and return
                 if (fs == null)
diff --git a/SabreTools.DatFiles/Formats/Logiqx.cs b/SabreTools.DatFiles/Formats/Logiqx.cs
index 03f88eda..5ee3c1a4 100644
--- a/SabreTools.DatFiles/Formats/Logiqx.cs
+++ b/SabreTools.DatFiles/Formats/Logiqx.cs
@@ -860,7 +860,7 @@ namespace SabreTools.DatFiles.Formats
             try
             {
                 logger.User($"Writing to '{outfile}'...");
-                FileStream fs = File.Create(outfile);
+                FileStream fs = System.IO.File.Create(outfile);
 
                 // If we get back null for some reason, just log and return
                 if (fs == null)
diff --git a/SabreTools.DatFiles/Formats/OfflineList.cs b/SabreTools.DatFiles/Formats/OfflineList.cs
index 6958d6aa..d991fad2 100644
--- a/SabreTools.DatFiles/Formats/OfflineList.cs
+++ b/SabreTools.DatFiles/Formats/OfflineList.cs
@@ -674,7 +674,7 @@ namespace SabreTools.DatFiles.Formats
             try
             {
                 logger.User($"Writing to '{outfile}'...");
-                FileStream fs = File.Create(outfile);
+                FileStream fs = System.IO.File.Create(outfile);
 
                 // If we get back null for some reason, just log and return
                 if (fs == null)
diff --git a/SabreTools.DatFiles/Formats/OpenMSX.cs b/SabreTools.DatFiles/Formats/OpenMSX.cs
index 9016f3f8..e614bc4c 100644
--- a/SabreTools.DatFiles/Formats/OpenMSX.cs
+++ b/SabreTools.DatFiles/Formats/OpenMSX.cs
@@ -547,7 +547,7 @@ namespace SabreTools.DatFiles.Formats
             try
             {
                 logger.User($"Writing to '{outfile}'...");
-                FileStream fs = File.Create(outfile);
+                FileStream fs = System.IO.File.Create(outfile);
 
                 // If we get back null for some reason, just log and return
                 if (fs == null)
diff --git a/SabreTools.DatFiles/Formats/RomCenter.cs b/SabreTools.DatFiles/Formats/RomCenter.cs
index 9b69873f..a6dfc8cf 100644
--- a/SabreTools.DatFiles/Formats/RomCenter.cs
+++ b/SabreTools.DatFiles/Formats/RomCenter.cs
@@ -376,7 +376,7 @@ namespace SabreTools.DatFiles.Formats
             try
             {
                 logger.User($"Writing to '{outfile}'...");
-                FileStream fs = File.Create(outfile);
+                FileStream fs = System.IO.File.Create(outfile);
 
                 // If we get back null for some reason, just log and return
                 if (fs == null)
diff --git a/SabreTools.DatFiles/Formats/SabreJSON.cs b/SabreTools.DatFiles/Formats/SabreJSON.cs
index ca6b7b6a..44d8c5d0 100644
--- a/SabreTools.DatFiles/Formats/SabreJSON.cs
+++ b/SabreTools.DatFiles/Formats/SabreJSON.cs
@@ -31,7 +31,7 @@ namespace SabreTools.DatFiles.Formats
         public override void ParseFile(string filename, int indexId, bool keep, bool statsOnly = false, bool throwOnError = false)
         {
             // Prepare all internal variables
-            StreamReader sr = new StreamReader(File.OpenRead(filename), new UTF8Encoding(false));
+            StreamReader sr = new StreamReader(System.IO.File.OpenRead(filename), new UTF8Encoding(false));
             JsonTextReader jtr = new JsonTextReader(sr);
 
             // If we got a null reader, just return
@@ -337,7 +337,7 @@ namespace SabreTools.DatFiles.Formats
             try
             {
                 logger.User($"Writing to '{outfile}'...");
-                FileStream fs = File.Create(outfile);
+                FileStream fs = System.IO.File.Create(outfile);
 
                 // If we get back null for some reason, just log and return
                 if (fs == null)
diff --git a/SabreTools.DatFiles/Formats/SeparatedValue.cs b/SabreTools.DatFiles/Formats/SeparatedValue.cs
index be8dc4c0..510d0e9e 100644
--- a/SabreTools.DatFiles/Formats/SeparatedValue.cs
+++ b/SabreTools.DatFiles/Formats/SeparatedValue.cs
@@ -36,7 +36,7 @@ namespace SabreTools.DatFiles.Formats
         {
             // Open a file reader
             Encoding enc = filename.GetEncoding();
-            SeparatedValueReader svr = new SeparatedValueReader(File.OpenRead(filename), enc)
+            SeparatedValueReader svr = new SeparatedValueReader(System.IO.File.OpenRead(filename), enc)
             {
                 Header = true,
                 Quotes = true,
@@ -108,7 +108,7 @@ namespace SabreTools.DatFiles.Formats
             try
             {
                 logger.User($"Writing to '{outfile}'...");
-                FileStream fs = File.Create(outfile);
+                FileStream fs = System.IO.File.Create(outfile);
 
                 // If we get back null for some reason, just log and return
                 if (fs == null)
diff --git a/SabreTools.DatFiles/Formats/SoftwareList.cs b/SabreTools.DatFiles/Formats/SoftwareList.cs
index 722e1775..ca799803 100644
--- a/SabreTools.DatFiles/Formats/SoftwareList.cs
+++ b/SabreTools.DatFiles/Formats/SoftwareList.cs
@@ -696,7 +696,7 @@ namespace SabreTools.DatFiles.Formats
             try
             {
                 logger.User($"Writing to '{outfile}'...");
-                FileStream fs = File.Create(outfile);
+                FileStream fs = System.IO.File.Create(outfile);
 
                 // If we get back null for some reason, just log and return
                 if (fs == null)
diff --git a/SabreTools.DatFiles/ItemDictionaryDB.cs b/SabreTools.DatFiles/ItemDictionaryDB.cs
index 32e30240..f61ed120 100644
--- a/SabreTools.DatFiles/ItemDictionaryDB.cs
+++ b/SabreTools.DatFiles/ItemDictionaryDB.cs
@@ -1099,8 +1099,8 @@ namespace SabreTools.DatFiles
         protected void EnsureDatabase()
         {
             // Make sure the file exists
-            if (!File.Exists(ItemDictionaryFileName))
-                File.Create(ItemDictionaryFileName);
+            if (!System.IO.File.Exists(ItemDictionaryFileName))
+                System.IO.File.Create(ItemDictionaryFileName);
 
             // If we have no database connection, we can't do anything
             if (dbc == null)
diff --git a/SabreTools.DatTools/DatFromDir.cs b/SabreTools.DatTools/DatFromDir.cs
index d03892ae..fe86916b 100644
--- a/SabreTools.DatTools/DatFromDir.cs
+++ b/SabreTools.DatTools/DatFromDir.cs
@@ -80,7 +80,7 @@ namespace SabreTools.DatTools
                 if (addBlanks)
                     ProcessDirectoryBlanks(datFile, basePath);
             }
-            else if (File.Exists(basePath))
+            else if (System.IO.File.Exists(basePath))
             {
                 logger.Verbose($"File found: {basePath}");