Index: trunk/ippdb/tests/alloc.c
===================================================================
--- trunk/ippdb/tests/alloc.c	(revision 10748)
+++ trunk/ippdb/tests/alloc.c	(revision 10753)
@@ -1531,7 +1531,7 @@
 
     {
-        p4PStackedImfileRow *object;
-
-        object = p4PStackedImfileRowAlloc(-32, "a string", "a string", "a string", "a string"    );
+        p4StackedImfileRow *object;
+
+        object = p4StackedImfileRowAlloc(-32, "a string", "a string", "a string", "a string"    );
 
         if (!object) {
@@ -1564,7 +1564,7 @@
 
     {
-        p4PDiffImfileRow *object;
-
-        object = p4PDiffImfileRowAlloc(-32, "a string", -32, "a string", "a string", "a string", "a string"    );
+        p4DiffImfileRow *object;
+
+        object = p4DiffImfileRowAlloc(-32, "a string", -32, "a string", "a string", "a string", "a string"    );
 
         if (!object) {
@@ -1605,7 +1605,7 @@
 
     {
-        p4PMagicMaskImfileRow *object;
-
-        object = p4PMagicMaskImfileRowAlloc(-32, "a string", -32, "a string", "a string"    );
+        p4MagicMaskImfileRow *object;
+
+        object = p4MagicMaskImfileRowAlloc(-32, "a string", -32, "a string", "a string"    );
 
         if (!object) {
Index: trunk/ippdb/tests/createtable.c
===================================================================
--- trunk/ippdb/tests/createtable.c	(revision 10748)
+++ trunk/ippdb/tests/createtable.c	(revision 10753)
@@ -538,35 +538,35 @@
         }
 
-        if(!p4PStackedImfileCreateTable(dbh)) {
-            exit(EXIT_FAILURE);
-        }
-
-        psDBCleanup(dbh);
-    }
-
-    {
-        psDB            *dbh;
-
-        dbh = psDBInit("localhost", "test", NULL, "test");
-        if (!dbh) {
-            exit(EXIT_FAILURE);
-        }
-
-        if(!p4PDiffImfileCreateTable(dbh)) {
-            exit(EXIT_FAILURE);
-        }
-
-        psDBCleanup(dbh);
-    }
-
-    {
-        psDB            *dbh;
-
-        dbh = psDBInit("localhost", "test", NULL, "test");
-        if (!dbh) {
-            exit(EXIT_FAILURE);
-        }
-
-        if(!p4PMagicMaskImfileCreateTable(dbh)) {
+        if(!p4StackedImfileCreateTable(dbh)) {
+            exit(EXIT_FAILURE);
+        }
+
+        psDBCleanup(dbh);
+    }
+
+    {
+        psDB            *dbh;
+
+        dbh = psDBInit("localhost", "test", NULL, "test");
+        if (!dbh) {
+            exit(EXIT_FAILURE);
+        }
+
+        if(!p4DiffImfileCreateTable(dbh)) {
+            exit(EXIT_FAILURE);
+        }
+
+        psDBCleanup(dbh);
+    }
+
+    {
+        psDB            *dbh;
+
+        dbh = psDBInit("localhost", "test", NULL, "test");
+        if (!dbh) {
+            exit(EXIT_FAILURE);
+        }
+
+        if(!p4MagicMaskImfileCreateTable(dbh)) {
             exit(EXIT_FAILURE);
         }
Index: trunk/ippdb/tests/dbcleanup.c
===================================================================
--- trunk/ippdb/tests/dbcleanup.c	(revision 10748)
+++ trunk/ippdb/tests/dbcleanup.c	(revision 10753)
@@ -46,7 +46,7 @@
     p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4InputImfile");
     p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4WarpedImfile");
-    p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4PStackedImfile");
-    p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4PDiffImfile");
-    p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4PMagicMaskImfile");
+    p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4StackedImfile");
+    p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4DiffImfile");
+    p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4MagicMaskImfile");
 
     psDBCleanup(dbh);
Index: trunk/ippdb/tests/dbsetup.c
===================================================================
--- trunk/ippdb/tests/dbsetup.c	(revision 10748)
+++ trunk/ippdb/tests/dbsetup.c	(revision 10753)
@@ -118,12 +118,12 @@
     p4WarpedImfileCreateTable(dbh);
 
-    p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4PStackedImfile");
-    p4PStackedImfileCreateTable(dbh);
+    p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4StackedImfile");
+    p4StackedImfileCreateTable(dbh);
 
-    p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4PDiffImfile");
-    p4PDiffImfileCreateTable(dbh);
+    p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4DiffImfile");
+    p4DiffImfileCreateTable(dbh);
 
-    p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4PMagicMaskImfile");
-    p4PMagicMaskImfileCreateTable(dbh);
+    p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4MagicMaskImfile");
+    p4MagicMaskImfileCreateTable(dbh);
 
     psDBCleanup(dbh);
Index: trunk/ippdb/tests/droptable.c
===================================================================
--- trunk/ippdb/tests/droptable.c	(revision 10748)
+++ trunk/ippdb/tests/droptable.c	(revision 10753)
@@ -538,35 +538,35 @@
         }
 
-        if (!p4PStackedImfileDropTable(dbh)) {
-            exit(EXIT_FAILURE);
-        }
-
-        psDBCleanup(dbh);
-    }
-
-    {
-        psDB            *dbh;
-
-        dbh = psDBInit("localhost", "test", NULL, "test");
-        if (!dbh) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!p4PDiffImfileDropTable(dbh)) {
-            exit(EXIT_FAILURE);
-        }
-
-        psDBCleanup(dbh);
-    }
-
-    {
-        psDB            *dbh;
-
-        dbh = psDBInit("localhost", "test", NULL, "test");
-        if (!dbh) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!p4PMagicMaskImfileDropTable(dbh)) {
+        if (!p4StackedImfileDropTable(dbh)) {
+            exit(EXIT_FAILURE);
+        }
+
+        psDBCleanup(dbh);
+    }
+
+    {
+        psDB            *dbh;
+
+        dbh = psDBInit("localhost", "test", NULL, "test");
+        if (!dbh) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!p4DiffImfileDropTable(dbh)) {
+            exit(EXIT_FAILURE);
+        }
+
+        psDBCleanup(dbh);
+    }
+
+    {
+        psDB            *dbh;
+
+        dbh = psDBInit("localhost", "test", NULL, "test");
+        if (!dbh) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!p4MagicMaskImfileDropTable(dbh)) {
             exit(EXIT_FAILURE);
         }
Index: trunk/ippdb/tests/insert.c
===================================================================
--- trunk/ippdb/tests/insert.c	(revision 10748)
+++ trunk/ippdb/tests/insert.c	(revision 10753)
@@ -538,35 +538,35 @@
         }
 
-        if (!p4PStackedImfileInsert(dbh, -32, "a string", "a string", "a string", "a string")) {
-            exit(EXIT_FAILURE);
-        }
-
-        psDBCleanup(dbh);
-    }
-
-    {
-        psDB            *dbh;
-
-        dbh = psDBInit("localhost", "test", NULL, "test");
-        if (!dbh) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!p4PDiffImfileInsert(dbh, -32, "a string", -32, "a string", "a string", "a string", "a string")) {
-            exit(EXIT_FAILURE);
-        }
-
-        psDBCleanup(dbh);
-    }
-
-    {
-        psDB            *dbh;
-
-        dbh = psDBInit("localhost", "test", NULL, "test");
-        if (!dbh) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!p4PMagicMaskImfileInsert(dbh, -32, "a string", -32, "a string", "a string")) {
+        if (!p4StackedImfileInsert(dbh, -32, "a string", "a string", "a string", "a string")) {
+            exit(EXIT_FAILURE);
+        }
+
+        psDBCleanup(dbh);
+    }
+
+    {
+        psDB            *dbh;
+
+        dbh = psDBInit("localhost", "test", NULL, "test");
+        if (!dbh) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!p4DiffImfileInsert(dbh, -32, "a string", -32, "a string", "a string", "a string", "a string")) {
+            exit(EXIT_FAILURE);
+        }
+
+        psDBCleanup(dbh);
+    }
+
+    {
+        psDB            *dbh;
+
+        dbh = psDBInit("localhost", "test", NULL, "test");
+        if (!dbh) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!p4MagicMaskImfileInsert(dbh, -32, "a string", -32, "a string", "a string")) {
             exit(EXIT_FAILURE);
         }
