Index: /trunk/ippTools/src/Makefile.am
===================================================================
--- /trunk/ippTools/src/Makefile.am	(revision 12024)
+++ /trunk/ippTools/src/Makefile.am	(revision 12025)
@@ -22,11 +22,11 @@
 	dettool.h \
 	detselect.h \
-	p0tool.h \
-	p1tool.h \
-	p2tool.h \
-	p3tool.h \
-	p4tool.h \
-	p5tool.h \
-	p6tool.h \
+	regtool.h \
+	guidetool.h \
+	chiptool.h \
+	camtool.h \
+	warptool.h \
+	difftool.h \
+	stacktool.h \
 	pxadmin.h \
 	pxinject.h \
@@ -60,42 +60,42 @@
 regtool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 regtool_SOURCES = \
-    p0tool.c \
-    p0toolConfig.c
+    regtool.c \
+    regtoolConfig.c
 
 guidetool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) 
 guidetool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 guidetool_SOURCES = \
-    p1tool.c \
-    p1toolConfig.c
+    guidetool.c \
+    guidetoolConfig.c
 
 chiptool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
 chiptool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 chiptool_SOURCES = \
-    p2tool.c \
-    p2toolConfig.c
+    chiptool.c \
+    chiptoolConfig.c
 
 camtool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
 camtool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 camtool_SOURCES = \
-    p3tool.c \
-    p3toolConfig.c
+    camtool.c \
+    camtoolConfig.c
 
 warptool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
 warptool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 warptool_SOURCES = \
-    p4tool.c \
-    p4toolConfig.c
+    warptool.c \
+    warptoolConfig.c
 
 difftool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
 difftool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 difftool_SOURCES = \
-    p5tool.c \
-    p5toolConfig.c
+    difftool.c \
+    difftoolConfig.c
 
 stacktool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
 stacktool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
 stacktool_SOURCES = \
-    p6tool.c \
-    p6toolConfig.c
+    stacktool.c \
+    stacktoolConfig.c
 
 pxadmin_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
