Index: trunk/ippdb/src/ippdb.c
===================================================================
--- trunk/ippdb/src/ippdb.c	(revision 11873)
+++ trunk/ippdb/src/ippdb.c	(revision 11988)
@@ -65,11 +65,11 @@
 #define P4INPUTEXP_TABLE_NAME "p4InputExp"
 #define P4SKYCELLMAP_TABLE_NAME "p4SkyCellMap"
-#define P4SCFILE_TABLE_NAME "p4Scfile"
+#define P4SKYFILE_TABLE_NAME "p4Skyfile"
 #define P5RUN_TABLE_NAME "p5Run"
-#define P5INPUTSCFILE_TABLE_NAME "p5InputScfile"
-#define P5DIFFSCFILE_TABLE_NAME "p5DiffScfile"
+#define P5INPUTSKYFILE_TABLE_NAME "p5InputSkyfile"
+#define P5DIFFSKYFILE_TABLE_NAME "p5DiffSkyfile"
 #define P6RUN_TABLE_NAME "p6Run"
-#define P6INPUTSCFILE_TABLE_NAME "p6InputScfile"
-#define P6SUMSCFILE_TABLE_NAME "p6SumScfile"
+#define P6INPUTSKYFILE_TABLE_NAME "p6InputSkyfile"
+#define P6SUMSKYFILE_TABLE_NAME "p6SumSkyfile"
 #define MAX_STRING_LENGTH 1024
 
@@ -14846,18 +14846,16 @@
     return true;
 }
-static void p4ScfileRowFree(p4ScfileRow *object);
-
-p4ScfileRow *p4ScfileRowAlloc(psS32 p4_id, const char *skycell_id, const char *tess_id, const char *exp_tag, psS32 p3_version, const char *uri, psF64 bg, psF64 bg_mean_stdev)
-{
-    p4ScfileRow     *_object;
-
-    _object = psAlloc(sizeof(p4ScfileRow));
-    psMemSetDeallocator(_object, (psFreeFunc)p4ScfileRowFree);
+static void p4SkyfileRowFree(p4SkyfileRow *object);
+
+p4SkyfileRow *p4SkyfileRowAlloc(psS32 p4_id, const char *skycell_id, const char *tess_id, const char *uri, psF64 bg, psF64 bg_mean_stdev)
+{
+    p4SkyfileRow    *_object;
+
+    _object = psAlloc(sizeof(p4SkyfileRow));
+    psMemSetDeallocator(_object, (psFreeFunc)p4SkyfileRowFree);
 
     _object->p4_id = p4_id;
     _object->skycell_id = psStringCopy(skycell_id);
     _object->tess_id = psStringCopy(tess_id);
-    _object->exp_tag = psStringCopy(exp_tag);
-    _object->p3_version = p3_version;
     _object->uri = psStringCopy(uri);
     _object->bg = bg;
@@ -14867,13 +14865,12 @@
 }
 
-static void p4ScfileRowFree(p4ScfileRow *object)
+static void p4SkyfileRowFree(p4SkyfileRow *object)
 {
     psFree(object->skycell_id);
     psFree(object->tess_id);
-    psFree(object->exp_tag);
     psFree(object->uri);
 }
 
-bool p4ScfileCreateTable(psDB *dbh)
+bool p4SkyfileCreateTable(psDB *dbh)
 {
     psMetadata *md = psMetadataAlloc();
@@ -14893,14 +14890,4 @@
         return false;
     }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_tag", PS_DATA_STRING, "Key", "64")) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item exp_tag");
-        psFree(md);
-        return false;
-    }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "p3_version", PS_DATA_S32, "Key", 0)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item p3_version");
-        psFree(md);
-        return false;
-    }
     if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, "255")) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item uri");
@@ -14919,5 +14906,5 @@
     }
 
-    bool status = psDBCreateTable(dbh, P4SCFILE_TABLE_NAME, md);
+    bool status = psDBCreateTable(dbh, P4SKYFILE_TABLE_NAME, md);
 
     psFree(md);
@@ -14926,10 +14913,10 @@
 }
 
-bool p4ScfileDropTable(psDB *dbh)
-{
-    return psDBDropTable(dbh, P4SCFILE_TABLE_NAME);
-}
-
-bool p4ScfileInsert(psDB * dbh, psS32 p4_id, const char *skycell_id, const char *tess_id, const char *exp_tag, psS32 p3_version, const char *uri, psF64 bg, psF64 bg_mean_stdev)
+bool p4SkyfileDropTable(psDB *dbh)
+{
+    return psDBDropTable(dbh, P4SKYFILE_TABLE_NAME);
+}
+
+bool p4SkyfileInsert(psDB * dbh, psS32 p4_id, const char *skycell_id, const char *tess_id, const char *uri, psF64 bg, psF64 bg_mean_stdev)
 {
     psMetadata *md = psMetadataAlloc();
@@ -14949,14 +14936,4 @@
         return false;
     }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_tag", PS_DATA_STRING, NULL, exp_tag)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item exp_tag");
-        psFree(md);
-        return false;
-    }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "p3_version", PS_DATA_S32, NULL, p3_version)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item p3_version");
-        psFree(md);
-        return false;
-    }
     if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, uri)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item uri");
@@ -14975,5 +14952,5 @@
     }
 
-    bool status = psDBInsertOneRow(dbh, P4SCFILE_TABLE_NAME, md);
+    bool status = psDBInsertOneRow(dbh, P4SKYFILE_TABLE_NAME, md);
     psFree(md);
 
@@ -14981,11 +14958,11 @@
 }
 
-long long p4ScfileDelete(psDB *dbh, const psMetadata *where, unsigned long long limit)
+long long p4SkyfileDelete(psDB *dbh, const psMetadata *where, unsigned long long limit)
 {
     long long       deleted = 0;
 
-    long long count = psDBDeleteRows(dbh, P4SCFILE_TABLE_NAME, where, limit);
+    long long count = psDBDeleteRows(dbh, P4SKYFILE_TABLE_NAME, where, limit);
     if (count < 0) {
-        psError(PS_ERR_UNKNOWN, true, "failed to delete row from p4Scfile");
+        psError(PS_ERR_UNKNOWN, true, "failed to delete row from p4Skyfile");
         return count;
 
@@ -14995,13 +14972,13 @@
     return deleted;
 }
-bool p4ScfileInsertObject(psDB *dbh, p4ScfileRow *object)
-{
-    return p4ScfileInsert(dbh, object->p4_id, object->skycell_id, object->tess_id, object->exp_tag, object->p3_version, object->uri, object->bg, object->bg_mean_stdev);
-}
-
-bool p4ScfileInsertObjects(psDB *dbh, psArray *objects)
+bool p4SkyfileInsertObject(psDB *dbh, p4SkyfileRow *object)
+{
+    return p4SkyfileInsert(dbh, object->p4_id, object->skycell_id, object->tess_id, object->uri, object->bg, object->bg_mean_stdev);
+}
+
+bool p4SkyfileInsertObjects(psDB *dbh, psArray *objects)
 {
     for (long i = 0; i < psArrayLength(objects); i++) {
-        if (!p4ScfileInsertObject(dbh, objects->data[i])) {
+        if (!p4SkyfileInsertObject(dbh, objects->data[i])) {
             return false;
         }
@@ -15011,11 +14988,11 @@
 }
 
-bool p4ScfileInsertFits(psDB *dbh, const psFits *fits)
+bool p4SkyfileInsertFits(psDB *dbh, const psFits *fits)
 {
     psArray         *rowSet;
 
-    // move to (the first?) extension named  P4SCFILE_TABLE_NAME
-    if (!psFitsMoveExtName(fits, P4SCFILE_TABLE_NAME)) {
-        psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", P4SCFILE_TABLE_NAME);
+    // move to (the first?) extension named  P4SKYFILE_TABLE_NAME
+    if (!psFitsMoveExtName(fits, P4SKYFILE_TABLE_NAME)) {
+        psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", P4SKYFILE_TABLE_NAME);
         return false;
     }
@@ -15035,5 +15012,5 @@
     }
 
-    if (!psDBInsertRows(dbh, P4SCFILE_TABLE_NAME, rowSet)) {
+    if (!psDBInsertRows(dbh, P4SKYFILE_TABLE_NAME, rowSet)) {
         psError(PS_ERR_UNKNOWN, false, "databse insert failed");
         psFree(rowSet);
@@ -15046,9 +15023,9 @@
 }
 
-bool p4ScfileSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit)
+bool p4SkyfileSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit)
 {
     psArray         *rowSet;
 
-    rowSet = psDBSelectRows(dbh, P4SCFILE_TABLE_NAME, where, limit);
+    rowSet = psDBSelectRows(dbh, P4SKYFILE_TABLE_NAME, where, limit);
     if (!rowSet) {
         return false;
@@ -15056,5 +15033,5 @@
 
     // output to fits
-    if (!psFitsWriteTable(fits, NULL, rowSet, P4SCFILE_TABLE_NAME)) {
+    if (!psFitsWriteTable(fits, NULL, rowSet, P4SKYFILE_TABLE_NAME)) {
         psError(PS_ERR_UNKNOWN, false, "FITS table write failed");
         psFree(rowSet);
@@ -15067,5 +15044,5 @@
 }
 
-psMetadata *p4ScfileMetadataFromObject(const p4ScfileRow *object)
+psMetadata *p4SkyfileMetadataFromObject(const p4SkyfileRow *object)
 {
     psMetadata *md = psMetadataAlloc();
@@ -15085,14 +15062,4 @@
         return false;
     }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "exp_tag", PS_DATA_STRING, NULL, object->exp_tag)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item exp_tag");
-        psFree(md);
-        return false;
-    }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "p3_version", PS_DATA_S32, NULL, object->p3_version)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item p3_version");
-        psFree(md);
-        return false;
-    }
     if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, object->uri)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item uri");
@@ -15115,5 +15082,5 @@
 }
 
