Index: /branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v1.d
===================================================================
--- /branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v1.d	(revision 38415)
+++ /branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v1.d	(revision 38416)
@@ -26,5 +26,5 @@
 FIELD Nmeasure,       NMEASURE,    unsigned short,  number of psf measurements
 FIELD Nmissing,       NMISSING,    unsigned short,  number of missings
-FIELD Ngalshape,      NGALSHAPE,   unsigned short,  number of galshape measurements
+FIELD Ngalphot,      NGALPHOT,   unsigned short,  number of galphot measurements
 
 FIELD measureOffset,  OFF_MEASURE, uint32_t,   	    offset to first psf measurement
Index: /branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v2.d
===================================================================
--- /branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v2.d	(revision 38415)
+++ /branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v2.d	(revision 38416)
@@ -31,5 +31,5 @@
 FIELD Nmeasure,       NMEASURE,    unsigned short,  number of psf measurements
 FIELD Nmissing,       NMISSING,    unsigned short,  number of missings
-FIELD Ngalshape,      NGALSHAPE,   unsigned short,  number of galshape measurements
+FIELD Ngalphot,      NGALPHOT,   unsigned short,  number of galphot measurements
 
 FIELD measureOffset,  OFF_MEASURE, uint32_t,   	    offset to first psf measurement
Index: /branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v3.d
===================================================================
--- /branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v3.d	(revision 38415)
+++ /branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v3.d	(revision 38416)
@@ -31,5 +31,5 @@
 FIELD Nmeasure,       NMEASURE,    unsigned short,  number of psf measurements
 FIELD Nmissing,       NMISSING,    unsigned short,  number of missings
-FIELD Ngalshape,      NGALSHAPE,   unsigned short,  number of galshape measurements
+FIELD Ngalphot,      NGALPHOT,   unsigned short,  number of galphot measurements
 
 FIELD measureOffset,  OFF_MEASURE, uint32_t,   	    offset to first psf measurement
Index: /branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v4.d
===================================================================
--- /branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v4.d	(revision 38415)
+++ /branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v4.d	(revision 38416)
@@ -34,5 +34,5 @@
 FIELD Nmeasure,       NMEASURE,    unsigned short,  number of psf measurements
 FIELD Nmissing,       NMISSING,    unsigned short,  number of missings
-FIELD Ngalshape,      NGALSHAPE,   unsigned short,  number of galshaped measurements
+FIELD Ngalphot,      NGALPHOT,   unsigned short,  number of galphotd measurements
 
 FIELD measureOffset,  OFF_MEASURE, uint32_t,   	    offset to first psf measurement
Index: /branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v5.d
===================================================================
--- /branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v5.d	(revision 38415)
+++ /branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v5.d	(revision 38416)
@@ -41,5 +41,5 @@
 FIELD Nlensing,       NLENSING,    unsigned short,  number of lensing measurements
 FIELD Nlensobj,       NLENSOBJ,    unsigned short,  number of lensing measurements
-FIELD Ngalshape,      NGALSHAPE,   unsigned short,  number of galshape measurements
+FIELD Ngalphot,      NGALPHOT,   unsigned short,  number of galphot measurements
 
 FIELD measureOffset,  OFF_MEASURE,  int,   	    offset to first psf measurement
@@ -48,5 +48,5 @@
 FIELD lensobjOffset,  OFF_LENSOBJ,  int,   	    offset to mean lensing data
 FIELD starparOffset,  OFF_STARPAR,  int,   	    offset to stellar parameter data
-FIELD galshapeOffset, OFF_GALSHAPE, int,   	    offset to galshape object entry
+FIELD galphotOffset, OFF_GALPHOT, int,   	    offset to galphot object entry
 
 FIELD refColorBlue,   REF_COLOR_BLUE, float,   	    color of astrometry ref stars
Index: /branches/eam_branches/ohana.20150429/src/libautocode/def/average.d
===================================================================
--- /branches/eam_branches/ohana.20150429/src/libautocode/def/average.d	(revision 38415)
+++ /branches/eam_branches/ohana.20150429/src/libautocode/def/average.d	(revision 38416)
@@ -41,5 +41,5 @@
 FIELD Nlensing,       NLENSING,    unsigned short,  number of lensing measurements
 FIELD Nlensobj,       NLENSOBJ,    unsigned short,  number of lensing measurements
-FIELD Ngalshape,      NGALSHAPE,   unsigned short,  number of galshape measurements
+FIELD Ngalphot,      NGALPHOT,   unsigned short,  number of galphot measurements
 
 FIELD measureOffset,  OFF_MEASURE,  int,             offset to first psf measurement
@@ -48,5 +48,5 @@
 FIELD lensobjOffset,  OFF_LENSOBJ,  int,   	    offset to mean lensing data
 FIELD starparOffset,  OFF_STARPAR,  int,   	    offset to stellar parameter data
-FIELD galshapeOffset, OFF_GALSHAPE, int,   	    offset to extended object entry
+FIELD galphotOffset, OFF_GALPHOT, int,   	    offset to extended object entry
 
 FIELD refColorBlue,   REF_COLOR_BLUE, float,   	    color of astrometry ref stars
Index: /branches/eam_branches/ohana.20150429/src/libautocode/def/galshape-ps1-v5.d
===================================================================
--- /branches/eam_branches/ohana.20150429/src/libautocode/def/galshape-ps1-v5.d	(revision 38415)
+++ /branches/eam_branches/ohana.20150429/src/libautocode/def/galshape-ps1-v5.d	(revision 38416)
@@ -1,4 +1,4 @@
-STRUCT       GalShape_PS1_V5
-EXTNAME      DVO_GALSHAPE_PS1_V5
+STRUCT       GalPhot_PS1_V5
+EXTNAME      DVO_GALPHOT_PS1_V5
 TYPE         BINTABLE
 SIZE         72
Index: /branches/eam_branches/ohana.20150429/src/libautocode/def/galshape.d
===================================================================
--- /branches/eam_branches/ohana.20150429/src/libautocode/def/galshape.d	(revision 38415)
+++ /branches/eam_branches/ohana.20150429/src/libautocode/def/galshape.d	(revision 38416)
@@ -1,4 +1,4 @@
-STRUCT       GalShape
-EXTNAME      DVO_GALSHAPE
+STRUCT       GalPhot
+EXTNAME      DVO_GALPHOT
 TYPE         BINTABLE
 SIZE         72