diff --git a/CHANGES.rst b/CHANGES.rst
index fc5f8ff..e2c302f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -6,6 +6,8 @@ Changelog
 
 - Change the category of the configlet to 'plone-general' [sneridagh]
 
+- Updated links for the renamed 'Types' control panel [sneridagh]
+
 
 2.4.3 (2015-06-05)
 ------------------
diff --git a/plone/app/discussion/browser/controlpanel.pt b/plone/app/discussion/browser/controlpanel.pt
index 4d84e7e..f050f5a 100644
--- a/plone/app/discussion/browser/controlpanel.pt
+++ b/plone/app/discussion/browser/controlpanel.pt
@@ -11,7 +11,7 @@
      tal:attributes="class view/settings"
      metal:fill-slot="prefs_configlet_content">
 
-    
+
     <div class="portalMessage warning"
         tal:condition="view/mailhost_warning">
         <strong i18n:translate="">
@@ -44,7 +44,7 @@
             <tal:link i18n:name="label_discussion_control_panel_link">
                 <a href=""
                    i18n:translate="text_discussion_type_control_panel_link"
-                   tal:attributes="href string:${portal_url}/@@types-controlpanel?type_id=Discussion Item"
+                   tal:attributes="href string:${portal_url}/@@content-controlpanel?type_id=Discussion Item"
                 >Types control panel</a>
             </tal:link>
             to choose a workflow for the 'Discussion Item' type.
diff --git a/plone/app/discussion/browser/moderation.pt b/plone/app/discussion/browser/moderation.pt
index d5c2065..81a1fca 100644
--- a/plone/app/discussion/browser/moderation.pt
+++ b/plone/app/discussion/browser/moderation.pt
@@ -32,7 +32,7 @@
                 Moderation workflow is disabled. You have to
                 <a i18n:name="enable_comment_workflow"
                    i18n:translate="message_enable_comment_workflow" href=""
-                   tal:attributes="href string:${context/portal_url}/@@types-controlpanel?type_id=Discussion Item">
+                   tal:attributes="href string:${context/portal_url}/@@content-controlpanel?type_id=Discussion Item">
                 enable the 'Comment Review Workflow' for the Comment content
                 type</a> before you can moderate comments here.
             </span>