Index: trunk/ippdb/src/ippdb.h
===================================================================
--- trunk/ippdb/src/ippdb.h	(revision 10686)
+++ trunk/ippdb/src/ippdb.h	(revision 10748)
@@ -7439,7 +7439,7 @@
     bool            mdcf                ///< format as mdconfig or simple
 );
-/** p4PWarpedImfileRow data structure
- *
- * Structure for representing a single row of p4PWarpedImfile table data.
+/** p4WarpedImfileRow data structure
+ *
+ * Structure for representing a single row of p4WarpedImfile table data.
  */
 
@@ -7452,12 +7452,12 @@
     char            *b1_uri;
     char            *b2_uri;
-} p4PWarpedImfileRow;
-
-/** Creates a new p4PWarpedImfileRow object
- *
- *  @return A new p4PWarpedImfileRow object or NULL on failure.
- */
-
-p4PWarpedImfileRow *p4PWarpedImfileRowAlloc(
+} p4WarpedImfileRow;
+
+/** Creates a new p4WarpedImfileRow object
+ *
+ *  @return A new p4WarpedImfileRow object or NULL on failure.
+ */
+
+p4WarpedImfileRow *p4WarpedImfileRowAlloc(
     psS32           p4_id,
     const char      *exp_tag,
@@ -7469,19 +7469,19 @@
 );
 
