Index: /trunk/ippdb/configure.ac
===================================================================
--- /trunk/ippdb/configure.ac	(revision 9241)
+++ /trunk/ippdb/configure.ac	(revision 9242)
@@ -7,5 +7,5 @@
 AC_PREREQ(2.59)
 
-AC_INIT([ippdb], [0.0.45], [pan-starrs.ifa.hawaii.edu])
+AC_INIT([ippdb], [0.0.46], [pan-starrs.ifa.hawaii.edu])
 AC_CONFIG_SRCDIR([ippdb.pc.in])
 
Index: /trunk/ippdb/src/ippdb.c
===================================================================
--- /trunk/ippdb/src/ippdb.c	(revision 9241)
+++ /trunk/ippdb/src/ippdb.c	(revision 9242)
@@ -7194,5 +7194,5 @@
 static void rawDetrendExpRowFree(rawDetrendExpRow *object);
 
-rawDetrendExpRow *rawDetrendExpRowAlloc(const char *exp_tag, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *obstype)
+rawDetrendExpRow *rawDetrendExpRowAlloc(const char *exp_tag, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object)
 {
     rawDetrendExpRow *object;
@@ -7218,5 +7218,5 @@
     object->ccd_temp = ccd_temp;
     object->posang = posang;
-    object->obstype = psStringCopy(obstype);
+    object->object = psStringCopy(object);
 
     return object;
@@ -7230,5 +7230,5 @@
     psFree(object->exp_type);
     psFree(object->filter);
-    psFree(object->obstype);
+    psFree(object->object);
 }
 
@@ -7329,6 +7329,6 @@
         return false;
     }
-    if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, "64")) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item obstype");
+    if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, "64")) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item object");
         psFree(md);
         return false;
@@ -7347,5 +7347,5 @@
 }
 
-bool rawDetrendExpInsert(psDB * dbh, const char *exp_tag, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *obstype)
+bool rawDetrendExpInsert(psDB * dbh, const char *exp_tag, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object)
 {
     psMetadata      *md;
@@ -7438,6 +7438,6 @@
         return false;
     }
-    if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, obstype)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item obstype");
+    if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, object)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item object");
         psFree(md);
         return false;
@@ -7464,5 +7464,5 @@
     return deleted;
 }
-bool rawDetrendExpPop(psDB *dbh, char **exp_tag, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *decl, psF32 *exp_time, psF64 *bg, psF64 *bg_stdev, psF64 *bg_mean_stdev, psF64 *alt, psF64 *az, psF32 *ccd_temp, psF64 *posang, char **obstype)
+bool rawDetrendExpPop(psDB *dbh, char **exp_tag, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *decl, psF32 *exp_time, psF64 *bg, psF64 *bg_stdev, psF64 *bg_mean_stdev, psF64 *alt, psF64 *az, psF32 *ccd_temp, psF64 *posang, char **object)
 {
     psArray         *rowSet;
@@ -7610,7 +7610,7 @@
         return false;
     }
-    *obstype = psMetadataLookupPtr(&status, row, "obstype");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item obstype");
+    *object = psMetadataLookupPtr(&status, row, "object");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item object");
         psFree(row);
         return false;
@@ -7624,5 +7624,5 @@
 bool rawDetrendExpInsertObject(psDB *dbh, rawDetrendExpRow *object)
 {
-    return rawDetrendExpInsert(dbh, object->exp_tag, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->obstype);
+    return rawDetrendExpInsert(dbh, object->exp_tag, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->object);
 }
 
@@ -7657,12 +7657,12 @@
     psF32           ccd_temp;
     psF64           posang;
-    char            obstype[256];
-
-    if (!rawDetrendExpPop(dbh, (char **)&exp_tag, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&obstype)) {
+    char            object[256];
+
+    if (!rawDetrendExpPop(dbh, (char **)&exp_tag, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&object)) {
         psError(PS_ERR_UNKNOWN, false, "failed to pop a database row");
         return NULL;
     }
 
-    return rawDetrendExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, obstype);
+    return rawDetrendExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, object);
 }
 
