diff --git a/basis-splines.lisp b/basis-splines.lisp
index e9215f22dd8df38930f718bfbf677c7a64e06e8a..aced31dfcbc4c8e8617e7c1d44f09668f31f7344 100644
--- a/basis-splines.lisp
+++ b/basis-splines.lisp
@@ -1,6 +1,6 @@
 ;; Basis splines.
 ;; Liam Healy 2008-02-18 14:43:20EST basis-splines.lisp
-;; Time-stamp: <2009-01-28 20:55:57EST basis-splines.lisp>
+;; Time-stamp: <2009-02-16 10:16:44EST basis-splines.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -95,7 +95,7 @@
 	 (nbreak (+ ncoeffs 2 (- order)))
 	 (bw (make-basis-spline order nbreak))
 	 (mw (make-fit-workspace ndata ncoeffs))
-	 (rng (make-random-number-generator *mt19937* 0))
+	 (rng (make-random-number-generator +mt19937+ 0))
 	 (B (make-marray 'double-float :dimensions ncoeffs))
 	 (c (make-marray 'double-float :dimensions ncoeffs))
 	 (cov (make-marray 'double-float :dimensions (list ncoeffs ncoeffs)))
diff --git a/calculus/monte-carlo.lisp b/calculus/monte-carlo.lisp
index 5331b5d616290b0195ef8cce29cb8a82f82a6c7d..41f46461e23100af065f1d748c166c4102b44a96 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: <2009-02-15 22:07:40EST monte-carlo.lisp>
+;; Time-stamp: <2009-02-16 10:16:43EST monte-carlo.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -247,21 +247,21 @@
   (let ((ws (make-monte-carlo-plain 3))
 	(lower #m(0.0d0 0.0d0 0.0d0))
 	(upper (make-marray 'double-float :initial-contents (list pi pi pi)))
-	(rng (make-random-number-generator *mt19937* 0)))
+	(rng (make-random-number-generator +mt19937+ 0)))
     (monte-carlo-integrate-plain 'mcrw lower upper nsamples rng ws)))
 
 (defun random-walk-miser-example (&optional (nsamples 500000))
   (let ((ws (make-monte-carlo-miser 3))
 	(lower #m(0.0d0 0.0d0 0.0d0))
 	(upper (make-marray 'double-float :initial-contents (list pi pi pi)))
-	(rng (make-random-number-generator *mt19937* 0)))
+	(rng (make-random-number-generator +mt19937+ 0)))
     (monte-carlo-integrate-miser 'mcrw lower upper nsamples rng ws)))
 
 (defun random-walk-vegas-example (&optional (nsamples 500000))
   (let ((ws (make-monte-carlo-vegas 3))
 	(lower #m(0.0d0 0.0d0 0.0d0))
 	(upper (make-marray 'double-float :initial-contents (list pi pi pi)))
-	(rng (make-random-number-generator *mt19937* 0)))
+	(rng (make-random-number-generator +mt19937+ 0)))
     (monte-carlo-integrate-vegas 'mcrw lower upper nsamples rng ws)))
 
 (save-test monte-carlo
diff --git a/interpolation/spline-example.lisp b/interpolation/spline-example.lisp
index c047e1f22462ab8f653f320a332342b5199113fe..adc80b2f5d3f123dcea9a53f1e9f1563fa8924e8 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: <2009-01-28 19:05:32EST spline-example.lisp>
+;; Time-stamp: <2009-02-16 09:46:57EST spline-example.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -20,7 +20,7 @@
 	   :initial-contents
 	   (loop for i from 0.0d0 below 10.0d0
 	      collect (+ i (cos (expt i 2))))))
-	 (spline (make-spline *cubic-spline-interpolation* xarr yarr)))
+	 (spline (make-spline +cubic-spline-interpolation+ xarr yarr)))
     (loop for xi from (maref xarr 0) below (maref xarr 9) by step
        collect (list xi (evaluate spline xi :acceleration acc)))))
 
diff --git a/interpolation/types.lisp b/interpolation/types.lisp
index 67448f23938dcca652eaf50be6b4251f0f453fbf..519d65dfcfead0da1af8501c178f7c6122b0eef0 100644
--- a/interpolation/types.lisp
+++ b/interpolation/types.lisp
@@ -1,16 +1,16 @@
 ;; Interpolation types
 ;; Liam Healy, Sun Nov  4 2007 - 17:41
-;; Time-stamp: <2009-01-28 21:02:31EST types.lisp>
+;; Time-stamp: <2009-02-16 09:46:04EST types.lisp>
 ;; $Id$
 
 (in-package :gsl)
 
-(defmpar *linear-interpolation* "gsl_interp_linear"
+(defmpar +linear-interpolation+ "gsl_interp_linear"
   ;; FDL
   "Linear interpolation.  This interpolation method does not require any
    additional memory.")
 
-(defmpar *polynomial-interpolation* "gsl_interp_polynomial"
+(defmpar +polynomial-interpolation+ "gsl_interp_polynomial"
   ;; FDL
   "Polynomial interpolation.  This method should only be used for
    interpolating small numbers of points because polynomial interpolation
@@ -18,14 +18,14 @@
    number of terms in the interpolating polynomial is equal to the number
    of points.")
 
-(defmpar *cubic-spline-interpolation* "gsl_interp_cspline"
+(defmpar +cubic-spline-interpolation+ "gsl_interp_cspline"
   ;; FDL
   "Cubic spline with natural boundary conditions.  The resulting curve is
    piecewise cubic on each interval, with matching first and second
    derivatives at the supplied data-points.  The second derivative is
    chosen to be zero at the first point and last point.")
 
-(defmpar *periodic-cubic-spline-interpolation* "gsl_interp_cspline_periodic"
+(defmpar +periodic-cubic-spline-interpolation+ "gsl_interp_cspline_periodic"
   ;; FDL
   "Cubic spline with periodic boundary conditions.  The resulting curve
    is piecewise cubic on each interval, with matching first and second
@@ -35,12 +35,12 @@
    resulting periodic interpolation will have a discontinuity at the
    boundary.")
 
-(defmpar *akima-interpolation* "gsl_interp_akima"
+(defmpar +akima-interpolation+ "gsl_interp_akima"
   ;; FDL
   "Non-rounded Akima spline with natural boundary conditions.  This method
    uses the non-rounded corner algorithm of Wodicka.")
 
-(defmpar *periodic-akima-interpolation* "gsl_interp_akima_periodic"
+(defmpar +periodic-akima-interpolation+ "gsl_interp_akima_periodic"
   ;; FDL
   "Non-rounded Akima spline with periodic boundary conditions.  This method
    uses the non-rounded corner algorithm of Wodicka.")
diff --git a/ordinary-differential-equations/ode-example.lisp b/ordinary-differential-equations/ode-example.lisp
index 5aa1819072aa4cc75555a89d69e3a4d3c79921ee..2710ac8ee2226a9a3ff10fb6819aec4b402a5dca 100644
--- a/ordinary-differential-equations/ode-example.lisp
+++ b/ordinary-differential-equations/ode-example.lisp
@@ -1,6 +1,6 @@
 ;; Example ODE                               
 ;; Liam Healy Sat Sep 29 2007 - 17:49
-;; Time-stamp: <2009-02-15 09:09:55EST ode-example.lisp>
+;; Time-stamp: <2009-02-16 10:18:29EST ode-example.lisp>
 ;; $Id$
 
 ;;; van der Pol as given in Section 25.5 of the GSL manual.  To
@@ -29,7 +29,7 @@
 (make-callbacks ode-stepper vanderpol vanderpol-jacobian 2)
 
 (defun integrate-vanderpol
-    (max-time &optional (step-size 1.0d-6) (stepper *step-rk8pd*) (print-steps t))
+    (max-time &optional (step-size 1.0d-6) (stepper +step-rk8pd+) (print-steps t))
   "Integrate the van der Pol oscillator as given in Section 25.5 of the
    GSL manual.  To reproduce that example, (integrate-vanderpol 100.0d0)."
   (let ((mu 10.0d0) (initial-time 0.0d0) (iter 0))
@@ -48,14 +48,14 @@
 
 (save-test
  ode
- (integrate-vanderpol 1.0d0 1.d-4 *step-rk2* nil)
- (integrate-vanderpol 1.0d0 1.d-4 *step-rk4* nil)
- (integrate-vanderpol 1.0d0 1.d-4 *step-rkf45* nil)
- (integrate-vanderpol 1.0d0 1.d-4 *step-rkck* nil)
- (integrate-vanderpol 1.0d0 1.d-4 *step-rk8pd* nil)
- (integrate-vanderpol 1.0d0 1.d-4 *step-rk2imp* nil)
- (integrate-vanderpol 1.0d0 1.d-4 *step-rk4imp* nil)
- (integrate-vanderpol 1.0d0 1.d-4 *step-bsimp* nil)
+ (integrate-vanderpol 1.0d0 1.d-4 +step-rk2+ nil)
+ (integrate-vanderpol 1.0d0 1.d-4 +step-rk4+ nil)
+ (integrate-vanderpol 1.0d0 1.d-4 +step-rkf45+ nil)
+ (integrate-vanderpol 1.0d0 1.d-4 +step-rkck+ nil)
+ (integrate-vanderpol 1.0d0 1.d-4 +step-rk8pd+ nil)
+ (integrate-vanderpol 1.0d0 1.d-4 +step-rk2imp+ nil)
+ (integrate-vanderpol 1.0d0 1.d-4 +step-rk4imp+ nil)
+ (integrate-vanderpol 1.0d0 1.d-4 +step-bsimp+ nil)
  (let ((*max-iter* 12000))
-   (integrate-vanderpol 1.0d0 1.d-4 *step-gear1* nil))
- (integrate-vanderpol 1.0d0 1.d-4 *step-gear2* nil))
+   (integrate-vanderpol 1.0d0 1.d-4 +step-gear1+ nil))
+ (integrate-vanderpol 1.0d0 1.d-4 +step-gear2+ nil))
diff --git a/ordinary-differential-equations/stepping.lisp b/ordinary-differential-equations/stepping.lisp
index 0ce8ebe3a0f89e2dc4984869b0e69980cf635106..5c7679e2a3f78e8a9b91634ce18a226654482615 100644
--- a/ordinary-differential-equations/stepping.lisp
+++ b/ordinary-differential-equations/stepping.lisp
@@ -1,6 +1,6 @@
 ;; Stepping functions for ODE systems.
 ;; Liam Healy, Mon Sep 24 2007 - 21:33
-;; Time-stamp: <2009-02-15 09:19:47EST stepping.lisp>
+;; Time-stamp: <2009-02-16 09:57:47EST stepping.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -121,44 +121,44 @@ values):
    User-supplied functions defined in the system dydt
    should signal an error or return the correct value.")
 
-(defmpar *step-rk2* "gsl_odeiv_step_rk2"
+(defmpar +step-rk2+ "gsl_odeiv_step_rk2"
   ;; FDL
   "Embedded Runge-Kutta (2, 3) method.")
 
-(defmpar *step-rk4* "gsl_odeiv_step_rk4"
+(defmpar +step-rk4+ "gsl_odeiv_step_rk4"
   ;; FDL
   "4th order (classical) Runge-Kutta.")
 
-(defmpar *step-rkf45* "gsl_odeiv_step_rkf45"
+(defmpar +step-rkf45+ "gsl_odeiv_step_rkf45"
   ;; FDL
   "Embedded Runge-Kutta-Fehlberg (4, 5) method.  This method is a good
    general-purpose integrator.")
 
-(defmpar *step-rkck* "gsl_odeiv_step_rkck"
+(defmpar +step-rkck+ "gsl_odeiv_step_rkck"
   ;; FDL
   "Embedded Runge-Kutta Cash-Karp (4, 5) method.")
 
-(defmpar *step-rk8pd* "gsl_odeiv_step_rk8pd"
+(defmpar +step-rk8pd+ "gsl_odeiv_step_rk8pd"
   ;; FDL
   "Embedded Runge-Kutta Prince-Dormand (8,9) method.")
 
-(defmpar *step-rk2imp* "gsl_odeiv_step_rk2imp"
+(defmpar +step-rk2imp+ "gsl_odeiv_step_rk2imp"
   ;; FDL
   "Implicit 2nd order Runge-Kutta at Gaussian points.")
 
-(defmpar *step-rk4imp* "gsl_odeiv_step_rk4imp"
+(defmpar +step-rk4imp+ "gsl_odeiv_step_rk4imp"
   ;; FDL
   "Implicit 4th order Runge-Kutta at Gaussian points.")
 
-(defmpar *step-bsimp* "gsl_odeiv_step_bsimp"
+(defmpar +step-bsimp+ "gsl_odeiv_step_bsimp"
   ;; FDL
   "Implicit Bulirsch-Stoer method of Bader and Deuflhard.  This algorithm
    requires the Jacobian.")
 
-(defmpar *step-gear1* "gsl_odeiv_step_gear1"
+(defmpar +step-gear1+ "gsl_odeiv_step_gear1"
   ;; FDL
   "M=1 implicit Gear method.")
 
-(defmpar *step-gear2* "gsl_odeiv_step_gear2"
+(defmpar +step-gear2+ "gsl_odeiv_step_gear2"
   ;; FDL
   "M=2 implicit Gear method.")
diff --git a/random/bernoulli.lisp b/random/bernoulli.lisp
index eba7a2804b2018dcdf18654afb51c2d79aaa4877..2aeaad1a9bc2b92364c93987632fcc9a156482bb 100644
--- a/random/bernoulli.lisp
+++ b/random/bernoulli.lisp
@@ -1,6 +1,6 @@
 ;; Bernoulli distribution
 ;; Liam Healy, Sat Nov 25 2006 - 16:59
-;; Time-stamp: <2008-12-26 18:05:04EST bernoulli.lisp>
+;; Time-stamp: <2009-02-16 10:08:17EST bernoulli.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -26,7 +26,7 @@
 
 ;;; Examples and unit test
 (save-test bernoulli
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
      (loop for i from 0 to 10
 	   collect
 	   (bernoulli rng 0.5d0)))
diff --git a/random/beta.lisp b/random/beta.lisp
index feb738cea611e5d8495519ca11f98b61a1bdc4e5..a58e5356c6a24ea4c925e5a1b229148fce12afd3 100644
--- a/random/beta.lisp
+++ b/random/beta.lisp
@@ -1,6 +1,6 @@
 ;; Beta distribution
 ;; Liam Healy, Sat Sep 30 2006
-;; Time-stamp: <2008-12-26 19:29:42EST beta.lisp>
+;; Time-stamp: <2009-02-16 10:10:32EST beta.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -53,7 +53,7 @@
 
 ;;; Examples and unit test
 (save-test beta
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
       (loop for i from 0 to 10
 	    collect
 	    (beta-rd rng 1.0d0 2.0d0)))
diff --git a/random/binomial.lisp b/random/binomial.lisp
index ab44c25faa99e8e089f58ee2758526a23aac3cfc..0fdccad7a7c87f718183c2cabb2ef890041d24fc 100644
--- a/random/binomial.lisp
+++ b/random/binomial.lisp
@@ -1,6 +1,6 @@
 ;; Binomial distribution
 ;; Liam Healy, Sat Nov 25 2006 - 16:00
-;; Time-stamp: <2008-12-26 19:34:39EST binomial.lisp>
+;; Time-stamp: <2009-02-16 10:05:55EST binomial.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -43,7 +43,7 @@
 
 ;;; Examples and unit test
 (save-test binomial
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
      (loop for i from 0 to 10
 	   collect
 	   (binomial rng 0.4d0 12)))
diff --git a/random/cauchy.lisp b/random/cauchy.lisp
index 5500c282d3d887170ad3d35ee41e6784ad9db980..8d82c56f3ed24d94a7af9ee13c1d0402ee087536 100644
--- a/random/cauchy.lisp
+++ b/random/cauchy.lisp
@@ -1,6 +1,6 @@
 ;; Cauchy distribution
 ;; Liam Healy, Sat Sep 30 2006
-;; Time-stamp: <2008-12-26 19:40:10EST cauchy.lisp>
+;; Time-stamp: <2009-02-16 10:08:14EST cauchy.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -58,7 +58,7 @@
 
 ;;; Examples and unit test
 (save-test cauchy
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
       (loop for i from 0 to 10
 	    collect
 	    (cauchy rng 10.0d0)))
diff --git a/random/chi-squared.lisp b/random/chi-squared.lisp
index cb0a9af3182e5d0b07acee324a288de837cbb509..bcfacb68119cecf1ed69a41d19d09c659f57a782 100644
--- a/random/chi-squared.lisp
+++ b/random/chi-squared.lisp
@@ -1,6 +1,6 @@
 ;; Chi-squared distribution
 ;; Liam Healy, Sat Oct  7 2006 - 16:13
-;; Time-stamp: <2008-12-26 19:47:17EST chi-squared.lisp>
+;; Time-stamp: <2009-02-16 10:10:33EST chi-squared.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -56,7 +56,7 @@
 
 ;;; Examples and unit test
 (save-test chi-squared
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
       (loop for i from 0 to 10
 	    collect
 	    (chi-squared rng 10.0d0)))
diff --git a/random/dirichlet.lisp b/random/dirichlet.lisp
index 1343902736eae3316f027a6a9530c8a478a35ded..d25b512ea734681f14e1f4c61e1e10d8e087893a 100644
--- a/random/dirichlet.lisp
+++ b/random/dirichlet.lisp
@@ -1,6 +1,6 @@
 ;; Dirichlet distribution
 ;; Liam Healy, Sun Oct 29 2006
-;; Time-stamp: <2008-12-29 22:22:57EST dirichlet.lisp>
+;; Time-stamp: <2009-02-16 10:10:31EST dirichlet.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -63,7 +63,7 @@
 
 ;;; Examples and unit test
 (save-test dirichlet
- (let ((rng (make-random-number-generator *mt19937* 0))
+ (let ((rng (make-random-number-generator +mt19937+ 0))
        (alpha #m(1.0d0 2.0d0 3.0d0 4.0d0))
        (theta (make-marray 'double-float :dimensions 4)))
    (dirichlet rng alpha theta)
diff --git a/random/discrete.lisp b/random/discrete.lisp
index 67453546f279776751547c7a91ea387b29f24370..e65d0ff884e3aa6086e0b6e6c2cddf8730aa60e3 100644
--- a/random/discrete.lisp
+++ b/random/discrete.lisp
@@ -1,6 +1,6 @@
 ;; Discrete random variables
 ;; Liam Healy, Sat Nov 11 2006 - 21:51
-;; Time-stamp: <2009-01-25 11:17:05EST discrete.lisp>
+;; Time-stamp: <2009-02-16 10:08:14EST discrete.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -43,7 +43,7 @@
 (save-test discrete
  (let* ((probabilities #m(0.25d0 0.5d0 0.25d0))
 	(table (make-discrete-random probabilities))
-	(rng (make-random-number-generator *mt19937* 0)))
+	(rng (make-random-number-generator +mt19937+ 0)))
    (loop for i from 0 to 10
       collect
       (discrete rng table)))
diff --git a/random/exponential-power.lisp b/random/exponential-power.lisp
index 87e65c2ca8544f4b29c9d976e691a7228346e5ca..7f93fcb58b02326ff781af4ee1a2ab35298e2b9e 100644
--- a/random/exponential-power.lisp
+++ b/random/exponential-power.lisp
@@ -1,6 +1,6 @@
 ;; Exponential power distribution
 ;; Liam Healy, Sat Sep 30 2006
-;; Time-stamp: <2008-12-26 19:36:20EST exponential-power.lisp>
+;; Time-stamp: <2009-02-16 10:08:16EST exponential-power.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -46,7 +46,7 @@
 
 ;;; Examples and unit test
 (save-test exponential-power
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
       (loop for i from 0 to 10
 	    collect
 	    (exponential-power rng 1.0d0 2.0d0)))
diff --git a/random/exponential.lisp b/random/exponential.lisp
index d57318ac54490d790a462e5e8ebf8931558b7000..5e8451dd86f5b158c45e16a8ff4065fe7acb249a 100644
--- a/random/exponential.lisp
+++ b/random/exponential.lisp
@@ -1,6 +1,6 @@
 ;; Exponential distribution
 ;; Liam Healy, Sat Sep  2 2006 - 19:04
-;; Time-stamp: <2008-12-26 19:45:35EST exponential.lisp>
+;; Time-stamp: <2009-02-16 10:08:11EST exponential.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -56,7 +56,7 @@
 
 ;;; Examples and unit test
 (save-test exponential
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
       (loop for i from 0 to 10
 	    collect
 	    (exponential rng 10.0d0)))
diff --git a/random/fdist.lisp b/random/fdist.lisp
index bde8fb13e3fab4bf9b583020d97e0bc4daab5380..38bbc88b830bf3171eed672b683954bac2b68345 100644
--- a/random/fdist.lisp
+++ b/random/fdist.lisp
@@ -1,6 +1,6 @@
 ;; Fdist distribution
 ;; Liam Healy, Sat Sep 30 2006
-;; Time-stamp: <2008-12-26 19:39:09EST fdist.lisp>
+;; Time-stamp: <2009-02-16 10:08:13EST fdist.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -64,7 +64,7 @@
 
 ;;; Examples and unit test
 (save-test fdist
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
       (loop for i from 0 to 10
 	    collect
 	    (fdist rng 1.0d0 2.0d0)))
diff --git a/random/flat.lisp b/random/flat.lisp
index 7b224900e70a461cc59535fc2c72916191c7afec..37c3d9acfee4fb8555f81557dc0449623bfb35d7 100644
--- a/random/flat.lisp
+++ b/random/flat.lisp
@@ -1,6 +1,6 @@
 ;; Flat distribution
 ;; Liam Healy, Oct  7 2006
-;; Time-stamp: <2008-12-26 19:36:22EST flat.lisp>
+;; Time-stamp: <2009-02-16 10:08:17EST flat.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -55,7 +55,7 @@
 
 ;;; Examples and unit test
 (save-test flat
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
       (loop for i from 0 to 10
 	    collect
 	    (flat rng 1.0d0 2.0d0)))
diff --git a/random/gamma.lisp b/random/gamma.lisp
index ba237e844b8284778e99208d4b63889e8cdc33e4..ed76b49a302fe71617f26e3c90d0ee35a4c2d1d5 100644
--- a/random/gamma.lisp
+++ b/random/gamma.lisp
@@ -1,6 +1,6 @@
 ;; Gamma distribution
 ;; Liam Healy, Sat Sep 30 2006
-;; Time-stamp: <2008-12-26 19:45:35EST gamma.lisp>
+;; Time-stamp: <2009-02-16 10:08:11EST gamma.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -66,11 +66,11 @@
 
 ;;; Examples and unit test
 (save-test gamma-randist
- (let ((rng (make-random-number-generator *mt19937* 0)))
+ (let ((rng (make-random-number-generator +mt19937+ 0)))
    (loop for i from 0 to 10
 	 collect
 	 (gamma-rd rng 1.0d0 2.0d0)))
- (let ((rng (make-random-number-generator *mt19937* 0)))
+ (let ((rng (make-random-number-generator +mt19937+ 0)))
    (loop for i from 0 to 10
 	 collect
 	 (gamma-mt rng 1.0d0 2.0d0)))
diff --git a/random/gaussian-bivariate.lisp b/random/gaussian-bivariate.lisp
index c8866800daf151aacb3db35455c391c46ae12761..1ecf094605a3731598f03530f4dfde73d24e1e3e 100644
--- a/random/gaussian-bivariate.lisp
+++ b/random/gaussian-bivariate.lisp
@@ -1,6 +1,6 @@
 ;; Gaussian bivariate distribution
 ;; Liam Healy, Sat Sep  2 2006 - 16:32
-;; Time-stamp: <2008-12-26 19:47:18EST gaussian-bivariate.lisp>
+;; Time-stamp: <2009-02-16 10:10:33EST gaussian-bivariate.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -36,7 +36,7 @@
 
 ;;; Examples and unit test
 (save-test gaussian-bivariate
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
       (loop for i from 0 to 10
 	    collect
 	    (bivariate-gaussian rng 1.0d0 0.75d0 0.25d0)))
diff --git a/random/gaussian-tail.lisp b/random/gaussian-tail.lisp
index 48845900675d6dfc778c92499c97e8cccc685ee6..596852b8404306213fcb121977bd8bebc0625eb9 100644
--- a/random/gaussian-tail.lisp
+++ b/random/gaussian-tail.lisp
@@ -1,6 +1,6 @@
 ;; Gaussian tail distribution
 ;; Liam Healy, Mon Aug 21 2006 - 21:52
-;; Time-stamp: <2008-12-26 19:41:56EST gaussian-tail.lisp>
+;; Time-stamp: <2009-02-16 10:08:12EST gaussian-tail.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -48,12 +48,12 @@
 ;;; Examples and unit test
 (save-test
  gaussian-tail
- (let ((rng (make-random-number-generator *mt19937* 0)))
+ (let ((rng (make-random-number-generator +mt19937+ 0)))
    (loop for i from 0 to 10
 	 collect
 	 (gaussian-tail rng 50.0d0 10.0d0)))
  (gaussian-tail-pdf 52.0d0 50.0d0 10.0d0)
- (let ((rng (make-random-number-generator *mt19937* 0)))
+ (let ((rng (make-random-number-generator +mt19937+ 0)))
      (loop for i from 0 to 10
 	   collect
 	   (ugaussian-tail rng 5.0d0)))
diff --git a/random/gaussian.lisp b/random/gaussian.lisp
index bef7c27599feb62c67c30022349c46f51fb04d5a..314f78f84470056b63a1d05c2b3258d891fa11c4 100644
--- a/random/gaussian.lisp
+++ b/random/gaussian.lisp
@@ -1,6 +1,6 @@
 ;; Gaussian distribution
 ;; Liam Healy, Sun Jul 16 2006 - 22:09
-;; Time-stamp: <2008-12-26 19:39:56EST gaussian.lisp>
+;; Time-stamp: <2009-02-16 10:08:13EST gaussian.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -131,12 +131,12 @@
 ;;; Examples and unit test
 (save-test
  gaussian
- (let ((rng (make-random-number-generator *mt19937* 0)))
+ (let ((rng (make-random-number-generator +mt19937+ 0)))
    (loop for i from 0 to 10
 	 collect
 	 (gaussian rng 10.0d0)))
  (gaussian-pdf 0.0d0 10.0d0)
- (let ((rng (make-random-number-generator *mt19937* 0)))
+ (let ((rng (make-random-number-generator +mt19937+ 0)))
      (loop for i from 0 to 10
 	   collect
 	   (gaussian-ziggurat rng 10.0d0)))
diff --git a/random/generators.lisp b/random/generators.lisp
index 6eb6eea1b49affc6d7c62127b7b9cee48a993dae..f810f10c201cb50593221e79d872d72c8547a806 100644
--- a/random/generators.lisp
+++ b/random/generators.lisp
@@ -1,6 +1,6 @@
 ;; Generators of random numbers.
 ;; Liam Healy, Sat Jul 15 2006 - 14:43
-;; Time-stamp: <2009-01-25 09:57:17EST generators.lisp>
+;; Time-stamp: <2009-02-16 10:10:32EST generators.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -33,7 +33,7 @@
 ;;;; Seed
 ;;;;****************************************************************************
 
-(defmpar *default-seed*
+(defmpar +default-seed+
     "gsl_rng_default_seed"
   "The default seed for random number generators."
   :ulong nil)
@@ -174,7 +174,7 @@
 ;;;;****************************************************************************
 
 (save-test random-number-generators
- (let ((rng (make-random-number-generator *mt19937* 0)))
+ (let ((rng (make-random-number-generator +mt19937+ 0)))
    (loop for i from 0 to 10
 	 collect
 	 (uniform-fixnum rng 1000)))
diff --git a/random/geometric.lisp b/random/geometric.lisp
index 1c08f482351d41a179a0970b6cc3946737f6b87f..0cf3e9f380326c38fdaa4180d627ae5004b9d120 100644
--- a/random/geometric.lisp
+++ b/random/geometric.lisp
@@ -1,6 +1,6 @@
 ;; Geometric distribution
 ;; Liam Healy, Sat Nov 25 2006 - 16:00
-;; Time-stamp: <2008-12-26 19:37:47EST geometric.lisp>
+;; Time-stamp: <2009-02-16 10:08:14EST geometric.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -44,7 +44,7 @@
 
 ;;; Examples and unit test
 (save-test geometric
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
      (loop for i from 0 to 10
 	   collect
 	   (geometric rng 0.4d0)))
diff --git a/random/gumbel1.lisp b/random/gumbel1.lisp
index 77db85d68652169dc39201e8c00b6feee5bbf5ec..54ca833888825c0dfbd6426c5d92cb2ddf696f96 100644
--- a/random/gumbel1.lisp
+++ b/random/gumbel1.lisp
@@ -1,6 +1,6 @@
 ;; The Gumbel type 1 random number distribution
 ;; Liam Healy, Sun Oct 29 2006
-;; Time-stamp: <2008-12-26 19:50:48EST gumbel1.lisp>
+;; Time-stamp: <2009-02-16 10:10:30EST gumbel1.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -60,7 +60,7 @@
 
 ;;; Examples and unit test
 (save-test gumbel1
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
       (loop for i from 0 to 10
 	    collect (gumbel1 rng 1.0d0 2.0d0)))
   (gumbel1-pdf 0.1d0 1.0d0 2.0d0)
diff --git a/random/gumbel2.lisp b/random/gumbel2.lisp
index ba2e0bc3775d3d56bf63a807542e16d5bdfef4a6..3b10191eb60f2dfe828e04702220261318230ce1 100644
--- a/random/gumbel2.lisp
+++ b/random/gumbel2.lisp
@@ -1,6 +1,6 @@
 ;; The Gumbel type 2 random number distribution
 ;; Liam Healy, Sun Oct 29 2006
-;; Time-stamp: <2008-12-26 19:43:32EST gumbel2.lisp>
+;; Time-stamp: <2009-02-16 10:08:12EST gumbel2.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -58,7 +58,7 @@
 
 ;;; Examples and unit test
 (save-test gumbel2
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
       (loop for i from 0 to 10
 	    collect
 	    (gumbel2 rng 1.0d0 2.0d0)))
diff --git a/random/hypergeometric.lisp b/random/hypergeometric.lisp
index 371625045345d4ffecc7aaff3abb7c18e450ff5e..4d04edc529af6c0ba480dbc9ec24f8982eb9f1ea 100644
--- a/random/hypergeometric.lisp
+++ b/random/hypergeometric.lisp
@@ -1,6 +1,6 @@
 ;; Hypergeometric distribution
 ;; Liam Healy, Sat Nov 25 2006 - 16:00
-;; Time-stamp: <2008-12-26 19:42:50EST hypergeometric.lisp>
+;; Time-stamp: <2009-02-16 10:08:12EST hypergeometric.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -50,7 +50,7 @@
 
 ;;; Examples and unit test
 (save-test hypergeometric-randist
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
      (loop for i from 0 to 10
 	   collect
 	   (hypergeometric rng 3 6 3)))
diff --git a/random/landau.lisp b/random/landau.lisp
index 8847d9b4ed6cabec7de2196114037ff5dd140fa0..40959af7d589b915a8a2ee72f907285d702d3dff 100644
--- a/random/landau.lisp
+++ b/random/landau.lisp
@@ -1,6 +1,6 @@
 ;; Landau distribution
 ;; Liam Healy, Sat Sep 30 2006
-;; Time-stamp: <2008-12-26 19:34:41EST landau.lisp>
+;; Time-stamp: <2009-02-16 10:05:57EST landau.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -30,7 +30,7 @@
 
 ;;; Examples and unit test
 (save-test landau
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
       (loop for i from 0 to 10
 	    collect (landau rng)))
   (landau-pdf 0.25d0))
diff --git a/random/laplace.lisp b/random/laplace.lisp
index 89b12c815a1db0ba70672e3e8d755f991c00e3c3..31628e8e4ad3b656584e20a4227a4ca60827e739 100644
--- a/random/laplace.lisp
+++ b/random/laplace.lisp
@@ -1,6 +1,6 @@
 ;; Exponential distribution
 ;; Liam Healy, Sun Sep 17 2006
-;; Time-stamp: <2008-12-26 19:40:32EST laplace.lisp>
+;; Time-stamp: <2009-02-16 10:08:15EST laplace.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -56,7 +56,7 @@
 
 ;;; Examples and unit test
 (save-test laplace
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
       (loop for i from 0 to 10
 	    collect
 	    (laplace rng 10.0d0)))
diff --git a/random/levy.lisp b/random/levy.lisp
index c04678d9ec88b5b67da07db0a49885ae9aa18f8c..d680fd6f13df2015eb65bad34189ab2d541abfdb 100644
--- a/random/levy.lisp
+++ b/random/levy.lisp
@@ -1,6 +1,6 @@
 ;; Levy distribution
 ;; Liam Healy, Sat Sep 30 2006
-;; Time-stamp: <2008-12-26 19:45:36EST levy.lisp>
+;; Time-stamp: <2009-02-16 10:08:11EST levy.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -46,11 +46,11 @@
 
 ;;; Examples and unit test
 (save-test levy
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
       (loop for i from 0 to 10
 	    collect
 	    (levy rng 1.0d0 2.0d0)))
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
       (loop for i from 0 to 10
 	    collect
 	    (levy-skew rng 1.0d0 2.0d0 1.0d0))))
diff --git a/random/logarithmic.lisp b/random/logarithmic.lisp
index 73a7dc84d8838de2dcc0dd2e0783ef68474123c9..b3e7f6571ed5638c33d77f1f8bf5f8d3bfb3cca3 100644
--- a/random/logarithmic.lisp
+++ b/random/logarithmic.lisp
@@ -1,6 +1,6 @@
 ;; Logarithmic distribution
 ;; Liam Healy, Sat Nov 25 2006 - 16:00
-;; Time-stamp: <2008-12-26 19:36:20EST logarithmic.lisp>
+;; Time-stamp: <2009-02-16 10:08:16EST logarithmic.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -27,7 +27,7 @@
 
 ;;; Examples and unit test
 (save-test logarithmic
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
      (loop for i from 0 to 10
 	   collect
 	   (logarithmic rng 0.9d0)))
diff --git a/random/logistic.lisp b/random/logistic.lisp
index 7125850335a4e7466e7db2ef335a414c82aa5f0a..6ef3bf92c1375322060ce7497ffd85642056406f 100644
--- a/random/logistic.lisp
+++ b/random/logistic.lisp
@@ -1,6 +1,6 @@
 ;; Logistic distribution
 ;; Liam Healy, Sat Oct  7 2006 - 16:13
-;; Time-stamp: <2008-12-26 19:45:34EST logistic.lisp>
+;; Time-stamp: <2009-02-16 10:08:10EST logistic.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -55,7 +55,7 @@
 
 ;;; Examples and unit test
 (save-test logistic
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
       (loop for i from 0 to 10
 	    collect
 	    (logistic rng 10.0d0)))
diff --git a/random/lognormal.lisp b/random/lognormal.lisp
index a56fb413f081bd2ef805e017931220b3722254bd..23e052946b32cb2e8c187b5562c86483c49c76b8 100644
--- a/random/lognormal.lisp
+++ b/random/lognormal.lisp
@@ -1,6 +1,6 @@
 ;; Lognormal distribution
 ;; Liam Healy, Sat Sep 30 2006
-;; Time-stamp: <2008-12-27 10:49:01EST lognormal.lisp>
+;; Time-stamp: <2009-02-16 10:08:15EST lognormal.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -56,7 +56,7 @@
 
 ;;; Examples and unit test
 (save-test lognormal
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
       (loop for i from 0 to 10
 	    collect
 	    (lognormal rng 1.0d0 2.0d0)))
diff --git a/random/multinomial.lisp b/random/multinomial.lisp
index 2630eefd0ea915e37661007021e2e66772e3f379..b5edc8f0dd7a39dc58184e45e1b42684ff432818 100644
--- a/random/multinomial.lisp
+++ b/random/multinomial.lisp
@@ -1,6 +1,6 @@
 ;; Multinomial distribution
 ;; Liam Healy, Sat Nov 25 2006 - 16:00
-;; Time-stamp: <2008-12-29 20:56:56EST multinomial.lisp>
+;; Time-stamp: <2009-02-16 10:10:33EST multinomial.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -56,7 +56,7 @@
 
 ;;; Examples and unit test
 (save-test multinomial
- (let ((rng (make-random-number-generator *mt19937* 0))
+ (let ((rng (make-random-number-generator +mt19937+ 0))
 	(p #m(0.1d0 0.2d0 0.3d0 0.4d0))
 	(n (make-marray '(signed-byte 32) :dimensions 4)))
    (multinomial rng 8 p n)
diff --git a/random/negative-binomial.lisp b/random/negative-binomial.lisp
index ad454513b66176f0459a3059c9b2f736df718df3..8b4a709f553f87faf5fc92bda875ab86a11822bf 100644
--- a/random/negative-binomial.lisp
+++ b/random/negative-binomial.lisp
@@ -1,6 +1,6 @@
 ;; Negative binomial and Pascal distributions
 ;; Liam Healy, Sat Nov 25 2006 - 16:00
-;; Time-stamp: <2008-12-26 19:34:40EST negative-binomial.lisp>
+;; Time-stamp: <2009-02-16 10:05:56EST negative-binomial.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -91,14 +91,14 @@
 ;;;;****************************************************************************
 
 (save-test negative-binomial
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
      (loop for i from 0 to 10
 	   collect
 	   (negative-binomial rng 0.4d0 12.0d0)))
   (negative-binomial-pdf 5 0.4d0 12.0d0)
   (negative-binomial-P 5 0.4d0 12.0d0)
   (negative-binomial-Q 5 0.4d0 12.0d0)
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
      (loop for i from 0 to 10
 	   collect
 	   (pascal rng 0.4d0 12)))
diff --git a/random/pareto.lisp b/random/pareto.lisp
index 94bcabfd13b626100e504bb675735af5de50fb14..505e768a10a2290be3cfb02f2ee15b4086aa7c7d 100644
--- a/random/pareto.lisp
+++ b/random/pareto.lisp
@@ -1,6 +1,6 @@
 ;; Pareto distribution
 ;; Liam Healy, Sat Oct  8 2006 - 21:23
-;; Time-stamp: <2008-12-26 19:47:19EST pareto.lisp>
+;; Time-stamp: <2009-02-16 10:10:34EST pareto.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -56,7 +56,7 @@
 
 ;;; Examples and unit test
 (save-test pareto
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
       (loop for i from 0 to 10
 	    collect
 	    (pareto rng 1.0d0 2.0d0)))
diff --git a/random/poisson.lisp b/random/poisson.lisp
index 6c2875aa49120be163bf5336c5b95707d7728d40..e4e8da91ffd0f858f1ca588ae0e3dc0c3e34f828 100644
--- a/random/poisson.lisp
+++ b/random/poisson.lisp
@@ -1,6 +1,6 @@
 ;; Poisson distribution
 ;; Liam Healy, Sat Nov 25 2006 - 16:00
-;; Time-stamp: <2008-12-26 19:50:50EST poisson.lisp>
+;; Time-stamp: <2009-02-16 10:10:31EST poisson.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -42,7 +42,7 @@
 
 ;;; Examples and unit test
 (save-test poisson
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
      (loop for i from 0 to 10
 	   collect
 	   (poisson rng 10.0d0)))
diff --git a/random/rayleigh-tail.lisp b/random/rayleigh-tail.lisp
index 861d36f85105d23fc3eda993806c193e19045448..e8218dfbca50870050f856ec13c5cb489a8c28c0 100644
--- a/random/rayleigh-tail.lisp
+++ b/random/rayleigh-tail.lisp
@@ -1,6 +1,6 @@
 ;; Rayleigh tail distribution
 ;; Liam Healy, Sat Sep 30 2006
-;; Time-stamp: <2008-12-26 19:50:49EST rayleigh-tail.lisp>
+;; Time-stamp: <2009-02-16 10:10:31EST rayleigh-tail.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -28,7 +28,7 @@
 
 ;;; Examples and unit test
 (save-test rayleigh-tail
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
       (loop for i from 0 to 10
 	    collect (rayleigh-tail rng 1.0d0 10.0d0)))
   (rayleigh-tail-pdf 0.25d0 -2.0d0 2.0d0))
diff --git a/random/rayleigh.lisp b/random/rayleigh.lisp
index 2eec01cc2cf6629e46a1348ce855a2da50086d29..233a1156e8f4574afbad9977e0b9fedbf11e0523 100644
--- a/random/rayleigh.lisp
+++ b/random/rayleigh.lisp
@@ -1,6 +1,6 @@
 ;; Rayleigh distribution
 ;; Liam Healy, Sat Sep 30 2006
-;; Time-stamp: <2008-12-26 19:34:41EST rayleigh.lisp>
+;; Time-stamp: <2009-02-16 10:05:57EST rayleigh.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -59,7 +59,7 @@
 
 ;;; Examples and unit test
 (save-test rayleigh
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
       (loop for i from 0 to 10
 	    collect
 	    (rayleigh rng 10.0d0)))
diff --git a/random/rng-types.lisp b/random/rng-types.lisp
index cb4d3160e89963c6b50a6aa6ea7c74ab02a06589..442eb56813e86ec2c9055d3a5aa44450c710a2df 100644
--- a/random/rng-types.lisp
+++ b/random/rng-types.lisp
@@ -1,6 +1,6 @@
 ;; Random number generation
 ;; Liam Healy, Tue Jul 11 2006 - 23:39
-;; Time-stamp: <2008-08-16 18:30:49EDT rng-types.lisp>
+;; Time-stamp: <2009-02-16 10:24:11EST rng-types.lisp>
 ;; $Id$
 
 ;;; Random number generator types and information functions.
@@ -42,13 +42,13 @@
   "Define the random number generator type."
   (let ((cname
 	 (or gsl-name
-	     (remove #\*
+	     (remove #\+
 		     (substitute
 		      #\_ #\- 
 		      (format nil "gsl_rng_~(~a~)" lisp-name))))))
     `(defmpar ,lisp-name ,cname ,documentation)))
 
-(def-rng-type *default-type*
+(def-rng-type +default-type+
     "The default random number generator type,
      set by environment variables GSL_RNG_TYPE and GSL_RNG_SEED"
   "gsl_rng_default")
@@ -65,7 +65,7 @@
 ;;;; Modern random number generators
 ;;;;****************************************************************************
 
-(def-rng-type *cmrg*			; FDL
+(def-rng-type +cmrg+			; FDL
     "Combined multiple recursive random number generator
      This is a combined multiple recursive generator by L'Ecuyer. 
      Its sequence is z_n = (x_n - y_n) mod m_1
@@ -82,7 +82,7 @@
      P. L'Ecuyer, ``Combined Multiple Recursive Random Number
      Generators'', Operations Research, 44, 5 (1996), 816--822.")
 
-(def-rng-type *gfsr4*			; FDL
+(def-rng-type +gfsr4+			; FDL
     "Four-tap Generalized Feedback Shift Register
     The *gfsr4* generator is like a lagged-Fibonacci generator, and 
     produces each number as an xor'd sum of four previous values.
@@ -119,7 +119,7 @@
     generators'', Computers in Physics, 12(4), Jul/Aug
     1998, pp 385--392.")
 
-(def-rng-type *mrg*			; FDL
+(def-rng-type +mrg+			; FDL
     "Multiple recursive random number generator
    This is a fifth-order multiple recursive generator by L'Ecuyer, Blouin
    and Coutre.  Its sequence is
@@ -132,7 +132,7 @@
     recursive random number generators'', ACM Transactions on Modeling and
     Computer Simulation 3, 87--98 (1993).")
 
-(def-rng-type *mt19937*			; FDL
+(def-rng-type +mt19937+			; FDL
     "The MT19937 generator of Makoto Matsumoto and Takuji Nishimura is a
     variant of the twisted generalized feedback shift-register algorithm,
     and is known as the ``Mersenne Twister'' generator.  It has a Mersenne
@@ -151,21 +151,21 @@
     original seeding procedures could cause spurious artifacts for some seed
     values. They are still available through the alternative generators")
 									 
-(def-rng-type *mt19937_1999*		; FDL
+(def-rng-type +mt19937-1999+		; FDL
     "Previous version of mt19937.")
 
-(def-rng-type *mt19937_1998*		; FDL
+(def-rng-type +mt19937-1998+		; FDL
     "Previous version of mt19937.")
 
-(def-rng-type *ran0*)
+(def-rng-type +ran0+)
 
-(def-rng-type *ran1*)
+(def-rng-type +ran1+)
 
-(def-rng-type *ran2*)
+(def-rng-type +ran2+)
 
-(def-rng-type *ran3*)
+(def-rng-type +ran3+)
 
-(def-rng-type *ranlux*			; FDL
+(def-rng-type +ranlux+			; FDL
     "The ranlux generator is an implementation of the original
     algorithm developed by Lüscher.  It uses a
     lagged-fibonacci-with-skipping algorithm to produce ``luxury random
@@ -189,9 +189,9 @@
     pseudo-random number generator of Lüscher'', Computer Physics
     Communications, 79 (1994) 111--114.")
 
-(def-rng-type *ranlux389*)
+(def-rng-type +ranlux389+)
 
-(def-rng-type *ranlxs0*
+(def-rng-type +ranlxs0+
     "This generator is a second-generation version of the
     *ranlux* algorithm of Lüscher, which produces ``luxury random
     numbers''.  This generator provides single precision output (24 bits) at
@@ -204,21 +204,21 @@
     The higher luxury levels provide increased decorrelation between samples
     as an additional safety margin.")
 
-(def-rng-type *ranlxs1*)
+(def-rng-type +ranlxs1+)
 
-(def-rng-type *ranlxs2*)
+(def-rng-type +ranlxs2+)
 
-(def-rng-type *ranlxd1*			; FDL
+(def-rng-type +ranlxd1+			; FDL
     "Produce double precision output (48 bits) from the
     *ranlxs* generator.  The library provides two luxury levels,
     *ranlxd1* and *ranlxd2*.")
 
-(def-rng-type *ranlxd2*			; FDL
+(def-rng-type +ranlxd2+			; FDL
     "Produce double precision output (48 bits) from the
     *ranlxs* generator.  The library provides two luxury levels,
     *ranlxd1* and *ranlxd2*.")
 
-(def-rng-type *taus*			; FDL
+(def-rng-type +taus+			; FDL
     "Tausworthe random number generator
      This is a maximally equidistributed combined Tausworthe generator by
      L'Ecuyer.  The sequence is x_n = (s^1_n \oplus s^2_n \oplus s^3_n) 
@@ -235,20 +235,20 @@
      P. L'Ecuyer, ``Maximally Equidistributed Combined Tausworthe
      Generators'', Mathematics of Computation, 65, 213 (1996), 203--213.")
 
-(def-rng-type *taus2*			; FDL
+(def-rng-type +taus2+			; FDL
     "The same algorithm as *taus* but with an improved seeding procedure
      described in the paper,
      P. L'Ecuyer, ``Tables of Maximally Equidistributed Combined LFSR
      Generators'', Mathematics of Computation, 68, 225 (1999), 261--269
      The generator *taus2* should now be used in preference to *taus*.")
 
-(def-rng-type *taus113*)
+(def-rng-type +taus113+)
 
 ;;;;****************************************************************************
 ;;;; UNIX random number generators
 ;;;;****************************************************************************
 
-(def-rng-type *rand*			; FDL
+(def-rng-type +rand+			; FDL
     "The BSD rand() generator.  Its sequence is
    x_{n+1} = (a x_n + c) mod m with a = 1103515245, 
    c = 12345 and m = 2^31.
@@ -256,7 +256,7 @@
    The period of this generator is 2^31, and it uses
    1 word of storage per generator.")
 
-(def-rng-type *rand48*			; FDL
+(def-rng-type +rand48+			; FDL
     "The Unix rand48 generator.  Its sequence is
      x_{n+1} = (a x_n + c) mod m
      defined on 48-bit unsigned integers with 
@@ -273,24 +273,24 @@
      contained a bug in mrand48 function which caused it to produce
      different results (only the lower 16-bits of the return value were set).")
 
-(def-rng-type *random128_bsd*)
-(def-rng-type *random128_glibc2*)
-(def-rng-type *random128_libc5*)
-(def-rng-type *random256_bsd*)
-(def-rng-type *random256_glibc2*)
-(def-rng-type *random256_libc5*)
-(def-rng-type *random32_bsd*)
-(def-rng-type *random32_glibc2*)
-(def-rng-type *random32_libc5*)
-(def-rng-type *random64_bsd*)
-(def-rng-type *random64_glibc2*)
-(def-rng-type *random64_libc5*)
-(def-rng-type *random8_bsd*)
-(def-rng-type *random8_glibc2*)
-(def-rng-type *random8_libc5*)
-(def-rng-type *random_bsd*)
-(def-rng-type *random_glibc2*)
-(def-rng-type *random_libc5*)
+(def-rng-type +random128_bsd+)
+(def-rng-type +random128_glibc2+)
+(def-rng-type +random128_libc5+)
+(def-rng-type +random256_bsd+)
+(def-rng-type +random256_glibc2+)
+(def-rng-type +random256_libc5+)
+(def-rng-type +random32_bsd+)
+(def-rng-type +random32_glibc2+)
+(def-rng-type +random32_libc5+)
+(def-rng-type +random64_bsd+)
+(def-rng-type +random64_glibc2+)
+(def-rng-type +random64_libc5+)
+(def-rng-type +random8_bsd+)
+(def-rng-type +random8_glibc2+)
+(def-rng-type +random8_libc5+)
+(def-rng-type +random_bsd+)
+(def-rng-type +random_glibc2+)
+(def-rng-type +random_libc5+)
 
 ;;;;****************************************************************************
 ;;;; Obsolete random number generators
@@ -316,13 +316,13 @@
 ;;; produce a random bitstream it is best to avoid using the least
 ;;; significant bits.
 
-(def-rng-type *ranf*			; FDL
+(def-rng-type +ranf+			; FDL
     "Obsolete, use only for compatibility.")
 
-(def-rng-type *ranmar*			; FDL
+(def-rng-type +ranmar+			; FDL
     "Obsolete, use only for compatibility.")
 
-(def-rng-type *r250*			; FDL
+(def-rng-type +r250+			; FDL
     "Obsolete, use only for compatibility.
      The shift-register generator of Kirkpatrick and Stoll.  The
      sequence is based on the recurrence
@@ -335,7 +335,7 @@
      number generator'', Journal of Computational Physics}, 40, 517--526
      (1981)")
 
-(def-rng-type *tt800*			; FDL
+(def-rng-type +tt800+			; FDL
     "Obsolete, use only for compatibility.
      An earlier version of the twisted generalized feedback
      shift-register generator, and has been superseded by the development of
@@ -352,16 +352,16 @@
 ;;; them.  These generators should not be used for real simulations since
 ;;; they have poor statistical properties by modern standards.
 
-(def-rng-type *vax*			; FDL
+(def-rng-type +vax+			; FDL
     "Obsolete, use only for compatibility.")
 
-(def-rng-type *transputer*		; FDL
+(def-rng-type +transputer+		; FDL
     "Obsolete, use only for compatibility.")
 
-(def-rng-type *randu*			; FDL
+(def-rng-type +randu+			; FDL
     "Obsolete, use only for compatibility.")
 
-(def-rng-type *minstd*			;FDL
+(def-rng-type +minstd+			;FDL
     "Obsolete, use only for compatibility.
     Park and Miller's ``minimal standard'' minstd generator, a
     simple linear congruence which takes care to avoid the major pitfalls of
@@ -377,16 +377,16 @@
     Communications of the ACM, October 1988, Volume 31, No 10, pages
     1192--1201.")
 
-(def-rng-type *uni*			; FDL
+(def-rng-type +uni+			; FDL
     "Obsolete, use only for compatibility.")
 
-(def-rng-type *uni32*			; FDL
+(def-rng-type +uni32+			; FDL
     "Obsolete, use only for compatibility.")
 
-(def-rng-type *slatec* 			; FDL
+(def-rng-type +slatec+ 			; FDL
     "Obsolete, use only for compatibility.")
 
-(def-rng-type *zuf*			; FDL
+(def-rng-type +zuf+			; FDL
     "Obsolete, use only for compatibility.
     The ZUFALL lagged Fibonacci series generator of Peterson.  Its
     sequence is
@@ -397,7 +397,7 @@
     W. Petersen, ``Lagged Fibonacci Random Number Generators for the NEC
     SX-3'', International Journal of High Speed Computing (1994).")
 
-(def-rng-type *borosh13*		; FDL
+(def-rng-type +borosh13+		; FDL
     "Obsolete, use only for compatibility.
     The Borosh-Niederreiter random number generator. It is taken
     from Knuth's Seminumerical Algorithms, 3rd Ed., pages
@@ -405,14 +405,14 @@
     with a = 1812433253 and m = 2^32.
     The seed specifies the initial value, x_1.")
 
-(def-rng-type *coveyou*			; FDL
+(def-rng-type +coveyou+			; FDL
     "Obsolete, use only for compatibility.
      The Coveyou random number generator, taken from Knuth's
      Seminumerical Algorithms, 3rd Ed., Section 3.2.2. Its sequence
      is x_{n+1} = (x_n (x_n + 1)) mod m with m = 2^32.
      The seed specifies the initial value, x_1.")
 
-(def-rng-type *fishman18*		; FDL
+(def-rng-type +fishman18+		; FDL
     "Obsolete, use only for compatibility.
      The Fishman, Moore III random number generator. It is taken from
      Knuth's Seminumerical Algorithms, 3rd Ed., pages 106--108. Its
@@ -420,7 +420,7 @@
      m = 2^31 - 1.  The seed specifies the initial value, 
      x_1.")
 
-(def-rng-type *fishman20*		; FDL
+(def-rng-type +fishman20+		; FDL
     "Obsolete, use only for compatibility.
      The Fishman random number generator. It is taken from Knuth's
      Seminumerical Algorithms, 3rd Ed., page 108. Its sequence is
@@ -428,7 +428,7 @@
      m = 2^31 - 1.  The seed specifies the initial value, 
      x_1.")
 
-(def-rng-type *fishman2x*		; FDL
+(def-rng-type +fishman2x+		; FDL
     "Obsolete, use only for compatibility.
      The L'Ecuyer--Fishman random number generator. It is taken from
      Knuth's Seminumerical Algorithms, 3rd Ed., page 108.
@@ -437,13 +437,13 @@
      x_n and y_n are given by the fishman20 and lecuyer21 algorithms.
      The seed specifies the initial value, x_1.")
 
-(def-rng-type *knuthran*		; FDL
+(def-rng-type +knuthran+		; FDL
     "Obsolete, use only for compatibility.
     A second-order multiple recursive generator described by Knuth
     in Seminumerical Algorithms, 3rd Ed., Section 3.6.  Knuth
     provides its C code.")
 
-(def-rng-type *knuthran2*		; FDL
+(def-rng-type +knuthran2+		; FDL
     "Obsolete, use only for compatibility.
      A second-order multiple recursive generator described by Knuth
      in Seminumerical Algorithms, 3rd Ed., page 108.  Its sequence is
@@ -451,7 +451,7 @@
      with a_1 = 271828183, a_2 = 314159269, and 
      m = 2^31 - 1.")
 
-(def-rng-type *lecuyer21*		; FDL
+(def-rng-type +lecuyer21+		; FDL
     "Obsolete, use only for compatibility.
      The L'Ecuyer random number generator, taken from Knuth's
      Seminumerical Algorithms, 3rd Ed., page 106--108.
@@ -459,7 +459,7 @@
      with a = 40692 and m = 2^31 - 249.
      The seed specifies the initial value, x_1.")
 
-(def-rng-type *waterman14*		; FDL
+(def-rng-type +waterman14+		; FDL
     "Obsolete, use only for compatibility.
      The Waterman random number generator. It is taken from Knuth's
      Seminumerical Algorithms, 3rd Ed., page 106--108.
diff --git a/random/shuffling-sampling.lisp b/random/shuffling-sampling.lisp
index 32848e5c36ab11a93faf43ef0759942ec0e4df3b..852ece5c426120796ee1020c48537c92149b6924 100644
--- a/random/shuffling-sampling.lisp
+++ b/random/shuffling-sampling.lisp
@@ -1,6 +1,6 @@
 ;; Shuffling and sampling
 ;; Liam Healy, Sat Dec  2 2006 - 18:40
-;; Time-stamp: <2008-12-29 19:36:17EST shuffling-sampling.lisp>
+;; Time-stamp: <2009-02-16 10:10:30EST shuffling-sampling.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -60,16 +60,16 @@
 
 ;;; Examples and unit test
 (save-test shuffling-sampling
- (let ((rng (make-random-number-generator *mt19937* 0))
+ (let ((rng (make-random-number-generator +mt19937+ 0))
 	(v1 #31m(1 2 3 4 5 6 7 8)))
    (shuffle rng v1)
    (cl-array v1))
- (let ((rng (make-random-number-generator *mt19937* 0))
+ (let ((rng (make-random-number-generator +mt19937+ 0))
 	(v1 #31m(1 2 3 4 5 6 7 8))
 	(v2 (make-marray '(signed-byte 32) :dimensions 4)))
    (choose-random rng v2 v1)
    (cl-array v2))
- (let ((rng (make-random-number-generator *mt19937* 0))
+ (let ((rng (make-random-number-generator +mt19937+ 0))
 	(v1 #31m(1 2 3 4 5 6 7 8))
 	(v2 (make-marray '(signed-byte 32) :dimensions 10)))
    (random-sample rng v2 v1)
diff --git a/random/spherical-vector.lisp b/random/spherical-vector.lisp
index c2539b356a6b05027c546b7f38a7c9ae96560b7b..9eeddb564ce3cf2cc2a1aefaa627ba86e337eda8 100644
--- a/random/spherical-vector.lisp
+++ b/random/spherical-vector.lisp
@@ -1,6 +1,6 @@
 ;; Spherical Vector distribution
 ;; Liam Healy, Sun Oct  22 2006
-;; Time-stamp: <2008-12-26 19:50:50EST spherical-vector.lisp>
+;; Time-stamp: <2009-02-16 10:10:32EST spherical-vector.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -59,15 +59,15 @@
 
 ;;; Examples and unit test
 (save-test spherical-vector
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
       (loop for i from 0 to 4
 	    append
 	    (multiple-value-list (direction-2d rng))))
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
       (loop for i from 0 to 4
 	    append
 	    (multiple-value-list (direction-2d-trig-method rng))))
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
       (loop for i from 0 to 2
 	    append
 	    (multiple-value-list (direction-3d rng)))))
diff --git a/random/tdist.lisp b/random/tdist.lisp
index c7a16888c16a9078d8d0c87c05d7a3746c34a8b5..4e30266c442ff46d4d31a0f2593ac375f5b8f6f1 100644
--- a/random/tdist.lisp
+++ b/random/tdist.lisp
@@ -1,6 +1,6 @@
 ;; Tdist distribution
 ;; Liam Healy, Sat Oct  7 2006 - 16:13
-;; Time-stamp: <2008-12-26 19:34:40EST tdist.lisp>
+;; Time-stamp: <2009-02-16 10:05:56EST tdist.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -56,7 +56,7 @@
 
 ;;; Examples and unit test
 (save-test tdist
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
       (loop for i from 0 to 10
 	    collect
 	    (tdist rng 10.0d0)))
diff --git a/random/weibull.lisp b/random/weibull.lisp
index 85a43b34039e0627cb591c9ab9294961fe1fa96e..7108e61c10a0fde6f4528537876512b246f792e8 100644
--- a/random/weibull.lisp
+++ b/random/weibull.lisp
@@ -1,6 +1,6 @@
 ;; Weibull distribution
 ;; Liam Healy, Sun Oct 22 2006
-;; Time-stamp: <2008-12-26 19:39:33EST weibull.lisp>
+;; Time-stamp: <2009-02-16 10:08:16EST weibull.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -55,7 +55,7 @@
 
 ;;; Examples and unit test
 (save-test weibull
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
       (loop for i from 0 to 10
 	    collect
 	    (weibull rng 1.0d0 2.0d0)))
diff --git a/simulated-annealing.lisp b/simulated-annealing.lisp
index 15308cd6402e6b18312cfa5c382c211fad205bc6..c225585ec061f0978f5b0ad8eda46ad871b28f0c 100644
--- a/simulated-annealing.lisp
+++ b/simulated-annealing.lisp
@@ -1,6 +1,6 @@
 ;; Simulated Annealing
 ;; Liam Healy Sun Feb 11 2007 - 17:23
-;; Time-stamp: <2009-01-12 22:48:38EST simulated-annealing.lisp>
+;; Time-stamp: <2009-02-16 10:16:44EST simulated-annealing.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -181,7 +181,7 @@
       (with-simulated-annealing-parameters
 	  (params 200 10 10.0d0 1.0d0 0.002d0 1.005d0 2.0d-6)
 	(simulated-annealing
-	 (make-random-number-generator *mt19937* 0) initial
+	 (make-random-number-generator +mt19937+ 0) initial
 	 'E2 'S2 'M2 'P2
 	 (cffi:foreign-type-size :double)
 	 params)))))
diff --git a/solve-minimize-fit/linear-least-squares.lisp b/solve-minimize-fit/linear-least-squares.lisp
index 823c1ae96899787d1bd0acf85fad8a8688ef5083..19a368fb823cc5a089ea4199b0849da27afa7af1 100644
--- a/solve-minimize-fit/linear-least-squares.lisp
+++ b/solve-minimize-fit/linear-least-squares.lisp
@@ -1,6 +1,6 @@
 ;; Linear least squares, or linear regression
 ;; Liam Healy <2008-01-21 12:41:46EST linear-least-squares.lisp>
-;; Time-stamp: <2009-01-25 10:08:22EST linear-least-squares.lisp>
+;; Time-stamp: <2009-02-16 10:16:05EST linear-least-squares.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -327,7 +327,7 @@
 (defun mv-linear-least-squares-data ()
   "Generate data for second example in Section 36.5 of the GSL
    manual."
-  (let ((rng (make-random-number-generator *mt19937* 0)))
+  (let ((rng (make-random-number-generator +mt19937+ 0)))
     (loop for x from 1/10 below 2 by 1/10
 	  for xd = (coerce x 'double-float)
 	  for y0 = (exp xd)
diff --git a/solve-minimize-fit/minimization-multi.lisp b/solve-minimize-fit/minimization-multi.lisp
index 59675a00008377a5b246e598e6fcbece7a132313..7022751c2b30fb6c3e3f0199ed79f63271f6f30f 100644
--- a/solve-minimize-fit/minimization-multi.lisp
+++ b/solve-minimize-fit/minimization-multi.lisp
@@ -1,6 +1,6 @@
 ;; Multivariate minimization.
 ;; Liam Healy  <Tue Jan  8 2008 - 21:28>
-;; Time-stamp: <2009-02-10 21:51:38EST minimization-multi.lisp>
+;; Time-stamp: <2009-02-16 09:54:29EST minimization-multi.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -230,7 +230,7 @@
 ;;;; Algorithms
 ;;;;****************************************************************************
 
-(defmpar *conjugate-fletcher-reeves*
+(defmpar +conjugate-fletcher-reeves+
     "gsl_multimin_fdfminimizer_conjugate_fr"
   ;; FDL
   "The Fletcher-Reeves conjugate gradient algorithm. The conjugate
@@ -248,7 +248,7 @@
    and the line minimization is then repeated for the new search
    direction.")
 
-(defmpar *conjugate-polak-ribiere*
+(defmpar +conjugate-polak-ribiere+
     "gsl_multimin_fdfminimizer_conjugate_pr"
   ;; FDL
   "The Polak-Ribiere conjugate gradient algorithm.  It is similar to
@@ -257,7 +257,7 @@
    close enough to the minimum of the objective function that it is well
    approximated by a quadratic hypersurface.")
 
-(defmpar *vector-bfgs*
+(defmpar +vector-bfgs+
     "gsl_multimin_fdfminimizer_vector_bfgs"
   ;; FDL
   "The vector Broyden-Fletcher-Goldfarb-Shanno (BFGS) conjugate
@@ -268,7 +268,7 @@
    steps towards the function minimum, assuming quadratic behavior in
    that region.")
 
-(defmpar *simplex-nelder-mead*
+(defmpar +simplex-nelder-mead+
     "gsl_multimin_fminimizer_nmsimplex"
   ;; FDL
   "The Simplex algorithm of Nelder and Mead. It constructs 
@@ -319,7 +319,7 @@
 (make-callbacks multi-dimensional-minimizer-f parabaloid-scalar 2 t)
 
 (defun multimin-example-no-derivative
-    (&optional (method *simplex-nelder-mead*) (print-steps t))
+    (&optional (method +simplex-nelder-mead+) (print-steps t))
   (let ((step-size (make-marray 'double-float :dimensions 2)))
     (set-all step-size 1.0d0)
     (let ((minimizer
@@ -384,7 +384,7 @@
  parabaloid-vector parabaloid-derivative parabaloid-and-derivative 2 nil)
 
 (defun multimin-example-derivative
-    (&optional (method *conjugate-fletcher-reeves*) (print-steps t))
+    (&optional (method +conjugate-fletcher-reeves+) (print-steps t))
   (let* ((initial #m(5.0d0 7.0d0))
 	 (minimizer
 	  (make-multi-dimensional-minimizer-fdf
@@ -411,7 +411,7 @@
 	   (values (maref x 0) (maref x 1) (function-value minimizer)))))))
 
 (save-test minimization-multi
- (multimin-example-no-derivative *simplex-nelder-mead* nil)
- (multimin-example-derivative *conjugate-fletcher-reeves* nil)
- (multimin-example-derivative *conjugate-polak-ribiere* nil)
- (multimin-example-derivative *vector-bfgs* nil))
+ (multimin-example-no-derivative +simplex-nelder-mead+ nil)
+ (multimin-example-derivative +conjugate-fletcher-reeves+ nil)
+ (multimin-example-derivative +conjugate-polak-ribiere+ nil)
+ (multimin-example-derivative +vector-bfgs+ nil))
diff --git a/solve-minimize-fit/minimization-one.lisp b/solve-minimize-fit/minimization-one.lisp
index aea3f8bf0aaf201fb39608228fd305b88a237f60..1f8fa9c0b2174f163aa26c545dfc95d80338604b 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: <2009-02-15 11:23:41EST minimization-one.lisp>
+;; Time-stamp: <2009-02-16 09:55:06EST minimization-one.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -142,7 +142,7 @@
 ;;;; Minimization algorithms
 ;;;;****************************************************************************
 
-(defmpar *golden-section-fminimizer* "gsl_min_fminimizer_goldensection"
+(defmpar +golden-section-fminimizer+ "gsl_min_fminimizer_goldensection"
   "The golden section algorithm is the simplest method of bracketing
    the minimum of a function.  It is the slowest algorithm provided by the
    library, with linear convergence.
@@ -158,7 +158,7 @@
    golden section as the bisection ratio can be shown to provide the
    fastest convergence for this type of algorithm.")
 
-(defmpar *brent-fminimizer* "gsl_min_fminimizer_brent"
+(defmpar +brent-fminimizer+ "gsl_min_fminimizer_brent"
   "The Brent minimization algorithm combines a parabolic
    interpolation with the golden section algorithm.  This produces a fast
    algorithm which is still robust.
@@ -186,7 +186,7 @@
 (make-callbacks single-function minimization-one-fn)
 
 (defun minimization-one-example
-    (&optional (minimizer-type *brent-fminimizer*) (print-steps t))
+    (&optional (minimizer-type +brent-fminimizer+) (print-steps t))
   "Solving a minimum, the example given in Sec. 33.8 of the GSL manual."
   (let ((max-iter 100)
 	(minimizer
@@ -215,5 +215,5 @@
        (return (values iter lower upper min (- min pi) (- upper lower))))))
 
 (save-test minimization-one
- (minimization-one-example *brent-fminimizer* nil)
- (minimization-one-example *golden-section-fminimizer* nil))
+ (minimization-one-example +brent-fminimizer+ nil)
+ (minimization-one-example +golden-section-fminimizer+ nil))
diff --git a/solve-minimize-fit/nonlinear-least-squares.lisp b/solve-minimize-fit/nonlinear-least-squares.lisp
index 7e18cde2e2d759bf8d8e944ebc00e985f8375f8e..6fddfa5ad6b5b8f8b021f1b5c74731bd81127296 100644
--- a/solve-minimize-fit/nonlinear-least-squares.lisp
+++ b/solve-minimize-fit/nonlinear-least-squares.lisp
@@ -1,6 +1,6 @@
 ;; Nonlinear least squares fitting.
 ;; Liam Healy, 2008-02-09 12:59:16EST nonlinear-least-squares.lisp
-;; Time-stamp: <2009-02-14 12:22:00EST nonlinear-least-squares.lisp>
+;; Time-stamp: <2009-02-16 10:16:06EST nonlinear-least-squares.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -228,7 +228,7 @@
 ;;;; Minimization using derivatives
 ;;;;****************************************************************************
 
-(defmpar *levenberg-marquardt* "gsl_multifit_fdfsolver_lmsder"
+(defmpar +levenberg-marquardt+ "gsl_multifit_fdfsolver_lmsder"
   ;; FDL
   "A robust and efficient version of the Levenberg-Marquardt
    algorithm as implemented in the scaled lmder routine in
@@ -271,7 +271,7 @@
    These errors indicate that further iterations would be unlikely to
    change the solution from its current value.")
 
-(defmpar *levenberg-marquardt-unscaled* "gsl_multifit_fdfsolver_lmder"
+(defmpar +levenberg-marquardt-unscaled+ "gsl_multifit_fdfsolver_lmder"
   ;; FDL
   "The unscaled version of *levenberg-marquardt*.  The elements of the
    diagonal scaling matrix D are set to 1.  This algorithm may be
@@ -334,7 +334,7 @@
    :n number-of-observations
    :y
    (let ((arr (make-marray 'double-float :dimensions number-of-observations))
-	 (rng (make-random-number-generator *mt19937* 0)))
+	 (rng (make-random-number-generator +mt19937+ 0)))
      (dotimes (i number-of-observations arr)
        (setf (maref arr i)
 	     (+ 1 (* 5 (exp (* -1/10 i))) (gaussian rng 0.1d0)))))
@@ -390,7 +390,7 @@
 
 (defun nonlinear-least-squares-example
     (&optional (number-of-observations 40)
-     (method *levenberg-marquardt*)
+     (method +levenberg-marquardt+)
      (print-steps t))
   (let ((*nlls-example-data* (generate-nlls-data number-of-observations)))
     (let* ((init #m(1.0d0 0.0d0 0.0d0))
@@ -434,4 +434,4 @@
 	     (return (list (fitx 0) (fitx 1) (fitx 2)))))))))
 
 (save-test nonlinear-least-squares
-	   (nonlinear-least-squares-example 40 *levenberg-marquardt* nil))
+	   (nonlinear-least-squares-example 40 +levenberg-marquardt+ nil))
diff --git a/solve-minimize-fit/roots-multi.lisp b/solve-minimize-fit/roots-multi.lisp
index 0bb51fd57ccbaaaedd2b9971787946585d7c215e..4466a1c2391e6ff8bbbb902ab593fc67d05c3ff6 100644
--- a/solve-minimize-fit/roots-multi.lisp
+++ b/solve-minimize-fit/roots-multi.lisp
@@ -1,6 +1,6 @@
 ;;; Multivariate roots.                
 ;;; Liam Healy 2008-01-12 12:49:08
-;;; Time-stamp: <2009-02-08 22:56:14EST roots-multi.lisp>
+;;; Time-stamp: <2009-02-16 09:56:43EST roots-multi.lisp>
 ;;; $Id$
 
 (in-package :gsl)
@@ -242,7 +242,7 @@
 ;;;; Algorithms using derivatives
 ;;;;****************************************************************************
 
-(defmpar *powells-hybrid* "gsl_multiroot_fdfsolver_hybridsj"
+(defmpar +powells-hybrid+ "gsl_multiroot_fdfsolver_hybridsj"
   ;; FDL
   "This is a modified version of Powell's Hybrid method as implemented in
    the hybrj algorithm in minpack.  Minpack was written by Jorge
@@ -288,14 +288,14 @@
    re-evaluations of the Jacobian indicate that the iteration is not
    making any progress, preventing the algorithm from continuing.")
 
-(defmpar *powells-hybrid-unscaled* "gsl_multiroot_fdfsolver_hybridj"
+(defmpar +powells-hybrid-unscaled+ "gsl_multiroot_fdfsolver_hybridj"
   ;; FDL
   "This algorithm is an unscaled version of *powells-hybrid*.  The steps are
    controlled by a spherical trust region |x' - x| < \delta, instead
    of a generalized region.  This can be useful if the generalized region
    estimated by *powells-hybrid* is inappropriate.")
 
-(defmpar *newton-mfdfsolver* "gsl_multiroot_fdfsolver_newton"
+(defmpar +newton-mfdfsolver+ "gsl_multiroot_fdfsolver_newton"
   ;; FDL
   "Newton's Method is the standard root-polishing algorithm.  The algorithm
    begins with an initial guess for the location of the solution.  On each
@@ -309,7 +309,7 @@
    J dx = - f(x)
    using LU decomposition.")
 
-(defmpar *gnewton-mfdfsolver* "gsl_multiroot_fdfsolver_gnewton"
+(defmpar +gnewton-mfdfsolver+ "gsl_multiroot_fdfsolver_gnewton"
   ;; FDL
   "A modified version of Newton's method which attempts to improve
    global convergence by requiring every step to reduce the Euclidean norm
@@ -324,7 +324,7 @@
 ;;;; Algorithms without derivatives
 ;;;;****************************************************************************
 
-(defmpar *hybrid-scaled* "gsl_multiroot_fsolver_hybrids"
+(defmpar +hybrid-scaled+ "gsl_multiroot_fsolver_hybrids"
   ;; FDL
   "This is a version of the Hybrid algorithm which replaces calls to the
      Jacobian function by its finite difference approximation.  The finite
@@ -333,12 +333,12 @@
 ;; Where is this function and parameter?  Only thing that shows in the
 ;; library is gsl_multiroot_fdjacobian.
  
-(defmpar *hybrid-unscaled* "gsl_multiroot_fsolver_hybrid"
+(defmpar +hybrid-unscaled+ "gsl_multiroot_fsolver_hybrid"
   ;; FDL
   "A finite difference version of the Hybrid algorithm without
    internal scaling.")
 
-(defmpar *discrete-newton* "gsl_multiroot_fsolver_dnewton"
+(defmpar +discrete-newton+ "gsl_multiroot_fsolver_dnewton"
   ;; FDL
   "The discrete Newton algorithm is the simplest method of solving a
    multidimensional system.  It uses the Newton iteration
@@ -355,7 +355,7 @@
    iteration.  The algorithm may become unstable if the finite differences
    are not a good approximation to the true derivatives.")
 
-(defmpar *broyden* "gsl_multiroot_fsolver_broyden"
+(defmpar +broyden+ "gsl_multiroot_fsolver_broyden"
   ;; FDL
   "The Broyden algorithm is a version of the discrete Newton
    algorithm which attempts to avoids the expensive update of the Jacobian
@@ -401,7 +401,7 @@
 (make-callbacks multi-dimensional-root-solver-f rosenbrock 2)
 
 (defun roots-multi-example-no-derivative
-    (&optional (method *hybrid-scaled*) (print-steps t))
+    (&optional (method +hybrid-scaled+) (print-steps t))
   "Solving Rosenbrock, the example given in Sec. 34.8 of the GSL manual."
   (let ((max-iter 1000)
 	(solver (make-multi-dimensional-root-solver-f 
@@ -447,7 +447,7 @@
 		rosenbrock rosenbrock-df rosenbrock-fdf 2)
 
 (defun roots-multi-example-derivative
-    (&optional (method *gnewton-mfdfsolver*) (print-steps t))
+    (&optional (method +gnewton-mfdfsolver+) (print-steps t))
   "Solving Rosenbrock with derivatives, the example given in Sec. 34.8
    of the GSL manual."
   (flet ((print-state (iter argval fnval)
@@ -483,11 +483,11 @@
 ;; To see step-by-step information as the solution progresses, make
 ;; the last argument T.
 (save-test roots-multi
- (roots-multi-example-no-derivative *hybrid-unscaled* nil)
- (roots-multi-example-no-derivative *hybrid-scaled* nil)
- (roots-multi-example-no-derivative *discrete-newton* nil)
- (roots-multi-example-no-derivative *broyden* nil)
- (roots-multi-example-derivative *newton-mfdfsolver* nil)
- (roots-multi-example-derivative *gnewton-mfdfsolver* nil)
- (roots-multi-example-derivative *powells-hybrid* nil)
- (roots-multi-example-derivative *powells-hybrid-unscaled* nil))
+ (roots-multi-example-no-derivative +hybrid-unscaled+ nil)
+ (roots-multi-example-no-derivative +hybrid-scaled+ nil)
+ (roots-multi-example-no-derivative +discrete-newton+ nil)
+ (roots-multi-example-no-derivative +broyden+ nil)
+ (roots-multi-example-derivative +newton-mfdfsolver+ nil)
+ (roots-multi-example-derivative +gnewton-mfdfsolver+ nil)
+ (roots-multi-example-derivative +powells-hybrid+ nil)
+ (roots-multi-example-derivative +powells-hybrid-unscaled+ nil))
diff --git a/solve-minimize-fit/roots-one.lisp b/solve-minimize-fit/roots-one.lisp
index 6ce03380f38ecc43e2518b14fecac00fc4ea0dae..3cb029cf8ce5b03ed66632e40b76268e0b44d85e 100644
--- a/solve-minimize-fit/roots-one.lisp
+++ b/solve-minimize-fit/roots-one.lisp
@@ -1,6 +1,6 @@
 ;; One-dimensional root solver.
 ;; Liam Healy 
-;; Time-stamp: <2009-02-15 11:27:34EST roots-one.lisp>
+;; Time-stamp: <2009-02-16 09:50:33EST roots-one.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -177,7 +177,7 @@
 ;;;; Root bracketing algorithms
 ;;;;****************************************************************************
 
-(defmpar *bisection-fsolver* "gsl_root_fsolver_bisection"
+(defmpar +bisection-fsolver+ "gsl_root_fsolver_bisection"
   ;; FDL
   "The bisection algorithm is the simplest method of bracketing the
    roots of a function.   It is the slowest algorithm provided by
@@ -193,7 +193,7 @@
    At any time the current estimate of the root is taken as the midpoint of
    the interval.")
 
-(defmpar *false-position-fsolver* "gsl_root_fsolver_falsepos"
+(defmpar +false-position-fsolver+ "gsl_root_fsolver_falsepos"
   ;; FDL
   "The false position algorithm is a method of finding roots based on
    linear interpolation.  Its convergence is linear, but it is usually
@@ -210,7 +210,7 @@
    The best estimate of the root is taken from the linear interpolation of
    the interval on the current iteration.")
 
-(defmpar *brent-fsolver* "gsl_root_fsolver_brent"
+(defmpar +brent-fsolver+ "gsl_root_fsolver_brent"
   ;; FDL
   "The Brent-Dekker method (referred to here as Brent's method)
    combines an interpolation strategy with the bisection algorithm.  This
@@ -234,7 +234,7 @@
 ;;;; Root finding algorithms using derivatives
 ;;;;****************************************************************************
 
-(defmpar *newton-fdfsolver* "gsl_root_fdfsolver_newton"
+(defmpar +newton-fdfsolver+ "gsl_root_fdfsolver_newton"
   ;; FDL
   "Newton's Method is the standard root-polishing algorithm.  The algorithm
    begins with an initial guess for the location of the root.  On each
@@ -245,7 +245,7 @@
    Newton's method converges quadratically for single roots, and linearly
    for multiple roots.")
 
-(defmpar *secant-fdfsolver* "gsl_root_fdfsolver_secant"
+(defmpar +secant-fdfsolver+ "gsl_root_fdfsolver_secant"
   ;; FDL
   "The secant method is a simplified version of Newton's method which does
    not require the computation of the derivative on every step.
@@ -270,7 +270,7 @@
    5)/2 (approximately 1.62).  It converges linearly for multiple
    roots.")
 
-(defmpar *steffenson-fdfsolver* "gsl_root_fdfsolver_steffenson"
+(defmpar +steffenson-fdfsolver+ "gsl_root_fdfsolver_steffenson"
   ;; FDL
   "The Steffenson method provides the fastest convergence of all the
    routines.  It combines the basic Newton algorithm with an Aitken
@@ -307,7 +307,7 @@
 		quadratic quadratic-derivative quadratic-and-derivative)
 
 (defun roots-one-example-no-derivative
-    (&optional (method *brent-fsolver*) (print-steps t))
+    (&optional (method +brent-fsolver+) (print-steps t))
   "Solving a quadratic, the example given in Sec. 32.10 of the GSL manual."
   (let ((max-iter 50)
 	(solver
@@ -330,7 +330,7 @@
        finally (return root))))
 
 (defun roots-one-example-derivative
-    (&optional (method *newton-fdfsolver*) (print-steps t))
+    (&optional (method +newton-fdfsolver+) (print-steps t))
   "Solving a quadratic, the example given in Sec. 32.10 of the GSL manual."
   (let* ((max-iter 100)
 	 (initial 5.0d0)
@@ -354,9 +354,9 @@
 ;; To see step-by-step information as the solution progresses, make
 ;; the last argument T.
 (save-test roots-one
- (roots-one-example-no-derivative *bisection-fsolver* nil)
- (roots-one-example-no-derivative *false-position-fsolver* nil)
- (roots-one-example-no-derivative *brent-fsolver* nil)
- (roots-one-example-derivative *newton-fdfsolver* nil)
- (roots-one-example-derivative *secant-fdfsolver* nil)
- (roots-one-example-derivative *steffenson-fdfsolver* nil))
+ (roots-one-example-no-derivative +bisection-fsolver+ nil)
+ (roots-one-example-no-derivative +false-position-fsolver+ nil)
+ (roots-one-example-no-derivative +brent-fsolver+ nil)
+ (roots-one-example-derivative +newton-fdfsolver+ nil)
+ (roots-one-example-derivative +secant-fdfsolver+ nil)
+ (roots-one-example-derivative +steffenson-fdfsolver+ nil))
diff --git a/tests/bernoulli.lisp b/tests/bernoulli.lisp
index a64a8514c3ddba7ef0d64821fa06da403f0d04b9..85d5972735ff2fc0bff9d9e5b6663159c224844f 100644
--- a/tests/bernoulli.lisp
+++ b/tests/bernoulli.lisp
@@ -6,7 +6,7 @@
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
                         (LIST (LIST 0 1 1 0 1 1 0 0 0 0 0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (BERNOULLI RNG 0.5d0)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 0.5d0)
diff --git a/tests/beta.lisp b/tests/beta.lisp
index c90ce26c8f34b3e6e4d17997894495616a3aa35c..70e95789e21c3f02dc9a924295a4c95ea0b6b6df 100644
--- a/tests/beta.lisp
+++ b/tests/beta.lisp
@@ -12,7 +12,7 @@
                                0.1731331145031117d0 0.4270743075655188d0
                                0.3353314142479658d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (BETA-RD RNG 1.0d0 2.0d0)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
diff --git a/tests/binomial.lisp b/tests/binomial.lisp
index d62c48d9e490876f05d856cb5f79c53d11abdd5b..df9dc6da22a6ba819a1763ad130a7261f9f319d7 100644
--- a/tests/binomial.lisp
+++ b/tests/binomial.lisp
@@ -6,7 +6,7 @@
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
                         (LIST (LIST 11 3 4 8 4 5 8 6 5 6 6))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (BINOMIAL RNG 0.4d0 12)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
diff --git a/tests/cauchy.lisp b/tests/cauchy.lisp
index 3004a8c7ee3e0208c75adb5391a6a79f0294941a..f9c778da500858d5c502033cd5716b1caefe04e4 100644
--- a/tests/cauchy.lisp
+++ b/tests/cauchy.lisp
@@ -12,7 +12,7 @@
                                -79.0709314248171d0 -10.652071087998578d0
                                -9.393948243493877d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (CAUCHY RNG 10.0d0)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
diff --git a/tests/chi-squared.lisp b/tests/chi-squared.lisp
index faf867a2c37477a6ada3fa9bac46507773b4dd13..ed0448c31f3eb0a1eca0c31b731f531f736aa6f1 100644
--- a/tests/chi-squared.lisp
+++ b/tests/chi-squared.lisp
@@ -12,7 +12,7 @@
                                7.559275305609187d0 8.35181083950897d0
                                4.140798004825149d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (CHI-SQUARED RNG 10.0d0)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
diff --git a/tests/dirichlet.lisp b/tests/dirichlet.lisp
index ec8203756ea9a5e2be56e1b02e7c7379403b3065..b26a0a80fe1fd733e446daf7808d74c3bfc3f5b8 100644
--- a/tests/dirichlet.lisp
+++ b/tests/dirichlet.lisp
@@ -8,7 +8,7 @@
                          #(0.12448073544131681d0 0.19182353706734917d0
                            0.46054388544826397d0 0.22315184204307006d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0))
                                (ALPHA
                                 (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS
                                              '(1.0d0 2.0d0 3.0d0 4.0d0)))
diff --git a/tests/discrete.lisp b/tests/discrete.lisp
index 356fb16c17ff401ee17d092f2ef18aca4d04014a..4de841123326c68c46943782009e5769d4965c9c 100644
--- a/tests/discrete.lisp
+++ b/tests/discrete.lisp
@@ -11,7 +11,7 @@
                                               '(0.25d0 0.5d0 0.25d0)))
                                 (TABLE (MAKE-DISCRETE-RANDOM PROBABILITIES))
                                 (RNG
-                                 (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                                 (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (DISCRETE RNG TABLE)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 0.5d0)
diff --git a/tests/exponential-power.lisp b/tests/exponential-power.lisp
index dbc86b49a477c59dfea51ccb9fb5b5b0f669c845..80fc3172cad2eeee10efeef0b932572badfbf94d 100644
--- a/tests/exponential-power.lisp
+++ b/tests/exponential-power.lisp
@@ -12,7 +12,7 @@
                                -0.027641736349912214d0 0.6318391856046153d0
                                -0.012478875227423025d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (EXPONENTIAL-POWER RNG 1.0d0 2.0d0)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
diff --git a/tests/exponential.lisp b/tests/exponential.lisp
index 1ca3519b177d8b683862ce4d8fdaf983d8e6bc16..b417234c19e8cbaf4f01f64dde645e919bd0c224 100644
--- a/tests/exponential.lisp
+++ b/tests/exponential.lisp
@@ -12,7 +12,7 @@
                                6.161052939065796d0 3.011686333539114d0
                                2.7451079819355364d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (EXPONENTIAL RNG 10.0d0)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 0.1d0)
diff --git a/tests/fdist.lisp b/tests/fdist.lisp
index beecdebb0cff13f69f5c0a48a22097bae3d4a86b..d9a63e5b992638134b5ae848945c736179d7f684 100644
--- a/tests/fdist.lisp
+++ b/tests/fdist.lisp
@@ -12,7 +12,7 @@
                                0.845346894458977d0 2.5212086970057763d0
                                0.5212415547032052d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (FDIST RNG 1.0d0 2.0d0)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
diff --git a/tests/flat.lisp b/tests/flat.lisp
index 5b9c3fa9cdb57fbf6223e0a556f9d5242421ece5..49a2b530b3110dfe9a37e9987bff7cf319788474 100644
--- a/tests/flat.lisp
+++ b/tests/flat.lisp
@@ -12,7 +12,7 @@
                                1.540043658344075d0 1.7399529814720154d0
                                1.7599437981843948d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (FLAT RNG 1.0d0 2.0d0)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 1.0d0)
diff --git a/tests/gamma-randist.lisp b/tests/gamma-randist.lisp
index 15bcf77677a486ae315811cd758a621e6e41dbee..3f5c4a42f29a465d9216ddd65bd7107fee6bdde9 100644
--- a/tests/gamma-randist.lisp
+++ b/tests/gamma-randist.lisp
@@ -12,7 +12,7 @@
                                0.7363931539298727d0 0.9843618987581162d0
                                0.06871686155296197d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (GAMMA-RD RNG 1.0d0 2.0d0)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
@@ -24,7 +24,7 @@
                                0.7363931539298727d0 0.9843618987581162d0
                                0.06871686155296197d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (GAMMA-MT RNG 1.0d0 2.0d0)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
diff --git a/tests/gaussian-bivariate.lisp b/tests/gaussian-bivariate.lisp
index 0cb65b3e9117b74bbc9f0af42d9ebdce7a73f40b..ab12f4b96cfcd14324d2a4ce938d8cb82a862e8f 100644
--- a/tests/gaussian-bivariate.lisp
+++ b/tests/gaussian-bivariate.lisp
@@ -12,7 +12,7 @@
                                -0.11029516610819164d0 0.17931840412143885d0
                                2.1025104980291696d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (BIVARIATE-GAUSSIAN RNG 1.0d0 0.75d0
                                                      0.25d0)))))
diff --git a/tests/gaussian-tail.lisp b/tests/gaussian-tail.lisp
index 5b535f2f0459ab8dbf85d1bc227e44ecd310d15a..7d7ff5e3b603da83b84760aa5b296c10c3513983 100644
--- a/tests/gaussian-tail.lisp
+++ b/tests/gaussian-tail.lisp
@@ -12,7 +12,7 @@
                                53.00107421429086d0 52.149774169929884d0
                                50.11572443504253d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (GAUSSIAN-TAIL RNG 50.0d0 10.0d0)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
@@ -28,7 +28,7 @@
                                5.300107421429086d0 5.214977416992989d0
                                5.011572443504253d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (UGAUSSIAN-TAIL RNG 5.0d0)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
diff --git a/tests/gaussian.lisp b/tests/gaussian.lisp
index 13250c59a5d6d581c31868144a862a96771ba23d..67ef24f3e1b2755ba906ba36f68636783bcbada4 100644
--- a/tests/gaussian.lisp
+++ b/tests/gaussian.lisp
@@ -12,7 +12,7 @@
                                -0.3909131843358723d0 8.935555455208181d0
                                -0.17647794589783283d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (GAUSSIAN RNG 10.0d0)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
@@ -27,7 +27,7 @@
                                2.519120940798607d0 -9.024585521868676d0
                                -9.463283369593537d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (GAUSSIAN-ZIGGURAT RNG 10.0d0)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
diff --git a/tests/geometric.lisp b/tests/geometric.lisp
index a9f716a34ecd5a859a4cbe2a760153b04bef4c42..99325708502e31e5de38830f2ced49f6caba4655 100644
--- a/tests/geometric.lisp
+++ b/tests/geometric.lisp
@@ -6,7 +6,7 @@
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
                         (LIST (LIST 1 4 3 1 3 2 1 1 2 1 1))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (GEOMETRIC RNG 0.4d0)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 0.24d0)
diff --git a/tests/gumbel1.lisp b/tests/gumbel1.lisp
index a2124b929164e0a7eadf94d959c15b37b4e96820..076e757e21adff72ad6425669c52b545469add96 100644
--- a/tests/gumbel1.lisp
+++ b/tests/gumbel1.lisp
@@ -12,7 +12,7 @@
                                1.17748457894919d0 1.893232107970416d0
                                1.9859118616847695d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (GUMBEL1 RNG 1.0d0 2.0d0)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
diff --git a/tests/gumbel2.lisp b/tests/gumbel2.lisp
index 676d969f1fc5078b55b09e02ce10f398714f7555..93ee230256805c3c2587e36f285bec72c9a580f6 100644
--- a/tests/gumbel2.lisp
+++ b/tests/gumbel2.lisp
@@ -12,7 +12,7 @@
                                3.2461983686562204d0 6.640797807286079d0
                                7.285687897019733d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (GUMBEL2 RNG 1.0d0 2.0d0)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
diff --git a/tests/hypergeometric-randist.lisp b/tests/hypergeometric-randist.lisp
index f371a6698824006c3b54ceec5eb3a15f41b41759..3802af8befa29ed23cd50406054a425c8056eb35 100644
--- a/tests/hypergeometric-randist.lisp
+++ b/tests/hypergeometric-randist.lisp
@@ -6,7 +6,7 @@
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
                         (LIST (LIST 2 1 0 0 1 1 3 1 0 1 3))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (HYPERGEOMETRIC RNG 3 6 3)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
diff --git a/tests/landau.lisp b/tests/landau.lisp
index 9f51ea01505cdf431f3120674e55891e3e97a8cd..7b5d27565dcd320881380172670c505bbced3404 100644
--- a/tests/landau.lisp
+++ b/tests/landau.lisp
@@ -12,7 +12,7 @@
                                1.6799546281085946d0 4.2475719218268395d0
                                4.681506208977819d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT (LANDAU RNG)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
                         (LIST 0.17331968995860203d0)
diff --git a/tests/laplace.lisp b/tests/laplace.lisp
index 7226d95edb0ae1404cee18c673812af176be7892..e542c4636a39e42294be304cb9046cf951a83028 100644
--- a/tests/laplace.lisp
+++ b/tests/laplace.lisp
@@ -12,7 +12,7 @@
                                25.24637780914261d0 7.341651048064451d0
                                6.54142651602034d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (LAPLACE RNG 10.0d0)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 0.05d0)
diff --git a/tests/levy.lisp b/tests/levy.lisp
index fc26d780ff3d0dbc03f6fe8d0dc1c98a510da716..b97aa985715a22d151f042a1042c18a4b9172dc1 100644
--- a/tests/levy.lisp
+++ b/tests/levy.lisp
@@ -12,7 +12,7 @@
                                -0.14857899041035147d0 -1.9074885744364487d0
                                -2.086195213997167d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (LEVY RNG 1.0d0 2.0d0)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
@@ -24,7 +24,7 @@
                                -0.14857899041035158d0 -1.907488574436449d0
                                -2.086195213997167d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (LEVY-SKEW RNG 1.0d0 2.0d0 1.0d0))))))
 
diff --git a/tests/logarithmic.lisp b/tests/logarithmic.lisp
index a147a7cfefe5fc2d5a89f80ab0959fdad9d155b9..6dce09cc36d321d589d7f1e196c2fd7589a4b9fb 100644
--- a/tests/logarithmic.lisp
+++ b/tests/logarithmic.lisp
@@ -6,7 +6,7 @@
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
                         (LIST (LIST 1 3 1 4 1 1 2 1 1 5 2))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (LOGARITHMIC RNG 0.9d0)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
diff --git a/tests/logistic.lisp b/tests/logistic.lisp
index d4b34c9c3b7f24216f2483a3727ac7977dfec52a..665c89f5636235a49bbc9b53b3a7950098072d9f 100644
--- a/tests/logistic.lisp
+++ b/tests/logistic.lisp
@@ -12,7 +12,7 @@
                                1.6051840954024446d0 10.457241904701199d0
                                11.523714106294097d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (LOGISTIC RNG 10.0d0)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
diff --git a/tests/lognormal.lisp b/tests/lognormal.lisp
index 4f2f42c8964752c63a47923cd772372028ee8cb4..b9ac8e19f74c166bb266a33ccfa67984214911f0 100644
--- a/tests/lognormal.lisp
+++ b/tests/lognormal.lisp
@@ -12,7 +12,7 @@
                                2.180184852178898d0 3.8908856616896017d0
                                182.18469788916977d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (LOGNORMAL RNG 1.0d0 2.0d0)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
diff --git a/tests/minimization-multi.lisp b/tests/minimization-multi.lisp
index a22b2f01de825da793bb92f301c0a99f7118444f..54f337acb3e06e0994d698629cea47930f02b04f 100644
--- a/tests/minimization-multi.lisp
+++ b/tests/minimization-multi.lisp
@@ -3,24 +3,19 @@
 (in-package :gsl)
 
 (LISP-UNIT:DEFINE-TEST MINIMIZATION-MULTI
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST 0.9920430849306285d0 1.9969168063253164d0
-                              30.000823246638923d0)
-                        (MULTIPLE-VALUE-LIST
-                         (MULTIMIN-EXAMPLE-NO-DERIVATIVE *SIMPLEX-NELDER-MEAD*
-                                                         NIL)))
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST 0.9999999999999997d0 2.0d0 30.0d0)
-                        (MULTIPLE-VALUE-LIST
-                         (MULTIMIN-EXAMPLE-DERIVATIVE
-                          *CONJUGATE-FLETCHER-REEVES* NIL)))
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST 0.9999999999999997d0 2.0d0 30.0d0)
-                        (MULTIPLE-VALUE-LIST
-                         (MULTIMIN-EXAMPLE-DERIVATIVE *CONJUGATE-POLAK-RIBIERE*
-                                                      NIL)))
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST 0.9999999999999997d0 2.0d0 30.0d0)
-                        (MULTIPLE-VALUE-LIST
-                         (MULTIMIN-EXAMPLE-DERIVATIVE *VECTOR-BFGS* NIL))))
-
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST 0.9920430849306285d0 1.9969168063253164d0 30.000823246638923d0)
+   (MULTIPLE-VALUE-LIST
+    (MULTIMIN-EXAMPLE-NO-DERIVATIVE +SIMPLEX-NELDER-MEAD+ NIL)))
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST 0.9999999999999997d0 2.0d0 30.0d0)
+   (MULTIPLE-VALUE-LIST
+    (MULTIMIN-EXAMPLE-DERIVATIVE +CONJUGATE-FLETCHER-REEVES+ NIL)))
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST 0.9999999999999997d0 2.0d0 30.0d0)
+   (MULTIPLE-VALUE-LIST
+    (MULTIMIN-EXAMPLE-DERIVATIVE +CONJUGATE-POLAK-RIBIERE+ NIL)))
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST 0.9999999999999997d0 2.0d0 30.0d0)
+   (MULTIPLE-VALUE-LIST
+    (MULTIMIN-EXAMPLE-DERIVATIVE +VECTOR-BFGS+ NIL))))
diff --git a/tests/minimization-one.lisp b/tests/minimization-one.lisp
index 5e1c23b8e0d280ad3ce00afbd11c659276af0946..f968bc8987577b88fd400cb8f1c06387ba2d85ac 100644
--- a/tests/minimization-one.lisp
+++ b/tests/minimization-one.lisp
@@ -3,17 +3,14 @@
 (in-package :gsl)
 
 (LISP-UNIT:DEFINE-TEST MINIMIZATION-ONE
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST 6 3.141474321994987d0 3.1415930343642042d0
-                              3.141592654724622d0 1.134828675475319d-9
-                              1.1871236921701112d-4)
-                        (MULTIPLE-VALUE-LIST
-                         (MINIMIZATION-ONE-EXAMPLE *BRENT-FMINIMIZER* NIL)))
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST 24 3.1413247152275243d0 3.1419619412229034d0
-                              3.1415652995716155d0 -2.7354018177661032d-5
-                              6.37225995379076d-4)
-                        (MULTIPLE-VALUE-LIST
-                         (MINIMIZATION-ONE-EXAMPLE *GOLDEN-SECTION-FMINIMIZER*
-                                                   NIL))))
-
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST 6 3.141474321994987d0 3.1415930343642042d0
+	 3.141592654724622d0 1.134828675475319d-9
+	 1.1871236921701112d-4)
+   (MULTIPLE-VALUE-LIST (MINIMIZATION-ONE-EXAMPLE +BRENT-FMINIMIZER+ NIL)))
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST 24 3.1413247152275243d0 3.1419619412229034d0
+	 3.1415652995716155d0 -2.7354018177661032d-5
+	 6.37225995379076d-4)
+   (MULTIPLE-VALUE-LIST
+    (MINIMIZATION-ONE-EXAMPLE +GOLDEN-SECTION-FMINIMIZER+ NIL))))
diff --git a/tests/multinomial.lisp b/tests/multinomial.lisp
index 0046b05303ba8518b9678c1c8cfbb0f2e933a0ca..adf8786e5606a32b7d97c191954fc1a4a883c77e 100644
--- a/tests/multinomial.lisp
+++ b/tests/multinomial.lisp
@@ -7,7 +7,7 @@
                                                           (MULTIPLE-VALUE-LIST
                                                            (LET ((RNG
                                                                   (MAKE-RANDOM-NUMBER-GENERATOR
-                                                                   *MT19937*
+                                                                   +MT19937+
                                                                    0))
                                                                  (P
                                                                   (MAKE-MARRAY
diff --git a/tests/negative-binomial.lisp b/tests/negative-binomial.lisp
index 70c336d2ca99eb538a95d8473e9cdcaaf0b375e9..99174922ecdd6794af4abb498fc622b4a98090f7 100644
--- a/tests/negative-binomial.lisp
+++ b/tests/negative-binomial.lisp
@@ -6,7 +6,7 @@
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
                         (LIST (LIST 15 21 19 15 8 18 23 18 33 16 10))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (NEGATIVE-BINOMIAL RNG 0.4d0 12.0d0)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
@@ -24,7 +24,7 @@
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
                         (LIST (LIST 15 21 19 15 8 18 23 18 33 16 10))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (PASCAL RNG 0.4d0 12)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
diff --git a/tests/nonlinear-least-squares.lisp b/tests/nonlinear-least-squares.lisp
index 679031426d4d671fc64d627646c9784c39b7422f..efc082a248bf4caacba5d708c7d3bbd0577d58a2 100644
--- a/tests/nonlinear-least-squares.lisp
+++ b/tests/nonlinear-least-squares.lisp
@@ -3,9 +3,7 @@
 (in-package :gsl)
 
 (LISP-UNIT:DEFINE-TEST NONLINEAR-LEAST-SQUARES
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST
-                         (LIST 5.045357801443204d0 0.10404905892045835d0
-                               1.0192487061031013d0))
-                        (MULTIPLE-VALUE-LIST
-			 (NONLINEAR-LEAST-SQUARES-EXAMPLE 40 *levenberg-marquardt* NIL))))
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST (LIST 5.045357801443204d0 0.10404905892045835d0 1.0192487061031013d0))
+   (MULTIPLE-VALUE-LIST
+    (NONLINEAR-LEAST-SQUARES-EXAMPLE 40 +levenberg-marquardt+ NIL))))
diff --git a/tests/ode.lisp b/tests/ode.lisp
index 971eeaf81c7c043e1de034fe6254e7c6e6852014..95d32cebd8f9eb540917c979bb792f527fc60d22 100644
--- a/tests/ode.lisp
+++ b/tests/ode.lisp
@@ -3,56 +3,42 @@
 (in-package :gsl)
 
 (LISP-UNIT:DEFINE-TEST ODE
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST 495 1.0d0 -1.4568657425802234d0
-                              -11.547345633897558d0)
-                        (MULTIPLE-VALUE-LIST
-                         (INTEGRATE-VANDERPOL 1.0d0 1.d-4 *STEP-RK2* NIL)))
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST 40 1.0d0 -1.4568569264026898d0
-                              -11.547449151779395d0)
-                        (MULTIPLE-VALUE-LIST
-                         (INTEGRATE-VANDERPOL 1.0d0 1.d-4 *STEP-RK4* NIL)))
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST 35 1.0d0 -1.456874342553472d0
-                              -11.547250693698407d0)
-                        (MULTIPLE-VALUE-LIST
-                         (INTEGRATE-VANDERPOL 1.0d0 1.d-4 *STEP-RKF45* NIL)))
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST 27 1.0d0 -1.4568588825970334d0
-                              -11.547432342449643d0)
-                        (MULTIPLE-VALUE-LIST
-                         (INTEGRATE-VANDERPOL 1.0d0 1.d-4 *STEP-RKCK* NIL)))
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST 16 1.0d0 -1.4568622636249005d0
-                              -11.547385179410822d0)
-                        (MULTIPLE-VALUE-LIST
-                         (INTEGRATE-VANDERPOL 1.0d0 1.d-4 *STEP-RK8PD* NIL)))
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST 359 1.0d0 -1.4569507371916566d0
-                              -11.546406519788615d0)
-                        (MULTIPLE-VALUE-LIST
-                         (INTEGRATE-VANDERPOL 1.0d0 1.d-4 *STEP-RK2IMP* NIL)))
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST 40 1.0d0 -1.4568644436344684d0
-                              -11.547361181933427d0)
-                        (MULTIPLE-VALUE-LIST
-                         (INTEGRATE-VANDERPOL 1.0d0 1.d-4 *STEP-RK4IMP* NIL)))
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST 9 1.0d0 -1.4568620806209944d0
-                              -11.547387321938151d0)
-                        (MULTIPLE-VALUE-LIST
-                         (INTEGRATE-VANDERPOL 1.0d0 1.d-4 *STEP-BSIMP* NIL)))
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST 11176 1.0d0 -1.459959741392502d0
-                              -11.510866371379606d0)
-                        (MULTIPLE-VALUE-LIST
-                         (LET ((*MAX-ITER* 12000))
-                           (INTEGRATE-VANDERPOL 1.0d0 1.d-4 *STEP-GEAR1*
-                                                NIL))))
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST 52 1.0d0 -1.4568645170220367d0
-                              -11.54736019525012d0)
-                        (MULTIPLE-VALUE-LIST
-                         (INTEGRATE-VANDERPOL 1.0d0 1.d-4 *STEP-GEAR2* NIL))))
-
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST 495 1.0d0 -1.4568657425802234d0 -11.547345633897558d0)
+   (MULTIPLE-VALUE-LIST (INTEGRATE-VANDERPOL 1.0d0 1.d-4 +STEP-RK2+ NIL)))
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST 40 1.0d0 -1.4568569264026898d0 -11.547449151779395d0)
+   (MULTIPLE-VALUE-LIST (INTEGRATE-VANDERPOL 1.0d0 1.d-4 +STEP-RK4+ NIL)))
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST 35 1.0d0 -1.456874342553472d0 -11.547250693698407d0)
+   (MULTIPLE-VALUE-LIST
+    (INTEGRATE-VANDERPOL 1.0d0 1.d-4 +STEP-RKF45+ NIL)))
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST 27 1.0d0 -1.4568588825970334d0 -11.547432342449643d0)
+   (MULTIPLE-VALUE-LIST
+    (INTEGRATE-VANDERPOL 1.0d0 1.d-4 +STEP-RKCK+ NIL)))
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST 16 1.0d0 -1.4568622636249005d0 -11.547385179410822d0)
+   (MULTIPLE-VALUE-LIST
+    (INTEGRATE-VANDERPOL 1.0d0 1.d-4 +STEP-RK8PD+ NIL)))
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST 359 1.0d0 -1.4569507371916566d0 -11.546406519788615d0)
+   (MULTIPLE-VALUE-LIST
+    (INTEGRATE-VANDERPOL 1.0d0 1.d-4 +STEP-RK2IMP+ NIL)))
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST 40 1.0d0 -1.4568644436344684d0 -11.547361181933427d0)
+   (MULTIPLE-VALUE-LIST
+    (INTEGRATE-VANDERPOL 1.0d0 1.d-4 +STEP-RK4IMP+ NIL)))
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST 9 1.0d0 -1.4568620806209944d0 -11.547387321938151d0)
+   (MULTIPLE-VALUE-LIST
+    (INTEGRATE-VANDERPOL 1.0d0 1.d-4 +STEP-BSIMP+ NIL)))
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST 11176 1.0d0 -1.459959741392502d0 -11.510866371379606d0)
+   (MULTIPLE-VALUE-LIST
+    (LET ((*MAX-ITER* 12000))
+      (INTEGRATE-VANDERPOL 1.0d0 1.d-4 +STEP-GEAR1+ NIL))))
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST 52 1.0d0 -1.4568645170220367d0 -11.54736019525012d0)
+   (MULTIPLE-VALUE-LIST
+    (INTEGRATE-VANDERPOL 1.0d0 1.d-4 +STEP-GEAR2+ NIL))))
diff --git a/tests/pareto.lisp b/tests/pareto.lisp
index b253e4701419563672bf1559b68443201313f54a..661a543b12b6673fa18995961d3143f7a7d5e753 100644
--- a/tests/pareto.lisp
+++ b/tests/pareto.lisp
@@ -12,7 +12,7 @@
                                3.703404287965457d0 2.7028744394290123d0
                                2.631773566385122d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (PARETO RNG 1.0d0 2.0d0)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
diff --git a/tests/poisson.lisp b/tests/poisson.lisp
index b72771c480c243c13045a7e31aa951af50fb69c6..47ba650012db8e76728144dfdb64f33eda11123a 100644
--- a/tests/poisson.lisp
+++ b/tests/poisson.lisp
@@ -6,7 +6,7 @@
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
                         (LIST (LIST 15 6 9 9 5 8 11 9 11 5 10))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (POISSON RNG 10.0d0)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
diff --git a/tests/random-number-generators.lisp b/tests/random-number-generators.lisp
index bfb239fd567c17877df8149b29dcd818b7523a2c..4327715499237791eace603b3f869f4e79764be4 100644
--- a/tests/random-number-generators.lisp
+++ b/tests/random-number-generators.lisp
@@ -3,22 +3,22 @@
 (in-package :gsl)
 
 (LISP-UNIT:DEFINE-TEST RANDOM-NUMBER-GENERATORS
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST
-                         (LIST 999 162 282 947 231 484 957 744 540 739 759))
-                        (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
-                           (LOOP FOR I FROM 0 TO 10 COLLECT
-                                 (UNIFORM-FIXNUM RNG 1000)))))
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST
-                         (LIST 0.11177622997750353d0 0.9591667949963206d0
-                               0.8415268011584537d0 0.9254037136795947d0
-                               0.27540698474059205d0 0.7093040573919677d0
-                               0.5541333041871588d0 0.8806957769583426d0
-                               0.597139396982798d0 0.7518741133398722d0
-                               0.9311084621265104d0))
-                        (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *CMRG* 0)))
-                           (LOOP FOR I FROM 0 TO 10 COLLECT (UNIFORM RNG))))))
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST
+    (LIST 999 162 282 947 231 484 957 744 540 739 759))
+   (MULTIPLE-VALUE-LIST
+    (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
+      (LOOP FOR I FROM 0 TO 10 COLLECT
+	   (UNIFORM-FIXNUM RNG 1000)))))
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST
+    (LIST 0.11177622997750353d0 0.9591667949963206d0
+	  0.8415268011584537d0 0.9254037136795947d0
+	  0.27540698474059205d0 0.7093040573919677d0
+	  0.5541333041871588d0 0.8806957769583426d0
+	  0.597139396982798d0 0.7518741133398722d0
+	  0.9311084621265104d0))
+   (MULTIPLE-VALUE-LIST
+    (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +CMRG+ 0)))
+      (LOOP FOR I FROM 0 TO 10 COLLECT (UNIFORM RNG))))))
 
diff --git a/tests/rayleigh-tail.lisp b/tests/rayleigh-tail.lisp
index e570f0b520515da87dc510cff8393126e6c6684c..b7ced5a26fc6126aa9750668f1b3622357019e32 100644
--- a/tests/rayleigh-tail.lisp
+++ b/tests/rayleigh-tail.lisp
@@ -12,7 +12,7 @@
                                11.145450138119857d0 7.825198187316554d0
                                7.476774681552917d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (RAYLEIGH-TAIL RNG 1.0d0 10.0d0)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
diff --git a/tests/rayleigh.lisp b/tests/rayleigh.lisp
index 0426404df447446b48aa4c4d0db77d330dc49af1..7f5e9719982891d1bab926bbb4d4808f9645eef6 100644
--- a/tests/rayleigh.lisp
+++ b/tests/rayleigh.lisp
@@ -12,7 +12,7 @@
                                11.100498132125239d0 7.76103902005281d0
                                7.409599155063027d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (RAYLEIGH RNG 10.0d0)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
diff --git a/tests/roots-multi.lisp b/tests/roots-multi.lisp
index c5f630c7a6ce90f40aede9a3c692942ec7588980..add199fa01e5c33d422efa786bd038911a257ced 100644
--- a/tests/roots-multi.lisp
+++ b/tests/roots-multi.lisp
@@ -3,48 +3,40 @@
 (in-package :gsl)
 
 (LISP-UNIT:DEFINE-TEST ROOTS-MULTI
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST 0.9999999999999992d0 0.9999999999999716d0
-                              7.771561172376096d-16 -2.686739719592879d-13)
-                        (MULTIPLE-VALUE-LIST
-                         (ROOTS-MULTI-EXAMPLE-NO-DERIVATIVE *HYBRID-UNSCALED*
-                                                            NIL)))
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST 1.0d0 1.0d0 0.0d0 0.0d0)
-                        (MULTIPLE-VALUE-LIST
-                         (ROOTS-MULTI-EXAMPLE-NO-DERIVATIVE *HYBRID-SCALED*
-                                                            NIL)))
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST 1.0d0 1.0000000000000004d0 0.0d0
-                              4.440892098500626d-15)
-                        (MULTIPLE-VALUE-LIST
-                         (ROOTS-MULTI-EXAMPLE-NO-DERIVATIVE *DISCRETE-NEWTON*
-                                                            NIL)))
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST 1.0d0 1.0000000000000568d0 0.0d0
-                              5.684341886080801d-13)
-                        (MULTIPLE-VALUE-LIST
-                         (ROOTS-MULTI-EXAMPLE-NO-DERIVATIVE *BROYDEN* NIL)))
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST 1.0d0 1.0d0 0.0d0 0.0d0)
-                        (MULTIPLE-VALUE-LIST
-                         (ROOTS-MULTI-EXAMPLE-DERIVATIVE *NEWTON-MFDFSOLVER*
-                                                         NIL)))
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST 0.999999999999998d0 0.9999999999999964d0
-                              1.9984014443252818d-15 4.440892098500626d-15)
-                        (MULTIPLE-VALUE-LIST
-                         (ROOTS-MULTI-EXAMPLE-DERIVATIVE *GNEWTON-MFDFSOLVER*
-                                                         NIL)))
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST 1.0d0 1.0d0 0.0d0 0.0d0)
-                        (MULTIPLE-VALUE-LIST
-                         (ROOTS-MULTI-EXAMPLE-DERIVATIVE *POWELLS-HYBRID*
-                                                         NIL)))
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST 0.9999999999999996d0 1.0000000000000568d0
-                              4.440892098500626d-16 5.773159728050814d-13)
-                        (MULTIPLE-VALUE-LIST
-                         (ROOTS-MULTI-EXAMPLE-DERIVATIVE
-                          *POWELLS-HYBRID-UNSCALED* NIL))))
-
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST 0.9999999999999992d0 0.9999999999999716d0
+	 7.771561172376096d-16 -2.686739719592879d-13)
+   (MULTIPLE-VALUE-LIST
+    (ROOTS-MULTI-EXAMPLE-NO-DERIVATIVE +HYBRID-UNSCALED+ NIL)))
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST 1.0d0 1.0d0 0.0d0 0.0d0)
+   (MULTIPLE-VALUE-LIST
+    (ROOTS-MULTI-EXAMPLE-NO-DERIVATIVE +HYBRID-SCALED+ NIL)))
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST 1.0d0 1.0000000000000004d0 0.0d0
+	 4.440892098500626d-15)
+   (MULTIPLE-VALUE-LIST
+    (ROOTS-MULTI-EXAMPLE-NO-DERIVATIVE +DISCRETE-NEWTON+ NIL)))
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST 1.0d0 1.0000000000000568d0 0.0d0
+	 5.684341886080801d-13)
+   (MULTIPLE-VALUE-LIST
+    (ROOTS-MULTI-EXAMPLE-NO-DERIVATIVE +BROYDEN+ NIL)))
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST 1.0d0 1.0d0 0.0d0 0.0d0)
+   (MULTIPLE-VALUE-LIST
+    (ROOTS-MULTI-EXAMPLE-DERIVATIVE +NEWTON-MFDFSOLVER+ NIL)))
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST 0.999999999999998d0 0.9999999999999964d0
+	 1.9984014443252818d-15 4.440892098500626d-15)
+   (MULTIPLE-VALUE-LIST
+    (ROOTS-MULTI-EXAMPLE-DERIVATIVE +GNEWTON-MFDFSOLVER+ NIL)))
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST 1.0d0 1.0d0 0.0d0 0.0d0)
+   (MULTIPLE-VALUE-LIST
+    (ROOTS-MULTI-EXAMPLE-DERIVATIVE +POWELLS-HYBRID+ NIL)))
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST 0.9999999999999996d0 1.0000000000000568d0
+	 4.440892098500626d-16 5.773159728050814d-13)
+   (MULTIPLE-VALUE-LIST
+    (ROOTS-MULTI-EXAMPLE-DERIVATIVE +POWELLS-HYBRID-UNSCALED+ NIL))))
diff --git a/tests/roots-one.lisp b/tests/roots-one.lisp
index 170e28d065fa3d1d741652a618647bcac58c328b..88200f4ad3b7a92f9d050297efb95591aecd65ac 100644
--- a/tests/roots-one.lisp
+++ b/tests/roots-one.lisp
@@ -3,34 +3,27 @@
 (in-package :gsl)
 
 (LISP-UNIT:DEFINE-TEST ROOTS-ONE
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST 2.2357177734375d0)
-                        (MULTIPLE-VALUE-LIST
-                         (ROOTS-ONE-EXAMPLE-NO-DERIVATIVE *BISECTION-FSOLVER*
-                                                          NIL)))
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST 2.23606797749979d0)
-                        (MULTIPLE-VALUE-LIST
-                         (ROOTS-ONE-EXAMPLE-NO-DERIVATIVE
-                          *FALSE-POSITION-FSOLVER* NIL)))
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST 2.2360634081902244d0)
-                        (MULTIPLE-VALUE-LIST
-                         (ROOTS-ONE-EXAMPLE-NO-DERIVATIVE *BRENT-FSOLVER*
-                                                          NIL)))
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST 2.236067977499978d0)
-                        (MULTIPLE-VALUE-LIST
-                         (ROOTS-ONE-EXAMPLE-DERIVATIVE *NEWTON-FDFSOLVER*
-                                                       NIL)))
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST 2.2360679849648637d0)
-                        (MULTIPLE-VALUE-LIST
-                         (ROOTS-ONE-EXAMPLE-DERIVATIVE *SECANT-FDFSOLVER*
-                                                       NIL)))
-                       (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-                        (LIST 2.23606797749979d0)
-                        (MULTIPLE-VALUE-LIST
-                         (ROOTS-ONE-EXAMPLE-DERIVATIVE *STEFFENSON-FDFSOLVER*
-                                                       NIL))))
-
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST 2.2357177734375d0)
+   (MULTIPLE-VALUE-LIST
+    (ROOTS-ONE-EXAMPLE-NO-DERIVATIVE +BISECTION-FSOLVER+ NIL)))
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST 2.23606797749979d0)
+   (MULTIPLE-VALUE-LIST
+    (ROOTS-ONE-EXAMPLE-NO-DERIVATIVE +FALSE-POSITION-FSOLVER+ NIL)))
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST 2.2360634081902244d0)
+   (MULTIPLE-VALUE-LIST
+    (ROOTS-ONE-EXAMPLE-NO-DERIVATIVE +BRENT-FSOLVER+ NIL)))
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST 2.236067977499978d0)
+   (MULTIPLE-VALUE-LIST
+    (ROOTS-ONE-EXAMPLE-DERIVATIVE +NEWTON-FDFSOLVER+ NIL)))
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST 2.2360679849648637d0)
+   (MULTIPLE-VALUE-LIST
+    (ROOTS-ONE-EXAMPLE-DERIVATIVE +SECANT-FDFSOLVER+ NIL)))
+  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
+   (LIST 2.23606797749979d0)
+   (MULTIPLE-VALUE-LIST
+    (ROOTS-ONE-EXAMPLE-DERIVATIVE +STEFFENSON-FDFSOLVER+ NIL))))
diff --git a/tests/shuffling-sampling.lisp b/tests/shuffling-sampling.lisp
index 5e0da672ff47ca0704b419b5dd55a67cf19b0795..dc24734751427d70de1d2d7c2f38c44d2f7d4ecf 100644
--- a/tests/shuffling-sampling.lisp
+++ b/tests/shuffling-sampling.lisp
@@ -6,7 +6,7 @@
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
                         (LIST #(4 3 6 1 5 7 2 8))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0))
                                (V1
                                 (MAKE-MARRAY '(SIGNED-BYTE 32)
                                              :INITIAL-CONTENTS
@@ -17,7 +17,7 @@
                                                           (MULTIPLE-VALUE-LIST
                                                            (LET ((RNG
                                                                   (MAKE-RANDOM-NUMBER-GENERATOR
-                                                                   *MT19937*
+                                                                   +MT19937+
                                                                    0))
                                                                  (V1
                                                                   (MAKE-MARRAY
@@ -39,7 +39,7 @@
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
                         (LIST #(8 2 3 8 2 4 8 6 5 6))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0))
                                (V1
                                 (MAKE-MARRAY '(SIGNED-BYTE 32)
                                              :INITIAL-CONTENTS
diff --git a/tests/spherical-vector.lisp b/tests/spherical-vector.lisp
index 79303b2200bfbbe157c9132e713b2b4d4a959de3..b99939ec1fd17b7b610df178a1f95cad0d90b7ad 100644
--- a/tests/spherical-vector.lisp
+++ b/tests/spherical-vector.lisp
@@ -11,7 +11,7 @@
                                0.45726622946182216d0 0.8893298574734622d0
                                -0.46325616159849964d0 -0.8862244234622655d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 4 APPEND
                                  (MULTIPLE-VALUE-LIST (DIRECTION-2D RNG))))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
@@ -22,7 +22,7 @@
                                0.9454753227485545d0 -0.3256937427607672d0
                                0.11500033916619544d0 0.9933654523848008d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 4 APPEND
                                  (MULTIPLE-VALUE-LIST
                                   (DIRECTION-2D-TRIG-METHOD RNG))))))
@@ -34,7 +34,7 @@
                                0.13993766535985133d0 0.8385462620524484d0
                                -0.526552576872909d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 2 APPEND
                                  (MULTIPLE-VALUE-LIST (DIRECTION-3D RNG)))))))
 
diff --git a/tests/tdist.lisp b/tests/tdist.lisp
index e7658899caa106e0cfc1310a2c4d87e0d8e38b00..41c44b038e4e71bbf8943ca93925f1ac10e838a8 100644
--- a/tests/tdist.lisp
+++ b/tests/tdist.lisp
@@ -12,7 +12,7 @@
                                -0.6534666117199732d0 0.2035771324523077d0
                                1.77650300477611d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (TDIST RNG 10.0d0)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
diff --git a/tests/weibull.lisp b/tests/weibull.lisp
index f0a17c305edc60194d99bd1289421fc05a077153..e23e307a8efdc409fa4a4cf56a49282faf3559a2 100644
--- a/tests/weibull.lisp
+++ b/tests/weibull.lisp
@@ -12,7 +12,7 @@
                                0.7849237503774361d0 0.5487883320132739d0
                                0.5239377808419179d0))
                         (MULTIPLE-VALUE-LIST
-                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR *MT19937* 0)))
+                         (LET ((RNG (MAKE-RANDOM-NUMBER-GENERATOR +MT19937+ 0)))
                            (LOOP FOR I FROM 0 TO 10 COLLECT
                                  (WEIBULL RNG 1.0d0 2.0d0)))))
                        (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
diff --git a/wavelet.lisp b/wavelet.lisp
index 53c7ce1a42b23a8ca5f15cccd6dc89f415dac938..cde4e352cb590529329395d695fa62710b51c6f9 100644
--- a/wavelet.lisp
+++ b/wavelet.lisp
@@ -1,6 +1,6 @@
 ;; Wavelet transforms.
 ;; Liam Healy, Mon Nov 26 2007 - 20:43
-;; Time-stamp: <2009-01-25 09:58:21EST wavelet.lisp>
+;; Time-stamp: <2009-02-16 09:59:18EST wavelet.lisp>
 ;; $Id$
 
 (in-package :gsl)
@@ -30,35 +30,35 @@
    family.  A memory-allocation-failure error indicates either
    lack of memory or an unsupported member requested.")
 
-(defmpar *daubechies-wavelet* "gsl_wavelet_daubechies"
+(defmpar +daubechies-wavelet+ "gsl_wavelet_daubechies"
   ;; FDL
   "The Daubechies wavelet family of maximum phase with member/2
    vanishing moments.  The implemented wavelets are 
    member=4, 6,..., 20, with member even.")
 
-(defmpar *daubechies-wavelet-centered* "gsl_wavelet_daubechies_centered"
+(defmpar +daubechies-wavelet-centered+ "gsl_wavelet_daubechies_centered"
   ;; FDL
   "The Daubechies wavelet family of maximum phase with member/2
    vanishing moments.  The implemented wavelets are 
    member=4, 6,..., 20, with member even.")
 
-(defmpar *haar-wavelet* "gsl_wavelet_haar"
+(defmpar +haar-wavelet+ "gsl_wavelet_haar"
   ;; FDL
   "The Haar wavelet.  The only valid choice for member for the
    Haar wavelet is member=2.")
 
-(defmpar *haar-wavelet-centered* "gsl_wavelet_haar_centered"
+(defmpar +haar-wavelet-centered+ "gsl_wavelet_haar_centered"
   ;; FDL
   "The Haar wavelet.  The only valid choice for member for the
    Haar wavelet is member=2.")
 
-(defmpar *bspline-wavelet* "gsl_wavelet_bspline"
+(defmpar +bspline-wavelet+ "gsl_wavelet_bspline"
   ;; FDL
   "The biorthogonal B-spline wavelet family of order (i,j).  
    The implemented values of member = 100*i + j are 103, 105, 202, 204,
    206, 208, 301, 303, 305 307, 309.")
 
-(defmpar *bspline-wavelet-centered* "gsl_wavelet_bspline_centered"
+(defmpar +bspline-wavelet-centered+ "gsl_wavelet_bspline_centered"
   ;; FDL
   "The biorthogonal B-spline wavelet family of order (i,j).  
    The implemented values of member = 100*i + j are 103, 105, 202, 204,
@@ -367,7 +367,7 @@
    setting the others to zero.  See GSL manual Section 30.4."
   (let* ((n (length cl-data))
 	 (vector cl-data)
-	 (wavelet (make-wavelet *daubechies-wavelet* 4))
+	 (wavelet (make-wavelet +daubechies-wavelet+ 4))
 	 (workspace (make-wavelet-workspace n)))
     (wavelet-transform-forward wavelet vector 1 workspace)
     (let ((absvector (make-marray 'double-float :dimensions n))
@@ -387,7 +387,7 @@
   "Simpler example, with only a Daubechies wavelet forward transformation."
   (let* ((n (length cl-data))
 	 (vector cl-data)
-	 (wavelet (make-wavelet *daubechies-wavelet* 4))
+	 (wavelet (make-wavelet +daubechies-wavelet+ 4))
 	 (workspace (make-wavelet-workspace n)))
     (wavelet-transform-forward wavelet vector 1 workspace)
     (cl-array vector)))