Index: trunk/ippTools/src/stacktool.c
===================================================================
--- trunk/ippTools/src/stacktool.c	(revision 18578)
+++ trunk/ippTools/src/stacktool.c	(revision 18579)
@@ -125,6 +125,6 @@
     PXOPT_LOOKUP_S32(randomLimit, config->args, "-random", false, false);
 
-    PXOPT_COPY_S32(config->args, having, "-min_num", "num_avail", ">=");
-    PXOPT_COPY_S32(config->args, having, "-min_new", "(num_avail - num_extant)", ">=");
+    PXOPT_COPY_S32(config->args, having, "-min_num", "num_warp", ">=");
+    PXOPT_COPY_S32(config->args, having, "-min_new", "(num_warp - num_stack)", ">=");
 
     PXOPT_LOOKUP_F32(min_frac, config->args, "-min_frac", false, false);
@@ -144,5 +144,5 @@
     PXOPT_COPY_F32(config->args, whereWSF, "-select_good_frac_min", "good_frac", ">=");
 
-    psString select = pxDataGet("stacktool_definebyquery_select.sql");
+    psString select = pxDataGet("stacktool_definebyquery_part1.sql");
     if (!select) {
         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
@@ -164,5 +164,5 @@
     psFree(whereWSF);
 
-    psString groupby = pxDataGet("stacktool_definebyquery_groupby.sql");
+    psString groupby = pxDataGet("stacktool_definebyquery_part2.sql");
     if (!groupby) {
         psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
@@ -185,5 +185,5 @@
             psStringAppend(&select, " HAVING");
         }
-        psStringAppend(&select, " num_avail >= %f * num_extant", (double)min_frac);
+        psStringAppend(&select, " num_warp >= %f * num_stack", (double)min_frac);
     }