diff --git a/sagenb/flask_version/admin.py b/sagenb/flask_version/admin.py
index b279a7195..680d6fad6 100644
--- a/sagenb/flask_version/admin.py
+++ b/sagenb/flask_version/admin.py
@@ -1,10 +1,10 @@
 import os
-from flask import Module, url_for, render_template, request, session, redirect, g, current_app
+from flask import Blueprint, url_for, render_template, request, session, redirect, g, current_app
 from .decorators import login_required, admin_required, with_lock
 from flask.ext.babel import Babel, gettext, ngettext, lazy_gettext
 _ = gettext
 
-admin = Module('sagenb.flask_version.admin')
+admin = Blueprint('admin', 'sagenb.flask_version.admin')
 
 @admin.route('/users')
 @admin.route('/users/reset/<reset>')
diff --git a/sagenb/flask_version/authentication.py b/sagenb/flask_version/authentication.py
index 4e9775efa..f2f4f738e 100644
--- a/sagenb/flask_version/authentication.py
+++ b/sagenb/flask_version/authentication.py
@@ -1,11 +1,12 @@
 import os
 import random
-from flask import Module, url_for, render_template, request, session, redirect, g, current_app
+from flask import Blueprint, url_for, render_template, request, session, redirect, g, current_app
 from .decorators import with_lock
 from flask.ext.babel import gettext, ngettext, lazy_gettext
 _ = gettext
 
-authentication = Module('sagenb.flask_version.authentication')
+authentication = Blueprint('authentication',
+                           'sagenb.flask_version.authentication')
 
 ##################
 # Authentication #
diff --git a/sagenb/flask_version/base.py b/sagenb/flask_version/base.py
index 6ecb9934f..84fc6df38 100755
--- a/sagenb/flask_version/base.py
+++ b/sagenb/flask_version/base.py
@@ -4,7 +4,7 @@
 import time
 import re
 from functools import partial
-from flask import Flask, Module, url_for, request, session, redirect, g, make_response, current_app, render_template
+from flask import Flask, Blueprint, url_for, request, session, redirect, g, make_response, current_app, render_template
 from .decorators import login_required, guest_or_login_required, with_lock
 from .decorators import global_lock
 # Make flask use the old session foo from <=flask-0.9
@@ -86,7 +86,7 @@ def message(self, msg, cont='/', username=None, **kwds):
         return render_template(os.path.join('html', 'error_message.html'),
                                **template_dict)
 
-base = Module('sagenb.flask_version.base')
+base = Blueprint('base', 'sagenb.flask_version.base')
 
 #############
 # Main Page #
diff --git a/sagenb/flask_version/doc.py b/sagenb/flask_version/doc.py
index 02c9916b2..0895f8a01 100644
--- a/sagenb/flask_version/doc.py
+++ b/sagenb/flask_version/doc.py
@@ -15,13 +15,13 @@
 """
 from __future__ import absolute_import
 import os
-from flask import Module, url_for, render_template, request, session, redirect, g, current_app
+from flask import Blueprint, url_for, render_template, request, session, redirect, g, current_app
 from .decorators import login_required, guest_or_login_required
 
 from flask.ext.babel import gettext, ngettext, lazy_gettext
 _ = gettext
 
-doc = Module('sagenb.flask_version.doc')
+doc = Blueprint('doc', 'sagenb.flask_version.doc')
 
 from sage.env import SAGE_DOC
 DOC = os.path.join(SAGE_DOC, 'html', 'en')
diff --git a/sagenb/flask_version/settings.py b/sagenb/flask_version/settings.py
index 473fd2f03..b482c0944 100644
--- a/sagenb/flask_version/settings.py
+++ b/sagenb/flask_version/settings.py
@@ -1,12 +1,12 @@
 import os
 import random
-from flask import Module, url_for, render_template, request, session, redirect, g, current_app
+from flask import Blueprint, url_for, render_template, request, session, redirect, g, current_app
 from .decorators import login_required, with_lock
 from flask.ext.babel import gettext, ngettext, lazy_gettext
 _ = gettext
 
 
-settings = Module('sagenb.flask_version.settings')
+settings = Blueprint('settings', 'sagenb.flask_version.settings')
 
 @settings.route('/settings', methods = ['GET','POST'])
 @login_required
diff --git a/sagenb/flask_version/worksheet.py b/sagenb/flask_version/worksheet.py
index 72d70d96c..ccc9c5e32 100644
--- a/sagenb/flask_version/worksheet.py
+++ b/sagenb/flask_version/worksheet.py
@@ -4,7 +4,7 @@
 import threading
 import collections
 from functools import wraps
-from flask import Module, make_response, url_for, render_template, request, session, redirect, g, current_app
+from flask import Blueprint, make_response, url_for, render_template, request, session, redirect, g, current_app
 from .decorators import login_required, with_lock
 from collections import defaultdict
 from werkzeug.utils import secure_filename
@@ -14,7 +14,7 @@
 from sagenb.notebook.interact import INTERACT_UPDATE_PREFIX
 from sagenb.notebook.misc import encode_response
 
-ws = Module('sagenb.flask_version.worksheet')
+ws = Blueprint('worksheet', 'sagenb.flask_version.worksheet')
 worksheet_locks = defaultdict(threading.Lock)
 
 def worksheet_view(f):
diff --git a/sagenb/flask_version/worksheet_listing.py b/sagenb/flask_version/worksheet_listing.py
index 5c0b66344..75c71549f 100644
--- a/sagenb/flask_version/worksheet_listing.py
+++ b/sagenb/flask_version/worksheet_listing.py
@@ -3,12 +3,13 @@
 from __future__ import absolute_import
 import os
 import urllib, urlparse
-from flask import Module, url_for, render_template, request, session, redirect, g, current_app
+from flask import Blueprint, url_for, render_template, request, session, redirect, g, current_app
 from .decorators import login_required, guest_or_login_required, with_lock
 from flask.ext.babel import Babel, gettext, ngettext, lazy_gettext
 _ = gettext
 
-worksheet_listing = Module('sagenb.flask_version.worksheet_listing')
+worksheet_listing = Blueprint('worksheet_listing',
+                              'sagenb.flask_version.worksheet_listing')
 
 def render_worksheet_list(args, pub, username):
     """