diff --git a/DATabase/Core/Generate.cs b/DATabase/Core/Generate.cs
index cb0d1e1e..0cd15a10 100644
--- a/DATabase/Core/Generate.cs
+++ b/DATabase/Core/Generate.cs
@@ -22,9 +22,9 @@ namespace WoD
 
 		// Private required variables
 		private Dictionary<int, string> _headers;
-		private Logging _logger;
+		private Logger _logger;
 
-		public Generate(string systems, string sources, string connectionString, Logging logger, bool norename = false, bool old = false)
+		public Generate(string systems, string sources, string connectionString, Logger logger, bool norename = false, bool old = false)
 		{
 			_systems = systems;
 			_sources = sources;
diff --git a/DATabase/Core/Import.cs b/DATabase/Core/Import.cs
index 1191edd4..b27b4c63 100644
--- a/DATabase/Core/Import.cs
+++ b/DATabase/Core/Import.cs
@@ -13,7 +13,7 @@ namespace WoD
 		// Private instance variables
 		private string _filepath;
 		private string _connectionString;
-		private Logging _logger;
+		private Logger _logger;
 
 		// Regex File Name Patterns
 		private static string _defaultPattern = @"^(.+?) - (.+?) \((.*) (.*)\)\.dat$";
@@ -50,7 +50,7 @@ namespace WoD
 		}
 
 		// Constructor
-		public Import(string filepath, string connectionString, Logging logger)
+		public Import(string filepath, string connectionString, Logger logger)
 		{
 			if (File.Exists(filepath))
 			{
diff --git a/DATabase/DATabase.cs b/DATabase/DATabase.cs
index 11655056..d0527582 100644
--- a/DATabase/DATabase.cs
+++ b/DATabase/DATabase.cs
@@ -9,7 +9,7 @@ namespace WoD
 {
 	class DATabase
 	{
-		private static Logging logger;
+		private static Logger logger;
 		private static string _dbName = "DATabase.sqlite";
 		private static string _connectionString = "Data Source=" + _dbName + ";Version = 3;";
 		private static string _version = "0.1.1.0";
@@ -27,7 +27,7 @@ namespace WoD
 			// Perform initial setup and verification
 			DBTools.EnsureDatabase(_dbName, _connectionString);
 			Remapping.CreateRemappings();
-			logger = new Logging(false, "database.log");
+			logger = new Logger(false, "database.log");
 			logger.Start();
 			Console.Clear();
 			Console.Title = "DATabase " + _version;
@@ -319,6 +319,7 @@ Make a selection:
 			return;
 		}
 
+		/// TODO: Make this safe for auto-generating multiple files (such as auto-generate)
 		private static void InitGenerate(string systems, string sources, bool norename, bool old)
 		{
 			Generate gen = new Generate(systems, sources, _connectionString, logger, norename, old);
diff --git a/DATabase/DATabase.csproj b/DATabase/DATabase.csproj
index aacca3cc..017ebf71 100644
--- a/DATabase/DATabase.csproj
+++ b/DATabase/DATabase.csproj
@@ -71,7 +71,7 @@
     <Compile Include="Core\Import.cs" />
     <Compile Include="Helper\DBTools.cs" />
     <Compile Include="DATabase.cs" />
-    <Compile Include="Helper\Logging.cs" />
+    <Compile Include="Helper\Logger.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Helper\Remapping.cs" />
     <Compile Include="Helper\Style.cs" />
diff --git a/DATabase/Helper/Logging.cs b/DATabase/Helper/Logger.cs
similarity index 94%
rename from DATabase/Helper/Logging.cs
rename to DATabase/Helper/Logger.cs
index fb35c5fe..3a7eb606 100644
--- a/DATabase/Helper/Logging.cs
+++ b/DATabase/Helper/Logger.cs
@@ -3,7 +3,7 @@ using System.IO;
 
 namespace WoD.Helper
 {
-	public class Logging
+	public class Logger
 	{
 		// Private instance variables
 		private bool _tofile;
@@ -28,7 +28,7 @@ namespace WoD.Helper
 			}
 		}
 
-		public Logging(bool tofile, string filename = "")
+		public Logger(bool tofile, string filename = "")
 		{
 			_tofile = tofile;
 			_filename = filename;