Index: trunk/ippTools/src/pztool.c
===================================================================
--- trunk/ippTools/src/pztool.c	(revision 8121)
+++ 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");