Rename @@discussion-settings to @@discussion-controlpanel

plone/app/discussion/tests/functional_test_comment_review_workflow.txt

@@ -61,7 +61,7 @@ We need to commit the transaction, otherwise setting the workflow will not work.
 
 Enable anonymous comments
 
-    >>> browser.open(portal_url+'/@@discussion-settings')
+    >>> browser.open(portal_url+'/@@discussion-controlpanel')
     >>> browser.getControl(name='form.widgets.anonymous_comments:list').value = True
     >>> browser.getControl(name='form.buttons.save').click()
 

plone/app/discussion/tests/functional_test_comments.txt

@@ -182,7 +182,7 @@ Enable anonymous comment
     >>> browser.getControl(name='__ac_name').value = 'admin'
     >>> browser.getControl(name='__ac_password').value = 'secret'
     >>> browser.getControl(name='submit').click()
-    >>> browser.open(portal_url+'/@@discussion-settings')
+    >>> browser.open(portal_url+'/@@discussion-controlpanel')
     >>> browser.getControl(name='form.widgets.anonymous_comments:list').value = [True]
     >>> browser.getControl(name='form.buttons.save').click()
     >>> browser.open(portal_url + '/logout')

plone/app/discussion/tests/test_controlpanel.py

@@ -33,7 +33,7 @@ class RegistryTest(unittest.TestCase):
     def test_discussion_controlpanel_view(self):
         view = getMultiAdapter(
             (self.portal, self.portal.REQUEST),
-            name="discussion-settings"
+            name="discussion-controlpanel"
         )
         view = view.__of__(self.portal)
         self.assertTrue(view())