Index: /trunk/ippTools/src/Makefile.am
===================================================================
--- /trunk/ippTools/src/Makefile.am	(revision 8534)
+++ /trunk/ippTools/src/Makefile.am	(revision 8535)
@@ -3,5 +3,5 @@
 	pzsearch \
 	p0tool \
-	p2search \
+	p2tool\
 	dettool \
 	pzgetexp \
@@ -19,5 +19,5 @@
 	p0tool.h \
 	p1search.h \
-	p2search.h \
+	p2tool.h \
 	dettool.h \
 	pxinject.h
@@ -58,9 +58,9 @@
     p1searchConfig.c
 
-p2search_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
-p2search_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
-p2search_SOURCES = \
-    p2search.c \
-    p2searchConfig.c
+p2tool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
+p2tool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
+p2tool_SOURCES = \
+    p2tool.c \
+    p2toolConfig.c
 
 pxadmin_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
Index: /trunk/ippTools/src/chiptool.c
===================================================================
--- /trunk/ippTools/src/chiptool.c	(revision 8534)
+++ /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)");
Index: /trunk/ippTools/src/chiptool.h
===================================================================
--- /trunk/ippTools/src/chiptool.h	(revision 8534)
+++ /trunk/ippTools/src/chiptool.h	(revision 8535)
@@ -1,16 +1,16 @@
-#ifndef P2SEARCH_H
-#define P2SEARCH_H 1
+#ifndef P2TOOL_H
+#define P2TOOL_H 1
 
 #include "pxtools.h"
 
 typedef enum {
-    P2SEARCH_MODE_NONE      = 0x0,
-    P2SEARCH_MODE_QUICK,
-    P2SEARCH_MODE_DEFINE,
-    P2SEARCH_MODE_PENDING,
-    P2SEARCH_MODE_DONE
-} p2searchMode;
+    P2TOOL_MODE_NONE      = 0x0,
+    P2TOOL_MODE_QUICK,
+    P2TOOL_MODE_DEFINE,
+    P2TOOL_MODE_PENDING,
+    P2TOOL_MODE_DONE
+} p2toolMode;
 
-pxConfig *p2searchConfig(pxConfig *config, int argc, char **argv);
+pxConfig *p2toolConfig(pxConfig *config, int argc, char **argv);
 
-#endif // P2SEARCH_H
+#endif // P2TOOL_H
Index: /trunk/ippTools/src/chiptoolConfig.c
===================================================================
--- /trunk/ippTools/src/chiptoolConfig.c	(revision 8534)
+++ /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");