diff --git a/README.md b/README.md
index ae642ce..52a2c36 100644
--- a/README.md
+++ b/README.md
@@ -43,8 +43,8 @@
 Apache Commons VFS Project
 ===================
 
-[![Build Status](https://travis-ci.org/apache/commons-vfs2.svg)](https://travis-ci.org/apache/commons-vfs2)
-[![Coverage Status](https://coveralls.io/repos/apache/commons-vfs2/badge.svg)](https://coveralls.io/r/apache/commons-vfs2)
+[![Build Status](https://travis-ci.org/apache/commons-vfs.svg)](https://travis-ci.org/apache/commons-vfs)
+[![Coverage Status](https://coveralls.io/repos/apache/commons-vfs/badge.svg)](https://coveralls.io/r/apache/commons-vfs)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-vfs2/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-vfs2/)
 [![Javadocs](https://javadoc.io/badge/org.apache.commons/commons-vfs2/2.3.svg)](https://javadoc.io/doc/org.apache.commons/commons-vfs2/2.3)
 
@@ -53,13 +53,13 @@
 Documentation
 -------------
 
-More information can be found on the [Apache Commons VFS Project homepage](https://commons.apache.org/proper/commons-vfs2).
-The [Javadoc](https://commons.apache.org/proper/commons-vfs2/javadocs/api-release) can be browsed.
+More information can be found on the [Apache Commons VFS Project homepage](https://commons.apache.org/proper/commons-vfs).
+The [Javadoc](https://commons.apache.org/proper/commons-vfs/javadocs/api-release) can be browsed.
 Questions related to the usage of Apache Commons VFS Project 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-vfs2/download_vfs2.cgi).
+You can download source and binaries from our [download page](https://commons.apache.org/proper/commons-vfs/download_vfs.cgi).
 
 Alternatively you can pull it from the central Maven repositories:
 
diff --git a/commons-vfs2-distribution/pom.xml b/commons-vfs2-distribution/pom.xml
index 576fec9..36c33b4 100644
--- a/commons-vfs2-distribution/pom.xml
+++ b/commons-vfs2-distribution/pom.xml
@@ -38,6 +38,7 @@
     <!--  dist module contains no code and no checkstyle config -->
     <checkstyle.skip>true</checkstyle.skip>
     <vfs.parent.dir>${basedir}/..</vfs.parent.dir>
+    <commons.release.isDistModule>true</commons.release.isDistModule>
   </properties>
 
   <profiles>
diff --git a/commons-vfs2-examples/src/site/xdoc/index.xml b/commons-vfs2-examples/src/site/xdoc/index.xml
index 55f673a..b3d2abe 100644
--- a/commons-vfs2-examples/src/site/xdoc/index.xml
+++ b/commons-vfs2-examples/src/site/xdoc/index.xml
@@ -72,9 +72,9 @@
 LIB=$LIB:$REP/org/apache/jackrabbit/jackrabbit-webdav/1.6.5/jackrabbit-webdav-1.6.5.jar
 LIB=$LIB:$REP/org/slf4j/slf4j-api/1.5.11/slf4j-api-1.5.11.jar:$REP/org/slf4j/slf4j-simple/1.5.3/slf4j-simple-1.5.3.jar
 LIB=$LIB:$REP/org/apache/jackrabbit/jackrabbit-jcr-commons/1.6.5/jackrabbit-jcr-commons-1.6.5.jar
-# LIB=$LIB:$REP/org/apache/commons/commons-vfs2-sandbox/2.2/commons-vfs2-sandbox-2.2.jar:$REP/jcifs/jcifs/0.8.3/jcifs-0.8.3.jar
-LIB=$LIB:$REP/org/apache/commons/commons-vfs2-examples/2.2/commons-vfs2-examples-2.2.jar
-LIB=$LIB:$REP/org/apache/commons/commons-vfs2/2.2/commons-vfs2-2.2.jar
+# LIB=$LIB:$REP/org/apache/commons/commons-vfs2-sandbox/2.3/commons-vfs2-sandbox-2.3.jar:$REP/jcifs/jcifs/0.8.3/jcifs-0.8.3.jar
+LIB=$LIB:$REP/org/apache/commons/commons-vfs2-examples/2.3/commons-vfs2-examples-2.3.jar
+LIB=$LIB:$REP/org/apache/commons/commons-vfs2/2.3/commons-vfs2-2.3.jar
 java -cp $LIB org.apache.commons.vfs2.example.Shell
 ]]></source>
             </subsection>
@@ -91,9 +91,9 @@
 set LIB=%LIB%;%REP%\org\apache\jackrabbit\jackrabbit-webdav\1.6.5\jackrabbit-webdav-1.6.5.jar
 set LIB=%LIB%;%REP%\org\slf4j\slf4j-api\1.5.11\slf4j-api-1.5.11.jar;%REP%\org\slf4j\slf4j-simple\1.5.3\slf4j-simple-1.5.3.jar
 set LIB=%LIB%;%REP%\org\apache\jackrabbit\jackrabbit-jcr-commons\1.6.5\jackrabbit-jcr-commons-1.6.5.jar
-REM # set LIB=%LIB%;%REP%\org\apache\commons\commons-vfs2-sandbox\2.2\commons-vfs2-sandbox-2.2.jar;%REP%\jcifs\jcifs\0.8.3\jcifs-0.8.3.jar
-set LIB=%LIB%;%REP%\org\apache\commons\commons-vfs2-examples\2.2\commons-vfs2-examples-2.2.jar
-set LIB=%LIB%;%REP%\org\apache\commons\commons-vfs2\2.2\commons-vfs2-2.2.jar
+REM # set LIB=%LIB%;%REP%\org\apache\commons\commons-vfs2-sandbox\2.3\commons-vfs2-sandbox-2.3.jar;%REP%\jcifs\jcifs\0.8.3\jcifs-0.8.3.jar
+set LIB=%LIB%;%REP%\org\apache\commons\commons-vfs2-examples\2.3\commons-vfs2-examples-2.3.jar
+set LIB=%LIB%;%REP%\org\apache\commons\commons-vfs2\2.3\commons-vfs2-2.3.jar
 java -cp %LIB% org.apache.commons.vfs2.example.Shell
 ]]></source>
             </subsection>
diff --git a/pom.xml b/pom.xml
index 079c6c9..982a2ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,11 +154,12 @@
     <commons.jira.id>VFS</commons.jira.id>
     <commons.jira.pid>12310495</commons.jira.pid>
     <commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-vfs</commons.scmPubUrl>
-
+    <commons.siteOutputDirectory>${basedir}/../target/site</commons.siteOutputDirectory>
+    <commons.releaseNotesLocation>${basedir}/../RELEASE-NOTES.txt</commons.releaseNotesLocation>
+    <commons.distSvnStagingUrl>scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid}</commons.distSvnStagingUrl>
     <commons.release.version>2.3</commons.release.version>
     <!-- Commons Release Plugin -->
     <commons.bc.version>2.2</commons.bc.version>
-    <commons.release.isDistModule>true</commons.release.isDistModule>
     <commons.releaseManagerName>Gary Gregory</commons.releaseManagerName>    
     <commons.releaseManagerKey>86fdc7e2a11262cb</commons.releaseManagerKey>  
     <commons.rc.version>RC1</commons.rc.version>
@@ -174,7 +175,7 @@
 -->
 
     <vfs.parent.dir>${basedir}</vfs.parent.dir>
-    <version.checkstyle>2.17</version.checkstyle>
+    <version.checkstyle>3.0.0</version.checkstyle>
     <!-- make sure bundle plugin has dependency informations for 'optional' -->
     <commons.osgi.excludeDependencies />
     <commons.osgi.import>
@@ -349,7 +350,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-pmd-plugin</artifactId>
-        <version>3.9.0</version>
+        <version>3.11.0</version>
         <configuration>
           <targetJdk>${maven.compiler.target}</targetJdk>
           <aggregate>true</aggregate>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 3c4da4d..7710c3d 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -45,7 +45,7 @@
   </properties>
 
   <body>
-    <release version="2.3" date="2019-01-25" description="New features and bug fix release.">
+    <release version="2.3" date="2019-01-26" description="New features and bug fix release.">
 <!--       <action issue="VFS-443" dev="ggregory" type="update" due-to="nickallen"> -->
 <!--        [Local] Need an easy way to convert from a FileObject to a File. -->
 <!--       </action> -->
diff --git a/src/site/site.xml b/src/site/site.xml
index 90b6b81..3cc9545 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -29,7 +29,7 @@
       <item name="Overview"                href="/index.html"/>
       <item name="Download and Build"      href="/download.html"/>
       <item name="Using the API"           href="/api.html"/>
-      <item name="API Javadocs"            href="/apidocs/index.html"/>
+      <item name="API Javadocs"            href="/commons-vfs2/apidocs/index.html"/>
       <item name="File Systems"            href="/filesystems.html"/>
       <item name="Ant Tasks"               href="/anttasks.html"/>
       <item name="Wiki"                    href="http://wiki.apache.org/commons/VFS"/>
@@ -39,7 +39,7 @@
       <item name="Testing"                 href="/testing.html"/>
       <item name="Mailing Lists"           href="/mail-lists.html"/>
       <item name="Issue Tracking"          href="/issue-tracking.html"/>
-      <item name="Source Repository"       href="/source-repository.html"/>
+      <item name="Source Repository"       href="/scm.html"/>
     </menu>
 
     <menu name="VFS Modules" inherit="top">
diff --git a/src/site/xdoc/download.xml b/src/site/xdoc/download.xml
index d69ae6b..365102c 100644
--- a/src/site/xdoc/download.xml
+++ b/src/site/xdoc/download.xml
@@ -39,62 +39,52 @@
                 <tr>
                     <td>
                         <a href="http://commons.apache.org/logging/">Commons Logging</a>
-                        Version 1.2.
                     </td>
                     <td>All</td>
                 </tr>
                 <tr>
                     <td>
                         <a href="http://commons.apache.org/collections/">Commons Collections</a>
-                        Version 4.1.
                     </td>
                     <td>LRU Cache (optional)</td>
                 </tr>
                 <tr>
                     <td>
                         <a href="http://commons.apache.org/compress/">Commons Compress</a>
-                        Version 1.14.
                     </td>
                     <td>TAR, Bzip2</td>
                 </tr>
                 <tr>
                     <td>
                         <a href="http://commons.apache.org/net/">Commons Net</a>
-                        Version 3.6.
                     </td>
                     <td>FTP</td>
                 </tr>
                 <tr>
                     <td>
-                        <a href="http://commons.apache.org/httpclient/">Commons Httpclient</a>
-                        Version 3.1.<br/>
-                        Requires <a href="http://commons.apache.org/proper/commons-codec/">Commons Codec</a> Version 1.2.
+                        <a href="http://commons.apache.org/httpclient/">Commons Httpclient</a><br/>
+                        Requires <a href="http://commons.apache.org/proper/commons-codec/">Commons Codec</a>
                     </td>
                     <td>WebDAV, HTTP, URI Utils</td>
                 </tr>
                 <tr>
                     <td>
-                        <a href="http://jackrabbit.apache.org/jackrabbit-webdav-library.html">Apache Jackrabbit WebDAV Library</a>
-                        Version 1.6.5.<br/>
+                        <a href="http://jackrabbit.apache.org/jackrabbit-webdav-library.html">Apache Jackrabbit WebDAV Library</a><br/>
                         Requires <a href="http://jackrabbit.apache.org/jackrabbit-jcr-commons.html">Jackrabbit JCR Commons</a>
-                        Version 1.6.5 and <a href="http://www.slf4j.org">SLF4J</a>
-                        Version 1.5.3 (Api and Impl).
+                        and <a href="http://www.slf4j.org">SLF4J</a> (Api and Impl).
                     </td>
                     <td>WebDAV</td>
                 </tr>
                 <tr>
                     <td>
                         <a href="http://www.jcraft.com/jsch/">JSch</a>
-                        Version 0.1.54.
                     </td>
                     <td>SFTP</td>
                 </tr>
                 <tr>
                     <td>
-                        <a href="http://hadoop.apache.org/docs/stable/">Apache Hadoop Common</a>
-                        Version 2.6.0.<br/>
-                        <a href="http://hadoop.apache.org/docs/stable/">Apache Hadoop HDFS Common</a>
-                        Version 2.6.0<br/>
+                        <a href="http://hadoop.apache.org/docs/stable/">Apache Hadoop Common</a><br/>
+                        <a href="http://hadoop.apache.org/docs/stable/">Apache Hadoop HDFS Common</a><br/>
                         This requires a number of dependencies, use <code>$HADOOP_HOME/bin/hadoop classpath</code> command.
                     </td>
                     <td>HDFS</td>
@@ -102,14 +92,12 @@
                 <tr>
                     <td>
                         <a href="http://jcifs.samba.org/">jCIFS</a>
-                        Version 1.3.17.
                     </td>
                     <td>CIFS (VFS sandbox)</td>
                 </tr>
                 <tr>
                     <td>
                         <a href="http://java.sun.com/products/javamail/">javamail</a>
-                        Version 1.4.7.
                     </td>
                     <td>mime (VFS sandbox)</td>
                 </tr>
@@ -146,9 +134,9 @@
         <section name="Building Commons VFS">
             <p>
                 To build Commons VFS, you can use <a href="http://maven.apache.org">Maven</a> 3.0.5 or later.
-                You need to use Java 7 or later (tested with Java 7 - 8). Production builds are done with the
-                <code>-Pjava-1.7</code> profile from Commons Parent (which will compile and test with a JDK
-                from the JAVA_1_7_HOME environment variable).
+                You need to use Java 8 or later. Production builds are done with the
+                <code>-Pjava-1.8</code> profile from Commons Parent (which will compile and test with a JDK
+                from the JAVA_1_8_HOME environment variable).
             </p><p>
                 Use <code>mvn clean verify</code> to locally build and test the <code>core</code> and 
                 <code>examples</code> modules. This will build the core JAR files in
diff --git a/src/site/xdoc/download_vfs2.xml b/src/site/xdoc/download_vfs.xml
similarity index 86%
rename from src/site/xdoc/download_vfs2.xml
rename to src/site/xdoc/download_vfs.xml
index 6ca5b0c..fba7512 100644
--- a/src/site/xdoc/download_vfs2.xml
+++ b/src/site/xdoc/download_vfs.xml
@@ -117,28 +117,28 @@
       <subsection name="Binaries">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/vfs2/binaries/commons-vfs-2.3.tar.gz">commons-vfs-2.3.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/vfs2/binaries/commons-vfs-2.3.tar.gz.sha256">sha256</a></td>
-              <td><a href="https://www.apache.org/dist/commons/vfs2/binaries/commons-vfs-2.3.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/vfs/binaries/commons-vfs-2.3.tar.gz">commons-vfs-2.3.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/vfs/binaries/commons-vfs-2.3.tar.gz.sha256">sha256</a></td>
+              <td><a href="https://www.apache.org/dist/commons/vfs/binaries/commons-vfs-2.3.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/vfs2/binaries/commons-vfs-2.3.zip">commons-vfs-2.3.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/vfs2/binaries/commons-vfs-2.3.zip.sha256">sha256</a></td>
-              <td><a href="https://www.apache.org/dist/commons/vfs2/binaries/commons-vfs-2.3.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/vfs/binaries/commons-vfs-2.3.zip">commons-vfs-2.3.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/vfs/binaries/commons-vfs-2.3.zip.sha256">sha256</a></td>
+              <td><a href="https://www.apache.org/dist/commons/vfs/binaries/commons-vfs-2.3.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
       <subsection name="Source">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/vfs2/source/commons-vfs-2.3-src.tar.gz">commons-vfs-2.3-src.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/vfs2/source/commons-vfs-2.3-src.tar.gz.sha256">sha256</a></td>
-              <td><a href="https://www.apache.org/dist/commons/vfs2/source/commons-vfs-2.3-src.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/vfs/source/commons-vfs-2.3-src.tar.gz">commons-vfs-2.3-src.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/vfs/source/commons-vfs-2.3-src.tar.gz.sha256">sha256</a></td>
+              <td><a href="https://www.apache.org/dist/commons/vfs/source/commons-vfs-2.3-src.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/vfs2/source/commons-vfs-2.3-src.zip">commons-vfs-2.3-src.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/vfs2/source/commons-vfs-2.3-src.zip.sha256">sha256</a></td>
-              <td><a href="https://www.apache.org/dist/commons/vfs2/source/commons-vfs-2.3-src.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/vfs/source/commons-vfs-2.3-src.zip">commons-vfs-2.3-src.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/vfs/source/commons-vfs-2.3-src.zip.sha256">sha256</a></td>
+              <td><a href="https://www.apache.org/dist/commons/vfs/source/commons-vfs-2.3-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/vfs2/">browse download area</a></li>
-          <li><a href="https://archive.apache.org/dist/commons/vfs2/">archives...</a></li>
+          <li class="download"><a href="[preferred]/commons/vfs/">browse download area</a></li>
+          <li><a href="https://archive.apache.org/dist/commons/vfs/">archives...</a></li>
         </ul>
     </section>
   </body>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 839c183..92ca9a2 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -86,6 +86,12 @@
 
         <section name="News">
           <p>
+            Apache Commons VFS 2.3 is a new features and bug fix release.
+          </p>
+          <p>
+            Apache Commons VFS 2.2 is a new features and bug fix release.
+          </p>
+          <p>
             Apache Commons VFS 2.1 is a bugfix release to VFS 2.0. If you meet the requirements you should be able 
             to replace 2.0 with 2.1 without the need for changes to API consumers. VFS 2.1 has introduced some now 
             methods for provider interfaces (like <code>FileObject</code>). If you implement a VFS provider and use the
@@ -94,7 +100,8 @@
             See the <a href="https://dist.apache.org/repos/dist/dev/commons/vfs/RELEASE-NOTES.txt">Release Notes</a> and the
             <a href="commons-vfs2/clirr-report.html">Clirr Report</a> for details. VFS 2.1 adds a new read-only provider
             for the Apache Hadoop (HDFS) File system.
-          </p><p>
+          </p>
+          <p>
             Apache Commons VFS 2.0 adds support for FTPS and WebDav have been added in addition to many bugs
             being fixed. Version 2.0 is not binary compatible with version 1.0. To insure that both 1.0 and 2.0 can
             coexist version 2.0 has had its Maven groupId changed to org.apache.commons, its Maven artifact changed
diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml
index 5151e4b..37a1a2b 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>[vfs2] Problem with the ...</li>
+          <li>[vfs] Problem with the ...</li>
         </ul>
       </p>
       <p>
@@ -79,7 +79,7 @@
     <section name="Apache Commons VFS Project Mailing Lists">
       <p>
         <strong>Please prefix the subject line of any messages for <a href="index.html">Apache Commons VFS Project</a>
-        with <i>[vfs2]</i></strong> - <i>thanks!</i>
+        with <i>[vfs]</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=[vfs2]">Post</a></td>
+          <td><a href="mailto:user@commons.apache.org?subject=[vfs]">Post</a></td>
           <td><a href="http://mail-archives.apache.org/mod_mbox/commons-user/">mail-archives.apache.org</a></td>
           <td><a href="http://markmail.org/list/org.apache.commons.users/">markmail.org</a><br />
               <a href="http://www.mail-archive.com/user@commons.apache.org/">www.mail-archive.com</a><br />
@@ -122,7 +122,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=[vfs2]">Post</a></td>
+          <td><a href="mailto:dev@commons.apache.org?subject=[vfs]">Post</a></td>
           <td><a href="http://mail-archives.apache.org/mod_mbox/commons-dev/">mail-archives.apache.org</a></td>
           <td><a href="http://markmail.org/list/org.apache.commons.dev/">markmail.org</a><br />
               <a href="http://www.mail-archive.com/dev@commons.apache.org/">www.mail-archive.com</a><br />