diff --git a/lms/djangoapps/dashboard/sysadmin.py b/lms/djangoapps/dashboard/sysadmin.py
index c66913920a10..042ac4649c00 100644
--- a/lms/djangoapps/dashboard/sysadmin.py
+++ b/lms/djangoapps/dashboard/sysadmin.py
@@ -25,7 +25,7 @@
 from django.views.generic.base import TemplateView
 from django.views.decorators.http import condition
 from django_future.csrf import ensure_csrf_cookie
-from mitxmako.shortcuts import render_to_response
+from edxmako.shortcuts import render_to_response
 import mongoengine
 
 from courseware.courses import get_course_by_id
@@ -159,7 +159,7 @@ def create_user(self, uname, name, password=None):
         email_domain = getattr(settings, 'SSL_AUTH_EMAIL_DOMAIN', 'MIT.EDU')
 
         msg = u''
-        if settings.MITX_FEATURES['AUTH_USE_MIT_CERTIFICATES']:
+        if settings.FEATURES['AUTH_USE_MIT_CERTIFICATES']:
             if not '@' in uname:
                 email = '{0}@{1}'.format(uname, email_domain)
             else:
@@ -201,7 +201,7 @@ def create_user(self, uname, name, password=None):
         profile.name = name
         profile.save()
 
-        if settings.MITX_FEATURES['AUTH_USE_MIT_CERTIFICATES']:
+        if settings.FEATURES['AUTH_USE_MIT_CERTIFICATES']:
             credential_string = getattr(settings, 'SSL_AUTH_DN_FORMAT_STRING',
                                         '/C=US/ST=Massachusetts/O=Massachusetts Institute of Technology/OU=Client CA v1/CN={0}/emailAddress={1}')
             credentials = credential_string.format(name, email)
@@ -271,7 +271,7 @@ def get(self, request):
             'msg': self.msg,
             'djangopid': os.getpid(),
             'modeflag': {'users': 'active-section'},
-            'mitx_version': getattr(settings, 'MITX_VERSION_STRING', ''),
+            'mitx_version': getattr(settings, 'VERSION_STRING', ''),
         }
         return render_to_response(self.template_name, context)
 
@@ -315,7 +315,7 @@ def post(self, request):
             'msg': self.msg,
             'djangopid': os.getpid(),
             'modeflag': {'users': 'active-section'},
-            'mitx_version': getattr(settings, 'MITX_VERSION_STRING', ''),
+            'mitx_version': getattr(settings, 'VERSION_STRING', ''),
         }
         return render_to_response(self.template_name, context)
 
@@ -478,7 +478,7 @@ def get(self, request):
             'msg': self.msg,
             'djangopid': os.getpid(),
             'modeflag': {'courses': 'active-section'},
-            'mitx_version': getattr(settings, 'MITX_VERSION_STRING', ''),
+            'mitx_version': getattr(settings, 'VERSION_STRING', ''),
         }
         return render_to_response(self.template_name, context)
 
@@ -544,7 +544,7 @@ def post(self, request):
             'msg': self.msg,
             'djangopid': os.getpid(),
             'modeflag': {'courses': 'active-section'},
-            'mitx_version': getattr(settings, 'MITX_VERSION_STRING', ''),
+            'mitx_version': getattr(settings, 'VERSION_STRING', ''),
         }
         return render_to_response(self.template_name, context)
 
@@ -583,7 +583,7 @@ def get(self, request):
             'msg': self.msg,
             'djangopid': os.getpid(),
             'modeflag': {'staffing': 'active-section'},
-            'mitx_version': getattr(settings, 'MITX_VERSION_STRING', ''),
+            'mitx_version': getattr(settings, 'VERSION_STRING', ''),
         }
         return render_to_response(self.template_name, context)
 
diff --git a/lms/djangoapps/dashboard/tests/test_sysadmin.py b/lms/djangoapps/dashboard/tests/test_sysadmin.py
index 95bc5bbb997b..171e0f730dae 100644
--- a/lms/djangoapps/dashboard/tests/test_sysadmin.py
+++ b/lms/djangoapps/dashboard/tests/test_sysadmin.py
@@ -33,8 +33,8 @@
     'db': 'test_xlog',
 }
 
-MITX_FEATURES_WITH_SSL_AUTH = settings.MITX_FEATURES.copy()
-MITX_FEATURES_WITH_SSL_AUTH['AUTH_USE_MIT_CERTIFICATES'] = True
+FEATURES_WITH_SSL_AUTH = settings.FEATURES.copy()
+FEATURES_WITH_SSL_AUTH['AUTH_USE_MIT_CERTIFICATES'] = True
 
 
 class SysadminBaseTestCase(ModuleStoreTestCase):
@@ -80,7 +80,7 @@ def _rm_edx4edx(self):
                                  'action': 'del_course', })
 
 
-@unittest.skipUnless(settings.MITX_FEATURES.get('ENABLE_SYSADMIN_DASHBOARD'),
+@unittest.skipUnless(settings.FEATURES.get('ENABLE_SYSADMIN_DASHBOARD'),
                      "ENABLE_SYSADMIN_DASHBOARD not set")
 @override_settings(GIT_IMPORT_WITH_XMLMODULESTORE=True)
 class TestSysadmin(SysadminBaseTestCase):
@@ -180,7 +180,7 @@ def test_user_csv(self):
         User.objects.filter(
             username__startswith='testingman_with_long_name').delete()
 
-    @override_settings(MITX_FEATURES=MITX_FEATURES_WITH_SSL_AUTH)
+    @override_settings(FEATURES=FEATURES_WITH_SSL_AUTH)
     def test_authmap_repair(self):
         """Run authmap check and repair"""
 
@@ -298,7 +298,7 @@ def test_enrollment_page(self):
 
 @override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 @override_settings(MONGODB_LOG=TEST_MONGODB_LOG)
-@unittest.skipUnless(settings.MITX_FEATURES.get('ENABLE_SYSADMIN_DASHBOARD'),
+@unittest.skipUnless(settings.FEATURES.get('ENABLE_SYSADMIN_DASHBOARD'),
                      "ENABLE_SYSADMIN_DASHBOARD not set")
 class TestSysAdminMongoCourseImport(SysadminBaseTestCase):
     """
diff --git a/lms/envs/test.py b/lms/envs/test.py
index 182fbdf0f977..1728c5d18d91 100644
--- a/lms/envs/test.py
+++ b/lms/envs/test.py
@@ -204,7 +204,7 @@
 CC_PROCESSOR['CyberSource']['PURCHASE_ENDPOINT'] = "/shoppingcart/payment_fake"
 
 ########################### SYSADMIN DASHBOARD ################################
-MITX_FEATURES['ENABLE_SYSADMIN_DASHBOARD'] = True
+FEATURES['ENABLE_SYSADMIN_DASHBOARD'] = True
 GIT_REPO_DIR = TEST_ROOT / "course_repos"
 
 ################################# CELERY ######################################
diff --git a/lms/urls.py b/lms/urls.py
index ba11055c10d8..ca154c21c541 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -81,7 +81,7 @@
 )
 
 # sysadmin dashboard, to see what courses are loaded, to delete & load courses
-if settings.MITX_FEATURES["ENABLE_SYSADMIN_DASHBOARD"]:
+if settings.FEATURES["ENABLE_SYSADMIN_DASHBOARD"]:
     urlpatterns += (
         url(r'^sysadmin/', include('dashboard.sysadmin_urls')),
     )