diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index a62b0fb0091e..21622cc9ac13 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,10 @@ These are notable changes in edx-platform.  This is a rolling list of changes,
 in roughly chronological order, most recent first.  Add your entries at or near
 the top.  Include a label indicating the component affected.
 
+Common: Switch from mitx.db to edx.db for sqlite databases. This will effectively
+  reset state for local instances of the code, unless you manually rename your
+  mitx.db file to edx.db.
+
 Blades: Video Transcripts: Fix clear and download buttons. BLD-438.
 
 Common: Switch over from MITX_FEATURES to just FEATURES. To override items in
diff --git a/cms/envs/dev.py b/cms/envs/dev.py
index 6d47e65f23c4..2fa06489df3c 100644
--- a/cms/envs/dev.py
+++ b/cms/envs/dev.py
@@ -71,7 +71,7 @@
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': ENV_ROOT / "db" / "mitx.db",
+        'NAME': ENV_ROOT / "db" / "edx.db",
     }
 }
 
diff --git a/common/djangoapps/terrain/browser.py b/common/djangoapps/terrain/browser.py
index 8c18c40a79cc..ec676b6daa30 100644
--- a/common/djangoapps/terrain/browser.py
+++ b/common/djangoapps/terrain/browser.py
@@ -155,7 +155,7 @@ def initial_setup(server):
 def reset_data(scenario):
     """
     Clean out the django test database defined in the
-    envs/acceptance.py file: mitx_all/db/test_mitx.db
+    envs/acceptance.py file: edx-platform/db/test_edx.db
     """
     LOGGER.debug("Flushing the test database...")
     call_command('flush', interactive=False, verbosity=0)
diff --git a/lms/envs/dev.py b/lms/envs/dev.py
index 9c5dd90ec716..09c3f5cb1ce5 100644
--- a/lms/envs/dev.py
+++ b/lms/envs/dev.py
@@ -55,7 +55,7 @@
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': ENV_ROOT / "db" / "mitx.db",
+        'NAME': ENV_ROOT / "db" / "edx.db",
     }
 }
 
diff --git a/lms/envs/static.py b/lms/envs/static.py
index 260153e62314..00cf837743a5 100644
--- a/lms/envs/static.py
+++ b/lms/envs/static.py
@@ -25,7 +25,7 @@
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': ENV_ROOT / "db" / "mitx.db",
+        'NAME': ENV_ROOT / "db" / "edx.db",
     }
 }
 
diff --git a/lms/envs/test.py b/lms/envs/test.py
index 111c9316ae64..59b815b885e5 100644
--- a/lms/envs/test.py
+++ b/lms/envs/test.py
@@ -130,7 +130,7 @@
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': TEST_ROOT / 'db' / 'mitx.db'
+        'NAME': TEST_ROOT / 'db' / 'edx.db'
     },
 
 }