Index: trunk/psModules/test/objects/tap_pmSource.c
===================================================================
--- trunk/psModules/test/objects/tap_pmSource.c	(revision 31153)
+++ trunk/psModules/test/objects/tap_pmSource.c	(revision 31451)
@@ -91,5 +91,5 @@
         ok(isnan(src->psfMag), "pmSourceAlloc() pmSource->psfMag correctly");
         ok(isnan(src->extMag), "pmSourceAlloc() pmSource->extMag correctly");
-        ok(isnan(src->errMag), "pmSourceAlloc() pmSource->errMag correctly");
+        ok(isnan(src->psfMagErr), "pmSourceAlloc() pmSource->psfMagErr correctly");
         ok(isnan(src->apMag), "pmSourceAlloc() pmSource->apMag correctly");
         ok(isnan(src->sky), "pmSourceAlloc() pmSource->sky correctly");
Index: trunk/psModules/test/objects/tap_pmSourceIO_PS1_DEV_0.c
===================================================================
--- trunk/psModules/test/objects/tap_pmSourceIO_PS1_DEV_0.c	(revision 31153)
+++ trunk/psModules/test/objects/tap_pmSourceIO_PS1_DEV_0.c	(revision 31451)
@@ -167,5 +167,5 @@
             model->dparams->data.F32[PM_PAR_YPOS] = TEST_BASE_Y_ERR + (float) i;
             src->psfMag = TEST_BASE_PSF_MAG + (float) i;
-            src->errMag = TEST_BASE_ERR_MAG + (float) i;
+            src->psfMagErr = TEST_BASE_ERR_MAG + (float) i;
             src->peak->flux = TEST_BASE_PEAK_FLUX + (float) i;
             src->sky = TEST_BASE_SKY + (float) i;
@@ -215,6 +215,6 @@
              ok(src->psfMag == (TEST_BASE_PSF_MAG + (float) i), "pmSourcesRead_PS1_DEV_0() set src->psfMag correctly (is %.2f, should be %.2f)",
                 src->psfMag, (TEST_BASE_PSF_MAG + (float) i));
-             ok(src->errMag == (TEST_BASE_ERR_MAG + (float) i), "pmSourcesRead_PS1_DEV_0() set src->errMag correctly (is %.2f, should be %.2f)",
-                src->errMag, (TEST_BASE_ERR_MAG + (float) i));
+             ok(src->psfMagErr == (TEST_BASE_ERR_MAG + (float) i), "pmSourcesRead_PS1_DEV_0() set src->psfMagErr correctly (is %.2f, should be %.2f)",
+                src->psfMagErr, (TEST_BASE_ERR_MAG + (float) i));
 
              // XXX: Source code always sets src->modelPSF.  Is that right?
Index: trunk/psModules/test/objects/tap_pmSourceIO_PS1_DEV_1.c
===================================================================
--- trunk/psModules/test/objects/tap_pmSourceIO_PS1_DEV_1.c	(revision 31153)
+++ trunk/psModules/test/objects/tap_pmSourceIO_PS1_DEV_1.c	(revision 31451)
@@ -196,5 +196,5 @@
             model->dparams->data.F32[PM_PAR_YPOS] = TEST_BASE_Y_ERR + (float) i;
             src->psfMag = TEST_BASE_PSF_MAG + (float) i;
-            src->errMag = TEST_BASE_ERR_MAG + (float) i;
+            src->psfMagErr = TEST_BASE_ERR_MAG + (float) i;
             src->peak->flux = TEST_BASE_PEAK_FLUX + (float) i;
             src->sky = TEST_BASE_SKY + (float) i;
@@ -203,5 +203,5 @@
             sources->data[i] = (psPtr *) src;
             src->psfMag = TEST_BASE_PSF_MAG + (float) i;
-            src->errMag = TEST_BASE_ERR_MAG + (float) i;
+            src->psfMagErr = TEST_BASE_ERR_MAG + (float) i;
             src->sky = TEST_BASE_SKY + (float) i;
             src->skyErr = TEST_BASE_SKY_ERR + (float) i;
@@ -280,6 +280,6 @@
              ok(src->psfMag == (TEST_BASE_PSF_MAG + (float) i), "pmSourcesRead_PS1_DEV_1() set src->psfMag correctly (is %.2f, should be %.2f)",
                 src->psfMag, (TEST_BASE_PSF_MAG + (float) i));
-             ok(src->errMag == (TEST_BASE_ERR_MAG + (float) i), "pmSourcesRead_PS1_DEV_1() set src->errMag correctly (is %.2f, should be %.2f)",
-                src->errMag, (TEST_BASE_ERR_MAG + (float) i));
+             ok(src->psfMagErr == (TEST_BASE_ERR_MAG + (float) i), "pmSourcesRead_PS1_DEV_1() set src->psfMagErr correctly (is %.2f, should be %.2f)",
+                src->psfMagErr, (TEST_BASE_ERR_MAG + (float) i));
 
              // XXX: Source code always sets src->modelPSF.  Is that right?
Index: trunk/psModules/test/objects/tap_pmSourceIO_SMPDATA.c
===================================================================
--- trunk/psModules/test/objects/tap_pmSourceIO_SMPDATA.c	(revision 31153)
+++ trunk/psModules/test/objects/tap_pmSourceIO_SMPDATA.c	(revision 31451)
@@ -167,5 +167,5 @@
             model->dparams->data.F32[PM_PAR_YPOS] = TEST_BASE_Y_ERR + (float) i;
             src->psfMag = TEST_BASE_PSF_MAG + (float) i;
-            src->errMag = TEST_BASE_ERR_MAG + (float) i;
+            src->psfMagErr = TEST_BASE_ERR_MAG + (float) i;
             src->peak->flux = TEST_BASE_PEAK_FLUX + (float) i;
             src->sky = TEST_BASE_SKY + (float) i;
@@ -226,6 +226,6 @@
                 src->psfMag, (TEST_BASE_PSF_MAG + (float) i));
              float tmpF =  0.001 * PS_MIN(999, (1000 * (TEST_BASE_ERR_MAG + (float) i)));
-             ok(src->errMag == tmpF, "pmSourcesRead_SMPDATA() set src->errMag correctly (is %.2f, should be %.2f)",
-                src->errMag, tmpF);
+             ok(src->psfMagErr == tmpF, "pmSourcesRead_SMPDATA() set src->psfMagErr correctly (is %.2f, should be %.2f)",
+                src->psfMagErr, tmpF);
              tmpF = PS_MIN(99.0, (TEST_BASE_EXT_MAG + ZERO_POINT)) - ZERO_POINT;
              ok(src->extMag == tmpF, "pmSourcesRead_SMPDATA() set src->extMag correctly (is %.2f, should be %.2f)",
Index: trunk/psModules/test/objects/tap_pmSourcePhotometry.c
===================================================================
--- trunk/psModules/test/objects/tap_pmSourcePhotometry.c	(revision 31153)
+++ trunk/psModules/test/objects/tap_pmSourcePhotometry.c	(revision 31451)
@@ -103,5 +103,5 @@
     ok_float_tol(source->psfMag, fitMag, 0.0002, "source fitMag is %f", source->psfMag);
     ok_float_tol(source->apMag,  apMag, 0.0002, "source apMag is %f", source->apMag);
-    ok_float(source->errMag,   0.001, "source errMag is %f", source->errMag);
+    ok_float(source->psfMagErr,   0.001, "source psfMagErr is %f", source->psfMagErr);
     float refMag = source->apMag;