diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index e040a61e..1fee99d9 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -5,7 +5,7 @@ import os
 import sys
 
 import core
-from core import logger, nzbToMediaDB
+from core import logger, main_db
 from core.nzbToMediaUserScript import external_script
 from core.nzbToMediaUtil import char_replace, convert_to_ascii, plex_update, replace_links
 from six import text_type
@@ -19,7 +19,7 @@ def process_torrent(input_directory, input_name, input_category, input_hash, inp
     if client_agent != 'manual' and not core.DOWNLOADINFO:
         logger.debug('Adding TORRENT download info for directory {0} to database'.format(input_directory))
 
-        my_db = nzbToMediaDB.DBConnection()
+        my_db = main_db.DBConnection()
 
         input_directory1 = input_directory
         input_name1 = input_name
diff --git a/core/__init__.py b/core/__init__.py
index dd4268c2..0fe35dc6 100644
--- a/core/__init__.py
+++ b/core/__init__.py
@@ -42,7 +42,7 @@ MYAPP = None
 import six
 from six.moves import reload_module
 
-from core import logger, nzbToMediaDB, versionCheck, databases, transcoder
+from core import logger, main_db, versionCheck, databases, transcoder
 from core.auto_process import Comic, Game, Movie, Music, TV
 from core.configuration import config
 from core.nzbToMediaUtil import (
@@ -319,7 +319,7 @@ def initialize(section=None):
             logger.info("{0}: {1}".format(item, os.environ[item]), "ENVIRONMENT")
 
     # initialize the main SB database
-    nzbToMediaDB.upgrade_database(nzbToMediaDB.DBConnection(), databases.InitialSchema)
+    main_db.upgrade_database(main_db.DBConnection(), databases.InitialSchema)
 
     # Set Version and GIT variables
     NZBTOMEDIA_VERSION = '11.06'
diff --git a/core/databases.py b/core/databases.py
index d6c1e1c3..2cec59d8 100644
--- a/core/databases.py
+++ b/core/databases.py
@@ -1,6 +1,6 @@
 # coding=utf-8
 
-from core import logger, nzbToMediaDB
+from core import logger, main_db
 from core.nzbToMediaUtil import backup_versioned_file
 
 MIN_DB_VERSION = 1  # oldest db version we support migrating from
@@ -9,7 +9,7 @@ MAX_DB_VERSION = 2
 
 def backup_database(version):
     logger.info("Backing up database before upgrade")
-    if not backup_versioned_file(nzbToMediaDB.db_filename(), version):
+    if not backup_versioned_file(main_db.db_filename(), version):
         logger.log_error_and_exit("Database backup failed, abort upgrading database")
     else:
         logger.info("Proceeding with upgrade")
@@ -20,7 +20,7 @@ def backup_database(version):
 # ======================
 # Add new migrations at the bottom of the list; subclass the previous migration.
 
-class InitialSchema(nzbToMediaDB.SchemaUpgrade):
+class InitialSchema(main_db.SchemaUpgrade):
     def test(self):
         no_update = False
         if self.has_table("db_version"):
diff --git a/core/nzbToMediaDB.py b/core/main_db.py
similarity index 100%
rename from core/nzbToMediaDB.py
rename to core/main_db.py
diff --git a/core/nzbToMediaUtil.py b/core/nzbToMediaUtil.py
index 21985623..97e23e40 100644
--- a/core/nzbToMediaUtil.py
+++ b/core/nzbToMediaUtil.py
@@ -26,7 +26,7 @@ from transmissionrpc.client import Client as TransmissionClient
 from utorrent.client import UTorrentClient
 
 import core
-from core import logger, nzbToMediaDB
+from core import logger, main_db
 from core.extractor import extractor
 
 requests.packages.urllib3.disable_warnings()
@@ -1284,7 +1284,7 @@ def backup_versioned_file(old_file, version):
 def update_download_info_status(input_name, status):
     logger.db("Updating status of our download {0} in the DB to {1}".format(input_name, status))
 
-    my_db = nzbToMediaDB.DBConnection()
+    my_db = main_db.DBConnection()
     my_db.action("UPDATE downloads SET status=?, last_update=? WHERE input_name=?",
                  [status, datetime.date.today().toordinal(), text_type(input_name)])
 
@@ -1292,7 +1292,7 @@ def update_download_info_status(input_name, status):
 def get_download_info(input_name, status):
     logger.db("Getting download info for {0} from the DB".format(input_name))
 
-    my_db = nzbToMediaDB.DBConnection()
+    my_db = main_db.DBConnection()
     sql_results = my_db.select("SELECT * FROM downloads WHERE input_name=? AND status=?",
                                [text_type(input_name), status])
 
diff --git a/nzbToMedia.py b/nzbToMedia.py
index 9ad63722..e3fb2910 100755
--- a/nzbToMedia.py
+++ b/nzbToMedia.py
@@ -628,7 +628,7 @@ import os
 import sys
 
 import core
-from core import logger, nzbToMediaDB
+from core import logger, main_db
 from core.auto_process import Comic, Game, Movie, Music, TV
 from core.nzbToMediaUserScript import external_script
 from core.nzbToMediaUtil import char_replace, clean_dir, convert_to_ascii, extract_files, get_dirs, get_download_info, get_nzoid, plex_update, update_download_info_status
@@ -653,7 +653,7 @@ def process(input_directory, input_name=None, status=0, client_agent='manual', d
     if client_agent != 'manual' and not core.DOWNLOADINFO:
         logger.debug('Adding NZB download info for directory {0} to database'.format(input_directory))
 
-        my_db = nzbToMediaDB.DBConnection()
+        my_db = main_db.DBConnection()
 
         input_directory1 = input_directory
         input_name1 = input_name