Index: trunk/ippTools/src/chiptool.c
===================================================================
--- trunk/ippTools/src/chiptool.c	(revision 12188)
+++ trunk/ippTools/src/chiptool.c	(revision 12190)
@@ -31,5 +31,5 @@
 #include "camtool.h"
 
-static bool queuerawexpMode(pxConfig *config);
+static bool queueMode(pxConfig *config);
 static bool pendingimfileMode(pxConfig *config);
 static bool addprocessedimfileMode(pxConfig *config);
@@ -61,12 +61,12 @@
 
     switch (config->mode) {
-        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);
+        MODECASE(CHIPTOOL_MODE_QUEUE,                   queueMode);
+        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)");
@@ -126,5 +126,5 @@
 
 
-static bool queuerawexpMode(pxConfig *config)
+static bool queueMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, NULL);
@@ -235,5 +235,5 @@
 
         // queue the exp
-        if (!chipQueueRawExp(config, exp_tag, label, recipe, expgroup, dvodb)) {
+        if (!chipQueueExpTag(config, exp_tag, label, recipe, expgroup, dvodb)) {
             if (!psDBRollback(config->dbh)) {
                 psError(PS_ERR_UNKNOWN, false, "database error");