Index: trunk/ippdb/tests/insertfits.c
===================================================================
--- trunk/ippdb/tests/insertfits.c	(revision 10748)
+++ trunk/ippdb/tests/insertfits.c	(revision 10753)
@@ -934,57 +934,57 @@
         }
 
-        if (!p4PStackedImfileInsertFits(dbh, fits)) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!psFitsClose(fits)) {
-            exit(EXIT_FAILURE);
-        }
-
-        psDBCleanup(dbh);
-    }
-
-    {
-        psDB            *dbh;
-        psFits          *fits;
-
-        dbh = psDBInit("localhost", "test", NULL, "test");
-        if (!dbh) {
-            exit(EXIT_FAILURE);
-        }
-
-        // open a temp
-        fits = psFitsOpen(TMP_FILENAME, "r");
-        if (!fits) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!p4PDiffImfileInsertFits(dbh, fits)) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!psFitsClose(fits)) {
-            exit(EXIT_FAILURE);
-        }
-
-        psDBCleanup(dbh);
-    }
-
-    {
-        psDB            *dbh;
-        psFits          *fits;
-
-        dbh = psDBInit("localhost", "test", NULL, "test");
-        if (!dbh) {
-            exit(EXIT_FAILURE);
-        }
-
-        // open a temp
-        fits = psFitsOpen(TMP_FILENAME, "r");
-        if (!fits) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!p4PMagicMaskImfileInsertFits(dbh, fits)) {
+        if (!p4StackedImfileInsertFits(dbh, fits)) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!psFitsClose(fits)) {
+            exit(EXIT_FAILURE);
+        }
+
+        psDBCleanup(dbh);
+    }
+
+    {
+        psDB            *dbh;
+        psFits          *fits;
+
+        dbh = psDBInit("localhost", "test", NULL, "test");
+        if (!dbh) {
+            exit(EXIT_FAILURE);
+        }
+
+        // open a temp
+        fits = psFitsOpen(TMP_FILENAME, "r");
+        if (!fits) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!p4DiffImfileInsertFits(dbh, fits)) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!psFitsClose(fits)) {
+            exit(EXIT_FAILURE);
+        }
+
+        psDBCleanup(dbh);
+    }
+
+    {
+        psDB            *dbh;
+        psFits          *fits;
+
+        dbh = psDBInit("localhost", "test", NULL, "test");
+        if (!dbh) {
+            exit(EXIT_FAILURE);
+        }
+
+        // open a temp
+        fits = psFitsOpen(TMP_FILENAME, "r");
+        if (!fits) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!p4MagicMaskImfileInsertFits(dbh, fits)) {
             exit(EXIT_FAILURE);
         }