Index: /trunk/ippTools/src/camtool.c
===================================================================
--- /trunk/ippTools/src/camtool.c	(revision 12024)
+++ /trunk/ippTools/src/camtool.c	(revision 12025)
@@ -1,4 +1,4 @@
 /*
- * p3tool.c
+ * camtool.c
  *
  * Copyright (C) 2006  Joshua Hoblitt
@@ -25,5 +25,5 @@
 
 #include "pxtools.h"
-#include "p3tool.h"
+#include "camtool.h"
 
 static bool pendingexpMode(pxConfig *config);
Index: /trunk/ippTools/src/camtool.h
===================================================================
--- /trunk/ippTools/src/camtool.h	(revision 12024)
+++ /trunk/ippTools/src/camtool.h	(revision 12025)
@@ -1,4 +1,4 @@
 /*
- * p3tool.h
+ * camtool.h
  *
  * Copyright (C) 2006  Joshua Hoblitt
Index: /trunk/ippTools/src/camtoolConfig.c
===================================================================
--- /trunk/ippTools/src/camtoolConfig.c	(revision 12024)
+++ /trunk/ippTools/src/camtoolConfig.c	(revision 12025)
@@ -1,4 +1,4 @@
 /*
- * p3toolConfig.c
+ * camtoolConfig.c
  *
  * Copyright (C) 2006  Joshua Hoblitt
@@ -26,5 +26,5 @@
 
 #include "pxtools.h"
-#include "p3tool.h"
+#include "camtool.h"
 
 pxConfig *camtoolConfig(pxConfig *config, int argc, char **argv)
Index: /trunk/ippTools/src/chiptool.c
===================================================================
--- /trunk/ippTools/src/chiptool.c	(revision 12024)
+++ /trunk/ippTools/src/chiptool.c	(revision 12025)
@@ -27,5 +27,5 @@
 
 #include "pxtools.h"
-#include "p2tool.h"
+#include "chiptool.h"
 
 static bool queuerawexpMode(pxConfig *config);
Index: /trunk/ippTools/src/chiptool.h
===================================================================
--- /trunk/ippTools/src/chiptool.h	(revision 12024)
+++ /trunk/ippTools/src/chiptool.h	(revision 12025)
@@ -1,4 +1,4 @@
 /*
- * p2tool.h
+ * chiptool.h
  *
  * Copyright (C) 2006  Joshua Hoblitt
Index: /trunk/ippTools/src/chiptoolConfig.c
===================================================================
--- /trunk/ippTools/src/chiptoolConfig.c	(revision 12024)
+++ /trunk/ippTools/src/chiptoolConfig.c	(revision 12025)
@@ -1,4 +1,4 @@
 /*
- * p2toolConfig.c
+ * chiptoolConfig.c
  *
  * Copyright (C) 2006  Joshua Hoblitt
@@ -25,5 +25,5 @@
 
 #include "pxtools.h"
-#include "p2tool.h"
+#include "chiptool.h"
 
 pxConfig *chiptoolConfig(pxConfig *config, int argc, char **argv) {
Index: /trunk/ippTools/src/difftool.c
===================================================================
--- /trunk/ippTools/src/difftool.c	(revision 12024)
+++ /trunk/ippTools/src/difftool.c	(revision 12025)
@@ -1,4 +1,4 @@
 /*
- * p5tool.c
+ * difftool.c
  *
  * Copyright (C) 2007  Joshua Hoblitt
@@ -29,5 +29,5 @@
 
 #include "pxtools.h"
-#include "p5tool.h"
+#include "difftool.h"
 
 static bool definerunMode(pxConfig *config);
Index: /trunk/ippTools/src/difftool.h
===================================================================
--- /trunk/ippTools/src/difftool.h	(revision 12024)
+++ /trunk/ippTools/src/difftool.h	(revision 12025)
@@ -1,4 +1,4 @@
 /*
- * p5tool.h
+ * difftool.h
  *
  * Copyright (C) 2007  Joshua Hoblitt
Index: /trunk/ippTools/src/difftoolConfig.c
===================================================================
--- /trunk/ippTools/src/difftoolConfig.c	(revision 12024)
+++ /trunk/ippTools/src/difftoolConfig.c	(revision 12025)
@@ -1,4 +1,4 @@
 /*
- * p5toolConfig.c
+ * difftoolConfig.c
  *
  * Copyright (C) 2007  Joshua Hoblitt
@@ -25,5 +25,5 @@
 
 #include "pxtools.h"
-#include "p5tool.h"
+#include "difftool.h"
 
 pxConfig *difftoolConfig(pxConfig *config, int argc, char **argv)
Index: /trunk/ippTools/src/guidetool.c
===================================================================
--- /trunk/ippTools/src/guidetool.c	(revision 12024)
+++ /trunk/ippTools/src/guidetool.c	(revision 12025)
@@ -1,4 +1,4 @@
 /*
- * p1tool.c
+ * guidetool.c
  *
  * Copyright (C) 2006  Joshua Hoblitt
@@ -25,5 +25,5 @@
 
 #include "pxtools.h"
-#include "p1tool.h"
+#include "guidetool.h"
 
 static bool pendingMode(pxConfig *config);
Index: /trunk/ippTools/src/guidetool.h
===================================================================
--- /trunk/ippTools/src/guidetool.h	(revision 12024)
+++ /trunk/ippTools/src/guidetool.h	(revision 12025)
@@ -1,4 +1,4 @@
 /*
- * p1tool.h
+ * guidetool.h
  *
  * Copyright (C) 2006  Joshua Hoblitt
Index: /trunk/ippTools/src/guidetoolConfig.c
===================================================================
--- /trunk/ippTools/src/guidetoolConfig.c	(revision 12024)
+++ /trunk/ippTools/src/guidetoolConfig.c	(revision 12025)
@@ -1,4 +1,4 @@
 /*
- * p1toolConfig.c
+ * guidetoolConfig.c
  *
  * Copyright (C) 2006  Joshua Hoblitt
Index: /trunk/ippTools/src/pxinjectConfig.c
===================================================================
--- /trunk/ippTools/src/pxinjectConfig.c	(revision 12024)
+++ /trunk/ippTools/src/pxinjectConfig.c	(revision 12025)
@@ -175,7 +175,7 @@
         int n = 0;
         bool status = false;
-        if ((n = psMetadataLookupS32(&status, config->args, "-p1_version"))) {
-            if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "p1_version", 0, "==", n)) {
-                psError(PS_ERR_UNKNOWN, false, "failed to add item p1_version");
+        if ((n = psMetadataLookupS32(&status, config->args, "-guide_version"))) {
+            if (!psMetadataAddS32(config->where, PS_LIST_TAIL, "guide_version", 0, "==", n)) {
+                psError(PS_ERR_UNKNOWN, false, "failed to add item guide_version");
                 psFree(config);
                 return NULL;
Index: /trunk/ippTools/src/regtool.c
===================================================================
--- /trunk/ippTools/src/regtool.c	(revision 12024)
+++ /trunk/ippTools/src/regtool.c	(revision 12025)
@@ -1,4 +1,4 @@
 /*
- * p0tool.c
+ * regtool.c
  *
  * Copyright (C) 2006  Joshua Hoblitt
@@ -25,5 +25,5 @@
 
 #include "pxtools.h"
-#include "p0tool.h"
+#include "regtool.h"
 
 static bool pendingimfileMode(pxConfig *config);
@@ -38,5 +38,5 @@
 
 
-// static p1PendingExpRow *newToP1PendingExp(newExpRow *newExp);
+// static guidePendingExpRow *newToP1PendingExp(newExpRow *newExp);
 static chipPendingExpRow *newTochipPendingExp(pxConfig *config, newExpRow *newExp);
 static chipPendingImfileRow *rawImfileTochipPendingImfile(pxConfig *config, rawImfileRow *rawImfile);
@@ -168,5 +168,5 @@
 
     // negate simple so the default is true
-    if (!ippdbPrintMetadatas(stdout, output, "p0PendingImfile", !simple)) {
+    if (!ippdbPrintMetadatas(stdout, output, "regPendingImfile", !simple)) {
         psError(PXTOOLS_ERR_PROG, false, "failed to print array");
         psFree(output);
@@ -540,5 +540,5 @@
 
     // negate simple so the default is true
-    if (!ippdbPrintMetadatas(stdout, output, "p0PendingExp", !simple)) {
+    if (!ippdbPrintMetadatas(stdout, output, "regPendingExp", !simple)) {
         psError(PXTOOLS_ERR_PROG, false, "failed to print array");
         psFree(output);
@@ -894,7 +894,7 @@
 
 # if 0
-static p1PendingExpRow *newToP1PendingExp(newExpRow *newExp)
-{
-    return p1PendingExpRowAlloc(
+static guidePendingExpRow *newToP1PendingExp(newExpRow *newExp)
+{
+    return guidePendingExpRowAlloc(
         newExp->exp_tag,
         newExp->camera,
@@ -931,5 +931,5 @@
         exp->exp_tag,
         0x0,            // chip version XXX calc version number
-        0xdeadbeef,     // p1 version
+        0xdeadbeef,     // guide version
         label,
         "my recipe",
@@ -947,5 +947,5 @@
         rawImfile->exp_tag,
         0x0,          // chip version XXX calc version number
-        0xdeadbeef,   // p1 version
+        0xdeadbeef,   // guide version
         rawImfile->class_id,
         "my recipe",
Index: /trunk/ippTools/src/regtool.h
===================================================================
--- /trunk/ippTools/src/regtool.h	(revision 12024)
+++ /trunk/ippTools/src/regtool.h	(revision 12025)
@@ -1,4 +1,4 @@
 /*
- * p0tool.h
+ * regtool.h
  *
  * Copyright (C) 2006  Joshua Hoblitt
Index: /trunk/ippTools/src/regtoolConfig.c
===================================================================
--- /trunk/ippTools/src/regtoolConfig.c	(revision 12024)
+++ /trunk/ippTools/src/regtoolConfig.c	(revision 12025)
@@ -1,4 +1,4 @@
 /*
- * p0toolConfig.c
+ * regtoolConfig.c
  *
  * Copyright (C) 2006  Joshua Hoblitt
@@ -26,5 +26,5 @@
 
 #include "pxtools.h"
-#include "p0tool.h"
+#include "regtool.h"
 
 pxConfig *regtoolConfig(pxConfig *config, int argc, char **argv)
Index: /trunk/ippTools/src/stacktool.c
===================================================================
--- /trunk/ippTools/src/stacktool.c	(revision 12024)
+++ /trunk/ippTools/src/stacktool.c	(revision 12025)
@@ -1,4 +1,4 @@
 /*
- * p6tool.c
+ * stacktool.c
  *
  * Copyright (C) 2007  Joshua Hoblitt
@@ -29,5 +29,5 @@
 
 #include "pxtools.h"
-#include "p6tool.h"
+#include "stacktool.h"
 
 static bool definerunMode(pxConfig *config);
Index: /trunk/ippTools/src/stacktool.h
===================================================================
--- /trunk/ippTools/src/stacktool.h	(revision 12024)
+++ /trunk/ippTools/src/stacktool.h	(revision 12025)
@@ -1,4 +1,4 @@
 /*
- * p6tool.h
+ * stacktool.h
  *
  * Copyright (C) 2007  Joshua Hoblitt
Index: /trunk/ippTools/src/stacktoolConfig.c
===================================================================
--- /trunk/ippTools/src/stacktoolConfig.c	(revision 12024)
+++ /trunk/ippTools/src/stacktoolConfig.c	(revision 12025)
@@ -1,4 +1,4 @@
 /*
- * p6toolConfig.c
+ * stacktoolConfig.c
  *
  * Copyright (C) 2007  Joshua Hoblitt
@@ -25,5 +25,5 @@
 
 #include "pxtools.h"
-#include "p6tool.h"
+#include "stacktool.h"
 
 pxConfig *stacktoolConfig(pxConfig *config, int argc, char **argv) {
@@ -56,7 +56,7 @@
     psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-tess_id",  0,
             "define tessellation ID (required)", NULL);
-    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-p4_id",
+    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-warp_id",
              PS_META_DUPLICATE_OK,
-             "include this p4 ID (multiple OK, required)", NULL);
+             "include this warp ID (multiple OK, required)", NULL);
 
     psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-simple",  0,
@@ -65,6 +65,6 @@
     // -updaterun
     psMetadata *updaterunArgs = psMetadataAlloc();
-    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-p6_id", 0,
-            "define p6 ID (required)", NULL);
+    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-stack_id", 0,
+            "define stack ID (required)", NULL);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0,
             "set state (required)", NULL);
@@ -78,15 +78,15 @@
     // -addinputskyfile
     psMetadata *addinputskyfileArgs = psMetadataAlloc();
-    psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-p6_id", 0,
-            "define p6 ID (required)", NULL);
-    psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-p4_id", 0,
-            "define p4 ID (required)", NULL);
+    psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-stack_id", 0,
+            "define stack ID (required)", NULL);
+    psMetadataAddStr(addinputskyfileArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "define warp ID (required)", NULL);
 
     // -inputskyfile
     psMetadata *inputskyfileArgs = psMetadataAlloc();
-    psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-p6_id", 0,
-            "search by p6 ID (required)", NULL);
-    psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-p4_id", 0,
-            "search by p4 ID (required)", NULL);
+    psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-stack_id", 0,
+            "search by stack ID (required)", NULL);
+    psMetadataAddStr(inputskyfileArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "search by warp ID (required)", NULL);
     psMetadataAddU64(inputskyfileArgs, PS_LIST_TAIL, "-limit",  0,
             "limit result set to N items", 0);
@@ -96,8 +96,8 @@
     // -tosum
     psMetadata *tosumArgs = psMetadataAlloc();
-    psMetadataAddStr(tosumArgs, PS_LIST_TAIL, "-p6_id", 0,
-            "search by p6 ID (required)", NULL);
-    psMetadataAddStr(tosumArgs, PS_LIST_TAIL, "-p4_id", 0,
-            "search by p4 ID (required)", NULL);
+    psMetadataAddStr(tosumArgs, PS_LIST_TAIL, "-stack_id", 0,
+            "search by stack ID (required)", NULL);
+    psMetadataAddStr(tosumArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "search by warp ID (required)", NULL);
     psMetadataAddU64(tosumArgs, PS_LIST_TAIL, "-limit",  0,
             "limit result set to N items", 0);
@@ -107,6 +107,6 @@
     // -addsumskyfile
     psMetadata *addsumskyfileArgs = psMetadataAlloc();
-    psMetadataAddStr(addsumskyfileArgs, PS_LIST_TAIL, "-p6_id", 0,
-            "define p4 ID (required)", NULL);
+    psMetadataAddStr(addsumskyfileArgs, PS_LIST_TAIL, "-stack_id", 0,
+            "define warp ID (required)", NULL);
     psMetadataAddStr(addsumskyfileArgs, PS_LIST_TAIL, "-uri", 0,
             "define URI of file (required)", 0);
@@ -118,8 +118,8 @@
     // -sumskyfile
     psMetadata *sumskyfileArgs= psMetadataAlloc();
-    psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-p6_id", 0,
-            "search by p6 ID (required)", NULL);
-    psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-p4_id", 0,
-            "search by p4 ID (required)", NULL);
+    psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-stack_id", 0,
+            "search by stack ID (required)", NULL);
+    psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-warp_id", 0,
+            "search by warp ID (required)", NULL);
     psMetadataAddU64(sumskyfileArgs, PS_LIST_TAIL, "-limit",  0,
             "limit result set to N items", 0);
@@ -225,7 +225,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;
Index: /trunk/ippTools/src/warptool.c
===================================================================
--- /trunk/ippTools/src/warptool.c	(revision 12024)
+++ /trunk/ippTools/src/warptool.c	(revision 12025)
@@ -1,4 +1,4 @@
 /*
- * p4tool.c
+ * warptool.c
  *
  * Copyright (C) 2006  Joshua Hoblitt
@@ -29,5 +29,5 @@
 
 #include "pxtools.h"
-#include "p4tool.h"
+#include "warptool.h"
 
 static bool definerunMode(pxConfig *config);
Index: /trunk/ippTools/src/warptool.h
===================================================================
--- /trunk/ippTools/src/warptool.h	(revision 12024)
+++ /trunk/ippTools/src/warptool.h	(revision 12025)
@@ -1,4 +1,4 @@
 /*
- * p4tool.h
+ * warptool.h
  *
  * Copyright (C) 2006  Joshua Hoblitt
Index: /trunk/ippTools/src/warptoolConfig.c
===================================================================
--- /trunk/ippTools/src/warptoolConfig.c	(revision 12024)
+++ /trunk/ippTools/src/warptoolConfig.c	(revision 12025)
@@ -1,4 +1,4 @@
 /*
- * p4toolConfig.c
+ * warptoolConfig.c
  *
  * Copyright (C) 2006  Joshua Hoblitt
@@ -25,5 +25,5 @@
 
 #include "pxtools.h"
-#include "p4tool.h"
+#include "warptool.h"
 
 pxConfig *warptoolConfig(pxConfig *config, int argc, char **argv) {