Index: trunk/psLib/src/collections/psArray.c
===================================================================
--- trunk/psLib/src/collections/psArray.c	(revision 3671)
+++ trunk/psLib/src/collections/psArray.c	(revision 3682)
@@ -9,6 +9,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-18 22:17:20 $
+ *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -55,5 +55,5 @@
     // Create vector struct
     psArr = (psArray* ) psAlloc(sizeof(psArray));
-    p_psMemSetDeallocator(psArr, (psFreeFcn) arrayFree);
+    psMemSetDeallocator(psArr, (psFreeFcn) arrayFree);
 
     psArr->nalloc = nalloc;
Index: trunk/psLib/src/collections/psBitSet.c
===================================================================
--- trunk/psLib/src/collections/psBitSet.c	(revision 3671)
+++ trunk/psLib/src/collections/psBitSet.c	(revision 3682)
@@ -11,6 +11,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-22 19:25:52 $
+ *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -80,5 +80,5 @@
     numBytes = ceil(n / 8.0);
     newObj = psAlloc(sizeof(psBitSet));
-    p_psMemSetDeallocator(newObj, (psFreeFcn) bitSetFree);
+    psMemSetDeallocator(newObj, (psFreeFcn) bitSetFree);
     newObj->n = numBytes;
 
Index: trunk/psLib/src/collections/psHash.c
===================================================================
--- trunk/psLib/src/collections/psHash.c	(revision 3671)
+++ trunk/psLib/src/collections/psHash.c	(revision 3682)
@@ -12,6 +12,6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-02-18 22:17:20 $
+*  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-07 20:27:41 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -90,5 +90,5 @@
     psHashBucket* bucket = psAlloc(sizeof(psHashBucket));
 
-    p_psMemSetDeallocator(bucket, (psFreeFcn) hashBucketFree);
+    psMemSetDeallocator(bucket, (psFreeFcn) hashBucketFree);
 
     // Initialize the bucket.
@@ -141,5 +141,5 @@
     psHash* table = psAlloc(sizeof(psHash));
 
-    p_psMemSetDeallocator(table, (psFreeFcn) hashFree);
+    psMemSetDeallocator(table, (psFreeFcn) hashFree);
 
     // Allocate memory for the buckets.
Index: trunk/psLib/src/collections/psList.c
===================================================================
--- trunk/psLib/src/collections/psList.c	(revision 3671)
+++ trunk/psLib/src/collections/psList.c	(revision 3682)
@@ -6,6 +6,6 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:23 $
+ *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -45,5 +45,5 @@
     psArray* iterators = list->iterators;
     for (int i = 0; i < iterators->n; i++) {
-        p_psMemSetDeallocator(iterators->data[i], NULL);
+        psMemSetDeallocator(iterators->data[i], NULL);
     }
 
@@ -129,5 +129,5 @@
     psList* list = psAlloc(sizeof(psList));
 
-    p_psMemSetDeallocator(list, (psFreeFcn) listFree);
+    psMemSetDeallocator(list, (psFreeFcn) listFree);
 
     list->size = 0;
@@ -153,5 +153,5 @@
     psListIterator* iter = psAlloc(sizeof(psListIterator));
 
-    p_psMemSetDeallocator(iter, (psFreeFcn) listIteratorFree);
+    psMemSetDeallocator(iter, (psFreeFcn) listIteratorFree);
 
     // initialize the attributes
Index: trunk/psLib/src/collections/psMetadata.c
===================================================================
--- trunk/psLib/src/collections/psMetadata.c	(revision 3671)
+++ trunk/psLib/src/collections/psMetadata.c	(revision 3682)
@@ -12,6 +12,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-29 21:31:54 $
+*  @version $Revision: 1.58 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-07 20:27:41 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -183,5 +183,5 @@
 
     // Set deallocator
-    p_psMemSetDeallocator(metadataItem, (psFreeFcn) metadataItemFree);
+    psMemSetDeallocator(metadataItem, (psFreeFcn) metadataItemFree);
 
     // Allocate and set metadata item comment
@@ -252,5 +252,5 @@
     metadata = (psMetadata*) psAlloc(sizeof(psMetadata));
     // Set deallocator
-    p_psMemSetDeallocator(metadata, (psFreeFcn) metadataFree);
+    psMemSetDeallocator(metadata, (psFreeFcn) metadataFree);
 
     // Allocate metadata's internal containers
@@ -598,5 +598,5 @@
 
     // Set deallocator
-    p_psMemSetDeallocator(newIter, (psFreeFcn) metadataIteratorFree);
+    psMemSetDeallocator(newIter, (psFreeFcn) metadataIteratorFree);
 
     if (regex == NULL) {
Index: trunk/psLib/src/collections/psVector.c
===================================================================
--- trunk/psLib/src/collections/psVector.c	(revision 3671)
+++ trunk/psLib/src/collections/psVector.c	(revision 3682)
@@ -9,6 +9,6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-22 21:52:49 $
+*  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-07 20:27:41 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -51,5 +51,5 @@
     // Create vector struct
     psVec = (psVector* ) psAlloc(sizeof(psVector));
-    p_psMemSetDeallocator(psVec, (psFreeFcn) vectorFree);
+    psMemSetDeallocator(psVec, (psFreeFcn) vectorFree);
 
     psVec->type.dimen = PS_DIMEN_VECTOR;