-/** Creates a new p4PWarpedImfile table
- *
- * @return true on success
- */
-
-bool p4PWarpedImfileCreateTable(
+/** Creates a new p4WarpedImfile table
+ *
+ * @return true on success
+ */
+
+bool p4WarpedImfileCreateTable(
     psDB            *dbh                ///< Database handle
 );
 
-/** Deletes a p4PWarpedImfile table
- *
- * @return true on success
- */
-
-bool p4PWarpedImfileDropTable(
+/** Deletes a p4WarpedImfile table
+ *
+ * @return true on success
+ */
+
+bool p4WarpedImfileDropTable(
     psDB            *dbh                ///< Database handle
 );
@@ -7494,5 +7494,5 @@
  */
 
-bool p4PWarpedImfileInsert(
+bool p4WarpedImfileInsert(
     psDB            *dbh,               ///< Database handle
     psS32           p4_id,
@@ -7510,5 +7510,5 @@
  */
 
-long long p4PWarpedImfileDelete(
+long long p4WarpedImfileDelete(
     psDB            *dbh,               ///< Database handle
     const psMetadata *where,            ///< Row match criteria
@@ -7516,5 +7516,5 @@
 );
 
-/** Insert a single p4PWarpedImfileRow object into a table
+/** Insert a single p4WarpedImfileRow object into a table
  *
  * This function constructs and inserts a single row based on it's parameters.
@@ -7523,10 +7523,10 @@
  */
 
-bool p4PWarpedImfileInsertObject(
-    psDB            *dbh,               ///< Database handle
-    p4PWarpedImfileRow *object             ///< p4PWarpedImfileRow object
-);
-
-/** Insert an array of p4PWarpedImfileRow object into a table
+bool p4WarpedImfileInsertObject(
+    psDB            *dbh,               ///< Database handle
+    p4WarpedImfileRow *object             ///< p4WarpedImfileRow object
+);
+
+/** Insert an array of p4WarpedImfileRow object into a table
  *
  * This function constructs and inserts multiple rows based on it's parameters.
@@ -7535,10 +7535,10 @@
  */
 
-bool p4PWarpedImfileInsertObjects(
-    psDB            *dbh,               ///< Database handle
-    psArray         *objects            ///< array of p4PWarpedImfileRow objects
-);
-
-/** Insert data from a binary FITS table p4PWarpedImfileRow into the database
+bool p4WarpedImfileInsertObjects(
+    psDB            *dbh,               ///< Database handle
+    psArray         *objects            ///< array of p4WarpedImfileRow objects
+);
+
+/** Insert data from a binary FITS table p4WarpedImfileRow into the database
  *
  * This function expects a psFits object with a FITS table as the first
@@ -7550,5 +7550,5 @@
  */
 
-bool p4PWarpedImfileInsertFits(
+bool p4WarpedImfileInsertFits(
     psDB            *dbh,               ///< Database handle
     const psFits    *fits               ///< psFits object
@@ -7565,5 +7565,5 @@
  */
 
-bool p4PWarpedImfileSelectRowsFits(
+bool p4WarpedImfileSelectRowsFits(
     psDB            *dbh,               ///< Database handle
     psFits          *fits,              ///< psFits object
@@ -7572,22 +7572,22 @@
 );
 
-/** Convert a p4PWarpedImfileRow into an equivalent psMetadata
+/** Convert a p4WarpedImfileRow into an equivalent psMetadata
  *
  * @return A psMetadata pointer or NULL on error
  */
 
-psMetadata *p4PWarpedImfileMetadataFromObject(
-    const p4PWarpedImfileRow *object             ///< fooRow to convert into a psMetadata
+psMetadata *p4WarpedImfileMetadataFromObject(
+    const p4WarpedImfileRow *object             ///< fooRow to convert into a psMetadata
 );
 
 /** Convert a psMetadata into an equivalent fooRow
  *
- * @return A p4PWarpedImfileRow pointer or NULL on error
- */
-
-p4PWarpedImfileRow *p4PWarpedImfileObjectFromMetadata(
+ * @return A p4WarpedImfileRow pointer or NULL on error
+ */
+
+p4WarpedImfileRow *p4WarpedImfileObjectFromMetadata(
     psMetadata      *md                 ///< psMetadata to convert into a fooRow
 );
-/** Selects up to limit rows from the database and returns as p4PWarpedImfileRow objects in a psArray
+/** Selects up to limit rows from the database and returns as p4WarpedImfileRow objects in a psArray
  *
  *  See psDBSelectRows() for documentation on the format of where.
@@ -7596,10 +7596,10 @@
  */
 
-psArray *p4PWarpedImfileSelectRowObjects(
+psArray *p4WarpedImfileSelectRowObjects(
     psDB            *dbh,               ///< Database handle
     const psMetadata *where,            ///< Row match criteria
     unsigned long long limit            ///< Maximum number of elements to return
 );
-/** Deletes a row from the database coresponding to an p4PWarpedImfile
+/** Deletes a row from the database coresponding to an p4WarpedImfile
  *
  *  Note that a 'where' search psMetadata is constructed from each object and
@@ -7609,7 +7609,7 @@
  */
 
-bool p4PWarpedImfileDeleteObject(
-    psDB            *dbh,               ///< Database handle
-    const p4PWarpedImfileRow *object    ///< Object to delete
+bool p4WarpedImfileDeleteObject(
+    psDB            *dbh,               ///< Database handle
+    const p4WarpedImfileRow *object    ///< Object to delete
 );
 /** Deletes up to limit rows from the database and returns the number of rows actually deleted. 
@@ -7621,10 +7621,10 @@
  */
 
-long long p4PWarpedImfileDeleteRowObjects(
+long long p4WarpedImfileDeleteRowObjects(
     psDB            *dbh,               ///< Database handle
     const psArray   *objects,           ///< Array of objects to delete
     unsigned long long limit            ///< Maximum number of elements to delete 
 );
-/** Formats and prints an array of p4PWarpedImfileRow objects
+/** Formats and prints an array of p4WarpedImfileRow objects
  *
  * When mdcf is set the formated output is in psMetadataConfig
@@ -7634,10 +7634,10 @@
  */
 
-bool p4PWarpedImfilePrintObjects(
+bool p4WarpedImfilePrintObjects(
     FILE            *stream,            ///< a stream
-    psArray         *objects,           ///< An array of p4PWarpedImfileRow objects
+    psArray         *objects,           ///< An array of p4WarpedImfileRow objects
     bool            mdcf                ///< format as mdconfig or simple
 );
-/** Formats and prints an p4PWarpedImfileRow object
+/** Formats and prints an p4WarpedImfileRow object
  *
  * When mdcf is set the formated output is in psMetadataConfig
@@ -7647,7 +7647,7 @@
  */
 
-bool p4PWarpedImfilePrintObject(
+bool p4WarpedImfilePrintObject(
     FILE            *stream,            ///< a stream
-    p4PWarpedImfileRow *object,    ///< an p4PWarpedImfileRow object
+    p4WarpedImfileRow *object,    ///< an p4WarpedImfileRow object
     bool            mdcf                ///< format as mdconfig or simple
 );