Index: trunk/psModules/src/camera/pmFPAConstruct.c
===================================================================
--- trunk/psModules/src/camera/pmFPAConstruct.c	(revision 9518)
+++ trunk/psModules/src/camera/pmFPAConstruct.c	(revision 9539)
@@ -28,5 +28,5 @@
 
     bool status = true;                 // Result of MD lookup
-    psMetadata *cells = psMetadataLookupMD(&status, format, "CELLS"); // The CELLS
+    psMetadata *cells = psMetadataLookupMetadata(&status, format, "CELLS"); // The CELLS
     if (!status || !cells) {
         psError(PS_ERR_IO, true, "Unable to determine CELLS of camera.\n");
@@ -34,5 +34,5 @@
     }
 
-    psMetadata *cellData = psMetadataLookupMD(&status, cells, cellName); // The data for the particular cell
+    psMetadata *cellData = psMetadataLookupMetadata(&status, cells, cellName); // The data for the particular cell
     if (!status || !cellData) {
         psLogMsg(__func__, PS_LOG_WARN, "Unable to find specs for cell %s: ignored\n", cellName);
@@ -389,5 +389,5 @@
 
     bool mdok = true;                   // Status of MD lookup
-    psMetadata *file = psMetadataLookupMD(&mdok, format, "FILE"); // File information
+    psMetadata *file = psMetadataLookupMetadata(&mdok, format, "FILE"); // File information
     if (!mdok || !file) {
         psError(PS_ERR_IO, true, "Unable to find FILE information in camera format configuration.\n");
@@ -427,5 +427,5 @@
 
     bool mdok = true;                   // Status from MD lookups
-    psMetadata *components = psMetadataLookupMD(&mdok, camera, "FPA"); // FPA components
+    psMetadata *components = psMetadataLookupMetadata(&mdok, camera, "FPA"); // FPA components
     if (!mdok || !components) {
         psError(PS_ERR_IO, true, "Failed to lookup \"FPA\"");
@@ -475,5 +475,5 @@
 
     bool mdok = true;                   // Status from metadata lookups
-    psMetadata *fileInfo = psMetadataLookupMD(&mdok, format, "FILE"); // The file information
+    psMetadata *fileInfo = psMetadataLookupMetadata(&mdok, format, "FILE"); // The file information
     if (!mdok || !fileInfo) {
         psError(PS_ERR_IO, false, "Unable to find FILE in the camera format configuration.\n");
@@ -553,5 +553,5 @@
     // In cases 2 and 3, the CONTENTS is of type METADATA, and is either a menu (if EXTENSIONS=NONE), or a
     // list of extensions otherwise.
-    psMetadata *contents = psMetadataLookupMD(&mdok, format, "CONTENTS"); // The contents of the FITS file
+    psMetadata *contents = psMetadataLookupMetadata(&mdok, format, "CONTENTS"); // The contents of the FITS file
     if (!mdok || !contents) {
         if (mdok && !contents) {
@@ -775,5 +775,5 @@
 
     bool mdok = true;                   // Status from metadata lookups
-    psMetadata *fileInfo = psMetadataLookupMD(&mdok, format, "FILE"); // The file information
+    psMetadata *fileInfo = psMetadataLookupMetadata(&mdok, format, "FILE"); // The file information
     if (!mdok || !fileInfo) {
         psError(PS_ERR_IO, false, "Unable to find FILE in the camera format configuration.\n");
Index: trunk/psModules/src/camera/pmFPAfileDefine.c
===================================================================
--- trunk/psModules/src/camera/pmFPAfileDefine.c	(revision 9518)
+++ trunk/psModules/src/camera/pmFPAfileDefine.c	(revision 9539)
@@ -256,5 +256,5 @@
 
         // select the format list from the selected camera
-        psMetadata *formats = psMetadataLookupMD(&status, file->camera, "FORMATS"); // List of formats
+        psMetadata *formats = psMetadataLookupMetadata(&status, file->camera, "FORMATS"); // List of formats
 
         // select the desired format
Index: trunk/psModules/src/camera/pmHDUGenerate.c
===================================================================
--- trunk/psModules/src/camera/pmHDUGenerate.c	(revision 9518)
+++ trunk/psModules/src/camera/pmHDUGenerate.c	(revision 9539)
@@ -389,5 +389,5 @@
     }
     bool mdok = true;                   // Status of MD lookup
-    psMetadata *file = psMetadataLookupMD(&mdok, hdu->format, "FILE"); // File information for camera format
+    psMetadata *file = psMetadataLookupMetadata(&mdok, hdu->format, "FILE"); // File information for camera format
     if (!mdok || !file) {
         psError(PS_ERR_UNEXPECTED_NULL, true, "Can't file FILE information for camera format "