Index: /trunk/psModules/test/objects/tap_pmSourceFitModel.c
===================================================================
--- /trunk/psModules/test/objects/tap_pmSourceFitModel.c	(revision 14653)
+++ /trunk/psModules/test/objects/tap_pmSourceFitModel.c	(revision 14654)
@@ -117,5 +117,5 @@
     source->moments = pmMomentsAlloc ();
 
-    pmModelType type = pmModelSetType ("PS_MODEL_GAUSS");
+    pmModelType type = pmModelClassGetType ("PS_MODEL_GAUSS");
     source->modelEXT = pmModelAlloc (type);
 
Index: /trunk/psModules/test/objects/tap_pmSourceFitModel_Delta.c
===================================================================
--- /trunk/psModules/test/objects/tap_pmSourceFitModel_Delta.c	(revision 14653)
+++ /trunk/psModules/test/objects/tap_pmSourceFitModel_Delta.c	(revision 14654)
@@ -35,5 +35,5 @@
     source->moments = pmMomentsAlloc ();
 
-    pmModelType type = pmModelSetType ("PS_MODEL_GAUSS");
+    pmModelType type = pmModelClassGetType ("PS_MODEL_GAUSS");
     source->modelEXT = pmModelAlloc (type);
 
@@ -71,5 +71,5 @@
     pmModel *guess;
 
-    type = pmModelSetType ("PS_MODEL_PGAUSS");
+    type = pmModelClassGetType ("PS_MODEL_PGAUSS");
     guess = pmModelAlloc (type);
 
Index: /trunk/psModules/test/objects/tst_pmObjects01.c
===================================================================
--- /trunk/psModules/test/objects/tst_pmObjects01.c	(revision 14653)
+++ /trunk/psModules/test/objects/tst_pmObjects01.c	(revision 14654)
@@ -31,6 +31,6 @@
     most of psObjects.c is not tested
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-03-04 01:01:34 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-08-24 00:11:59 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -186,9 +186,9 @@
     //
     psS32 i = 0;
-    while (0 != pmModelParameterCount(i)) {
-        printf("Testing pmModelAlloc(%s)...\n", pmModelGetType(0));
+    while (0 != pmModelClassParameterCount(i)) {
+        printf("Testing pmModelAlloc(%s)...\n", pmModelClassGetName(0));
         pmModel *tmpModel = pmModelAlloc(i);
         if (tmpModel == NULL) {
-            printf("TEST ERROR: pmModelAlloc(%s) returned a NULL pmModel\n", pmModelGetType(0));
+            printf("TEST ERROR: pmModelAlloc(%s) returned a NULL pmModel\n", pmModelClassGetName(0));
             testStatus = false;
         } else {