Index: trunk/psphot/src/psModulesUtils.c
===================================================================
--- trunk/psphot/src/psModulesUtils.c	(revision 4946)
+++ trunk/psphot/src/psModulesUtils.c	(revision 4949)
@@ -4,5 +4,5 @@
 
 // this sets and clears bit 0x80
-bool pmSourceLocalSky_EAM (psSource *source,
+bool pmSourceLocalSky_EAM (pmSource *source,
 			   psStatsOptions statsOptions,
 			   psF32 Radius)
@@ -36,7 +36,7 @@
 # define PM_SOURCE_FIT_MODEL_NUM_ITERATIONS 15
 # define PM_SOURCE_FIT_MODEL_TOLERANCE 0.1
-bool pmSourceFitModel_EAM(psSource *source,
-			  psModel *model,
-			  const bool PSF)
+bool pmSourceFitModel_EAM (pmSource *source,
+			     pmModel *model,
+			     const bool PSF)
 {
     PS_PTR_CHECK_NULL(source, false);
@@ -55,6 +55,6 @@
     //           tests below could be conditions (!NULL)
 
-    psModelFunc modelFunc = psModelFunc_GetFunction (model->type);
-    psModelLimits modelLimits = psModelLimits_GetFunction (model->type);
+    pmModelFunc modelFunc = pmModelFunc_GetFunction (model->type);
+    pmModelLimits modelLimits = pmModelLimits_GetFunction (model->type);
 
     psVector *params = model->params;
@@ -177,11 +177,11 @@
 /******************************************************************************
 pmSourceMoments(source, radius): this function takes a subImage defined in the
-psSource data structure, along with the peak location, and determines the
+pmSource data structure, along with the peak location, and determines the
 various moments associated with that peak.
  
 Requires the following to have been created:
-    psSource
-    psSource->peak
-    psSource->pixels
+    pmSource
+    pmSource->peak
+    pmSource->pixels
  
 XXX: The peak calculations are done in image coords, not subImage coords.
@@ -191,5 +191,5 @@
 # define VALID_RADIUS(X,Y) (((R2) >= (PS_SQR(X) + PS_SQR(Y))) ? 1 : 0)
 
-bool pmSourceMoments_EAM(psSource *source,
+bool pmSourceMoments_EAM(pmSource *source,
 			 psF32 radius)
 {
@@ -310,9 +310,9 @@
 }
 
-bool pmModelFitStatus (psModel *model) {
+bool pmModelFitStatus (pmModel *model) {
 
     bool status;
 
-    psModelFitStatusFunc statusFunc = psModelFitStatusFunc_GetFunction (model->type);
+    pmModelFitStatusFunc statusFunc = pmModelFitStatusFunc_GetFunction (model->type);
     status = statusFunc (model);