diff --git a/docs/org.eclipse.jst.doc.isv/javadoc.xml b/docs/org.eclipse.jst.doc.isv/javadoc.xml
index 11e4a31bd52fd51101beb0f441f9275dba771f38..3e58e675de9befd915595fa88c723502355c2ccb 100644
--- a/docs/org.eclipse.jst.doc.isv/javadoc.xml
+++ b/docs/org.eclipse.jst.doc.isv/javadoc.xml
@@ -28,10 +28,10 @@
     </target>
 
     <target name="javadoc">
-        <echo message="classpath: ${env.J2SE15}" />
+        <echo message="classpath: ${J2SE-1.5}" />
         <echo message="buildDirectory: ${buildDirectory}" />
-        <echo message="JAVADOC_COMMAND: ${env.JAVADOC_COMMAND}" />
-        <echo message="JAVADOC_ARGS: ${env.JAVADOC_ARGS}" />
+        <echo message="JAVADOC_COMMAND: ${JAVADOC_COMMAND}" />
+        <echo message="JAVADOC_ARGS: ${JAVADOC_ARGS}" />
 
         <mkdir dir="${outputDir}/reference/api/overview" />
 
@@ -44,7 +44,7 @@
                 includes="*/javadoc-images/*.jpg" />
         </copy>
         <javadoc
-            executable="${env.JAVADOC_COMMAND}"
+            executable="${JAVADOC_COMMAND}"
             access="public"
             author="false"
             destdir="${outputDir}/reference/api"
@@ -64,9 +64,9 @@
             breakiterator="yes"
             verbose="false"
             failonerror="false">
-            <arg line="${env.JAVADOC_ARGS}"/>
+            <arg line="${JAVADOC_ARGS}"/>
             <classpath>
-                <pathelement path="${env.J2SE15}" />
+                <pathelement path="${J2SE-1.5}" />
                 <fileset dir="${buildDirectory}/../eclipse/plugins">
                     <include name="**/*.jar" />
                 </fileset>
diff --git a/docs/org.eclipse.wst.doc.isv/javadoc.xml b/docs/org.eclipse.wst.doc.isv/javadoc.xml
index a0188cfaaed081181079dd4352108954b039d465..0820a18ae6de278c3fa50557b53f7d240766b847 100644
--- a/docs/org.eclipse.wst.doc.isv/javadoc.xml
+++ b/docs/org.eclipse.wst.doc.isv/javadoc.xml
@@ -28,9 +28,9 @@
     </target>
 
     <target name="javadoc">
-        <echo message="classpath: ${env.J2SE15}" />
+        <echo message="classpath: ${J2SE-1.5}" />
         <echo message="buildDirectory: ${buildDirectory}" />
-        <echo message="JAVADOC_COMMAND: ${env.JAVADOC_COMMAND}" />
+        <echo message="JAVADOC_COMMAND: ${JAVADOC_COMMAND}" />
 
         <mkdir dir="${outputDir}/reference/api/overview" />
 
@@ -43,7 +43,7 @@
                 includes="*/javadoc-images/*.jpg" />
         </copy>
         <javadoc
-            executable="${env.JAVADOC_COMMAND}"
+            executable="${JAVADOC_COMMAND}"
             access="public"
             author="false"
             destdir="${outputDir}/reference/api"
@@ -63,9 +63,9 @@
             breakiterator="yes"
             verbose="false"
             failonerror="false">
-             <arg line="${env.JAVADOC_ARGS}"/>
+             <arg line="${JAVADOC_ARGS}"/>
             <classpath>
-                <pathelement path="${env.J2SE15}" />
+                <pathelement path="${J2SE-1.5}" />
                 <fileset dir="${buildDirectory}/../eclipse/plugins">
                     <include name="**/*.jar" />
                 </fileset>