@@ -7848,6 +7848,6 @@
         return NULL;
     }
-    if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, object->obstype)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item obstype");
+    if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, object->object)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item object");
         psFree(md);
         return NULL;
@@ -7877,5 +7877,5 @@
     psF32           ccd_temp;
     psF64           posang;
-    char            *obstype;
+    char            *object;
 
     exp_tag = psMetadataLookupPtr(&status, md, "exp_tag");
@@ -7964,11 +7964,11 @@
         return false;
     }
-    obstype = psMetadataLookupPtr(&status, md, "obstype");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item obstype");
-        return false;
-    }
-
-    return rawDetrendExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, obstype);
+    object = psMetadataLookupPtr(&status, md, "object");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item object");
+        return false;
+    }
+
+    return rawDetrendExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, object);
 }
 psArray *rawDetrendExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
@@ -8077,5 +8077,5 @@
 static void rawScienceExpRowFree(rawScienceExpRow *object);
 
-rawScienceExpRow *rawScienceExpRowAlloc(const char *exp_tag, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *obstype)
+rawScienceExpRow *rawScienceExpRowAlloc(const char *exp_tag, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object)
 {
     rawScienceExpRow *object;
@@ -8101,5 +8101,5 @@
     object->ccd_temp = ccd_temp;
     object->posang = posang;
-    object->obstype = psStringCopy(obstype);
+    object->object = psStringCopy(object);
 
     return object;
@@ -8113,5 +8113,5 @@
     psFree(object->exp_type);
     psFree(object->filter);
-    psFree(object->obstype);
+    psFree(object->object);
 }
 
@@ -8212,6 +8212,6 @@
         return false;
     }
-    if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, "64")) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item obstype");
+    if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, "64")) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item object");
         psFree(md);
         return false;
@@ -8230,5 +8230,5 @@
 }
 
-bool rawScienceExpInsert(psDB * dbh, const char *exp_tag, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *obstype)
+bool rawScienceExpInsert(psDB * dbh, const char *exp_tag, const char *camera, const char *telescope, const char *exp_type, psS32 imfiles, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object)
 {
     psMetadata      *md;
@@ -8321,6 +8321,6 @@
         return false;
     }
-    if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, obstype)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item obstype");
+    if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, object)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item object");
         psFree(md);
         return false;
@@ -8347,5 +8347,5 @@
     return deleted;
 }
-bool rawScienceExpPop(psDB *dbh, char **exp_tag, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *decl, psF32 *exp_time, psF64 *bg, psF64 *bg_stdev, psF64 *bg_mean_stdev, psF64 *alt, psF64 *az, psF32 *ccd_temp, psF64 *posang, char **obstype)
+bool rawScienceExpPop(psDB *dbh, char **exp_tag, char **camera, char **telescope, char **exp_type, psS32 *imfiles, char **filter, psF32 *airmass, psF64 *ra, psF64 *decl, psF32 *exp_time, psF64 *bg, psF64 *bg_stdev, psF64 *bg_mean_stdev, psF64 *alt, psF64 *az, psF32 *ccd_temp, psF64 *posang, char **object)
 {
     psArray         *rowSet;
@@ -8493,7 +8493,7 @@
         return false;
     }
-    *obstype = psMetadataLookupPtr(&status, row, "obstype");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item obstype");
+    *object = psMetadataLookupPtr(&status, row, "object");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item object");
         psFree(row);
         return false;
@@ -8507,5 +8507,5 @@
 bool rawScienceExpInsertObject(psDB *dbh, rawScienceExpRow *object)
 {
-    return rawScienceExpInsert(dbh, object->exp_tag, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->obstype);
+    return rawScienceExpInsert(dbh, object->exp_tag, object->camera, object->telescope, object->exp_type, object->imfiles, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->object);
 }
 
