Index: trunk/psLib/test/dataManip/tst_psFunc00.c
===================================================================
--- trunk/psLib/test/dataManip/tst_psFunc00.c	(revision 2393)
+++ trunk/psLib/test/dataManip/tst_psFunc00.c	(revision 2436)
@@ -57,5 +57,8 @@
 
     printf("At (x) = (%f): %f\n", MISC_X_VALUE,
-           psPolynomial1DEval(MISC_X_VALUE, my1DPoly));
+           psPolynomial1DEval(
+               my1DPoly,
+               MISC_X_VALUE
+           ));
 
     psFree(my1DPoly);
@@ -87,5 +90,9 @@
 
     printf("At (x, y) = (%f, %f): %f\n", MISC_X_VALUE, MISC_X_VALUE,
-           psPolynomial2DEval(MISC_X_VALUE, MISC_X_VALUE, my2DPoly));
+           psPolynomial2DEval(
+               my2DPoly,
+               MISC_X_VALUE,
+               MISC_X_VALUE
+           ));
 
     psFree(my2DPoly);
@@ -118,5 +125,10 @@
     printf("At (x, y, z) = (%f, %f, %f): %f\n", MISC_X_VALUE, MISC_X_VALUE,
            MISC_X_VALUE,
-           psPolynomial3DEval(MISC_X_VALUE, MISC_X_VALUE, MISC_X_VALUE, my3DPoly));
+           psPolynomial3DEval(
+               my3DPoly,
+               MISC_X_VALUE,
+               MISC_X_VALUE,
+               MISC_X_VALUE
+           ));
 
     psFree(my3DPoly);
@@ -152,5 +164,11 @@
     printf("At (w, x, y, z) = (%f, %f, %f, %f): %f\n", MISC_X_VALUE, MISC_X_VALUE,
            MISC_X_VALUE, MISC_X_VALUE,
-           psPolynomial4DEval(MISC_X_VALUE, MISC_X_VALUE, MISC_X_VALUE, MISC_X_VALUE, my4DPoly));
+           psPolynomial4DEval(
+               my4DPoly,
+               MISC_X_VALUE,
+               MISC_X_VALUE,
+               MISC_X_VALUE,
+               MISC_X_VALUE
+           ));
 
     psFree(my4DPoly);
@@ -182,5 +200,8 @@
 
     printf("At (x) = (%f): %f\n", MISC_X_VALUE,
-           psDPolynomial1DEval(MISC_X_VALUE, my1DPolyD));
+           psDPolynomial1DEval(
+               my1DPolyD,
+               MISC_X_VALUE
+           ));
 
     psFree(my1DPolyD);
@@ -208,5 +229,9 @@
 
     printf("At (x, y) = (%f, %f): %f\n", MISC_X_VALUE, MISC_X_VALUE,
-           psDPolynomial2DEval(MISC_X_VALUE, MISC_X_VALUE, my2DPolyD));
+           psDPolynomial2DEval(
+               my2DPolyD,
+               MISC_X_VALUE,
+               MISC_X_VALUE
+           ));
 
     psFree(my2DPolyD);
@@ -239,5 +264,10 @@
     printf("At (x, y, z) = (%f, %f, %f): %f\n", MISC_X_VALUE, MISC_X_VALUE,
            MISC_X_VALUE,
-           psDPolynomial3DEval(MISC_X_VALUE, MISC_X_VALUE, MISC_X_VALUE, my3DPolyD));
+           psDPolynomial3DEval(
+               my3DPolyD,
+               MISC_X_VALUE,
+               MISC_X_VALUE,
+               MISC_X_VALUE
+           ));
 
     psFree(my3DPolyD);
@@ -273,5 +303,11 @@
     printf("At (w, x, y, z) = (%f, %f, %f, %f): %f\n", MISC_X_VALUE, MISC_X_VALUE,
            MISC_X_VALUE, MISC_X_VALUE,
-           psDPolynomial4DEval(MISC_X_VALUE, MISC_X_VALUE, MISC_X_VALUE, MISC_X_VALUE, my4DPolyD));
+           psDPolynomial4DEval(
+               my4DPolyD,
+               MISC_X_VALUE,
+               MISC_X_VALUE,
+               MISC_X_VALUE,
+               MISC_X_VALUE
+           ));
 
     psFree(my4DPolyD);
@@ -303,5 +339,8 @@
 
     printf("At (x) = (%f): %f\n", MISC_X_VALUE,
-           psPolynomial1DEval(MISC_X_VALUE, my1DPoly));
+           psPolynomial1DEval(
+               my1DPoly,
+               MISC_X_VALUE
+           ));
 
     psFree(my1DPoly);
