Index: trunk/archive/scripts/src/phase2/pmFPAConstruct.c
===================================================================
--- trunk/archive/scripts/src/phase2/pmFPAConstruct.c	(revision 5371)
+++ trunk/archive/scripts/src/phase2/pmFPAConstruct.c	(revision 5462)
@@ -37,7 +37,7 @@
     psMetadataItem *item = NULL;	// Item from iteration
     while (item = psMetadataGetAndIncrement(iter)) {
-	if (item->type == PS_META_MULTI || item->type == PS_META_META) {
-	    psLogMsg(__func__, PS_LOG_WARN, "PS_META_MULTI and PS_META_META are not supported in a cell "
-		     "definition --- %s ignored.\n", item->name);
+	if (item->type == PS_DATA_METADATA_MULTI || item->type == PS_DATA_METADATA) {
+	    psLogMsg(__func__, PS_LOG_WARN, "PS_DATA_METADATA_MULTI and PS_DATA_METADATA are not supported "
+		     "in a cell definition --- %s ignored.\n", item->name);
 	    continue;
 	}
@@ -89,5 +89,5 @@
 		pmChip *chip = pmChipAlloc(fpa, extName); // The chip
 		chip->data = pmPixelDataAlloc(extName); // Prepare chip to receive FITS data
-		if (contentItem->type != PS_META_STR) {
+		if (contentItem->type != PS_DATA_STRING) {
 		    psLogMsg(__func__, PS_LOG_WARN, "Type of content item (%x) is not string: ignored\n",
 			     contentItem->type);
@@ -117,5 +117,5 @@
 		psTrace(__func__, 1, "Getting %s....\n", extName);
 
-		if (contentItem->type != PS_META_STR) {
+		if (contentItem->type != PS_DATA_STRING) {
 		    psLogMsg(__func__, PS_LOG_WARN, "Type of content item (%x) is not string: ignored\n",
 			     contentItem->type);
@@ -136,5 +136,5 @@
 		    if (! chipItem) {
 			chip = pmChipAlloc(fpa, chipName);
-			psMetadataAdd(chips, PS_LIST_TAIL, chipName, PS_META_CHIP, "", chip);
+			psMetadataAdd(chips, PS_LIST_TAIL, chipName, PS_DATA_UNKNOWN, "", chip);
 		    } else {
 			chip = psMemIncrRefCounter(chipItem->data.V);
@@ -161,5 +161,5 @@
 		psString chipName = contentItem->name; // The name of the chip
 
-		if (contentItem->type != PS_META_STR) {
+		if (contentItem->type != PS_DATA_STRING) {
 		    psLogMsg(__func__, PS_LOG_WARN, "Type of content item (%x) is not string: ignored\n",
 			     contentItem->type);
@@ -234,5 +234,5 @@
 		psString extName = contentItem->name; // The name of the extension
 		// Content is a cell type
-		if (contentItem->type != PS_META_STR) {
+		if (contentItem->type != PS_DATA_STRING) {
 		    psLogMsg(__func__, PS_LOG_WARN,
 			     "CONTENT metadata for extension %s is not of type string, but %x --- ignored\n",