-p4ScfileRow *p4ScfileObjectFromMetadata(psMetadata *md)
+p4SkyfileRow *p4SkyfileObjectFromMetadata(psMetadata *md)
 {
 
@@ -15134,14 +15101,4 @@
         return false;
     }
-    char* exp_tag = psMetadataLookupPtr(&status, md, "exp_tag");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item exp_tag");
-        return false;
-    }
-    psS32 p3_version = psMetadataLookupS32(&status, md, "p3_version");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item p3_version");
-        return false;
-    }
     char* uri = psMetadataLookupPtr(&status, md, "uri");
     if (!status) {
@@ -15160,7 +15117,7 @@
     }
 
-    return p4ScfileRowAlloc(p4_id, skycell_id, tess_id, exp_tag, p3_version, uri, bg, bg_mean_stdev);
-}
-psArray *p4ScfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
+    return p4SkyfileRowAlloc(p4_id, skycell_id, tess_id, uri, bg, bg_mean_stdev);
+}
+psArray *p4SkyfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
 {
     psArray         *rowSet;
@@ -15168,5 +15125,5 @@
     psU64           i;
 
-    rowSet = psDBSelectRows(dbh, P4SCFILE_TABLE_NAME, where, limit);
+    rowSet = psDBSelectRows(dbh, P4SKYFILE_TABLE_NAME, where, limit);
     if (!rowSet) {
         return NULL;
@@ -15178,5 +15135,5 @@
 
     for (i = 0; i < rowSet->n; i++) {
-        p4ScfileRow *object = p4ScfileObjectFromMetadata(rowSet->data[i]);
+        p4SkyfileRow *object = p4SkyfileObjectFromMetadata(rowSet->data[i]);
         psArrayAdd(returnSet, 0, object);
         psFree(object);
@@ -15187,11 +15144,11 @@
     return returnSet;
 }
-bool p4ScfileDeleteObject(psDB *dbh, const p4ScfileRow *object)
-{
-    psMetadata *where = p4ScfileMetadataFromObject(object);
-    long long count = psDBDeleteRows(dbh, P4SCFILE_TABLE_NAME, where, 0);
+bool p4SkyfileDeleteObject(psDB *dbh, const p4SkyfileRow *object)
+{
+    psMetadata *where = p4SkyfileMetadataFromObject(object);
+    long long count = psDBDeleteRows(dbh, P4SKYFILE_TABLE_NAME, where, 0);
     psFree(where);
     if (count < 0) {
-        psError(PS_ERR_UNKNOWN, true, "failed to delete row from p4Scfile");
+        psError(PS_ERR_UNKNOWN, true, "failed to delete row from p4Skyfile");
         return false;
     }
@@ -15199,21 +15156,21 @@
         // XXX should this be a psAbort() instead?  It is possible that
         // having an object match multiple rows was by design.
-        psError(PS_ERR_UNKNOWN, true, "p4ScfileRow object matched more then one row.  Check your database schema");
-        return false;
-    }
-
-    return true;
-}
-long long p4ScfileDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit)
+        psError(PS_ERR_UNKNOWN, true, "p4SkyfileRow object matched more then one row.  Check your database schema");
+        return false;
+    }
+
+    return true;
+}
+long long p4SkyfileDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit)
 {
     long long       deleted = 0;
 
     for (long long i = 0; i < objects->n; i++) {
-        p4ScfileRow *object = objects->data[i];
-        psMetadata *where = p4ScfileMetadataFromObject(object);
-        long long count = psDBDeleteRows(dbh, P4SCFILE_TABLE_NAME, where, limit);
+        p4SkyfileRow *object = objects->data[i];
+        psMetadata *where = p4SkyfileMetadataFromObject(object);
+        long long count = psDBDeleteRows(dbh, P4SKYFILE_TABLE_NAME, where, limit);
         psFree(where);
         if (count < 0) {
-            psError(PS_ERR_UNKNOWN, true, "failed to delete row from p4Scfile");
+            psError(PS_ERR_UNKNOWN, true, "failed to delete row from p4Skyfile");
             return count;
         }
@@ -15224,5 +15181,5 @@
     return deleted;
 }
-bool p4ScfilePrintObjects(FILE *stream, psArray *objects, bool mdcf)
+bool p4SkyfilePrintObjects(FILE *stream, psArray *objects, bool mdcf)
 {
     PS_ASSERT_PTR_NON_NULL(objects, false);
@@ -15230,9 +15187,9 @@
     psMetadata *output = psMetadataAlloc();
     for (long i = 0; i < psArrayLength(objects); i++) {
-        psMetadata *md = p4ScfileMetadataFromObject(objects->data[i]);
+        psMetadata *md = p4SkyfileMetadataFromObject(objects->data[i]);
         if (!psMetadataAddMetadata(
             output,
             PS_LIST_TAIL,
-            P4SCFILE_TABLE_NAME,
+            P4SKYFILE_TABLE_NAME,
             PS_META_DUPLICATE_OK,
             NULL,
@@ -15255,9 +15212,9 @@
     return true;
 }
-bool p4ScfilePrintObject(FILE *stream, p4ScfileRow *object, bool mdcf)
+bool p4SkyfilePrintObject(FILE *stream, p4SkyfileRow *object, bool mdcf)
 {
     PS_ASSERT_PTR_NON_NULL(object, false);
 
-    psMetadata *md = p4ScfileMetadataFromObject(object);
+    psMetadata *md = p4SkyfileMetadataFromObject(object);
 
     if (!ippdbPrintMetadataRaw(stream, md, mdcf)) {
@@ -15272,5 +15229,5 @@
 static void p5RunRowFree(p5RunRow *object);
 
-p5RunRow *p5RunRowAlloc(psS32 p5_id, const char *state, const char *workdir, const char *dvodb, psTime* registered)
+p5RunRow *p5RunRowAlloc(psS32 p5_id, const char *state, const char *workdir, const char *dvodb, psTime* registered, const char *skycell_id, const char *tess_id)
 {
     p5RunRow        *_object;
@@ -15284,4 +15241,6 @@
     _object->dvodb = psStringCopy(dvodb);
     _object->registered = psTimeCopy(registered);
+    _object->skycell_id = psStringCopy(skycell_id);
+    _object->tess_id = psStringCopy(tess_id);
 
     return _object;
@@ -15294,4 +15253,6 @@
     psFree(object->dvodb);
     psFree(object->registered);
+    psFree(object->skycell_id);
+    psFree(object->tess_id);
 }
 
@@ -15324,4 +15285,14 @@
         return false;
     }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "skycell_id", PS_DATA_STRING, "Key", "64")) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id");
+        psFree(md);
+        return false;
+    }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, "Key", "64")) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id");
+        psFree(md);
+        return false;
+    }
 
     bool status = psDBCreateTable(dbh, P5RUN_TABLE_NAME, md);
@@ -15337,5 +15308,5 @@
 }
 
-bool p5RunInsert(psDB * dbh, psS32 p5_id, const char *state, const char *workdir, const char *dvodb, psTime* registered)
+bool p5RunInsert(psDB * dbh, psS32 p5_id, const char *state, const char *workdir, const char *dvodb, psTime* registered, const char *skycell_id, const char *tess_id)
 {
     psMetadata *md = psMetadataAlloc();
@@ -15362,4 +15333,14 @@
     if (!psMetadataAdd(md, PS_LIST_TAIL, "registered", PS_DATA_TIME, NULL, registered)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item registered");
+        psFree(md);
+        return false;
+    }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "skycell_id", PS_DATA_STRING, NULL, skycell_id)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id");
+        psFree(md);
+        return false;
+    }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, NULL, tess_id)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id");
         psFree(md);
         return false;
@@ -15388,5 +15369,5 @@
 bool p5RunInsertObject(psDB *dbh, p5RunRow *object)
 {
-    return p5RunInsert(dbh, object->p5_id, object->state, object->workdir, object->dvodb, object->registered);
+    return p5RunInsert(dbh, object->p5_id, object->state, object->workdir, object->dvodb, object->registered, object->skycell_id, object->tess_id);
 }
 
@@ -15486,4 +15467,14 @@
         return false;
     }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "skycell_id", PS_DATA_STRING, NULL, object->skycell_id)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id");
+        psFree(md);
+        return false;
+    }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, NULL, object->tess_id)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id");
+        psFree(md);
+        return false;
+    }
 
 
@@ -15520,6 +15511,16 @@
         return false;
     }
-
-    return p5RunRowAlloc(p5_id, state, workdir, dvodb, registered);
+    char* skycell_id = psMetadataLookupPtr(&status, md, "skycell_id");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item skycell_id");
+        return false;
+    }
+    char* tess_id = psMetadataLookupPtr(&status, md, "tess_id");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item tess_id");
+        return false;
+    }
+
+    return p5RunRowAlloc(p5_id, state, workdir, dvodb, registered, skycell_id, tess_id);
 }
 psArray *p5RunSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
@@ -15631,12 +15632,12 @@
     return true;
 }
