Index: trunk/psphot/src/psphotModelGroupInit.c
===================================================================
--- trunk/psphot/src/psphotModelGroupInit.c	(revision 12792)
+++ trunk/psphot/src/psphotModelGroupInit.c	(revision 14655)
@@ -7,18 +7,18 @@
 # include "models/pmModel_STRAIL.c"
 
-static pmModelGroup userModels[] = {
-    {"PS_MODEL_TEST1", 7, pmModelFunc_TEST1,  pmModelFlux_TEST1,  pmModelRadius_TEST1,  pmModelLimits_TEST1,  pmModelGuess_TEST1, pmModelFromPSF_TEST1, pmModelFitStatus_TEST1},
-    {"PS_MODEL_STRAIL", 9, pmModelFunc_STRAIL,  pmModelFlux_STRAIL,  pmModelRadius_STRAIL,  pmModelLimits_STRAIL,  pmModelGuess_STRAIL, pmModelFromPSF_STRAIL, pmModelFitStatus_STRAIL},
+static pmModelClass userModels[] = {
+    {"PS_MODEL_TEST1", 7, pmModelFunc_TEST1,  pmModelFlux_TEST1,  pmModelRadius_TEST1,  pmModelLimits_TEST1,  pmModelGuess_TEST1, pmModelFromPSF_TEST1, pmModelParamsFromPSF_TEST1, pmModelFitStatus_TEST1},
+    {"PS_MODEL_STRAIL", 9, pmModelFunc_STRAIL,  pmModelFlux_STRAIL,  pmModelRadius_STRAIL,  pmModelLimits_STRAIL,  pmModelGuess_STRAIL, pmModelFromPSF_STRAIL, pmModelParamsFromPSF_STRAIL, pmModelFitStatus_STRAIL},
 };
 
-void psphotModelGroupInit (void) 
+void psphotModelClassInit (void) 
 { 
 
-    // if pmModelGroupInit returns false, we have already init'ed
-    if (!pmModelGroupInit ()) return;
+    // if pmModelClassInit returns false, we have already init'ed
+    if (!pmModelClassInit ()) return;
 
-    int Nmodels = sizeof (userModels) / sizeof (pmModelGroup);
+    int Nmodels = sizeof (userModels) / sizeof (pmModelClass);
     for (int i = 0; i < Nmodels; i++) {
-	pmModelGroupAdd (&userModels[i]);
+	pmModelClassAdd (&userModels[i]);
     }
     return;