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",