Index: trunk/ippdb/tests/insertobject.c
===================================================================
--- trunk/ippdb/tests/insertobject.c	(revision 10748)
+++ trunk/ippdb/tests/insertobject.c	(revision 10753)
@@ -777,61 +777,61 @@
     {
         psDB            *dbh;
-        p4PStackedImfileRow *object;
-
-        dbh = psDBInit("localhost", "test", NULL, "test");
-        if (!dbh) {
-            exit(EXIT_FAILURE);
-        }
-
-        object = p4PStackedImfileRowAlloc(-32, "a string", "a string", "a string", "a string");
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!p4PStackedImfileInsertObject(dbh, object)) {
-            exit(EXIT_FAILURE);
-        }
-
-        psFree(object);
-        psDBCleanup(dbh);
-    }
-
-    {
-        psDB            *dbh;
-        p4PDiffImfileRow *object;
-
-        dbh = psDBInit("localhost", "test", NULL, "test");
-        if (!dbh) {
-            exit(EXIT_FAILURE);
-        }
-
-        object = p4PDiffImfileRowAlloc(-32, "a string", -32, "a string", "a string", "a string", "a string");
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!p4PDiffImfileInsertObject(dbh, object)) {
-            exit(EXIT_FAILURE);
-        }
-
-        psFree(object);
-        psDBCleanup(dbh);
-    }
-
-    {
-        psDB            *dbh;
-        p4PMagicMaskImfileRow *object;
-
-        dbh = psDBInit("localhost", "test", NULL, "test");
-        if (!dbh) {
-            exit(EXIT_FAILURE);
-        }
-
-        object = p4PMagicMaskImfileRowAlloc(-32, "a string", -32, "a string", "a string");
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!p4PMagicMaskImfileInsertObject(dbh, object)) {
+        p4StackedImfileRow *object;
+
+        dbh = psDBInit("localhost", "test", NULL, "test");
+        if (!dbh) {
+            exit(EXIT_FAILURE);
+        }
+
+        object = p4StackedImfileRowAlloc(-32, "a string", "a string", "a string", "a string");
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!p4StackedImfileInsertObject(dbh, object)) {
+            exit(EXIT_FAILURE);
+        }
+
+        psFree(object);
+        psDBCleanup(dbh);
+    }
+
+    {
+        psDB            *dbh;
+        p4DiffImfileRow *object;
+
+        dbh = psDBInit("localhost", "test", NULL, "test");
+        if (!dbh) {
+            exit(EXIT_FAILURE);
+        }
+
+        object = p4DiffImfileRowAlloc(-32, "a string", -32, "a string", "a string", "a string", "a string");
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!p4DiffImfileInsertObject(dbh, object)) {
+            exit(EXIT_FAILURE);
+        }
+
+        psFree(object);
+        psDBCleanup(dbh);
+    }
+
+    {
+        psDB            *dbh;
+        p4MagicMaskImfileRow *object;
+
+        dbh = psDBInit("localhost", "test", NULL, "test");
+        if (!dbh) {
+            exit(EXIT_FAILURE);
+        }
+
+        object = p4MagicMaskImfileRowAlloc(-32, "a string", -32, "a string", "a string");
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!p4MagicMaskImfileInsertObject(dbh, object)) {
             exit(EXIT_FAILURE);
         }
