Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr	(revision 1655)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr	(revision 1729)
@@ -1,6 +1,6 @@
-<DATE><TIME>|<HOST>|E|psMetadataReadH|Null fileName not allowed
-<DATE><TIME>|<HOST>|E|psMetadataReadH|FITS error while opening file: missing.dat could not open the named file
-<DATE><TIME>|<HOST>|E|psMetadataReadH|Couldn't close FITS file. FITS error: NULL input pointer
-<DATE><TIME>|<HOST>|E|psMetadataReadH|Null extName and extNum = 0 not allowed
-<DATE><TIME>|<HOST>|E|psMetadataReadH|FITS error while locating header 22: tried to move past end of file
-<DATE><TIME>|<HOST>|E|psMetadataReadH|FITS error while locating header AARGH: illegal HDU number
+<DATE><TIME>|<HOST>|E|+dataReadHeader|Null fileName not allowed
+<DATE><TIME>|<HOST>|E|+dataReadHeader|FITS error while opening file: missing.dat could not open the named file
+<DATE><TIME>|<HOST>|E|+dataReadHeader|Couldn't close FITS file. FITS error: NULL input pointer
+<DATE><TIME>|<HOST>|E|+dataReadHeader|Null extName and extNum = 0 not allowed
+<DATE><TIME>|<HOST>|E|+dataReadHeader|FITS error while locating header 22: tried to move past end of file
+<DATE><TIME>|<HOST>|E|+dataReadHeader|FITS error while locating header AARGH: illegal HDU number
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr	(revision 1655)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr	(revision 1729)
@@ -1,4 +1,4 @@
-<DATE><TIME>|<HOST>|E|psMetadataItemA|Null value for name not allowed
-<DATE><TIME>|<HOST>|E|psMetadataItemA|Invalid psMetadataType: 6
-<DATE><TIME>|<HOST>|E|psMetadataAddIt|Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|psMetadataAddIt|Null metadata item not allowed
+<DATE><TIME>|<HOST>|E|+dataItemAllocV|Null value for name not allowed
+<DATE><TIME>|<HOST>|E|+dataItemAllocV|Invalid psMetadataType: 6
+<DATE><TIME>|<HOST>|E|+etadataAddItem|Null metadata collection not allowed
+<DATE><TIME>|<HOST>|E|+etadataAddItem|Null metadata item not allowed
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stderr	(revision 1655)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stderr	(revision 1729)
@@ -1,3 +1,3 @@
-<DATE><TIME>|<HOST>|E|psMetadataRemov|Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|psMetadataRemov|Couldn't find metadata item. Name: AARGH
-<DATE><TIME>|<HOST>|E|psMetadataRemov|Couldn't find metadata item in list. Index: 22
+<DATE><TIME>|<HOST>|E|+MetadataRemove|Null metadata collection not allowed
+<DATE><TIME>|<HOST>|E|+MetadataRemove|Couldn't find metadata item. Name: AARGH
+<DATE><TIME>|<HOST>|E|+MetadataRemove|Couldn't find metadata item in list. Index: 22
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stderr	(revision 1655)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stderr	(revision 1729)
@@ -1,4 +1,4 @@
-<DATE><TIME>|<HOST>|E|psMetadataLooku|Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|psMetadataLooku|Null key name not allowed
+<DATE><TIME>|<HOST>|E|+MetadataLookup|Null metadata collection not allowed
+<DATE><TIME>|<HOST>|E|+MetadataLookup|Null key name not allowed
 <DATE><TIME>|<HOST>|E|  psMetadataGet|Null metadata collection not allowed
 <DATE><TIME>|<HOST>|E|  psMetadataGet|Couldn't find metadata item with given index. Index: 22
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr	(revision 1655)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr	(revision 1729)
@@ -1,6 +1,6 @@
-<DATE><TIME>|<HOST>|E|psMetadataSetIt|Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|psMetadataGetNe|Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|psMetadataGetPr|Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|psMetadataItemP|Null file descriptor not allowed
-<DATE><TIME>|<HOST>|E|psMetadataItemP|Null format not allowed
-<DATE><TIME>|<HOST>|E|psMetadataItemP|Null metadata not allowed
+<DATE><TIME>|<HOST>|E|+ataSetIterator|Null metadata collection not allowed
+<DATE><TIME>|<HOST>|E|+etadataGetNext|Null metadata collection not allowed
+<DATE><TIME>|<HOST>|E|+ataGetPrevious|Null metadata collection not allowed
+<DATE><TIME>|<HOST>|E|+adataItemPrint|Null file descriptor not allowed
+<DATE><TIME>|<HOST>|E|+adataItemPrint|Null format not allowed
+<DATE><TIME>|<HOST>|E|+adataItemPrint|Null metadata not allowed