diff --git a/README.rst b/README.rst
index 52b20a3..c9f1364 100644
--- a/README.rst
+++ b/README.rst
@@ -63,7 +63,7 @@ Usage
     Use in your signup form like this:
 
         from django import forms
-        from passwords.fields import PasswordField
+        from django_zxcvbn.fields import PasswordField
 
         class ExampleForm(forms.Form):
             password = PasswordField(label="Password")
diff --git a/passwords/__init__.py b/django_zxcvbn/__init__.py
similarity index 100%
rename from passwords/__init__.py
rename to django_zxcvbn/__init__.py
diff --git a/passwords/fields.py b/django_zxcvbn/fields.py
similarity index 83%
rename from passwords/fields.py
rename to django_zxcvbn/fields.py
index 308b87a..df0c713 100644
--- a/passwords/fields.py
+++ b/django_zxcvbn/fields.py
@@ -1,6 +1,6 @@
 from django.forms import CharField, PasswordInput
 
-from passwords.validators import length_validator, zxcvbn_validator
+from django_zxcvbn.validators import length_validator, zxcvbn_validator
 
 class PasswordField(CharField):
     default_validators = [length_validator, zxcvbn_validator ]
diff --git a/passwords/models.py b/django_zxcvbn/models.py
similarity index 100%
rename from passwords/models.py
rename to django_zxcvbn/models.py
diff --git a/passwords/static/js/zxcvbn-async.js b/django_zxcvbn/static/js/zxcvbn-async.js
similarity index 100%
rename from passwords/static/js/zxcvbn-async.js
rename to django_zxcvbn/static/js/zxcvbn-async.js
diff --git a/passwords/static/js/zxcvbn.js b/django_zxcvbn/static/js/zxcvbn.js
similarity index 100%
rename from passwords/static/js/zxcvbn.js
rename to django_zxcvbn/static/js/zxcvbn.js
diff --git a/passwords/validators.py b/django_zxcvbn/validators.py
similarity index 100%
rename from passwords/validators.py
rename to django_zxcvbn/validators.py
diff --git a/setup.py b/setup.py
index ba59870..0d9db17 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name = "django-zxcvbn",
-    version = __import__("passwords").__version__,
+    version = __import__("django_zxcvbn").__version__,
     author = "Rich Atkinson",
     author_email = "rich@piran.com.au",
     description = "Django app providing zxcvbn password validation (see http://tech.dropbox.com/?p=165)",