Index: trunk/archive/scripts/src/phase2/pmFPAConceptsSet.c
===================================================================
--- trunk/archive/scripts/src/phase2/pmFPAConceptsSet.c	(revision 5371)
+++ trunk/archive/scripts/src/phase2/pmFPAConceptsSet.c	(revision 5462)
@@ -68,6 +68,6 @@
 	}
 	return (item1->data.F64 == item2->data.F64) ? true : false;
-      case PS_META_STR:
-	if (item2->type != PS_META_STR) {
+      case PS_DATA_STRING:
+	if (item2->type != PS_DATA_STRING) {
 	    return false;
 	}
@@ -112,14 +112,14 @@
 	// XXX: Need to expand range of types
 	switch (concept->type) {
-	  case PS_META_STR:
+	  case PS_DATA_STRING:
 	    headerItem = psMetadataItemAllocStr(keyword, concept->comment, concept->data.V);
 	    break;
-	  case PS_META_S32:
+	  case PS_DATA_S32:
 	    headerItem = psMetadataItemAllocS32(keyword, concept->comment, concept->data.S32);
 	    break;
-	  case PS_META_F32:
+	  case PS_DATA_F32:
 	    headerItem = psMetadataItemAllocF32(keyword, concept->comment, concept->data.F32);
 	    break;
-	  case PS_META_F64:
+	  case PS_DATA_F64:
 	    headerItem = psMetadataItemAllocF64(keyword, concept->comment, concept->data.F64);
 	    break;
@@ -183,5 +183,5 @@
     psMetadataItem *defItem = psMetadataLookup(defaults, concept->name);
     if (defItem) {
-	if (defItem->type == PS_META_META) {
+	if (defItem->type == PS_DATA_METADATA) {
 	    // A dependent default
 	    psTrace(__func__, 7, "Evaluating dependent default....\n");
@@ -205,5 +205,5 @@
 		return false;
 	    }
-	    if (depItem->type != PS_META_STR) {
+	    if (depItem->type != PS_DATA_STRING) {
 		psError(PS_ERR_IO, true, "Value of %s is not of type string, as required for dependency"
 			" --- ignored.\n", dependsOn);
@@ -555,5 +555,5 @@
 	if (! sourceItem) {
 	    psError(PS_ERR_IO, false, "Couldn't find CELL.TRIMSEC.SOURCE.\n");
-	} else if (sourceItem->type != PS_META_STR) {
+	} else if (sourceItem->type != PS_DATA_STRING) {
 	    psError(PS_ERR_IO, true, "CELL.TRIMSEC.SOURCE is not of type STR (%x)\n", sourceItem->type);
 	} else {
@@ -596,5 +596,5 @@
 	if (! sourceItem) {
 	    psError(PS_ERR_IO, false, "Couldn't find CELL.BIASSEC.SOURCE.\n");
-	} else if (sourceItem->type != PS_META_STR) {
+	} else if (sourceItem->type != PS_DATA_STRING) {
 	    psError(PS_ERR_IO, true, "CELL.BIASSEC.SOURCE is not of type STR (%x)\n", sourceItem->type);
 	} else {
@@ -668,5 +668,5 @@
 			    psRegion *biassec = psListGetAndIncrement(biassecsIter);
 			    psString biassecString = psRegionToString(*biassec);
-			    psMetadataAdd(header, PS_LIST_TAIL, keyword, PS_META_STR | PS_META_REPLACE,
+			    psMetadataAdd(header, PS_LIST_TAIL, keyword, PS_DATA_STRING | PS_META_REPLACE,
 					  "Bias section", biassecString);
 			    psFree(biassecString);