Index: trunk/ippTools/src/camtoolConfig.c
===================================================================
--- trunk/ippTools/src/camtoolConfig.c	(revision 11844)
+++ trunk/ippTools/src/camtoolConfig.c	(revision 11997)
@@ -28,5 +28,5 @@
 #include "p3tool.h"
 
-pxConfig *p3toolConfig(pxConfig *config, int argc, char **argv)
+pxConfig *camtoolConfig(pxConfig *config, int argc, char **argv)
 {
     if (!config) {
@@ -165,15 +165,15 @@
     psMetadata *argSets = psMetadataAlloc();
     // find which mode we're running under
-    PXTOOL_MODE("-pendingexp",   P3TOOL_MODE_PENDINGEXP,    pendingexpArgs);
-    PXTOOL_MODE("-pendingimfile",P3TOOL_MODE_PENDINGIMFILE, pendingimfileArgs);
-    PXTOOL_MODE("-addprocessedexp", P3TOOL_MODE_ADDPROCESSEDEXP, addprocessedexpArgs);
-    PXTOOL_MODE("-processedexp", P3TOOL_MODE_PROCESSEDEXP,  processedexpArgs);
-    PXTOOL_MODE("-updateprocessedexp", P3TOOL_MODE_UPDATEPROCESSEDEXP,updateprocessedexpArgs);
-    PXTOOL_MODE("-block",        P3TOOL_MODE_BLOCK,         blockArgs);
-    PXTOOL_MODE("-masked",       P3TOOL_MODE_MASKED,        maskedArgs);
-    PXTOOL_MODE("-unblock",      P3TOOL_MODE_UNBLOCK,       unblockArgs);
+    PXTOOL_MODE("-pendingexp",   CAMTOOL_MODE_PENDINGEXP,    pendingexpArgs);
+    PXTOOL_MODE("-pendingimfile",CAMTOOL_MODE_PENDINGIMFILE, pendingimfileArgs);
+    PXTOOL_MODE("-addprocessedexp", CAMTOOL_MODE_ADDPROCESSEDEXP, addprocessedexpArgs);
+    PXTOOL_MODE("-processedexp", CAMTOOL_MODE_PROCESSEDEXP,  processedexpArgs);
+    PXTOOL_MODE("-updateprocessedexp", CAMTOOL_MODE_UPDATEPROCESSEDEXP,updateprocessedexpArgs);
+    PXTOOL_MODE("-block",        CAMTOOL_MODE_BLOCK,         blockArgs);
+    PXTOOL_MODE("-masked",       CAMTOOL_MODE_MASKED,        maskedArgs);
+    PXTOOL_MODE("-unblock",      CAMTOOL_MODE_UNBLOCK,       unblockArgs);
 
     bool argErr = false;
-    if (config->mode == P3TOOL_MODE_NONE) {
+    if (config->mode == CAMTOOL_MODE_NONE) {
         argErr = true;
         fprintf (stderr, "mode argument is required\n");
@@ -184,5 +184,5 @@
 
     if (argErr) {
-        printf("\nPan-STARRS Phase 3 Tool\n");
+        printf("\nPan-STARRS Camera Tool\n");
         printf("Usage: %s <mode> [<options>]\n\n", argv[0]);
         printf(" <mode> :\n\n");