Index: trunk/psModules/src/concepts/pmConceptsStandard.c
===================================================================
--- trunk/psModules/src/concepts/pmConceptsStandard.c	(revision 32941)
+++ trunk/psModules/src/concepts/pmConceptsStandard.c	(revision 34085)
@@ -118,5 +118,5 @@
     assert(concept);
     assert(cell);
-    assert(concept->type == PS_TYPE_F32);
+    assert(concept->type == PS_DATA_F32);
 
     float rn = concept->data.F32;       // Read noise
@@ -930,5 +930,5 @@
     psFree(timesysName);
 
-    if (!item || item->type != PS_TYPE_S32) {
+    if (!item || item->type != PS_DATA_S32) {
         psWarning("Unable to find %s --- assuming UTC", timesysName);
         return PS_TIME_UTC;
@@ -1258,7 +1258,7 @@
 #endif
       default:
-        if (concept->type == PS_TYPE_F32 && concept->data.F32 - (int)concept->data.F32 == 0) {
+        if (concept->type == PS_DATA_F32 && concept->data.F32 - (int)concept->data.F32 == 0) {
             offset = concept->data.F32;
-        } else if (concept->type == PS_TYPE_F64 && concept->data.F64 - (int)concept->data.F64 == 0) {
+        } else if (concept->type == PS_DATA_F64 && concept->data.F64 - (int)concept->data.F64 == 0) {
             offset = concept->data.F64;
         } else {
@@ -1558,5 +1558,5 @@
     assert(cameraFormat);
 
-    if (concept->type != PS_TYPE_S32) {
+    if (concept->type != PS_DATA_S32) {
         psError(PS_ERR_UNKNOWN, true, "Concept %s is not of type S32, as expected.\n", concept->name);
         return NULL;