Index: trunk/psphot/src/pmPSF.c
===================================================================
--- trunk/psphot/src/pmPSF.c	(revision 5126)
+++ trunk/psphot/src/pmPSF.c	(revision 5593)
@@ -38,10 +38,9 @@
     psf->params = psArrayAlloc (Nparams - 4);
     for (int i = 0; i < psf->params->n; i++) {
-	// XXX EAM : make this a user-defined value?
-	// XXX EAM : future version (0.7.0?) psf->params->data[i] = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 1, 1);
+	// XXX EAM : make polynomial order user-specified?
 	if (1) {
-	    psf->params->data[i] = Polynomial2DAlloc_EAM(PS_POLYNOMIAL_ORD, 1, 1);
+	    psf->params->data[i] = psPolynomial2DAlloc(1, 1, PS_POLYNOMIAL_ORD);
 	} else {
-	    psf->params->data[i] = Polynomial2DAlloc_EAM(PS_POLYNOMIAL_ORD, 0, 0);
+	    psf->params->data[i] = psPolynomial2DAlloc(0, 0, PS_POLYNOMIAL_ORD);
 	}
     }
@@ -93,5 +92,5 @@
 
 	// XXX EAM : this is the expected API (cycle 7? cycle 8?)
-	psf->params->data[i] = VectorClipFitPolynomial2D_EAM (psf->params->data[i], stats, mask, 0xff, z, dz, x, y);
+	psf->params->data[i] = psVectorClipFitPolynomial2D (psf->params->data[i], stats, mask, 0xff, z, dz, x, y);
 
 	// XXX EAM : drop this when above is implemented...
