Index: /branches/eam_branches/ipp-20121219/Ohana/src/libautocode/def/cmf-ps1-sv1.d
===================================================================
--- /branches/eam_branches/ipp-20121219/Ohana/src/libautocode/def/cmf-ps1-sv1.d	(revision 35000)
+++ /branches/eam_branches/ipp-20121219/Ohana/src/libautocode/def/cmf-ps1-sv1.d	(revision 35001)
@@ -29,5 +29,5 @@
 FIELD Flux,           PSF_INST_FLUX,     float,    psf flux,	       counts
 FIELD dFlux,          PSF_INST_FLUX_SIG, float,    psf flux error,        counts      
-FIELD Map,            AP_MAG_STANDARD,   float,    standard aperture mag, mags
+FIELD Map,            AP_MAG,   	 float,    standard aperture mag, mags
 
 FIELD MapRaw,         AP_MAG_RAW,        float,    raw aperture mag,      mags
Index: /branches/eam_branches/ipp-20121219/Ohana/src/libautocode/def/cmf-ps1-sv2.d
===================================================================
--- /branches/eam_branches/ipp-20121219/Ohana/src/libautocode/def/cmf-ps1-sv2.d	(revision 35000)
+++ /branches/eam_branches/ipp-20121219/Ohana/src/libautocode/def/cmf-ps1-sv2.d	(revision 35001)
@@ -29,5 +29,5 @@
 FIELD Flux,           PSF_INST_FLUX,     float,    psf flux,	       counts
 FIELD dFlux,          PSF_INST_FLUX_SIG, float,    psf flux error,        counts      
-FIELD Map,            AP_MAG_STANDARD,   float,    standard aperture mag, mags
+FIELD Map,            AP_MAG,   	 float,    standard aperture mag, mags
 
 FIELD MapRaw,         AP_MAG_RAW,        float,    raw aperture mag,      mags
Index: /branches/eam_branches/ipp-20121219/Ohana/src/libautocode/def/cmf-ps1-v1.d
===================================================================
--- /branches/eam_branches/ipp-20121219/Ohana/src/libautocode/def/cmf-ps1-v1.d	(revision 35000)
+++ /branches/eam_branches/ipp-20121219/Ohana/src/libautocode/def/cmf-ps1-v1.d	(revision 35001)
@@ -17,5 +17,5 @@
 FIELD M,      	 PSF_INST_MAG,     float,    inst mags,             mags
 FIELD dM,     	 PSF_INST_MAG_SIG, float,    inst mag error,        mags
-FIELD Map,       AP_MAG_STANDARD,  float,    standard aperture mag, mags
+FIELD Map,       AP_MAG,  	   float,    standard aperture mag, mags
 FIELD apRadius,  AP_MAG_RADIUS,    float,    radius used for fit,   pixels
 FIELD Mpeak,     PEAK_FLUX_AS_MAG, float,    peak flux as a mag,    mags
@@ -23,5 +23,5 @@
 FIELD dMcal,     CAL_PSF_MAG_SIG,  float,    zero point scatter,    mags
 FIELD sky,    	 SKY,              float,    sky flux,              cnts/sec
-FIELD dSky,    	 SKY_SIG,          float,    sky flux error,        cnts/sec
+FIELD dSky,    	 SKY_SIGMA,        float,    sky flux error,        cnts/sec
 FIELD psfChisq,  PSF_CHISQ,        float,    psf fit chisq
 FIELD crNsigma,  CR_NSIGMA,        float,    Nsigma deviations from PSF to CF
Index: /branches/eam_branches/ipp-20121219/Ohana/src/libautocode/def/cmf-ps1-v2.d
===================================================================
--- /branches/eam_branches/ipp-20121219/Ohana/src/libautocode/def/cmf-ps1-v2.d	(revision 35000)
+++ /branches/eam_branches/ipp-20121219/Ohana/src/libautocode/def/cmf-ps1-v2.d	(revision 35001)
@@ -15,5 +15,5 @@
 FIELD M,      	 PSF_INST_MAG,     float,    inst mags,             mags
 FIELD dM,     	 PSF_INST_MAG_SIG, float,    inst mag error,        mags
-FIELD Map,       AP_MAG_STANDARD,  float,    standard aperture mag, mags
+FIELD Map,       AP_MAG,  	   float,    standard aperture mag, mags
 FIELD apRadius,  AP_MAG_RADIUS,    float,    radius used for fit,   pixels
 FIELD Mpeak,     PEAK_FLUX_AS_MAG, float,    peak flux as a mag,    mags
@@ -23,5 +23,5 @@
 FIELD DEC,     	 DEC_PSF,    	   double,   PSF DEC coord,         degrees
 FIELD sky,    	 SKY,              float,    sky flux,              cnts/sec
