Index: /trunk/ippTools/src/Makefile.am
===================================================================
--- /trunk/ippTools/src/Makefile.am	(revision 8535)
+++ /trunk/ippTools/src/Makefile.am	(revision 8536)
@@ -1,5 +1,5 @@
 bin_PROGRAMS = \
 	pxadmin \
-	pzsearch \
+	pztool \
 	p0tool \
 	p2tool\
@@ -16,5 +16,5 @@
 	pzgetexp.h \
 	pzgetimfiles.h \
-	pzsearch.h \
+	pztool.h \
 	p0tool.h \
 	p1search.h \
@@ -40,9 +40,9 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src$
 
-pzsearch_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
-pzsearch_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
-pzsearch_SOURCES = \
-    pzsearch.c \
-    pzsearchConfig.c
+pztool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
+pztool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
+pztool_SOURCES = \
+    pztool.c \
+    pztoolConfig.c
 
 p0tool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) $(pxtools_CFLAGS)
Index: /trunk/ippTools/src/pztool.c
===================================================================
--- /trunk/ippTools/src/pztool.c	(revision 8535)
+++ /trunk/ippTools/src/pztool.c	(revision 8536)
@@ -6,5 +6,5 @@
 
 #include "pxtools.h"
-#include "pzsearch.h"
+#include "pztool.h"
 
 static bool seenMode(pxConfig *config);
@@ -12,7 +12,7 @@
 static bool copydoneMode(pxConfig *config);
 static bool summitExpPrint(FILE *stream, summitExpRow *summitExp);
-static psArray *pzsearchPendingExp(pxConfig *config);
-static psArray *pzsearchPendingImfiles(pxConfig *config);
-static bool pzsearchFlushPendingExp(pxConfig *config);
+static psArray *pztoolPendingExp(pxConfig *config);
+static psArray *pztoolPendingImfiles(pxConfig *config);
+static bool pztoolFlushPendingExp(pxConfig *config);
 
 # define MODECASE(caseName, func) \
@@ -28,10 +28,10 @@
     psLibInit(NULL);
 
-    pxConfig *config = pzsearchConfig(NULL, argc, argv);
+    pxConfig *config = pztoolConfig(NULL, argc, argv);
 
     switch (config->mode) {
-        MODECASE(PZSEARCH_MODE_SEEN, seenMode);
-        MODECASE(PZSEARCH_MODE_PENDING, pendingMode);
-        MODECASE(PZSEARCH_MODE_COPYDONE, copydoneMode);
+        MODECASE(PZTOOL_MODE_SEEN, seenMode);
+        MODECASE(PZTOOL_MODE_PENDING, pendingMode);
+        MODECASE(PZTOOL_MODE_COPYDONE, copydoneMode);
         default:
             psAbort(argv[0], "invalid option (this should not happen)");
@@ -120,5 +120,5 @@
     // we don't have to operate on complete frames here as it's ok to start
     // downloading the imfiles before the exp has been registered
-    psArray *pending = pzsearchPendingImfiles(config);
+    psArray *pending = pztoolPendingImfiles(config);
     if (!pending) {
         psError(PS_ERR_UNKNOWN, false, "no pzPendingImfiles found");
@@ -159,6 +159,6 @@
 
     // check for completed exps
-    if (!pzsearchFlushPendingExp(config)) {
-        psError(PS_ERR_UNKNOWN, false, "pzsearchFlushPendingExp() failed");
+    if (!pztoolFlushPendingExp(config)) {
+        psError(PS_ERR_UNKNOWN, false, "pztoolFlushPendingExp() failed");
         goto ROLLBACK; 
     }
@@ -198,5 +198,5 @@
 }
 
-static psArray *pzsearchPendingExp(pxConfig *config)
+static psArray *pztoolPendingExp(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, NULL);
@@ -212,5 +212,5 @@
 }
 
-static psArray *pzsearchPendingImfiles(pxConfig *config)
+static psArray *pztoolPendingImfiles(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, NULL);
@@ -226,9 +226,9 @@
 }
 
-static bool pzsearchFlushPendingExp(pxConfig *config)
-{
-    PS_ASSERT_PTR_NON_NULL(config, false);
-
-    psArray *pending = pzsearchPendingExp(config);
+static bool pztoolFlushPendingExp(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    psArray *pending = pztoolPendingExp(config);
     if (!pending) {
         psError(PS_ERR_UNKNOWN, false, "no pzPendingExps found");
Index: /trunk/ippTools/src/pztool.h
===================================================================
--- /trunk/ippTools/src/pztool.h	(revision 8535)
+++ /trunk/ippTools/src/pztool.h	(revision 8536)
@@ -1,15 +1,15 @@
-#ifndef PZSEARCH_H
-#define PZSEARCH_H 1
+#ifndef PZTOOL_H
+#define PZTOOL_H 1
 
 #include "pxtools.h"
 
 typedef enum {
-    PZSEARCH_MODE_NONE      = 0x0,
-    PZSEARCH_MODE_SEEN,
-    PZSEARCH_MODE_PENDING,
-    PZSEARCH_MODE_COPYDONE
-} pzsearchMode;
+    PZTOOL_MODE_NONE      = 0x0,
+    PZTOOL_MODE_SEEN,
+    PZTOOL_MODE_PENDING,
+    PZTOOL_MODE_COPYDONE
+} pztoolMode;
 
-pxConfig *pzsearchConfig(pxConfig *config, int argc, char **argv);
+pxConfig *pztoolConfig(pxConfig *config, int argc, char **argv);
 
-#endif // PZSEARCH_H
+#endif // PZTOOL_H
Index: /trunk/ippTools/src/pztoolConfig.c
===================================================================
--- /trunk/ippTools/src/pztoolConfig.c	(revision 8535)
+++ /trunk/ippTools/src/pztoolConfig.c	(revision 8536)
@@ -6,8 +6,8 @@
 
 #include "pxtools.h"
-#include "pzsearch.h"
+#include "pztool.h"
 
 // this function can not fail -- exits on error
-pxConfig *pzsearchConfig(pxConfig *config, int argc, char **argv) {
+pxConfig *pztoolConfig(pxConfig *config, int argc, char **argv) {
     if (!config) {
         config = pxConfigAlloc();
@@ -67,10 +67,10 @@
 }
 
-    PXTOOL_MODE("-seen",            PZSEARCH_MODE_SEEN,         seenArgs);
-    PXTOOL_MODE("-pending",         PZSEARCH_MODE_PENDING,      pendingArgs);
-    PXTOOL_MODE("-copydone",        PZSEARCH_MODE_COPYDONE,     copydoneArgs);
+    PXTOOL_MODE("-seen",            PZTOOL_MODE_SEEN,         seenArgs);
+    PXTOOL_MODE("-pending",         PZTOOL_MODE_PENDING,      pendingArgs);
+    PXTOOL_MODE("-copydone",        PZTOOL_MODE_COPYDONE,     copydoneArgs);
 
     bool argErr = false;
-    if (config->mode == PZSEARCH_MODE_NONE) {
+    if (config->mode == PZTOOL_MODE_NONE) {
         argErr = true;
         fprintf (stderr, "mode argument is required\n");