diff --git a/lms/djangoapps/experiments/views_custom.py b/lms/djangoapps/experiments/views_custom.py
index 1ee2b8c30e..70a1fa56ad 100644
--- a/lms/djangoapps/experiments/views_custom.py
+++ b/lms/djangoapps/experiments/views_custom.py
@@ -31,17 +31,17 @@ from student.models import CourseEnrollment
 from track import segment
 
 
-# .. feature_toggle_name: experiments.mobile_upsell_rev934
-# .. feature_toggle_type: flag
-# .. feature_toggle_default: False
-# .. feature_toggle_description: Toggle mobile upsell enabled
-# .. feature_toggle_category: experiments
-# .. feature_toggle_use_cases: monitored_rollout
-# .. feature_toggle_creation_date: 2019-09-05
-# .. feature_toggle_expiration_date: None
-# .. feature_toggle_warnings: None
-# .. feature_toggle_tickets: REV-934
-# .. feature_toggle_status: supported
+# .. toggle_name: experiments.mobile_upsell_rev934
+# .. toggle_type: flag
+# .. toggle_default: False
+# .. toggle_description: Toggle mobile upsell enabled
+# .. toggle_category: experiments
+# .. toggle_use_cases: temporary
+# .. toggle_creation_date: 2019-09-05
+# .. toggle_target_removal_date: None
+# .. toggle_warnings: None
+# .. toggle_tickets: REV-934
+# .. toggle_status: supported
 MOBILE_UPSELL_FLAG = WaffleFlag(
     waffle_namespace=WaffleFlagNamespace(name=u'experiments'),
     flag_name=u'mobile_upsell_rev934',
diff --git a/openedx/core/djangoapps/user_authn/views/register.py b/openedx/core/djangoapps/user_authn/views/register.py
index ecef9e78aa..6cd6eb2db4 100644
--- a/openedx/core/djangoapps/user_authn/views/register.py
+++ b/openedx/core/djangoapps/user_authn/views/register.py
@@ -96,17 +96,17 @@ REGISTRATION_UTM_CREATED_AT = 'registration_utm_created_at'
 REGISTER_USER = Signal(providing_args=["user", "registration"])
 
 
-# .. feature_toggle_name: registration.enable_failure_logging
-# .. feature_toggle_type: flag
-# .. feature_toggle_default: False
-# .. feature_toggle_description: Enable verbose logging of registration failure messages
-# .. feature_toggle_category: registration
-# .. feature_toggle_use_cases: monitored_rollout
-# .. feature_toggle_creation_date: 2020-04-30
-# .. feature_toggle_expiration_date: 2020-06-01
-# .. feature_toggle_warnings: None
-# .. feature_toggle_tickets: None
-# .. feature_toggle_status: supported
+# .. toggle_name: registration.enable_failure_logging
+# .. toggle_type: flag
+# .. toggle_default: False
+# .. toggle_description: Enable verbose logging of registration failure messages
+# .. toggle_category: registration
+# .. toggle_use_cases: monitored_rollout
+# .. toggle_creation_date: 2020-04-30
+# .. toggle_expiration_date: 2020-06-01
+# .. toggle_warnings: None
+# .. toggle_tickets: None
+# .. toggle_status: supported
 REGISTRATION_FAILURE_LOGGING_FLAG = WaffleFlag(
     waffle_namespace=WaffleFlagNamespace(name=u'registration'),
     flag_name=u'enable_failure_logging',
diff --git a/openedx/features/discounts/applicability.py b/openedx/features/discounts/applicability.py
index 610e2cf361..c0fc46775e 100644
--- a/openedx/features/discounts/applicability.py
+++ b/openedx/features/discounts/applicability.py
@@ -26,17 +26,17 @@ from openedx.features.discounts.models import DiscountPercentageConfig, Discount
 from student.models import CourseEnrollment
 from track import segment
 
-# .. feature_toggle_name: discounts.enable_discounting
-# .. feature_toggle_type: flag
-# .. feature_toggle_default: False
-# .. feature_toggle_description: Toggle discounts always being disabled
-# .. feature_toggle_category: discounts
-# .. feature_toggle_use_cases: monitored_rollout
-# .. feature_toggle_creation_date: 2019-4-16
-# .. feature_toggle_expiration_date: None
-# .. feature_toggle_warnings: None
-# .. feature_toggle_tickets: REVEM-282
-# .. feature_toggle_status: supported
+# .. toggle_name: discounts.enable_discounting
+# .. toggle_type: flag
+# .. toggle_default: False
+# .. toggle_description: Toggle discounts always being disabled
+# .. toggle_category: discounts
+# .. toggle_use_cases: temporary
+# .. toggle_creation_date: 2019-4-16
+# .. toggle_target_removal_date: None
+# .. toggle_warnings: None
+# .. toggle_tickets: REVEM-282
+# .. toggle_status: supported
 DISCOUNT_APPLICABILITY_FLAG = WaffleFlag(
     waffle_namespace=WaffleFlagNamespace(name=u'discounts'),
     flag_name=u'enable_discounting',