Index: trunk/psphot/src/psphotFitGalaxies.c
===================================================================
--- trunk/psphot/src/psphotFitGalaxies.c	(revision 6379)
+++ trunk/psphot/src/psphotFitGalaxies.c	(revision 6715)
@@ -23,6 +23,6 @@
 
 	// only fit suspected extended sources
-	if (source->type != PM_SOURCE_EXTENDED) continue;
-	if (source->mode  & PM_SOURCE_BLEND) continue; 
+	if (source->type != PM_SOURCE_TYPE_EXTENDED) continue;
+	if (source->mode  & PM_SOURCE_MODE_BLEND) continue; 
 
 	// skip possible extended sources below fit threshold
@@ -32,5 +32,5 @@
 	status = pmSourceMoments (source, EXT_MOMENTS_RAD);
 	if (!status) {
-	  source->mode |= PM_SOURCE_FAIL;  // better choice?
+	  source->mode |= PM_SOURCE_MODE_FAIL;  // better choice?
 	  continue;
 	}
@@ -46,7 +46,7 @@
 
 	// fit EXT (not PSF) model (set/unset the pixel mask)
-	psImageKeepCircle (source->mask, x, y, model->radius, "OR", PSPHOT_MASK_MARKED);
+	psImageKeepCircle (source->mask, x, y, model->radius, "OR", PM_SOURCE_MASK_MARKED);
 	pmSourceFitModel (source, model, false);
-	psImageKeepCircle (source->mask, x, y, model->radius, "AND", ~PSPHOT_MASK_MARKED);
+	psImageKeepCircle (source->mask, x, y, model->radius, "AND", ~PM_SOURCE_MASK_MARKED);
 
 	Niter += model[0].nIter;
@@ -55,7 +55,7 @@
 	// check if model fit is acceptable
 	if (pmModelFitStatus (model)) {
-	    pmSourceSubModel (source->pixels, source->mask, model, false, false);
-	    source->mode |=  PM_SOURCE_SUBTRACTED;
-	    source->mode &= ~PM_SOURCE_TEMPSUB;
+	    pmModelSub (source->pixels, source->mask, model, false, false);
+	    source->mode |=  PM_SOURCE_MODE_SUBTRACTED;
+	    source->mode &= ~PM_SOURCE_MODE_TEMPSUB;
 	    Nsub ++;
 	}