diff --git a/build.properties b/build.properties
index 8a9e7f799ae5f843b78d2bbab953dcd6d7c7de9b..841f02a2ec7505b2a0009dc82e890a040a2f30d4 100644
--- a/build.properties
+++ b/build.properties
@@ -237,9 +237,9 @@ replica=xj3d.replica.Replica
 sai.simserver.dir=${examples.dir}/sai/simserver
 examples.spec.x3d.java.dir=${examples.dir}/spec/x3d/java
 
-xj3d.version=Version
+xj3d.version.info=Xj3dVersionInformation
 xj3d.version.number=${product.version.major}.${product.version.level}
-xj3d.version.file=${src.java.dir}/org/web3d/util/${xj3d.version}.java
+xj3d.version.file=${src.java.dir}/org/web3d/util/${xj3d.version.info}.java
 
 browser.class=${browser.classes.dir}/xj3d/browser/Xj3DBrowser.class
 cadfilter.class=${cadfilter.classes.dir}/xj3d/filter/CDFFilter.class
diff --git a/build.xml b/build.xml
index 5f1061865d5e05b4ae7130e074609c0bfe199e09..2ba837cf3afcf019cdd764b0bdf28976c0c77681 100644
--- a/build.xml
+++ b/build.xml
@@ -755,17 +755,17 @@ POSSIBILITY OF SUCH DAMAGE.
         <!-- This is a way to get our Version.java file compiled each time ant is run, -->
         <!-- but not have it show up in SVN as modified -->
         <copy file="${xj3d.version.file}" todir="."/>
-        <!-- put the build-time properties defined by the above step into our ${xj3d.version} file -->
+        <!-- put the build-time properties defined by the above step into our ${xj3d.version.info} file -->
         <!-- look for, e.g., DSTAMP = "blah", replace the "blah" with current property value -->
-        <replaceregexp file="./${xj3d.version}.java"
+        <replaceregexp file="./${xj3d.version.info}.java"
                        match="DSTAMP\s++=\s++&quot;.*&quot;"
                        replace="DSTAMP = &quot;${DSTAMP}&quot;"/>
         <echo message="DSTAMP = &quot;${DSTAMP}&quot;"/>
-        <replaceregexp file="./${xj3d.version}.java"
+        <replaceregexp file="./${xj3d.version.info}.java"
                        match="TSTAMP\s++=\s++&quot;.*&quot;"
                        replace="TSTAMP = &quot;${TSTAMP}&quot;"/>
         <echo message="TSTAMP = &quot;${TSTAMP}&quot;"/>
-        <replaceregexp file="./${xj3d.version}.java"
+        <replaceregexp file="./${xj3d.version.info}.java"
                        match="TODAY\s++=\s++&quot;.*&quot;"
                        replace="TODAY = &quot;${TODAY}&quot;"/>
         <echo message="TODAY = &quot;${TODAY}&quot;"/>
@@ -775,12 +775,12 @@ POSSIBILITY OF SUCH DAMAGE.
                source="${javac.source}"
                target="${javac.target}"
                debug="on"
-               includes="${xj3d.version}.java"
+               includes="${xj3d.version.info}.java"
                classpathref="app.classpath"
                includeantruntime="false">
             <compilerarg line="${javac.compilerargs}"/>
         </javac>
-        <delete file="./${xj3d.version}.java"/>
+        <delete file="./${xj3d.version.info}.java"/>
     </target>
 
     <target name="javadoc"