Index: trunk/ippTools/src/chiptool.c
===================================================================
--- trunk/ippTools/src/chiptool.c	(revision 8120)
+++ trunk/ippTools/src/chiptool.c	(revision 8535)
@@ -6,5 +6,5 @@
 
 #include "pxtools.h"
-#include "p2search.h"
+#include "p2tool.h"
 
 static bool quickMode(pxConfig *config);
@@ -24,11 +24,11 @@
     psLibInit(NULL);
 
-    pxConfig *config = p2searchConfig(NULL, argc, argv);
+    pxConfig *config = p2toolConfig(NULL, argc, argv);
 
     switch (config->mode) {
-        MODECASE(P2SEARCH_MODE_QUICK, quickMode);
-        MODECASE(P2SEARCH_MODE_DEFINE, defineMode);
-        MODECASE(P2SEARCH_MODE_PENDING, pendingMode);
-        MODECASE(P2SEARCH_MODE_DONE, doneMode);
+        MODECASE(P2TOOL_MODE_QUICK, quickMode);
+        MODECASE(P2TOOL_MODE_DEFINE, defineMode);
+        MODECASE(P2TOOL_MODE_PENDING, pendingMode);
+        MODECASE(P2TOOL_MODE_DONE, doneMode);
         default:
             psAbort(argv[0], "invalid option (this should not happen)");