Index: trunk/ippdb/tests/alloc.c
===================================================================
--- trunk/ippdb/tests/alloc.c	(revision 10681)
+++ trunk/ippdb/tests/alloc.c	(revision 10748)
@@ -1490,7 +1490,7 @@
 
     {
-        p4PWarpedImfileRow *object;
-
-        object = p4PWarpedImfileRowAlloc(-32, "a string", -32, "a string", "a string", "a string", "a string"    );
+        p4WarpedImfileRow *object;
+
+        object = p4WarpedImfileRowAlloc(-32, "a string", -32, "a string", "a string", "a string", "a string"    );
 
         if (!object) {
Index: trunk/ippdb/tests/createtable.c
===================================================================
--- trunk/ippdb/tests/createtable.c	(revision 10681)
+++ trunk/ippdb/tests/createtable.c	(revision 10748)
@@ -523,5 +523,5 @@
         }
 
-        if(!p4PWarpedImfileCreateTable(dbh)) {
+        if(!p4WarpedImfileCreateTable(dbh)) {
             exit(EXIT_FAILURE);
         }
Index: trunk/ippdb/tests/dbcleanup.c
===================================================================
--- trunk/ippdb/tests/dbcleanup.c	(revision 10681)
+++ trunk/ippdb/tests/dbcleanup.c	(revision 10748)
@@ -45,5 +45,5 @@
     p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4Run");
     p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4InputImfile");
-    p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4PWarpedImfile");
+    p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4WarpedImfile");
     p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4PStackedImfile");
     p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4PDiffImfile");
Index: trunk/ippdb/tests/dbsetup.c
===================================================================
--- trunk/ippdb/tests/dbsetup.c	(revision 10681)
+++ trunk/ippdb/tests/dbsetup.c	(revision 10748)
@@ -115,6 +115,6 @@
     p4InputImfileCreateTable(dbh);
 
-    p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4PWarpedImfile");
-    p4PWarpedImfileCreateTable(dbh);
+    p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4WarpedImfile");
+    p4WarpedImfileCreateTable(dbh);
 
     p_psDBRunQuery(dbh, "DROP TABLE IF EXISTS p4PStackedImfile");
Index: trunk/ippdb/tests/droptable.c
===================================================================
--- trunk/ippdb/tests/droptable.c	(revision 10681)
+++ trunk/ippdb/tests/droptable.c	(revision 10748)
@@ -523,5 +523,5 @@
         }
 
-        if (!p4PWarpedImfileDropTable(dbh)) {
+        if (!p4WarpedImfileDropTable(dbh)) {
             exit(EXIT_FAILURE);
         }
Index: trunk/ippdb/tests/insert.c
===================================================================
--- trunk/ippdb/tests/insert.c	(revision 10681)
+++ trunk/ippdb/tests/insert.c	(revision 10748)
@@ -523,5 +523,5 @@
         }
 
-        if (!p4PWarpedImfileInsert(dbh, -32, "a string", -32, "a string", "a string", "a string", "a string")) {
+        if (!p4WarpedImfileInsert(dbh, -32, "a string", -32, "a string", "a string", "a string", "a string")) {
             exit(EXIT_FAILURE);
         }
Index: trunk/ippdb/tests/insertfits.c
===================================================================
--- trunk/ippdb/tests/insertfits.c	(revision 10681)
+++ trunk/ippdb/tests/insertfits.c	(revision 10748)
@@ -908,5 +908,5 @@
         }
 
-        if (!p4PWarpedImfileInsertFits(dbh, fits)) {
+        if (!p4WarpedImfileInsertFits(dbh, fits)) {
             exit(EXIT_FAILURE);
         }
Index: trunk/ippdb/tests/insertobject.c
===================================================================
--- trunk/ippdb/tests/insertobject.c	(revision 10681)
+++ trunk/ippdb/tests/insertobject.c	(revision 10748)
@@ -755,17 +755,17 @@
     {
         psDB            *dbh;
-        p4PWarpedImfileRow *object;
-
-        dbh = psDBInit("localhost", "test", NULL, "test");
-        if (!dbh) {
-            exit(EXIT_FAILURE);
-        }
-
-        object = p4PWarpedImfileRowAlloc(-32, "a string", -32, "a string", "a string", "a string", "a string");
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!p4PWarpedImfileInsertObject(dbh, object)) {
+        p4WarpedImfileRow *object;
+
+        dbh = psDBInit("localhost", "test", NULL, "test");
+        if (!dbh) {
+            exit(EXIT_FAILURE);
+        }
+
+        object = p4WarpedImfileRowAlloc(-32, "a string", -32, "a string", "a string", "a string", "a string");
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!p4WarpedImfileInsertObject(dbh, object)) {
             exit(EXIT_FAILURE);
         }
Index: trunk/ippdb/tests/metadatafromobject.c
===================================================================
--- trunk/ippdb/tests/metadatafromobject.c	(revision 10681)
+++ trunk/ippdb/tests/metadatafromobject.c	(revision 10748)
@@ -1763,13 +1763,13 @@
     {
         psMetadata      *md;
-        p4PWarpedImfileRow *object;
-        bool            status;
-
-        object = p4PWarpedImfileRowAlloc(-32, "a string", -32, "a string", "a string", "a string", "a string");
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        md = p4PWarpedImfileMetadataFromObject(object);
+        p4WarpedImfileRow *object;
+        bool            status;
+
+        object = p4WarpedImfileRowAlloc(-32, "a string", -32, "a string", "a string", "a string", "a string");
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        md = p4WarpedImfileMetadataFromObject(object);
         if (!md) {
             exit(EXIT_FAILURE);
Index: trunk/ippdb/tests/objectfrommetadata.c
===================================================================
--- trunk/ippdb/tests/objectfrommetadata.c	(revision 10681)
+++ trunk/ippdb/tests/objectfrommetadata.c	(revision 10748)
@@ -2700,5 +2700,5 @@
     {
         psMetadata      *md;
-        p4PWarpedImfileRow *object;
+        p4WarpedImfileRow *object;
 
         md = psMetadataAlloc();
@@ -2732,5 +2732,5 @@
         }
 
-        object = p4PWarpedImfileObjectFromMetadata(md);
+        object = p4WarpedImfileObjectFromMetadata(md);
         if (!object) {
             psFree(md);
Index: trunk/ippdb/tests/selectrowsfits.c
===================================================================
--- trunk/ippdb/tests/selectrowsfits.c	(revision 10681)
+++ trunk/ippdb/tests/selectrowsfits.c	(revision 10748)
@@ -769,5 +769,5 @@
         }
 
-        if (!p4PWarpedImfileSelectRowsFits(dbh, fits, NULL, 1)) {
+        if (!p4WarpedImfileSelectRowsFits(dbh, fits, NULL, 1)) {
             exit(EXIT_FAILURE);
         }