diff --git a/app.py b/app.py
index 1710069ca..2b856fa3f 100644
--- a/app.py
+++ b/app.py
@@ -1,5 +1,5 @@
 import os
-from flask.ext.script import Manager, Server
+from flask_script import Manager, Server
 from app import create_app
 
 
diff --git a/app/__init__.py b/app/__init__.py
index fe77d1b9d..9ff29af79 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -22,7 +22,7 @@ from flask import (
 from flask._compat import string_types
 from flask.globals import _lookup_req_object, _request_ctx_stack
 from flask_login import LoginManager
-from flask_wtf import CsrfProtect
+from flask_wtf import CSRFProtect
 from flask_wtf.csrf import CSRFError
 from functools import partial
 
@@ -59,7 +59,7 @@ from app.utils import get_cdn_domain
 from app.utils import gmt_timezones
 
 login_manager = LoginManager()
-csrf = CsrfProtect()
+csrf = CSRFProtect()
 
 service_api_client = ServiceAPIClient()
 user_api_client = UserApiClient()