diff --git a/cms/djangoapps/contentstore/config/waffle.py b/cms/djangoapps/contentstore/config/waffle.py
index d63db9f519..a4bfc68cf4 100644
--- a/cms/djangoapps/contentstore/config/waffle.py
+++ b/cms/djangoapps/contentstore/config/waffle.py
@@ -52,7 +52,7 @@ SHOW_REVIEW_RULES_FLAG = CourseWaffleFlag(
 # .. toggle_description: Toggles the new micro-frontend-based implementation of the library authoring experience.
 # .. toggle_use_cases: incremental_release, open_edx
 # .. toggle_creation_date: 2020-08-03
-# .. toggle_expiration_date: 2020-12-31
+# .. toggle_target_removal_date: 2020-12-31
 # .. toggle_warnings: Also set settings.LIBRARY_AUTHORING_MICROFRONTEND_URL and ENABLE_LIBRARY_AUTHORING_MICROFRONTEND.
 # .. toggle_tickets: https://openedx.atlassian.net/wiki/spaces/COMM/pages/1545011241/BD-14+Blockstore+Powered+Content+Libraries+Taxonomies
 REDIRECT_TO_LIBRARY_AUTHORING_MICROFRONTEND = WaffleFlag(
diff --git a/cms/envs/common.py b/cms/envs/common.py
index 3d64fd8d3d..0db1490c5c 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -341,7 +341,7 @@ FEATURES = {
     #   default because enabling allows a method to bypass password policy.
     # .. toggle_use_cases: open_edx
     # .. toggle_creation_date: 2020-02-21
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_tickets: 'https://github.com/edx/edx-platform/pull/21616'
     # .. toggle_warnings: None
     'ENABLE_CHANGE_USER_PASSWORD_ADMIN': False,
@@ -354,7 +354,7 @@ FEATURES = {
     # .. toggle_description: Set to True to enable team-based ORA submissions.
     # .. toggle_use_cases: incremental_release
     # .. toggle_creation_date: 2020-03-03
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_tickets: https://openedx.atlassian.net/browse/EDUCATOR-4951
     # .. toggle_warnings: None
     'ENABLE_ORA_TEAM_SUBMISSIONS': False,
@@ -367,7 +367,7 @@ FEATURES = {
     #   metadata in staff assessments.
     # .. toggle_use_cases: temporary
     # .. toggle_creation_date: 2020-03-03
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_tickets: https://openedx.atlassian.net/browse/EDUCATOR-4951
     # .. toggle_warnings: None
     'ENABLE_ORA_ALL_FILE_URLS': False,
@@ -379,7 +379,7 @@ FEATURES = {
     #   discoverable. If enabled, will pull file metadata from StudentModule.state for display in staff assessments.
     # .. toggle_use_cases: temporary
     # .. toggle_creation_date: 2020-03-03
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_tickets: https://openedx.atlassian.net/browse/EDUCATOR-4951
     # .. toggle_warnings: None
     'ENABLE_ORA_USER_STATE_UPLOAD_DATA': False,
@@ -394,7 +394,7 @@ FEATURES = {
     #        eg: '2020-09-01'
     # .. toggle_use_cases: incremental_release
     # .. toggle_creation_date: 2020-06-12
-    # .. toggle_expiration_date: 2020-12-01
+    # .. toggle_target_removal_date: 2020-12-01
     # .. toggle_warnings: This can be removed once support is removed for deprecated
     #   course keys.
     # .. toggle_tickets: https://openedx.atlassian.net/browse/DEPR-58
@@ -406,7 +406,7 @@ FEATURES = {
     # .. toggle_description: Set to True to enable the Library Authoring MFE
     # .. toggle_use_cases: incremental_release
     # .. toggle_creation_date: 2020-06-20
-    # .. toggle_expiration_date: 2020-12-31
+    # .. toggle_target_removal_date: 2020-12-31
     # .. toggle_tickets: https://openedx.atlassian.net/wiki/spaces/COMM/pages/1545011241/BD-14+Blockstore+Powered+Content+Libraries+Taxonomies
     # .. toggle_warnings: Also set settings.LIBRARY_AUTHORING_MICROFRONTEND_URL and see
     #   REDIRECT_TO_LIBRARY_AUTHORING_MICROFRONTEND for rollout.
@@ -2263,7 +2263,7 @@ EDXAPP_PARSE_KEYS = {}
 # .. toggle_description: Toggle for removing the deprecated /signin url.
 # .. toggle_use_cases: incremental_release
 # .. toggle_creation_date: 2019-12-02
-# .. toggle_expiration_date: 2020-06-01
+# .. toggle_target_removal_date: 2020-06-01
 # .. toggle_warnings: This url can be removed once it no longer has any real traffic.
 # .. toggle_tickets: ARCH-1253
 DISABLE_DEPRECATED_SIGNIN_URL = False
@@ -2274,7 +2274,7 @@ DISABLE_DEPRECATED_SIGNIN_URL = False
 # .. toggle_description: Toggle for removing the deprecated /signup url.
 # .. toggle_use_cases: incremental_release
 # .. toggle_creation_date: 2019-12-02
-# .. toggle_expiration_date: 2020-06-01
+# .. toggle_target_removal_date: 2020-06-01
 # .. toggle_warnings: This url can be removed once it no longer has any real traffic.
 # .. toggle_tickets: ARCH-1253
 DISABLE_DEPRECATED_SIGNUP_URL = False
diff --git a/doc.rst.j2 b/doc.rst.j2
index f5e00e53fe..787e7d2c52 100644
--- a/doc.rst.j2
+++ b/doc.rst.j2
@@ -16,8 +16,8 @@ These are all of our well-documented feature toggles!
 {% if group.toggle_warnings != 'None' -%}
 * Warnings: {{ group.toggle_warnings }}
 {% endif -%}
-{% if group.toggle_expiration_date != 'None' -%}
-* Expiration date: {{ group.toggle_expiration_date }}
+{% if group.toggle_target_removal_date != 'None' -%}
+* Expiration date: {{ group.toggle_target_removal_date }}
 {% endif -%}
 {% if group.toggle_tickets != 'None' -%}
 * Tickets: {{ group.toggle_tickets }}
diff --git a/lms/djangoapps/bulk_email/models.py b/lms/djangoapps/bulk_email/models.py
index cfa9e17fdd..9191dcd837 100644
--- a/lms/djangoapps/bulk_email/models.py
+++ b/lms/djangoapps/bulk_email/models.py
@@ -488,7 +488,7 @@ class BulkEmailFlag(ConfigurationModel):
     .. toggle_category: bulk email
     .. toggle_use_cases:  open_edx
     .. toggle_creation_date: 2016-05-05
-    .. toggle_expiration_date: None
+    .. toggle_target_removal_date: None
     .. toggle_warnings: None
     .. toggle_tickets: None
     """
diff --git a/lms/djangoapps/course_api/__init__.py b/lms/djangoapps/course_api/__init__.py
index edefafdf96..84f273472b 100644
--- a/lms/djangoapps/course_api/__init__.py
+++ b/lms/djangoapps/course_api/__init__.py
@@ -12,7 +12,7 @@ WAFFLE_SWITCH_NAMESPACE = WaffleSwitchNamespace(name='course_list_api_rate_limit
 #   users, this limit is 10 requests/minute.
 # .. toggle_use_cases: open_edx
 # .. toggle_creation_date: 2018-06-12
-# .. toggle_expiration_date: None
+# .. toggle_target_removal_date: None
 # .. toggle_warnings: None
 # .. toggle_tickets: https://openedx.atlassian.net/browse/LEARNER-5527
 USE_RATE_LIMIT_2_FOR_COURSE_LIST_API = WaffleSwitch(WAFFLE_SWITCH_NAMESPACE, 'rate_limit_2', __name__)
@@ -23,7 +23,7 @@ USE_RATE_LIMIT_2_FOR_COURSE_LIST_API = WaffleSwitch(WAFFLE_SWITCH_NAMESPACE, 'ra
 #   users, this limit is 20 requests/minute.
 # .. toggle_use_cases: open_edx
 # .. toggle_creation_date: 2018-06-12
-# .. toggle_expiration_date: None
+# .. toggle_target_removal_date: None
 # .. toggle_warnings: None
 # .. toggle_tickets: https://openedx.atlassian.net/browse/LEARNER-5527
 USE_RATE_LIMIT_10_FOR_COURSE_LIST_API = WaffleSwitch(WAFFLE_SWITCH_NAMESPACE, 'rate_limit_10', __name__)
diff --git a/lms/djangoapps/course_api/blocks/toggles.py b/lms/djangoapps/course_api/blocks/toggles.py
index 476b7b32d4..09b8ea9934 100644
--- a/lms/djangoapps/course_api/blocks/toggles.py
+++ b/lms/djangoapps/course_api/blocks/toggles.py
@@ -14,7 +14,7 @@ COURSE_BLOCKS_API_NAMESPACE = WaffleFlagNamespace(name=u'course_blocks_api')
 # .. toggle_description: Waffle flag to hide access denial messages in the course blocks.
 # .. toggle_use_cases: incremental_release, open_edx
 # .. toggle_creation_date: ??
-# .. toggle_expiration_date: None
+# .. toggle_target_removal_date: None
 # .. toggle_warnings: None
 # .. toggle_tickets: ??
 HIDE_ACCESS_DENIALS_FLAG = WaffleFlag(
diff --git a/lms/djangoapps/courseware/toggles.py b/lms/djangoapps/courseware/toggles.py
index 7ca6df2b41..1e01c18538 100644
--- a/lms/djangoapps/courseware/toggles.py
+++ b/lms/djangoapps/courseware/toggles.py
@@ -15,7 +15,7 @@ WAFFLE_FLAG_NAMESPACE = WaffleFlagNamespace(name='courseware')
 #   students for a new micro-frontend-based implementation of the courseware page.
 # .. toggle_use_cases: incremental_release, open_edx
 # .. toggle_creation_date: 2020-01-29
-# .. toggle_expiration_date: 2020-12-31
+# .. toggle_target_removal_date: 2020-12-31
 # .. toggle_warnings: Also set settings.LEARNING_MICROFRONTEND_URL and
 #   ENABLE_COURSEWARE_MICROFRONTEND.
 # .. toggle_tickets: TNL-7000
@@ -31,7 +31,7 @@ REDIRECT_TO_COURSEWARE_MICROFRONTEND = ExperimentWaffleFlag(
 #   courseware page.
 # .. toggle_use_cases: incremental_release, open_edx
 # .. toggle_creation_date: 2020-03-09
-# .. toggle_expiration_date: 2020-12-31
+# .. toggle_target_removal_date: 2020-12-31
 # .. toggle_warnings: Also set settings.LEARNING_MICROFRONTEND_URL and
 #   ENABLE_COURSEWARE_MICROFRONTEND.
 # .. toggle_tickets: TNL-6982
diff --git a/lms/djangoapps/discussion/config/settings.py b/lms/djangoapps/discussion/config/settings.py
index 6fa2a241fd..a31af3479f 100644
--- a/lms/djangoapps/discussion/config/settings.py
+++ b/lms/djangoapps/discussion/config/settings.py
@@ -11,7 +11,7 @@ from django.conf import settings
 #   for daily digest. This setting enables deprecation of daily digest.
 # .. toggle_use_cases: open_edx
 # .. toggle_creation_date: 2020-03-09
-# .. toggle_expiration_date: None
+# .. toggle_target_removal_date: None
 # .. toggle_tickets: None
 # .. toggle_warnings: None
 ENABLE_FORUM_DAILY_DIGEST = 'enable_forum_daily_digest'
diff --git a/lms/djangoapps/experiments/utils.py b/lms/djangoapps/experiments/utils.py
index 2928853db2..5528872294 100644
--- a/lms/djangoapps/experiments/utils.py
+++ b/lms/djangoapps/experiments/utils.py
@@ -40,7 +40,7 @@ experiments_namespace = WaffleFlagNamespace(name=u'experiments')
 # .. toggle_description: Toggle for adding the current course's program information to user metadata
 # .. toggle_use_cases: temporary
 # .. toggle_creation_date: 2019-2-25
-# .. toggle_expiration_date: None
+# .. toggle_target_removal_date: None
 # .. toggle_warnings: None
 # .. toggle_tickets: REVEM-63, REVEM-198
 PROGRAM_INFO_FLAG = WaffleFlag(
@@ -55,7 +55,7 @@ PROGRAM_INFO_FLAG = WaffleFlag(
 # .. toggle_description: Toggle for adding info about each course to the dashboard metadata
 # .. toggle_use_cases: temporary
 # .. toggle_creation_date: 2019-3-28
-# .. toggle_expiration_date: None
+# .. toggle_target_removal_date: None
 # .. toggle_warnings: None
 # .. toggle_tickets: REVEM-118
 DASHBOARD_INFO_FLAG = WaffleFlag(experiments_namespace, u'add_dashboard_info', __name__)
@@ -68,7 +68,7 @@ DASHBOARD_INFO_FLAG = WaffleFlag(experiments_namespace, u'add_dashboard_info', _
 # .. toggle_description: Make sure upsell tracking JS works as expected.
 # .. toggle_use_cases: temporary
 # .. toggle_creation_date: 2020-7-7
-# .. toggle_expiration_date: None
+# .. toggle_target_removal_date: None
 # .. toggle_warnings: None
 # .. toggle_tickets: REV-1205
 UPSELL_TRACKING_FLAG = WaffleFlag(
diff --git a/lms/djangoapps/verify_student/toggles.py b/lms/djangoapps/verify_student/toggles.py
index 243351caee..88dd5cf898 100644
--- a/lms/djangoapps/verify_student/toggles.py
+++ b/lms/djangoapps/verify_student/toggles.py
@@ -15,7 +15,7 @@ WAFFLE_FLAG_NAMESPACE = WaffleFlagNamespace(name='verify_student')
 #   implementation for ID verification.
 # .. toggle_use_cases: incremental_release, open_edx
 # .. toggle_creation_date: 2020-06-25
-# .. toggle_expiration_date: n/a
+# .. toggle_target_removal_date: n/a
 # .. toggle_warnings: n/a
 # .. toggle_tickets: PROD-1639
 USE_NEW_EMAIL_TEMPLATES = WaffleFlag(
@@ -36,7 +36,7 @@ def use_new_templates_for_id_verification_emails():
 # .. toggle_description: Supports staged rollout to students for the new IDV flow.
 # .. toggle_use_cases: incremental_release, open_edx
 # .. toggle_creation_date: 2020-07-09
-# .. toggle_expiration_date: n/a
+# .. toggle_target_removal_date: n/a
 # .. toggle_warnings: n/a
 # .. toggle_tickets: MST-318
 REDIRECT_TO_IDV_MICROFRONTEND = WaffleFlag(
diff --git a/lms/envs/common.py b/lms/envs/common.py
index e11deebbe0..dd6b0c9c2a 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -89,7 +89,7 @@ FEATURES = {
     #   by course staff.
     # .. toggle_use_cases: ?
     # .. toggle_creation_date: 2015-09-04
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_warnings: None
     # .. toggle_tickets: https://github.com/edx/edx-platform/pull/2425
     'DISPLAY_DEBUG_INFO_TO_STAFF': True,
@@ -104,7 +104,7 @@ FEATURES = {
     #   date.
     # .. toggle_use_cases: ?
     # .. toggle_creation_date: ?
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_warnings: This will cause ALL courses to be immediately visible.
     # .. toggle_tickets: https://github.com/edx/edx-platform/pull/17913
     ## DO NOT SET TO True IN THIS FILE
@@ -121,7 +121,7 @@ FEATURES = {
     # .. toggle_description: Add PDF and HTML textbook tabs to the courseware.
     # .. toggle_use_cases: ?
     # .. toggle_creation_date: 2014-03-27
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_warnings: None
     # .. toggle_tickets: https://github.com/edx/edx-platform/pull/3064
     'ENABLE_TEXTBOOK': True,
@@ -138,7 +138,7 @@ FEATURES = {
     #   registrations.
     # .. toggle_use_cases: open_edx
     # .. toggle_creation_date: 2014-08-19
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_warnings: It is not recommended to enable this feature if
     #   ENABLE_DISCUSSION_HOME_PANEL is not enabled, since subscribers who receive
     #   digests in that case will only be able to unsubscribe via links embedded in
@@ -155,7 +155,7 @@ FEATURES = {
     # toggle_category: admin
     # toggle_use_cases: open_edx
     # toggle_creation_date: 2017-06-27
-    # toggle_expiration_date: None
+    # toggle_target_removal_date: None
     # toggle_warnings: None
     # toggle_tickets: https://github.com/edx/edx-platform/pull/14729
     # toggle_status: supported
@@ -171,7 +171,7 @@ FEATURES = {
     #   /course/{course_id}/masquerade url.
     # .. toggle_use_cases: ?
     # .. toggle_creation_date: 2013-04-13
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_warnings: None
     # .. toggle_tickets: None
     'ENABLE_MASQUERADE': True,
@@ -184,7 +184,7 @@ FEATURES = {
     #   performant when there are more than 100 courses.
     # .. toggle_use_cases: open_edx
     # .. toggle_creation_date: 2013-12-12
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_warnings: This feature is not supported anymore.
     # .. toggle_tickets: None
     'ENABLE_SYSADMIN_DASHBOARD': False,  # sysadmin dashboard, to see what courses are loaded, to delete & load courses
@@ -198,7 +198,7 @@ FEATURES = {
     #   provider. This is necessary to enable some other features, such as the REST API for the mobile application.
     # .. toggle_use_cases: temporary
     # .. toggle_creation_date: 2014-09-09
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_warnings: None
     'ENABLE_OAUTH2_PROVIDER': False,
 
@@ -210,7 +210,7 @@ FEATURES = {
     #   https://github.com/edx-solutions/jquery-xblock
     # .. toggle_use_cases: ?
     # .. toggle_creation_date: 2014-03-14
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_warnings: None
     # .. toggle_tickets: https://github.com/edx/edx-platform/pull/2968
     'ENABLE_XBLOCK_VIEW_ENDPOINT': False,
@@ -267,7 +267,7 @@ FEATURES = {
     #   allows verified certificates, like courses.edx.org.
     # .. toggle_use_cases: open_edx
     # .. toggle_creation_date: 2019-05-14
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_tickets: https://openedx.atlassian.net/browse/PROD-269
     # .. toggle_warnings: ???
     'DISABLE_HONOR_CERTIFICATES': False,  # Toggle to disable honor certificates
@@ -286,7 +286,7 @@ FEATURES = {
     #   querystring parameters.
     # .. toggle_use_cases: open_edx
     # .. toggle_creation_date: 2018-05-07
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_tickets: https://openedx.atlassian.net/browse/TE-2545
     'RESTRICT_AUTOMATIC_AUTH': True,
 
@@ -297,7 +297,7 @@ FEATURES = {
     # toggle_category: admin
     # toggle_use_cases: open_edx
     # toggle_creation_date: 2018-05-07
-    # toggle_expiration_date: None
+    # toggle_target_removal_date: None
     # toggle_warnings: The login MFE domain name should be listed in LOGIN_REDIRECT_WHITELIST.
     # toggle_status: supported
     'ENABLE_LOGIN_MICROFRONTEND': False,
@@ -309,7 +309,7 @@ FEATURES = {
     #   Beware, as this leaves the door open to potential spam abuse.
     # toggle_category: admin
     # toggle_use_cases: open_edx
-    # toggle_expiration_date: None
+    # toggle_target_removal_date: None
     # toggle_warnings: The login MFE domain name should be listed in LOGIN_REDIRECT_WHITELIST.
     # toggle_status: supported
     'SKIP_EMAIL_VALIDATION': False,
@@ -330,7 +330,7 @@ FEATURES = {
     #   cosmetic price is used when there is no registration price associated to the course.
     # .. toggle_use_cases: ?
     # .. toggle_creation_date: 2014-10-10
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_warnings: None
     # .. toggle_tickets: https://github.com/edx/edx-platform/pull/6876
     'ENABLE_COSMETIC_DISPLAY_PRICE': False,
@@ -373,7 +373,7 @@ FEATURES = {
     # toggle_category: admin
     # toggle_use_cases: open_edx
     # toggle_creation_date: 2014-09-15
-    # toggle_expiration_date: None
+    # toggle_target_removal_date: None
     # toggle_status: supported
     # toggle_warnings: None
     'ENABLE_THIRD_PARTY_AUTH': False,
@@ -384,7 +384,7 @@ FEATURES = {
     # .. toggle_description: Toggle to enable alternate urls for marketing links.
     # .. toggle_use_cases: ?
     # .. toggle_creation_date: 2014-03-24
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_warnings: When this is enabled, the MKTG_URLS setting should be defined.
     # .. toggle_tickets: ?
     'ENABLE_MKTG_SITE': False,
@@ -405,7 +405,7 @@ FEATURES = {
     #   by their start dates, latest first.
     # .. toggle_use_cases: ?
     # .. toggle_creation_date: 2015-03-27
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_warnings: None
     # .. toggle_tickets: https://github.com/edx/edx-platform/pull/7548
     'ENABLE_COURSE_SORTING_BY_START_DATE': True,
@@ -418,7 +418,7 @@ FEATURES = {
     #   unified course tab (when the UNIFIED_COURSE_TAB_FLAG waffle is enabled).
     # .. toggle_use_cases: ?
     # .. toggle_creation_date: 2019-01-15
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_warnings: None
     # .. toggle_tickets: https://github.com/edx/edx-platform/pull/19604
     'ENABLE_COURSE_HOME_REDIRECT': True,
@@ -434,7 +434,7 @@ FEATURES = {
     #   specific configuration.
     # .. toggle_use_cases: open_edx
     # .. toggle_creation_date: 2016-06-24
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_tickets: https://openedx.atlassian.net/browse/OSPR-1320
     # .. toggle_warnings: None
     'ENABLE_COMBINED_LOGIN_REGISTRATION_FOOTER': False,
@@ -484,7 +484,7 @@ FEATURES = {
     #   license information to the courseware.
     # .. toggle_use_cases: ?
     # .. toggle_creation_date: 2015-05-14
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_warnings: None
     # .. toggle_tickets: https://github.com/edx/edx-platform/pull/7315
     'LICENSING': False,
@@ -500,7 +500,7 @@ FEATURES = {
     #   navbar.
     # .. toggle_use_cases: ?
     # .. toggle_creation_date: 2015-04-23
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_warnings: The COURSE_DISCOVERY_MEANINGS setting should be properly defined.
     # .. toggle_tickets: https://github.com/edx/edx-platform/pull/7845
     'ENABLE_COURSE_DISCOVERY': False,
@@ -526,7 +526,7 @@ FEATURES = {
     # .. toggle_description: Enable to use special exams, aka timed and proctored exams.
     # .. toggle_use_cases: ?
     # .. toggle_creation_date: 2015-09-04
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_warnings: None
     # .. toggle_tickets: https://github.com/edx/edx-platform/pull/9744
     'ENABLE_SPECIAL_EXAMS': False,
@@ -555,7 +555,7 @@ FEATURES = {
     #   student activities to MySQL, in a separate database.
     # .. toggle_use_cases: ?
     # .. toggle_creation_date: ?
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_warnings: Even though most Open edX instances run with a separate CSMH database, it may not always be
     #   the case. When disabling this feature flag, remember to remove "coursewarehistoryextended" from the
     #   INSTALLED_APPS and the "StudentModuleHistoryExtendedRouter" from the DATABASE_ROUTERS.
@@ -578,7 +578,7 @@ FEATURES = {
     #   the signup page.
     # .. toggle_use_cases: open_edx
     # .. toggle_creation_date: 2017-04-12
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_tickets: https://openedx.atlassian.net/browse/YONK-513
     # .. toggle_warnings: None
     'ALLOW_PUBLIC_ACCOUNT_CREATION': True,
@@ -618,7 +618,7 @@ FEATURES = {
     #   with. This setting can be overridden by a site-specific configuration.
     # .. toggle_use_cases: open_edx
     # .. toggle_creation_date: 2017-07-20
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_tickets: https://openedx.atlassian.net/browse/OSPR-1832
     # .. toggle_warnings: None
     'ENABLE_PASSWORD_RESET_FAILURE_EMAIL': False,
@@ -640,7 +640,7 @@ FEATURES = {
     #   default because enabling allows a method to bypass password policy.
     # .. toggle_use_cases: open_edx
     # .. toggle_creation_date: 2020-02-21
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_tickets: 'https://github.com/edx/edx-platform/pull/21616'
     # .. toggle_warnings: None
     'ENABLE_CHANGE_USER_PASSWORD_ADMIN': False,
@@ -652,7 +652,7 @@ FEATURES = {
     #   REDIRECT_TO_COURSEWARE_MICROFRONTEND for course rollout)
     # .. toggle_use_cases: open_edx
     # .. toggle_creation_date: 2020-03-05
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_tickets: 'https://github.com/edx/edx-platform/pull/23317'
     # .. toggle_warnings: Also set settings.LEARNING_MICROFRONTEND_URL and see REDIRECT_TO_COURSEWARE_MICROFRONTEND for
     #   rollout.
@@ -664,7 +664,7 @@ FEATURES = {
     # .. toggle_description: Supports staged rollout of a new micro-frontend-based implementation of the logistration.
     # .. toggle_use_cases: incremental_release, open_edx
     # .. toggle_creation_date: 2020-09-08
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_tickets: 'https://github.com/edx/edx-platform/pull/24908'
     # .. toggle_warnings: Also set settings.ACCOUNT_MICROFRONTEND_URL and set REDIRECT_TO_ACCOUNT_MICROFRONTEND for rollout.
     'ENABLE_LOGISTRATION_MICROFRONTEND': False,
@@ -677,7 +677,7 @@ FEATURES = {
     # .. toggle_description: Set to True to enable team-based ORA submissions.
     # .. toggle_use_cases: incremental_release
     # .. toggle_creation_date: 2020-03-03
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_tickets: https://openedx.atlassian.net/browse/EDUCATOR-4951
     # .. toggle_warnings: None
     'ENABLE_ORA_TEAM_SUBMISSIONS': False,
@@ -690,7 +690,7 @@ FEATURES = {
     #  file metadata in staff assessments.
     # .. toggle_use_cases: temporary
     # .. toggle_creation_date: 2020-03-03
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_tickets: https://openedx.atlassian.net/browse/EDUCATOR-4951
     # .. toggle_warnings: None
     'ENABLE_ORA_ALL_FILE_URLS': False,
@@ -702,7 +702,7 @@ FEATURES = {
     #   discoverable.  If enabled, will pull file metadata from StudentModule.state for display in staff assessments.
     # .. toggle_use_cases: temporary
     # .. toggle_creation_date: 2020-03-03
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_tickets: https://openedx.atlassian.net/browse/EDUCATOR-4951
     # .. toggle_warnings: None
     'ENABLE_ORA_USER_STATE_UPLOAD_DATA': False,
@@ -714,7 +714,7 @@ FEATURES = {
     #   report.
     # .. toggle_use_cases: incremental_release
     # .. toggle_creation_date: 2020-06-11
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_tickets: https://openedx.atlassian.net/browse/TNL-7273
     # .. toggle_warnings: None
     'ENABLE_ORA_USERNAMES_ON_DATA_EXPORT': False,
diff --git a/openedx/core/djangoapps/user_api/accounts/toggles.py b/openedx/core/djangoapps/user_api/accounts/toggles.py
index eee40ef9c6..3a7a68cacc 100644
--- a/openedx/core/djangoapps/user_api/accounts/toggles.py
+++ b/openedx/core/djangoapps/user_api/accounts/toggles.py
@@ -13,7 +13,7 @@ from openedx.core.djangoapps.waffle_utils import WaffleFlag
 # .. toggle_description: Supports staged rollout of a new micro-frontend-based implementation of the order history page.
 # .. toggle_use_cases: incremental_release, open_edx
 # .. toggle_creation_date: 2019-04-11
-# .. toggle_expiration_date: 2020-12-31
+# .. toggle_target_removal_date: 2020-12-31
 # .. toggle_warnings: Also set settings.ORDER_HISTORY_MICROFRONTEND_URL and site's
 #   ENABLE_ORDER_HISTORY_MICROFRONTEND.
 # .. toggle_tickets: DEPR-17
@@ -33,7 +33,7 @@ def should_redirect_to_order_history_microfrontend():
 # .. toggle_description: Supports staged rollout of a new micro-frontend-based implementation of the account page.
 # .. toggle_use_cases: incremental_release, open_edx
 # .. toggle_creation_date: 2019-04-30
-# .. toggle_expiration_date: 2020-12-31
+# .. toggle_target_removal_date: 2020-12-31
 # .. toggle_warnings: Also set settings.ACCOUNT_MICROFRONTEND_URL and site's ENABLE_ACCOUNT_MICROFRONTEND.
 # .. toggle_tickets: DEPR-17
 REDIRECT_TO_ACCOUNT_MICROFRONTEND = WaffleFlag('account', 'redirect_to_microfrontend', __name__)
diff --git a/openedx/core/djangoapps/user_authn/config/waffle.py b/openedx/core/djangoapps/user_authn/config/waffle.py
index 22d813e745..a0db91887d 100644
--- a/openedx/core/djangoapps/user_authn/config/waffle.py
+++ b/openedx/core/djangoapps/user_authn/config/waffle.py
@@ -15,7 +15,7 @@ _WAFFLE_SWITCH_NAMESPACE = WaffleSwitchNamespace(name=_WAFFLE_NAMESPACE, log_pre
 #   ins to the Django admin dashboard at "/admin".
 # .. toggle_use_cases: incremental_release
 # .. toggle_creation_date: 2019-11-20
-# .. toggle_expiration_date: 2020-01-31
+# .. toggle_target_removal_date: 2020-01-31
 # .. toggle_warnings: Requires THIRD_PARTY_AUTH_ONLY_DOMAIN to also be set.
 # .. toggle_tickets: ENT-2461
 ENABLE_LOGIN_USING_THIRDPARTY_AUTH_ONLY = WaffleSwitch(
diff --git a/openedx/core/djangoapps/user_authn/views/register.py b/openedx/core/djangoapps/user_authn/views/register.py
index 3b6703e104..964d9eb6a7 100644
--- a/openedx/core/djangoapps/user_authn/views/register.py
+++ b/openedx/core/djangoapps/user_authn/views/register.py
@@ -102,7 +102,7 @@ REGISTER_USER = Signal(providing_args=["user", "registration"])
 # .. toggle_description: Enable verbose logging of registration failure messages
 # .. toggle_use_cases: temporary
 # .. toggle_creation_date: 2020-04-30
-# .. toggle_expiration_date: 2020-06-01
+# .. toggle_target_removal_date: 2020-06-01
 # .. toggle_warnings: None
 # .. toggle_tickets: None
 REGISTRATION_FAILURE_LOGGING_FLAG = WaffleFlag(
diff --git a/openedx/core/djangoapps/video_config/models.py b/openedx/core/djangoapps/video_config/models.py
index 4eb29492c7..8e85477d26 100644
--- a/openedx/core/djangoapps/video_config/models.py
+++ b/openedx/core/djangoapps/video_config/models.py
@@ -32,7 +32,7 @@ class HLSPlaybackEnabledFlag(ConfigurationModel):
     .. toggle_category: video_config
     .. toggle_use_cases:  open_edx
     .. toggle_creation_date: 2017-04-19
-    .. toggle_expiration_date: None
+    .. toggle_target_removal_date: None
     .. toggle_warnings: None
     .. toggle_tickets: https://github.com/edx/edx-platform/pull/14924
     """
@@ -86,7 +86,7 @@ class CourseHLSPlaybackEnabledFlag(ConfigurationModel):
     .. toggle_category: video_config
     .. toggle_use_cases:  open_edx
     .. toggle_creation_date: 2017-04-19
-    .. toggle_expiration_date: None
+    .. toggle_target_removal_date: None
     .. toggle_warnings: None
     .. toggle_tickets: https://github.com/edx/edx-platform/pull/14924
     """
diff --git a/openedx/core/djangoapps/video_pipeline/config/waffle.py b/openedx/core/djangoapps/video_pipeline/config/waffle.py
index 56eff4f8c6..ced4ed4ae3 100644
--- a/openedx/core/djangoapps/video_pipeline/config/waffle.py
+++ b/openedx/core/djangoapps/video_pipeline/config/waffle.py
@@ -15,7 +15,7 @@ WAFFLE_NAMESPACE = 'videos'
 #   enabled, videos are no longer uploaded to YouTube as part of the video pipeline.
 # .. toggle_use_cases: open_edx
 # .. toggle_creation_date: 2018-08-03
-# .. toggle_expiration_date: None
+# .. toggle_target_removal_date: None
 # .. toggle_warnings: None
 # .. toggle_tickets: https://github.com/edx/edx-platform/pull/18765
 DEPRECATE_YOUTUBE = 'deprecate_youtube'
@@ -27,7 +27,7 @@ DEPRECATE_YOUTUBE = 'deprecate_youtube'
 #   development (probably?).
 # .. toggle_use_cases: open_edx
 # .. toggle_creation_date: 2020-03-12
-# .. toggle_expiration_date: None
+# .. toggle_target_removal_date: None
 # .. toggle_warnings: Enabling this feature requires that the ROLE_ARN,
 #   MFA_SERIAL_NUMBER, MFA_TOKEN settings are properly defined.
 # .. toggle_tickets: https://github.com/edx/edx-platform/pull/23375
diff --git a/openedx/core/djangoapps/video_pipeline/models.py b/openedx/core/djangoapps/video_pipeline/models.py
index d0b9d50415..095ff97ca1 100644
--- a/openedx/core/djangoapps/video_pipeline/models.py
+++ b/openedx/core/djangoapps/video_pipeline/models.py
@@ -59,7 +59,7 @@ class VEMPipelineIntegration(ConfigurationModel):
     .. toggle_category: video_pipeline
     .. toggle_use_cases:  open_edx
     .. toggle_creation_date: 2020-06-04
-    .. toggle_expiration_date: None
+    .. toggle_target_removal_date: None
     .. toggle_warnings: None
     .. toggle_tickets: https://github.com/edx/edx-platform/pull/24093
     """
@@ -104,7 +104,7 @@ class VideoUploadsEnabledByDefault(ConfigurationModel):
     .. toggle_category: video_pipeline
     .. toggle_use_cases:  open_edx
     .. toggle_creation_date: 2017-11-10
-    .. toggle_expiration_date: None
+    .. toggle_target_removal_date: None
     .. toggle_warnings: None
     .. toggle_tickets: https://github.com/edx/edx-platform/pull/16536
     """
@@ -158,7 +158,7 @@ class CourseVideoUploadsEnabledByDefault(ConfigurationModel):
     .. toggle_category: video_pipeline
     .. toggle_use_cases:  open_edx
     .. toggle_creation_date: 2017-11-10
-    .. toggle_expiration_date: None
+    .. toggle_target_removal_date: None
     .. toggle_warnings: None
     .. toggle_tickets: https://github.com/edx/edx-platform/pull/16536
     """
diff --git a/openedx/core/djangoapps/waffle_utils/__init__.py b/openedx/core/djangoapps/waffle_utils/__init__.py
index 7eb7f20454..6ad26e157f 100644
--- a/openedx/core/djangoapps/waffle_utils/__init__.py
+++ b/openedx/core/djangoapps/waffle_utils/__init__.py
@@ -385,7 +385,7 @@ def _get_waffle_flag_custom_metrics_set():
     #   values of (True, False, or Both).
     # .. toggle_use_cases: opt_in
     # .. toggle_creation_date: 2020-06-17
-    # .. toggle_expiration_date: None
+    # .. toggle_target_removal_date: None
     # .. toggle_tickets: None
     # .. toggle_warnings: Intent is for temporary research (1 day - several weeks) of a flag's usage.
 _WAFFLE_FLAG_CUSTOM_METRICS = 'WAFFLE_FLAG_CUSTOM_METRICS'
diff --git a/openedx/features/course_duration_limits/models.py b/openedx/features/course_duration_limits/models.py
index 66137704b7..448601e39e 100644
--- a/openedx/features/course_duration_limits/models.py
+++ b/openedx/features/course_duration_limits/models.py
@@ -28,7 +28,7 @@ class CourseDurationLimitConfig(StackedConfigurationModel):
     .. toggle_category: ?
     .. toggle_use_cases: ?
     .. toggle_creation_date: 2018-11-02
-    .. toggle_expiration_date: None
+    .. toggle_target_removal_date: None
     .. toggle_warnings: None
     .. toggle_tickets: None
     """
diff --git a/openedx/features/course_experience/__init__.py b/openedx/features/course_experience/__init__.py
index 7159ac4955..b371f81814 100644
--- a/openedx/features/course_experience/__init__.py
+++ b/openedx/features/course_experience/__init__.py
@@ -92,7 +92,7 @@ COURSE_PRE_START_ACCESS_FLAG = WaffleFlag(WAFFLE_FLAG_NAMESPACE, 'pre_start_acce
 # .. toggle_description: Used with our integration with CourseTalk to display reviews for a course.
 # .. toggle_use_cases: temporary
 # .. toggle_creation_date: 2017-06-19
-# .. toggle_expiration_date: ???
+# .. toggle_target_removal_date: ???
 # .. toggle_warnings: We are no longer integrating with CourseTalk, so this probably should be deprecated and the code
 #   for reviews should be removed.
 # .. toggle_tickets: DEPR-48
@@ -105,7 +105,7 @@ SHOW_REVIEWS_TOOL_FLAG = CourseWaffleFlag(WAFFLE_FLAG_NAMESPACE, 'show_reviews_t
 # .. toggle_description: Used to determine whether or not to use course goals for the particular course.
 # .. toggle_use_cases: opt_out, temporary
 # .. toggle_creation_date: 2017-09-11
-# .. toggle_expiration_date: ???
+# .. toggle_target_removal_date: ???
 # .. toggle_warnings: N/A
 # .. toggle_tickets: N/A
 ENABLE_COURSE_GOALS = CourseWaffleFlag(WAFFLE_FLAG_NAMESPACE, 'enable_course_goals', __name__)
@@ -123,7 +123,7 @@ UPGRADE_DEADLINE_MESSAGE = CourseWaffleFlag(WAFFLE_FLAG_NAMESPACE, 'upgrade_dead
 # .. toggle_description: Used to switch between 'welcome message' and 'latest update' on the course home page.
 # .. toggle_use_cases: opt_out
 # .. toggle_creation_date: 2017-09-11
-# .. toggle_expiration_date: ???
+# .. toggle_target_removal_date: ???
 # .. toggle_warnings: This is meant to be configured using waffle_utils course override only. Either do not create the
 #   actual waffle flag, or be sure to unset the flag even for Superusers.
 # .. toggle_tickets: N/A
diff --git a/openedx/features/course_experience/waffle.py b/openedx/features/course_experience/waffle.py
index 6e246a849b..b61f0ec717 100644
--- a/openedx/features/course_experience/waffle.py
+++ b/openedx/features/course_experience/waffle.py
@@ -15,7 +15,7 @@ WAFFLE_NAMESPACE = u'course_experience'
 # .. toggle_description: Used to determine whether to show custom HTML in the sidebar on the internal course about page.
 # .. toggle_use_cases: open_edx
 # .. toggle_creation_date: 2018-01-26
-# .. toggle_expiration_date: ???
+# .. toggle_target_removal_date: ???
 # .. toggle_warnings: N/A
 # .. toggle_tickets: N/A
 ENABLE_COURSE_ABOUT_SIDEBAR_HTML = u'enable_about_sidebar_html'
diff --git a/openedx/features/learner_profile/toggles.py b/openedx/features/learner_profile/toggles.py
index 47341e59b9..b211dcba24 100644
--- a/openedx/features/learner_profile/toggles.py
+++ b/openedx/features/learner_profile/toggles.py
@@ -17,7 +17,7 @@ WAFFLE_FLAG_NAMESPACE = WaffleFlagNamespace(name='learner_profile')
 # .. toggle_description: Supports staged rollout of a new micro-frontend-based implementation of the profile page.
 # .. toggle_use_cases: incremental_release, open_edx
 # .. toggle_creation_date: 2019-02-19
-# .. toggle_expiration_date: 2020-12-31
+# .. toggle_target_removal_date: 2020-12-31
 # .. toggle_warnings: Also set settings.PROFILE_MICROFRONTEND_URL and site's ENABLE_PROFILE_MICROFRONTEND.
 # .. toggle_tickets: DEPR-17
 REDIRECT_TO_PROFILE_MICROFRONTEND = WaffleFlag(WAFFLE_FLAG_NAMESPACE, 'redirect_to_microfrontend', __name__)