Index: /trunk/ippTools/src/Makefile.am
===================================================================
--- /trunk/ippTools/src/Makefile.am	(revision 8536)
+++ /trunk/ippTools/src/Makefile.am	(revision 8537)
@@ -18,5 +18,5 @@
 	pztool.h \
 	p0tool.h \
-	p1search.h \
+	p1tool.h \
 	p2tool.h \
 	dettool.h \
@@ -52,9 +52,9 @@
     p0toolConfig.c
 
-p1search_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
-p1search_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
-p1search_SOURCES = \
-    p1search.c \
-    p1searchConfig.c
+p1tool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
+p1tool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
+p1tool_SOURCES = \
+    p1tool.c \
+    p1toolConfig.c
 
 p2tool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
Index: /trunk/ippTools/src/guidetool.c
===================================================================
--- /trunk/ippTools/src/guidetool.c	(revision 8536)
+++ /trunk/ippTools/src/guidetool.c	(revision 8537)
@@ -6,5 +6,5 @@
 
 #include "pxtools.h"
-#include "p1search.h"
+#include "p1tool.h"
 
 static bool pendingMode(pxConfig *config);
@@ -14,5 +14,5 @@
 int main(int argc, char **argv)
 {
-    pxConfig *config = p1searchConfig(NULL, argc, argv);
+    pxConfig *config = p1toolConfig(NULL, argc, argv);
 
     switch (config->mode) {
Index: /trunk/ippTools/src/guidetool.h
===================================================================
--- /trunk/ippTools/src/guidetool.h	(revision 8536)
+++ /trunk/ippTools/src/guidetool.h	(revision 8537)
@@ -1,8 +1,8 @@
-#ifndef P1SEARCH_H
-#define P1SEARCH_H 1
+#ifndef P1TOOL_H
+#define P1TOOL_H 1
 
 #include "pxtools.h"
 
-pxConfig *p1searchConfig(pxConfig *config, int argc, char **argv);
+pxConfig *p1toolConfig(pxConfig *config, int argc, char **argv);
 
-#endif // P1SEARCH_H
+#endif // P1TOOL_H
Index: /trunk/ippTools/src/guidetoolConfig.c
===================================================================
--- /trunk/ippTools/src/guidetoolConfig.c	(revision 8536)
+++ /trunk/ippTools/src/guidetoolConfig.c	(revision 8537)
@@ -9,5 +9,5 @@
 // this function can not fail -- exits on error
 
-pxConfig *p1searchConfig(pxConfig *config, int argc, char **argv) {
+pxConfig *p1toolConfig(pxConfig *config, int argc, char **argv) {
     if (!config) {
         config = pxConfigAlloc();