-static void p5InputScfileRowFree(p5InputScfileRow *object);
-
-p5InputScfileRow *p5InputScfileRowAlloc(psS32 p5_id, psS32 p4_id, const char *skycell_id, const char *tess_id, const char *kind, bool template)
-{
-    p5InputScfileRow *_object;
-
-    _object = psAlloc(sizeof(p5InputScfileRow));
-    psMemSetDeallocator(_object, (psFreeFunc)p5InputScfileRowFree);
+static void p5InputSkyfileRowFree(p5InputSkyfileRow *object);
+
+p5InputSkyfileRow *p5InputSkyfileRowAlloc(psS32 p5_id, psS32 p4_id, const char *skycell_id, const char *tess_id, const char *kind, bool template)
+{
+    p5InputSkyfileRow *_object;
+
+    _object = psAlloc(sizeof(p5InputSkyfileRow));
+    psMemSetDeallocator(_object, (psFreeFunc)p5InputSkyfileRowFree);
 
     _object->p5_id = p5_id;
@@ -15650,5 +15651,5 @@
 }
 
-static void p5InputScfileRowFree(p5InputScfileRow *object)
+static void p5InputSkyfileRowFree(p5InputSkyfileRow *object)
 {
     psFree(object->skycell_id);
@@ -15657,5 +15658,5 @@
 }
 
-bool p5InputScfileCreateTable(psDB *dbh)
+bool p5InputSkyfileCreateTable(psDB *dbh)
 {
     psMetadata *md = psMetadataAlloc();
@@ -15691,5 +15692,5 @@
     }
 
-    bool status = psDBCreateTable(dbh, P5INPUTSCFILE_TABLE_NAME, md);
+    bool status = psDBCreateTable(dbh, P5INPUTSKYFILE_TABLE_NAME, md);
 
     psFree(md);
@@ -15698,10 +15699,10 @@
 }
 
-bool p5InputScfileDropTable(psDB *dbh)
-{
-    return psDBDropTable(dbh, P5INPUTSCFILE_TABLE_NAME);
-}
-
-bool p5InputScfileInsert(psDB * dbh, psS32 p5_id, psS32 p4_id, const char *skycell_id, const char *tess_id, const char *kind, bool template)
+bool p5InputSkyfileDropTable(psDB *dbh)
+{
+    return psDBDropTable(dbh, P5INPUTSKYFILE_TABLE_NAME);
+}
+
+bool p5InputSkyfileInsert(psDB * dbh, psS32 p5_id, psS32 p4_id, const char *skycell_id, const char *tess_id, const char *kind, bool template)
 {
     psMetadata *md = psMetadataAlloc();
@@ -15737,5 +15738,5 @@
     }
 
-    bool status = psDBInsertOneRow(dbh, P5INPUTSCFILE_TABLE_NAME, md);
+    bool status = psDBInsertOneRow(dbh, P5INPUTSKYFILE_TABLE_NAME, md);
     psFree(md);
 
@@ -15743,11 +15744,11 @@
 }
 
-long long p5InputScfileDelete(psDB *dbh, const psMetadata *where, unsigned long long limit)
+long long p5InputSkyfileDelete(psDB *dbh, const psMetadata *where, unsigned long long limit)
 {
     long long       deleted = 0;
 
-    long long count = psDBDeleteRows(dbh, P5INPUTSCFILE_TABLE_NAME, where, limit);
+    long long count = psDBDeleteRows(dbh, P5INPUTSKYFILE_TABLE_NAME, where, limit);
     if (count < 0) {
-        psError(PS_ERR_UNKNOWN, true, "failed to delete row from p5InputScfile");
+        psError(PS_ERR_UNKNOWN, true, "failed to delete row from p5InputSkyfile");
         return count;
 
@@ -15757,13 +15758,13 @@
     return deleted;
 }
-bool p5InputScfileInsertObject(psDB *dbh, p5InputScfileRow *object)
-{
-    return p5InputScfileInsert(dbh, object->p5_id, object->p4_id, object->skycell_id, object->tess_id, object->kind, object->template);
-}
-
-bool p5InputScfileInsertObjects(psDB *dbh, psArray *objects)
+bool p5InputSkyfileInsertObject(psDB *dbh, p5InputSkyfileRow *object)
+{
+    return p5InputSkyfileInsert(dbh, object->p5_id, object->p4_id, object->skycell_id, object->tess_id, object->kind, object->template);
+}
+
+bool p5InputSkyfileInsertObjects(psDB *dbh, psArray *objects)
 {
     for (long i = 0; i < psArrayLength(objects); i++) {
-        if (!p5InputScfileInsertObject(dbh, objects->data[i])) {
+        if (!p5InputSkyfileInsertObject(dbh, objects->data[i])) {
             return false;
         }
@@ -15773,11 +15774,11 @@
 }
 
-bool p5InputScfileInsertFits(psDB *dbh, const psFits *fits)
+bool p5InputSkyfileInsertFits(psDB *dbh, const psFits *fits)
 {
     psArray         *rowSet;
 
-    // move to (the first?) extension named  P5INPUTSCFILE_TABLE_NAME
-    if (!psFitsMoveExtName(fits, P5INPUTSCFILE_TABLE_NAME)) {
-        psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", P5INPUTSCFILE_TABLE_NAME);
+    // move to (the first?) extension named  P5INPUTSKYFILE_TABLE_NAME
+    if (!psFitsMoveExtName(fits, P5INPUTSKYFILE_TABLE_NAME)) {
+        psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", P5INPUTSKYFILE_TABLE_NAME);
         return false;
     }
@@ -15797,5 +15798,5 @@
     }
 
-    if (!psDBInsertRows(dbh, P5INPUTSCFILE_TABLE_NAME, rowSet)) {
+    if (!psDBInsertRows(dbh, P5INPUTSKYFILE_TABLE_NAME, rowSet)) {
         psError(PS_ERR_UNKNOWN, false, "databse insert failed");
         psFree(rowSet);
@@ -15808,9 +15809,9 @@
 }
 
-bool p5InputScfileSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit)
+bool p5InputSkyfileSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit)
 {
     psArray         *rowSet;
 
-    rowSet = psDBSelectRows(dbh, P5INPUTSCFILE_TABLE_NAME, where, limit);
+    rowSet = psDBSelectRows(dbh, P5INPUTSKYFILE_TABLE_NAME, where, limit);
     if (!rowSet) {
         return false;
@@ -15818,5 +15819,5 @@
 
     // output to fits
-    if (!psFitsWriteTable(fits, NULL, rowSet, P5INPUTSCFILE_TABLE_NAME)) {
+    if (!psFitsWriteTable(fits, NULL, rowSet, P5INPUTSKYFILE_TABLE_NAME)) {
         psError(PS_ERR_UNKNOWN, false, "FITS table write failed");
         psFree(rowSet);
@@ -15829,5 +15830,5 @@
 }
 
-psMetadata *p5InputScfileMetadataFromObject(const p5InputScfileRow *object)
+psMetadata *p5InputSkyfileMetadataFromObject(const p5InputSkyfileRow *object)
 {
     psMetadata *md = psMetadataAlloc();
@@ -15867,5 +15868,5 @@
 }
 
-p5InputScfileRow *p5InputScfileObjectFromMetadata(psMetadata *md)
+p5InputSkyfileRow *p5InputSkyfileObjectFromMetadata(psMetadata *md)
 {
 
@@ -15902,7 +15903,7 @@
     }
 
-    return p5InputScfileRowAlloc(p5_id, p4_id, skycell_id, tess_id, kind, template);
-}
-psArray *p5InputScfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
+    return p5InputSkyfileRowAlloc(p5_id, p4_id, skycell_id, tess_id, kind, template);
+}
+psArray *p5InputSkyfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
 {
     psArray         *rowSet;
@@ -15910,5 +15911,5 @@
     psU64           i;
 
-    rowSet = psDBSelectRows(dbh, P5INPUTSCFILE_TABLE_NAME, where, limit);
+    rowSet = psDBSelectRows(dbh, P5INPUTSKYFILE_TABLE_NAME, where, limit);
     if (!rowSet) {
         return NULL;
@@ -15920,5 +15921,5 @@
 
     for (i = 0; i < rowSet->n; i++) {
-        p5InputScfileRow *object = p5InputScfileObjectFromMetadata(rowSet->data[i]);
+        p5InputSkyfileRow *object = p5InputSkyfileObjectFromMetadata(rowSet->data[i]);
         psArrayAdd(returnSet, 0, object);
         psFree(object);
@@ -15929,11 +15930,11 @@
     return returnSet;
 }
-bool p5InputScfileDeleteObject(psDB *dbh, const p5InputScfileRow *object)
-{
-    psMetadata *where = p5InputScfileMetadataFromObject(object);
-    long long count = psDBDeleteRows(dbh, P5INPUTSCFILE_TABLE_NAME, where, 0);
+bool p5InputSkyfileDeleteObject(psDB *dbh, const p5InputSkyfileRow *object)
+{
+    psMetadata *where = p5InputSkyfileMetadataFromObject(object);
+    long long count = psDBDeleteRows(dbh, P5INPUTSKYFILE_TABLE_NAME, where, 0);
     psFree(where);
     if (count < 0) {
-        psError(PS_ERR_UNKNOWN, true, "failed to delete row from p5InputScfile");
+        psError(PS_ERR_UNKNOWN, true, "failed to delete row from p5InputSkyfile");
         return false;
     }
@@ -15941,21 +15942,21 @@
         // XXX should this be a psAbort() instead?  It is possible that
         // having an object match multiple rows was by design.
-        psError(PS_ERR_UNKNOWN, true, "p5InputScfileRow object matched more then one row.  Check your database schema");
-        return false;
-    }
-
-    return true;
-}
-long long p5InputScfileDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit)
+        psError(PS_ERR_UNKNOWN, true, "p5InputSkyfileRow object matched more then one row.  Check your database schema");
+        return false;
+    }
+
+    return true;
+}
+long long p5InputSkyfileDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit)
 {
     long long       deleted = 0;
 
     for (long long i = 0; i < objects->n; i++) {
-        p5InputScfileRow *object = objects->data[i];
-        psMetadata *where = p5InputScfileMetadataFromObject(object);
-        long long count = psDBDeleteRows(dbh, P5INPUTSCFILE_TABLE_NAME, where, limit);
+        p5InputSkyfileRow *object = objects->data[i];
+        psMetadata *where = p5InputSkyfileMetadataFromObject(object);
+        long long count = psDBDeleteRows(dbh, P5INPUTSKYFILE_TABLE_NAME, where, limit);
         psFree(where);
         if (count < 0) {
-            psError(PS_ERR_UNKNOWN, true, "failed to delete row from p5InputScfile");
+            psError(PS_ERR_UNKNOWN, true, "failed to delete row from p5InputSkyfile");
             return count;
         }
@@ -15966,5 +15967,5 @@
     return deleted;
 }
-bool p5InputScfilePrintObjects(FILE *stream, psArray *objects, bool mdcf)
+bool p5InputSkyfilePrintObjects(FILE *stream, psArray *objects, bool mdcf)
 {
     PS_ASSERT_PTR_NON_NULL(objects, false);
@@ -15972,9 +15973,9 @@
     psMetadata *output = psMetadataAlloc();
     for (long i = 0; i < psArrayLength(objects); i++) {
-        psMetadata *md = p5InputScfileMetadataFromObject(objects->data[i]);
+        psMetadata *md = p5InputSkyfileMetadataFromObject(objects->data[i]);
         if (!psMetadataAddMetadata(
             output,
             PS_LIST_TAIL,
-            P5INPUTSCFILE_TABLE_NAME,
+            P5INPUTSKYFILE_TABLE_NAME,
             PS_META_DUPLICATE_OK,
             NULL,
@@ -15997,9 +15998,9 @@
     return true;
 }
-bool p5InputScfilePrintObject(FILE *stream, p5InputScfileRow *object, bool mdcf)
+bool p5InputSkyfilePrintObject(FILE *stream, p5InputSkyfileRow *object, bool mdcf)
 {
     PS_ASSERT_PTR_NON_NULL(object, false);
 
-    psMetadata *md = p5InputScfileMetadataFromObject(object);
+    psMetadata *md = p5InputSkyfileMetadataFromObject(object);
 
     if (!ippdbPrintMetadataRaw(stream, md, mdcf)) {
@@ -16012,16 +16013,14 @@
     return true;
 }
-static void p5DiffScfileRowFree(p5DiffScfileRow *object);
-
-p5DiffScfileRow *p5DiffScfileRowAlloc(psS32 p5_id, const char *skycell_id, const char *tess_id, const char *uri, psF64 bg, psF64 bg_mean_stdev)
-{
-    p5DiffScfileRow *_object;
-
-    _object = psAlloc(sizeof(p5DiffScfileRow));
-    psMemSetDeallocator(_object, (psFreeFunc)p5DiffScfileRowFree);
+static void p5DiffSkyfileRowFree(p5DiffSkyfileRow *object);
+
+p5DiffSkyfileRow *p5DiffSkyfileRowAlloc(psS32 p5_id, const char *uri, psF64 bg, psF64 bg_mean_stdev)
+{
+    p5DiffSkyfileRow *_object;
+
+    _object = psAlloc(sizeof(p5DiffSkyfileRow));
+    psMemSetDeallocator(_object, (psFreeFunc)p5DiffSkyfileRowFree);
 
     _object->p5_id = p5_id;
-    _object->skycell_id = psStringCopy(skycell_id);
-    _object->tess_id = psStringCopy(tess_id);
     _object->uri = psStringCopy(uri);
     _object->bg = bg;
@@ -16031,12 +16030,10 @@
 }
 
-static void p5DiffScfileRowFree(p5DiffScfileRow *object)
-{
-    psFree(object->skycell_id);
-    psFree(object->tess_id);
+static void p5DiffSkyfileRowFree(p5DiffSkyfileRow *object)
+{
     psFree(object->uri);
 }
 
-bool p5DiffScfileCreateTable(psDB *dbh)
+bool p5DiffSkyfileCreateTable(psDB *dbh)
 {
     psMetadata *md = psMetadataAlloc();
@@ -16046,14 +16043,4 @@
         return false;
     }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "skycell_id", PS_DATA_STRING, "Primary Key", "64")) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id");
-        psFree(md);
-        return false;
-    }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, "Primary Key", "64")) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id");
-        psFree(md);
-        return false;
-    }
     if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, "255")) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item uri");
@@ -16072,5 +16059,5 @@
     }
 
