diff --git a/src/xdocs/anttask.xml.vm b/src/xdocs/anttask.xml.vm
index 3351d6684..1629179fa 100755
--- a/src/xdocs/anttask.xml.vm
+++ b/src/xdocs/anttask.xml.vm
@@ -27,7 +27,7 @@
 
       <p>
         The easiest way is to include <span
-        class="default">checkstyle-all-${projectVersion}.jar</span> in the
+        class="default">checkstyle-${projectVersion}-all.jar</span> in the
         classpath. This contains all the classes required to run
         Checkstyle. Alternatively, you must include the following in the
         classpath:
@@ -69,7 +69,7 @@
 
       <source>
 &lt;taskdef resource=&quot;checkstyletask.properties&quot;
-         classpath=&quot;/path/to/checkstyle-all-${projectVersion}.jar&quot;/&gt;
+         classpath=&quot;/path/to/checkstyle-${projectVersion}-all.jar&quot;/&gt;
       </source>
 
       <p>
diff --git a/src/xdocs/cmdline.xml.vm b/src/xdocs/cmdline.xml.vm
index 65125c0a9..b46570ede 100755
--- a/src/xdocs/cmdline.xml.vm
+++ b/src/xdocs/cmdline.xml.vm
@@ -23,7 +23,7 @@
     <section name="Installation">
       <p>
         The easiest way is to include <span
-        class="default">checkstyle-all-${projectVersion}.jar</span> in the
+        class="default">checkstyle-${projectVersion}-all.jar</span> in the
         classpath. If you are running JDK 5.0 this contains all the classes
         required to run Checkstyle. Alternatively, you must include the
         following in the classpath:
@@ -200,7 +200,7 @@ java com.puppycrawl.tools.checkstyle.Main -c docs/sun_checks.xml \
         </p>
 
         <source>
-java -jar checkstyle-all-${projectVersion}.jar \
+java -jar checkstyle-${projectVersion}-all.jar \
      -c docs/sun_checks.xml Check.java
         </source>
       </div>
diff --git a/src/xdocs/writingchecks.xml.vm b/src/xdocs/writingchecks.xml.vm
index 285de92c3..61476ab2f 100644
--- a/src/xdocs/writingchecks.xml.vm
+++ b/src/xdocs/writingchecks.xml.vm
@@ -112,7 +112,7 @@
         source file. To run it type
       </p>
       <source>
-java -classpath checkstyle-all-${projectVersion}.jar \
+java -classpath checkstyle-${projectVersion}-all.jar \
      com.puppycrawl.tools.checkstyle.gui.Main
       </source>
 
@@ -416,7 +416,7 @@ public class MethodLimitCheck extends Check
       </p>
 
       <source>
-java -classpath mycompanychecks.jar:checkstyle-all-${projectVersion}.jar \
+java -classpath mycompanychecks.jar:checkstyle-${projectVersion}-all.jar \
      com.puppycrawl.tools.checkstyle.Main \
      -c config.xml -r .
       </source>
diff --git a/src/xdocs/writinglisteners.xml.vm b/src/xdocs/writinglisteners.xml.vm
index 4baae4fe3..449f31987 100755
--- a/src/xdocs/writinglisteners.xml.vm
+++ b/src/xdocs/writinglisteners.xml.vm
@@ -279,7 +279,7 @@ Audit finished. Total errors: 1
       <p>
         The easiest way to use <span
         class="code">CommonsLoggingListener</span> is to include <span
-        class="default">checkstyle-all-${projectVersion}.jar</span>
+        class="default">checkstyle-${projectVersion}-all.jar</span>
         in the classpath because that jar file contains all the Commons
         Logging classes.  The default Log under J2SE 1.4 is wrapper
         class <a