diff --git a/Tautulli.py b/Tautulli.py
index 06284d2d..406e846a 100644
--- a/Tautulli.py
+++ b/Tautulli.py
@@ -185,6 +185,10 @@ def main():
     # Put the database in the DATA_DIR
     plexpy.DB_FILE = os.path.join(plexpy.DATA_DIR, database.FILENAME)
 
+    # Move 'plexpy.db' to 'tautulli.db'
+    if os.path.isfile(os.path.join(plexpy.DATA_DIR, 'plexpy.db')):
+        os.rename(os.path.join(plexpy.DATA_DIR, 'plexpy.db'), plexpy.DB_FILE)
+
     if plexpy.DAEMON:
         plexpy.daemonize()
 
diff --git a/plexpy/database.py b/plexpy/database.py
index bc08b4d0..d5c998ec 100644
--- a/plexpy/database.py
+++ b/plexpy/database.py
@@ -23,7 +23,7 @@ import time
 import plexpy
 import logger
 
-FILENAME = "plexpy.db"
+FILENAME = "tautulli.db"
 db_lock = threading.Lock()