-    bool status = psDBCreateTable(dbh, P5DIFFSCFILE_TABLE_NAME, md);
+    bool status = psDBCreateTable(dbh, P5DIFFSKYFILE_TABLE_NAME, md);
 
     psFree(md);
@@ -16079,10 +16066,10 @@
 }
 
-bool p5DiffScfileDropTable(psDB *dbh)
-{
-    return psDBDropTable(dbh, P5DIFFSCFILE_TABLE_NAME);
-}
-
-bool p5DiffScfileInsert(psDB * dbh, psS32 p5_id, const char *skycell_id, const char *tess_id, const char *uri, psF64 bg, psF64 bg_mean_stdev)
+bool p5DiffSkyfileDropTable(psDB *dbh)
+{
+    return psDBDropTable(dbh, P5DIFFSKYFILE_TABLE_NAME);
+}
+
+bool p5DiffSkyfileInsert(psDB * dbh, psS32 p5_id, const char *uri, psF64 bg, psF64 bg_mean_stdev)
 {
     psMetadata *md = psMetadataAlloc();
@@ -16092,14 +16079,4 @@
         return false;
     }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "skycell_id", PS_DATA_STRING, NULL, skycell_id)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id");
-        psFree(md);
-        return false;
-    }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, NULL, tess_id)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id");
-        psFree(md);
-        return false;
-    }
     if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, uri)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item uri");
@@ -16118,5 +16095,5 @@
     }
 
-    bool status = psDBInsertOneRow(dbh, P5DIFFSCFILE_TABLE_NAME, md);
+    bool status = psDBInsertOneRow(dbh, P5DIFFSKYFILE_TABLE_NAME, md);
     psFree(md);
 
@@ -16124,11 +16101,11 @@
 }
 
-long long p5DiffScfileDelete(psDB *dbh, const psMetadata *where, unsigned long long limit)
+long long p5DiffSkyfileDelete(psDB *dbh, const psMetadata *where, unsigned long long limit)
 {
     long long       deleted = 0;
 
-    long long count = psDBDeleteRows(dbh, P5DIFFSCFILE_TABLE_NAME, where, limit);
+    long long count = psDBDeleteRows(dbh, P5DIFFSKYFILE_TABLE_NAME, where, limit);
     if (count < 0) {
-        psError(PS_ERR_UNKNOWN, true, "failed to delete row from p5DiffScfile");
+        psError(PS_ERR_UNKNOWN, true, "failed to delete row from p5DiffSkyfile");
         return count;
 
@@ -16138,13 +16115,13 @@
     return deleted;
 }
-bool p5DiffScfileInsertObject(psDB *dbh, p5DiffScfileRow *object)
-{
-    return p5DiffScfileInsert(dbh, object->p5_id, object->skycell_id, object->tess_id, object->uri, object->bg, object->bg_mean_stdev);
-}
-
-bool p5DiffScfileInsertObjects(psDB *dbh, psArray *objects)
+bool p5DiffSkyfileInsertObject(psDB *dbh, p5DiffSkyfileRow *object)
+{
+    return p5DiffSkyfileInsert(dbh, object->p5_id, object->uri, object->bg, object->bg_mean_stdev);
+}
+
+bool p5DiffSkyfileInsertObjects(psDB *dbh, psArray *objects)
 {
     for (long i = 0; i < psArrayLength(objects); i++) {
-        if (!p5DiffScfileInsertObject(dbh, objects->data[i])) {
+        if (!p5DiffSkyfileInsertObject(dbh, objects->data[i])) {
             return false;
         }
@@ -16154,11 +16131,11 @@
 }
 
-bool p5DiffScfileInsertFits(psDB *dbh, const psFits *fits)
+bool p5DiffSkyfileInsertFits(psDB *dbh, const psFits *fits)
 {
     psArray         *rowSet;
 
-    // move to (the first?) extension named  P5DIFFSCFILE_TABLE_NAME
-    if (!psFitsMoveExtName(fits, P5DIFFSCFILE_TABLE_NAME)) {
-        psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", P5DIFFSCFILE_TABLE_NAME);
+    // move to (the first?) extension named  P5DIFFSKYFILE_TABLE_NAME
+    if (!psFitsMoveExtName(fits, P5DIFFSKYFILE_TABLE_NAME)) {
+        psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", P5DIFFSKYFILE_TABLE_NAME);
         return false;
     }
@@ -16178,5 +16155,5 @@
     }
 
-    if (!psDBInsertRows(dbh, P5DIFFSCFILE_TABLE_NAME, rowSet)) {
+    if (!psDBInsertRows(dbh, P5DIFFSKYFILE_TABLE_NAME, rowSet)) {
         psError(PS_ERR_UNKNOWN, false, "databse insert failed");
         psFree(rowSet);
@@ -16189,9 +16166,9 @@
 }
 
-bool p5DiffScfileSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit)
+bool p5DiffSkyfileSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit)
 {
     psArray         *rowSet;
 
-    rowSet = psDBSelectRows(dbh, P5DIFFSCFILE_TABLE_NAME, where, limit);
+    rowSet = psDBSelectRows(dbh, P5DIFFSKYFILE_TABLE_NAME, where, limit);
     if (!rowSet) {
         return false;
@@ -16199,5 +16176,5 @@
 
     // output to fits
-    if (!psFitsWriteTable(fits, NULL, rowSet, P5DIFFSCFILE_TABLE_NAME)) {
+    if (!psFitsWriteTable(fits, NULL, rowSet, P5DIFFSKYFILE_TABLE_NAME)) {
         psError(PS_ERR_UNKNOWN, false, "FITS table write failed");
         psFree(rowSet);
@@ -16210,5 +16187,5 @@
 }
 
-psMetadata *p5DiffScfileMetadataFromObject(const p5DiffScfileRow *object)
+psMetadata *p5DiffSkyfileMetadataFromObject(const p5DiffSkyfileRow *object)
 {
     psMetadata *md = psMetadataAlloc();
@@ -16218,14 +16195,4 @@
         return false;
     }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "skycell_id", PS_DATA_STRING, NULL, object->skycell_id)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id");
-        psFree(md);
-        return false;
-    }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, NULL, object->tess_id)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id");
-        psFree(md);
-        return false;
-    }
     if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, object->uri)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item uri");
@@ -16248,5 +16215,5 @@
 }
 
