Index: /trunk/ippTools/src/camtool.c
===================================================================
--- /trunk/ippTools/src/camtool.c	(revision 19591)
+++ /trunk/ippTools/src/camtool.c	(revision 19592)
@@ -230,6 +230,6 @@
     }
 
-    PXOPT_LOOKUP_STR(state, config->args, "-state", false, false);
-    PXOPT_LOOKUP_STR(label, config->args, "-label", false, false);
+    PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false);
+    PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false);
 
     if ((!state) && (!label)) {
Index: /trunk/ippTools/src/camtoolConfig.c
===================================================================
--- /trunk/ippTools/src/camtoolConfig.c	(revision 19591)
+++ /trunk/ippTools/src/camtoolConfig.c	(revision 19592)
@@ -74,7 +74,6 @@
 
     psMetadataAddBool(updaterunArgs, PS_LIST_TAIL, "-all",               0, "allow everything to be queued without search terms", false);
-    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set-state",              0, "set state", NULL);
-    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set-label",              0, "set label", NULL);
-    // XXX change the two above to use -set-state and -set-label?
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_state",              0, "set state", NULL);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_label",              0, "set label", NULL);
 
     // -pendingexp
Index: /trunk/ippTools/src/chiptool.c
===================================================================
--- /trunk/ippTools/src/chiptool.c	(revision 19591)
+++ /trunk/ippTools/src/chiptool.c	(revision 19592)
@@ -245,5 +245,5 @@
     }
 
-    PXOPT_LOOKUP_STR(state, config->args, "-state", false, false);
+    PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false);
     PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false);
 
Index: /trunk/ippTools/src/faketool.c
===================================================================
--- /trunk/ippTools/src/faketool.c	(revision 19591)
+++ /trunk/ippTools/src/faketool.c	(revision 19592)
@@ -305,6 +305,6 @@
     }
 
-    PXOPT_LOOKUP_STR(state, config->args, "-set-state", false, false);
-    PXOPT_LOOKUP_STR(label, config->args, "-set-label", false, false);
+    PXOPT_LOOKUP_STR(state, config->args, "-set_state", false, false);
+    PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false);
 
     if ((!state) && (!label)) {
Index: /trunk/ippTools/src/faketoolConfig.c
===================================================================
--- /trunk/ippTools/src/faketoolConfig.c	(revision 19591)
+++ /trunk/ippTools/src/faketoolConfig.c	(revision 19592)
@@ -141,6 +141,6 @@
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", 0, "search by label", NULL);
 
-    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set-state", 0,            "set state", NULL);
-    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set-label", 0,            "set label", NULL);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_state", 0,            "set state", NULL);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_label", 0,            "set label", NULL);
     psMetadataAddBool(updaterunArgs, PS_LIST_TAIL, "-all",  0,            "allow everything to be queued without search terms", false);