diff --git a/calculus/monte-carlo.lisp b/calculus/monte-carlo.lisp
index cb18bb10a3e6e491f02281dc7f0c59d4e2670b2d..6bffa80318a67013dafd1109c920994a7d2502b2 100644
--- a/calculus/monte-carlo.lisp
+++ b/calculus/monte-carlo.lisp
@@ -1,6 +1,6 @@
 ;; Monte Carlo Integration
 ;; Liam Healy Sat Feb  3 2007 - 17:42
-;; Time-stamp: <2010-06-29 22:15:24EDT monte-carlo.lisp>
+;; Time-stamp: <2010-08-07 21:41:14EDT monte-carlo.lisp>
 ;;
 ;; Copyright 2007, 2008, 2009 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -205,13 +205,14 @@
 
 (defun mcrw (x y z)
   "Example function for Monte Carlo used in random walk studies."
-  (* (/ (expt pi 3))
+  (* (/ (expt dpi 3))
      (/ (- 1 (* (cos x) (cos y) (cos z))))))
 
 (defparameter *mc-lower* #m(0.0d0 0.0d0 0.0d0))
 
 (defparameter *mc-upper*
-  (grid:make-foreign-array 'double-float :initial-contents (list pi pi pi)))
+  (grid:make-foreign-array
+   'double-float :initial-contents (make-list 3 :initial-element dpi)))
 
 (defun random-walk-plain-example (&optional (nsamples 500000))
   (monte-carlo-integrate-plain 'mcrw *mc-lower* *mc-upper* nsamples))
diff --git a/calculus/numerical-integration-with-tables.lisp b/calculus/numerical-integration-with-tables.lisp
index 45730ee350ec070abf394d5118ce72442a483bc1..5f4b4010aba0acffbeb17b082ff9882b409b323c 100644
--- a/calculus/numerical-integration-with-tables.lisp
+++ b/calculus/numerical-integration-with-tables.lisp
@@ -1,6 +1,6 @@
 ;; Numerical integration techniques that require tables
 ;; Liam Healy 2009-04-04 15:24:05EDT 
-;; Time-stamp: <2009-12-27 09:42:09EST numerical-integration-with-tables.lisp>
+;; Time-stamp: <2010-08-07 21:41:16EDT numerical-integration-with-tables.lisp>
 ;;
 ;; Copyright 2009 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -256,11 +256,11 @@
  ;; point overflow in making the table.  Setting to 100 works and
  ;; gives the result given in test.c.
  (integration-QAWO
-  'integration-test-f456 0.0d0 (* 10 pi) 1.0d0 :sine 100 0.0d0 1.0d-7)
+  'integration-test-f456 0.0d0 (* 10 dpi) 1.0d0 :sine 100 0.0d0 1.0d-7)
  ;; For the negative interval, it was necessary to have the function
  ;; takethe absolute value of the argument and then transfer the sign of
  ;;  x to the answer.
  (integration-QAWO
-  'integration-test-f456 0.0d0 (* 10 pi) -1.0d0 :sine 100 0.0d0 1.0d-7)
+  'integration-test-f456 0.0d0 (* 10 dpi) -1.0d0 :sine 100 0.0d0 1.0d-7)
  (integration-QAWF
-  'integration-test-f457 0.0d0 (/ pi 2) 1.0d0 :cosine 1000 1.0d-7))
+  'integration-test-f457 0.0d0 (/ dpi 2) 1.0d0 :cosine 1000 1.0d-7))
diff --git a/calculus/numerical-integration.lisp b/calculus/numerical-integration.lisp
index d40cc871f7609ecac3e50391d62355de1f75f845..f11be59c1700f1c8bf299a540b731952224931c7 100644
--- a/calculus/numerical-integration.lisp
+++ b/calculus/numerical-integration.lisp
@@ -1,8 +1,8 @@
 ;; Numerical integration
 ;; Liam Healy, Wed Jul  5 2006 - 23:14
-;; Time-stamp: <2010-07-07 14:21:55EDT numerical-integration.lisp>
+;; Time-stamp: <2010-08-07 21:46:21EDT numerical-integration.lisp>
 ;;
-;; Copyright 2006, 2007, 2008, 2009 Liam M. Healy
+;; Copyright 2006, 2007, 2008, 2009, 2010 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
 ;;
 ;; This program is free software: you can redistribute it and/or modify
@@ -321,9 +321,9 @@
   (lambda (x) (exp (* alpha x))))
 
 (save-test numerical-integration
- (integration-qng 'sin 0.0d0 pi)
- (integration-QAG 'sin 0.0d0 pi :gauss15 20)
- (integration-QAG 'sin 0.0d0 pi :gauss21 40)
+ (integration-qng 'sin 0.0d0 dpi)
+ (integration-QAG 'sin 0.0d0 dpi :gauss15 20)
+ (integration-QAG 'sin 0.0d0 dpi :gauss21 40)
  ;; Tests from gsl-1.11/integration/test.c
  ;; Functions defined in gsl-1.11/integration/tests.c
  (integration-QNG (integration-test-f1 2.6d0) 0.0d0 1.0d0 0.1d0 0.0d0)
diff --git a/interpolation/spline-example.lisp b/interpolation/spline-example.lisp
index 4a8349db0e6dae1c17f935cbe8e642073369b11c..1e870684efa29fc2e2d5e0165a7bf4bb80debbb5 100644
--- a/interpolation/spline-example.lisp
+++ b/interpolation/spline-example.lisp
@@ -1,6 +1,6 @@
 ;; Example spline
 ;; Liam Healy, Sat Nov 10 2007 - 21:18
-;; Time-stamp: <2010-06-30 19:57:28EDT spline-example.lisp>
+;; Time-stamp: <2010-08-07 21:37:07EDT spline-example.lisp>
 ;;
 ;; Copyright 2007, 2008, 2009 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -43,7 +43,7 @@
    over a 0-2pi interval and interpolated with
    +periodic-cubic-spline-interpolation+"
   (let* ((xarr 
-	  (loop with step = (/ (* 2.0 pi) intervals)
+	  (loop with step = (/ (* 2.0 dpi) intervals)
 	     for i from 0 upto intervals
 	     collect (* i step)))
 	 (xmarr (grid:make-foreign-array 'double-float :initial-contents xarr))
@@ -51,9 +51,7 @@
 	  (grid:make-foreign-array 'double-float :initial-contents (mapcar 'sin xarr)))
 	 (spline
 	  (make-spline +periodic-cubic-spline-interpolation+ xmarr ymarr)))
-    (evaluate-integral spline 0d0
-		       #+clisp (coerce pi 'double-float) ;; pi=3.14..L0 on clisp
-		       #-clisp pi)))
+    (evaluate-integral spline 0d0 dpi)))
 
 (save-test interpolation
  (spline-example 0.1d0)
diff --git a/mathematical/mathematical.lisp b/mathematical/mathematical.lisp
index 4a53e2d1bdc33adcf227cf9720031aea5a3af921..a041e17bd721b4e8753e338b6497d0b00732894c 100644
--- a/mathematical/mathematical.lisp
+++ b/mathematical/mathematical.lisp
@@ -1,6 +1,6 @@
 ;; Mathematical functions
 ;; Liam Healy, Wed Mar  8 2006 - 22:09
-;; Time-stamp: <2010-07-20 16:56:44EDT mathematical.lisp>
+;; Time-stamp: <2010-08-07 21:35:54EDT mathematical.lisp>
 ;;
 ;; Copyright 2006, 2007, 2008, 2009, 2010 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -196,6 +196,12 @@ Function: double gsl_pow_9 (const double x)
     returns +1."
   :return ((pmnil cr)))
 
+;;;;****************************************************************************
+;;;; pi
+;;;;****************************************************************************
+
+(defconstant dpi (coerce pi 'double-float))
+
 ;;;;****************************************************************************
 ;;;; Examples and unit test
 ;;;;****************************************************************************
diff --git a/series-acceleration.lisp b/series-acceleration.lisp
index 5c992c36487f7ccea0299388c1d1593ab3720594..9497539cbc558cc1784474176e2430bbcac5f145 100644
--- a/series-acceleration.lisp
+++ b/series-acceleration.lisp
@@ -1,6 +1,6 @@
 ;; Series acceleration.
 ;; Liam Healy, Wed Nov 21 2007 - 18:41
-;; Time-stamp: <2010-06-30 19:57:28EDT series-acceleration.lisp>
+;; Time-stamp: <2010-08-07 21:41:14EDT series-acceleration.lisp>
 ;;
 ;; Copyright 2007, 2008, 2009 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -91,7 +91,7 @@
 (defun acceleration-example (&optional (print-explanation t))
   (let ((maxterms 20)
 	(sum 0.0d0)
-	(zeta2 (/ (expt pi 2) 6)))
+	(zeta2 (/ (expt dpi 2) 6)))
     (let ((levin (make-levin maxterms))
 	  (array (grid:make-foreign-array 'double-float :dimensions maxterms)))
       (dotimes (n maxterms)
diff --git a/solve-minimize-fit/minimization-one.lisp b/solve-minimize-fit/minimization-one.lisp
index 8b10aa38c2815abe5ffeb62de04818e291fee9cb..03812d96c416717faea072f3f321fd1bc8f2f6b3 100644
--- a/solve-minimize-fit/minimization-one.lisp
+++ b/solve-minimize-fit/minimization-one.lisp
@@ -1,6 +1,6 @@
 ;; Univariate minimization
 ;; Liam Healy Tue Jan  8 2008 - 21:02
-;; Time-stamp: <2010-07-01 11:55:38EDT minimization-one.lisp>
+;; Time-stamp: <2010-08-07 21:41:13EDT minimization-one.lisp>
 ;;
 ;; Copyright 2008, 2009 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -226,14 +226,14 @@
         (when print-steps
           (format t "~d~6t~10,6f~18t~10,6f~28t~12,9f ~44t~10,4g ~10,4g~&"
                   iter lower upper
-                  min (- min pi)
+                  min (- min dpi)
                   (- upper lower)))
 
         while  (and (< iter max-iter)
                     ;; abs and rel error swapped in example?
                     (not (min-test-interval lower upper 0.001d0 0.0d0)))
         finally
-        (return (values iter lower upper min (- min pi) (- upper lower)))))))
+        (return (values iter lower upper min (- min dpi) (- upper lower)))))))
 
 (save-test minimization-one
  (minimization-one-example +brent-fminimizer+ nil nil)
diff --git a/special-functions/elliptic-functions.lisp b/special-functions/elliptic-functions.lisp
index 4a8c143353853f303cf2162f62aacb60c9e2f34c..09b52fdce258474b9ed004c676085a1120512cb9 100644
--- a/special-functions/elliptic-functions.lisp
+++ b/special-functions/elliptic-functions.lisp
@@ -1,6 +1,6 @@
 ;; Jacobian elliptic functions
 ;; Liam Healy, Mon Mar 20 2006 - 22:21
-;; Time-stamp: <2010-04-14 13:06:10EDT elliptic-functions.lisp>
+;; Time-stamp: <2010-08-07 21:41:12EDT elliptic-functions.lisp>
 ;;
 ;; Copyright 2006, 2007, 2008, 2009 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -30,7 +30,7 @@
   "The Jacobian elliptic functions sn(u|m),
   cn(u|m), dn(u|m) computed by descending Landen transformations.")
 
-(defvar *elljac-K* (/ pi (* 2.0d0 0.9741726903999478375938128316d0)))
+(defvar *elljac-K* (/ dpi (* 2.0d0 0.9741726903999478375938128316d0)))
 (defvar *elljac-A* (/ (sqrt (1+ (sqrt 0.9d0)))))
 (defvar *elljac-B* (/ (expt 0.9d0 1/4) (sqrt (1+ (sqrt 0.9d0)))))
 (defvar *elljac-C* (expt 0.9d0 1/4))
diff --git a/special-functions/mathieu.lisp b/special-functions/mathieu.lisp
index cbc4c522f048d20cde9b421ba7360435973a148f..09a7bf731f4b5f1c1b710ec03af836f7685b0612 100644
--- a/special-functions/mathieu.lisp
+++ b/special-functions/mathieu.lisp
@@ -1,6 +1,6 @@
 ;; Mathieu functions
 ;; Liam Healy 2009-02-16 16:30:59EST mathieu.lisp
-;; Time-stamp: <2010-07-15 10:35:18EDT mathieu.lisp>
+;; Time-stamp: <2010-08-07 21:38:53EDT mathieu.lisp>
 ;;
 ;; Copyright 2009, 2010 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -219,77 +219,77 @@
 ;;; Tests from gsl-1.11/specfunc/test_mathieu.c
 (save-test mathieu
 	   (mathieu-ce 0 0.0d0 0.0d0)
-	   (mathieu-ce 0 0.0d0 (/ pi 2))
+	   (mathieu-ce 0 0.0d0 (/ dpi 2))
 	   (mathieu-ce 0 5.0d0 0.0d0)
-	   (mathieu-ce 0 5.0d0 (/ pi 2))
+	   (mathieu-ce 0 5.0d0 (/ dpi 2))
 	   (mathieu-ce 0 10.0d0 0.0d0)
-	   (mathieu-ce 0 10.0d0 (/ pi 2))
+	   (mathieu-ce 0 10.0d0 (/ dpi 2))
 	   (mathieu-ce 0 15.0d0 0.0d0)
-	   (mathieu-ce 0 15.0d0 (/ pi 2))
+	   (mathieu-ce 0 15.0d0 (/ dpi 2))
 	   (mathieu-ce 0 20.0d0 0.0d0)
-	   (mathieu-ce 0 20.0d0 (/ pi 2))
+	   (mathieu-ce 0 20.0d0 (/ dpi 2))
 	   (mathieu-ce 0 25.0d0 0.0d0)
-	   (mathieu-ce 0 25.0d0 (/ pi 2))
+	   (mathieu-ce 0 25.0d0 (/ dpi 2))
 	   (mathieu-ce 1 0.0d0 0.0d0)
 	   (mathieu-ce 1 5.0d0 0.0d0)
 	   (mathieu-ce 1 10.0d0 0.0d0)
 	   (mathieu-ce 1 15.0d0 0.0d0)
 	   (mathieu-ce 1 20.0d0 0.0d0)
 	   (mathieu-ce 1 25.0d0 0.0d0)
-	   (mathieu-se 1 0.0d0 (/ pi 2))
-	   (mathieu-se 1 5.0d0 (/ pi 2))
-	   (mathieu-se 1 10.0d0 (/ pi 2))
-	   (mathieu-se 1 15.0d0 (/ pi 2))
-	   (mathieu-se 1 20.0d0 (/ pi 2))
-	   (mathieu-se 1 25.0d0 (/ pi 2))
+	   (mathieu-se 1 0.0d0 (/ dpi 2))
+	   (mathieu-se 1 5.0d0 (/ dpi 2))
+	   (mathieu-se 1 10.0d0 (/ dpi 2))
+	   (mathieu-se 1 15.0d0 (/ dpi 2))
+	   (mathieu-se 1 20.0d0 (/ dpi 2))
+	   (mathieu-se 1 25.0d0 (/ dpi 2))
 	   (mathieu-ce 2 0.0d0 0.0d0)
-	   (mathieu-ce 2 0.0d0 (/ pi 2))
+	   (mathieu-ce 2 0.0d0 (/ dpi 2))
 	   (mathieu-ce 2 5.0d0 0.0d0)
-	   (mathieu-ce 2 5.0d0 (/ pi 2))
+	   (mathieu-ce 2 5.0d0 (/ dpi 2))
 	   (mathieu-ce 2 10.0d0 0.0d0)
-	   (mathieu-ce 2 10.0d0 (/ pi 2))
+	   (mathieu-ce 2 10.0d0 (/ dpi 2))
 	   (mathieu-ce 2 15.0d0 0.0d0)
-	   (mathieu-ce 2 15.0d0 (/ pi 2))
+	   (mathieu-ce 2 15.0d0 (/ dpi 2))
 	   (mathieu-ce 2 20.0d0 0.0d0)
-	   (mathieu-ce 2 20.0d0 (/ pi 2))
+	   (mathieu-ce 2 20.0d0 (/ dpi 2))
 	   (mathieu-ce 2 25.0d0 0.0d0)
-	   (mathieu-ce 2 25.0d0 (/ pi 2))
+	   (mathieu-ce 2 25.0d0 (/ dpi 2))
 	   (mathieu-ce 5 0.0d0 0.0d0)
 	   (mathieu-ce 5 5.0d0 0.0d0)
 	   (mathieu-ce 5 10.0d0 0.0d0)
 	   (mathieu-ce 5 15.0d0 0.0d0)
 	   (mathieu-ce 5 20.0d0 0.0d0)
 	   (mathieu-ce 5 25.0d0 0.0d0)
-	   (mathieu-se 5 0.0d0 (/ pi 2))
-	   (mathieu-se 5 5.0d0 (/ pi 2))
-	   (mathieu-se 5 10.0d0 (/ pi 2))
-	   (mathieu-se 5 15.0d0 (/ pi 2))
-	   (mathieu-se 5 20.0d0 (/ pi 2))
-	   (mathieu-se 5 25.0d0 (/ pi 2))
+	   (mathieu-se 5 0.0d0 (/ dpi 2))
+	   (mathieu-se 5 5.0d0 (/ dpi 2))
+	   (mathieu-se 5 10.0d0 (/ dpi 2))
+	   (mathieu-se 5 15.0d0 (/ dpi 2))
+	   (mathieu-se 5 20.0d0 (/ dpi 2))
+	   (mathieu-se 5 25.0d0 (/ dpi 2))
 	   (mathieu-ce 10 0.0d0 0.0d0)
-	   (mathieu-ce 10 0.0d0 (/ pi 2))
+	   (mathieu-ce 10 0.0d0 (/ dpi 2))
 	   (mathieu-ce 10 5.0d0 0.0d0)
-	   (mathieu-ce 10 5.0d0 (/ pi 2))
+	   (mathieu-ce 10 5.0d0 (/ dpi 2))
 	   (mathieu-ce 10 10.0d0 0.0d0)
-	   (mathieu-ce 10 10.0d0 (/ pi 2))
+	   (mathieu-ce 10 10.0d0 (/ dpi 2))
 	   (mathieu-ce 10 15.0d0 0.0d0)
-	   (mathieu-ce 10 15.0d0 (/ pi 2))
+	   (mathieu-ce 10 15.0d0 (/ dpi 2))
 	   (mathieu-ce 10 20.0d0 0.0d0)
-	   (mathieu-ce 10 20.0d0 (/ pi 2))
+	   (mathieu-ce 10 20.0d0 (/ dpi 2))
 	   (mathieu-ce 10 25.0d0 0.0d0)
-	   (mathieu-ce 10 25.0d0 (/ pi 2))
+	   (mathieu-ce 10 25.0d0 (/ dpi 2))
 	   (mathieu-ce 15 0.0d0 0.0d0)
 	   (mathieu-ce 15 5.0d0 0.0d0)
 	   (mathieu-ce 15 10.0d0 0.0d0)
 	   (mathieu-ce 15 15.0d0 0.0d0)
 	   (mathieu-ce 15 20.0d0 0.0d0)
 	   (mathieu-ce 15 25.0d0 0.0d0)
-	   (mathieu-se 15 0.0d0 (/ pi 2))
-	   (mathieu-se 15 5.0d0 (/ pi 2))
-	   (mathieu-se 15 10.0d0 (/ pi 2))
-	   (mathieu-se 15 15.0d0 (/ pi 2))
-	   (mathieu-se 15 20.0d0 (/ pi 2))
-	   (mathieu-se 15 25.0d0 (/ pi 2))
-	   (grid:copy-to (mathieu-ce-array 0.0d0 (/ pi 2) 6))
+	   (mathieu-se 15 0.0d0 (/ dpi 2))
+	   (mathieu-se 15 5.0d0 (/ dpi 2))
+	   (mathieu-se 15 10.0d0 (/ dpi 2))
+	   (mathieu-se 15 15.0d0 (/ dpi 2))
+	   (mathieu-se 15 20.0d0 (/ dpi 2))
+	   (mathieu-se 15 25.0d0 (/ dpi 2))
+	   (grid:copy-to (mathieu-ce-array 0.0d0 (/ dpi 2) 6))
 	   (grid:copy-to (mathieu-ce-array 20.0d0 0.0d0 16))
-	   (grid:copy-to (mathieu-se-array 20.0d0 (/ pi 2) 15 1)))
+	   (grid:copy-to (mathieu-se-array 20.0d0 (/ dpi 2) 15 1)))
diff --git a/tests/mathieu.lisp b/tests/mathieu.lisp
index ba077395e95332462282663f2a25cb36ae747413..43743fd7ced72d750ae10aa212b0f0c2d13dfb52 100644
--- a/tests/mathieu.lisp
+++ b/tests/mathieu.lisp
@@ -1,6 +1,6 @@
 ;; Regression test MATHIEU for GSLL, automatically generated
 ;;
-;; Copyright 2009 Liam M. Healy
+;; Copyright 2009, 2010 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
 ;;
 ;; This program is free software: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 0.7071067811865475d0 4.440892098500626d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-CE 0 0.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-CE 0 0.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 0.04480018165188903d0 4.440892098500626d-16)
@@ -35,7 +35,7 @@
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 1.334848674698019d0 5.927918932160465d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-CE 0 5.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-CE 0 5.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 0.007626517570935777d0 4.440892098500626d-16)
@@ -43,7 +43,7 @@
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 1.4686604707128563d0 6.522162679768934d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-CE 0 10.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-CE 0 10.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 0.0019325083152045943d0 4.440892098500626d-16)
@@ -51,7 +51,7 @@
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 1.5501081466866489d0 6.883863020442189d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-CE 0 15.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-CE 0 15.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 6.037438292241945d-4 4.440892098500626d-16)
@@ -59,7 +59,7 @@
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 1.609890857395926d0 7.149351588057966d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-CE 0 20.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-CE 0 20.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 2.1586301841465958d-4 4.440892098500626d-16)
@@ -67,7 +67,7 @@
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 1.657510298323475d0 7.360824387008136d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-CE 0 25.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-CE 0 25.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 1.0d0 4.440892098500626d-16)
@@ -95,27 +95,27 @@
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 1.0d0 4.440892098500626d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-SE 1 0.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-SE 1 0.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 1.3374338870223457d0 5.939399581144514d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-SE 1 5.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-SE 1 5.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 1.4687556641029376d0 6.522585423342775d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-SE 1 10.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-SE 1 10.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 1.5501150743575518d0 6.883893785481162d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-SE 1 15.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-SE 1 15.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 1.6098915926037722d0 7.149354853036681d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-SE 1 20.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-SE 1 20.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 1.6575103983745163d0 7.360824831324015d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-SE 1 25.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-SE 1 25.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 1.0d0 4.440892098500626d-16)
@@ -123,7 +123,7 @@
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST -1.0d0 4.440892098500626d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-CE 2 0.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-CE 2 0.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 0.7352943084006845d0 4.440892098500626d-16)
@@ -131,7 +131,7 @@
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST -0.7244881519676682d0 4.440892098500626d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-CE 2 5.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-CE 2 5.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 0.24588834929131909d0 4.440892098500626d-16)
@@ -139,7 +139,7 @@
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST -0.9267592641263209d0 4.440892098500626d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-CE 2 10.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-CE 2 10.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 0.0787928278463933d0 4.440892098500626d-16)
@@ -147,7 +147,7 @@
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST -1.019966226030262d0 4.529559953915294d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-CE 2 15.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-CE 2 15.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 0.028648943147074366d0 4.440892098500626d-16)
@@ -155,7 +155,7 @@
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST -1.0752932287796875d0 4.77526120325894d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-CE 2 20.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-CE 2 20.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 0.011512866330887451d0 4.440892098500626d-16)
@@ -163,7 +163,7 @@
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST -1.116278953295253d0 4.957274383411439d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-CE 2 25.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-CE 2 25.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 1.0d0 4.440892098500626d-16)
@@ -191,27 +191,27 @@
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 1.0d0 4.440892098500626d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-SE 5 0.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-SE 5 0.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 0.906077930202355d0 4.440892098500626d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-SE 5 5.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-SE 5 5.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 0.8460384335355104d0 4.440892098500626d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-SE 5 10.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-SE 5 10.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 0.8379493400124841d0 4.440892098500626d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-SE 5 15.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-SE 5 15.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 0.8635431218533666d0 4.440892098500626d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-SE 5 20.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-SE 5 20.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 0.8992683245108409d0 4.440892098500626d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-SE 5 25.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-SE 5 25.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 1.0d0 4.440892098500626d-16)
@@ -219,7 +219,7 @@
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST -1.0d0 4.440892098500626d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-CE 10 0.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-CE 10 0.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 1.0259950270894385d0 4.556333208902423d-16)
@@ -227,7 +227,7 @@
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST -0.975347487235964d0 4.440892098500626d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-CE 10 5.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-CE 10 5.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 1.0538159921009345d0 4.679883112594638d-16)
@@ -235,7 +235,7 @@
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST -0.9516453181789555d0 4.440892098500626d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-CE 10 10.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-CE 10 10.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 1.0841063118392213d0 4.814399154181454d-16)
@@ -243,7 +243,7 @@
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST -0.9285480638845388d0 4.440892098500626d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-CE 10 15.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-CE 10 15.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 1.1177886312593968d0 4.963978700353685d-16)
@@ -251,7 +251,7 @@
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST -0.9057107845940974d0 4.440892098500626d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-CE 10 20.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-CE 10 20.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 1.1562399186322392d0 5.134736718624918d-16)
@@ -259,7 +259,7 @@
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST -0.8826919105636902d0 4.440892098500626d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-CE 10 25.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-CE 10 25.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST 1.0d0 4.440892098500626d-16)
@@ -287,27 +287,27 @@
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST -1.0d0 4.440892098500626d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-SE 15 0.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-SE 15 0.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST -0.9889607027406359d0 4.440892098500626d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-SE 15 5.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-SE 15 5.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST -0.978142347183216d0 4.440892098500626d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-SE 15 10.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-SE 15 10.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST -0.9675137031854539d0 4.440892098500626d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-SE 15 15.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-SE 15 15.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST -0.9570452540612818d0 4.440892098500626d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-SE 15 20.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-SE 15 20.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST -0.9467086958780897d0 4.440892098500626d-16)
-     (MULTIPLE-VALUE-LIST (MATHIEU-SE 15 25.0d0 (/ PI 2)))))
+     (MULTIPLE-VALUE-LIST (MATHIEU-SE 15 25.0d0 (/ dPI 2)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST
@@ -315,7 +315,7 @@
 	-1.8369701987210297d-16 1.0d0
 	3.061616997868383d-16))
      (MULTIPLE-VALUE-LIST
-      (GRID:COPY-TO (MATHIEU-CE-ARRAY 0.0d0 (/ PI 2) 6)))))
+      (GRID:COPY-TO (MATHIEU-CE-ARRAY 0.0d0 (/ dPI 2) 6)))))
   (let ((lisp-unit:*epsilon* 1.0d-6))
     (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
      (LIST
@@ -341,5 +341,5 @@
 	0.9433025704899831d0 8.979725089944524d-16
 	-0.9570452540612865d0))
      (MULTIPLE-VALUE-LIST
-      (GRID:COPY-TO (MATHIEU-SE-ARRAY 20.0d0 (/ PI 2) 15 1))))))
+      (GRID:COPY-TO (MATHIEU-SE-ARRAY 20.0d0 (/ dPI 2) 15 1))))))
 