-p5DiffScfileRow *p5DiffScfileObjectFromMetadata(psMetadata *md)
+p5DiffSkyfileRow *p5DiffSkyfileObjectFromMetadata(psMetadata *md)
 {
 
@@ -16257,14 +16224,4 @@
         return false;
     }
-    char* skycell_id = psMetadataLookupPtr(&status, md, "skycell_id");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item skycell_id");
-        return false;
-    }
-    char* tess_id = psMetadataLookupPtr(&status, md, "tess_id");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item tess_id");
-        return false;
-    }
     char* uri = psMetadataLookupPtr(&status, md, "uri");
     if (!status) {
@@ -16283,7 +16240,7 @@
     }
 
-    return p5DiffScfileRowAlloc(p5_id, skycell_id, tess_id, uri, bg, bg_mean_stdev);
-}
-psArray *p5DiffScfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
+    return p5DiffSkyfileRowAlloc(p5_id, uri, bg, bg_mean_stdev);
+}
+psArray *p5DiffSkyfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
 {
     psArray         *rowSet;
@@ -16291,5 +16248,5 @@
     psU64           i;
 
-    rowSet = psDBSelectRows(dbh, P5DIFFSCFILE_TABLE_NAME, where, limit);
+    rowSet = psDBSelectRows(dbh, P5DIFFSKYFILE_TABLE_NAME, where, limit);
     if (!rowSet) {
         return NULL;
@@ -16301,5 +16258,5 @@
 
     for (i = 0; i < rowSet->n; i++) {
-        p5DiffScfileRow *object = p5DiffScfileObjectFromMetadata(rowSet->data[i]);
+        p5DiffSkyfileRow *object = p5DiffSkyfileObjectFromMetadata(rowSet->data[i]);
         psArrayAdd(returnSet, 0, object);
         psFree(object);
@@ -16310,11 +16267,11 @@
     return returnSet;
 }
-bool p5DiffScfileDeleteObject(psDB *dbh, const p5DiffScfileRow *object)
-{
-    psMetadata *where = p5DiffScfileMetadataFromObject(object);
-    long long count = psDBDeleteRows(dbh, P5DIFFSCFILE_TABLE_NAME, where, 0);
+bool p5DiffSkyfileDeleteObject(psDB *dbh, const p5DiffSkyfileRow *object)
+{
+    psMetadata *where = p5DiffSkyfileMetadataFromObject(object);
+    long long count = psDBDeleteRows(dbh, P5DIFFSKYFILE_TABLE_NAME, where, 0);
     psFree(where);
     if (count < 0) {
-        psError(PS_ERR_UNKNOWN, true, "failed to delete row from p5DiffScfile");
+        psError(PS_ERR_UNKNOWN, true, "failed to delete row from p5DiffSkyfile");
         return false;
     }
@@ -16322,21 +16279,21 @@
         // XXX should this be a psAbort() instead?  It is possible that
         // having an object match multiple rows was by design.
-        psError(PS_ERR_UNKNOWN, true, "p5DiffScfileRow object matched more then one row.  Check your database schema");
-        return false;
-    }
-
-    return true;
-}
-long long p5DiffScfileDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit)
+        psError(PS_ERR_UNKNOWN, true, "p5DiffSkyfileRow object matched more then one row.  Check your database schema");
+        return false;
+    }
+
+    return true;
+}
+long long p5DiffSkyfileDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit)
 {
     long long       deleted = 0;
 
     for (long long i = 0; i < objects->n; i++) {
-        p5DiffScfileRow *object = objects->data[i];
-        psMetadata *where = p5DiffScfileMetadataFromObject(object);
-        long long count = psDBDeleteRows(dbh, P5DIFFSCFILE_TABLE_NAME, where, limit);
+        p5DiffSkyfileRow *object = objects->data[i];
+        psMetadata *where = p5DiffSkyfileMetadataFromObject(object);
+        long long count = psDBDeleteRows(dbh, P5DIFFSKYFILE_TABLE_NAME, where, limit);
         psFree(where);
         if (count < 0) {
-            psError(PS_ERR_UNKNOWN, true, "failed to delete row from p5DiffScfile");
+            psError(PS_ERR_UNKNOWN, true, "failed to delete row from p5DiffSkyfile");
             return count;
         }
@@ -16347,5 +16304,5 @@
     return deleted;
 }
-bool p5DiffScfilePrintObjects(FILE *stream, psArray *objects, bool mdcf)
+bool p5DiffSkyfilePrintObjects(FILE *stream, psArray *objects, bool mdcf)
 {
     PS_ASSERT_PTR_NON_NULL(objects, false);
@@ -16353,9 +16310,9 @@
     psMetadata *output = psMetadataAlloc();
     for (long i = 0; i < psArrayLength(objects); i++) {
-        psMetadata *md = p5DiffScfileMetadataFromObject(objects->data[i]);
+        psMetadata *md = p5DiffSkyfileMetadataFromObject(objects->data[i]);
         if (!psMetadataAddMetadata(
             output,
             PS_LIST_TAIL,
-            P5DIFFSCFILE_TABLE_NAME,
+            P5DIFFSKYFILE_TABLE_NAME,
             PS_META_DUPLICATE_OK,
             NULL,
@@ -16378,9 +16335,9 @@
     return true;
 }
-bool p5DiffScfilePrintObject(FILE *stream, p5DiffScfileRow *object, bool mdcf)
+bool p5DiffSkyfilePrintObject(FILE *stream, p5DiffSkyfileRow *object, bool mdcf)
 {
     PS_ASSERT_PTR_NON_NULL(object, false);
 
-    psMetadata *md = p5DiffScfileMetadataFromObject(object);
+    psMetadata *md = p5DiffSkyfileMetadataFromObject(object);
 
     if (!ippdbPrintMetadataRaw(stream, md, mdcf)) {
@@ -16395,5 +16352,5 @@
 static void p6RunRowFree(p6RunRow *object);
 
-p6RunRow *p6RunRowAlloc(psS32 p6_id, const char *state, const char *workdir, const char *dvodb, psTime* registered)
+p6RunRow *p6RunRowAlloc(psS32 p6_id, const char *state, const char *workdir, const char *dvodb, psTime* registered, const char *skycell_id, const char *tess_id)
 {
     p6RunRow        *_object;
@@ -16407,4 +16364,6 @@
     _object->dvodb = psStringCopy(dvodb);
     _object->registered = psTimeCopy(registered);
+    _object->skycell_id = psStringCopy(skycell_id);
+    _object->tess_id = psStringCopy(tess_id);
 
     return _object;
@@ -16417,4 +16376,6 @@
     psFree(object->dvodb);
     psFree(object->registered);
+    psFree(object->skycell_id);
+    psFree(object->tess_id);
 }
 
@@ -16447,4 +16408,14 @@
         return false;
     }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "skycell_id", PS_DATA_STRING, "Key", "64")) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id");
+        psFree(md);
+        return false;
+    }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, "Key", "64")) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id");
+        psFree(md);
+        return false;
+    }
 
     bool status = psDBCreateTable(dbh, P6RUN_TABLE_NAME, md);
@@ -16460,5 +16431,5 @@
 }
 
-bool p6RunInsert(psDB * dbh, psS32 p6_id, const char *state, const char *workdir, const char *dvodb, psTime* registered)
+bool p6RunInsert(psDB * dbh, psS32 p6_id, const char *state, const char *workdir, const char *dvodb, psTime* registered, const char *skycell_id, const char *tess_id)
 {
     psMetadata *md = psMetadataAlloc();
@@ -16485,4 +16456,14 @@
     if (!psMetadataAdd(md, PS_LIST_TAIL, "registered", PS_DATA_TIME, NULL, registered)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item registered");
+        psFree(md);
+        return false;
+    }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "skycell_id", PS_DATA_STRING, NULL, skycell_id)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id");
+        psFree(md);
+        return false;
+    }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, NULL, tess_id)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id");
         psFree(md);
         return false;
@@ -16511,5 +16492,5 @@
 bool p6RunInsertObject(psDB *dbh, p6RunRow *object)
 {
-    return p6RunInsert(dbh, object->p6_id, object->state, object->workdir, object->dvodb, object->registered);
+    return p6RunInsert(dbh, object->p6_id, object->state, object->workdir, object->dvodb, object->registered, object->skycell_id, object->tess_id);
 }
 
