diff --git a/src/xdocs/index.xml.vm b/src/xdocs/index.xml.vm
index 6c8b75f16..5b4511805 100644
--- a/src/xdocs/index.xml.vm
+++ b/src/xdocs/index.xml.vm
@@ -313,7 +313,7 @@
         <tr>
           <td><a href="https://bitbucket.org/atlassian/bamboo-checkstyle-plugin">Bamboo Checkstyle plug-in</a></td>
           <td>Atlassian (formerly by Ross Rowe and Stephan Paulicke)</td>
-          <td><a href="https://marketplace.atlassian.com/plugins/com.atlassian.bamboo.plugins.bamboo-checkstyle-plugin">Bamboo Checkstyle plug-in Atlassian Marketplace page</a></td>
+          <td><a href="https://marketplace.atlassian.com/archive/com.atlassian.bamboo.plugins.bamboo-checkstyle-plugin">Bamboo Checkstyle plug-in Atlassian Marketplace page</a></td>
           <td>An add-on that will parse and record CheckStyle reports and report your style violations over time.</td>
         </tr>
       </table>
diff --git a/src/xdocs/releasenotes_old.xml b/src/xdocs/releasenotes_old.xml
index c21cbb8a7..1f5ca0364 100644
--- a/src/xdocs/releasenotes_old.xml
+++ b/src/xdocs/releasenotes_old.xml
@@ -489,8 +489,8 @@
         <li><a href="config_coding.html#NoFinalizer">NoFinalizer</a></li>
         <li><a href="config_imports.html#AvoidStaticImport">AvoidStaticImport</a></li>
         <li><a href="config_javadoc.html#JavadocPackage">JavadocPackage</a></li>
-        <li><a href="config_naming.html#Modules">ClassTypeParameterName</a></li>
-        <li><a href="config_naming.html#Modules">MethodTypeParameterName</a></li>
+        <li><a href="config_naming.html#ClassTypeParameterName">ClassTypeParameterName</a></li>
+        <li><a href="config_naming.html#MethodTypeParameterName">MethodTypeParameterName</a></li>
         <li><a href="config_regexp.html#RegexpMultiline">RegexpMultiline</a></li>
         <li><a href="config_regexp.html#RegexpSingleline">RegexpSingleline</a></li>
         <li><a href="config_regexp.html#RegexpSinglelineJava">RegexpSinglelineJava</a></li>
@@ -771,9 +771,9 @@
           Schneeberger for providing patch #1947417.
         </li>
         <li>
-          New checks <a href="config_naming.html#Modules">
+          New checks <a href="config_naming.html#ClassTypeParameterName">
           ClassTypeParameterName</a> and
-          <a href="config_naming.html#Modules">
+          <a href="config_naming.html#MethodTypeParameterName">
           MethodTypeParameterName</a>
           for type name formats. Thanks to Travis Schneeberger for providing
           patch #1956561.