Index: /trunk/psastro/src/psastro.h
===================================================================
--- /trunk/psastro/src/psastro.h	(revision 10612)
+++ /trunk/psastro/src/psastro.h	(revision 10613)
@@ -17,8 +17,4 @@
 # define RAD_DEG  0.017453292519943
 # define SIGN(X)  (((X) == 0) ? 0 : ((fabs((double)(X))) / (X)))
-
-# define fromTPA fromTangentPlane
-# define toTPA toTangentPlane
-# define toSky projection
 
 // this structure represents a fit to the logN / logS curve for a set of stars
Index: /trunk/psastro/src/psastroAstromGuess.c
===================================================================
--- /trunk/psastro/src/psastroAstromGuess.c	(revision 10612)
+++ /trunk/psastro/src/psastroAstromGuess.c	(revision 10613)
@@ -58,10 +58,10 @@
         if (newFPA) {
             newFPA = false;
-	    while (fpa->projection->R <        0) fpa->projection->R += 2.0*M_PI;
-	    while (fpa->projection->R > 2.0*M_PI) fpa->projection->R -= 2.0*M_PI;
-            RAminSky = fpa->projection->R - M_PI;
-            RAmaxSky = fpa->projection->R + M_PI;
-            RAmin = RAmax = fpa->projection->R;
-            DECmin = DECmax = fpa->projection->D;
+	    while (fpa->toSky->R <        0) fpa->toSky->R += 2.0*M_PI;
+	    while (fpa->toSky->R > 2.0*M_PI) fpa->toSky->R -= 2.0*M_PI;
+            RAminSky = fpa->toSky->R - M_PI;
+            RAmaxSky = fpa->toSky->R + M_PI;
+            RAmin = RAmax = fpa->toSky->R;
+            DECmin = DECmax = fpa->toSky->D;
         }
 
@@ -83,6 +83,6 @@
 
                     psPlaneTransformApply (raw->FP, chip->toFPA, raw->chip);
-                    psPlaneDistortApply (raw->TP, fpa->toTangentPlane, raw->FP, 0.0, 0.0);
-                    p_psDeproject (raw->sky, raw->TP, fpa->projection);
+                    psPlaneDistortApply (raw->TP, fpa->toTPA, raw->FP, 0.0, 0.0);
+                    psDeproject (raw->sky, raw->TP, fpa->toSky);
 
 		    if (i < 10) {
@@ -97,6 +97,6 @@
                         psPlane *ch = psPlaneAlloc();
 			
-                        p_psProject (tp, raw->sky, fpa->projection);
-                        psPlaneDistortApply (fp, fpa->fromTangentPlane, tp, 0.0, 0.0);
+                        psProject (tp, raw->sky, fpa->toSky);
+                        psPlaneDistortApply (fp, fpa->fromTPA, tp, 0.0, 0.0);
                         psPlaneTransformApply (ch, chip->fromFPA, fp);
 			
Index: /trunk/psastro/src/psastroChipAstrom.c
===================================================================
--- /trunk/psastro/src/psastroChipAstrom.c	(revision 10612)
+++ /trunk/psastro/src/psastroChipAstrom.c	(revision 10613)
@@ -55,5 +55,5 @@
 		    return false;
 		}
-		pmAstromWriteWCS (chip->toFPA, fpa->toTangentPlane, fpa->toSky, updates, plateScale);
+		pmAstromWriteWCS (chip->toFPA, fpa->toTPA, fpa->toSky, updates, plateScale);
 		psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSASTRO.HEADER",  PS_DATA_METADATA, "psastro header stats", updates);
 		psFree (updates);
Index: /trunk/psastro/src/psastroChooseRefstars.c
===================================================================
--- /trunk/psastro/src/psastroChooseRefstars.c	(revision 10612)
+++ /trunk/psastro/src/psastroChooseRefstars.c	(revision 10613)
@@ -62,6 +62,6 @@
 
                     // XXX why is this still a private function?
-                    p_psProject (ref->TP, ref->sky, fpa->projection);
-                    psPlaneDistortApply (ref->FP, fpa->fromTangentPlane, ref->TP, 0.0, 0.0);
+                    psProject (ref->TP, ref->sky, fpa->toSky);
+                    psPlaneDistortApply (ref->FP, fpa->fromTPA, ref->TP, 0.0, 0.0);
                     psPlaneTransformApply (ref->chip, chip->fromFPA, ref->FP);
 
Index: /trunk/psastro/src/psastroMosaicAstrom.c
===================================================================
--- /trunk/psastro/src/psastroMosaicAstrom.c	(revision 10612)
+++ /trunk/psastro/src/psastroMosaicAstrom.c	(revision 10613)
@@ -28,8 +28,8 @@
 
     // XXX no input distortion model yet; existing fpa distortion is identity: replace it
