diff --git a/cms/djangoapps/contentstore/config/waffle.py b/cms/djangoapps/contentstore/config/waffle.py
index fe33f85fbc..45c6799d02 100644
--- a/cms/djangoapps/contentstore/config/waffle.py
+++ b/cms/djangoapps/contentstore/config/waffle.py
@@ -5,7 +5,7 @@ waffle switches for the contentstore app.
 from openedx.core.djangoapps.waffle_utils import WaffleSwitchNamespace
 
 # Namespace
-WAFFLE_NAMESPACE = u'accessibility'
+WAFFLE_NAMESPACE = u'studio'
 
 # Switches
 ENABLE_ACCESSIBILITY_POLICY_PAGE = u'enable_policy_page'
@@ -13,6 +13,6 @@ ENABLE_ACCESSIBILITY_POLICY_PAGE = u'enable_policy_page'
 
 def waffle():
     """
-    Returns the namespaced, cached, audited Waffle class for Accessibility Accomodation Request Page.
+    Returns the namespaced, cached, audited Waffle class for Studio pages.
     """
-    return WaffleSwitchNamespace(name=WAFFLE_NAMESPACE, log_prefix=u'Accessibility: ')
+    return WaffleSwitchNamespace(name=WAFFLE_NAMESPACE, log_prefix=u'Studio: ')
diff --git a/common/test/db_fixtures/waffle_flags.json b/common/test/db_fixtures/waffle_flags.json
index 414161ce42..a5f1bf005d 100644
--- a/common/test/db_fixtures/waffle_flags.json
+++ b/common/test/db_fixtures/waffle_flags.json
@@ -19,7 +19,7 @@
         "pk": 1,
         "model": "waffle.switch",
         "fields": {
-            "name": "accessibility.enable_policy_page",
+            "name": "studio.enable_policy_page",
             "active": true
         }
     }