@@ -332,5 +371,9 @@
 
     printf("At (x, y) = (%f, %f): %f\n", MISC_X_VALUE, MISC_X_VALUE,
-           psPolynomial2DEval(MISC_X_VALUE, MISC_X_VALUE, my2DPoly));
+           psPolynomial2DEval(
+               my2DPoly,
+               MISC_X_VALUE,
+               MISC_X_VALUE
+           ));
 
     psFree(my2DPoly);
@@ -363,5 +406,10 @@
     printf("At (x, y, z) = (%f, %f, %f): %f\n", MISC_X_VALUE, MISC_X_VALUE,
            MISC_X_VALUE,
-           psPolynomial3DEval(MISC_X_VALUE, MISC_X_VALUE, MISC_X_VALUE, my3DPoly));
+           psPolynomial3DEval(
+               my3DPoly,
+               MISC_X_VALUE,
+               MISC_X_VALUE,
+               MISC_X_VALUE
+           ));
 
     psFree(my3DPoly);
@@ -397,5 +445,11 @@
     printf("At (w, x, y, z) = (%f, %f, %f, %f): %f\n", MISC_X_VALUE, MISC_X_VALUE,
            MISC_X_VALUE, MISC_X_VALUE,
-           psPolynomial4DEval(MISC_X_VALUE, MISC_X_VALUE, MISC_X_VALUE, MISC_X_VALUE, my4DPoly));
+           psPolynomial4DEval(
+               my4DPoly,
+               MISC_X_VALUE,
+               MISC_X_VALUE,
+               MISC_X_VALUE,
+               MISC_X_VALUE
+           ));
 
     psFree(my4DPoly);
@@ -427,5 +481,8 @@
 
     printf("At (x) = (%f): %f\n", MISC_X_VALUE,
-           psDPolynomial1DEval(MISC_X_VALUE, my1DPolyD));
+           psDPolynomial1DEval(
+               my1DPolyD,
+               MISC_X_VALUE
+           ));
 
     psFree(my1DPolyD);
@@ -453,5 +510,9 @@
 
     printf("At (x, y) = (%f, %f): %f\n", MISC_X_VALUE, MISC_X_VALUE,
-           psDPolynomial2DEval(MISC_X_VALUE, MISC_X_VALUE, my2DPolyD));
+           psDPolynomial2DEval(
+               my2DPolyD,
+               MISC_X_VALUE,
+               MISC_X_VALUE
+           ));
 
     psFree(my2DPolyD);
@@ -484,5 +545,10 @@
     printf("At (x, y, z) = (%f, %f, %f): %f\n", MISC_X_VALUE, MISC_X_VALUE,
            MISC_X_VALUE,
-           psDPolynomial3DEval(MISC_X_VALUE, MISC_X_VALUE, MISC_X_VALUE, my3DPolyD));
+           psDPolynomial3DEval(
+               my3DPolyD,
+               MISC_X_VALUE,
+               MISC_X_VALUE,
+               MISC_X_VALUE
+           ));
 
     psFree(my3DPolyD);
@@ -518,5 +584,11 @@
     printf("At (w, x, y, z) = (%f, %f, %f, %f): %f\n", MISC_X_VALUE, MISC_X_VALUE,
            MISC_X_VALUE, MISC_X_VALUE,
-           psDPolynomial4DEval(MISC_X_VALUE, MISC_X_VALUE, MISC_X_VALUE, MISC_X_VALUE, my4DPolyD));
+           psDPolynomial4DEval(
+               my4DPolyD,
+               MISC_X_VALUE,
+               MISC_X_VALUE,
+               MISC_X_VALUE,
+               MISC_X_VALUE
+           ));
 
     psFree(my4DPolyD);
Index: trunk/psLib/test/dataManip/tst_psFunc01.c
===================================================================
--- trunk/psLib/test/dataManip/tst_psFunc01.c	(revision 2393)
+++ trunk/psLib/test/dataManip/tst_psFunc01.c	(revision 2436)
@@ -3,5 +3,5 @@
     specified Gaussian at some X.
  
-    It also tests the psGaussianDev() procedure.
+    It also tests the p_psGaussianDev() procedure.
  *****************************************************************************/
 #include <stdio.h>
@@ -49,7 +49,7 @@
     printPositiveTestHeader(stdout,
                             "psFunctions functions",
-                            "psGaussianDev()");
+                            "p_psGaussianDev()");
 