-    psFree (fpa->toTangentPlane);
-    psFree (fpa->fromTangentPlane);
-    fpa->toTangentPlane   = psPlaneDistortIdentity (order);
-    fpa->fromTangentPlane = psPlaneDistortIdentity (order);
+    psFree (fpa->toTPA);
+    psFree (fpa->fromTPA);
+    fpa->toTPA   = psPlaneDistortIdentity (order);
+    fpa->fromTPA = psPlaneDistortIdentity (order);
 
     grads = psastroMosaicGetGrads (fpa, recipe);
Index: /trunk/psastro/src/psastroMosaicHeaders.c
===================================================================
--- /trunk/psastro/src/psastroMosaicHeaders.c	(revision 10612)
+++ /trunk/psastro/src/psastroMosaicHeaders.c	(revision 10613)
@@ -39,5 +39,5 @@
     }
 
-    psMetadata *mosaic = pmAstromWriteBilevelMosaic (fpa->projection, fpa->toTangentPlane, plateScale);
+    psMetadata *mosaic = pmAstromWriteBilevelMosaic (fpa->toSky, fpa->toTPA, plateScale);
 
     // XXX what is the EXTNAME??
Index: /trunk/psastro/src/psastroMosaicSetAstrom.c
===================================================================
--- /trunk/psastro/src/psastroMosaicSetAstrom.c	(revision 10612)
+++ /trunk/psastro/src/psastroMosaicSetAstrom.c	(revision 10613)
@@ -30,6 +30,6 @@
 	
 		    psPlaneTransformApply (raw->FP, chip->toFPA, raw->chip);
-		    psPlaneDistortApply (raw->TP, fpa->toTangentPlane, raw->FP, 0.0, 0.0);
-		    p_psDeproject (raw->sky, raw->TP, fpa->projection);
+		    psPlaneDistortApply (raw->TP, fpa->toTPA, raw->FP, 0.0, 0.0);
+		    psDeproject (raw->sky, raw->TP, fpa->toSky);
 		}
 
@@ -40,6 +40,6 @@
 		    pmAstromObj *ref = refstars->data[i];
 	
-		    p_psProject (ref->TP, ref->sky, fpa->projection);
-		    psPlaneDistortApply (ref->FP, fpa->fromTangentPlane, ref->TP, 0.0, 0.0);
+		    psProject (ref->TP, ref->sky, fpa->toSky);
+		    psPlaneDistortApply (ref->FP, fpa->fromTPA, ref->TP, 0.0, 0.0);
 		    psPlaneTransformApply (ref->chip, chip->fromFPA, ref->FP);
 		}
Index: /trunk/psastro/src/psastroUtils.c
===================================================================
--- /trunk/psastro/src/psastroUtils.c	(revision 10612)
+++ /trunk/psastro/src/psastroUtils.c	(revision 10613)
@@ -13,6 +13,6 @@
 
         psPlaneTransformApply (raw->FP, chip->toFPA, raw->chip);
-        psPlaneDistortApply (raw->TP, fpa->toTangentPlane, raw->FP, 0.0, 0.0);
-        p_psDeproject (raw->sky, raw->TP, fpa->projection);
+        psPlaneDistortApply (raw->TP, fpa->toTPA, raw->FP, 0.0, 0.0);
+        psDeproject (raw->sky, raw->TP, fpa->toSky);
     }
 
Index: /trunk/psastro/src/psastroWCS.c
===================================================================
--- /trunk/psastro/src/psastroWCS.c	(revision 10612)
+++ /trunk/psastro/src/psastroWCS.c	(revision 10613)
@@ -138,10 +138,10 @@
 	if (fpa->toSky == NULL) {
 	    // XXX for now, use the identity for TPA <--> FPA
-	    fpa->toTangentPlane = psPlaneDistortIdentity (1);
-	    fpa->fromTangentPlane = psPlaneDistortIdentity (1);
+	    fpa->toTPA = psPlaneDistortIdentity (1);
+	    fpa->fromTPA = psPlaneDistortIdentity (1);
 	    fpa->toSky = toSky;
 	} else {
-	    if (fpa->toTangentPlane == NULL) psAbort ("wcs", "projection defined, tangent-plane not defined");
-	    if (fpa->fromTangentPlane == NULL) psAbort ("wcs", "projection defined, tangent-plane not defined");
+	    if (fpa->toTPA == NULL) psAbort ("wcs", "projection defined, tangent-plane not defined");
+	    if (fpa->fromTPA == NULL) psAbort ("wcs", "projection defined, tangent-plane not defined");
 
 	    // adjust for common toSky for mosaic:
@@ -154,6 +154,6 @@
 	
 	    psPlaneTransformApply (fp, toFPA, chip); // find the focal-plane coordinate of this chip's 0,0 coordinate
-	    p_psDeproject (sky, fp, toSky); // find the RA,DEC coord of the focal-plane coordinate
-	    p_psProject (fp, sky, fpa->toSky); // find the focal-plane coord of this RA,DEC coord using the ref chip projection
+	    psDeproject (sky, fp, toSky); // find the RA,DEC coord of the focal-plane coordinate
+	    psProject (fp, sky, fpa->toSky); // find the focal-plane coord of this RA,DEC coord using the ref chip projection
 
 	    toFPA->x->coeff[0][0] = fp->x;