diff --git a/README.rst b/README.rst
index f2f5e9c..2ed7408 100644
--- a/README.rst
+++ b/README.rst
@@ -79,9 +79,9 @@ Add djadmin2 urls to your URLconf:
 
    # urls.py
    from django.conf.urls import patterns, include
-   
+
    import djadmin2
-   
+
    djadmin2.default.autodiscover()
 
 
@@ -126,16 +126,16 @@ The default theme is whatever bootstrap is most current. Specifically:
 .. code-block:: python
 
     # settings.py
-    ADMIN2_THEME_DIRECTORY = "admin2/bootstrap/"
+    ADMIN2_THEME_DIRECTORY = "djadmin2/bootstrap/"
 
 If you create a new theme, you define it thus:
 
 .. code-block:: python
 
     # settings.py
-    ADMIN2_THEME_DIRECTORY = "admin2/foundation/"
+    ADMIN2_THEME_DIRECTORY = "djadmin2/foundation/"
+
 
-    
 
 History
 =========
@@ -144,7 +144,7 @@ History
 
   * Implemented both Function- and Class-based Action views
   * Implemented ModelAdmin2.list_display
-  * Implemented ModelAdmin2.fieldsets 
+  * Implemented ModelAdmin2.fieldsets
   * Dropdown widget now displays the selected choice
   * Added support for callables in ModelAdmin2.list_display
   * Added screenshots to README
diff --git a/djadmin2/settings.py b/djadmin2/settings.py
index b84b862..ec3d674 100644
--- a/djadmin2/settings.py
+++ b/djadmin2/settings.py
@@ -6,4 +6,4 @@ MODEL_ADMIN_ATTRS = (
     'index_view', 'detail_view', 'create_view', 'update_view', 'delete_view',
     'get_default_view_kwargs', 'get_list_actions')
 
-ADMIN2_THEME_DIRECTORY = getattr(settings, "ADMIN2_THEME_DIRECTORY", "admin2/bootstrap")
+ADMIN2_THEME_DIRECTORY = getattr(settings, "ADMIN2_THEME_DIRECTORY", "djadmin2/bootstrap")
diff --git a/djadmin2/templates/admin2/bootstrap/actions/delete_selected_confirmation.html b/djadmin2/templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html
similarity index 96%
rename from djadmin2/templates/admin2/bootstrap/actions/delete_selected_confirmation.html
rename to djadmin2/templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html
index fa5d87f..1639cfd 100644
--- a/djadmin2/templates/admin2/bootstrap/actions/delete_selected_confirmation.html
+++ b/djadmin2/templates/djadmin2/bootstrap/actions/delete_selected_confirmation.html
@@ -1,4 +1,4 @@
-{% extends "admin2/bootstrap/base.html" %}
+{% extends "djadmin2/bootstrap/base.html" %}
 {% load admin2_tags i18n %}
 
 {% block title %}{% trans "Are you sure?" %}{% endblock title %}
diff --git a/djadmin2/templates/admin2/bootstrap/app_index.html b/djadmin2/templates/djadmin2/bootstrap/app_index.html
similarity index 92%
rename from djadmin2/templates/admin2/bootstrap/app_index.html
rename to djadmin2/templates/djadmin2/bootstrap/app_index.html
index 5ed20d4..07c5e21 100644
--- a/djadmin2/templates/admin2/bootstrap/app_index.html
+++ b/djadmin2/templates/djadmin2/bootstrap/app_index.html
@@ -1,4 +1,4 @@
-{% extends "admin2/bootstrap/base.html" %}
+{% extends "djadmin2/bootstrap/base.html" %}
 {% load admin2_tags i18n %}
 
 {% block breadcrumbs %}
diff --git a/djadmin2/templates/admin2/bootstrap/auth/login.html b/djadmin2/templates/djadmin2/bootstrap/auth/login.html
similarity index 98%
rename from djadmin2/templates/admin2/bootstrap/auth/login.html
rename to djadmin2/templates/djadmin2/bootstrap/auth/login.html
index c055c15..5a9ba15 100644
--- a/djadmin2/templates/admin2/bootstrap/auth/login.html
+++ b/djadmin2/templates/djadmin2/bootstrap/auth/login.html
@@ -1,4 +1,4 @@
-{% extends "admin2/bootstrap/base.html" %}
+{% extends "djadmin2/bootstrap/base.html" %}
 
 {% load i18n %}
 {% load admin2_tags %}
