Index: trunk/psphot/src/pmSourceUtils.c
===================================================================
--- trunk/psphot/src/pmSourceUtils.c	(revision 4946)
+++ trunk/psphot/src/pmSourceUtils.c	(revision 4949)
@@ -1,5 +1,5 @@
 # include "psphot.h"
 
-bool pmSourceDefinePixels(psSource *mySource, 
+bool pmSourceDefinePixels(pmSource *mySource, 
 			  const psImageData *imdata,
 			  psF32 x, 
@@ -26,5 +26,5 @@
 }
 
-bool pmSourcePhotometry (float *fitMag, float *obsMag, psModel *model, psImage *image, psImage *mask) {
+bool pmSourcePhotometry (float *fitMag, float *obsMag, pmModel *model, psImage *image, psImage *mask) {
 
     float obsSum = 0;
@@ -32,5 +32,5 @@
     float sky = model->params->data.F32[0];
 
-    psModelFlux modelFluxFunc = psModelFlux_GetFunction (model->type);
+    pmModelFlux modelFluxFunc = pmModelFlux_GetFunction (model->type);
     fitSum = modelFluxFunc (model->params);
 
@@ -39,5 +39,4 @@
 	    if (mask->data.U8[iy][ix]) continue;
 	    obsSum += image->data.F32[iy][ix] - sky;
-	    // fitSum += psModelEval (model, image, ix, iy) - sky;
 	}
     }