diff --git a/lms/templates/module-error.html b/lms/templates/module-error.html
index 3ea605dc2796837218916920e4c4308ab02316c9..659dbc1c86403574a280709531e7e2e809b5f942 100644
--- a/lms/templates/module-error.html
+++ b/lms/templates/module-error.html
@@ -1,5 +1,5 @@
 <section class="outside-app">
-  <h1>There has been an error on the <em>MITx</em> servers</h1>
+  <h1>There has been an error on the <em>edX</em> servers</h1>
   <p>We're sorry, this module is temporarily unavailable. Our staff is working to fix it as soon as possible. Please email us at <a href="mailto:technical@edx.org">technical@edx.org</a> to report any problems or downtime.</p>
 
 % if staff_access:
diff --git a/lms/templates/static_templates/server-overloaded.html b/lms/templates/static_templates/server-overloaded.html
index a202923fcda8590795af5e92f5fcac316f1c07a7..bbf4550ff4002c775ff937cae19c89f90a5e91a5 100644
--- a/lms/templates/static_templates/server-overloaded.html
+++ b/lms/templates/static_templates/server-overloaded.html
@@ -1,6 +1,6 @@
 <%inherit file="../main.html" />
 
 <section class="outside-app">
-  <h1>Currently the <em>MITx</em> servers are overloaded</h1>
+  <h1>Currently the <em>edX</em> servers are overloaded</h1>
   <p>Our staff is currently working to get the site back up as soon as possible. Please email us at <a href="mailto:technical@edx.org">technical@edx.org</a> to report any problems or downtime.</p>
 </section>