diff --git a/mongomap/__init__.py b/mongoengine/__init__.py
similarity index 100%
rename from mongomap/__init__.py
rename to mongoengine/__init__.py
diff --git a/mongomap/base.py b/mongoengine/base.py
similarity index 100%
rename from mongomap/base.py
rename to mongoengine/base.py
diff --git a/mongomap/collection.py b/mongoengine/collection.py
similarity index 100%
rename from mongomap/collection.py
rename to mongoengine/collection.py
diff --git a/mongomap/connection.py b/mongoengine/connection.py
similarity index 100%
rename from mongomap/connection.py
rename to mongoengine/connection.py
diff --git a/mongomap/document.py b/mongoengine/document.py
similarity index 100%
rename from mongomap/document.py
rename to mongoengine/document.py
diff --git a/mongomap/fields.py b/mongoengine/fields.py
similarity index 100%
rename from mongomap/fields.py
rename to mongoengine/fields.py
diff --git a/tests/collection.py b/tests/collection.py
index bffc9065..fd6532cb 100644
--- a/tests/collection.py
+++ b/tests/collection.py
@@ -1,15 +1,15 @@
 import unittest
 import pymongo
 
-from mongomap.collection import CollectionManager
-from mongomap.connection import _get_db
-from mongomap import *
+from mongoengine.collection import CollectionManager
+from mongoengine.connection import _get_db
+from mongoengine import *
 
 
 class CollectionManagerTest(unittest.TestCase):
     
     def setUp(self):
-        connect(db='mongomaptest')
+        connect(db='mongoenginetest')
 
         class Person(Document):
             name = StringField()
diff --git a/tests/document.py b/tests/document.py
index d2f3d8e9..2e8145ba 100644
--- a/tests/document.py
+++ b/tests/document.py
@@ -1,13 +1,13 @@
 import unittest
 
-from mongomap import *
-from mongomap.connection import _get_db
+from mongoengine import *
+from mongoengine.connection import _get_db
 
 
 class DocumentTest(unittest.TestCase):
     
     def setUp(self):
-        connect(db='mongomaptest')
+        connect(db='mongoenginetest')
 
         class Person(Document):
             name = StringField()
diff --git a/tests/fields.py b/tests/fields.py
index 8f33c21c..e5b6603e 100644
--- a/tests/fields.py
+++ b/tests/fields.py
@@ -1,13 +1,13 @@
 import unittest
 
-from mongomap import *
-from mongomap.connection import _get_db
+from mongoengine import *
+from mongoengine.connection import _get_db
 
 
 class FieldTest(unittest.TestCase):
 
     def setUp(self):
-        connect(db='mongomaptest')
+        connect(db='mongoenginetest')
         self.db = _get_db()
 
     def test_default_values(self):