Index: trunk/psModules/src/concepts/pmConcepts.c
===================================================================
--- trunk/psModules/src/concepts/pmConcepts.c	(revision 7923)
+++ trunk/psModules/src/concepts/pmConcepts.c	(revision 8246)
@@ -89,5 +89,5 @@
     psMetadataItem *specItem = NULL;    // Item from the specs metadata
     while ((specItem = psMetadataGetAndIncrement(specsIter))) {
-        psTrace(__func__, 9, "Blanking %s...\n", specItem->name);
+        psTrace("psModules.concepts", 9, "Blanking %s...\n", specItem->name);
         pmConceptSpec *spec = specItem->data.V; // The specification
         psMetadataItem *blank = spec->blank; // The concept
@@ -189,5 +189,5 @@
     }
 
-    psTrace(__func__, 3, "Writing concepts (%x %x %x): %x\n", fpa, chip, cell, source);
+    psTrace("psModules.concepts", 3, "Writing concepts (%x %x %x): %x\n", fpa, chip, cell, source);
 
     if (source & PM_CONCEPT_SOURCE_CAMERA) {
@@ -212,5 +212,5 @@
 {
     PS_ASSERT_PTR_NON_NULL(fpa, false);
-    psTrace("psModule.concepts", 5, "Blanking FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
+    psTrace("psModules.concepts", 5, "Blanking FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
     return conceptsBlank(&conceptsFPA, fpa->concepts);
 }
@@ -225,5 +225,5 @@
 {
     PS_ASSERT_PTR_NON_NULL(fpa, false);
-    psTrace("psModule.concepts", 5, "Reading FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
+    psTrace("psModules.concepts", 5, "Reading FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
     bool success = conceptsRead(&conceptsFPA, fpa, NULL, NULL, &fpa->conceptsRead, source, db, fpa->concepts);
     if (propagateDown) {
@@ -248,5 +248,5 @@
 {
     PS_ASSERT_PTR_NON_NULL(fpa, false);
-    psTrace("psModule.concepts", 5, "Writing FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
+    psTrace("psModules.concepts", 5, "Writing FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
     bool success = conceptsWrite(&conceptsFPA, fpa, NULL, NULL, source, db, fpa->concepts);
     if (propagateDown) {
@@ -267,5 +267,5 @@
 {
     PS_ASSERT_PTR_NON_NULL(chip, false);
-    psTrace("psModule.concepts", 5, "Blanking chip concepts: %x %x\n", conceptsChip, chip->concepts);
+    psTrace("psModules.concepts", 5, "Blanking chip concepts: %x %x\n", conceptsChip, chip->concepts);
     return conceptsBlank(&conceptsChip, chip->concepts);
 }
@@ -280,5 +280,5 @@
 {
     PS_ASSERT_PTR_NON_NULL(chip, false);
-    psTrace("psModule.concepts", 5, "Reading chip concepts: %x %x\n", conceptsChip, chip->concepts);
+    psTrace("psModules.concepts", 5, "Reading chip concepts: %x %x\n", conceptsChip, chip->concepts);
     pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
     bool success = conceptsRead(&conceptsChip, fpa, chip, NULL, &chip->conceptsRead, source, db,
@@ -308,5 +308,5 @@
 {
     PS_ASSERT_PTR_NON_NULL(chip, false);
-    psTrace("psModule.concepts", 5, "Writing chip concepts: %x %x\n", conceptsChip, chip->concepts);
+    psTrace("psModules.concepts", 5, "Writing chip concepts: %x %x\n", conceptsChip, chip->concepts);
     pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
     bool success = conceptsWrite(&conceptsChip, fpa, chip, NULL, source, db, chip->concepts);
@@ -331,5 +331,5 @@
 {
     PS_ASSERT_PTR_NON_NULL(cell, false);
-    psTrace("psModule.concepts", 5, "Blanking cell concepts: %x %x\n", conceptsCell, cell->concepts);
+    psTrace("psModules.concepts", 5, "Blanking cell concepts: %x %x\n", conceptsCell, cell->concepts);
     return conceptsBlank(&conceptsCell, cell->concepts);
 }
@@ -343,5 +343,5 @@
 {
     PS_ASSERT_PTR_NON_NULL(cell, false);
-    psTrace("psModule.concepts", 5, "Reading cell concepts: %x %x\n", conceptsCell, cell->concepts);
+    psTrace("psModules.concepts", 5, "Reading cell concepts: %x %x\n", conceptsCell, cell->concepts);
     pmChip *chip = cell->parent;        // Chip to which the cell belongs
     pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
@@ -371,5 +371,5 @@
 {
     PS_ASSERT_PTR_NON_NULL(cell, false);
-    psTrace("psModule.concepts", 5, "Writing cell concepts: %x %x\n", conceptsCell, cell->concepts);
+    psTrace("psModules.concepts", 5, "Writing cell concepts: %x %x\n", conceptsCell, cell->concepts);
     pmChip *chip = cell->parent;        // Chip to which the cell belongs
     pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
Index: trunk/psModules/src/concepts/pmConceptsRead.c
===================================================================
--- trunk/psModules/src/concepts/pmConceptsRead.c	(revision 7923)
+++ trunk/psModules/src/concepts/pmConceptsRead.c	(revision 8246)
@@ -177,5 +177,5 @@
     PS_ASSERT_PTR_NON_NULL(target, false);
 
-    psTrace(__func__, 3, "Reading concepts from defaults...\n");
+    psTrace("psModules.concepts", 3, "Reading concepts from defaults...\n");
 
     pmHDU *hdu = pmHDUGetLowest(fpa, chip, cell); // The HDU at the lowest level
@@ -199,7 +199,7 @@
         psString name = specItem->name; // The concept name
         psMetadataItem *conceptItem = psMetadataLookup(defaults, name); // The concept, or NULL
-        psTrace(__func__, 10, "%s: %x\n", name, conceptItem);
+        psTrace("psModules.concepts", 10, "%s: %x\n", name, conceptItem);
         if (conceptItem && conceptItem->type == PS_DATA_METADATA) {
-            psTrace(__func__, 5, "%s is of type METADATA.\n", name);
+            psTrace("psModules.concepts", 5, "%s is of type METADATA.\n", name);
             // Check for DEPEND
             psMetadata *dependMenu = conceptItem->data.V; // The DEPEND menu
@@ -236,5 +236,5 @@
             }
             const char *dependKey = dependValue->data.V; // The key to the DEPEND menu
-            psTrace(__func__, 7, "%s.DEPEND resolves to %s....\n", name, dependKey);
+            psTrace("psModules.concepts", 7, "%s.DEPEND resolves to %s....\n", name, dependKey);
 
             conceptItem = psMetadataLookup(dependMenu, dependKey);
Index: trunk/psModules/src/concepts/pmConceptsWrite.c
===================================================================
--- trunk/psModules/src/concepts/pmConceptsWrite.c	(revision 7923)
+++ trunk/psModules/src/concepts/pmConceptsWrite.c	(revision 8246)
@@ -140,22 +140,22 @@
     switch (item->type) {
     case PS_DATA_STRING:
-        psTrace(__func__, 9, "Writing header %s: %s\n", keyword, item->data.V);
+        psTrace("psModules.concepts", 9, "Writing header %s: %s\n", keyword, item->data.V);
         return psMetadataAddStr(hdu->header, PS_LIST_TAIL, keyword, PS_META_REPLACE, item->comment,
                                 item->data.V);
     case PS_DATA_S32:
-        psTrace(__func__, 9, "Writing header %s: %d\n", keyword, item->data.S32);
+        psTrace("psModules.concepts", 9, "Writing header %s: %d\n", keyword, item->data.S32);
         return psMetadataAddS32(hdu->header, PS_LIST_TAIL, keyword, PS_META_REPLACE, item->comment,
                                 item->data.S32);
     case PS_DATA_F32:
-        psTrace(__func__, 9, "Writing header %s: %f\n", keyword, item->data.F32);
+        psTrace("psModules.concepts", 9, "Writing header %s: %f\n", keyword, item->data.F32);
         return psMetadataAddF32(hdu->header, PS_LIST_TAIL, keyword, PS_META_REPLACE, item->comment,
                                 item->data.F32);
     case PS_DATA_F64:
-        psTrace(__func__, 9, "Writing header %s: %f\n", keyword, item->data.F64);
+        psTrace("psModules.concepts", 9, "Writing header %s: %f\n", keyword, item->data.F64);
         return psMetadataAddF64(hdu->header, PS_LIST_TAIL, keyword, PS_META_REPLACE, item->comment,
                                 item->data.F64);
     case PS_DATA_REGION: {
             psString region = psRegionToString(*(psRegion*)item->data.V);
-            psTrace(__func__, 9, "Writing header %s: %s\n", keyword, region);
+            psTrace("psModules.concepts", 9, "Writing header %s: %s\n", keyword, region);
             bool result = psMetadataAddStr(hdu->header, PS_LIST_TAIL, keyword, PS_META_REPLACE, item->comment,
                                            region);
@@ -252,5 +252,5 @@
             psString source = psMetadataLookupStr(&mdok, cell->config, nameSource); // The source
             if (mdok && strlen(source) > 0) {
-                psTrace(__func__, 8, "%s is %s\n", nameSource, source);
+                psTrace("psModules.concepts", 8, "%s is %s\n", nameSource, source);
                 if (strcasecmp(source, "HEADER") == 0) {
                     if (cameraItem->type != PS_DATA_STRING) {
@@ -259,8 +259,8 @@
                         continue;
                     }
-                    psTrace(__func__, 8, "Writing %s to header %s\n", name, cameraItem->data.V);
+                    psTrace("psModules.concepts", 8, "Writing %s to header %s\n", name, cameraItem->data.V);
                     writeHeader(hdu, cameraItem->data.V, formatted);
                 } else if (strcasecmp(source, "VALUE") == 0) {
-                    psTrace(__func__, 8, "Checking %s against camera format.\n", name);
+                    psTrace("psModules.concepts", 8, "Checking %s against camera format.\n", name);
                     if (! compareConcepts(formatted, cameraItem)) {
                         psLogMsg(__func__, PS_LOG_WARN, "Concept %s is specified by value in the camera "
@@ -384,5 +384,5 @@
                 continue;
             }
-            psTrace(__func__, 3, "Writing %s to header %s\n", name, headerItem->data.V);
+            psTrace("psModules.concepts", 3, "Writing %s to header %s\n", name, headerItem->data.V);
             psMetadataItem *conceptItem = psMetadataLookup(concepts, name); // The item from the concepts
             psMetadataItem *formatted = conceptFormat(spec, conceptItem, cameraFormat, fpa, chip, cell);