Index: /trunk/archive/pslib/include/psMetadata.h
===================================================================
--- /trunk/archive/pslib/include/psMetadata.h	(revision 399)
+++ /trunk/archive/pslib/include/psMetadata.h	(revision 400)
@@ -50,7 +50,4 @@
 } psMetadata;
 
-/** Metadata is actually a "set of metadata" */
-typedef psMetadata psMetadata;
-
 /** Functions **************************************************************/
 /** \addtogroup AstroGroup Astronomy-Specific Utilities
@@ -80,25 +77,25 @@
 /**** Utilities **********************************************************************/
 
-/// Add entry to the end of the metadata set
-psMetadataItem *psMetadataAppend(psMetadata *restrict ms, ///< Metadata set to add to
+/// Add entry to the end of the metadata
+psMetadataItem *psMetadataAppend(psMetadata *restrict ms, ///< metadata to add to
 				 psMetadataItem *restrict item ///< Metatdata to add
     );
 
-/// delete entry from the metadata set
-psMetadataItem *psMetadataRemove(psMetadata *restrict ms, ///< Metadata set to delete from
+/// delete entry from the metadata
+psMetadataItem *psMetadataRemove(psMetadata *restrict ms, ///< metadata to delete from
 				 const char *restrict key ///< Key to delete
     );
 
 /// reset the iterator to the start of the list
-void psMetadataIterator(psMetadata *ms ///< Metadata set to set iterator for
+void psMetadataSetIterator(psMetadata *ms ///< metadata to set iterator for
     );
 
 /// get the next entry in the sequence
-psMetadataItem *psMetadataGetNext(psMetadata *restrict ms, ///< Metadata set to get from
+psMetadataItem *psMetadataGetNext(psMetadata *restrict ms, ///< metadata to get from
 				  const char *restrict match ///< Match this
     );
 
 /// find the metadata with the specified key
-psMetadataItem *psMetadataLookup(const psMetadata *restrict ms, ///< Metadata set to look up
+psMetadataItem *psMetadataLookup(const psMetadata *restrict ms, ///< metadata to look up
 				 const char *restrict key ///< Key to find
     );