Index: /trunk/psLib/test/sysUtils/verified/tst_psLogMsg02.stderr
===================================================================
--- /trunk/psLib/test/sysUtils/verified/tst_psLogMsg02.stderr	(revision 1195)
+++ /trunk/psLib/test/sysUtils/verified/tst_psLogMsg02.stderr	(revision 1196)
@@ -11,8 +11,8 @@
  <DATE> <TIME> |
 ------------- psLogSetFormat(H) -------------
-shire.mhpcc.hawaii.edu|
-shire.mhpcc.hawaii.edu|
-shire.mhpcc.hawaii.edu|
-shire.mhpcc.hawaii.edu|
+shire               |
+shire               |
+shire               |
+shire               |
 ------------- psLogSetFormat(L) -------------
 A|
Index: /trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr
===================================================================
--- /trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr	(revision 1195)
+++ /trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr	(revision 1196)
@@ -1,5 +1,5 @@
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMemory.c                                             *
-*            TestPoint: psMemory{449-TPCheckBufferPositive}                        *
+*            TestPoint: psMemory{checkBufferPositive}                              *
 *             TestType: Positive                                                   *
 \**********************************************************************************/
@@ -7,9 +7,9 @@
  <DATE> <TIME> <HOST> |I|TPCheckBufferPo|psAlloc shall allocate memory blocks writeable by caller.
 
----> TESTPOINT PASSED (psMemory{449-TPCheckBufferPositive} | tst_psMemory.c)
+---> TESTPOINT PASSED (psMemory{checkBufferPositive} | tst_psMemory.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMemory.c                                             *
-*            TestPoint: psMemory{450-TPOutOfMemory}                                *
+*            TestPoint: psMemory{outOfMemory}                                      *
 *             TestType: Positive                                                   *
 \**********************************************************************************/
@@ -17,22 +17,22 @@
  <DATE> <TIME> <HOST> |I|  TPOutOfMemory|Upon requesting more memory than is available, psalloc shall call the psMemExhaustedCallback.
  <DATE> <TIME> <HOST> |I|TPOutOfMemoryEx|Custom MemExhaustedCallback was invoked.
- <DATE> <TIME> <HOST> |A|      p_psAlloc|Failed to allocate 4294966295 bytes at tst_psMemory.c:207
+ <DATE> <TIME> <HOST> |A|      p_psAlloc|Failed to allocate 4294966295 bytes at tst_psMemory.c:208
 
----> TESTPOINT PASSED (psMemory{450-TPOutOfMemory} | tst_psMemory.c)
+---> TESTPOINT PASSED (psMemory{outOfMemory} | tst_psMemory.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMemory.c                                             *
-*            TestPoint: psMemory{562-TPReallocOutOfMemory}                         *
+*            TestPoint: psMemory{reallocOutOfMemory}                               *
 *             TestType: Positive                                                   *
 \**********************************************************************************/
 
  <DATE> <TIME> <HOST> |I|TPReallocOutOfM|Upon requesting more memory than is available, psRealloc shall call the psMemExhaustedCallback.
- <DATE> <TIME> <HOST> |A|    p_psRealloc|Failed to reallocate -1001 bytes at tst_psMemory.c:172
+ <DATE> <TIME> <HOST> |A|    p_psRealloc|Failed to reallocate -1001 bytes at tst_psMemory.c:173
 
----> TESTPOINT PASSED (psMemory{562-TPReallocOutOfMemory} | tst_psMemory.c)
+---> TESTPOINT PASSED (psMemory{reallocOutOfMemory} | tst_psMemory.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMemory.c                                             *
-*            TestPoint: psMemory{451-TPrealloc}                                    *
+*            TestPoint: psMemory{psRealloc}                                        *
 *             TestType: Positive                                                   *
 \**********************************************************************************/
@@ -42,9 +42,9 @@
  <DATE> <TIME> <HOST> |I|      TPrealloc|Shrinking memory buffer.
 
----> TESTPOINT PASSED (psMemory{451-TPrealloc} | tst_psMemory.c)
+---> TESTPOINT PASSED (psMemory{psRealloc} | tst_psMemory.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMemory.c                                             *
-*            TestPoint: psMemory{452/453-TPallocCallback}                          *
+*            TestPoint: psMemory{allocCallback}                                    *
 *             TestType: Positive                                                   *
 \**********************************************************************************/
@@ -59,9 +59,9 @@
  <DATE> <TIME> <HOST> |I|memFreeCallback|block 4 was freed
 
----> TESTPOINT PASSED (psMemory{452/453-TPallocCallback} | tst_psMemory.c)
+---> TESTPOINT PASSED (psMemory{allocCallback} | tst_psMemory.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMemory.c                                             *
-*            TestPoint: psMemory{454-TPcheckLeaks}                                 *
+*            TestPoint: psMemory{checkLeaks}                                       *
 *             TestType: Positive                                                   *
 \**********************************************************************************/
@@ -70,20 +70,20 @@
  <DATE> <TIME> <HOST> |I|   TPcheckLeaks|following psMemCheckLeaks call should produce one instance.
                    file:line ID
-         tst_psMemory.c:357  1
+         tst_psMemory.c:358  1
  <DATE> <TIME> <HOST> |I|   TPcheckLeaks|Testing psMemCheckLeaks again with a different leak location
  <DATE> <TIME> <HOST> |I|   TPcheckLeaks|following psMemCheckLeaks call should produce one error.
                    file:line ID
-         tst_psMemory.c:387  11
+         tst_psMemory.c:388  11
  <DATE> <TIME> <HOST> |I|   TPcheckLeaks|Testing psMemCheckLeaks again with multiple leak locations.
  <DATE> <TIME> <HOST> |I|   TPcheckLeaks|following psMemCheckLeaks call should produce two errors.
                    file:line ID
-         tst_psMemory.c:415  16
-         tst_psMemory.c:415  14
+         tst_psMemory.c:416  16
+         tst_psMemory.c:416  14
 
----> TESTPOINT PASSED (psMemory{454-TPcheckLeaks} | tst_psMemory.c)
+---> TESTPOINT PASSED (psMemory{checkLeaks} | tst_psMemory.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMemory.c                                             *
-*            TestPoint: psMemory{455-TPmemCorruption}                              *
+*            TestPoint: psMemory{psMemCorruption}                                  *
 *             TestType: Positive                                                   *
 \**********************************************************************************/
@@ -94,9 +94,9 @@
  <DATE> <TIME> <HOST> |I|memProblemCallb|memory callback called for id 1 (psMemCheckCorruption:220).
 
----> TESTPOINT PASSED (psMemory{455-TPmemCorruption} | tst_psMemory.c)
+---> TESTPOINT PASSED (psMemory{psMemCorruption} | tst_psMemory.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMemory.c                                             *
-*            TestPoint: psMemory{456-TPFreeReferencedMemory}                       *
+*            TestPoint: psMemory{freeReferencedMemory}                             *
 *             TestType: Positive                                                   *
 \**********************************************************************************/
@@ -105,4 +105,4 @@
  <DATE> <TIME> <HOST> |I|TPFreeReference|psFree shall be just decrement a multiple refererenced pointer.
 
----> TESTPOINT PASSED (psMemory{456-TPFreeReferencedMemory} | tst_psMemory.c)
+---> TESTPOINT PASSED (psMemory{freeReferencedMemory} | tst_psMemory.c)