-    myGaussData = psGaussianDev(MY_MEAN, MY_STDEV, N);
+    myGaussData = p_psGaussianDev(MY_MEAN, MY_STDEV, N);
     for (psS32 i = 0; i < N ; i++) {
         printf("Gaussian Deviate [%d] is %f\n", i, myGaussData->data.F32[i]);
@@ -57,5 +57,5 @@
 
     if ( myGaussData->type.type != PS_TYPE_F32) {
-        psAbort(__func__,"psGaussianDev did not return a vector of type F32");
+        psAbort(__func__,"p_psGaussianDev did not return a vector of type F32");
     }
 
@@ -70,5 +70,5 @@
     printFooter(stdout,
                 "psFunctions functions",
-                "psGaussianDev()",
+                "p_psGaussianDev()",
                 testStatus);
 
Index: trunk/psLib/test/dataManip/tst_psMinimize04.c
===================================================================
--- trunk/psLib/test/dataManip/tst_psMinimize04.c	(revision 2393)
+++ trunk/psLib/test/dataManip/tst_psMinimize04.c	(revision 2436)
@@ -70,5 +70,8 @@
     for (i=0;i<NUM_DATA;i++) {
         expectData = setData(x->data.F64[i]);
-        actualData = psPolynomial1DEval(x->data.F64[i], myPoly);
+        actualData = psPolynomial1DEval(
+                         myPoly,
+                         x->data.F64[i]
+                     );
         if (fabs(actualData-expectData) > fabs(ERROR_TOLERANCE * expectData)) {
             printf("ERROR: Fitted data %d: (%.1f %.1f), expected was (%.1f)\n",
@@ -135,5 +138,8 @@
     for (i=0;i<NUM_DATA;i++) {
         expectData = setData(x->data.F64[i]);
-        actualData = psPolynomial1DEval(x->data.F64[i], myPoly);
+        actualData = psPolynomial1DEval(
+                         myPoly,
+                         x->data.F64[i]
+                     );
         if (fabs(actualData-expectData) > fabs(ERROR_TOLERANCE * expectData)) {
             printf("ERROR: Fitted data %d: (%.1f %.1f), expected was (%.1f)\n",
@@ -195,5 +201,8 @@
     for (i=0;i<NUM_DATA;i++) {
         expectData = setData((double) i);
-        actualData = psPolynomial1DEval((double) i, myPoly);
+        actualData = psPolynomial1DEval(
+                         myPoly,
+                         (double) i
+                     );
         if (fabs(actualData-expectData) > fabs(ERROR_TOLERANCE * expectData)) {
             printf("ERROR: Fitted data %d: (%.1f %.1f), expected was (%.1f)\n",
Index: trunk/psLib/test/dataManip/tst_psMinimize04_F32.c
===================================================================
--- trunk/psLib/test/dataManip/tst_psMinimize04_F32.c	(revision 2393)
+++ trunk/psLib/test/dataManip/tst_psMinimize04_F32.c	(revision 2436)
@@ -70,5 +70,8 @@
     for (i=0;i<NUM_DATA;i++) {
         expectData = setData(x->data.F32[i]);
-        actualData = psPolynomial1DEval(x->data.F32[i], myPoly);
+        actualData = psPolynomial1DEval(
+                         myPoly,
+                         x->data.F32[i]
+                     );
         if (fabs(actualData-expectData) > fabs(ERROR_TOLERANCE * expectData)) {
             printf("ERROR: Fitted data %d: (%.1f %.1f), expected was (%.1f)\n",
@@ -134,5 +137,8 @@
     for (i=0;i<NUM_DATA;i++) {
         expectData = setData(x->data.F32[i]);
-        actualData = psPolynomial1DEval(x->data.F32[i], myPoly);
+        actualData = psPolynomial1DEval(
+                         myPoly,
+                         x->data.F32[i]
+                     );
         if (fabs(actualData-expectData) > fabs(ERROR_TOLERANCE * expectData)) {
             printf("ERROR: Fitted data %d: (%.1f %.1f), expected was (%.1f)\n",
@@ -194,5 +200,8 @@
     for (i=0;i<NUM_DATA;i++) {
         expectData = setData((float) i);
-        actualData = psPolynomial1DEval((float) i, myPoly);
+        actualData = psPolynomial1DEval(
+                         myPoly,
+                         (float) i
+                     );
         if (fabs(actualData-expectData) > fabs(ERROR_TOLERANCE * expectData)) {
             printf("ERROR: Fitted data %d: (%.1f %.1f), expected was (%.1f)\n",
Index: trunk/psLib/test/dataManip/tst_psMinimize04b.c
===================================================================
--- trunk/psLib/test/dataManip/tst_psMinimize04b.c	(revision 2393)
+++ trunk/psLib/test/dataManip/tst_psMinimize04b.c	(revision 2436)
@@ -63,5 +63,8 @@
     for (i=IGNORE;i<NUM_DATA-IGNORE;i++) {
         double expectData = y->data.F64[i];
-        double actualData = psPolynomial1DEval(x->data.F64[i], myPoly);
+        double actualData = psPolynomial1DEval(
+                                myPoly,
+                                x->data.F64[i]
+                            );
         if (fabs(actualData-expectData) > fabs(ERROR_TOLERANCE * expectData)) {
             printf("ERROR: Fitted data %d: (%.1f %.1f), expected was (%.1f)\n",
@@ -124,5 +127,8 @@
     for (i=IGNORE;i<NUM_DATA-IGNORE;i++) {
         double expectData = y->data.F64[i];
-        double actualData = psPolynomial1DEval(x->data.F64[i], myPoly);
+        double actualData = psPolynomial1DEval(
+                                myPoly,
+                                x->data.F64[i]
+                            );
         if (fabs(actualData-expectData) > fabs(ERROR_TOLERANCE * expectData)) {
             printf("ERROR: Fitted data %d: (%.1f %.1f), expected was (%.1f)\n",
@@ -184,5 +190,8 @@
     for (i=IGNORE;i<NUM_DATA-IGNORE;i++) {
         double expectData = y->data.F64[i];
-        double actualData = psPolynomial1DEval(x->data.F64[i], myPoly);
+        double actualData = psPolynomial1DEval(
+                                myPoly,
+                                x->data.F64[i]
+                            );
         if (fabs(actualData-expectData) > fabs(ERROR_TOLERANCE * expectData)) {
             printf("ERROR: Fitted data %d: (%.1f %.1f), expected was (%.1f)\n",
Index: trunk/psLib/test/dataManip/tst_psMinimize04b_F32.c
===================================================================
--- trunk/psLib/test/dataManip/tst_psMinimize04b_F32.c	(revision 2393)
+++ trunk/psLib/test/dataManip/tst_psMinimize04b_F32.c	(revision 2436)
@@ -63,5 +63,8 @@
     for (i=IGNORE;i<NUM_DATA-IGNORE;i++) {
         float expectData = y->data.F32[i];
-        float actualData = psPolynomial1DEval(x->data.F32[i], myPoly);
+        float actualData = psPolynomial1DEval(
+                               myPoly,
+                               x->data.F32[i]
+                           );
         if (fabs(actualData-expectData) > fabs(ERROR_TOLERANCE * expectData)) {
             printf("ERROR: Fitted data %d: (%.1f %.1f), expected was (%.1f)\n",
@@ -124,5 +127,8 @@
     for (i=IGNORE;i<NUM_DATA-IGNORE;i++) {
         float expectData = y->data.F32[i];
-        float actualData = psPolynomial1DEval(x->data.F32[i], myPoly);
+        float actualData = psPolynomial1DEval(
+                               myPoly,
+                               x->data.F32[i]
+                           );
         if (fabs(actualData-expectData) > fabs(ERROR_TOLERANCE * expectData)) {
             printf("ERROR: Fitted data %d: (%.1f %.1f), expected was (%.1f)\n",
@@ -184,5 +190,8 @@
     for (i=IGNORE;i<NUM_DATA-IGNORE;i++) {
         float expectData = y->data.F32[i];
-        float  actualData = psPolynomial1DEval(x->data.F32[i], myPoly);
+        float  actualData = psPolynomial1DEval(
+                                myPoly,
+                                x->data.F32[i]
+                            );
         if (fabs(actualData-expectData) > fabs(ERROR_TOLERANCE * expectData)) {
             printf("ERROR: Fitted data %d: (%.1f %.1f), expected was (%.1f)\n",
Index: trunk/psLib/test/dataManip/tst_psStats07.c
===================================================================
--- trunk/psLib/test/dataManip/tst_psStats07.c	(revision 2393)
+++ trunk/psLib/test/dataManip/tst_psStats07.c	(revision 2436)
@@ -55,5 +55,5 @@
     maskVector = psVectorAlloc( N, PS_TYPE_U8 );
     maskVector->n = N;
-    myVector = psGaussianDev( MEAN, STDEV, N );
+    myVector = p_psGaussianDev( MEAN, STDEV, N );
     // Set the mask vector and calculate the expected maximum.
     for ( i = 0;i < N;i++ ) {
@@ -293,5 +293,5 @@
     maskVector = psVectorAlloc( N, PS_TYPE_U8 );
     maskVector->n = N;
-    myVector = psGaussianDev( MEAN, STDEV, N );
+    myVector = p_psGaussianDev( MEAN, STDEV, N );
     // Set the mask vector and calculate the expected maximum.
     for ( i = 0;i < N;i++ ) {