Index: trunk/ippTools/src/warptool.c
===================================================================
--- trunk/ippTools/src/warptool.c	(revision 11985)
+++ trunk/ippTools/src/warptool.c	(revision 11997)
@@ -59,5 +59,5 @@
     psLibInit(NULL);
 
-    pxConfig *config = p4toolConfig(NULL, argc, argv);
+    pxConfig *config = warptoolConfig(NULL, argc, argv);
     if (!config) {
         psError(PXTOOLS_ERR_CONFIG, false, "failed to configure");
@@ -66,15 +66,15 @@
 
     switch (config->mode) {
-        MODECASE(P4TOOL_MODE_DEFINERUN,         definerunMode);
-        MODECASE(P4TOOL_MODE_UPDATERUN,         updaterunMode);
-        MODECASE(P4TOOL_MODE_ADDINPUTEXP,       addinputexpMode);
-        MODECASE(P4TOOL_MODE_EXP,               expMode);
-        MODECASE(P4TOOL_MODE_IMFILE,            imfileMode);
-        MODECASE(P4TOOL_MODE_TOOVERLAP,         tooverlapMode);
-        MODECASE(P4TOOL_MODE_ADDOVERLAP,        addoverlapMode);
-        MODECASE(P4TOOL_MODE_SCMAP,             scmapMode);
-        MODECASE(P4TOOL_MODE_TOWARPED,          towarpedMode);
-        MODECASE(P4TOOL_MODE_ADDWARPED,         addwarpedMode);
-        MODECASE(P4TOOL_MODE_WARPED,            warpedMode);
+        MODECASE(WARPTOOL_MODE_DEFINERUN,         definerunMode);
+        MODECASE(WARPTOOL_MODE_UPDATERUN,         updaterunMode);
+        MODECASE(WARPTOOL_MODE_ADDINPUTEXP,       addinputexpMode);
+        MODECASE(WARPTOOL_MODE_EXP,               expMode);
+        MODECASE(WARPTOOL_MODE_IMFILE,            imfileMode);
+        MODECASE(WARPTOOL_MODE_TOOVERLAP,         tooverlapMode);
+        MODECASE(WARPTOOL_MODE_ADDOVERLAP,        addoverlapMode);
+        MODECASE(WARPTOOL_MODE_SCMAP,             scmapMode);
+        MODECASE(WARPTOOL_MODE_TOWARPED,          towarpedMode);
+        MODECASE(WARPTOOL_MODE_ADDWARPED,         addwarpedMode);
+        MODECASE(WARPTOOL_MODE_WARPED,            warpedMode);
         default:
             psAbort("invalid option (this should not happen)");