Index: trunk/psModules/src/camera/pmFPA.c
===================================================================
--- trunk/psModules/src/camera/pmFPA.c	(revision 16716)
+++ trunk/psModules/src/camera/pmFPA.c	(revision 17911)
@@ -305,5 +305,6 @@
     tmpCell->conceptsRead = PM_CONCEPT_SOURCE_NONE;
     if (!psMetadataAddStr(tmpCell->concepts, PS_LIST_HEAD, "CELL.NAME", 0, NULL, name)) {
-        psLogMsg(__func__, PS_LOG_WARN, "WARNING: Could not add CELL.NAME to metadata.\n");
+        psErrorClear();
+        psWarning("Could not add CELL.NAME to metadata.");
     }
     pmConceptsBlankCell(tmpCell);
@@ -343,5 +344,6 @@
     tmpChip->conceptsRead = PM_CONCEPT_SOURCE_NONE;
     if (!psMetadataAddStr(tmpChip->concepts, PS_LIST_HEAD, "CHIP.NAME", 0, NULL, name)) {
-        psLogMsg(__func__, PS_LOG_WARN, "WARNING: Could not add CHIP.NAME %s to concepts.\n", name);
+        psErrorClear();
+        psWarning("Could not add CHIP.NAME %s to concepts.", name);
     }
     pmConceptsBlankChip(tmpChip);
@@ -355,5 +357,5 @@
 }
 
-pmFPA *pmFPAAlloc(const psMetadata *camera)
+pmFPA *pmFPAAlloc(const psMetadata *camera, const char *cameraName)
 {
     pmFPA *tmpFPA = (pmFPA *) psAlloc(sizeof(pmFPA));
@@ -373,4 +375,10 @@
     pmConceptsBlankFPA(tmpFPA);
 
+    if (!psMetadataAddStr(tmpFPA->concepts, PS_LIST_TAIL, "FPA.CAMERA", PS_META_REPLACE,
+                          "Camera name (according to configuration)", cameraName)) {
+        psErrorClear();
+        psWarning("Could not add FPA.CAMERA %s to concepts.", cameraName);
+    }
+
     return tmpFPA;
 }