@@ -8540,12 +8540,12 @@
     psF32           ccd_temp;
     psF64           posang;
-    char            obstype[256];
-
-    if (!rawScienceExpPop(dbh, (char **)&exp_tag, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&obstype)) {
+    char            object[256];
+
+    if (!rawScienceExpPop(dbh, (char **)&exp_tag, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&object)) {
         psError(PS_ERR_UNKNOWN, false, "failed to pop a database row");
         return NULL;
     }
 
-    return rawScienceExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, obstype);
+    return rawScienceExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, object);
 }
 
@@ -8731,6 +8731,6 @@
         return NULL;
     }
-    if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, object->obstype)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item obstype");
+    if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, object->object)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item object");
         psFree(md);
         return NULL;
@@ -8760,5 +8760,5 @@
     psF32           ccd_temp;
     psF64           posang;
-    char            *obstype;
+    char            *object;
 
     exp_tag = psMetadataLookupPtr(&status, md, "exp_tag");
@@ -8847,11 +8847,11 @@
         return false;
     }
-    obstype = psMetadataLookupPtr(&status, md, "obstype");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item obstype");
-        return false;
-    }
-
-    return rawScienceExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, obstype);
+    object = psMetadataLookupPtr(&status, md, "object");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item object");
+        return false;
+    }
+
+    return rawScienceExpRowAlloc(exp_tag, camera, telescope, exp_type, imfiles, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, object);
 }
 psArray *rawScienceExpSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
@@ -8960,5 +8960,5 @@
 static void rawImfileRowFree(rawImfileRow *object);
 
-rawImfileRow *rawImfileRowAlloc(const char *exp_tag, const char *class, const char *class_id, const char *uri, const char *exp_type, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *obstype)
+rawImfileRow *rawImfileRowAlloc(const char *exp_tag, const char *class, const char *class_id, const char *uri, const char *exp_type, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object)
 {
     rawImfileRow    *object;
@@ -8984,5 +8984,5 @@
     object->ccd_temp = ccd_temp;
     object->posang = posang;
-    object->obstype = psStringCopy(obstype);
+    object->object = psStringCopy(object);
 
     return object;
@@ -8997,5 +8997,5 @@
     psFree(object->exp_type);
     psFree(object->filter);
-    psFree(object->obstype);
+    psFree(object->object);
 }
 
@@ -9096,6 +9096,6 @@
         return false;
     }
-    if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, "64")) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item obstype");
+    if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, "64")) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item object");
         psFree(md);
         return false;
@@ -9114,5 +9114,5 @@
 }
 
-bool rawImfileInsert(psDB * dbh, const char *exp_tag, const char *class, const char *class_id, const char *uri, const char *exp_type, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *obstype)
+bool rawImfileInsert(psDB * dbh, const char *exp_tag, const char *class, const char *class_id, const char *uri, const char *exp_type, const char *filter, psF32 airmass, psF64 ra, psF64 decl, psF32 exp_time, psF64 bg, psF64 bg_stdev, psF64 bg_mean_stdev, psF64 alt, psF64 az, psF32 ccd_temp, psF64 posang, const char *object)
 {
     psMetadata      *md;
@@ -9205,6 +9205,6 @@
         return false;
     }
-    if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, obstype)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item obstype");
+    if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, object)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item object");
         psFree(md);
         return false;
@@ -9231,5 +9231,5 @@
     return deleted;
 }
-bool rawImfilePop(psDB *dbh, char **exp_tag, char **class, char **class_id, char **uri, char **exp_type, char **filter, psF32 *airmass, psF64 *ra, psF64 *decl, psF32 *exp_time, psF64 *bg, psF64 *bg_stdev, psF64 *bg_mean_stdev, psF64 *alt, psF64 *az, psF32 *ccd_temp, psF64 *posang, char **obstype)
+bool rawImfilePop(psDB *dbh, char **exp_tag, char **class, char **class_id, char **uri, char **exp_type, char **filter, psF32 *airmass, psF64 *ra, psF64 *decl, psF32 *exp_time, psF64 *bg, psF64 *bg_stdev, psF64 *bg_mean_stdev, psF64 *alt, psF64 *az, psF32 *ccd_temp, psF64 *posang, char **object)
 {
     psArray         *rowSet;
@@ -9377,7 +9377,7 @@
         return false;
     }
