Index: trunk/psphot/src/psphotApplyPSF.c
===================================================================
--- trunk/psphot/src/psphotApplyPSF.c	(revision 6056)
+++ trunk/psphot/src/psphotApplyPSF.c	(revision 6715)
@@ -20,7 +20,7 @@
 
 	// skip non-astronomical objects (very likely defects)
-	if (source->mode  & PM_SOURCE_BLEND) continue; 
-	if (source->type == PM_SOURCE_DEFECT) continue; 
-	if (source->type == PM_SOURCE_SATURATED) continue;
+	if (source->mode  & PM_SOURCE_MODE_BLEND) continue; 
+	if (source->type == PM_SOURCE_TYPE_DEFECT) continue; 
+	if (source->type == PM_SOURCE_TYPE_SATURATED) continue;
 
 	// use the source moments, etc to guess basic model parameters
@@ -49,7 +49,7 @@
 	// check if model fit is acceptable
 	if (psphotEvalPSF (source, source->modelPSF)) {
-	    pmSourceSubModel (source->pixels, source->mask, source->modelPSF, false, false);
-	    source->mode |=  PM_SOURCE_SUBTRACTED;
-	    source->mode &= ~PM_SOURCE_TEMPSUB;
+	    pmModelSub (source->pixels, source->mask, source->modelPSF, false, false);
+	    source->mode |=  PM_SOURCE_MODE_SUBTRACTED;
+	    source->mode &= ~PM_SOURCE_MODE_TEMPSUB;
 	    Nsub ++;
 	}