diff --git a/django_project/db/exampleapp/rest.py b/django_project/db/exampleapp/rest.py
index 8a2c6d2..4530833 100644
--- a/django_project/db/exampleapp/rest.py
+++ b/django_project/db/exampleapp/rest.py
@@ -1,10 +1,10 @@
-from wq.db.rest import app
+from wq.db import rest
 from wq.db.patterns import rest as patterns
 from .models import Example
 
 
-app.router.register_model(
+rest.router.register_model(
     Example,
     serializer=patterns.IdentifiedModelSerializer
 )
-app.router.add_page('index', {'url': ''})
+rest.router.add_page('index', {'url': ''})
diff --git a/django_project/db/project_name/settings.py b/django_project/db/project_name/settings.py
index e113a3a..f959e6e 100644
--- a/django_project/db/project_name/settings.py
+++ b/django_project/db/project_name/settings.py
@@ -55,7 +55,7 @@
 )
 
 # wq: Recommended settings for Django, rest_framework, and social auth
-from wq.db.rest.settings import (
+from wq.db.default_settings import (
     TEMPLATE_LOADERS,
     TEMPLATE_CONTEXT_PROCESSORS,
     SESSION_COOKIE_HTTPONLY,
@@ -64,7 +64,7 @@
 )
 
 # wq: Recommended settings unique to wq.db
-from wq.db.rest.settings import (
+from wq.db.default_settings import (
     ANONYMOUS_PERMISSIONS,
     SRID,
     DEFAULT_AUTH_GROUP,
diff --git a/django_project/db/project_name/urls.py b/django_project/db/project_name/urls.py
index 03843e5..f2db078 100644
--- a/django_project/db/project_name/urls.py
+++ b/django_project/db/project_name/urls.py
@@ -3,11 +3,11 @@
 from django.contrib import admin
 admin.autodiscover()
 
-from wq.db.rest import app
-app.autodiscover()
+from wq.db import rest
+rest.autodiscover()
 
 urlpatterns = patterns('',
     url(r'^admin/', include(admin.site.urls)),
     url(r'', include('social.apps.django_app.urls', namespace='social')),
-    url(r'^', include(app.router.urls))
+    url(r'^', include(rest.router.urls))
 )
diff --git a/django_project/templates/partials/csrf.html b/django_project/templates/partials/csrf.html
index aab9339..f6befef 100644
--- a/django_project/templates/partials/csrf.html
+++ b/django_project/templates/partials/csrf.html
@@ -1 +1 @@
-<input type="hidden" name="csrfmiddlewaretoken" value="{% templatetag openvariable %}csrftoken{% templatetag closevariable %}">
+<input type="hidden" name="csrfmiddlewaretoken" value="{% templatetag openvariable %}csrf_token{% templatetag closevariable %}">