-    *obstype = psMetadataLookupPtr(&status, row, "obstype");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item obstype");
+    *object = psMetadataLookupPtr(&status, row, "object");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item object");
         psFree(row);
         return false;
@@ -9391,5 +9391,5 @@
 bool rawImfileInsertObject(psDB *dbh, rawImfileRow *object)
 {
-    return rawImfileInsert(dbh, object->exp_tag, object->class, object->class_id, object->uri, object->exp_type, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->obstype);
+    return rawImfileInsert(dbh, object->exp_tag, object->class, object->class_id, object->uri, object->exp_type, object->filter, object->airmass, object->ra, object->decl, object->exp_time, object->bg, object->bg_stdev, object->bg_mean_stdev, object->alt, object->az, object->ccd_temp, object->posang, object->object);
 }
 
@@ -9424,12 +9424,12 @@
     psF32           ccd_temp;
     psF64           posang;
-    char            obstype[256];
-
-    if (!rawImfilePop(dbh, (char **)&exp_tag, (char **)&class, (char **)&class_id, (char **)&uri, (char **)&exp_type, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&obstype)) {
+    char            object[256];
+
+    if (!rawImfilePop(dbh, (char **)&exp_tag, (char **)&class, (char **)&class_id, (char **)&uri, (char **)&exp_type, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&object)) {
         psError(PS_ERR_UNKNOWN, false, "failed to pop a database row");
         return NULL;
     }
 
-    return rawImfileRowAlloc(exp_tag, class, class_id, uri, exp_type, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, obstype);
+    return rawImfileRowAlloc(exp_tag, class, class_id, uri, exp_type, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, object);
 }
 
@@ -9615,6 +9615,6 @@
         return NULL;
     }
-    if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, object->obstype)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item obstype");
+    if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, object->object)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item object");
         psFree(md);
         return NULL;
@@ -9644,5 +9644,5 @@
     psF32           ccd_temp;
     psF64           posang;
-    char            *obstype;
+    char            *object;
 
     exp_tag = psMetadataLookupPtr(&status, md, "exp_tag");
@@ -9731,11 +9731,11 @@
         return false;
     }
-    obstype = psMetadataLookupPtr(&status, md, "obstype");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item obstype");
-        return false;
-    }
-
-    return rawImfileRowAlloc(exp_tag, class, class_id, uri, exp_type, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, obstype);
+    object = psMetadataLookupPtr(&status, md, "object");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item object");
+        return false;
+    }
+
+    return rawImfileRowAlloc(exp_tag, class, class_id, uri, exp_type, filter, airmass, ra, decl, exp_time, bg, bg_stdev, bg_mean_stdev, alt, az, ccd_temp, posang, object);
 }
 psArray *rawImfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
Index: /trunk/ippdb/src/ippdb.h
===================================================================
--- /trunk/ippdb/src/ippdb.h	(revision 9241)
+++ /trunk/ippdb/src/ippdb.h	(revision 9242)
@@ -3187,5 +3187,5 @@
     psF32           ccd_temp;
     psF64           posang;
-    char            *obstype;
+    char            *object;
 } rawDetrendExpRow;
 
@@ -3213,5 +3213,5 @@
     psF32           ccd_temp,
     psF64           posang,
-    const char      *obstype
+    const char      *object
 );
 
@@ -3260,5 +3260,5 @@
     psF32           ccd_temp,
     psF64           posang,
-    const char      *obstype
+    const char      *object
 );
 
@@ -3298,5 +3298,5 @@
     psF32           *ccd_temp,
     psF64           *posang,
