diff --git a/DATabase/Partials/DATabase_Helpers.cs b/DATabase/Partials/DATabase_Helpers.cs
index 6c2e3533..f4ebd175 100644
--- a/DATabase/Partials/DATabase_Helpers.cs
+++ b/DATabase/Partials/DATabase_Helpers.cs
@@ -27,7 +27,7 @@ namespace SabreTools
 			{
 				Directory.CreateDirectory(_outroot);
 			}
-			DatabaseTools.EnsureDatabase(_dbName, _connectionString);
+			Database.EnsureDatabase(_dbName, _connectionString);
 
 			using (SqliteConnection dbc = new SqliteConnection(_connectionString))
 			{
diff --git a/DATabase/Partials/DATabase_Inits.cs b/DATabase/Partials/DATabase_Inits.cs
index 4832fe01..60775009 100644
--- a/DATabase/Partials/DATabase_Inits.cs
+++ b/DATabase/Partials/DATabase_Inits.cs
@@ -541,7 +541,7 @@ namespace SabreTools
 		/// <param name="url">Source URL(s)</param>
 		private static void InitAddSource(string name, string url)
 		{
-			if (DatabaseTools.AddSource(name, url, _connectionString))
+			if (Database.AddSource(name, url, _connectionString))
 			{
 				_logger.Log("Source " + name + " added!");
 			}
@@ -560,7 +560,7 @@ namespace SabreTools
 			int srcid = -1;
 			if (Int32.TryParse(sourceid, out srcid))
 			{
-				if (DatabaseTools.RemoveSource(srcid, _connectionString))
+				if (Database.RemoveSource(srcid, _connectionString))
 				{
 					_logger.Log("Source '" + srcid + "' removed!");
 				}
@@ -582,7 +582,7 @@ namespace SabreTools
 		/// <param name="system">System name</param>
 		private static void InitAddSystem(string manufacturer, string system)
 		{
-			if (DatabaseTools.AddSystem(manufacturer, system, _connectionString))
+			if (Database.AddSystem(manufacturer, system, _connectionString))
 			{
 				_logger.Log("System " + manufacturer + " - " + system + " added!");
 			}
@@ -601,7 +601,7 @@ namespace SabreTools
 			int sysid = -1;
 			if (Int32.TryParse(systemid, out sysid))
 			{
-				if (DatabaseTools.RemoveSystem(sysid, _connectionString))
+				if (Database.RemoveSystem(sysid, _connectionString))
 				{
 					_logger.Log("System '" + sysid + "' removed!");
 				}
diff --git a/Deheader/Headerer.cs b/Deheader/Headerer.cs
index c1c09468..051a0e7b 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();
-			DatabaseTools.EnsureDatabase(_dbName, _connectionString);
+			Database.EnsureDatabase(_dbName, _connectionString);
 			Remapping.CreateHeaderSkips();
 
 			// Credits take precidence over all
diff --git a/SabreHelper/Tools/Database.cs b/SabreHelper/Tools/Database.cs
index dba49f80..b125b4f2 100644
--- a/SabreHelper/Tools/Database.cs
+++ b/SabreHelper/Tools/Database.cs
@@ -7,7 +7,7 @@ namespace SabreTools.Helper
 	/// <summary>
 	/// All general database operations
 	/// </summary>
-	public class DatabaseTools
+	public class Database
 	{
 		/// <summary>
 		/// Ensure that the databse exists and has the proper schema