Index: /trunk/psModules/src/camera/pmFPAfile.c
===================================================================
--- /trunk/psModules/src/camera/pmFPAfile.c	(revision 11375)
+++ /trunk/psModules/src/camera/pmFPAfile.c	(revision 11376)
@@ -241,13 +241,42 @@
         }
     }
+    if (strstr (newName, "{FILTER.ID}") != NULL) {
+        if (file->fpa != NULL) {
+            char *name = psMetadataLookupStr (NULL, file->fpa->concepts, "FPA.FILTERID");
+            if (name && *name) {
+                psStringSubstitute(&newName, name, "{FILTER.ID}");
+            }
+        }
+    }
     if (strstr (newName, "{CAMERA}") != NULL) {
         if (file->fpa != NULL) {
-            // XXX this concept does not exist...
-            // char *name = psMetadataLookupStr (NULL, file->fpa->concepts, "FPA.CAMERA");
-            char *name = psStringCopy ("isp");
+            char *name = psMetadataLookupStr (NULL, file->fpa->concepts, "FPA.INSTRUMENT");
             if (name && *name) {
                 psStringSubstitute(&newName, name, "{CAMERA}");
             }
-            psFree (name);
+        }
+    }
+    if (strstr (newName, "{INSTRUMENT}") != NULL) {
+        if (file->fpa != NULL) {
+            char *name = psMetadataLookupStr (NULL, file->fpa->concepts, "FPA.INSTRUMENT");
+            if (name && *name) {
+                psStringSubstitute(&newName, name, "{INSTRUMENT}");
+            }
+        }
+    }
+    if (strstr (newName, "{DETECTOR}") != NULL) {
+        if (file->fpa != NULL) {
+            char *name = psMetadataLookupStr (NULL, file->fpa->concepts, "FPA.DETECTOR");
+            if (name && *name) {
+                psStringSubstitute(&newName, name, "{DETECTOR}");
+            }
+        }
+    }
+    if (strstr (newName, "{TELESCOPE}") != NULL) {
+        if (file->fpa != NULL) {
+            char *name = psMetadataLookupStr (NULL, file->fpa->concepts, "FPA.TELESCOPE");
+            if (name && *name) {
+                psStringSubstitute(&newName, name, "{TELESCOPE}");
+            }
         }
     }