diff --git a/apps/browse/templates/browse/themes.html b/apps/browse/templates/browse/themes.html
index 7f06a2d9d2..68c698a7df 100644
--- a/apps/browse/templates/browse/themes.html
+++ b/apps/browse/templates/browse/themes.html
@@ -3,10 +3,10 @@
 {% block primary %}
 <section class="primary">
   {% if category %}
-    {{ impala_breadcrumbs([(url('browse.themes'), _('Full Themes')),
+    {{ impala_breadcrumbs([(url('browse.themes'), _('Complete Themes')),
                            (None, title)]) }}
   {% else %}
-    {{ impala_breadcrumbs([(None, _('Full Themes'))]) }}
+    {{ impala_breadcrumbs([(None, _('Complete Themes'))]) }}
   {% endif %}
     <h1>{{ title }}</h1>
     <div id="themes-listing" class="island listing hero c">
diff --git a/apps/constants/base.py b/apps/constants/base.py
index e74022a745..0acaba49a9 100644
--- a/apps/constants/base.py
+++ b/apps/constants/base.py
@@ -434,13 +434,13 @@ REVIEWED_CHOICES = {
     REVIEWED_LP_FULL: _('Full Language Pack Review'),
     REVIEWED_LP_PRELIM: _('Preliminary Language Pack Review'),
     REVIEWED_LP_UPDATE: _('Updated Language Pack Review'),
-    REVIEWED_PERSONA: _('Persona Review'),
+    REVIEWED_PERSONA: _('Theme Review'),
     REVIEWED_SEARCH_FULL: _('Full Search Provider Review'),
     REVIEWED_SEARCH_PRELIM: _('Preliminary Search Provider Review'),
     REVIEWED_SEARCH_UPDATE: _('Updated Search Provider Review'),
-    REVIEWED_THEME_FULL: _('Full Theme Review'),
-    REVIEWED_THEME_PRELIM: _('Preliminary Theme Review'),
-    REVIEWED_THEME_UPDATE: _('Updated Theme Review'),
+    REVIEWED_THEME_FULL: _('Complete Theme Review'),
+    REVIEWED_THEME_PRELIM: _('Preliminary Complete Theme Review'),
+    REVIEWED_THEME_UPDATE: _('Updated Complete Theme Review'),
     REVIEWED_WEBAPP_HOSTED: _('Web App Review'),
     REVIEWED_WEBAPP_PACKAGED: _('Packaged App Review'),
     REVIEWED_WEBAPP_REREVIEW: _('Web App Re-review'),
diff --git a/apps/pages/templates/pages/faq.html b/apps/pages/templates/pages/faq.html
index 2aa6e27e91..5f22a6dfc0 100644
--- a/apps/pages/templates/pages/faq.html
+++ b/apps/pages/templates/pages/faq.html
@@ -91,7 +91,7 @@
         button provided. Add-ons can be managed, disabled, or uninstalled from
         the Add-ons Manager in {{ app_name }}. For more detailed instructions,
         read <a href="{{ extension_url }}">this article on extensions</a> or
-        <a href="{{ theme_url }}">this one for Themes and Full Themes</a>. If you
+        <a href="{{ theme_url }}">this one for Themes and Complete Themes</a>. If you
         have difficulty installing add-ons, see
         <a href="{{ troubleshooting_url }}">Troubleshooting Extensions and
         Themes</a>.{% endtrans %}</dd>
diff --git a/templates/menu_links.html b/templates/menu_links.html
index 5ed222ab36..1a8e9a2c5a 100644
--- a/templates/menu_links.html
+++ b/templates/menu_links.html
@@ -7,7 +7,6 @@
       <li><a href="https://addons.mozilla.org/firefox/featured/">{{ _('Featured Add-ons') }}</a></li>
       <li><a href="https://addons.mozilla.org/firefox/extensions/">{{ _('Extensions') }}</a></li>
       <li><a href="https://addons.mozilla.org/firefox/themes/">{{ _('Themes') }}</a></li>
-      <li><a href="https://addons.mozilla.org/firefox/complete-themes/">{{ _('Complete Themes') }}</a></li>
       <li><a href="https://addons.mozilla.org/firefox/search-tools/">{{ _('Search Tools') }}</a></li>
       <li><a href="https://addons.mozilla.org/firefox/language-tools/">{{ _('Language Support') }}</a></li>
       <li><a href="https://addons.mozilla.org/firefox/collections/">{{ _('Collections') }}</a></li>