Index: trunk/psModules/src/concepts/pmConcepts.c
===================================================================
--- trunk/psModules/src/concepts/pmConcepts.c	(revision 9539)
+++ trunk/psModules/src/concepts/pmConcepts.c	(revision 9570)
@@ -117,7 +117,7 @@
 // Read all registered concepts for the specified level
 static bool conceptsRead(psMetadata **specs, // One of the concepts specifications
-                         pmFPA *fpa,    // The FPA
-                         pmChip *chip,  // The chip
-                         pmCell *cell,  // The cell
+                         const pmFPA *fpa,    // The FPA
+                         const pmChip *chip,  // The chip
+                         const pmCell *cell, // The cell
                          unsigned int *read,     // What's already been read
                          pmConceptSource source, // The source of the concepts to read
@@ -135,7 +135,7 @@
 
     bool success = true;                // Success in reading concepts?
-    if (source & PM_CONCEPT_SOURCE_CAMERA && !(*read & PM_CONCEPT_SOURCE_CAMERA)) {
-        if (pmConceptsReadFromCamera(*specs, cell, target)) {
-            *read |= PM_CONCEPT_SOURCE_CAMERA;
+    if (source & PM_CONCEPT_SOURCE_CELLS && !(*read & PM_CONCEPT_SOURCE_CELLS)) {
+        if (p_pmConceptsReadFromCells(target, *specs, cell)) {
+            *read |= PM_CONCEPT_SOURCE_CELLS;
         } else {
             psError(PS_ERR_UNKNOWN, false, "Error reading concepts from camera configuration.\n");
@@ -145,5 +145,5 @@
 
     if (source & PM_CONCEPT_SOURCE_DEFAULTS && !(*read & PM_CONCEPT_SOURCE_DEFAULTS)) {
-        if (pmConceptsReadFromDefaults(*specs, fpa, chip, cell, target)) {
+        if (p_pmConceptsReadFromDefaults(target, *specs, fpa, chip, cell)) {
             *read |= PM_CONCEPT_SOURCE_DEFAULTS;
         } else {
@@ -154,5 +154,5 @@
 
     if (source & PM_CONCEPT_SOURCE_PHU && !(*read & PM_CONCEPT_SOURCE_PHU)) {
-        if (!pmConceptsReadFromHeader(*specs, fpa, chip, cell, target)) {
+        if (!p_pmConceptsReadFromHeader(target, *specs, fpa, chip, cell)) {
             psError(PS_ERR_UNKNOWN, false, "Error reading concepts from header.\n");
             success = false;
@@ -161,5 +161,5 @@
 
     if (source & PM_CONCEPT_SOURCE_HEADER && !(*read & PM_CONCEPT_SOURCE_HEADER)) {
-        if (pmConceptsReadFromHeader(*specs, fpa, chip, cell, target)) {
+        if (p_pmConceptsReadFromHeader(target, *specs, fpa, chip, cell)) {
             *read |= PM_CONCEPT_SOURCE_HEADER;
         } else {
@@ -171,5 +171,5 @@
     #ifndef OMIT_PSDB
     if (source & PM_CONCEPT_SOURCE_DATABASE && !(*read & PM_CONCEPT_SOURCE_DATABASE)) {
-        if (pmConceptsReadFromDatabase(*specs, fpa, chip, cell, db, target)) {
+        if (p_pmConceptsReadFromDatabase(target, *specs, fpa, chip, cell, db)) {
             *read |= PM_CONCEPT_SOURCE_DATABASE;
         } else {
@@ -202,15 +202,15 @@
     psTrace("psModules.concepts", 3, "Writing concepts (%p %p %p): %d\n", fpa, chip, cell, source);
 
-    if (source & PM_CONCEPT_SOURCE_CAMERA) {
-        pmConceptsWriteToCamera(*specs, cell, concepts);
+    if (source & PM_CONCEPT_SOURCE_CELLS) {
+        p_pmConceptsWriteToCells(*specs, cell, concepts);
     }
     if (source & PM_CONCEPT_SOURCE_DEFAULTS) {
-        pmConceptsWriteToDefaults(*specs, fpa, chip, cell, concepts);
+        p_pmConceptsWriteToDefaults(*specs, fpa, chip, cell, concepts);
     }
     if (source & (PM_CONCEPT_SOURCE_PHU | PM_CONCEPT_SOURCE_HEADER)) {
-        pmConceptsWriteToHeader(*specs, fpa, chip, cell, concepts);
+        p_pmConceptsWriteToHeader(*specs, fpa, chip, cell, concepts);
     }
     if (source & PM_CONCEPT_SOURCE_DATABASE) {
-        pmConceptsWriteToDatabase(*specs, fpa, chip, cell, db, concepts);
+        p_pmConceptsWriteToDatabase(*specs, fpa, chip, cell, db, concepts);
     }