diff --git a/dbstorage/__init__.py b/dbfilestorage/__init__.py
similarity index 100%
rename from dbstorage/__init__.py
rename to dbfilestorage/__init__.py
diff --git a/dbstorage/admin.py b/dbfilestorage/admin.py
similarity index 100%
rename from dbstorage/admin.py
rename to dbfilestorage/admin.py
diff --git a/dbstorage/migrations/0001_initial.py b/dbfilestorage/migrations/0001_initial.py
similarity index 100%
rename from dbstorage/migrations/0001_initial.py
rename to dbfilestorage/migrations/0001_initial.py
diff --git a/dbstorage/migrations/__init__.py b/dbfilestorage/migrations/__init__.py
similarity index 100%
rename from dbstorage/migrations/__init__.py
rename to dbfilestorage/migrations/__init__.py
diff --git a/dbstorage/models.py b/dbfilestorage/models.py
similarity index 100%
rename from dbstorage/models.py
rename to dbfilestorage/models.py
diff --git a/dbstorage/storage.py b/dbfilestorage/storage.py
similarity index 100%
rename from dbstorage/storage.py
rename to dbfilestorage/storage.py
diff --git a/dbstorage/test_files/kris.jpg b/dbfilestorage/test_files/kris.jpg
similarity index 100%
rename from dbstorage/test_files/kris.jpg
rename to dbfilestorage/test_files/kris.jpg
diff --git a/dbstorage/tests.py b/dbfilestorage/tests.py
similarity index 87%
rename from dbstorage/tests.py
rename to dbfilestorage/tests.py
index 0997fd3..274c11d 100644
--- a/dbstorage/tests.py
+++ b/dbfilestorage/tests.py
@@ -21,7 +21,7 @@ class DBFileTest(TestCase):
             return default_storage.save(self.filepath, f)
 
     @override_settings(
-        DEFAULT_FILE_STORAGE="dbstorage.storage.DBStorage")
+        DEFAULT_FILE_STORAGE="dbfilestorage.storage.DBStorage")
     def test_upload(self):
         """ Test that the file storage uploads and puts in DB Properly """
         name = self._upload()
@@ -29,7 +29,7 @@ class DBFileTest(TestCase):
         self.assertTrue(DBFile.objects.filter(name=name).exists())
 
     @override_settings(
-        DEFAULT_FILE_STORAGE="dbstorage.storage.DBStorage")
+        DEFAULT_FILE_STORAGE="dbfilestorage.storage.DBStorage")
     def test_equality(self):
         """ Test that the DB entry matches what is expected from the file """
         name = self._upload()
@@ -40,7 +40,7 @@ class DBFileTest(TestCase):
             self.assertEqual(dbf.content_type, 'image/jpeg')
 
     @override_settings(
-        DEFAULT_FILE_STORAGE="dbstorage.storage.DBStorage")
+        DEFAULT_FILE_STORAGE="dbfilestorage.storage.DBStorage")
     def test_open(self):
         """ Test that the storage mechanism can upload """
         name = self._upload()
@@ -49,7 +49,7 @@ class DBFileTest(TestCase):
             self.assertEqual(dbf.read(), f.read())
 
     @override_settings(
-        DEFAULT_FILE_STORAGE="dbstorage.storage.DBStorage")
+        DEFAULT_FILE_STORAGE="dbfilestorage.storage.DBStorage")
     def test_exists(self):
         """ Test that the storage mechanism can check existance """
         name = self._upload()
diff --git a/dbstorage/urls.py b/dbfilestorage/urls.py
similarity index 100%
rename from dbstorage/urls.py
rename to dbfilestorage/urls.py
diff --git a/dbstorage/views.py b/dbfilestorage/views.py
similarity index 100%
rename from dbstorage/views.py
rename to dbfilestorage/views.py
diff --git a/tests/settings.py b/tests/settings.py
index f8464b9..3ead56d 100644
--- a/tests/settings.py
+++ b/tests/settings.py
@@ -37,7 +37,7 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'dbstorage',
+    'dbfilestorage',
 ]
 
 MIDDLEWARE = [