Index: trunk/ippTools/src/difftoolConfig.c
===================================================================
--- trunk/ippTools/src/difftoolConfig.c	(revision 11997)
+++ trunk/ippTools/src/difftoolConfig.c	(revision 12024)
@@ -62,6 +62,6 @@
     // -updaterun
     psMetadata *updaterunArgs = psMetadataAlloc();
-    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-p5_id", 0,
-            "define p5 ID (required)", NULL);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-diff_id", 0,
+            "define diff ID (required)", NULL);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0,
             "set state (required)", NULL);
@@ -75,8 +75,8 @@
     // -addinputskyfile
     psMetadata *addinputskyfileArgs = psMetadataAlloc();
-    psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-p5_id", 0,
-            "define p5 ID (required)", NULL);
-    psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-p4_id", 0,
-            "define p4 ID (required)", NULL);
+    psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-diff_id", 0,
+            "define diff ID (required)", NULL);
+    psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "define warp ID (required)", NULL);
     psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-skycell_id", 0,
             "define by skycell ID", NULL);
@@ -90,8 +90,8 @@
     // -inputskyfile
     psMetadata *inputskyfileArgs = psMetadataAlloc();
-    psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-p5_id", 0,
-            "search by p5 ID (required)", NULL);
-    psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-p4_id", 0,
-            "search by p4 ID (required)", NULL);
+    psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-diff_id", 0,
+            "search by diff ID (required)", NULL);
+    psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "search by warp ID (required)", NULL);
     psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-skycell_id", 0,
             "search by skycell ID", NULL);
@@ -109,6 +109,6 @@
     // -todiffskyfile
     psMetadata *todiffskyfileArgs = psMetadataAlloc();
-    psMetadataAddStr(todiffskyfileArgs, PS_LIST_TAIL, "-p5_id", 0,
-            "search by p5 ID", NULL);
+    psMetadataAddStr(todiffskyfileArgs, PS_LIST_TAIL, "-diff_id", 0,
+            "search by diff ID", NULL);
     psMetadataAddU64(todiffskyfileArgs, PS_LIST_TAIL, "-limit",  0,
             "limit result set to N items", 0);
@@ -118,6 +118,6 @@
     // -adddiffskyfile
     psMetadata *adddiffskyfileArgs = psMetadataAlloc();
-    psMetadataAddStr(adddiffskyfileArgs, PS_LIST_TAIL, "-p5_id", 0,
-            "define p4 ID (required)", NULL);
+    psMetadataAddStr(adddiffskyfileArgs, PS_LIST_TAIL, "-diff_id", 0,
+            "define warp ID (required)", NULL);
     psMetadataAddStr(adddiffskyfileArgs, PS_LIST_TAIL, "-uri", 0,
             "define URI of file (required)", 0);
@@ -129,6 +129,6 @@
     // -diffskyfile
     psMetadata *diffskyfileArgs = psMetadataAlloc();
-    psMetadataAddStr(diffskyfileArgs, PS_LIST_TAIL, "-p5_id", 0,
-            "search by p4 ID", NULL);
+    psMetadataAddStr(diffskyfileArgs, PS_LIST_TAIL, "-diff_id", 0,
+            "search by warp ID", NULL);
     psMetadataAddStr(diffskyfileArgs , PS_LIST_TAIL, "-skycell_id",  0,
             "define skycell ID (required)", NULL);
@@ -238,7 +238,7 @@
     psString str = NULL;
     bool status = false;
-    if ((str = psMetadataLookupStr(&status, config->args, "-p5_id"))) {
-        if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "p5_id", 0, "==", (psS32)atoi(str))) {
-            psError(PS_ERR_UNKNOWN, false, "failed to add item p5_id");
+    if ((str = psMetadataLookupStr(&status, config->args, "-diff_id"))) {
+        if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "diff_id", 0, "==", (psS32)atoi(str))) {
+            psError(PS_ERR_UNKNOWN, false, "failed to add item diff_id");
             psFree(config);
             return NULL;
@@ -249,7 +249,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;