Index: trunk/ippTools/src/chiptoolConfig.c
===================================================================
--- trunk/ippTools/src/chiptoolConfig.c	(revision 11843)
+++ trunk/ippTools/src/chiptoolConfig.c	(revision 11997)
@@ -27,5 +27,5 @@
 #include "p2tool.h"
 
-pxConfig *p2toolConfig(pxConfig *config, int argc, char **argv) {
+pxConfig *chiptoolConfig(pxConfig *config, int argc, char **argv) {
     if (!config) {
         config = pxConfigAlloc();
@@ -199,15 +199,15 @@
 
     psMetadata *argSets = psMetadataAlloc();
-    PXTOOL_MODE("-queuerawexp",     P2TOOL_MODE_QUEUERAWEXP,   queuerawexpArgs);
-    PXTOOL_MODE("-pendingimfile",   P2TOOL_MODE_PENDINGIMFILE,  pendingimfileArgs);
-    PXTOOL_MODE("-addprocessedimfile",P2TOOL_MODE_ADDPROCESSEDIMFILE,addprocessedimfileArgs);
-    PXTOOL_MODE("-processedimfile",P2TOOL_MODE_PROCESSEDIMFILE, processedimfileArgs);
-    PXTOOL_MODE("-updateprocessedimfile",P2TOOL_MODE_UPDATEPROCESSEDIMFILE,    updateprocessedimfileArgs);
-    PXTOOL_MODE("-block",           P2TOOL_MODE_BLOCK,          blockArgs);
-    PXTOOL_MODE("-masked",          P2TOOL_MODE_MASKED,         maskedArgs);
-    PXTOOL_MODE("-unblock",         P2TOOL_MODE_UNBLOCK,        unblockArgs);
+    PXTOOL_MODE("-queuerawexp",     CHIPTOOL_MODE_QUEUERAWEXP,   queuerawexpArgs);
+    PXTOOL_MODE("-pendingimfile",   CHIPTOOL_MODE_PENDINGIMFILE,  pendingimfileArgs);
+    PXTOOL_MODE("-addprocessedimfile",CHIPTOOL_MODE_ADDPROCESSEDIMFILE,addprocessedimfileArgs);
+    PXTOOL_MODE("-processedimfile",CHIPTOOL_MODE_PROCESSEDIMFILE, processedimfileArgs);
+    PXTOOL_MODE("-updateprocessedimfile",CHIPTOOL_MODE_UPDATEPROCESSEDIMFILE,    updateprocessedimfileArgs);
+    PXTOOL_MODE("-block",           CHIPTOOL_MODE_BLOCK,          blockArgs);
+    PXTOOL_MODE("-masked",          CHIPTOOL_MODE_MASKED,         maskedArgs);
+    PXTOOL_MODE("-unblock",         CHIPTOOL_MODE_UNBLOCK,        unblockArgs);
 
     bool argErr = false;
-    if (config->mode == P2TOOL_MODE_NONE) {
+    if (config->mode == CHIPTOOL_MODE_NONE) {
             argErr = true;
         fprintf (stderr, "mode argument is required\n");
@@ -218,5 +218,5 @@
 
     if (argErr) {
-        printf("\nPan-STARRS Phase 2 Search Tool\n\n");
+        printf("\nPan-STARRS Chip Tool\n\n");
         printf("Usage: %s <mode> [<options>]\n\n", argv[0]);
         printf(" <mode> :\n\n");