Index: trunk/ippTools/src/guidetool.c
===================================================================
--- trunk/ippTools/src/guidetool.c	(revision 11997)
+++ trunk/ippTools/src/guidetool.c	(revision 12024)
@@ -29,5 +29,5 @@
 static bool pendingMode(pxConfig *config);
 static bool defineMode(pxConfig *config);
-static p1PendingExpRow *rawScienceTop1PendingExp(pxConfig *config, rawScienceExpRow *exp);
+static guidePendingExpRow *rawScienceToguidePendingExp(pxConfig *config, rawScienceExpRow *exp);
 
 int main(int argc, char **argv)
@@ -61,12 +61,12 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-    // return all p1PendingExp rows unless there CLI search options
-    psArray *p1PendingExp = p1PendingExpSelectRowObjects(
+    // return all guidePendingExp rows unless there CLI search options
+    psArray *guidePendingExp = guidePendingExpSelectRowObjects(
         config->dbh,
         config->where ? config->where : NULL,
         0
     );
-    if (!p1PendingExp) {
-        psError(PS_ERR_UNKNOWN, false, "no p1PendingExp found");
+    if (!guidePendingExp) {
+        psError(PS_ERR_UNKNOWN, false, "no guidePendingExp found");
         return false;
     }
@@ -74,7 +74,7 @@
     psMetadata *output = psMetadataAlloc();
 
-    for (long i = 0; i < psArrayLength(p1PendingExp); i++) {
-        psMetadata *md = p1PendingExpMetadataFromObject(p1PendingExp->data[i]);
-        psMetadataAddMetadata(output, PS_LIST_TAIL, "p1PendingExp",
+    for (long i = 0; i < psArrayLength(guidePendingExp); i++) {
+        psMetadata *md = guidePendingExpMetadataFromObject(guidePendingExp->data[i]);
+        psMetadataAddMetadata(output, PS_LIST_TAIL, "guidePendingExp",
             PS_META_DUPLICATE_OK, NULL, md);
         psFree(md);
@@ -106,12 +106,12 @@
     }
 
-    // insert the rawScienceExps into p1PendingExp
+    // insert the rawScienceExps into guidePendingExp
     // XXX for the being we're going to skip checking for duplicate entries
     // XXX this will have to implimented unless duplicate key insertion 
     // XXX support is implimented in psDB
     for (long i = 0; i < psArrayLength(rawScienceExps); i++) {
-        p1PendingExpRow * new = rawScienceTop1PendingExp(
+        guidePendingExpRow * new = rawScienceToguidePendingExp(
                                             config, rawScienceExps->data[i]);
-        if (!p1PendingExpInsertObject(config->dbh, new)) {
+        if (!guidePendingExpInsertObject(config->dbh, new)) {
             psError(PS_ERR_UNKNOWN, false, "dbh access failed");
             return false; 
@@ -123,5 +123,5 @@
 }
 
-static p1PendingExpRow *rawScienceTop1PendingExp(pxConfig *config, rawScienceExpRow *exp)
+static guidePendingExpRow *rawScienceToguidePendingExp(pxConfig *config, rawScienceExpRow *exp)
 {
     PS_ASSERT_PTR_NON_NULL(config, NULL);
@@ -184,5 +184,5 @@
     }
 
-    return p1PendingExpRowAlloc(
+    return guidePendingExpRowAlloc(
         exp->exp_tag,
         exp->camera,