diff --git a/MANIFEST.in b/MANIFEST.in
index 9331b9e..233725c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,5 @@
 include *.rst LICENSE *.cfg ez_setup.py VERSION
-recursive-include matgendb *
+recursive-include pymatgen *
 recursive-include scripts *
 prune */*/tests
 prune */*/*/tests
diff --git a/setup.py b/setup.py
index b4c1a89..201150d 100644
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,8 @@
     extras_require={
         'tests': 'mongomock'
     },
-    package_data={"matgendb": ["*.json"]},
+    package_data={"pymatgen": ["db/*.json"]},
+    include_package_data=True,
     author="Shyue Ping Ong, Dan Gunter",
     author_email="shyuep@gmail.com",
     maintainer="Dan Gunter",
@@ -47,4 +48,4 @@
     ],
     scripts=[os.path.join("scripts", f) for f in os.listdir("scripts")
              if not os.path.isdir(os.path.join("scripts", f))]
-)
\ No newline at end of file
+)
diff --git a/tasks.py b/tasks.py
index 2b3f450..3fa433f 100755
--- a/tasks.py
+++ b/tasks.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 """
-Deployment file to facilitate releases of matgendb.
+Deployment file to facilitate releases of pymatgen-db.
 """
 
 from __future__ import division