Index: trunk/archive/pslib/include/psAstrom.h
===================================================================
--- trunk/archive/pslib/include/psAstrom.h	(revision 153)
+++ trunk/archive/pslib/include/psAstrom.h	(revision 160)
@@ -28,5 +28,5 @@
 /** Constructor */
 psAstromCoeffs *
-psAstromCoeffsNew(int xyOrder,		//!< Spatial (x,y) order of polynomial
+psAstromCoeffsAlloc(int xyOrder,		//!< Spatial (x,y) order of polynomial
 		  int colourOrder,	//!< Order of polynomial in colour
 		  int magOrder,		//!< Order of polynomial in magnitude
@@ -38,5 +38,5 @@
 /** Destructor */
 void
-psAstromCoeffsDel(psAstromCoeffs *restrict myAstromCoeffs //!< Object to destroy
+psAstromCoeffsFree(psAstromCoeffs *restrict myAstromCoeffs //!< Object to destroy
     );
 
@@ -60,5 +60,5 @@
 /** Constructor */
 psTelPointing *
-psTelPointingNew(double ra, double dec,	//!< Telescope boresight
+psTelPointingAlloc(double ra, double dec,	//!< Telescope boresight
 		 double ha,		//!< Hour angle
 		 double zd,		//!< Zenith distance
@@ -71,5 +71,5 @@
 /** Destructor */
 void
-psTelPointingDel(psTelPointing *restrict myTelPointing //!< Object to destroy
+psTelPointingFree(psTelPointing *restrict myTelPointing //!< Object to destroy
     );
 
@@ -91,9 +91,9 @@
 /** Constructor */
 psCellDescription *
-psCellDescriptionNew(void);
-
-/** Destructor */
-void
-psCellDescriptionDel(psCellDescription *restrict myCell //!< Cell description to destroy
+psCellDescriptionAlloc(void);
+
+/** Destructor */
+void
+psCellDescriptionFree(psCellDescription *restrict myCell //!< Cell description to destroy
     );
 
@@ -117,9 +117,9 @@
 /** Constructor */
 psOTADescription *
-psOTADescriptionNew(void);
+psOTADescriptionAlloc(void);
 
 /** Destructor. */
 void
-psOTADescriptionDel(psOTADescription *restrict myOTA //!< OTA description to destroy
+psOTADescriptionFree(psOTADescription *restrict myOTA //!< OTA description to destroy
     );
 
@@ -158,10 +158,10 @@
 /** Constructor */
 psAstrom *
-psAstromNew(const psTelPointing *telescope //!< Telescope pointing, used to initialise the tp data.
-    );
-
-/** Destructor */
-void
-psAstromDel(psAstrom *restrict myAstrom	//!< Object to destroy
+psAstromAlloc(const psTelPointing *telescope //!< Telescope pointing, used to initialise the tp data.
+    );
+
+/** Destructor */
+void
+psAstromFree(psAstrom *restrict myAstrom	//!< Object to destroy
     );
 
@@ -184,5 +184,5 @@
 /** Fit astrometric solution to list of (chip#,x,y) and (RA,Dec) */
 int
-psFitAstrom(psOTADescription *restrict ota, //!< psAstrom struct containing initial guess for coefficients
+psFitAstrom(psOTADescription *restrict ota, //!< Initial guess for coefficients
 	    const psOTAPosArray *restrict detector, //!< Positions on OTA (chip#,x,y)
 	    const psSkyPosArray *restrict sky, //!< Positions on the sky (RA,Dec)