diff --git a/flask_security/__init__.py b/flask_security/__init__.py
index 77e8054..647d1f0 100644
--- a/flask_security/__init__.py
+++ b/flask_security/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """
-    flask.ext.security
-    ~~~~~~~~~~~~~~~~~~
+    flask_security
+    ~~~~~~~~~~~~~~
 
     Flask-Security is a Flask extension that aims to add quick and simple
     security via Flask-Login, Flask-Principal, Flask-WTF, and passlib.
diff --git a/flask_security/changeable.py b/flask_security/changeable.py
index c79f84e..c968f2e 100644
--- a/flask_security/changeable.py
+++ b/flask_security/changeable.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """
-    flask.ext.security.changeable
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    flask_security.changeable
+    ~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Flask-Security recoverable module
 
diff --git a/flask_security/confirmable.py b/flask_security/confirmable.py
index 8d19ae8..aed2d23 100644
--- a/flask_security/confirmable.py
+++ b/flask_security/confirmable.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """
-    flask.ext.security.confirmable
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    flask_security.confirmable
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Flask-Security confirmable module
 
diff --git a/flask_security/core.py b/flask_security/core.py
index fb2a6b6..286d106 100644
--- a/flask_security/core.py
+++ b/flask_security/core.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """
-    flask.ext.security.core
-    ~~~~~~~~~~~~~~~~~~~~~~~
+    flask_security.core
+    ~~~~~~~~~~~~~~~~~~~
 
     Flask-Security core module
 
@@ -10,9 +10,9 @@
 """
 
 from flask import current_app, render_template
-from flask.ext.login import AnonymousUserMixin, UserMixin as BaseUserMixin, \
+from flask_login import AnonymousUserMixin, UserMixin as BaseUserMixin, \
     LoginManager, current_user
-from flask.ext.principal import Principal, RoleNeed, UserNeed, Identity, \
+from flask_principal import Principal, RoleNeed, UserNeed, Identity, \
     identity_loaded
 from itsdangerous import URLSafeTimedSerializer
 from passlib.context import CryptContext
diff --git a/flask_security/datastore.py b/flask_security/datastore.py
index aca5d50..c66a63e 100644
--- a/flask_security/datastore.py
+++ b/flask_security/datastore.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """
-    flask.ext.security.datastore
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    flask_security.datastore
+    ~~~~~~~~~~~~~~~~~~~~~~~~
 
     This module contains an user datastore classes.
 
diff --git a/flask_security/decorators.py b/flask_security/decorators.py
index 3363fc5..a928e04 100644
--- a/flask_security/decorators.py
+++ b/flask_security/decorators.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """
-    flask.ext.security.decorators
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    flask_security.decorators
+    ~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Flask-Security decorators module
 
@@ -13,8 +13,8 @@ from collections import namedtuple
 from functools import wraps
 
 from flask import current_app, Response, request, redirect, _request_ctx_stack
-from flask.ext.login import current_user, login_required  # pragma: no flakes
-from flask.ext.principal import RoleNeed, Permission, Identity, identity_changed
+from flask_login import current_user, login_required  # pragma: no flakes
+from flask_principal import RoleNeed, Permission, Identity, identity_changed
 from werkzeug.local import LocalProxy
 
 from . import utils
diff --git a/flask_security/forms.py b/flask_security/forms.py
index d5f15b9..62bbfda 100644
--- a/flask_security/forms.py
+++ b/flask_security/forms.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """
-    flask.ext.security.forms
-    ~~~~~~~~~~~~~~~~~~~~~~~~
+    flask_security.forms
+    ~~~~~~~~~~~~~~~~~~~~
 
     Flask-Security forms module
 
diff --git a/flask_security/passwordless.py b/flask_security/passwordless.py
index 387b7f2..2d375d8 100644
--- a/flask_security/passwordless.py
+++ b/flask_security/passwordless.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """
-    flask.ext.security.passwordless
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    flask_security.passwordless
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Flask-Security passwordless module
 
diff --git a/flask_security/recoverable.py b/flask_security/recoverable.py
index 1bb6878..12ea264 100644
--- a/flask_security/recoverable.py
+++ b/flask_security/recoverable.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """
-    flask.ext.security.recoverable
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    flask_security.recoverable
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Flask-Security recoverable module
 
diff --git a/flask_security/registerable.py b/flask_security/registerable.py
index e4a7e78..781afed 100644
--- a/flask_security/registerable.py
+++ b/flask_security/registerable.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """
-    flask.ext.security.registerable
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    flask_security.registerable
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Flask-Security registerable module
 
diff --git a/flask_security/script.py b/flask_security/script.py
index a9c8084..27ec3ef 100644
--- a/flask_security/script.py
+++ b/flask_security/script.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """
-    flask.ext.security.script
-    ~~~~~~~~~~~~~~~~~~~~~~~~~
+    flask_security.script
+    ~~~~~~~~~~~~~~~~~~~~~
 
     Flask-Security script module
 
@@ -18,7 +18,7 @@ except ImportError:
 import re
 
 from flask import current_app
-from flask.ext.script import Command, Option
+from flask_script import Command, Option
 from werkzeug.local import LocalProxy
 
 from .utils import encrypt_password
diff --git a/flask_security/signals.py b/flask_security/signals.py
index 532bba9..b5b558e 100644
--- a/flask_security/signals.py
+++ b/flask_security/signals.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """
-    flask.ext.security.signals
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~
+    flask_security.signals
+    ~~~~~~~~~~~~~~~~~~~~~~
 
     Flask-Security signals module
 
diff --git a/flask_security/utils.py b/flask_security/utils.py
index 86bb24a..fa0b17d 100644
--- a/flask_security/utils.py
+++ b/flask_security/utils.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """
-    flask.ext.security.utils
-    ~~~~~~~~~~~~~~~~~~~~~~~~
+    flask_security.utils
+    ~~~~~~~~~~~~~~~~~~~~
 
     Flask-Security utils module
 
@@ -23,9 +23,9 @@ from contextlib import contextmanager
 from datetime import datetime, timedelta
 
 from flask import url_for, flash, current_app, request, session, render_template
-from flask.ext.login import login_user as _login_user, logout_user as _logout_user
-from flask.ext.mail import Message
-from flask.ext.principal import Identity, AnonymousIdentity, identity_changed
+from flask_login import login_user as _login_user, logout_user as _logout_user
+from flask_mail import Message
+from flask_principal import Identity, AnonymousIdentity, identity_changed
 from itsdangerous import BadSignature, SignatureExpired
 from werkzeug.local import LocalProxy
 
diff --git a/flask_security/views.py b/flask_security/views.py
index 0f6d57c..8acb5fd 100644
--- a/flask_security/views.py
+++ b/flask_security/views.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """
-    flask.ext.security.views
-    ~~~~~~~~~~~~~~~~~~~~~~~~
+    flask_security.views
+    ~~~~~~~~~~~~~~~~~~~~
 
     Flask-Security views module