diff --git a/auth/views.py b/auth/views.py
index 56c9cd81debf8700f7974ba7660893bd8c549323..f2f945644fb86c72a51dc0d8bc2ea9a82eb4045e 100644
--- a/auth/views.py
+++ b/auth/views.py
@@ -12,7 +12,7 @@ from django.core.validators import validate_email, validate_slug
 from django.db import connection
 from django.http import HttpResponse
 from django.shortcuts import redirect
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 from models import Registration, UserProfile
 
 log = logging.getLogger("mitx.auth")
diff --git a/circuit/views.py b/circuit/views.py
index c8840484a84d16949f10f9b43ee94b3ab8aca640..96fcc83115a7bfc7f99bd6e950b2368e92b20db3 100644
--- a/circuit/views.py
+++ b/circuit/views.py
@@ -7,7 +7,7 @@ from django.conf import settings
 from django.http import Http404
 from django.http import HttpResponse
 from django.shortcuts import redirect
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 
 from models import ServerCircuit
 
diff --git a/courseware/capa/inputtypes.py b/courseware/capa/inputtypes.py
index c3b59a45372248bf636887004ede22db3570f6a4..c7732014da37ab4c3eb741ef6a9b81ef839bc182 100644
--- a/courseware/capa/inputtypes.py
+++ b/courseware/capa/inputtypes.py
@@ -1,7 +1,7 @@
 from lxml.etree import Element
 from lxml import etree
 
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 
 class textline(object):
     @staticmethod
diff --git a/courseware/module_render.py b/courseware/module_render.py
index 96833cc32dea5accaa26de713f7dfe14204a6a4e..6aa407bf801ce2fdea730c3cdc4f91a552370571 100644
--- a/courseware/module_render.py
+++ b/courseware/module_render.py
@@ -17,7 +17,7 @@ from django.http import HttpResponse
 from django.shortcuts import redirect
 from django.template import Context
 from django.template import Context, loader
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 
 from auth.models import UserProfile
 from models import StudentModule
diff --git a/courseware/modules/capa_module.py b/courseware/modules/capa_module.py
index 8eeeec1f3cdfceba993e00b7509927f7baa0af24..b6c7f1748c7ff33bcb2ed73c155e0ac5a0e21dec 100644
--- a/courseware/modules/capa_module.py
+++ b/courseware/modules/capa_module.py
@@ -16,7 +16,7 @@ from lxml import etree
 
 ## TODO: Abstract out from Django
 from django.conf import settings
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 from django.http import Http404
 
 from x_module import XModule
diff --git a/courseware/modules/html_module.py b/courseware/modules/html_module.py
index 61c903d41c93a8daade41b945ce01e11034de02d..e72fea9dfde7d57158d1127332ebec543097d279 100644
--- a/courseware/modules/html_module.py
+++ b/courseware/modules/html_module.py
@@ -2,7 +2,7 @@ import json
 
 ## TODO: Abstract out from Django
 from django.conf import settings
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 
 from x_module import XModule
 from lxml import etree
diff --git a/courseware/modules/schematic_module.py b/courseware/modules/schematic_module.py
index 9c7d291b92018ee69fc8fc77c2ea63298b83131e..0312321b4d964b588675c20749d4b1d0d5303a6f 100644
--- a/courseware/modules/schematic_module.py
+++ b/courseware/modules/schematic_module.py
@@ -2,7 +2,7 @@ import json
 
 ## TODO: Abstract out from Django
 from django.conf import settings
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 
 from x_module import XModule
 
diff --git a/courseware/modules/seq_module.py b/courseware/modules/seq_module.py
index 2a91b0caa0bb230934956094247fbf563a2e36c4..02c8320ac8049fa4c710c417d5c56a4efdaee230 100644
--- a/courseware/modules/seq_module.py
+++ b/courseware/modules/seq_module.py
@@ -5,7 +5,7 @@ from lxml import etree
 ## TODO: Abstract out from Django
 from django.http import Http404
 from django.conf import settings
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 
 from x_module import XModule
 
diff --git a/courseware/modules/vertical_module.py b/courseware/modules/vertical_module.py
index 5530e2241520d4e8acebfb98eb05413f89572e15..6939c75cc91e6b8dde3f8e16ca8f1ec319ca6df4 100644
--- a/courseware/modules/vertical_module.py
+++ b/courseware/modules/vertical_module.py
@@ -2,7 +2,7 @@ import json
 
 ## TODO: Abstract out from Django
 from django.conf import settings
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 
 from x_module import XModule
 from lxml import etree
diff --git a/courseware/modules/video_module.py b/courseware/modules/video_module.py
index 69a0837403e289926feb567b02215e4799bf92b2..4225f368805d4c25560e594b50e56f3109bef018 100644
--- a/courseware/modules/video_module.py
+++ b/courseware/modules/video_module.py
@@ -5,7 +5,7 @@ from lxml import etree
 
 ## TODO: Abstract out from Django
 from django.conf import settings
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 
 from x_module import XModule
 
