Index: trunk/Ohana/src/dvosplit/src/dvosplit.c
===================================================================
--- trunk/Ohana/src/dvosplit/src/dvosplit.c	(revision 37807)
+++ trunk/Ohana/src/dvosplit/src/dvosplit.c	(revision 38441)
@@ -80,5 +80,5 @@
     incatalog.filename = skylist[0].filename[i];
     incatalog.Nsecfilt = GetPhotcodeNsecfilt ();
-    incatalog.catflags = LOAD_NONE;
+    incatalog.catflags = DVO_LOAD_NONE;
 
     // an error exit status here is a significant error
@@ -89,5 +89,5 @@
 
     // skip empty input catalogs
-    if (!incatalog.Naves_disk) {
+    if (!incatalog.Naverage_disk) {
       dvo_catalog_unlock (&incatalog);
       dvo_catalog_free (&incatalog);
Index: trunk/Ohana/src/dvosplit/src/open_output_catalogs.c
===================================================================
--- trunk/Ohana/src/dvosplit/src/open_output_catalogs.c	(revision 37807)
+++ trunk/Ohana/src/dvosplit/src/open_output_catalogs.c	(revision 38441)
@@ -14,5 +14,5 @@
     outcatalogs[i].filename  = outlist[0].filename[i];
     outcatalogs[i].Nsecfilt  = GetPhotcodeNsecfilt ();
-    outcatalogs[i].catflags  = LOAD_NONE;
+    outcatalogs[i].catflags  = DVO_LOAD_NONE;
     outcatalogs[i].catformat = CATFORMAT ? dvo_catalog_catformat (CATFORMAT) : catformat;  // set the default catformat from config data
     outcatalogs[i].catmode   = CATMODE   ? dvo_catalog_catmode (CATMODE)     : catmode;    // set the default catmode from config data
Index: trunk/Ohana/src/dvosplit/src/split_averages.c
===================================================================
--- trunk/Ohana/src/dvosplit/src/split_averages.c	(revision 37807)
+++ trunk/Ohana/src/dvosplit/src/split_averages.c	(revision 38441)
@@ -10,6 +10,6 @@
   AveLinks *avelinks;
 
-  ALLOCATE (outref, int, incatalog[0].Naves_disk);
-  ALLOCATE (outcat, int, incatalog[0].Naves_disk);
+  ALLOCATE (outref, int, incatalog[0].Naverage_disk);
+  ALLOCATE (outcat, int, incatalog[0].Naverage_disk);
   ALLOCATE (outmem, int, outlist[0].Nregions);
 
@@ -25,9 +25,9 @@
 
   // split out the average & secfilt entries:
-  incatalog[0].catflags = LOAD_AVES | LOAD_SECF;
+  incatalog[0].catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
 
   if ((incatalog[0].catmode == DVO_MODE_SPLIT) && !FULL_TABLE) {
-    Nblocks = incatalog[0].Naves_disk / NROWS;
-    if (incatalog[0].Naves_disk % NROWS) Nblocks ++;
+    Nblocks = incatalog[0].Naverage_disk / NROWS;
+    if (incatalog[0].Naverage_disk % NROWS) Nblocks ++;
   } else {
     Nblocks = 1;
@@ -40,5 +40,5 @@
       dvo_catalog_load_segment (incatalog, VERBOSE, block*NROWS, NROWS);
       fprintf (stderr, "splitting %s (averages) .. %d of %d\n", incatalog[0].filename, block, Nblocks);
-      assert (block*NROWS == incatalog[0].Naves_off);
+      assert (block*NROWS == incatalog[0].Naverage_off);
     } else {
       dvo_catalog_load (incatalog, VERBOSE);
@@ -48,5 +48,5 @@
     // distribute data to the output catalogs
     for (ave = 0; ave < incatalog[0].Naverage; ave++) {
-      averef = ave + incatalog[0].Naves_off;
+      averef = ave + incatalog[0].Naverage_off;
 	
       inR = incatalog[0].average[ave].R;
@@ -75,5 +75,5 @@
 
       Nout = outcatalogs[Ncat].Naverage;
-      outref[averef] = Nout + outcatalogs[Ncat].Naves_off;
+      outref[averef] = Nout + outcatalogs[Ncat].Naverage_off;
       outcat[averef] = Ncat;
 
@@ -85,5 +85,5 @@
       for (n = 0; n < Nsecfilt; n++) {
 	outcatalogs[Ncat].secfilt[Nout*Nsecfilt + n] = incatalog[0].secfilt[ave*Nsecfilt + n];
-	outcatalogs[Ncat].Nsecf_mem++;
+	outcatalogs[Ncat].Nsecfilt_mem++;
       }
 
@@ -96,5 +96,5 @@
     dvo_catalog_free_data (incatalog);
 
-    // double check the values of Naverage, Nsecf_mem?
+    // double check the values of Naverage, Nsecfilt_mem?
 
     // XXX for output.catformat == MEF, we probably need to skip this stuff and the free below
@@ -103,19 +103,19 @@
     if (!FULL_TABLE) {
       for (cat = 0; cat < outlist[0].Nregions; cat++) {
-	outcatalogs[cat].catflags = LOAD_AVES | LOAD_SECF;
+	outcatalogs[cat].catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
 
 	dvo_catalog_save (&outcatalogs[cat], VERBOSE);
-	// fprintf (stderr, "secfilt: %d %d %d %d\n", outcatalogs[cat].Nsecf_mem, outcatalogs[cat].Nsecf_disk, outcatalogs[cat].Nsecf_off, outcatalogs[cat].Naverage, outcatalogs[cat].Nsecfilt);
+	// fprintf (stderr, "secfilt: %d %d %d %d\n", outcatalogs[cat].Nsecfilt_mem, outcatalogs[cat].Nsecfilt_disk, outcatalogs[cat].Nsecfilt_off, outcatalogs[cat].Naverage, outcatalogs[cat].Nsecfilt);
 
 	// advance the pointers and free the current data
 	// XXX these should be done within save segment:
-	outcatalogs[cat].Naves_disk += outcatalogs[cat].Naverage;
-	outcatalogs[cat].Naves_off  += outcatalogs[cat].Naverage;
-	outcatalogs[cat].Nsecf_disk += outcatalogs[cat].Nsecfilt * outcatalogs[cat].Naverage;
-	outcatalogs[cat].Nsecf_off  += outcatalogs[cat].Nsecfilt * outcatalogs[cat].Naverage;
+	outcatalogs[cat].Naverage_disk += outcatalogs[cat].Naverage;
+	outcatalogs[cat].Naverage_off  += outcatalogs[cat].Naverage;
+	outcatalogs[cat].Nsecfilt_disk += outcatalogs[cat].Nsecfilt * outcatalogs[cat].Naverage;
+	outcatalogs[cat].Nsecfilt_off  += outcatalogs[cat].Nsecfilt * outcatalogs[cat].Naverage;
 	outcatalogs[cat].Nsecfilt    = Nsecfilt;
 
 	outcatalogs[cat].Naverage    = 0;
-	outcatalogs[cat].Nsecf_mem   = 0;
+	outcatalogs[cat].Nsecfilt_mem   = 0;
       }
     }
Index: trunk/Ohana/src/dvosplit/src/split_measures.c
===================================================================
--- trunk/Ohana/src/dvosplit/src/split_measures.c	(revision 37807)
+++ trunk/Ohana/src/dvosplit/src/split_measures.c	(revision 38441)
@@ -19,15 +19,15 @@
 
   // split out the measure entries:
-  incatalog[0].catflags = LOAD_MEAS | LOAD_AVES | LOAD_SECF;
+  incatalog[0].catflags = DVO_LOAD_MEASURE | DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
 
   // if ((incatalog[0].catformat == DVO_FORMAT_ELIXIR) || (incatalog[0].catformat == DVO_FORMAT_LONEOS)) {
   //   // for these two formats, we need the average and secfilt values around until we do the measures...
   //   // XXX I am loading these 2x -- perhaps I can make the API smarter about reloading?
-  //   incatalog[0].catflags |= LOAD_AVES | LOAD_SECF; 
+  //   incatalog[0].catflags |= DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT; 
   // }
 
   if ((incatalog[0].catmode == DVO_MODE_SPLIT) && !FULL_TABLE) {
-    Nblocks = incatalog[0].Nmeas_disk / NROWS;
-    if (incatalog[0].Nmeas_disk % NROWS) Nblocks ++;
+    Nblocks = incatalog[0].Nmeasure_disk / NROWS;
+    if (incatalog[0].Nmeasure_disk % NROWS) Nblocks ++;
   } else {
     Nblocks = 1;
@@ -40,5 +40,5 @@
       dvo_catalog_load_segment (incatalog, VERBOSE, block*NROWS, NROWS);
       fprintf (stderr, "splitting %s (measures) .. %d of %d\n", incatalog[0].filename, block, Nblocks);
-      assert (block*NROWS == incatalog[0].Nmeas_off);
+      assert (block*NROWS == incatalog[0].Nmeasure_off);
     } else {
       dvo_catalog_load (incatalog, VERBOSE);
@@ -72,9 +72,9 @@
     if (!FULL_TABLE) {
       for (cat = 0; cat < outlist[0].Nregions; cat++) {
-	outcatalogs[cat].catflags = LOAD_MEAS;
+	outcatalogs[cat].catflags = DVO_LOAD_MEASURE;
 	dvo_catalog_save (&outcatalogs[cat], VERBOSE);
 
-	outcatalogs[cat].Nmeas_disk += outcatalogs[cat].Nmeasure;
-	outcatalogs[cat].Nmeas_off  += outcatalogs[cat].Nmeasure;
+	outcatalogs[cat].Nmeasure_disk += outcatalogs[cat].Nmeasure;
+	outcatalogs[cat].Nmeasure_off  += outcatalogs[cat].Nmeasure;
 	outcatalogs[cat].Nmeasure    = 0;
       }
@@ -84,5 +84,5 @@
   if (FULL_TABLE) {
     for (cat = 0; cat < outlist[0].Nregions; cat++) {
-      outcatalogs[cat].catflags = LOAD_AVES | LOAD_SECF | LOAD_MEAS;
+      outcatalogs[cat].catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT | DVO_LOAD_MEASURE;
       dvo_catalog_save (&outcatalogs[cat], VERBOSE);
     }
Index: trunk/Ohana/src/dvosplit/src/split_missings.c
===================================================================
--- trunk/Ohana/src/dvosplit/src/split_missings.c	(revision 37807)
+++ trunk/Ohana/src/dvosplit/src/split_missings.c	(revision 38441)
@@ -15,7 +15,7 @@
 
   // split out the missing entries:
-  incatalog[0].catflags = LOAD_MISS;
-  Nblocks = incatalog[0].Nmiss_disk / NROWS;
-  if (incatalog[0].Nmiss_disk % NROWS) Nblocks ++;
+  incatalog[0].catflags = DVO_LOAD_MISSING;
+  Nblocks = incatalog[0].Nmissing_disk / NROWS;
+  if (incatalog[0].Nmissing_disk % NROWS) Nblocks ++;
   for (block = 0; block < Nblocks; block++) {
 
@@ -35,9 +35,9 @@
 
     for (cat = 0; cat < outlist[0].Nregions; cat++) {
-      outcatalogs[cat].catflags = LOAD_MISS;
+      outcatalogs[cat].catflags = DVO_LOAD_MISSING;
       dvo_catalog_save_segment (&outcatalog[cat], VERBOSE);
 
-      outcatalog[cat].Nmiss_disk += outcatalog[cat].Nmissing;
-      outcatalog[cat].Nmiss_off  += outcatalog[cat].Nmissing;
+      outcatalog[cat].Nmissing_disk += outcatalog[cat].Nmissing;
+      outcatalog[cat].Nmissing_off  += outcatalog[cat].Nmissing;
       outcatalog[cat].Nmissing    = 0;