Index: trunk/ippTools/src/stacktoolConfig.c
===================================================================
--- trunk/ippTools/src/stacktoolConfig.c	(revision 11997)
+++ trunk/ippTools/src/stacktoolConfig.c	(revision 12025)
@@ -1,4 +1,4 @@
 /*
- * p6toolConfig.c
+ * stacktoolConfig.c
  *
  * Copyright (C) 2007  Joshua Hoblitt
@@ -25,5 +25,5 @@
 
 #include "pxtools.h"
-#include "p6tool.h"
+#include "stacktool.h"
 
 pxConfig *stacktoolConfig(pxConfig *config, int argc, char **argv) {
@@ -56,7 +56,7 @@
     psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-tess_id",  0,
             "define tessellation ID (required)", NULL);
-    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-p4_id",
+    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-warp_id",
              PS_META_DUPLICATE_OK,
-             "include this p4 ID (multiple OK, required)", NULL);
+             "include this warp ID (multiple OK, required)", NULL);
 
     psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-simple",  0,
@@ -65,6 +65,6 @@
     // -updaterun
     psMetadata *updaterunArgs = psMetadataAlloc();
-    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-p6_id", 0,
-            "define p6 ID (required)", NULL);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-stack_id", 0,
+            "define stack ID (required)", NULL);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0,
             "set state (required)", NULL);
@@ -78,15 +78,15 @@
     // -addinputskyfile
     psMetadata *addinputskyfileArgs = psMetadataAlloc();
-    psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-p6_id", 0,
-            "define p6 ID (required)", NULL);
-    psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-p4_id", 0,
-            "define p4 ID (required)", NULL);
+    psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-stack_id", 0,
+            "define stack ID (required)", NULL);
+    psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "define warp ID (required)", NULL);
 
     // -inputskyfile
     psMetadata *inputskyfileArgs = psMetadataAlloc();
-    psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-p6_id", 0,
-            "search by p6 ID (required)", NULL);
-    psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-p4_id", 0,
-            "search by p4 ID (required)", NULL);
+    psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-stack_id", 0,
+            "search by stack ID (required)", NULL);
+    psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "search by warp ID (required)", NULL);
     psMetadataAddU64(inputskyfileArgs, PS_LIST_TAIL, "-limit",  0,
             "limit result set to N items", 0);
@@ -96,8 +96,8 @@
     // -tosum
     psMetadata *tosumArgs = psMetadataAlloc();
-    psMetadataAddStr(tosumArgs, PS_LIST_TAIL, "-p6_id", 0,
-            "search by p6 ID (required)", NULL);
-    psMetadataAddStr(tosumArgs, PS_LIST_TAIL, "-p4_id", 0,
-            "search by p4 ID (required)", NULL);
+    psMetadataAddStr(tosumArgs, PS_LIST_TAIL, "-stack_id", 0,
+            "search by stack ID (required)", NULL);
+    psMetadataAddStr(tosumArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "search by warp ID (required)", NULL);
     psMetadataAddU64(tosumArgs, PS_LIST_TAIL, "-limit",  0,
             "limit result set to N items", 0);
@@ -107,6 +107,6 @@
     // -addsumskyfile
     psMetadata *addsumskyfileArgs = psMetadataAlloc();
-    psMetadataAddStr(addsumskyfileArgs, PS_LIST_TAIL, "-p6_id", 0,
-            "define p4 ID (required)", NULL);
+    psMetadataAddStr(addsumskyfileArgs, PS_LIST_TAIL, "-stack_id", 0,
+            "define warp ID (required)", NULL);
     psMetadataAddStr(addsumskyfileArgs, PS_LIST_TAIL, "-uri", 0,
             "define URI of file (required)", 0);
@@ -118,8 +118,8 @@
     // -sumskyfile
     psMetadata *sumskyfileArgs= psMetadataAlloc();
-    psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-p6_id", 0,
-            "search by p6 ID (required)", NULL);
-    psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-p4_id", 0,
-            "search by p4 ID (required)", NULL);
+    psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-stack_id", 0,
+            "search by stack ID (required)", NULL);
+    psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "search by warp ID (required)", NULL);
     psMetadataAddU64(sumskyfileArgs, PS_LIST_TAIL, "-limit",  0,
             "limit result set to N items", 0);
@@ -225,7 +225,7 @@
     psString str = NULL;
     bool status = false;
-    if ((str = psMetadataLookupStr(&status, config->args, "-p4_id"))) {
-        if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "p4_id", 0, "==", (psS32)atoi(str))) {
-            psError(PS_ERR_UNKNOWN, false, "failed to add item p4_id");
+    if ((str = psMetadataLookupStr(&status, config->args, "-warp_id"))) {
+        if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "warp_id", 0, "==", (psS32)atoi(str))) {
+            psError(PS_ERR_UNKNOWN, false, "failed to add item warp_id");
             psFree(config);
             return NULL;