Index: trunk/psModules/src/concepts/pmConceptsRead.c
===================================================================
--- trunk/psModules/src/concepts/pmConceptsRead.c	(revision 9510)
+++ trunk/psModules/src/concepts/pmConceptsRead.c	(revision 9539)
@@ -191,5 +191,5 @@
     psMetadata *cameraFormat = hdu->format; // The camera format
     bool mdok = true;                   // Status of MD lookup
-    psMetadata *defaults = psMetadataLookupMD(&mdok, cameraFormat, "DEFAULTS"); // The DEFAULTS spec
+    psMetadata *defaults = psMetadataLookupMetadata(&mdok, cameraFormat, "DEFAULTS"); // The DEFAULTS spec
     if (!mdok || !defaults) {
         psError(PS_ERR_IO, true, "Failed to find \"DEFAULTS\"");
@@ -279,5 +279,5 @@
     psMetadata *cameraFormat = hduLow->format; // The camera format
     bool mdok = true;                   // Status of MD lookup
-    psMetadata *transSpec = psMetadataLookupMD(&mdok, cameraFormat, "TRANSLATION"); // The TRANSLATION spec
+    psMetadata *transSpec = psMetadataLookupMetadata(&mdok, cameraFormat, "TRANSLATION"); // The TRANSLATION spec
     if (!mdok || !transSpec) {
         psError(PS_ERR_IO, true, "Failed to find \"TRANSLATION\"");
@@ -381,5 +381,5 @@
     psMetadata *cameraFormat = hdu->format; // The camera format
     bool mdok = true;                   // Status of MD lookup
-    psMetadata *dbSpec = psMetadataLookupMD(&mdok, cameraFormat, "DATABASE"); // The DATABASE spec
+    psMetadata *dbSpec = psMetadataLookupMetadata(&mdok, cameraFormat, "DATABASE"); // The DATABASE spec
     if (!mdok || !dbSpec) {
         psError(PS_ERR_IO, true, "Unable to find DATABASE in camera configuration.\n");
@@ -394,5 +394,5 @@
         psString name = specItem->name; // The concept name
 
-        psMetadata *dbLookup = psMetadataLookupMD(&mdok, dbSpec, name);
+        psMetadata *dbLookup = psMetadataLookupMetadata(&mdok, dbSpec, name);
         if (mdok && dbLookup) {
             const char *tableName = psMetadataLookupStr(&mdok, dbLookup, "TABLE"); // Table name
Index: trunk/psModules/src/concepts/pmConceptsStandard.c
===================================================================
--- trunk/psModules/src/concepts/pmConceptsStandard.c	(revision 9510)
+++ trunk/psModules/src/concepts/pmConceptsStandard.c	(revision 9539)
@@ -91,5 +91,5 @@
     // How to interpret the coordinates
     bool mdok = true;           // Status of MD lookup
-    psMetadata *formats = psMetadataLookupMD(&mdok, cameraFormat, "FORMATS");
+    psMetadata *formats = psMetadataLookupMetadata(&mdok, cameraFormat, "FORMATS");
     if (mdok && formats) {
         psString format = psMetadataLookupStr(&mdok, formats, pattern->name);
@@ -128,5 +128,5 @@
     // How to interpret the coordinates
     bool mdok = true;                   // Status of MD lookup
-    psMetadata *formats = psMetadataLookupMD(&mdok,
+    psMetadata *formats = psMetadataLookupMetadata(&mdok,
                           cameraFormat,
                           "FORMATS");
@@ -350,5 +350,5 @@
 
     // Get format
-    psMetadata *formats = psMetadataLookupMD(&mdok, cameraFormat, "FORMATS");
+    psMetadata *formats = psMetadataLookupMetadata(&mdok, cameraFormat, "FORMATS");
     if (!mdok || !formats) {
         psError(PS_ERR_UNKNOWN, true, "Unable to find FORMATS in camera configuration.\n");
@@ -528,5 +528,5 @@
 {
     bool mdok = false;                  // Result of MD lookup
-    psMetadata *formats = psMetadataLookupMD(&mdok, cameraFormat, "FORMATS");
+    psMetadata *formats = psMetadataLookupMetadata(&mdok, cameraFormat, "FORMATS");
     if (mdok && formats) {
         psString format = psMetadataLookupStr(&mdok, formats, name);
@@ -622,5 +622,5 @@
     assert(concept);
 
-    psMetadata *translation = psMetadataLookupMD(NULL, cameraFormat, "TRANSLATION");
+    psMetadata *translation = psMetadataLookupMetadata(NULL, cameraFormat, "TRANSLATION");
     bool xBinOK = true, yBinOK = true;  // Status of MD lookups
     psString xKeyword = psMetadataLookupStr(&xBinOK, translation, "CELL.XBIN");
@@ -649,5 +649,5 @@
     assert(concept);
 
-    psMetadata *translation = psMetadataLookupMD(NULL, cameraFormat, "TRANSLATION");
+    psMetadata *translation = psMetadataLookupMetadata(NULL, cameraFormat, "TRANSLATION");
     bool xBinOK = true, yBinOK = true;  // Status of MD lookups
     psString xKeyword = psMetadataLookupStr(&xBinOK, translation, "CELL.XBIN");
@@ -710,5 +710,5 @@
 
     bool mdok = true;                   // Status of MD lookup
-    psMetadata *formats = psMetadataLookupMD(&mdok, cameraFormat, "FORMATS"); // The formats
+    psMetadata *formats = psMetadataLookupMetadata(&mdok, cameraFormat, "FORMATS"); // The formats
     if (mdok && formats) {
         psString format = psMetadataLookupStr(&mdok, formats, concept->name); // The formats for eg, CELL.TIME
Index: trunk/psModules/src/concepts/pmConceptsWrite.c
===================================================================
--- trunk/psModules/src/concepts/pmConceptsWrite.c	(revision 9510)
+++ trunk/psModules/src/concepts/pmConceptsWrite.c	(revision 9539)
@@ -307,5 +307,5 @@
     psMetadata *cameraFormat = hdu->format; // The camera format
     bool mdok = true;                   // Status of MD lookup
-    psMetadata *defaults = psMetadataLookupMD(&mdok, cameraFormat, "DEFAULTS"); // The DEFAULTS spec
+    psMetadata *defaults = psMetadataLookupMetadata(&mdok, cameraFormat, "DEFAULTS"); // The DEFAULTS spec
     if (!mdok || !defaults) {
         return false;
@@ -373,5 +373,5 @@
     psMetadata *cameraFormat = hdu->format; // The camera format
     bool mdok = true;                   // Status of MD lookup
-    psMetadata *translation = psMetadataLookupMD(&mdok, cameraFormat, "TRANSLATION"); // The TRANSLATION spec
+    psMetadata *translation = psMetadataLookupMetadata(&mdok, cameraFormat, "TRANSLATION"); // The TRANSLATION spec
     if (!mdok || !translation) {
         return false;
@@ -430,5 +430,5 @@
     psMetadata *cameraFormat = hdu->format; // The camera format
     bool mdok = true;                   // Status of MD lookup
-    psMetadata *database = psMetadataLookupMD(&mdok, cameraFormat, "DATABASE"); // The DATABASE spec
+    psMetadata *database = psMetadataLookupMetadata(&mdok, cameraFormat, "DATABASE"); // The DATABASE spec
     if (!mdok || !database) {
         return false;