Index: trunk/ippTools/src/chiptoolConfig.c
===================================================================
--- trunk/ippTools/src/chiptoolConfig.c	(revision 8459)
+++ trunk/ippTools/src/chiptoolConfig.c	(revision 8535)
@@ -6,8 +6,8 @@
 
 #include "pxtools.h"
-#include "p2search.h"
+#include "p2tool.h"
 
 // this function can not fail -- exits on error
-pxConfig *p2searchConfig(pxConfig *config, int argc, char **argv) {
+pxConfig *p2toolConfig(pxConfig *config, int argc, char **argv) {
     if (!config) {
         config = pxConfigAlloc();
@@ -58,11 +58,11 @@
 }
 
-    PXTOOL_MODE("-quick",       P2SEARCH_MODE_QUICK,        quickArgs);
-    PXTOOL_MODE("-define",      P2SEARCH_MODE_DEFINE,       defineArgs);
-    PXTOOL_MODE("-pending",     P2SEARCH_MODE_PENDING,      pendingArgs);
-    PXTOOL_MODE("-done",        P2SEARCH_MODE_DONE,         doneArgs);
+    PXTOOL_MODE("-quick",       P2TOOL_MODE_QUICK,        quickArgs);
+    PXTOOL_MODE("-define",      P2TOOL_MODE_DEFINE,       defineArgs);
+    PXTOOL_MODE("-pending",     P2TOOL_MODE_PENDING,      pendingArgs);
+    PXTOOL_MODE("-done",        P2TOOL_MODE_DONE,         doneArgs);
 
     bool argErr = false;
-    if (config->mode == P2SEARCH_MODE_NONE) {
+    if (config->mode == P2TOOL_MODE_NONE) {
             argErr = true;
         fprintf (stderr, "mode argument is required\n");