diff --git a/djadmin2/templates/admin2/bootstrap/auth/logout.html b/djadmin2/templates/djadmin2/bootstrap/auth/logout.html
similarity index 92%
rename from djadmin2/templates/admin2/bootstrap/auth/logout.html
rename to djadmin2/templates/djadmin2/bootstrap/auth/logout.html
index 7da8675..433c62a 100644
--- a/djadmin2/templates/admin2/bootstrap/auth/logout.html
+++ b/djadmin2/templates/djadmin2/bootstrap/auth/logout.html
@@ -1,4 +1,4 @@
-{% extends "admin2/bootstrap/base.html" %}
+{% extends "djadmin2/bootstrap/base.html" %}
 
 {% load i18n %}
 {% load admin2_tags %}
diff --git a/djadmin2/templates/admin2/bootstrap/auth/password_change_done.html b/djadmin2/templates/djadmin2/bootstrap/auth/password_change_done.html
similarity index 92%
rename from djadmin2/templates/admin2/bootstrap/auth/password_change_done.html
rename to djadmin2/templates/djadmin2/bootstrap/auth/password_change_done.html
index 6f1b352..85ecc89 100644
--- a/djadmin2/templates/admin2/bootstrap/auth/password_change_done.html
+++ b/djadmin2/templates/djadmin2/bootstrap/auth/password_change_done.html
@@ -1,4 +1,4 @@
-{% extends "admin2/bootstrap/base.html" %}
+{% extends "djadmin2/bootstrap/base.html" %}
 
 {% load i18n %}
 {% load admin2_tags %}
diff --git a/djadmin2/templates/admin2/bootstrap/auth/password_change_form.html b/djadmin2/templates/djadmin2/bootstrap/auth/password_change_form.html
similarity index 96%
rename from djadmin2/templates/admin2/bootstrap/auth/password_change_form.html
rename to djadmin2/templates/djadmin2/bootstrap/auth/password_change_form.html
index 18d6408..ae06ac0 100644
--- a/djadmin2/templates/admin2/bootstrap/auth/password_change_form.html
+++ b/djadmin2/templates/djadmin2/bootstrap/auth/password_change_form.html
@@ -1,4 +1,4 @@
-{% extends "admin2/bootstrap/base.html" %}
+{% extends "djadmin2/bootstrap/base.html" %}
 
 {% load i18n %}
 {% load admin2_tags %}
diff --git a/djadmin2/templates/admin2/bootstrap/base.html b/djadmin2/templates/djadmin2/bootstrap/base.html
similarity index 100%
rename from djadmin2/templates/admin2/bootstrap/base.html
rename to djadmin2/templates/djadmin2/bootstrap/base.html
diff --git a/djadmin2/templates/admin2/bootstrap/includes/app_model_list.html b/djadmin2/templates/djadmin2/bootstrap/includes/app_model_list.html
similarity index 100%
rename from djadmin2/templates/admin2/bootstrap/includes/app_model_list.html
rename to djadmin2/templates/djadmin2/bootstrap/includes/app_model_list.html
diff --git a/djadmin2/templates/admin2/bootstrap/index.html b/djadmin2/templates/djadmin2/bootstrap/index.html
similarity index 89%
rename from djadmin2/templates/admin2/bootstrap/index.html
rename to djadmin2/templates/djadmin2/bootstrap/index.html
index 11eb551..fc78ac6 100644
--- a/djadmin2/templates/admin2/bootstrap/index.html
+++ b/djadmin2/templates/djadmin2/bootstrap/index.html
@@ -1,4 +1,4 @@
-{% extends "admin2/bootstrap/base.html" %}
+{% extends "djadmin2/bootstrap/base.html" %}
 {% load admin2_tags i18n %}
 
 {% block content %}
diff --git a/djadmin2/templates/admin2/bootstrap/model_confirm_delete.html b/djadmin2/templates/djadmin2/bootstrap/model_confirm_delete.html
similarity index 96%
rename from djadmin2/templates/admin2/bootstrap/model_confirm_delete.html
rename to djadmin2/templates/djadmin2/bootstrap/model_confirm_delete.html
index 8f35b96..76a58e7 100644
--- a/djadmin2/templates/admin2/bootstrap/model_confirm_delete.html
+++ b/djadmin2/templates/djadmin2/bootstrap/model_confirm_delete.html
@@ -1,4 +1,4 @@
-{% extends "admin2/bootstrap/base.html" %}
+{% extends "djadmin2/bootstrap/base.html" %}
 {% load admin2_tags i18n %}
 
 {% block title %}{% trans "Are you sure?" %}{% endblock title %}
