Index: trunk/ippTools/src/camtool.c
===================================================================
--- trunk/ippTools/src/camtool.c	(revision 11875)
+++ trunk/ippTools/src/camtool.c	(revision 11997)
@@ -47,5 +47,5 @@
     psLibInit(NULL);
 
-    pxConfig *config = p3toolConfig(NULL, argc, argv);
+    pxConfig *config = camtoolConfig(NULL, argc, argv);
     if (!config) {
         psError(PXTOOLS_ERR_CONFIG, false, "failed to configure");
@@ -54,12 +54,12 @@
 
     switch (config->mode) {
-        MODECASE(P3TOOL_MODE_PENDINGEXP,        pendingexpMode);
-        MODECASE(P3TOOL_MODE_PENDINGIMFILE,     pendingimfileMode);
-        MODECASE(P3TOOL_MODE_ADDPROCESSEDEXP,   addprocessedexpMode);
-        MODECASE(P3TOOL_MODE_PROCESSEDEXP,      processedexpMode);
-        MODECASE(P3TOOL_MODE_UPDATEPROCESSEDEXP,updateprocessedexpMode);
-        MODECASE(P3TOOL_MODE_BLOCK,             blockMode);
-        MODECASE(P3TOOL_MODE_MASKED,            maskedMode);
-        MODECASE(P3TOOL_MODE_UNBLOCK,           unblockMode);
+        MODECASE(CAMTOOL_MODE_PENDINGEXP,        pendingexpMode);
+        MODECASE(CAMTOOL_MODE_PENDINGIMFILE,     pendingimfileMode);
+        MODECASE(CAMTOOL_MODE_ADDPROCESSEDEXP,   addprocessedexpMode);
+        MODECASE(CAMTOOL_MODE_PROCESSEDEXP,      processedexpMode);
+        MODECASE(CAMTOOL_MODE_UPDATEPROCESSEDEXP,updateprocessedexpMode);
+        MODECASE(CAMTOOL_MODE_BLOCK,             blockMode);
+        MODECASE(CAMTOOL_MODE_MASKED,            maskedMode);
+        MODECASE(CAMTOOL_MODE_UNBLOCK,           unblockMode);
         default:
             psAbort("invalid option (this should not happen)");