Index: trunk/psphot/src/psphotModelTest.c
===================================================================
--- trunk/psphot/src/psphotModelTest.c	(revision 14348)
+++ trunk/psphot/src/psphotModelTest.c	(revision 14655)
@@ -89,5 +89,5 @@
             modelName = item->data.V;
         }
-        modelType = pmModelSetType (modelName);
+        modelType = pmModelClassGetType (modelName);
         if (modelType < 0) psAbort("unknown model %s", modelName);
 	source->type = PM_SOURCE_TYPE_EXTENDED;
@@ -118,5 +118,5 @@
             modelName = item->data.V;
         }
-        modelType = pmModelSetType (modelName);
+        modelType = pmModelClassGetType (modelName);
         if (modelType < 0) psAbort("unknown model %s", modelName);
 	source->type = PM_SOURCE_TYPE_EXTENDED;
@@ -148,5 +148,5 @@
 
     // if any parameters are defined by the user, take those values
-    int nParams = pmModelParameterCount (modelType);
+    int nParams = pmModelClassParameterCount (modelType);
     psF32 *params = model->params->data.F32;
     params[PM_PAR_XPOS] = xObj; // XXX use the user-supplied value,