-    char            **obstype
+    char            **object
 );
 
@@ -3470,5 +3470,5 @@
     psF32           ccd_temp;
     psF64           posang;
-    char            *obstype;
+    char            *object;
 } rawScienceExpRow;
 
@@ -3496,5 +3496,5 @@
     psF32           ccd_temp,
     psF64           posang,
-    const char      *obstype
+    const char      *object
 );
 
@@ -3543,5 +3543,5 @@
     psF32           ccd_temp,
     psF64           posang,
-    const char      *obstype
+    const char      *object
 );
 
@@ -3581,5 +3581,5 @@
     psF32           *ccd_temp,
     psF64           *posang,
-    char            **obstype
+    char            **object
 );
 
@@ -3753,5 +3753,5 @@
     psF32           ccd_temp;
     psF64           posang;
-    char            *obstype;
+    char            *object;
 } rawImfileRow;
 
@@ -3779,5 +3779,5 @@
     psF32           ccd_temp,
     psF64           posang,
-    const char      *obstype
+    const char      *object
 );
 
@@ -3826,5 +3826,5 @@
     psF32           ccd_temp,
     psF64           posang,
-    const char      *obstype
+    const char      *object
 );
 
@@ -3864,5 +3864,5 @@
     psF32           *ccd_temp,
     psF64           *posang,
-    char            **obstype
+    char            **object
 );
 
Index: /trunk/ippdb/tests/alloc.c
===================================================================
--- /trunk/ippdb/tests/alloc.c	(revision 9241)
+++ /trunk/ippdb/tests/alloc.c	(revision 9242)
@@ -570,5 +570,5 @@
             exit(EXIT_FAILURE);
         }
-        if (strncmp(object->obstype, "a string", MAX_STRING_LENGTH)) {
+        if (strncmp(object->object, "a string", MAX_STRING_LENGTH)) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -655,5 +655,5 @@
             exit(EXIT_FAILURE);
         }
-        if (strncmp(object->obstype, "a string", MAX_STRING_LENGTH)) {
+        if (strncmp(object->object, "a string", MAX_STRING_LENGTH)) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -740,5 +740,5 @@
             exit(EXIT_FAILURE);
         }
-        if (strncmp(object->obstype, "a string", MAX_STRING_LENGTH)) {
+        if (strncmp(object->object, "a string", MAX_STRING_LENGTH)) {
             psFree(object);
             exit(EXIT_FAILURE);
Index: /trunk/ippdb/tests/metadatafromobject.c
===================================================================
--- /trunk/ippdb/tests/metadatafromobject.c	(revision 9241)
+++ /trunk/ippdb/tests/metadatafromobject.c	(revision 9242)
@@ -682,5 +682,5 @@
             exit(EXIT_FAILURE);
         }
-        if (strncmp(psMetadataLookupPtr(&status, md, "obstype"), "a string", MAX_STRING_LENGTH)) {
+        if (strncmp(psMetadataLookupPtr(&status, md, "object"), "a string", MAX_STRING_LENGTH)) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -775,5 +775,5 @@
             exit(EXIT_FAILURE);
         }
-        if (strncmp(psMetadataLookupPtr(&status, md, "obstype"), "a string", MAX_STRING_LENGTH)) {
+        if (strncmp(psMetadataLookupPtr(&status, md, "object"), "a string", MAX_STRING_LENGTH)) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -868,5 +868,5 @@
             exit(EXIT_FAILURE);
         }
-        if (strncmp(psMetadataLookupPtr(&status, md, "obstype"), "a string", MAX_STRING_LENGTH)) {
+        if (strncmp(psMetadataLookupPtr(&status, md, "object"), "a string", MAX_STRING_LENGTH)) {
             psFree(md);
             exit(EXIT_FAILURE);
Index: /trunk/ippdb/tests/objectfrommetadata.c
===================================================================
--- /trunk/ippdb/tests/objectfrommetadata.c	(revision 9241)
+++ /trunk/ippdb/tests/objectfrommetadata.c	(revision 9242)
@@ -947,5 +947,5 @@
             exit(EXIT_FAILURE);
         }
-        if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, "a string")) {
+        if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, "a string")) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -1028,5 +1028,5 @@
             exit(EXIT_FAILURE);
         }