diff --git a/tests/numerical-integration.lisp b/tests/numerical-integration.lisp
index 66790d8efe241d1777d999adc3ac868ee550560e..7f1e0a815160bd6a158726ac2ef86860bc076c3f 100644
--- a/tests/numerical-integration.lisp
+++ b/tests/numerical-integration.lisp
@@ -1,6 +1,6 @@
 ;; Regression test NUMERICAL-INTEGRATION for GSLL, automatically generated
 ;;
-;; Copyright 2009 Liam M. Healy
+;; Copyright 2009, 2010 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
 ;;
 ;; This program is free software: you can redistribute it and/or modify
@@ -54,27 +54,27 @@
    (LIST -0.12813684839916742d0 6.875028324415666d-12)
    (MULTIPLE-VALUE-LIST
     (INTEGRATION-QAWO 'INTEGRATION-TEST-F456 0.0d0
-		      (* 10 PI) 1.0d0 :SINE 100 0.0d0
+		      (* 10 dPI) 1.0d0 :SINE 100 0.0d0
 		      1.d-7)))
   (LISP-UNIT:ASSERT-NUMERICAL-EQUAL
    (LIST 0.12813684839916742d0 6.875028324415666d-12)
    (MULTIPLE-VALUE-LIST
     (INTEGRATION-QAWO 'INTEGRATION-TEST-F456 0.0d0
-		      (* 10 PI) -1.0d0 :SINE 100 0.0d0
+		      (* 10 dPI) -1.0d0 :SINE 100 0.0d0
 		      1.d-7)))
   (LISP-UNIT:ASSERT-NUMERICAL-EQUAL
    (LIST 0.9999999999279803d0 1.556289974669056d-8)
    (MULTIPLE-VALUE-LIST
     (INTEGRATION-QAWF 'INTEGRATION-TEST-F457 0.0d0
-		      (/ PI 2) 1.0d0 :COSINE 1000 1.d-7)))
+		      (/ dPI 2) 1.0d0 :COSINE 1000 1.d-7)))
   (LISP-UNIT:ASSERT-NUMERICAL-EQUAL
    (LIST 2.0d0 2.220446049250313d-14 21)
-   (MULTIPLE-VALUE-LIST (INTEGRATION-QNG 'SIN 0.0d0 PI)))
+   (MULTIPLE-VALUE-LIST (INTEGRATION-QNG 'SIN 0.0d0 dPI)))
   (LISP-UNIT:ASSERT-ERROR 'TYPE-ERROR
-			  (INTEGRATION-QAG 'SIN 0.0d0 PI
+			  (INTEGRATION-QAG 'SIN 0.0d0 dPI
 					   :GAUSS15 20))
   (LISP-UNIT:ASSERT-ERROR 'TYPE-ERROR
-			  (INTEGRATION-QAG 'SIN 0.0d0 PI
+			  (INTEGRATION-QAG 'SIN 0.0d0 dPI
 					   :GAUSS21 40))
   (LISP-UNIT:ASSERT-NUMERICAL-EQUAL
    (LIST 0.07716049379303085d0 9.424302194248481d-8 21)