diff --git a/cms/templates/accessibility.html b/cms/templates/accessibility.html
index 07e30120ac..bb7a13f114 100644
--- a/cms/templates/accessibility.html
+++ b/cms/templates/accessibility.html
@@ -3,7 +3,7 @@
 <%def name="online_help_token()"><% return "accessibility" %></%def>
 <%!
   from django.urls import reverse
-  from django.utils.translation import ugettext as _
+  from django.utils.translation import gettext as _
   from openedx.core.djangolib.markup import HTML, Text
   from openedx.core.djangolib.js_utils import js_escaped_string, dump_js_escaped_json
 %>
diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html
index fed7e22c06..44fe759cda 100644
--- a/cms/templates/asset_index.html
+++ b/cms/templates/asset_index.html
@@ -3,7 +3,7 @@
 <%def name="online_help_token()"><% return "files" %></%def>
 <%!
   from django.urls import reverse
-  from django.utils.translation import ugettext as _
+  from django.utils.translation import gettext as _
   from openedx.core.djangolib.markup import HTML, Text
   from openedx.core.djangolib.js_utils import js_escaped_string, dump_js_escaped_json
 %>
diff --git a/cms/templates/certificates.html b/cms/templates/certificates.html
index 8c7853d89d..edf4e45c6c 100644
--- a/cms/templates/certificates.html
+++ b/cms/templates/certificates.html
@@ -4,7 +4,7 @@
 <%namespace name='static' file='static_content.html'/>
 <%!
 from cms.djangoapps.contentstore import utils
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from openedx.core.djangolib.markup import HTML, Text
 from openedx.core.djangolib.js_utils import (
     dump_js_escaped_json, js_escaped_string
diff --git a/cms/templates/checklists.html b/cms/templates/checklists.html
index bfe7fa2908..44d456de26 100644
--- a/cms/templates/checklists.html
+++ b/cms/templates/checklists.html
@@ -7,7 +7,7 @@
   from cms.djangoapps.contentstore import utils
   from cms.djangoapps.contentstore.config.waffle_utils import should_show_checklists_quality
   from django.urls import reverse
-  from django.utils.translation import ugettext as _
+  from django.utils.translation import gettext as _
   from openedx.core.djangolib.markup import HTML, Text
   from openedx.core.djangolib.js_utils import js_escaped_string, dump_js_escaped_json
   from common.djangoapps.util.course import has_certificates_enabled
diff --git a/cms/templates/component.html b/cms/templates/component.html
index ccf3c58225..6ebad77c8f 100644
--- a/cms/templates/component.html
+++ b/cms/templates/component.html
@@ -1,5 +1,5 @@
 <%page expression_filter="h"/>
-<%! from django.utils.translation import ugettext as _ %>
+<%! from django.utils.translation import gettext as _ %>
 <%namespace name='static' file='static_content.html'/>
 
 <div class="wrapper wrapper-component-action-header">
diff --git a/cms/templates/container.html b/cms/templates/container.html
index cbe4b1908c..17de3d20ea 100644
--- a/cms/templates/container.html
+++ b/cms/templates/container.html
@@ -9,7 +9,7 @@ else:
 %>
 </%def>
 <%!
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from cms.djangoapps.contentstore.views.helpers import xblock_studio_url, xblock_type_display_name
 from openedx.core.djangolib.js_utils import (
diff --git a/cms/templates/course-create-rerun.html b/cms/templates/course-create-rerun.html
index b8cdd06e88..12c98f997d 100644
--- a/cms/templates/course-create-rerun.html
+++ b/cms/templates/course-create-rerun.html
@@ -2,7 +2,7 @@
 <%inherit file="base.html" />
 <%def name="online_help_token()"><% return "course_rerun" %></%def>
 <%!
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.urls import reverse
 from openedx.core.djangolib.js_utils import js_escaped_string
 %>
diff --git a/cms/templates/course_info.html b/cms/templates/course_info.html
index d82bdc5c11..1339e66957 100644
--- a/cms/templates/course_info.html
+++ b/cms/templates/course_info.html
@@ -3,7 +3,7 @@
 <%def name="online_help_token()"><% return "updates" %></%def>
 <%namespace name='static' file='static_content.html'/>
 <%!
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from openedx.core.djangolib.js_utils import (
     dump_js_escaped_json, js_escaped_string
 )
diff --git a/cms/templates/course_outline.html b/cms/templates/course_outline.html
index e9f6f3ad54..912948c2ed 100644
--- a/cms/templates/course_outline.html
+++ b/cms/templates/course_outline.html
@@ -8,7 +8,7 @@ from six.moves.urllib.parse import quote
 
 from cms.djangoapps.contentstore.config.waffle_utils import should_show_checklists_quality
 from common.djangoapps.util.date_utils import get_default_time_display
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from openedx.core.djangolib.js_utils import js_escaped_string, dump_js_escaped_json
 from openedx.core.djangolib.markup import HTML, Text
 from django.urls import reverse
diff --git a/cms/templates/edit-tabs.html b/cms/templates/edit-tabs.html
index 472f3fa908..03e5bc6a4d 100644
--- a/cms/templates/edit-tabs.html
+++ b/cms/templates/edit-tabs.html
@@ -3,7 +3,7 @@
 <%def name="online_help_token()"><% return "pages" %></%def>
 <%namespace name='static' file='static_content.html'/>
 <%!
-  from django.utils.translation import ugettext as _
+  from django.utils.translation import gettext as _
   from django.urls import reverse
   from xmodule.tabs import StaticTab
   from openedx.core.djangolib.js_utils import js_escaped_string
diff --git a/cms/templates/error.html b/cms/templates/error.html
index 6fcac47fb0..5d989d6efe 100644
--- a/cms/templates/error.html
+++ b/cms/templates/error.html
@@ -1,7 +1,7 @@
 <%page expression_filter="h"/>
 <%inherit file="base.html" />
 <%!
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.urls import reverse
 from django.conf import settings
 from openedx.core.djangolib.markup import Text
diff --git a/cms/templates/export.html b/cms/templates/export.html
index bbc74c2046..4ee5605cca 100644
--- a/cms/templates/export.html
+++ b/cms/templates/export.html
@@ -11,7 +11,7 @@ else:
 <%namespace name='static' file='static_content.html'/>
 
 <%!
-  from django.utils.translation import ugettext as _
+  from django.utils.translation import gettext as _
   from openedx.core.djangolib.markup import HTML, Text
   from openedx.core.djangolib.js_utils import (
       dump_js_escaped_json, js_escaped_string
diff --git a/cms/templates/export_git.html b/cms/templates/export_git.html
index d18a231862..fe6bd9dd16 100644
--- a/cms/templates/export_git.html
+++ b/cms/templates/export_git.html
@@ -6,7 +6,7 @@
   import six
 
   from django.urls import reverse
-  from django.utils.translation import ugettext as _
+  from django.utils.translation import gettext as _
 %>
 <%block name="title">${_("Export Course to Git")}</%block>
 <%block name="bodyclass">is-signedin course tools view-export-git</%block>
diff --git a/cms/templates/settings.html b/cms/templates/settings.html
index 9655782709..c3ed1afb99 100644
--- a/cms/templates/settings.html
+++ b/cms/templates/settings.html
@@ -6,7 +6,7 @@
 
 <%namespace name='static' file='static_content.html'/>
 <%!
-  from django.utils.translation import ugettext as _
+  from django.utils.translation import gettext as _
   from cms.djangoapps.contentstore import utils
   from lms.djangoapps.certificates.api import can_show_certificate_available_date_field
   from openedx.core.djangolib.js_utils import (
diff --git a/cms/templates/settings_advanced.html b/cms/templates/settings_advanced.html
index 91362eaa5a..14df03e228 100644
--- a/cms/templates/settings_advanced.html
+++ b/cms/templates/settings_advanced.html
@@ -5,7 +5,7 @@
 <%!
   import six
   from six.moves.urllib.parse import quote
-  from django.utils.translation import ugettext as _
+  from django.utils.translation import gettext as _
   from cms.djangoapps.contentstore import utils
   from openedx.core.djangolib.js_utils import (
       dump_js_escaped_json, js_escaped_string
diff --git a/cms/templates/settings_graders.html b/cms/templates/settings_graders.html
index fc55dc7d97..bde1351221 100644
--- a/cms/templates/settings_graders.html
+++ b/cms/templates/settings_graders.html
@@ -10,7 +10,7 @@
   from six.moves.urllib.parse import quote
   import json
   from cms.djangoapps.contentstore import utils
-  from django.utils.translation import ugettext as _
+  from django.utils.translation import gettext as _
   from cms.djangoapps.models.settings.encoder import CourseSettingsEncoder
   from openedx.core.djangolib.js_utils import (
       dump_js_escaped_json, js_escaped_string
diff --git a/cms/templates/studio_xblock_wrapper.html b/cms/templates/studio_xblock_wrapper.html
index b5109324a3..8159f1fa44 100644
--- a/cms/templates/studio_xblock_wrapper.html
+++ b/cms/templates/studio_xblock_wrapper.html
@@ -1,6 +1,6 @@
 <%page expression_filter="h"/>
 <%!
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from cms.djangoapps.contentstore.views.helpers import xblock_studio_url
 from cms.djangoapps.contentstore.utils import is_visible_to_specific_partition_groups
 from lms.lib.utils import is_unit