diff --git a/src/site/xdoc/download_bsf.xml b/src/site/xdoc/download_bsf.xml
index a24b2d3..f5f82f9 100644
--- a/src/site/xdoc/download_bsf.xml
+++ b/src/site/xdoc/download_bsf.xml
@@ -88,69 +88,69 @@
       </form>
 
       <p>
-        The <a href="http://www.apache.org/dist/jakarta/bsf/KEYS">KEYS</a>
+        The <a href="http://www.apache.org/dist/commons/KEYS">KEYS</a>
         link links to the code signing keys used to sign the product.
         The <code>PGP</code> link downloads the OpenPGP compatible signature from our main site. 
         The <code>MD5</code> link downloads the checksum from the main site.
       </p>
     </subsection>
     </section>
-    <section name="Apache Jakarta BSF (Bean Scripting Framework) 2.4.0 ">
+    <section name="Apache Commons BSF (Bean Scripting Framework) 2.4.0 ">
       <subsection name="Binaries">
         <table>
           <tr>
-              <td><a href="[preferred]/jakarta/bsf/binaries/bsf-bin-2.4.0.tar.gz">bsf-bin-2.4.0.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dist/jakarta/bsf/binaries/bsf-bin-2.4.0.tar.gz.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/jakarta/bsf/binaries/bsf-bin-2.4.0.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/bsf/binaries/bsf-bin-2.4.0.tar.gz">bsf-bin-2.4.0.tar.gz</a></td>
+              <td><a href="http://www.apache.org/dist/commons/bsf/binaries/bsf-bin-2.4.0.tar.gz.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/commons/bsf/binaries/bsf-bin-2.4.0.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/jakarta/bsf/binaries/bsf-bin-2.4.0.zip">bsf-bin-2.4.0.zip</a></td>
-              <td><a href="http://www.apache.org/dist/jakarta/bsf/binaries/bsf-bin-2.4.0.zip.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/jakarta/bsf/binaries/bsf-bin-2.4.0.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/bsf/binaries/bsf-bin-2.4.0.zip">bsf-bin-2.4.0.zip</a></td>
+              <td><a href="http://www.apache.org/dist/commons/bsf/binaries/bsf-bin-2.4.0.zip.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/commons/bsf/binaries/bsf-bin-2.4.0.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
       <subsection name="Source">
         <table>
           <tr>
-              <td><a href="[preferred]/jakarta/bsf/source/bsf-src-2.4.0.tar.gz">bsf-src-2.4.0.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dist/jakarta/bsf/source/bsf-src-2.4.0.tar.gz.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/jakarta/bsf/source/bsf-src-2.4.0.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/bsf/source/bsf-src-2.4.0.tar.gz">bsf-src-2.4.0.tar.gz</a></td>
+              <td><a href="http://www.apache.org/dist/commons/bsf/source/bsf-src-2.4.0.tar.gz.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/commons/bsf/source/bsf-src-2.4.0.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/jakarta/bsf/source/bsf-src-2.4.0.zip">bsf-src-2.4.0.zip</a></td>
-              <td><a href="http://www.apache.org/dist/jakarta/bsf/source/bsf-src-2.4.0.zip.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/jakarta/bsf/source/bsf-src-2.4.0.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/bsf/source/bsf-src-2.4.0.zip">bsf-src-2.4.0.zip</a></td>
+              <td><a href="http://www.apache.org/dist/commons/bsf/source/bsf-src-2.4.0.zip.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/commons/bsf/source/bsf-src-2.4.0.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
     </section>
-    <section name="Apache Jakarta BSF (Bean Scripting Framework) 3.1 (Requires Java 1.5 or later)">
+    <section name="Apache Commons BSF (Bean Scripting Framework) 3.1 (Requires Java 1.5 or later)">
       <subsection name="Binaries">
         <table>
           <tr>
-              <td><a href="[preferred]/jakarta/bsf/binaries/bsf-3.1-bin.tar.gz">bsf-3.1-bin.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dist/jakarta/bsf/binaries/bsf-3.1-bin.tar.gz.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/jakarta/bsf/binaries/bsf-3.1-bin.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/bsf/binaries/bsf-3.1-bin.tar.gz">bsf-3.1-bin.tar.gz</a></td>
+              <td><a href="http://www.apache.org/dist/commons/bsf/binaries/bsf-3.1-bin.tar.gz.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/commons/bsf/binaries/bsf-3.1-bin.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/jakarta/bsf/binaries/bsf-3.1-bin.zip">bsf-3.1-bin.zip</a></td>
-              <td><a href="http://www.apache.org/dist/jakarta/bsf/binaries/bsf-3.1-bin.zip.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/jakarta/bsf/binaries/bsf-3.1-bin.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/bsf/binaries/bsf-3.1-bin.zip">bsf-3.1-bin.zip</a></td>
+              <td><a href="http://www.apache.org/dist/commons/bsf/binaries/bsf-3.1-bin.zip.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/commons/bsf/binaries/bsf-3.1-bin.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
       <subsection name="Source">
         <table>
           <tr>
-              <td><a href="[preferred]/jakarta/bsf/source/bsf-3.1-src.tar.gz">bsf-3.1-src.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dist/jakarta/bsf/source/bsf-3.1-src.tar.gz.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/jakarta/bsf/source/bsf-3.1-src.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/bsf/source/bsf-3.1-src.tar.gz">bsf-3.1-src.tar.gz</a></td>
+              <td><a href="http://www.apache.org/dist/commons/bsf/source/bsf-3.1-src.tar.gz.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/commons/bsf/source/bsf-3.1-src.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/jakarta/bsf/source/bsf-3.1-src.zip">bsf-3.1-src.zip</a></td>
-              <td><a href="http://www.apache.org/dist/jakarta/bsf/source/bsf-3.1-src.zip.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/jakarta/bsf/source/bsf-3.1-src.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/bsf/source/bsf-3.1-src.zip">bsf-3.1-src.zip</a></td>
+              <td><a href="http://www.apache.org/dist/commons/bsf/source/bsf-3.1-src.zip.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/commons/bsf/source/bsf-3.1-src.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
@@ -160,8 +160,8 @@
           Older releases can be obtained from the archives.
         </p>
         <ul>
-          <li class="download"><a href="[preferred]/jakarta/bsf/">browse download area</a></li>
-          <li><a href="http://archive.apache.org/dist/jakarta/bsf/">archives...</a></li>
+          <li class="download"><a href="[preferred]/commons/bsf/">browse download area</a></li>
+          <li><a href="http://archive.apache.org/dist/commons/bsf/">archives...</a></li>
         </ul>
     </section>
   </body>