diff --git a/Deheader/Headerer.cs b/Deheader/Headerer.cs
index d579baea..1bd6a97b 100644
--- a/Deheader/Headerer.cs
+++ b/Deheader/Headerer.cs
@@ -34,7 +34,7 @@ namespace SabreTools
 			// Perform initial setup and verification
 			logger = new Logger(true, "headerer.log");
 			logger.Start();
-			Database.EnsureDatabase(_dbName, _connectionString);
+			DBTools.EnsureDatabase(_dbName, _connectionString);
 			Remapping.CreateHeaderSkips();
 
 			// Credits take precidence over all
diff --git a/SabreTools.Helper/SabreTools.Helper.csproj b/SabreTools.Helper/SabreTools.Helper.csproj
index 330f4a68..8870c2f0 100644
--- a/SabreTools.Helper/SabreTools.Helper.csproj
+++ b/SabreTools.Helper/SabreTools.Helper.csproj
@@ -85,7 +85,7 @@
     <Compile Include="Data\Constants.cs" />
     <Compile Include="Tools\ArchiveTools.cs" />
     <Compile Include="Tools\CRC32.cs" />
-    <Compile Include="Tools\Database.cs" />
+    <Compile Include="Tools\DBTools.cs" />
     <Compile Include="Data\Enums.cs" />
     <Compile Include="Interfaces\IGenerate.cs" />
     <Compile Include="Interfaces\IImport.cs" />
diff --git a/SabreTools.Helper/Tools/Database.cs b/SabreTools.Helper/Tools/DBTools.cs
similarity index 99%
rename from SabreTools.Helper/Tools/Database.cs
rename to SabreTools.Helper/Tools/DBTools.cs
index b125b4f2..44e678af 100644
--- a/SabreTools.Helper/Tools/Database.cs
+++ b/SabreTools.Helper/Tools/DBTools.cs
@@ -7,7 +7,7 @@ namespace SabreTools.Helper
 	/// <summary>
 	/// All general database operations
 	/// </summary>
-	public class Database
+	public class DBTools
 	{
 		/// <summary>
 		/// Ensure that the databse exists and has the proper schema
diff --git a/SabreTools/Partials/SabreTools_Helpers.cs b/SabreTools/Partials/SabreTools_Helpers.cs
index 573fe60a..65ab9dd4 100644
--- a/SabreTools/Partials/SabreTools_Helpers.cs
+++ b/SabreTools/Partials/SabreTools_Helpers.cs
@@ -27,7 +27,7 @@ namespace SabreTools
 			{
 				Directory.CreateDirectory(_outroot);
 			}
-			Database.EnsureDatabase(_dbName, _connectionString);
+			DBTools.EnsureDatabase(_dbName, _connectionString);
 
 			using (SqliteConnection dbc = new SqliteConnection(_connectionString))
 			{
diff --git a/SabreTools/Partials/SabreTools_Inits.cs b/SabreTools/Partials/SabreTools_Inits.cs
index e61d03c7..ec2321e9 100644
--- a/SabreTools/Partials/SabreTools_Inits.cs
+++ b/SabreTools/Partials/SabreTools_Inits.cs
@@ -547,7 +547,7 @@ namespace SabreTools
 		/// <param name="url">Source URL(s)</param>
 		private static void InitAddSource(string name, string url)
 		{
-			if (Database.AddSource(name, url, _connectionString))
+			if (DBTools.AddSource(name, url, _connectionString))
 			{
 				_logger.Log("Source " + name + " added!");
 			}
@@ -566,7 +566,7 @@ namespace SabreTools
 			int srcid = -1;
 			if (Int32.TryParse(sourceid, out srcid))
 			{
-				if (Database.RemoveSource(srcid, _connectionString))
+				if (DBTools.RemoveSource(srcid, _connectionString))
 				{
 					_logger.Log("Source '" + srcid + "' removed!");
 				}
@@ -588,7 +588,7 @@ namespace SabreTools
 		/// <param name="system">System name</param>
 		private static void InitAddSystem(string manufacturer, string system)
 		{
-			if (Database.AddSystem(manufacturer, system, _connectionString))
+			if (DBTools.AddSystem(manufacturer, system, _connectionString))
 			{
 				_logger.Log("System " + manufacturer + " - " + system + " added!");
 			}
@@ -607,7 +607,7 @@ namespace SabreTools
 			int sysid = -1;
 			if (Int32.TryParse(systemid, out sysid))
 			{
-				if (Database.RemoveSystem(sysid, _connectionString))
+				if (DBTools.RemoveSystem(sysid, _connectionString))
 				{
 					_logger.Log("System '" + sysid + "' removed!");
 				}