Index: trunk/ippTools/src/regtoolConfig.c
===================================================================
--- trunk/ippTools/src/regtoolConfig.c	(revision 8281)
+++ trunk/ippTools/src/regtoolConfig.c	(revision 8292)
@@ -7,8 +7,8 @@
 
 #include "pxtools.h"
-#include "p0search.h"
+#include "p0tool.h"
 
 // this function can not fail -- exits on error
-pxConfig *p0searchConfig(pxConfig *config, int argc, char **argv) {
+pxConfig *p0toolConfig(pxConfig *config, int argc, char **argv) {
     if (!config) {
         config = pxConfigAlloc();
@@ -146,12 +146,12 @@
 
     // find which mode we're running under
-    PXTOOL_MODE("-pendingexp",   P0SEARCH_MODE_PENDINGEXP,  pendingexpArgs);
-    PXTOOL_MODE("-pendingimfile",P0SEARCH_MODE_PENDINGIMFILE,pendingimfileArgs);
-    PXTOOL_MODE("-updateexp",    P0SEARCH_MODE_UPDATEEXP,   updateexpArgs);
-    PXTOOL_MODE("-updateimfile", P0SEARCH_MODE_UPDATEIMFILE,updateimfileArgs);
-    PXTOOL_MODE("-rawimfile",    P0SEARCH_MODE_RAWIMFILE,   rawimfileArgs);
+    PXTOOL_MODE("-pendingexp",   P0TOOL_MODE_PENDINGEXP,  pendingexpArgs);
+    PXTOOL_MODE("-pendingimfile",P0TOOL_MODE_PENDINGIMFILE,pendingimfileArgs);
+    PXTOOL_MODE("-updateexp",    P0TOOL_MODE_UPDATEEXP,   updateexpArgs);
+    PXTOOL_MODE("-updateimfile", P0TOOL_MODE_UPDATEIMFILE,updateimfileArgs);
+    PXTOOL_MODE("-rawimfile",    P0TOOL_MODE_RAWIMFILE,   rawimfileArgs);
 
     bool argErr = false;
-    if (config->mode == P0SEARCH_MODE_NONE) {
+    if (config->mode == P0TOOL_MODE_NONE) {
         argErr = true;
         fprintf (stderr, "mode argument is required\n");
@@ -162,5 +162,5 @@
 
     if (argErr) {
-        printf("\nPan-STARRS Phase 0 Search Tool\n");
+        printf("\nPan-STARRS Phase 0 Tool\n");
         printf("Usage: %s <mode> [<options>]\n\n", argv[0]);
         printf(" <mode> : [-pendingexp|-pendingimfile|-updateexp|-updateimfile|-rawimfile]\n\n");