Index: trunk/archive/pslib/src/Metadata/psMetaData.h
===================================================================
--- trunk/archive/pslib/src/Metadata/psMetaData.h	(revision 156)
+++ trunk/archive/pslib/src/Metadata/psMetaData.h	(revision 164)
@@ -20,9 +20,9 @@
 } psMetaDataType;
 
-enum {
+typedef enum {
     PS_META_TYPE_MASK =     0xffff,	// the type enum must fit in this mask
     PS_META_UNIQUE =       0x10000,	// the name must be unique (default)
     PS_META_NON_UNIQUE =   0x20000,	// the name may be repeated, and should be disambiguated for us
-};
+} psMetaDataFlags;
 
 /*
@@ -34,5 +34,5 @@
     char *restrict name;		// Name of item
     psMetaDataType type;		// type of this item
-    int flags;				// flags associated with this item
+    psMetaDataFlags flags;		// flags associated with this item
     const union {
 	float f;			// floating value
@@ -56,5 +56,5 @@
  * Constructors and destructors
  */
-psMetaDataItem *psMetaDataItemNew(
+psMetaDataItem *psMetaDataItemAlloc(
     int typeFlags,			// type of this piece of metadata + flags
     const void *val,			// value of new item
@@ -65,8 +65,8 @@
     ...);				// possible arguments for name format
 
-void psMetaDataItemDel(psMetaDataItem *ms); // piece of metadata to destroy
+void psMetaDataItemFree(psMetaDataItem *ms); // piece of metadata to destroy
 
-psMetaDataSet *psMetaDataSetNew(void);	  // make a new set of metadata
-void psMetaDataSetDel(psMetaDataSet *ms); // destroy a set of metadata
+psMetaDataSet *psMetaDataSetAlloc(void);   // make a new set of metadata
+void psMetaDataSetFree(psMetaDataSet *ms); // destroy a set of metadata
 
 /*****************************************************************************/