Index: trunk/archive/pslib/src/Utils/psArray.h
===================================================================
--- trunk/archive/pslib/src/Utils/psArray.h	(revision 141)
+++ trunk/archive/pslib/src/Utils/psArray.h	(revision 164)
@@ -14,7 +14,7 @@
     } PS_CONCAT(TYPE, Array); \
     \
-PS_CONCAT(TYPE, Array) *PS_CONCAT3(TYPE,Array,New)(int n, int s); \
+PS_CONCAT(TYPE, Array) *PS_CONCAT3(TYPE,Array,Alloc)(int n, int s); \
 PS_CONCAT(TYPE, Array) *PS_CONCAT3(TYPE,Array,Realloc)(PS_CONCAT(TYPE, Array) *arr, int n); \
-void PS_CONCAT3(TYPE,Array,Del)(PS_CONCAT(TYPE, Array) *arr)
+void PS_CONCAT3(TYPE,Array,Free)(PS_CONCAT(TYPE, Array) *arr)
 
 /*****************************************************************************/
@@ -27,5 +27,5 @@
 #define P_PS_CREATE_ARRAY_TYPE(QUAL,PREFIX,TYPE) \
 \
-QUAL PS_CONCAT(TYPE, Array) *PS_CONCAT4(PREFIX,TYPE,Array,New)(int n, /* initial dimension */\
+QUAL PS_CONCAT(TYPE, Array) *PS_CONCAT4(PREFIX,TYPE,Array,Alloc)(int n, /* initial dimension */\
                                                    int s) /* initial number of elements */ \
 { \
@@ -33,5 +33,5 @@
     \
     if (n > s) { \
-	psLogMsg(PS_STRING(TYPE) "ArrayNew", PS_LOG_ERROR, "Too few elements requested in array (%d < %d)\n", s, n); \
+	psLogMsg(PS_STRING(TYPE) "ArrayAlloc", PS_LOG_ERROR, "Too few elements requested in array (%d < %d)\n", s, n); \
 	s = n; \
     } \
@@ -52,5 +52,5 @@
 { \
     if (arr == NULL) { \
-	return PS_CONCAT4(PREFIX,TYPE,Array,New)(n, n); \
+	return PS_CONCAT4(PREFIX,TYPE,Array,Alloc)(n, n); \
     } \
     \
@@ -67,5 +67,5 @@
 } \
 \
-QUAL void PS_CONCAT4(PREFIX,TYPE,Array,Del)(PS_CONCAT(TYPE,Array) *arr) \
+QUAL void PS_CONCAT4(PREFIX,TYPE,Array,Free)(PS_CONCAT(TYPE,Array) *arr) \
 { \
     if (arr == NULL) { \
@@ -88,9 +88,9 @@
     P_PS_CREATE_ARRAY_TYPE(static, my_, P_PS_CONCAT(TYPE, Ptr)) \
     \
-    PS_CONCAT(TYPE, PtrArray) *PS_CONCAT3(TYPE,PtrArray,New)(int n, int s) \
+    PS_CONCAT(TYPE, PtrArray) *PS_CONCAT3(TYPE,PtrArray,Alloc)(int n, int s) \
     { \
-	PS_CONCAT(TYPE, PtrArray) *arr = PS_CONCAT4(my_,TYPE,PtrArray,New)(n, s); \
+	PS_CONCAT(TYPE, PtrArray) *arr = PS_CONCAT4(my_,TYPE,PtrArray,Alloc)(n, s); \
 	for (int i = 0; i < arr->n; i++) { \
-	    arr->arr[i] = psMemIncrRefCounter,(PS_CONCAT(TYPE, New)());\
+	    arr->arr[i] = psMemIncrRefCounter,(PS_CONCAT(TYPE, Alloc)());\
 	} \
         \
@@ -101,5 +101,5 @@
     { \
 	for (int i = n; i < arr->n; i++) { \
-	    PS_CONCAT(TYPE, Del)(psMemDecrRefCounter(arr->arr[i]));\
+	    PS_CONCAT(TYPE, Free)(psMemDecrRefCounter(arr->arr[i]));\
 	} \
         \
@@ -107,11 +107,11 @@
     } \
     \
-    void PS_CONCAT3(TYPE,PtrArray,Del)(PS_CONCAT2(TYPE,PtrArray) *arr) \
+    void PS_CONCAT3(TYPE,PtrArray,Free)(PS_CONCAT2(TYPE,PtrArray) *arr) \
     { \
 	if (arr == NULL) { return; } \
 	for (int i = 0; i < arr->size; i++) { \
-	    PS_CONCAT(TYPE, Del)(psMemDecrRefCounter(arr->arr[i])); \
+	    PS_CONCAT(TYPE, Free)(psMemDecrRefCounter(arr->arr[i])); \
 	} \
-	PS_CONCAT4(my_, TYPE, PtrArray, Del)(arr); \
+	PS_CONCAT4(my_, TYPE, PtrArray, Free)(arr); \
     }
 
@@ -129,8 +129,8 @@
 } psVoidPtrArray;
 
-psVoidPtrArray *psVoidPtrArrayNew(int n, int s);
+psVoidPtrArray *psVoidPtrArrayAlloc(int n, int s);
 psVoidPtrArray *psVoidPtrArrayRealloc(psVoidPtrArray *arr, int n);
-void psVoidPtrArrayDel(psVoidPtrArray *arr,
-		       void (*elemDel)(void *)); // destructor for array data
+void psVoidPtrArrayFree(psVoidPtrArray *arr,
+			void (*elemFree)(void *)); // destructor for array data