@@ -16609,4 +16590,14 @@
         return false;
     }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "skycell_id", PS_DATA_STRING, NULL, object->skycell_id)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id");
+        psFree(md);
+        return false;
+    }
+    if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, NULL, object->tess_id)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id");
+        psFree(md);
+        return false;
+    }
 
 
@@ -16643,6 +16634,16 @@
         return false;
     }
-
-    return p6RunRowAlloc(p6_id, state, workdir, dvodb, registered);
+    char* skycell_id = psMetadataLookupPtr(&status, md, "skycell_id");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item skycell_id");
+        return false;
+    }
+    char* tess_id = psMetadataLookupPtr(&status, md, "tess_id");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item tess_id");
+        return false;
+    }
+
+    return p6RunRowAlloc(p6_id, state, workdir, dvodb, registered, skycell_id, tess_id);
 }
 psArray *p6RunSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
@@ -16754,28 +16755,24 @@
     return true;
 }
-static void p6InputScfileRowFree(p6InputScfileRow *object);
-
-p6InputScfileRow *p6InputScfileRowAlloc(psS32 p6_id, psS32 p4_id, const char *skycell_id, const char *tess_id)
-{
-    p6InputScfileRow *_object;
-
-    _object = psAlloc(sizeof(p6InputScfileRow));
-    psMemSetDeallocator(_object, (psFreeFunc)p6InputScfileRowFree);
+static void p6InputSkyfileRowFree(p6InputSkyfileRow *object);
+
+p6InputSkyfileRow *p6InputSkyfileRowAlloc(psS32 p6_id, psS32 p4_id)
+{
+    p6InputSkyfileRow *_object;
+
+    _object = psAlloc(sizeof(p6InputSkyfileRow));
+    psMemSetDeallocator(_object, (psFreeFunc)p6InputSkyfileRowFree);
 
     _object->p6_id = p6_id;
     _object->p4_id = p4_id;
-    _object->skycell_id = psStringCopy(skycell_id);
-    _object->tess_id = psStringCopy(tess_id);
 
     return _object;
 }
 
-static void p6InputScfileRowFree(p6InputScfileRow *object)
-{
-    psFree(object->skycell_id);
-    psFree(object->tess_id);
-}
-
-bool p6InputScfileCreateTable(psDB *dbh)
+static void p6InputSkyfileRowFree(p6InputSkyfileRow *object)
+{
+}
+
+bool p6InputSkyfileCreateTable(psDB *dbh)
 {
     psMetadata *md = psMetadataAlloc();
@@ -16790,16 +16787,6 @@
         return false;
     }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "skycell_id", PS_DATA_STRING, "Primary Key", "64")) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id");
-        psFree(md);
-        return false;
-    }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, "Primary Key", "64")) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id");
-        psFree(md);
-        return false;
-    }
-
-    bool status = psDBCreateTable(dbh, P6INPUTSCFILE_TABLE_NAME, md);
+
+    bool status = psDBCreateTable(dbh, P6INPUTSKYFILE_TABLE_NAME, md);
 
     psFree(md);
@@ -16808,10 +16795,10 @@
 }
 
-bool p6InputScfileDropTable(psDB *dbh)
-{
-    return psDBDropTable(dbh, P6INPUTSCFILE_TABLE_NAME);
-}
-
-bool p6InputScfileInsert(psDB * dbh, psS32 p6_id, psS32 p4_id, const char *skycell_id, const char *tess_id)
+bool p6InputSkyfileDropTable(psDB *dbh)
+{
+    return psDBDropTable(dbh, P6INPUTSKYFILE_TABLE_NAME);
+}
+
+bool p6InputSkyfileInsert(psDB * dbh, psS32 p6_id, psS32 p4_id)
 {
     psMetadata *md = psMetadataAlloc();
@@ -16826,16 +16813,6 @@
         return false;
     }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "skycell_id", PS_DATA_STRING, NULL, skycell_id)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id");
-        psFree(md);
-        return false;
-    }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, NULL, tess_id)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id");
-        psFree(md);
-        return false;
-    }
-
-    bool status = psDBInsertOneRow(dbh, P6INPUTSCFILE_TABLE_NAME, md);
+
+    bool status = psDBInsertOneRow(dbh, P6INPUTSKYFILE_TABLE_NAME, md);
     psFree(md);
 
@@ -16843,11 +16820,11 @@
 }
 
