Index: trunk/psphot/src/pspsf.c
===================================================================
--- trunk/psphot/src/pspsf.c	(revision 4901)
+++ trunk/psphot/src/pspsf.c	(revision 4949)
@@ -10,5 +10,5 @@
 
 // a PSF always has 4 parameters fewer than the equivalent model
-pmPSF *pmPSFAlloc (psModelType type) {
+pmPSF *pmPSFAlloc (pmModelType type) {
 
     int Nparams;
@@ -19,7 +19,7 @@
     psf->chisq = 0.0;
 
-    Nparams = psModelParameterCount (type);
+    Nparams = pmModelParameterCount (type);
     if (!Nparams) {
-	psError(PS_ERR_UNKNOWN, true, "Undefined psModelType");
+	psError(PS_ERR_UNKNOWN, true, "Undefined pmModelType");
 	return(NULL);
     }      
@@ -54,5 +54,5 @@
 
     // XXX probably need to increment ref counter
-    test->modelType   = psModelSetType (modelName);
+    test->modelType   = pmModelSetType (modelName);
     test->psf         = pmPSFAlloc (test->modelType);
     test->sources     = psMemCopy(sources);
@@ -99,6 +99,6 @@
     for (int i = 0; i < test->sources->n; i++) {
 
-	psSource *source = test->sources->data[i];
-	psModel  *model  = pmSourceModelGuess (source, test->modelType); 
+	pmSource *source = test->sources->data[i];
+	pmModel  *model  = pmSourceModelGuess (source, test->modelType); 
 	x = source->peak->x;
 	y = source->peak->y;
@@ -134,9 +134,9 @@
 	if (test->mask->data.U8[i]) continue;
 
-	psSource *source = test->sources->data[i];
-	psModel  *modelFLT = test->modelFLT->data[i];
+	pmSource *source = test->sources->data[i];
+	pmModel  *modelFLT = test->modelFLT->data[i];
 
 	// set shape for this model based on PSF
-	psModel *modelPSF = psModelFromPSF (modelFLT, test->psf); 
+	pmModel *modelPSF = pmModelFromPSF (modelFLT, test->psf); 
 	x = source->peak->x;
 	y = source->peak->y;
@@ -185,5 +185,5 @@
 }
 
-// input: an array of psModels, pre-allocated psf
+// input: an array of pmModels, pre-allocated psf
 // some of the array entries may be NULL, ignore them
 bool pmPSFFromModels (pmPSF *psf, psArray *models, psVector *mask) {
@@ -197,5 +197,5 @@
 
     for (int i = 0; i < models->n; i++) {
-	psModel *model = models->data[i];
+	pmModel *model = models->data[i];
 	if (model == NULL) continue;
 
@@ -211,5 +211,5 @@
     for (int i = 0; i < psf->params->n; i++) {
 	for (int j = 0; j < models->n; j++) {
-	    psModel *model = models->data[j];
+	    pmModel *model = models->data[j];
 	    if (model == NULL) continue;
 	    z->data.F64[j] = model->params->data.F32[i + 4];
@@ -231,13 +231,13 @@
 }
 
-psModel *psModelFromPSF (psModel *modelFLT, pmPSF *psf) {
+pmModel *pmModelFromPSF (pmModel *modelFLT, pmPSF *psf) {
 
     // need to define the relationship between the modelFLT and modelPSF ?
     
     // find function used to set the model parameters
-    psModelFromPSFFunc modelFromPSFFunc = psModelFromPSFFunc_GetFunction (psf->type);
+    pmModelFromPSFFunc modelFromPSFFunc = pmModelFromPSFFunc_GetFunction (psf->type);
 
     // do we need a different model for the PSF vs FLT version?
-    psModel *modelPSF = psModelAlloc (psf->type);
+    pmModel *modelPSF = pmModelAlloc (psf->type);
 
     // set model parameters for this source based on PSF information