Index: trunk/ippTools/src/chiptool.c
===================================================================
--- trunk/ippTools/src/chiptool.c	(revision 11972)
+++ trunk/ippTools/src/chiptool.c	(revision 11997)
@@ -53,5 +53,5 @@
     psLibInit(NULL);
 
-    pxConfig *config = p2toolConfig(NULL, argc, argv);
+    pxConfig *config = chiptoolConfig(NULL, argc, argv);
     if (!config) {
         psError(PXTOOLS_ERR_CONFIG, false, "failed to configure");
@@ -60,12 +60,12 @@
 
     switch (config->mode) {
-        MODECASE(P2TOOL_MODE_QUEUERAWEXP,           queuerawexpMode);
-        MODECASE(P2TOOL_MODE_PENDINGIMFILE,         pendingimfileMode);
-        MODECASE(P2TOOL_MODE_ADDPROCESSEDIMFILE,    addprocessedimfileMode);
-        MODECASE(P2TOOL_MODE_PROCESSEDIMFILE,       processedimfileMode);
-        MODECASE(P2TOOL_MODE_UPDATEPROCESSEDIMFILE, updateprocessedimfileMode);
-        MODECASE(P2TOOL_MODE_BLOCK,                 blockMode);
-        MODECASE(P2TOOL_MODE_MASKED,                maskedMode);
-        MODECASE(P2TOOL_MODE_UNBLOCK,               unblockMode);
+        MODECASE(CHIPTOOL_MODE_QUEUERAWEXP,           queuerawexpMode);
+        MODECASE(CHIPTOOL_MODE_PENDINGIMFILE,         pendingimfileMode);
+        MODECASE(CHIPTOOL_MODE_ADDPROCESSEDIMFILE,    addprocessedimfileMode);
+        MODECASE(CHIPTOOL_MODE_PROCESSEDIMFILE,       processedimfileMode);
+        MODECASE(CHIPTOOL_MODE_UPDATEPROCESSEDIMFILE, updateprocessedimfileMode);
+        MODECASE(CHIPTOOL_MODE_BLOCK,                 blockMode);
+        MODECASE(CHIPTOOL_MODE_MASKED,                maskedMode);
+        MODECASE(CHIPTOOL_MODE_UNBLOCK,               unblockMode);
         default:
             psAbort("invalid option (this should not happen)");