Index: trunk/ippTools/src/warptoolConfig.c
===================================================================
--- trunk/ippTools/src/warptoolConfig.c	(revision 11997)
+++ trunk/ippTools/src/warptoolConfig.c	(revision 12024)
@@ -59,6 +59,6 @@
     // -updaterun
     psMetadata *updaterunArgs = psMetadataAlloc();
-    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-p4_id", 0,
-            "define p4 ID (required)", NULL);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "define warp ID (required)", NULL);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0,
             "set state (required)", NULL);
@@ -72,9 +72,9 @@
     // -addinputexp
     psMetadata *addinputexpArgs = psMetadataAlloc();
-    psMetadataAddStr(addinputexpArgs, PS_LIST_TAIL, "-p4_id", 0,
-            "define p4 ID (required)", NULL);
+    psMetadataAddStr(addinputexpArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "define warp ID (required)", NULL);
     psMetadataAddStr(addinputexpArgs, PS_LIST_TAIL, "-exp_tag", 0,
             "define exposure tag (required)", NULL);
-    psMetadataAddS32(addinputexpArgs, PS_LIST_TAIL, "-p3_version", 0,
+    psMetadataAddS32(addinputexpArgs, PS_LIST_TAIL, "-cam_version", 0,
             "define phase 3 version of exposure tag (required)", 0);
     psMetadataAddBool(addinputexpArgs, PS_LIST_TAIL, "-magiced",  0,
@@ -83,9 +83,9 @@
     // -exp
     psMetadata *expArgs = psMetadataAlloc();
-    psMetadataAddStr(expArgs, PS_LIST_TAIL, "-p4_id", 0,
-            "define p4 ID (required)", NULL);
+    psMetadataAddStr(expArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "define warp ID (required)", NULL);
     psMetadataAddStr(expArgs, PS_LIST_TAIL, "-exp_tag", 0,
             "define exposure tag (required)", NULL);
-    psMetadataAddS32(expArgs, PS_LIST_TAIL, "-p3_version", 0,
+    psMetadataAddS32(expArgs, PS_LIST_TAIL, "-cam_version", 0,
             "define phase 3 version of exposure tag (required)", 0);
     psMetadataAddU64(expArgs, PS_LIST_TAIL, "-limit",  0,
@@ -96,9 +96,9 @@
     // -imfile
     psMetadata *imfileArgs = psMetadataAlloc();
-    psMetadataAddStr(imfileArgs, PS_LIST_TAIL, "-p4_id", 0,
-            "define p4 ID (required)", NULL);
+    psMetadataAddStr(imfileArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "define warp ID (required)", NULL);
     psMetadataAddStr(imfileArgs, PS_LIST_TAIL, "-exp_tag", 0,
             "define exposure tag (required)", NULL);
-    psMetadataAddS32(imfileArgs, PS_LIST_TAIL, "-p3_version", 0,
+    psMetadataAddS32(imfileArgs, PS_LIST_TAIL, "-cam_version", 0,
             "define phase 3 version of exposure tag (required)", 0);
     psMetadataAddU64(imfileArgs, PS_LIST_TAIL, "-limit",  0,
@@ -109,6 +109,6 @@
     // -tooverlap
     psMetadata *tooverlapArgs = psMetadataAlloc();
-    psMetadataAddStr(tooverlapArgs, PS_LIST_TAIL, "-p4_id", 0,
-            "search by p4 ID", NULL);
+    psMetadataAddStr(tooverlapArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "search by warp ID", NULL);
     psMetadataAddU64(tooverlapArgs, PS_LIST_TAIL, "-limit",  0,
             "limit result set to N items", 0);
@@ -123,6 +123,6 @@
     // -scmap
     psMetadata *scmapArgs = psMetadataAlloc();
-    psMetadataAddStr(scmapArgs, PS_LIST_TAIL, "-p4_id", 0,
-            "search by p4 ID", NULL);
+    psMetadataAddStr(scmapArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "search by warp ID", NULL);
     psMetadataAddStr(scmapArgs, PS_LIST_TAIL, "-skycell_id", 0,
             "searcy by skycell ID", NULL);
@@ -136,6 +136,6 @@
     // -towarped
     psMetadata *towarpedArgs = psMetadataAlloc();
-    psMetadataAddStr(towarpedArgs, PS_LIST_TAIL, "-p4_id", 0,
-            "search by p4 ID", NULL);
+    psMetadataAddStr(towarpedArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "search by warp ID", NULL);
     psMetadataAddU64(towarpedArgs, PS_LIST_TAIL, "-limit",  0,
             "limit result set to N items", 0);
@@ -145,6 +145,6 @@
     // -addwarped
     psMetadata *addwarpedArgs = psMetadataAlloc();
-    psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-p4_id", 0,
-            "define p4 ID (required)", NULL);
+    psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "define warp ID (required)", NULL);
     psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-skycell_id",  0,
             "define skycell ID (required)", NULL);
@@ -160,6 +160,6 @@
     // -warped
     psMetadata *warpedArgs = psMetadataAlloc();
-    psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-p4_id", 0,
-            "search by p4 ID", NULL);
+    psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "search by warp ID", NULL);
     psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-skycell_id",  0,
             "define skycell ID (required)", NULL);
@@ -168,5 +168,5 @@
     psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-exp_tag", 0,
             "define exposure tag (required)", NULL);
-    psMetadataAddS32(warpedArgs, PS_LIST_TAIL, "-p3_version", 0,
+    psMetadataAddS32(warpedArgs, PS_LIST_TAIL, "-cam_version", 0,
             "define phase 3 version of exposure tag (required)", 0);
     psMetadataAddU64(warpedArgs, PS_LIST_TAIL, "-limit",  0,
@@ -285,7 +285,7 @@
     psString str = NULL;
     bool status = false;
-    if ((str = psMetadataLookupStr(&status, config->args, "-p4_id"))) {
-        if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "p4_id", 0, "==", (psS32)atoi(str))) {
-            psError(PS_ERR_UNKNOWN, false, "failed to add item p4_id");
+    if ((str = psMetadataLookupStr(&status, config->args, "-warp_id"))) {
+        if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "warp_id", 0, "==", (psS32)atoi(str))) {
+            psError(PS_ERR_UNKNOWN, false, "failed to add item warp_id");
             psFree(config);
             return NULL;