Index: trunk/ippTools/src/warptoolConfig.c
===================================================================
--- trunk/ippTools/src/warptoolConfig.c	(revision 11981)
+++ trunk/ippTools/src/warptoolConfig.c	(revision 11997)
@@ -27,5 +27,5 @@
 #include "p4tool.h"
 
-pxConfig *p4toolConfig(pxConfig *config, int argc, char **argv) {
+pxConfig *warptoolConfig(pxConfig *config, int argc, char **argv) {
     if (!config) {
         config = pxConfigAlloc();
@@ -198,26 +198,26 @@
     psMetadata *argSets = psMetadataAlloc();
     // find which mode we're running under
-    PXTOOL_MODE("-definerun",       P4TOOL_MODE_DEFINERUN,      definerunArgs);
-    PXTOOL_MODE("-updaterun",       P4TOOL_MODE_UPDATERUN,      updaterunArgs);
-    PXTOOL_MODE("-addinputexp",     P4TOOL_MODE_ADDINPUTEXP,    addinputexpArgs);
-    PXTOOL_MODE("-exp",             P4TOOL_MODE_EXP,            expArgs);
-    PXTOOL_MODE("-imfile",          P4TOOL_MODE_IMFILE,         imfileArgs);
-    PXTOOL_MODE("-tooverlap",       P4TOOL_MODE_TOOVERLAP,      tooverlapArgs);
-    PXTOOL_MODE("-addoverlap",      P4TOOL_MODE_ADDOVERLAP,     addoverlapArgs);
-    PXTOOL_MODE("-scmap",           P4TOOL_MODE_SCMAP,          scmapArgs);
-    PXTOOL_MODE("-towarped",        P4TOOL_MODE_TOWARPED,       towarpedArgs);
-    PXTOOL_MODE("-addwarped",       P4TOOL_MODE_ADDWARPED,      addwarpedArgs);
-    PXTOOL_MODE("-warped",          P4TOOL_MODE_WARPED,         warpedArgs);
+    PXTOOL_MODE("-definerun",       WARPTOOL_MODE_DEFINERUN,      definerunArgs);
+    PXTOOL_MODE("-updaterun",       WARPTOOL_MODE_UPDATERUN,      updaterunArgs);
+    PXTOOL_MODE("-addinputexp",     WARPTOOL_MODE_ADDINPUTEXP,    addinputexpArgs);
+    PXTOOL_MODE("-exp",             WARPTOOL_MODE_EXP,            expArgs);
+    PXTOOL_MODE("-imfile",          WARPTOOL_MODE_IMFILE,         imfileArgs);
+    PXTOOL_MODE("-tooverlap",       WARPTOOL_MODE_TOOVERLAP,      tooverlapArgs);
+    PXTOOL_MODE("-addoverlap",      WARPTOOL_MODE_ADDOVERLAP,     addoverlapArgs);
+    PXTOOL_MODE("-scmap",           WARPTOOL_MODE_SCMAP,          scmapArgs);
+    PXTOOL_MODE("-towarped",        WARPTOOL_MODE_TOWARPED,       towarpedArgs);
+    PXTOOL_MODE("-addwarped",       WARPTOOL_MODE_ADDWARPED,      addwarpedArgs);
+    PXTOOL_MODE("-warped",          WARPTOOL_MODE_WARPED,         warpedArgs);
 #if 0
-    PXTOOL_MODE("-tostackedimfile", P4TOOL_MODE_TOSTACKEDIMFILE, tostackedimfileArgs);
-    PXTOOL_MODE("-addstackedimfile", P4TOOL_MODE_ADDSTACKEDIMFILE, addstackedimfileArgs);
-    PXTOOL_MODE("-stackedimfile",   P4TOOL_MODE_STACKEDIMFILE, stackedimfileArgs);
-    PXTOOL_MODE("-todiffimfile", P4TOOL_MODE_TODIFFIMFILE, todiffimfileArgs);
-    PXTOOL_MODE("-adddiffimfile", P4TOOL_MODE_ADDDIFFIMFILE, adddiffimfileArgs);
-    PXTOOL_MODE("-diffimfile",   P4TOOL_MODE_DIFFIMFILE, diffimfileArgs);
+    PXTOOL_MODE("-tostackedimfile", WARPTOOL_MODE_TOSTACKEDIMFILE, tostackedimfileArgs);
+    PXTOOL_MODE("-addstackedimfile", WARPTOOL_MODE_ADDSTACKEDIMFILE, addstackedimfileArgs);
+    PXTOOL_MODE("-stackedimfile",   WARPTOOL_MODE_STACKEDIMFILE, stackedimfileArgs);
+    PXTOOL_MODE("-todiffimfile", WARPTOOL_MODE_TODIFFIMFILE, todiffimfileArgs);
+    PXTOOL_MODE("-adddiffimfile", WARPTOOL_MODE_ADDDIFFIMFILE, adddiffimfileArgs);
+    PXTOOL_MODE("-diffimfile",   WARPTOOL_MODE_DIFFIMFILE, diffimfileArgs);
 #endif
 
     bool argErr = false;
-    if (config->mode == P4TOOL_MODE_NONE) {
+    if (config->mode == WARPTOOL_MODE_NONE) {
         argErr = true;
         fprintf (stderr, "mode argument is required\n");
@@ -228,5 +228,5 @@
 
     if (argErr) {
-        printf("\nPan-STARRS Phase 4 Tool\n");
+        printf("\nPan-STARRS Warp Tool\n");
         printf("Usage: %s <mode> [<options>]\n\n", argv[0]);
         printf(" <mode> :\n\n");