-long long p6InputScfileDelete(psDB *dbh, const psMetadata *where, unsigned long long limit)
+long long p6InputSkyfileDelete(psDB *dbh, const psMetadata *where, unsigned long long limit)
 {
     long long       deleted = 0;
 
-    long long count = psDBDeleteRows(dbh, P6INPUTSCFILE_TABLE_NAME, where, limit);
+    long long count = psDBDeleteRows(dbh, P6INPUTSKYFILE_TABLE_NAME, where, limit);
     if (count < 0) {
-        psError(PS_ERR_UNKNOWN, true, "failed to delete row from p6InputScfile");
+        psError(PS_ERR_UNKNOWN, true, "failed to delete row from p6InputSkyfile");
         return count;
 
@@ -16857,13 +16834,13 @@
     return deleted;
 }
-bool p6InputScfileInsertObject(psDB *dbh, p6InputScfileRow *object)
-{
-    return p6InputScfileInsert(dbh, object->p6_id, object->p4_id, object->skycell_id, object->tess_id);
-}
-
-bool p6InputScfileInsertObjects(psDB *dbh, psArray *objects)
+bool p6InputSkyfileInsertObject(psDB *dbh, p6InputSkyfileRow *object)
+{
+    return p6InputSkyfileInsert(dbh, object->p6_id, object->p4_id);
+}
+
+bool p6InputSkyfileInsertObjects(psDB *dbh, psArray *objects)
 {
     for (long i = 0; i < psArrayLength(objects); i++) {
-        if (!p6InputScfileInsertObject(dbh, objects->data[i])) {
+        if (!p6InputSkyfileInsertObject(dbh, objects->data[i])) {
             return false;
         }
@@ -16873,11 +16850,11 @@
 }
 
-bool p6InputScfileInsertFits(psDB *dbh, const psFits *fits)
+bool p6InputSkyfileInsertFits(psDB *dbh, const psFits *fits)
 {
     psArray         *rowSet;
 
-    // move to (the first?) extension named  P6INPUTSCFILE_TABLE_NAME
-    if (!psFitsMoveExtName(fits, P6INPUTSCFILE_TABLE_NAME)) {
-        psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", P6INPUTSCFILE_TABLE_NAME);
+    // move to (the first?) extension named  P6INPUTSKYFILE_TABLE_NAME
+    if (!psFitsMoveExtName(fits, P6INPUTSKYFILE_TABLE_NAME)) {
+        psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", P6INPUTSKYFILE_TABLE_NAME);
         return false;
     }
@@ -16897,5 +16874,5 @@
     }
 
-    if (!psDBInsertRows(dbh, P6INPUTSCFILE_TABLE_NAME, rowSet)) {
+    if (!psDBInsertRows(dbh, P6INPUTSKYFILE_TABLE_NAME, rowSet)) {
         psError(PS_ERR_UNKNOWN, false, "databse insert failed");
         psFree(rowSet);
@@ -16908,9 +16885,9 @@
 }
 
-bool p6InputScfileSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit)
+bool p6InputSkyfileSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit)
 {
     psArray         *rowSet;
 
-    rowSet = psDBSelectRows(dbh, P6INPUTSCFILE_TABLE_NAME, where, limit);
+    rowSet = psDBSelectRows(dbh, P6INPUTSKYFILE_TABLE_NAME, where, limit);
     if (!rowSet) {
         return false;
@@ -16918,5 +16895,5 @@
 
     // output to fits
-    if (!psFitsWriteTable(fits, NULL, rowSet, P6INPUTSCFILE_TABLE_NAME)) {
+    if (!psFitsWriteTable(fits, NULL, rowSet, P6INPUTSKYFILE_TABLE_NAME)) {
         psError(PS_ERR_UNKNOWN, false, "FITS table write failed");
         psFree(rowSet);
@@ -16929,5 +16906,5 @@
 }
 
-psMetadata *p6InputScfileMetadataFromObject(const p6InputScfileRow *object)
+psMetadata *p6InputSkyfileMetadataFromObject(const p6InputSkyfileRow *object)
 {
     psMetadata *md = psMetadataAlloc();
@@ -16942,14 +16919,4 @@
         return false;
     }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "skycell_id", PS_DATA_STRING, NULL, object->skycell_id)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id");
-        psFree(md);
-        return false;
-    }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, NULL, object->tess_id)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id");
-        psFree(md);
-        return false;
-    }
 
 
@@ -16957,5 +16924,5 @@
 }
 
-p6InputScfileRow *p6InputScfileObjectFromMetadata(psMetadata *md)
+p6InputSkyfileRow *p6InputSkyfileObjectFromMetadata(psMetadata *md)
 {
 
@@ -16971,18 +16938,8 @@
         return false;
     }
-    char* skycell_id = psMetadataLookupPtr(&status, md, "skycell_id");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item skycell_id");
-        return false;
-    }
-    char* tess_id = psMetadataLookupPtr(&status, md, "tess_id");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item tess_id");
-        return false;
-    }
-
-    return p6InputScfileRowAlloc(p6_id, p4_id, skycell_id, tess_id);
-}
-psArray *p6InputScfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
+
+    return p6InputSkyfileRowAlloc(p6_id, p4_id);
+}
+psArray *p6InputSkyfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
 {
     psArray         *rowSet;
@@ -16990,5 +16947,5 @@
     psU64           i;
 
-    rowSet = psDBSelectRows(dbh, P6INPUTSCFILE_TABLE_NAME, where, limit);
+    rowSet = psDBSelectRows(dbh, P6INPUTSKYFILE_TABLE_NAME, where, limit);
     if (!rowSet) {
         return NULL;
@@ -17000,5 +16957,5 @@
 
     for (i = 0; i < rowSet->n; i++) {
-        p6InputScfileRow *object = p6InputScfileObjectFromMetadata(rowSet->data[i]);
+        p6InputSkyfileRow *object = p6InputSkyfileObjectFromMetadata(rowSet->data[i]);
         psArrayAdd(returnSet, 0, object);
         psFree(object);
@@ -17009,11 +16966,11 @@
     return returnSet;
 }
-bool p6InputScfileDeleteObject(psDB *dbh, const p6InputScfileRow *object)
-{
-    psMetadata *where = p6InputScfileMetadataFromObject(object);
-    long long count = psDBDeleteRows(dbh, P6INPUTSCFILE_TABLE_NAME, where, 0);
+bool p6InputSkyfileDeleteObject(psDB *dbh, const p6InputSkyfileRow *object)
+{
+    psMetadata *where = p6InputSkyfileMetadataFromObject(object);
+    long long count = psDBDeleteRows(dbh, P6INPUTSKYFILE_TABLE_NAME, where, 0);
     psFree(where);
     if (count < 0) {
-        psError(PS_ERR_UNKNOWN, true, "failed to delete row from p6InputScfile");
+        psError(PS_ERR_UNKNOWN, true, "failed to delete row from p6InputSkyfile");
         return false;
     }
@@ -17021,21 +16978,21 @@
         // XXX should this be a psAbort() instead?  It is possible that
         // having an object match multiple rows was by design.
-        psError(PS_ERR_UNKNOWN, true, "p6InputScfileRow object matched more then one row.  Check your database schema");
-        return false;
-    }
-
-    return true;
-}
-long long p6InputScfileDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit)
+        psError(PS_ERR_UNKNOWN, true, "p6InputSkyfileRow object matched more then one row.  Check your database schema");
+        return false;
+    }
+
+    return true;
+}
+long long p6InputSkyfileDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit)
 {
     long long       deleted = 0;
 
     for (long long i = 0; i < objects->n; i++) {
-        p6InputScfileRow *object = objects->data[i];
-        psMetadata *where = p6InputScfileMetadataFromObject(object);
-        long long count = psDBDeleteRows(dbh, P6INPUTSCFILE_TABLE_NAME, where, limit);
+        p6InputSkyfileRow *object = objects->data[i];
+        psMetadata *where = p6InputSkyfileMetadataFromObject(object);
+        long long count = psDBDeleteRows(dbh, P6INPUTSKYFILE_TABLE_NAME, where, limit);
         psFree(where);
         if (count < 0) {
-            psError(PS_ERR_UNKNOWN, true, "failed to delete row from p6InputScfile");
+            psError(PS_ERR_UNKNOWN, true, "failed to delete row from p6InputSkyfile");
             return count;
         }
@@ -17046,5 +17003,5 @@
     return deleted;
 }
-bool p6InputScfilePrintObjects(FILE *stream, psArray *objects, bool mdcf)
+bool p6InputSkyfilePrintObjects(FILE *stream, psArray *objects, bool mdcf)
 {
     PS_ASSERT_PTR_NON_NULL(objects, false);
@@ -17052,9 +17009,9 @@
     psMetadata *output = psMetadataAlloc();
     for (long i = 0; i < psArrayLength(objects); i++) {
-        psMetadata *md = p6InputScfileMetadataFromObject(objects->data[i]);
+        psMetadata *md = p6InputSkyfileMetadataFromObject(objects->data[i]);
         if (!psMetadataAddMetadata(
             output,
             PS_LIST_TAIL,
-            P6INPUTSCFILE_TABLE_NAME,
+            P6INPUTSKYFILE_TABLE_NAME,
             PS_META_DUPLICATE_OK,
             NULL,
@@ -17077,9 +17034,9 @@
     return true;
 }
-bool p6InputScfilePrintObject(FILE *stream, p6InputScfileRow *object, bool mdcf)
+bool p6InputSkyfilePrintObject(FILE *stream, p6InputSkyfileRow *object, bool mdcf)
 {
     PS_ASSERT_PTR_NON_NULL(object, false);
 
-    psMetadata *md = p6InputScfileMetadataFromObject(object);
+    psMetadata *md = p6InputSkyfileMetadataFromObject(object);
 
     if (!ippdbPrintMetadataRaw(stream, md, mdcf)) {
@@ -17092,16 +17049,14 @@
     return true;
 }
-static void p6SumScfileRowFree(p6SumScfileRow *object);
-
-p6SumScfileRow *p6SumScfileRowAlloc(psS32 p6_id, const char *skycell_id, const char *tess_id, const char *uri, psF64 bg, psF64 bg_mean_stdev)
-{
-    p6SumScfileRow  *_object;
-
-    _object = psAlloc(sizeof(p6SumScfileRow));
-    psMemSetDeallocator(_object, (psFreeFunc)p6SumScfileRowFree);
+static void p6SumSkyfileRowFree(p6SumSkyfileRow *object);
+
+p6SumSkyfileRow *p6SumSkyfileRowAlloc(psS32 p6_id, const char *uri, psF64 bg, psF64 bg_mean_stdev)
+{
+    p6SumSkyfileRow *_object;
+
+    _object = psAlloc(sizeof(p6SumSkyfileRow));
+    psMemSetDeallocator(_object, (psFreeFunc)p6SumSkyfileRowFree);
 
     _object->p6_id = p6_id;
-    _object->skycell_id = psStringCopy(skycell_id);
-    _object->tess_id = psStringCopy(tess_id);
     _object->uri = psStringCopy(uri);
     _object->bg = bg;
@@ -17111,12 +17066,10 @@
 }
 
-static void p6SumScfileRowFree(p6SumScfileRow *object)
-{
-    psFree(object->skycell_id);
-    psFree(object->tess_id);
+static void p6SumSkyfileRowFree(p6SumSkyfileRow *object)
+{
     psFree(object->uri);
 }
 
-bool p6SumScfileCreateTable(psDB *dbh)
+bool p6SumSkyfileCreateTable(psDB *dbh)
 {
     psMetadata *md = psMetadataAlloc();
@@ -17126,14 +17079,4 @@
         return false;
     }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "skycell_id", PS_DATA_STRING, "Primary Key", "64")) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id");
-        psFree(md);
-        return false;
-    }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, "Primary Key", "64")) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id");
-        psFree(md);
-        return false;
-    }
     if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, "255")) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item uri");
@@ -17152,5 +17095,5 @@
     }
 
-    bool status = psDBCreateTable(dbh, P6SUMSCFILE_TABLE_NAME, md);
+    bool status = psDBCreateTable(dbh, P6SUMSKYFILE_TABLE_NAME, md);
 
     psFree(md);
@@ -17159,10 +17102,10 @@
 }
 
-bool p6SumScfileDropTable(psDB *dbh)
-{
-    return psDBDropTable(dbh, P6SUMSCFILE_TABLE_NAME);
-}
-
-bool p6SumScfileInsert(psDB * dbh, psS32 p6_id, const char *skycell_id, const char *tess_id, const char *uri, psF64 bg, psF64 bg_mean_stdev)
+bool p6SumSkyfileDropTable(psDB *dbh)
+{
+    return psDBDropTable(dbh, P6SUMSKYFILE_TABLE_NAME);
+}
+
+bool p6SumSkyfileInsert(psDB * dbh, psS32 p6_id, const char *uri, psF64 bg, psF64 bg_mean_stdev)
 {
     psMetadata *md = psMetadataAlloc();
@@ -17172,14 +17115,4 @@
         return false;
     }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "skycell_id", PS_DATA_STRING, NULL, skycell_id)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id");
-        psFree(md);
-        return false;
-    }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, NULL, tess_id)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id");
-        psFree(md);
-        return false;
-    }
     if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, uri)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item uri");
@@ -17198,5 +17131,5 @@
     }
 
-    bool status = psDBInsertOneRow(dbh, P6SUMSCFILE_TABLE_NAME, md);
+    bool status = psDBInsertOneRow(dbh, P6SUMSKYFILE_TABLE_NAME, md);
     psFree(md);
 
@@ -17204,11 +17137,11 @@
 }
 