Index: trunk/ippdb/tests/metadatafromobject.c
===================================================================
--- trunk/ippdb/tests/metadatafromobject.c	(revision 10748)
+++ trunk/ippdb/tests/metadatafromobject.c	(revision 10753)
@@ -1812,13 +1812,13 @@
     {
         psMetadata      *md;
-        p4PStackedImfileRow *object;
-        bool            status;
-
-        object = p4PStackedImfileRowAlloc(-32, "a string", "a string", "a string", "a string");
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        md = p4PStackedImfileMetadataFromObject(object);
+        p4StackedImfileRow *object;
+        bool            status;
+
+        object = p4StackedImfileRowAlloc(-32, "a string", "a string", "a string", "a string");
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        md = p4StackedImfileMetadataFromObject(object);
         if (!md) {
             exit(EXIT_FAILURE);
@@ -1853,13 +1853,13 @@
     {
         psMetadata      *md;
-        p4PDiffImfileRow *object;
-        bool            status;
-
-        object = p4PDiffImfileRowAlloc(-32, "a string", -32, "a string", "a string", "a string", "a string");
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        md = p4PDiffImfileMetadataFromObject(object);
+        p4DiffImfileRow *object;
+        bool            status;
+
+        object = p4DiffImfileRowAlloc(-32, "a string", -32, "a string", "a string", "a string", "a string");
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        md = p4DiffImfileMetadataFromObject(object);
         if (!md) {
             exit(EXIT_FAILURE);
@@ -1902,13 +1902,13 @@
     {
         psMetadata      *md;
-        p4PMagicMaskImfileRow *object;
-        bool            status;
-
-        object = p4PMagicMaskImfileRowAlloc(-32, "a string", -32, "a string", "a string");
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        md = p4PMagicMaskImfileMetadataFromObject(object);
+        p4MagicMaskImfileRow *object;
+        bool            status;
+
+        object = p4MagicMaskImfileRowAlloc(-32, "a string", -32, "a string", "a string");
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        md = p4MagicMaskImfileMetadataFromObject(object);
         if (!md) {
             exit(EXIT_FAILURE);
Index: trunk/ippdb/tests/objectfrommetadata.c
===================================================================
--- trunk/ippdb/tests/objectfrommetadata.c	(revision 10748)
+++ trunk/ippdb/tests/objectfrommetadata.c	(revision 10753)
@@ -2774,5 +2774,5 @@
     {
         psMetadata      *md;
-        p4PStackedImfileRow *object;
+        p4StackedImfileRow *object;
 
         md = psMetadataAlloc();
@@ -2798,5 +2798,5 @@
         }
 
-        object = p4PStackedImfileObjectFromMetadata(md);
+        object = p4StackedImfileObjectFromMetadata(md);
         if (!object) {
             psFree(md);
@@ -2832,5 +2832,5 @@
     {
         psMetadata      *md;
-        p4PDiffImfileRow *object;
+        p4DiffImfileRow *object;
 
         md = psMetadataAlloc();
@@ -2864,5 +2864,5 @@
         }
 
-        object = p4PDiffImfileObjectFromMetadata(md);
+        object = p4DiffImfileObjectFromMetadata(md);
         if (!object) {
             psFree(md);
@@ -2906,5 +2906,5 @@
     {
         psMetadata      *md;
-        p4PMagicMaskImfileRow *object;
+        p4MagicMaskImfileRow *object;
 
         md = psMetadataAlloc();
@@ -2930,5 +2930,5 @@
         }
 
-        object = p4PMagicMaskImfileObjectFromMetadata(md);
+        object = p4MagicMaskImfileObjectFromMetadata(md);
         if (!object) {
             psFree(md);
Index: trunk/ippdb/tests/selectrowsfits.c
===================================================================
--- trunk/ippdb/tests/selectrowsfits.c	(revision 10748)
+++ trunk/ippdb/tests/selectrowsfits.c	(revision 10753)
@@ -791,49 +791,49 @@
         }
 
-        if (!p4PStackedImfileSelectRowsFits(dbh, fits, NULL, 1)) {
-            exit(EXIT_FAILURE);
-        }
-
-        psFree(fits);
-        psDBCleanup(dbh);
-    }
-
-    {
-        psDB            *dbh;
-        psFits          *fits;
-
-        dbh = psDBInit("localhost", "test", NULL, "test");
-        if (!dbh) {
-            exit(EXIT_FAILURE);
-        }
-
-        fits = psFitsOpen(TMP_FILENAME, "w");
-        if (!fits) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!p4PDiffImfileSelectRowsFits(dbh, fits, NULL, 1)) {
-            exit(EXIT_FAILURE);
-        }
-
-        psFree(fits);
-        psDBCleanup(dbh);
-    }
-
-    {
-        psDB            *dbh;
-        psFits          *fits;
-
-        dbh = psDBInit("localhost", "test", NULL, "test");
-        if (!dbh) {
-            exit(EXIT_FAILURE);
-        }
-
-        fits = psFitsOpen(TMP_FILENAME, "w");
-        if (!fits) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!p4PMagicMaskImfileSelectRowsFits(dbh, fits, NULL, 1)) {
+        if (!p4StackedImfileSelectRowsFits(dbh, fits, NULL, 1)) {
+            exit(EXIT_FAILURE);
+        }
+
+        psFree(fits);
+        psDBCleanup(dbh);
+    }
+
+    {
+        psDB            *dbh;
+        psFits          *fits;
+
+        dbh = psDBInit("localhost", "test", NULL, "test");
+        if (!dbh) {
+            exit(EXIT_FAILURE);
+        }
+
+        fits = psFitsOpen(TMP_FILENAME, "w");
+        if (!fits) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!p4DiffImfileSelectRowsFits(dbh, fits, NULL, 1)) {
+            exit(EXIT_FAILURE);
+        }
+
+        psFree(fits);
+        psDBCleanup(dbh);
+    }
+
+    {
+        psDB            *dbh;
+        psFits          *fits;
+
+        dbh = psDBInit("localhost", "test", NULL, "test");
+        if (!dbh) {
+            exit(EXIT_FAILURE);
+        }
+
+        fits = psFitsOpen(TMP_FILENAME, "w");
+        if (!fits) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!p4MagicMaskImfileSelectRowsFits(dbh, fits, NULL, 1)) {
             exit(EXIT_FAILURE);
         }