Index: /trunk/psLib/test/sysUtils/tst_psTrace00.c
===================================================================
--- /trunk/psLib/test/sysUtils/tst_psTrace00.c	(revision 904)
+++ /trunk/psLib/test/sysUtils/tst_psTrace00.c	(revision 905)
@@ -14,8 +14,8 @@
     printPositiveTestHeader(stdout,
                             "psTrace functions",
-                            "psSetTraceLevel() and psGetTraceLevel()");
+                            "psTraceSetLevel() and psTraceGetLevel()");
     for (i=0;i<10;i++) {
-        psSetTraceLevel(".", i);
-        lev = psGetTraceLevel(".");
+        psTraceSetLevel(".", i);
+        lev = psTraceGetLevel(".");
         if (lev != i) {
             printf("ERROR: (.) expected trace level was %d, actual was %d\n",
@@ -24,9 +24,9 @@
         }
     }
-    psSetTraceLevel(".", 3);
+    psTraceSetLevel(".", 3);
 
     for (i=5;i<10;i++) {
-        psSetTraceLevel(".NODE00", i);
-        lev = psGetTraceLevel(".NODE00");
+        psTraceSetLevel(".NODE00", i);
+        lev = psTraceGetLevel(".NODE00");
         if (lev != i) {
             printf("ERROR: (.NODE00) expected trace level was %d, actual was %d\n",
@@ -35,5 +35,5 @@
         }
 
-        lev = psGetTraceLevel(".");
+        lev = psTraceGetLevel(".");
         if (lev != 3) {
             printf("ERROR: (.) expected trace level was %d, actual was %d\n",
@@ -44,8 +44,8 @@
 
 
-    psSetTraceLevel(".NODE00.NODE01", 4);
+    psTraceSetLevel(".NODE00.NODE01", 4);
     for (i=0;i<10;i++) {
-        psSetTraceLevel(".NODE00.NODE01", i);
-        lev = psGetTraceLevel(".NODE00.NODE01");
+        psTraceSetLevel(".NODE00.NODE01", i);
+        lev = psTraceGetLevel(".NODE00.NODE01");
         if (lev != i) {
             printf("ERROR: (.NODE00.NODE01) expected trace level was %d, actual was %d\n",
@@ -57,5 +57,5 @@
     printFooter(stdout,
                 "psTrace functions",
-                "Testing psSetTraceLevel and psGetTraceLevel",
+                "Testing psTraceSetLevel and psTraceGetLevel",
                 testStatus);
     return(!testStatus);
Index: /trunk/psLib/test/sysUtils/tst_psTrace01.c
===================================================================
--- /trunk/psLib/test/sysUtils/tst_psTrace01.c	(revision 904)
+++ /trunk/psLib/test/sysUtils/tst_psTrace01.c	(revision 905)
@@ -17,8 +17,8 @@
 
     for (i=0;i<10;i++) {
-        psSetTraceLevel(".", i);
+        psTraceSetLevel(".", i);
         psTraceReset();
 
-        lev = psGetTraceLevel(".");
+        lev = psTraceGetLevel(".");
         if (lev != DEFAULT_TRACE_LEVEL) {
             printf("ERROR: expected trace level was %d, actual was %d\n",
@@ -27,13 +27,13 @@
         }
     }
-    psSetTraceLevel(".", 5);
-    psSetTraceLevel(".a", 4);
-    psSetTraceLevel(".a.b", 3);
-    psSetTraceLevel(".a.b.c", 2);
+    psTraceSetLevel(".", 5);
+    psTraceSetLevel(".a", 4);
+    psTraceSetLevel(".a.b", 3);
+    psTraceSetLevel(".a.b.c", 2);
     psTraceReset();
-    if ((DEFAULT_TRACE_LEVEL != psGetTraceLevel(".")) ||
-            (DEFAULT_TRACE_LEVEL != psGetTraceLevel(".a")) ||
-            (DEFAULT_TRACE_LEVEL != psGetTraceLevel(".a.b")) ||
-            (DEFAULT_TRACE_LEVEL != psGetTraceLevel(".a.b.c"))) {
+    if ((DEFAULT_TRACE_LEVEL != psTraceGetLevel(".")) ||
+            (DEFAULT_TRACE_LEVEL != psTraceGetLevel(".a")) ||
+            (DEFAULT_TRACE_LEVEL != psTraceGetLevel(".a.b")) ||
+            (DEFAULT_TRACE_LEVEL != psTraceGetLevel(".a.b.c"))) {
         printf("ERROR: trace levels were not reset properly\n");
         successFlag = false;
Index: /trunk/psLib/test/sysUtils/tst_psTrace02.c
===================================================================
--- /trunk/psLib/test/sysUtils/tst_psTrace02.c	(revision 904)
+++ /trunk/psLib/test/sysUtils/tst_psTrace02.c	(revision 905)
@@ -29,23 +29,23 @@
                                 "psTrace()");
 
-        psSetTraceLevel(".", 4);
+        psTraceSetLevel(".", 4);
         psTrace(".", 5, "(0) This message should not be displayed (%x)\n",
                 0xbeefface);
-        psSetTraceLevel(".", 7);
+        psTraceSetLevel(".", 7);
         psTrace(".", 5, "(0) This message should be displayed (%x)\n",
                 0xbeefface);
 
-        psSetTraceLevel(".a", 4);
+        psTraceSetLevel(".a", 4);
         psTrace(".a", 5, "(1) This message should not be displayed (%x)\n",
                 0xbeefface);
-        psSetTraceLevel(".a", 7);
+        psTraceSetLevel(".a", 7);
         psTrace(".a", 5, "(1) This message should be displayed (%x)\n",
                 0xbeefface);
 
 
-        psSetTraceLevel(".a.b", 4);
+        psTraceSetLevel(".a.b", 4);
         psTrace(".a.b", 5, "(2) This message should not be displayed (%x)\n",
                 0xbeefface);
-        psSetTraceLevel(".a.b", 7);
+        psTraceSetLevel(".a.b", 7);
         psTrace(".a.b", 5, "(2) This message should be displayed (%x)\n",
                 0xbeefface);
Index: /trunk/psLib/test/sysUtils/tst_psTrace03.c
===================================================================
--- /trunk/psLib/test/sysUtils/tst_psTrace03.c	(revision 904)
+++ /trunk/psLib/test/sysUtils/tst_psTrace03.c	(revision 905)
@@ -1,5 +1,5 @@
 /*****************************************************************************
     This code will test whether trace messages can be printed successfully
-    with psPrintTraceLevels().
+    with psTracePrintLevels().
  *****************************************************************************/
 #include <stdio.h>
@@ -13,21 +13,21 @@
                             "psTracePrintLevels()");
 
-    psSetTraceLevel(".", 9);
+    psTraceSetLevel(".", 9);
 
-    psSetTraceLevel(".a", 8);
-    psSetTraceLevel(".b", 7);
-    psSetTraceLevel(".c", 5);
+    psTraceSetLevel(".a", 8);
+    psTraceSetLevel(".b", 7);
+    psTraceSetLevel(".c", 5);
 
-    psSetTraceLevel(".a.a", 4);
-    psSetTraceLevel(".a.b", 3);
+    psTraceSetLevel(".a.a", 4);
+    psTraceSetLevel(".a.b", 3);
 
-    psSetTraceLevel(".b.a", 2);
-    psSetTraceLevel(".b.b", 1);
+    psTraceSetLevel(".b.a", 2);
+    psTraceSetLevel(".b.b", 1);
 
-    psSetTraceLevel(".c.a", 0);
-    psSetTraceLevel(".c.b", 3);
-    psSetTraceLevel(".c.c", 5);
+    psTraceSetLevel(".c.a", 0);
+    psTraceSetLevel(".c.b", 3);
+    psTraceSetLevel(".c.c", 5);
 
-    psPrintTraceLevels();
+    psTracePrintLevels();
 
     printFooter(stdout,
Index: /trunk/psLib/test/sysUtils/tst_psTrace04.c
===================================================================
--- /trunk/psLib/test/sysUtils/tst_psTrace04.c	(revision 904)
+++ /trunk/psLib/test/sysUtils/tst_psTrace04.c	(revision 905)
@@ -1,5 +1,5 @@
 /*****************************************************************************
     This code will test whether trace messages can be printed successfully
-    with psPrintTraceLevels().
+    with psTracePrintLevels().
  *****************************************************************************/
 #include <stdio.h>
@@ -12,33 +12,33 @@
                             "psTrace functions",
                             "Testing psTraceReset()");
-    psSetTraceLevel(".", 9);
+    psTraceSetLevel(".", 9);
 
-    psSetTraceLevel(".a", 8);
-    psSetTraceLevel(".b", 7);
-    psSetTraceLevel(".c", 5);
+    psTraceSetLevel(".a", 8);
+    psTraceSetLevel(".b", 7);
+    psTraceSetLevel(".c", 5);
 
-    psSetTraceLevel(".a.a", 4);
-    psSetTraceLevel(".a.b", 3);
+    psTraceSetLevel(".a.a", 4);
+    psTraceSetLevel(".a.b", 3);
 
-    psSetTraceLevel(".b.a", 2);
-    psSetTraceLevel(".b.b", 1);
+    psTraceSetLevel(".b.a", 2);
+    psTraceSetLevel(".b.b", 1);
 
-    psSetTraceLevel(".c.a", 0);
-    psSetTraceLevel(".c.b", 3);
-    psSetTraceLevel(".c.c", 5);
+    psTraceSetLevel(".c.a", 0);
+    psTraceSetLevel(".c.b", 3);
+    psTraceSetLevel(".c.c", 5);
 
     psTraceReset();
 
-    if (psGetTraceLevel(".") ||
-            psGetTraceLevel(".a") ||
-            psGetTraceLevel(".b") ||
-            psGetTraceLevel(".c") ||
-            psGetTraceLevel(".a.a") ||
-            psGetTraceLevel(".a.b") ||
-            psGetTraceLevel(".b.a") ||
-            psGetTraceLevel(".b.b") ||
-            psGetTraceLevel(".c.a") ||
-            psGetTraceLevel(".c.b") ||
-            psGetTraceLevel(".c.c")) {
+    if (psTraceGetLevel(".") ||
+            psTraceGetLevel(".a") ||
+            psTraceGetLevel(".b") ||
+            psTraceGetLevel(".c") ||
+            psTraceGetLevel(".a.a") ||
+            psTraceGetLevel(".a.b") ||
+            psTraceGetLevel(".b.a") ||
+            psTraceGetLevel(".b.b") ||
+            psTraceGetLevel(".c.a") ||
+            psTraceGetLevel(".c.b") ||
+            psTraceGetLevel(".c.c")) {
         printFooter(stdout,
                     "psTrace functions",
Index: /trunk/psLib/test/sysUtils/verified/tst_psTrace00.stdout
===================================================================
--- /trunk/psLib/test/sysUtils/verified/tst_psTrace00.stdout	(revision 904)
+++ /trunk/psLib/test/sysUtils/verified/tst_psTrace00.stdout	(revision 905)
@@ -1,9 +1,9 @@
 /----------------------------- TESTPOINT ------------------------------------------\
 |             TestFile: tst_psTrace00.c                                            |
-|            TestPoint: psTrace functions{psSetTraceLevel() and psGetTraceLevel()} |
+|            TestPoint: psTrace functions{psTraceSetLevel() and psTraceGetLevel()} |
 |             TestType: Positive                                                   |
 \----------------------------------------------------------------------------------/
 
 
----> TESTPOINT PASSED (psTrace functions{Testing psSetTraceLevel and psGetTraceLevel} | tst_psTrace00.c)
+---> TESTPOINT PASSED (psTrace functions{Testing psTraceSetLevel and psTraceGetLevel} | tst_psTrace00.c)