diff --git a/courseware/views.py b/courseware/views.py
index 9254da1e1e213bfb67dc7ca1eb8d7f99212fa331..f7035975df6a9ea0f39d97e5fe8e11b90bf733ba 100644
--- a/courseware/views.py
+++ b/courseware/views.py
@@ -12,7 +12,7 @@ from django.contrib.auth.models import User
 from django.http import HttpResponse, Http404
 from django.shortcuts import redirect
 from django.template import Context, loader
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 from django.db import connection
 
 from lxml import etree
diff --git a/settings_new_askbot.py b/settings_new_askbot.py
index aa79e08ea8ec09c8ab9ec30e9dfb7fe4b3c80015..eb168dabd2a8f49016972b7b5c4e3b77525a8302 100644
--- a/settings_new_askbot.py
+++ b/settings_new_askbot.py
@@ -3,6 +3,9 @@ import sys
 
 import djcelery
 
+LIB_URL = '/static/lib/'
+BOOK_URL = '/static/book/'
+
 # Our parent dir (mitx_all) is the BASE_DIR
 BASE_DIR = os.path.abspath(os.path.join(__file__, "..", ".."))
 
@@ -85,7 +88,7 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'track.middleware.TrackMiddleware',
-    'djangomako.middleware.MakoMiddleware',
+    'mitxmako.middleware.MakoMiddleware',
     #'debug_toolbar.middleware.DebugToolbarMiddleware',
 )
 
diff --git a/settings_old_askbot.py b/settings_old_askbot.py
index d7783c05db0a7b59dd0ffd9d1edc8f32dff8b78c..b711440d650d53921b6c04eeffdc1e4ebaeee995 100644
--- a/settings_old_askbot.py
+++ b/settings_old_askbot.py
@@ -81,7 +81,7 @@ MIDDLEWARE_CLASSES = (
    'django.contrib.auth.middleware.AuthenticationMiddleware',
    'django.contrib.messages.middleware.MessageMiddleware',
    'track.middleware.TrackMiddleware',
-   'djangomako.middleware.MakoMiddleware',
+   'mitxmako.middleware.MakoMiddleware',
    #'debug_toolbar.middleware.DebugToolbarMiddleware',
 )
 
diff --git a/simplewiki/mdx_circuit.py b/simplewiki/mdx_circuit.py
index efac721b7ced70978b803a4b61ad1171a2255032..465e7d9a3a5d6e481c729c7d102fe8f2f2a38849 100755
--- a/simplewiki/mdx_circuit.py
+++ b/simplewiki/mdx_circuit.py
@@ -8,7 +8,7 @@ circuit:name becomes the circuit.
 
 import simplewiki.settings as settings
 
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 
 import markdown
 try:
diff --git a/simplewiki/views.py b/simplewiki/views.py
index 16bfc11c4409711c4ae9cfc821d168f83e249eb6..856a45d1c0f3e895ba5d2f62fe2647cc5be6d2e4 100644
--- a/simplewiki/views.py
+++ b/simplewiki/views.py
@@ -15,10 +15,10 @@ from django.template import Context
 from django.template import RequestContext, Context, loader
 from django.utils import simplejson
 from django.utils.translation import ugettext_lazy as _
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 from mako.lookup import TemplateLookup
 from mako.template import Template
-import djangomako.middleware
+import mitxmako.middleware
 
 from models import * # TODO: Clean up
 from settings import *
diff --git a/static_template_view/views.py b/static_template_view/views.py
index 5579e20c86b60baee9aaa760fb8791118e3541d7..734434b43a28faac7db05790800f18a95c268520 100644
--- a/static_template_view/views.py
+++ b/static_template_view/views.py
@@ -3,7 +3,7 @@
 # List of valid templates is explicitly managed for (short-term)
 # security reasons.
 
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 from django.shortcuts import redirect
 from django.core.context_processors import csrf
 
diff --git a/staticbook/views.py b/staticbook/views.py
index bb6e2ada19f17dbb0aea676c663efd689c26ce21..2e5712fc67743e657e55f07becb769fcf88acfa0 100644
--- a/staticbook/views.py
+++ b/staticbook/views.py
@@ -4,7 +4,7 @@ import os
 from django.conf import settings
 from django.http import Http404
 from django.shortcuts import redirect
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 
 def index(request, page=0): 
     if not request.user.is_authenticated():
diff --git a/util/views.py b/util/views.py
index 139906e24a97c9e0c80d22cbaf5688d59e905951..5f0400d14348ada3e0cda6bbfae95c10b628e8db 100644
--- a/util/views.py
+++ b/util/views.py
@@ -10,7 +10,7 @@ from django.core.mail import send_mail
 from django.http import Http404
 from django.http import HttpResponse
 from django.shortcuts import redirect
-from djangomako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response, render_to_string
 
 import courseware.capa.calc
 import track.views