Fix component id property.
diff --git a/README.md b/README.md
index 7a18d1f..4d90ebf 100644
--- a/README.md
+++ b/README.md
@@ -43,9 +43,9 @@
 Apache Commons Release Plugin
 ===================
 
-[![Travis-CI Status](https://travis-ci.org/apache/commons-commons-release-plugin.svg)](https://travis-ci.org/apache/commons-commons-release-plugin)
-[![GitHub Actions Status](https://github.com/apache/commons-commons-release-plugin/workflows/Java%20CI/badge.svg)](https://github.com/apache/commons-commons-release-plugin/actions)
-[![Coverage Status](https://coveralls.io/repos/apache/commons-commons-release-plugin/badge.svg)](https://coveralls.io/r/apache/commons-commons-release-plugin)
+[![Travis-CI Status](https://travis-ci.org/apache/commons-release-plugin.svg)](https://travis-ci.org/apache/commons-release-plugin)
+[![GitHub Actions Status](https://github.com/apache/commons-release-plugin/workflows/Java%20CI/badge.svg)](https://github.com/apache/commons-release-plugin/actions)
+[![Coverage Status](https://coveralls.io/repos/apache/commons-release-plugin/badge.svg)](https://coveralls.io/r/apache/commons-release-plugin)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-release-plugin/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-release-plugin/)
 [![Javadocs](https://javadoc.io/badge/org.apache.commons/commons-release-plugin/1.8.0.svg)](https://javadoc.io/doc/org.apache.commons/commons-release-plugin/1.8.0)
 
@@ -54,13 +54,13 @@
 Documentation
 -------------
 
-More information can be found on the [Apache Commons Release Plugin homepage](https://commons.apache.org/proper/commons-commons-release-plugin).
-The [Javadoc](https://commons.apache.org/proper/commons-commons-release-plugin/apidocs) can be browsed.
+More information can be found on the [Apache Commons Release Plugin homepage](https://commons.apache.org/proper/commons-release-plugin).
+The [Javadoc](https://commons.apache.org/proper/commons-release-plugin/apidocs) can be browsed.
 Questions related to the usage of Apache Commons Release Plugin should be posted to the [user mailing list][ml].
 
 Where can I get the latest release?
 -----------------------------------
-You can download source and binaries from our [download page](https://commons.apache.org/proper/commons-commons-release-plugin/download_commons-release-plugin.cgi).
+You can download source and binaries from our [download page](https://commons.apache.org/proper/commons-release-plugin/download_release-plugin.cgi).
 
 Alternatively you can pull it from the central Maven repositories:
 
diff --git a/src/site/xdoc/download_commons-release-plugin.xml b/src/site/xdoc/download_release-plugin.xml
similarity index 75%
rename from src/site/xdoc/download_commons-release-plugin.xml
rename to src/site/xdoc/download_release-plugin.xml
index 2fc7c04..62dfef0 100644
--- a/src/site/xdoc/download_commons-release-plugin.xml
+++ b/src/site/xdoc/download_release-plugin.xml
@@ -117,28 +117,28 @@
       <subsection name="Binaries">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/commons-release-plugin/binaries/commons-release-plugin-1.8.0-bin.tar.gz">commons-release-plugin-1.8.0-bin.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/commons-release-plugin/binaries/commons-release-plugin-1.8.0-bin.tar.gz.sha512">sha512</a></td>
-              <td><a href="https://www.apache.org/dist/commons/commons-release-plugin/binaries/commons-release-plugin-1.8.0-bin.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/release-plugin/binaries/commons-release-plugin-1.8.0-bin.tar.gz">commons-release-plugin-1.8.0-bin.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/release-plugin/binaries/commons-release-plugin-1.8.0-bin.tar.gz.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/release-plugin/binaries/commons-release-plugin-1.8.0-bin.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/commons-release-plugin/binaries/commons-release-plugin-1.8.0-bin.zip">commons-release-plugin-1.8.0-bin.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/commons-release-plugin/binaries/commons-release-plugin-1.8.0-bin.zip.sha512">sha512</a></td>
-              <td><a href="https://www.apache.org/dist/commons/commons-release-plugin/binaries/commons-release-plugin-1.8.0-bin.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/release-plugin/binaries/commons-release-plugin-1.8.0-bin.zip">commons-release-plugin-1.8.0-bin.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/release-plugin/binaries/commons-release-plugin-1.8.0-bin.zip.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/release-plugin/binaries/commons-release-plugin-1.8.0-bin.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
       <subsection name="Source">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/commons-release-plugin/source/commons-release-plugin-1.8.0-src.tar.gz">commons-release-plugin-1.8.0-src.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/commons-release-plugin/source/commons-release-plugin-1.8.0-src.tar.gz.sha512">sha512</a></td>
-              <td><a href="https://www.apache.org/dist/commons/commons-release-plugin/source/commons-release-plugin-1.8.0-src.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/release-plugin/source/commons-release-plugin-1.8.0-src.tar.gz">commons-release-plugin-1.8.0-src.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/release-plugin/source/commons-release-plugin-1.8.0-src.tar.gz.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/release-plugin/source/commons-release-plugin-1.8.0-src.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/commons-release-plugin/source/commons-release-plugin-1.8.0-src.zip">commons-release-plugin-1.8.0-src.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/commons-release-plugin/source/commons-release-plugin-1.8.0-src.zip.sha512">sha512</a></td>
-              <td><a href="https://www.apache.org/dist/commons/commons-release-plugin/source/commons-release-plugin-1.8.0-src.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/release-plugin/source/commons-release-plugin-1.8.0-src.zip">commons-release-plugin-1.8.0-src.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/release-plugin/source/commons-release-plugin-1.8.0-src.zip.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/release-plugin/source/commons-release-plugin-1.8.0-src.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
@@ -148,8 +148,8 @@
           Older releases can be obtained from the archives.
         </p>
         <ul>
-          <li class="download"><a href="[preferred]/commons/commons-release-plugin/">browse download area</a></li>
-          <li><a href="https://archive.apache.org/dist/commons/commons-release-plugin/">archives...</a></li>
+          <li class="download"><a href="[preferred]/commons/release-plugin/">browse download area</a></li>
+          <li><a href="https://archive.apache.org/dist/commons/release-plugin/">archives...</a></li>
         </ul>
     </section>
   </body>
diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml
index 999d412..d37f068 100644
--- a/src/site/xdoc/mail-lists.xml
+++ b/src/site/xdoc/mail-lists.xml
@@ -54,7 +54,7 @@
         the convention in Commons is to prefix the subject line of messages with the component's name,
         for example:
         <ul>
-          <li>[commons-release-plugin] Problem with the ...</li>
+          <li>[release-plugin] Problem with the ...</li>
         </ul>
       </p>
       <p>
@@ -79,7 +79,7 @@
     <section name="Apache Commons Release Plugin Mailing Lists">
       <p>
         <strong>Please prefix the subject line of any messages for <a href="index.html">Apache Commons Release Plugin</a>
-        with <i>[commons-release-plugin]</i></strong> - <i>thanks!</i>
+        with <i>[release-plugin]</i></strong> - <i>thanks!</i>
         <br />
         <br />
       </p>
@@ -104,7 +104,7 @@
           </td>
           <td><a href="mailto:user-subscribe@commons.apache.org">Subscribe</a></td>
           <td><a href="mailto:user-unsubscribe@commons.apache.org">Unsubscribe</a></td>
-          <td><a href="mailto:user@commons.apache.org?subject=[commons-release-plugin]">Post</a></td>
+          <td><a href="mailto:user@commons.apache.org?subject=[release-plugin]">Post</a></td>
           <td><a href="https://mail-archives.apache.org/mod_mbox/commons-user/">mail-archives.apache.org</a><br />
               <a href="https://lists.apache.org/list.html?user@commons.apache.org">lists.apache.org</a>
           </td>
@@ -124,7 +124,7 @@
           </td>
           <td><a href="mailto:dev-subscribe@commons.apache.org">Subscribe</a></td>
           <td><a href="mailto:dev-unsubscribe@commons.apache.org">Unsubscribe</a></td>
-          <td><a href="mailto:dev@commons.apache.org?subject=[commons-release-plugin]">Post</a></td>
+          <td><a href="mailto:dev@commons.apache.org?subject=[release-plugin]">Post</a></td>
           <td><a href="https://mail-archives.apache.org/mod_mbox/commons-dev/">mail-archives.apache.org</a><br />
               <a href="https://lists.apache.org/list.html?dev@commons.apache.org">lists.apache.org</a>
           </td>