diff --git a/djadmin2/templates/admin2/bootstrap/model_detail.html b/djadmin2/templates/djadmin2/bootstrap/model_detail.html
similarity index 93%
rename from djadmin2/templates/admin2/bootstrap/model_detail.html
rename to djadmin2/templates/djadmin2/bootstrap/model_detail.html
index f44e9da..8434f47 100644
--- a/djadmin2/templates/admin2/bootstrap/model_detail.html
+++ b/djadmin2/templates/djadmin2/bootstrap/model_detail.html
@@ -1,4 +1,4 @@
-{% extends "admin2/bootstrap/base.html" %}
+{% extends "djadmin2/bootstrap/base.html" %}
 
 {% load admin2_tags i18n %}
 
diff --git a/djadmin2/templates/admin2/bootstrap/model_list.html b/djadmin2/templates/djadmin2/bootstrap/model_list.html
similarity index 98%
rename from djadmin2/templates/admin2/bootstrap/model_list.html
rename to djadmin2/templates/djadmin2/bootstrap/model_list.html
index d5c521a..8607e15 100644
--- a/djadmin2/templates/admin2/bootstrap/model_list.html
+++ b/djadmin2/templates/djadmin2/bootstrap/model_list.html
@@ -1,4 +1,4 @@
-{% extends "admin2/bootstrap/base.html" %}
+{% extends "djadmin2/bootstrap/base.html" %}
 {% load admin2_tags i18n %}
 
 {% block title %}{% blocktrans with model_name=model_name %}Select {{ model_name }} to change{% endblocktrans %}{% endblock title %}
diff --git a/djadmin2/templates/admin2/bootstrap/model_update_form.html b/djadmin2/templates/djadmin2/bootstrap/model_update_form.html
similarity index 98%
rename from djadmin2/templates/admin2/bootstrap/model_update_form.html
rename to djadmin2/templates/djadmin2/bootstrap/model_update_form.html
index d5b5825..52c7f7f 100644
--- a/djadmin2/templates/admin2/bootstrap/model_update_form.html
+++ b/djadmin2/templates/djadmin2/bootstrap/model_update_form.html
@@ -1,4 +1,4 @@
-{% extends "admin2/bootstrap/base.html" %}
+{% extends "djadmin2/bootstrap/base.html" %}
 
 {% load admin2_tags i18n %}
 
diff --git a/example/blog/templates/admin2/bootstrap/actions/publish_selected_items.html b/example/blog/templates/admin2/bootstrap/actions/publish_selected_items.html
index 988e435..9cf329d 100644
--- a/example/blog/templates/admin2/bootstrap/actions/publish_selected_items.html
+++ b/example/blog/templates/admin2/bootstrap/actions/publish_selected_items.html
@@ -1,4 +1,4 @@
-{% extends "admin2/bootstrap/base.html" %}
+{% extends "djadmin2/bootstrap/base.html" %}
 {% load admin2_tags i18n %}
 
 {% block title %}Are you sure?{% endblock title %}
diff --git a/example/example/settings.py b/example/example/settings.py
index 3a05928..8dfb0e9 100644
--- a/example/example/settings.py
+++ b/example/example/settings.py
@@ -162,7 +162,7 @@ LOGGING = {
 }
 
 
-ADMIN2_THEME_DIRECTORY = "admin2/bootstrap/"
+ADMIN2_THEME_DIRECTORY = "djadmin2/bootstrap/"
 
 
 ########## TOOLBAR CONFIGURATION
diff --git a/example2/example2/settings.py b/example2/example2/settings.py
index 48859d2..bb1df97 100644
--- a/example2/example2/settings.py
+++ b/example2/example2/settings.py
@@ -163,7 +163,7 @@ LOGGING = {
 }
 
 
-ADMIN2_THEME_DIRECTORY = "admin2/bootstrap/"
+ADMIN2_THEME_DIRECTORY = "djadmin2/bootstrap/"
 
 ########## TOOLBAR CONFIGURATION
 # See: https://github.com/django-debug-toolbar/django-debug-toolbar#installation
diff --git a/example2/polls/templates/home.html b/example2/polls/templates/home.html
index f00243e..d16e212 100644
--- a/example2/polls/templates/home.html
+++ b/example2/polls/templates/home.html
@@ -1,4 +1,4 @@
-{% extends "admin2/bootstrap/base.html" %}
+{% extends "djadmin2/bootstrap/base.html" %}
 
 {% block content %}
 <h1>Example Home</h1>