-        if (strncmp(object->obstype, "a string", MAX_STRING_LENGTH)) {
+        if (strncmp(object->object, "a string", MAX_STRING_LENGTH)) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -1109,5 +1109,5 @@
             exit(EXIT_FAILURE);
         }
-        if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, "a string")) {
+        if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, "a string")) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -1190,5 +1190,5 @@
             exit(EXIT_FAILURE);
         }
-        if (strncmp(object->obstype, "a string", MAX_STRING_LENGTH)) {
+        if (strncmp(object->object, "a string", MAX_STRING_LENGTH)) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -1271,5 +1271,5 @@
             exit(EXIT_FAILURE);
         }
-        if (!psMetadataAddStr(md, PS_LIST_TAIL, "obstype", 0, NULL, "a string")) {
+        if (!psMetadataAddStr(md, PS_LIST_TAIL, "object", 0, NULL, "a string")) {
             psFree(md);
             exit(EXIT_FAILURE);
@@ -1352,5 +1352,5 @@
             exit(EXIT_FAILURE);
         }
-        if (strncmp(object->obstype, "a string", MAX_STRING_LENGTH)) {
+        if (strncmp(object->object, "a string", MAX_STRING_LENGTH)) {
             psFree(object);
             exit(EXIT_FAILURE);
Index: /trunk/ippdb/tests/pop.c
===================================================================
--- /trunk/ippdb/tests/pop.c	(revision 9241)
+++ /trunk/ippdb/tests/pop.c	(revision 9242)
@@ -298,12 +298,12 @@
         psF32           ccd_temp;
         psF64           posang;
-        char            obstype[256];
-
-        dbh = psDBInit("localhost", "test", NULL, "test");
-        if (!dbh) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!rawDetrendExpPop(dbh, (char **)&exp_tag, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&obstype)) { 
+        char            object[256];
+
+        dbh = psDBInit("localhost", "test", NULL, "test");
+        if (!dbh) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!rawDetrendExpPop(dbh, (char **)&exp_tag, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&object)) { 
             exit(EXIT_FAILURE);
         }
@@ -331,12 +331,12 @@
         psF32           ccd_temp;
         psF64           posang;
-        char            obstype[256];
-
-        dbh = psDBInit("localhost", "test", NULL, "test");
-        if (!dbh) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!rawScienceExpPop(dbh, (char **)&exp_tag, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&obstype)) { 
+        char            object[256];
+
+        dbh = psDBInit("localhost", "test", NULL, "test");
+        if (!dbh) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!rawScienceExpPop(dbh, (char **)&exp_tag, (char **)&camera, (char **)&telescope, (char **)&exp_type, &imfiles, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&object)) { 
             exit(EXIT_FAILURE);
         }
@@ -364,12 +364,12 @@
         psF32           ccd_temp;
         psF64           posang;
-        char            obstype[256];
-
-        dbh = psDBInit("localhost", "test", NULL, "test");
-        if (!dbh) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!rawImfilePop(dbh, (char **)&exp_tag, (char **)&class, (char **)&class_id, (char **)&uri, (char **)&exp_type, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&obstype)) { 
+        char            object[256];
+
+        dbh = psDBInit("localhost", "test", NULL, "test");
+        if (!dbh) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!rawImfilePop(dbh, (char **)&exp_tag, (char **)&class, (char **)&class_id, (char **)&uri, (char **)&exp_type, (char **)&filter, &airmass, &ra, &decl, &exp_time, &bg, &bg_stdev, &bg_mean_stdev, &alt, &az, &ccd_temp, &posang, (char **)&object)) { 
             exit(EXIT_FAILURE);
         }