Index: /trunk/ippTools/autogen.sh
===================================================================
--- /trunk/ippTools/autogen.sh	(revision 6209)
+++ /trunk/ippTools/autogen.sh	(revision 6210)
@@ -8,5 +8,5 @@
 cd $srcdir
 
-PROJECT=p2tools
+PROJECT=pxtools
 TEST_TYPE=-f
 # change this to be a unique filename in the top level dir
Index: /trunk/ippTools/configure.ac
===================================================================
--- /trunk/ippTools/configure.ac	(revision 6209)
+++ /trunk/ippTools/configure.ac	(revision 6210)
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
 
-AC_INIT([p2tools], [0.0.1], [eugene@ifa.hawaii.edu])
+AC_INIT([pxtools], [0.0.1], [jhoblitt@ifa.hawaii.edu])
 AC_CONFIG_SRCDIR([autogen.sh])
 
@@ -18,6 +18,6 @@
 PKG_CHECK_MODULES([METADATADB], [metadatadb >= 0.0.1]) 
 
-p2tools_CFLAGS="-Wall -Werror -std=c99"
-AC_SUBST([p2tools_CFLAGS])
+pxtools_CFLAGS="-Wall -Werror -std=c99"
+AC_SUBST([pxtools_CFLAGS])
 
 AC_CONFIG_FILES([
Index: /trunk/ippTools/src/Makefile.am
===================================================================
--- /trunk/ippTools/src/Makefile.am	(revision 6209)
+++ /trunk/ippTools/src/Makefile.am	(revision 6210)
@@ -1,13 +1,12 @@
-bin_PROGRAMS = p2search p2admin
+bin_PROGRAMS = p2search pxadmin
 
-include_HEADERS = p2tools.h
-lib_LTLIBRARIES = libp2tools.la
-libp2tools_la_CFLAGS	= $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(METADATADB_CFLAGS) $(p2tools_CFLAGS)
-libp2tools_la_LIBS      = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(METADATADB_LIBS)
-libp2tools_la_LDFLAGS   = -release $(PACKAGE_VERSION)
-libp2tools_la_SOURCES   = \
+include_HEADERS = pxtools.h
+lib_LTLIBRARIES = libpxtools.la
+libpxtools_la_CFLAGS	= $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(METADATADB_CFLAGS) $(pxtools_CFLAGS)
+libpxtools_la_LIBS      = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(METADATADB_LIBS)
+libpxtools_la_LDFLAGS   = -release $(PACKAGE_VERSION)
+libpxtools_la_SOURCES   = \
     p2searchDoneFrames.c \
-    p2adminTables.c \
-    p2alloc.c \
+    pxalloc.c \
     p2insertDoneFrames.c \
     p2insertPendingFrames.c \
@@ -17,20 +16,21 @@
     p2searchRawFrames.c \
     p2updatePending.c \
-    p2writePendingFrames.c
+    p2writePendingFrames.c \
+    pxtables.c
 
 
-# for p2tools.h
+# for pxtools.h
 AM_CPPFLAGS = -I$(top_srcdir)/src$
 
-p2search_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(METADATADB_CFLAGS) $(p2tools_CFLAGS)
-p2search_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(METADATADB_LIBS) $(top_builddir)/src/libp2tools.la
+p2search_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(METADATADB_CFLAGS) $(pxtools_CFLAGS)
+p2search_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(METADATADB_LIBS) $(top_builddir)/src/libpxtools.la
 p2search_SOURCES = \
     p2search.c \
     p2searchConfig.c
-p2admin_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(METADATADB_CFLAGS) $(p2tools_CFLAGS)
-p2admin_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(METADATADB_LIBS) $(top_builddir)/src/libp2tools.la
-p2admin_SOURCES = \
-    p2admin.c \
-    p2adminConfig.c
+pxadmin_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(METADATADB_CFLAGS) $(pxtools_CFLAGS)
+pxadmin_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(METADATADB_LIBS) $(top_builddir)/src/libpxtools.la
+pxadmin_SOURCES = \
+    pxadmin.c \
+    pxadminConfig.c
 
 clean-local:
Index: /trunk/ippTools/src/chiptool.c
===================================================================
--- /trunk/ippTools/src/chiptool.c	(revision 6209)
+++ /trunk/ippTools/src/chiptool.c	(revision 6210)
@@ -1,13 +1,13 @@
 #include <stdlib.h>
 
-#include "p2tools.h"
-
-static bool quickMode(p2Config *config);
-static bool defineMode(p2Config *config);
-static bool pendingMode(p2Config *config);
-static bool doneMode(p2Config *config);
+#include "pxtools.h"
+
+static bool quickMode(pxConfig *config);
+static bool defineMode(pxConfig *config);
+static bool pendingMode(pxConfig *config);
+static bool doneMode(pxConfig *config);
 
 int main(int argc, char **argv) {
-    p2Config        config; 
+    pxConfig        config; 
 
     p2searchConfig(&config, argc, argv);
@@ -49,5 +49,5 @@
 }
 
-static bool quickMode(p2Config *config)
+static bool quickMode(pxConfig *config)
 {
     psArray *rawFrames = p2searchRawFrames(config);
@@ -70,5 +70,5 @@
 }
 
-static bool defineMode(p2Config *config)
+static bool defineMode(pxConfig *config)
 {
     psArray *rawFrames = p2searchRawFrames(config);
@@ -136,5 +136,5 @@
 }
 
-static bool pendingMode(p2Config *config)
+static bool pendingMode(pxConfig *config)
 {
     psArray *pendingFrames = p2searchPendingFrames(config);
@@ -152,5 +152,5 @@
 }
 
-static bool doneMode(p2Config *config)
+static bool doneMode(pxConfig *config)
 {
     // get exp_id/class/class_id/url from the CLI // add the completed imfile to
Index: /trunk/ippTools/src/chiptoolConfig.c
===================================================================
--- /trunk/ippTools/src/chiptoolConfig.c	(revision 6209)
+++ /trunk/ippTools/src/chiptoolConfig.c	(revision 6210)
@@ -1,7 +1,7 @@
 #include <pmConfig.h>
 
-#include "p2tools.h"
+#include "pxtools.h"
 
-bool p2searchConfig(p2Config *config, int argc, char **argv) {
+bool p2searchConfig(pxConfig *config, int argc, char **argv) {
     PS_ASSERT_PTR_NON_NULL(config, false);
 
Index: /trunk/ippTools/src/p2insertDoneFrames.c
===================================================================
--- /trunk/ippTools/src/p2insertDoneFrames.c	(revision 6209)
+++ /trunk/ippTools/src/p2insertDoneFrames.c	(revision 6210)
@@ -1,7 +1,7 @@
 # include <metadatadb.h>
-# include "p2tools.h"
+#include "pxtools.h"
 
 // select pending frames (exposure+images) which are done/not done
-bool p2insertDoneFrames(p2Config *config, psArray *doneFrames) {
+bool p2insertDoneFrames(pxConfig *config, psArray *doneFrames) {
     PS_ASSERT_PTR_NON_NULL(config, false);
     PS_ASSERT_PTR_NON_NULL(doneFrames, false);
Index: /trunk/ippTools/src/p2insertPendingFrames.c
===================================================================
--- /trunk/ippTools/src/p2insertPendingFrames.c	(revision 6209)
+++ /trunk/ippTools/src/p2insertPendingFrames.c	(revision 6210)
@@ -1,10 +1,10 @@
 #include <metadatadb.h>
 
-# include "p2tools.h"
+#include "pxtools.h"
 
 // select pending frames (exposure+images) which are done/not done
 // NOTE this function converts the rawFrames to pendingFrames AND inserts them
 //      this is useful since the table must be locked the whole time, to get the versions
-bool p2insertPendingFrames(p2Config *config, psArray *rawFrames) {
+bool p2insertPendingFrames(pxConfig *config, psArray *rawFrames) {
     PS_ASSERT_PTR_NON_NULL(config, false);
     PS_ASSERT_PTR_NON_NULL(rawFrames, false);
Index: /trunk/ippTools/src/p2pendingToDone.c
===================================================================
--- /trunk/ippTools/src/p2pendingToDone.c	(revision 6209)
+++ /trunk/ippTools/src/p2pendingToDone.c	(revision 6210)
@@ -1,6 +1,6 @@
-# include "p2tools.h"
+#include "pxtools.h"
 
 // select pending frames (exposure+images) which are done/not done
-psArray *p2pendingToDone(p2Config *config, psArray *pendingFrames) {
+psArray *p2pendingToDone(pxConfig *config, psArray *pendingFrames) {
     PS_ASSERT_PTR_NON_NULL(config, NULL);
     PS_ASSERT_PTR_NON_NULL(pendingFrames, NULL);
Index: /trunk/ippTools/src/p2rawToPending.c
===================================================================
--- /trunk/ippTools/src/p2rawToPending.c	(revision 6209)
+++ /trunk/ippTools/src/p2rawToPending.c	(revision 6210)
@@ -1,6 +1,6 @@
-# include "p2tools.h"
+#include "pxtools.h"
 
 // select pending frames (exposure+images) which are done/not done
-psArray *p2rawToPending(p2Config *config, psArray *rawFrames) {
+psArray *p2rawToPending(pxConfig *config, psArray *rawFrames) {
     PS_ASSERT_PTR_NON_NULL(config, NULL);
     PS_ASSERT_PTR_NON_NULL(rawFrames, NULL);
Index: /trunk/ippTools/src/p2searchDoneFrames.c
===================================================================
--- /trunk/ippTools/src/p2searchDoneFrames.c	(revision 6209)
+++ /trunk/ippTools/src/p2searchDoneFrames.c	(revision 6210)
@@ -1,6 +1,6 @@
-#include "p2tools.h"
+#include "pxtools.h"
 
 // select raw frames (exposure+images) which match the given config options
-psArray *p2searchDoneFrames(p2Config *config) {
+psArray *p2searchDoneFrames(pxConfig *config) {
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
Index: /trunk/ippTools/src/p2searchPendingFrames.c
===================================================================
--- /trunk/ippTools/src/p2searchPendingFrames.c	(revision 6209)
+++ /trunk/ippTools/src/p2searchPendingFrames.c	(revision 6210)
@@ -1,6 +1,6 @@
-# include "p2tools.h"
+#include "pxtools.h"
 
 // select pending frames (exposure+images) which are done/not done
-psArray *p2searchPendingFrames(p2Config *config) {
+psArray *p2searchPendingFrames(pxConfig *config) {
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
@@ -78,5 +78,5 @@
 // the selection.  test to see how well/poorly this performs
 
-psArray *p2searchPendingImfiles(p2Config *config)
+psArray *p2searchPendingImfiles(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, NULL);
@@ -125,5 +125,5 @@
 }
 
-psArray *p2searchPendingExp(p2Config *config)
+psArray *p2searchPendingExp(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, NULL);
Index: /trunk/ippTools/src/p2searchRawFrames.c
===================================================================
--- /trunk/ippTools/src/p2searchRawFrames.c	(revision 6209)
+++ /trunk/ippTools/src/p2searchRawFrames.c	(revision 6210)
@@ -1,6 +1,6 @@
-# include "p2tools.h"
+#include "pxtools.h"
 
 // select raw frames (exposure+images) which match the given config options
-psArray *p2searchRawFrames(p2Config *config) {
+psArray *p2searchRawFrames(pxConfig *config) {
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
Index: /trunk/ippTools/src/p2updatePending.c
===================================================================
--- /trunk/ippTools/src/p2updatePending.c	(revision 6209)
+++ /trunk/ippTools/src/p2updatePending.c	(revision 6210)
@@ -1,6 +1,6 @@
-# include "p2tools.h"
+#include "pxtools.h"
 
 // select pending frames (exposure+images) which are not done, select their done images, count, update
-bool p2updatePendingFrames(p2Config *config, psArray *pendingFrames) {
+bool p2updatePendingFrames(pxConfig *config, psArray *pendingFrames) {
     PS_ASSERT_PTR_NON_NULL(config, false);
     PS_ASSERT_PTR_NON_NULL(pendingFrames, false);
Index: /trunk/ippTools/src/p2writePendingFrames.c
===================================================================
--- /trunk/ippTools/src/p2writePendingFrames.c	(revision 6209)
+++ /trunk/ippTools/src/p2writePendingFrames.c	(revision 6210)
@@ -1,6 +1,6 @@
-# include "p2tools.h"
+#include "pxtools.h"
 
 // select pending frames (exposure+images) which are done/not done
-bool p2writePendingFrames (p2Config *config, psArray *frames) {
+bool p2writePendingFrames (pxConfig *config, psArray *frames) {
     PS_ASSERT_PTR_NON_NULL(config, false);
     PS_ASSERT_PTR_NON_NULL(frames, false);
Index: /trunk/ippTools/src/pxadmin.c
===================================================================
--- /trunk/ippTools/src/pxadmin.c	(revision 6209)
+++ /trunk/ippTools/src/pxadmin.c	(revision 6210)
@@ -2,14 +2,15 @@
 #include <metadatadb.h>
 
-#include "p2tools.h"
+#include "pxtools.h"
 
-int main(int argc, char **argv) {
-    p2Config        config;
+int main(int argc, char **argv)
+{
+    pxConfig        config;
 
-    p2adminConfig(&config, argc, argv);
+    pxAdminConfig(&config, argc, argv);
 
     switch (config.mode) {
         case P2_MODE_RECREATE:
-            if (!p2deleteTables(&config)) {
+            if (!pxDeleteTables(&config)) {
                 psError(PS_ERR_UNKNOWN, false, "table deletion failed");
                 exit(EXIT_FAILURE);
@@ -17,5 +18,5 @@
             // fall through
         case P2_MODE_CREATE:
-            if (!p2createTables(&config)) {
+            if (!pxCreateTables(&config)) {
                 psError(PS_ERR_UNKNOWN, false, "table creation failed");
                 exit(EXIT_FAILURE);
@@ -23,5 +24,5 @@
             break;
         case P2_MODE_DELETE:
-            if (!p2deleteTables(&config)) {
+            if (!pxDeleteTables(&config)) {
                 psError(PS_ERR_UNKNOWN, false, "table deletion failed");
                 exit(EXIT_FAILURE);
Index: /trunk/ippTools/src/pxadminConfig.c
===================================================================
--- /trunk/ippTools/src/pxadminConfig.c	(revision 6209)
+++ /trunk/ippTools/src/pxadminConfig.c	(revision 6210)
@@ -1,6 +1,7 @@
-# include <pmConfig.h>
-# include "p2tools.h"
+#include <pmConfig.h>
+#include "pxtools.h"
 
-bool p2adminConfig(p2Config *config, int argc, char **argv) {
+bool pxAdminConfig(pxConfig *config, int argc, char **argv)
+{
     PS_ASSERT_PTR_NON_NULL(config, false);
 
Index: /trunk/ippTools/src/pxalloc.c
===================================================================
--- /trunk/ippTools/src/pxalloc.c	(revision 6209)
+++ /trunk/ippTools/src/pxalloc.c	(revision 6210)
@@ -1,3 +1,3 @@
-#include "p2tools.h"
+#include "pxtools.h"
 
 static void ppRawFrameFree(ppRawFrame *ptr);
Index: /trunk/ippTools/src/pxtools.h
===================================================================
--- /trunk/ippTools/src/pxtools.h	(revision 6209)
+++ /trunk/ippTools/src/pxtools.h	(revision 6210)
@@ -44,5 +44,5 @@
     char *class_id;
     char *url;
-} p2Config;
+} pxConfig;
 
 typedef struct {
@@ -76,21 +76,21 @@
 );
 
-bool p2createTables (p2Config *config);
-bool p2deleteTables (p2Config *config);
-bool p2adminConfig (p2Config *config, int argc, char **argv);
-bool p2searchConfig (p2Config *config, int argc, char **argv);
-psArray *p2rawToPending (p2Config *config, psArray *rawFrames);
-psArray *p2searchRawFrames (p2Config *config);
-bool p2insertPendingFrames (p2Config *config, psArray *rawFrames);
-psArray *p2searchPendingFrames (p2Config *config);
-bool p2writePendingImages (p2Config *config, psArray *frames);
-bool p2updatePendingFrames (p2Config *config, psArray *pendingFrames);
-psArray *p2pendingToDone (p2Config *config, psArray *pendingFrames);
-bool p2insertDoneFrames (p2Config *config, psArray *doneFrames);
+bool pxCreateTables (pxConfig *config);
+bool pxDeleteTables (pxConfig *config);
+bool pxAdminConfig (pxConfig *config, int argc, char **argv);
+bool p2searchConfig (pxConfig *config, int argc, char **argv);
+psArray *p2rawToPending (pxConfig *config, psArray *rawFrames);
+psArray *p2searchRawFrames (pxConfig *config);
+bool p2insertPendingFrames (pxConfig *config, psArray *rawFrames);
+psArray *p2searchPendingFrames (pxConfig *config);
+bool p2writePendingImages (pxConfig *config, psArray *frames);
+bool p2updatePendingFrames (pxConfig *config, psArray *pendingFrames);
+psArray *p2pendingToDone (pxConfig *config, psArray *pendingFrames);
+bool p2insertDoneFrames (pxConfig *config, psArray *doneFrames);
 bool psTimeIsZero(psTime *time);
-bool p2writePendingFrames (p2Config *config, psArray *frames);
-psArray *p2searchDoneFrames(p2Config *config);
-psArray *p2searchPendingImfiles(p2Config *config);
+bool p2writePendingFrames (pxConfig *config, psArray *frames);
+psArray *p2searchDoneFrames(pxConfig *config);
+psArray *p2searchPendingImfiles(pxConfig *config);
 psArray *p2pendingToDoneImfile(psArray *pendingImfiles);
-psArray *p2searchPendingExp(p2Config *config);
+psArray *p2searchPendingExp(pxConfig *config);
 p2DoneExpRow *p2pendingToDoneExp(p2PendingExpRow *pendingExp);