-long long p6SumScfileDelete(psDB *dbh, const psMetadata *where, unsigned long long limit)
+long long p6SumSkyfileDelete(psDB *dbh, const psMetadata *where, unsigned long long limit)
 {
     long long       deleted = 0;
 
-    long long count = psDBDeleteRows(dbh, P6SUMSCFILE_TABLE_NAME, where, limit);
+    long long count = psDBDeleteRows(dbh, P6SUMSKYFILE_TABLE_NAME, where, limit);
     if (count < 0) {
-        psError(PS_ERR_UNKNOWN, true, "failed to delete row from p6SumScfile");
+        psError(PS_ERR_UNKNOWN, true, "failed to delete row from p6SumSkyfile");
         return count;
 
@@ -17218,13 +17151,13 @@
     return deleted;
 }
-bool p6SumScfileInsertObject(psDB *dbh, p6SumScfileRow *object)
-{
-    return p6SumScfileInsert(dbh, object->p6_id, object->skycell_id, object->tess_id, object->uri, object->bg, object->bg_mean_stdev);
-}
-
-bool p6SumScfileInsertObjects(psDB *dbh, psArray *objects)
+bool p6SumSkyfileInsertObject(psDB *dbh, p6SumSkyfileRow *object)
+{
+    return p6SumSkyfileInsert(dbh, object->p6_id, object->uri, object->bg, object->bg_mean_stdev);
+}
+
+bool p6SumSkyfileInsertObjects(psDB *dbh, psArray *objects)
 {
     for (long i = 0; i < psArrayLength(objects); i++) {
-        if (!p6SumScfileInsertObject(dbh, objects->data[i])) {
+        if (!p6SumSkyfileInsertObject(dbh, objects->data[i])) {
             return false;
         }
@@ -17234,11 +17167,11 @@
 }
 
-bool p6SumScfileInsertFits(psDB *dbh, const psFits *fits)
+bool p6SumSkyfileInsertFits(psDB *dbh, const psFits *fits)
 {
     psArray         *rowSet;
 
-    // move to (the first?) extension named  P6SUMSCFILE_TABLE_NAME
-    if (!psFitsMoveExtName(fits, P6SUMSCFILE_TABLE_NAME)) {
-        psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", P6SUMSCFILE_TABLE_NAME);
+    // move to (the first?) extension named  P6SUMSKYFILE_TABLE_NAME
+    if (!psFitsMoveExtName(fits, P6SUMSKYFILE_TABLE_NAME)) {
+        psError(PS_ERR_UNKNOWN, true, "failed to find FITS extension %s", P6SUMSKYFILE_TABLE_NAME);
         return false;
     }
@@ -17258,5 +17191,5 @@
     }
 
-    if (!psDBInsertRows(dbh, P6SUMSCFILE_TABLE_NAME, rowSet)) {
+    if (!psDBInsertRows(dbh, P6SUMSKYFILE_TABLE_NAME, rowSet)) {
         psError(PS_ERR_UNKNOWN, false, "databse insert failed");
         psFree(rowSet);
@@ -17269,9 +17202,9 @@
 }
 
-bool p6SumScfileSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit)
+bool p6SumSkyfileSelectRowsFits(psDB *dbh, psFits *fits, const psMetadata *where, unsigned long long limit)
 {
     psArray         *rowSet;
 
-    rowSet = psDBSelectRows(dbh, P6SUMSCFILE_TABLE_NAME, where, limit);
+    rowSet = psDBSelectRows(dbh, P6SUMSKYFILE_TABLE_NAME, where, limit);
     if (!rowSet) {
         return false;
@@ -17279,5 +17212,5 @@
 
     // output to fits
-    if (!psFitsWriteTable(fits, NULL, rowSet, P6SUMSCFILE_TABLE_NAME)) {
+    if (!psFitsWriteTable(fits, NULL, rowSet, P6SUMSKYFILE_TABLE_NAME)) {
         psError(PS_ERR_UNKNOWN, false, "FITS table write failed");
         psFree(rowSet);
@@ -17290,5 +17223,5 @@
 }
 
-psMetadata *p6SumScfileMetadataFromObject(const p6SumScfileRow *object)
+psMetadata *p6SumSkyfileMetadataFromObject(const p6SumSkyfileRow *object)
 {
     psMetadata *md = psMetadataAlloc();
@@ -17298,14 +17231,4 @@
         return false;
     }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "skycell_id", PS_DATA_STRING, NULL, object->skycell_id)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item skycell_id");
-        psFree(md);
-        return false;
-    }
-    if (!psMetadataAdd(md, PS_LIST_TAIL, "tess_id", PS_DATA_STRING, NULL, object->tess_id)) {
-        psError(PS_ERR_UNKNOWN, false, "failed to add item tess_id");
-        psFree(md);
-        return false;
-    }
     if (!psMetadataAdd(md, PS_LIST_TAIL, "uri", PS_DATA_STRING, NULL, object->uri)) {
         psError(PS_ERR_UNKNOWN, false, "failed to add item uri");
@@ -17328,5 +17251,5 @@
 }
 
-p6SumScfileRow *p6SumScfileObjectFromMetadata(psMetadata *md)
+p6SumSkyfileRow *p6SumSkyfileObjectFromMetadata(psMetadata *md)
 {
 
@@ -17337,14 +17260,4 @@
         return false;
     }
-    char* skycell_id = psMetadataLookupPtr(&status, md, "skycell_id");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item skycell_id");
-        return false;
-    }
-    char* tess_id = psMetadataLookupPtr(&status, md, "tess_id");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item tess_id");
-        return false;
-    }
     char* uri = psMetadataLookupPtr(&status, md, "uri");
     if (!status) {
@@ -17363,7 +17276,7 @@
     }
 
-    return p6SumScfileRowAlloc(p6_id, skycell_id, tess_id, uri, bg, bg_mean_stdev);
-}
-psArray *p6SumScfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
+    return p6SumSkyfileRowAlloc(p6_id, uri, bg, bg_mean_stdev);
+}
+psArray *p6SumSkyfileSelectRowObjects(psDB *dbh, const psMetadata *where, unsigned long long limit)
 {
     psArray         *rowSet;
@@ -17371,5 +17284,5 @@
     psU64           i;
 
-    rowSet = psDBSelectRows(dbh, P6SUMSCFILE_TABLE_NAME, where, limit);
+    rowSet = psDBSelectRows(dbh, P6SUMSKYFILE_TABLE_NAME, where, limit);
     if (!rowSet) {
         return NULL;
@@ -17381,5 +17294,5 @@
 
     for (i = 0; i < rowSet->n; i++) {
-        p6SumScfileRow *object = p6SumScfileObjectFromMetadata(rowSet->data[i]);
+        p6SumSkyfileRow *object = p6SumSkyfileObjectFromMetadata(rowSet->data[i]);
         psArrayAdd(returnSet, 0, object);
         psFree(object);
@@ -17390,11 +17303,11 @@
     return returnSet;
 }
-bool p6SumScfileDeleteObject(psDB *dbh, const p6SumScfileRow *object)
-{
-    psMetadata *where = p6SumScfileMetadataFromObject(object);
-    long long count = psDBDeleteRows(dbh, P6SUMSCFILE_TABLE_NAME, where, 0);
+bool p6SumSkyfileDeleteObject(psDB *dbh, const p6SumSkyfileRow *object)
+{
+    psMetadata *where = p6SumSkyfileMetadataFromObject(object);
+    long long count = psDBDeleteRows(dbh, P6SUMSKYFILE_TABLE_NAME, where, 0);
     psFree(where);
     if (count < 0) {
-        psError(PS_ERR_UNKNOWN, true, "failed to delete row from p6SumScfile");
+        psError(PS_ERR_UNKNOWN, true, "failed to delete row from p6SumSkyfile");
         return false;
     }
@@ -17402,21 +17315,21 @@
         // XXX should this be a psAbort() instead?  It is possible that
         // having an object match multiple rows was by design.
-        psError(PS_ERR_UNKNOWN, true, "p6SumScfileRow object matched more then one row.  Check your database schema");
-        return false;
-    }
-
-    return true;
-}
-long long p6SumScfileDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit)
+        psError(PS_ERR_UNKNOWN, true, "p6SumSkyfileRow object matched more then one row.  Check your database schema");
+        return false;
+    }
+
+    return true;
+}
+long long p6SumSkyfileDeleteRowObjects(psDB *dbh, const psArray *objects, unsigned long long limit)
 {
     long long       deleted = 0;
 
     for (long long i = 0; i < objects->n; i++) {
-        p6SumScfileRow *object = objects->data[i];
-        psMetadata *where = p6SumScfileMetadataFromObject(object);
-        long long count = psDBDeleteRows(dbh, P6SUMSCFILE_TABLE_NAME, where, limit);
+        p6SumSkyfileRow *object = objects->data[i];
+        psMetadata *where = p6SumSkyfileMetadataFromObject(object);
+        long long count = psDBDeleteRows(dbh, P6SUMSKYFILE_TABLE_NAME, where, limit);
         psFree(where);
         if (count < 0) {
-            psError(PS_ERR_UNKNOWN, true, "failed to delete row from p6SumScfile");
+            psError(PS_ERR_UNKNOWN, true, "failed to delete row from p6SumSkyfile");
             return count;
         }
@@ -17427,5 +17340,5 @@
     return deleted;
 }
-bool p6SumScfilePrintObjects(FILE *stream, psArray *objects, bool mdcf)
+bool p6SumSkyfilePrintObjects(FILE *stream, psArray *objects, bool mdcf)
 {
     PS_ASSERT_PTR_NON_NULL(objects, false);
@@ -17433,9 +17346,9 @@
     psMetadata *output = psMetadataAlloc();
     for (long i = 0; i < psArrayLength(objects); i++) {
-        psMetadata *md = p6SumScfileMetadataFromObject(objects->data[i]);
+        psMetadata *md = p6SumSkyfileMetadataFromObject(objects->data[i]);
         if (!psMetadataAddMetadata(
             output,
             PS_LIST_TAIL,
-            P6SUMSCFILE_TABLE_NAME,
+            P6SUMSKYFILE_TABLE_NAME,
             PS_META_DUPLICATE_OK,
             NULL,
@@ -17458,9 +17371,9 @@
     return true;
 }
-bool p6SumScfilePrintObject(FILE *stream, p6SumScfileRow *object, bool mdcf)
+bool p6SumSkyfilePrintObject(FILE *stream, p6SumSkyfileRow *object, bool mdcf)
 {
     PS_ASSERT_PTR_NON_NULL(object, false);
 
-    psMetadata *md = p6SumScfileMetadataFromObject(object);
+    psMetadata *md = p6SumSkyfileMetadataFromObject(object);
 
     if (!ippdbPrintMetadataRaw(stream, md, mdcf)) {