diff --git a/src/scratchpad/targets/generate-records.xml b/src/scratchpad/targets/generate-records.xml
deleted file mode 100644
index e7d05de17e..0000000000
--- a/src/scratchpad/targets/generate-records.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-<project default="generate-records" basedir=".." name="generate-records">
-  <target name="generate-records" depends="prepare"
-     description="Generates the record source code">
-
-      <java classname="org.apache.poi.dev.RecordGenerator" fork="yes">
-          <arg value="src/records/definitions"/>
-          <arg value="src/records/styles"/>
-          <arg value="src/java"/>
-          <arg value="src/testcases"/>
-          <classpath>
-              <path refid="scratchpad.classpath"/>
-              <pathelement location="${build.scratchpad.dest}"/>
-          </classpath>
-      </java>
-
-  </target>
-</project>
-
- 
\ No newline at end of file
diff --git a/src/scratchpad/targets/generate-types.xml b/src/scratchpad/targets/generate-types.xml
deleted file mode 100644
index 99de11f96c..0000000000
--- a/src/scratchpad/targets/generate-types.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<project default="generate-types" basedir=".." name="generate-types">
- <target name="generate-types" depends="prepare"
-     description="Generates the record source code">
-
-      <java classname="org.apache.poi.dev.RecordGenerator" fork="yes">
-          <arg value="src/types/definitions"/>
-          <arg value="src/types/styles"/>
-          <arg value="src/scratchpad/src"/>
-          <arg value="src/scratchpad/testcases"/>
-          <classpath>
-              <path refid="scratchpad.classpath"/>
-              <pathelement location="${build.scratchpad.dest}"/>
-          </classpath>
-      </java>
-
-   </target>
-</project>
\ No newline at end of file
diff --git a/src/scratchpad/targets/scratchpad.xtarget b/src/scratchpad/targets/scratchpad.xtarget
index a390725120..1476fcbb63 100644
--- a/src/scratchpad/targets/scratchpad.xtarget
+++ b/src/scratchpad/targets/scratchpad.xtarget
@@ -1,7 +1,7 @@
   <!-- =================================================================== -->
   <!-- Interactive scratchpad builds                                       -->
   <!-- =================================================================== -->
-  <target name="scratchpad" depends="init" description="Interactive Scratchpad Build">
+  <target name="scratchpad" depends="prepare" description="Interactive Scratchpad Build">
     <echo message="--------------------------------------------------------------"/>
     <echo message=" "/>    
     <echo message="          ${fullname} ${version} SCRATCHPAD "/>
@@ -25,6 +25,38 @@
     <property name="input.selection" value=""/>
     <user-input name="input.selection">Please select a target </user-input>
 
-    <ant antfile="src/scratchpad/targets/${input.selection}.xml"/>
+    <antcall target="${input.selection}"/>
 
   </target>
+
+  <target name="generate-records" depends="prepare"
+     description="Generates the record source code">
+
+      <java classname="org.apache.poi.dev.RecordGenerator" fork="yes">
+          <arg value="src/records/definitions"/>
+          <arg value="src/records/styles"/>
+          <arg value="src/java"/>
+          <arg value="src/testcases"/>
+          <classpath>
+              <path refid="scratchpad.classpath"/>
+              <pathelement location="${build.scratchpad.dest}"/>
+          </classpath>
+      </java>
+
+  </target>
+  
+   <target name="generate-types" depends="prepare"
+     description="Generates the record source code">
+
+      <java classname="org.apache.poi.dev.RecordGenerator" fork="yes">
+          <arg value="src/types/definitions"/>
+          <arg value="src/types/styles"/>
+          <arg value="src/scratchpad/src"/>
+          <arg value="src/scratchpad/testcases"/>
+          <classpath>
+              <path refid="scratchpad.classpath"/>
+              <pathelement location="${build.scratchpad.dest}"/>
+          </classpath>
+      </java>
+
+   </target>
\ No newline at end of file
diff --git a/tools/centipede/targets/preinit.xtarget b/tools/centipede/targets/preinit.xtarget
index 6fb6325edc..4475a4b422 100644
--- a/tools/centipede/targets/preinit.xtarget
+++ b/tools/centipede/targets/preinit.xtarget
@@ -51,7 +51,7 @@
     <pathelement path="${build.root}/jakarta-poi/classes"/>
   </path>
 
-  <path id="scratchpad.classpath">
+ <path id="scratchpad.classpath">
     <fileset dir="./lib/endorsed">
       <include name="*.jar"/>
     </fileset>