diff --git a/build.xml b/build.xml
index e817348e81a3c4fedce9a1dc539745fadde9d212..9142ae48f15bcf3611cc6ba2d864ff0a0e3126ce 100644
--- a/build.xml
+++ b/build.xml
@@ -930,7 +930,7 @@ Key references:
         <echo message="clean/delete autogenerated viewpoint image files"/>
         <delete failonerror="false" includeemptydirs="true" verbose="true">
             <fileset dir=".">
-                <include name="*/_viewpoints/*.png"/>
+                <include name="**/_viewpoints/*.png"/>
             </fileset>
         </delete>
         <echo message="Note: you must also clean HTML versions of scenes to trigger re-shooting of replica screenshot images"/>
@@ -2269,12 +2269,12 @@ ignoreSetupDownloadErrors=true
     <target name="processScenes" description="process all scenes with all conversion tasks" depends="get.saxon">
         <echo>TODO: note that if Viewpoint descriptions changed, or the visible rendered scene changed,</echo>
         <echo>      then you must delete the pretty-print .html version in order to trigger target task</echo>
-        <echo>      processScenes.captureViewpoints that regenerates the viewpoint snapshot images.</echo>
+        <echo>      processScenes.captureImages that regenerates the viewpoint snapshot images.</echo>
         <!-- processScenes.regularExpressionChecks occurs first because provides diagnostic scene correctness checks -->
         <!-- processScenes.canonicalX3D            occurs second because it replaces original .x3d scene -->
         <!-- processScenes.X3DtoVRML97             occurs third because provides diagnostic scene  correctness checks -->
         <!-- processScripts.jslint, X3dToJson      occur  fourth,fifth & provide diagnostic script correctness checks -->
-        <!-- processScenes.captureViewpoints  occurs sixth because it must be performed before processScenes.X3dToHtmlListing -->
+        <!-- processScenes.captureImages           occurs sixth because it must be performed before processScenes.X3dToHtmlListing -->
         <!-- this task depends on other tasks to look through the directories, only updating as needed -->
         <antcall target="processScenes.regularExpressionChecks"/>
         <antcall target="processScenes.canonicalX3D"/>
@@ -2289,9 +2289,8 @@ ignoreSetupDownloadErrors=true
         <antcall target="processScenes.X3dToX3domXhtml"/>
         <antcall target="processScenes.X3dToX3dvClassicVrmlEncoding"/>
         <antcall target="processScenes.X3dToX3dbCompressedBinaryEncoding"/>
-        <!-- processScenes.captureThumbnails, captureViewpointImages conversions should precede processScenes.X3dToHtmlListing -->
-        <antcall target="processScenes.captureThumbnails"/>
-        <antcall target="processScenes.captureViewpoints"/>
+        <!-- processScenes.captureImages need to precede processScenes.X3dToHtmlListing -->
+        <antcall target="processScenes.captureImages"/>
         <antcall target="processScenes.X3dToHtmlListing"/>
         <echo message="${archive.name} processScenes complete."/>
     </target>
@@ -3462,8 +3461,8 @@ app.replica.args=-mode scene -mipmaps -antialias 8 -anisotropicDegree 16 -verbos
             <arg value="../${archive.name}"/>
             <arg value="${CreateContentCatalog.dir}"/>
         </java>
-		<echo  message="if a package.html chapter summary is not appearing in chapter.html output, check filters in"/>
-		<echo  message="   tools/CreateContentCatalog/CreateContentCatalogPages.xslt ChapterPackageDescription"/>
+        <echo  message="if a package.html chapter summary is not appearing in chapter.html output, check filters in"/>
+        <echo  message="   tools/CreateContentCatalog/CreateContentCatalogPages.xslt ChapterPackageDescription"/>
         <echo  message="catalog creation complete, if successful then rename result to include archive name:"/>
         <move file="ContentCatalog.xml" tofile="ContentCatalog${archive.name}.xml" overwrite="true" failonerror="false" verbose="true"/>
     </target>