Index: trunk/ippTools/src/chiptool.c
===================================================================
--- trunk/ippTools/src/chiptool.c	(revision 23695)
+++ trunk/ippTools/src/chiptool.c	(revision 23697)
@@ -1302,6 +1302,6 @@
   ExportTable tables [] = {
     {"chipRun", "chiptool_export_run.sql"},
-    {"chipImfile", "chiptool_export_imfiles.sql"},
-    {"chipProcessedImfile", "chiptool_export_processed_imfiles.sql"},
+    {"chipImfile", "chiptool_export_imfile.sql"},
+    {"chipProcessedImfile", "chiptool_export_processed_imfile.sql"},
   };
 
Index: trunk/ippTools/src/warptool.c
===================================================================
--- trunk/ippTools/src/warptool.c	(revision 23695)
+++ trunk/ippTools/src/warptool.c	(revision 23697)
@@ -1602,9 +1602,10 @@
       {"warpImfile", "warptool_export_imfile.sql"},
       {"warpSkyfile", "warptool_export_skyfile.sql"},
-      {"warpSkyCellMap", "warptool_export_sky_cell_map.sql"},
+      {"warpSkyCellMap", "warptool_export_skycell_map.sql"},
     };
 
-
-    for (int i=0; i < sizeof(tables); i++) {
+    int numTables = sizeof(tables)/sizeof(tables[0]);
+
+    for (int i=0; i < numTables; i++) {
       psString query = pxDataGet(tables[i].sqlFilename);
       if (!query) {