diff --git a/CHANGES.rst b/CHANGES.rst
index 482a299..437ae9a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,9 @@ Changelog
 2.4.0 (unreleased)
 ------------------
 
+- Rename @@discussion-settings to @@discussion-controlpanel
+  [maartenkling]
+
 - Add permission to allow comment authors to delete their own comments if
   there are no replies yet.
   [gaudenz]
@@ -104,6 +107,7 @@ Changelog
 - Put defaultUser.png instead of old defaultUser.gif
   [bsuttor]
 
+>>>>>>> master
 - Remove bbb directory. bbb was never really implemented.
   [timo]
 
diff --git a/plone/app/discussion/browser/configure.zcml b/plone/app/discussion/browser/configure.zcml
index 7464501..45ca2a0 100644
--- a/plone/app/discussion/browser/configure.zcml
+++ b/plone/app/discussion/browser/configure.zcml
@@ -152,6 +152,13 @@
         />
 
     <!-- Control panel -->
+    <browser:page
+        name="discussion-controlpanel"
+        for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+        class=".controlpanel.DiscussionSettingsControlPanel"
+        permission="cmf.ManagePortal"
+        />
+    <!-- Deprecated controlpanel url -->
     <browser:page
         name="discussion-settings"
         for="Products.CMFPlone.interfaces.IPloneSiteRoot"
diff --git a/plone/app/discussion/browser/controlpanel.py b/plone/app/discussion/browser/controlpanel.py
index 5cdbea7..9ad0bca 100644
--- a/plone/app/discussion/browser/controlpanel.py
+++ b/plone/app/discussion/browser/controlpanel.py
@@ -88,7 +88,7 @@ class DiscussionSettingsEditForm(controlpanel.RegistryEditForm):
         self.applyChanges(data)
         IStatusMessage(self.request).addStatusMessage(_(u"Changes saved"),
                                                       "info")
-        self.context.REQUEST.RESPONSE.redirect("@@discussion-settings")
+        self.context.REQUEST.RESPONSE.redirect("@@discussion-controlpanel")
 
     @button.buttonAndHandler(_('Cancel'), name='cancel')
     def handleCancel(self, action):
diff --git a/plone/app/discussion/browser/stylesheets/discussion.css b/plone/app/discussion/browser/stylesheets/discussion.css
index 3857836..641c8a5 100644
--- a/plone/app/discussion/browser/stylesheets/discussion.css
+++ b/plone/app/discussion/browser/stylesheets/discussion.css
@@ -178,6 +178,7 @@
 /* Discussion Control Panel
    -------------------------------------------------------------------------- */
 
+.template-discussion-controlpanel .unclickable,
 .template-discussion-settings .unclickable {
     opacity: 0.6;
     filter: alpha(opacity = 50);
@@ -228,4 +229,4 @@
 
 .overlay-edit-comment textarea {
     height: 10em;
-}
\ No newline at end of file
+}
diff --git a/plone/app/discussion/profiles/default/controlpanel.xml b/plone/app/discussion/profiles/default/controlpanel.xml
index b0e5b17..f06f000 100644
--- a/plone/app/discussion/profiles/default/controlpanel.xml
+++ b/plone/app/discussion/profiles/default/controlpanel.xml
@@ -12,10 +12,10 @@
         category="Plone"
         condition_expr=""
         icon_expr="string:${portal_url}/discussionitem_icon.png"
-        url_expr="string:${portal_url}/@@discussion-settings"
+        url_expr="string:${portal_url}/@@discussion-controlpanel"
         visible="True"
         i18n:attributes="title">
             <permission>Manage portal</permission>
     </configlet>
 
-</object>
\ No newline at end of file
+</object>
diff --git a/plone/app/discussion/tests/functional_test_comment_review_workflow.txt b/plone/app/discussion/tests/functional_test_comment_review_workflow.txt
index 069875e..7cc743c 100644
--- a/plone/app/discussion/tests/functional_test_comment_review_workflow.txt
+++ b/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()
 
diff --git a/plone/app/discussion/tests/functional_test_comments.txt b/plone/app/discussion/tests/functional_test_comments.txt
index 9712635..82c2051 100644
--- a/plone/app/discussion/tests/functional_test_comments.txt
+++ b/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')
diff --git a/plone/app/discussion/tests/test_controlpanel.py b/plone/app/discussion/tests/test_controlpanel.py
index d672167..b2ded5b 100644
--- a/plone/app/discussion/tests/test_controlpanel.py
+++ b/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())