-FIELD dSky,    	 SKY_SIG,          float,    sky flux error,        cnts/sec
+FIELD dSky,    	 SKY_SIGMA,        float,    sky flux error,        cnts/sec
 FIELD psfChisq,  PSF_CHISQ,        float,    psf fit chisq
 FIELD crNsigma,  CR_NSIGMA,        float,    Nsigma deviations from PSF to CF
Index: /branches/eam_branches/ipp-20121219/Ohana/src/libautocode/def/cmf-ps1-v3.d
===================================================================
--- /branches/eam_branches/ipp-20121219/Ohana/src/libautocode/def/cmf-ps1-v3.d	(revision 35000)
+++ /branches/eam_branches/ipp-20121219/Ohana/src/libautocode/def/cmf-ps1-v3.d	(revision 35001)
@@ -17,5 +17,5 @@
 FIELD Flux,           PSF_INST_FLUX,     float,    psf flux,	       counts
 FIELD dFlux,          PSF_INST_FLUX_SIG, float,    psf flux error,        counts      
-FIELD Map,            AP_MAG_STANDARD,   float,    standard aperture mag, mags
+FIELD Map,            AP_MAG,   	 float,    standard aperture mag, mags
 FIELD MapRaw,         AP_MAG_RAW,        float,    raw aperture mag,      mags
 FIELD apRadius,       AP_MAG_RADIUS,     float,    radius used for fit,   pixels
@@ -29,5 +29,5 @@
 FIELD Mpeak,          PEAK_FLUX_AS_MAG,  float,    peak flux as a mag,    mags
 FIELD sky,            SKY,               float,    sky flux,              cnts/sec
-FIELD dSky,           SKY_SIG,           float,    sky flux error,        cnts/sec
+FIELD dSky,           SKY_SIGMA,         float,    sky flux error,        cnts/sec
 FIELD psfChisq,       PSF_CHISQ,         float,    psf fit chisq
 FIELD crNsigma,       CR_NSIGMA,         float,    Nsigma deviations from PSF to CF
@@ -54,5 +54,5 @@
 FIELD kronOuter,      KRON_FLUX_OUTER,   float,    kron flux 2.5<R<4,     counts
 FIELD flags,          FLAGS,             int,      analysis flags
-FIELD flags2,         FLAGS,             int,      analysis flags (2)
+FIELD flags2,         FLAGS2,            int,      analysis flags (2)
 FIELD padding2,       PADDING,           int,      padding for 8byte records
 FIELD nFrames,        N_FRAMES,          short,    images overlapping peak
Index: /branches/eam_branches/ipp-20121219/Ohana/src/libautocode/def/cmf-ps1-v4.d
===================================================================
--- /branches/eam_branches/ipp-20121219/Ohana/src/libautocode/def/cmf-ps1-v4.d	(revision 35000)
+++ /branches/eam_branches/ipp-20121219/Ohana/src/libautocode/def/cmf-ps1-v4.d	(revision 35001)
@@ -17,5 +17,5 @@
 FIELD Flux,           PSF_INST_FLUX,     float,    psf flux,	       counts
 FIELD dFlux,          PSF_INST_FLUX_SIG, float,    psf flux error,        counts      
-FIELD Map,            AP_MAG_STANDARD,   float,    standard aperture mag, mags
+FIELD Map,            AP_MAG,   	 float,    standard aperture mag, mags
 FIELD MapRaw,         AP_MAG_RAW,        float,    raw aperture mag,      mags
 FIELD apRadius,       AP_MAG_RADIUS,     float,    radius used for fit,   pixels
@@ -31,5 +31,5 @@
 FIELD Mpeak,          PEAK_FLUX_AS_MAG,  float,    peak flux as a mag,    mags
 FIELD sky,            SKY,               float,    sky flux,              cnts/sec
-FIELD dSky,           SKY_SIG,           float,    sky flux error,        cnts/sec
+FIELD dSky,           SKY_SIGMA,         float,    sky flux error,        cnts/sec
 FIELD psfChisq,       PSF_CHISQ,         float,    psf fit chisq
 FIELD crNsigma,       CR_NSIGMA,         float,    Nsigma deviations from PSF to CF
@@ -59,5 +59,5 @@
 FIELD skyLimitSlope,  SKY_LIMIT_SLOPE,   float,    profile to sky limit (slope)
 FIELD flags,          FLAGS,             int,      analysis flags
-FIELD flags2,         FLAGS,             int,      analysis flags (2)
+FIELD flags2,         FLAGS2,            int,      analysis flags (2)
 FIELD nFrames,        N_FRAMES,          short,    images overlapping peak
 FIELD padding,        PADDING,           short,    padding for 8byte records