diff --git a/interface.lisp b/interface.lisp
index 7e3369f559588791e5c6107bd0379caa846cfd1e..2d6118b6f411d41092fb6f46285072dd0d13abbb 100644
--- a/interface.lisp
+++ b/interface.lisp
@@ -3,7 +3,7 @@
 ; description: Macros to interface GSL functions.
 ; date:        Mon Mar  6 2006 - 22:35                   
 ; author:      Liam M. Healy
-; modified:    Sat Mar 25 2006 - 21:50
+; modified:    Sat Mar 25 2006 - 22:11
 ;********************************************************
 
 (in-package :gsl)
@@ -198,7 +198,7 @@ and a scaling exponent e10, such that the value is val*10^e10."
 		  #:LEN4183)))))
 
 ;;;;****************************************************************************
-;;;; Macro defun-sf 
+;;;; Macro defun-gsl 
 ;;;;****************************************************************************
 
 (defun wfo-declare (d)
@@ -216,7 +216,7 @@ and a scaling exponent e10, such that the value is val*10^e10."
 
 ;;; Warning isn't quite right for lambdas.
 ;;; New name?
-(defmacro defun-sf
+(defmacro defun-gsl
     (cl-name arguments gsl-name
      &key documentation return mode (c-return-value :error-code))
   "Define a CL function that provides an interface to a GSL function.
diff --git a/polynomial.lisp b/polynomial.lisp
index 6062158a9137c83956080c68269c0c8c548138c3..2c9e5bcec84972b41defdf964c758b2dcd333326 100644
--- a/polynomial.lisp
+++ b/polynomial.lisp
@@ -3,7 +3,7 @@
 ; description: Polynomials                               
 ; date:        Tue Mar 21 2006 - 18:33                   
 ; author:      Liam M. Healy                             
-; modified:    Sat Mar 25 2006 - 21:55
+; modified:    Sat Mar 25 2006 - 22:11
 ;********************************************************
 ;;; $Id: $
 
@@ -19,7 +19,7 @@
 ;;;;****************************************************************************
 
 ;;; (polynomial-eval #(1.0d0 2.0d0 3.0d0) -1.0d0)
-(defun-sf polynomial-eval 
+(defun-gsl polynomial-eval 
     ((coefficients (:double *)) (x :double))
   "gsl_poly_eval"
   :documentation
@@ -109,7 +109,7 @@
 ;;;; Quadratic Equations
 ;;;;****************************************************************************
 
-(defun-sf solve-quadratic ((a :double) (b :double) (c :double))
+(defun-gsl solve-quadratic ((a :double) (b :double) (c :double))
   "gsl_poly_solve_quadratic"
   :documentation
   "The real roots of the quadratic equation a x^2 + b x + c = 0.
@@ -118,7 +118,7 @@
   :return (:double :double)
   :c-return-value :number-of-answers)
 
-(defun-sf solve-quadratic-complex ((a :double) (b :double) (c :double))
+(defun-gsl solve-quadratic-complex ((a :double) (b :double) (c :double))
   "gsl_poly_complex_solve_quadratic"
   :documentation
   "The complex roots of the quadratic equation a x^2 + b x + c = 0.
@@ -141,7 +141,7 @@
 ;;; NIL
 ;;; NIL
 
-(defun-sf solve-cubic ((a :double) (b :double) (c :double))
+(defun-gsl solve-cubic ((a :double) (b :double) (c :double))
   "gsl_poly_solve_cubic"
   :documentation
   "Find the real roots of the cubic equation, x^3 + a x^2 + b x + c = 0
@@ -151,7 +151,7 @@
   :return (:double :double :double)
   :c-return-value :number-of-answers)
 
-(defun-sf solve-cubic-complex ((a :double) (b :double) (c :double))
+(defun-gsl solve-cubic-complex ((a :double) (b :double) (c :double))
   "gsl_poly_complex_solve_cubic"
   :documentation
   "Find the complex roots of the cubic equation, x^3 + a x^2 + b x + c = 0
@@ -174,7 +174,7 @@
   "Macro to create and cleanup workspace for polynomial root solver." 
   `(let ((,workspace
 	  (funcall
-	   (defun-sf :lambda ((n :size))
+	   (defun-gsl :lambda ((n :size))
 	     "gsl_poly_complex_workspace_alloc"
 	     :return
 	     (poly-complex-workspace)
@@ -183,12 +183,12 @@
     (unwind-protect 
 	 (progn ,@body)
       (funcall
-       (defun-sf :lambda ((,workspace poly-complex-workspace))
+       (defun-gsl :lambda ((,workspace poly-complex-workspace))
 	 "gsl_poly_complex_workspace_free"
 	 :c-return-value :void)
        ,workspace))))
 
-(defun-sf polynomial-solve
+(defun-gsl polynomial-solve
     ((coefficients (:double n)) (workspace poly-complex-workspace))
   "gsl_poly_complex_solve"
   :documentation
diff --git a/special-functions/airy.lisp b/special-functions/airy.lisp
index 94fb4fcb1729af6f66bc56a5e6797fde5dfb573e..5b09d6d7e09f278a2016ca763d1454a9231f1b32 100644
--- a/special-functions/airy.lisp
+++ b/special-functions/airy.lisp
@@ -3,7 +3,7 @@
 ; description: Airy functions                            
 ; date:        Fri Mar 17 2006 - 18:41                   
 ; author:      Liam M. Healy
-; modified:    Sat Mar 18 2006 - 15:21
+; modified:    Sat Mar 25 2006 - 22:11
 ;********************************************************
 
 (in-package :gsl)
@@ -12,7 +12,7 @@
 ;;;; Airy functions
 ;;;;****************************************************************************
 
-(defun-sf airy-Ai ((x :double))
+(defun-gsl airy-Ai ((x :double))
   "gsl_sf_airy_Ai_e"
   :return (sf-result)
   :documentation "The Airy function Ai(x)."
@@ -22,68 +22,68 @@
 ;;; 0.24308135437540998d0
 ;;; 6.288670879282072d-17
 
-(defun-sf airy-Bi ((x :double))
+(defun-gsl airy-Bi ((x :double))
   "gsl_sf_airy_Bi_e"
   :return (sf-result)
   :documentation "The Airy function Bi(x)."
   :mode t)
 
-(defun-sf airy-Ai-scaled ((x :double))
+(defun-gsl airy-Ai-scaled ((x :double))
   "gsl_sf_airy_Ai_scaled_e"
   :return (sf-result)
   :documentation "The scaled Airy function @math{S_A(x) Ai(x)}.  For @math{x>0} the scaling factor @math{S_A(x)} is @c{$\exp(+(2/3) x^{3/2})$} @math{\exp(+(2/3) x^(3/2))}, and is 1 for @math{x<0}."
   :mode t)
 
-(defun-sf airy-Bi-scaled ((x :double))
+(defun-gsl airy-Bi-scaled ((x :double))
   "gsl_sf_airy_Bi_scaled_e"
   :return (sf-result)
   :documentation "The scaled Airy function @math{S_B(x) Bi(x)}.  For @math{x>0} the scaling factor @math{S_B(x)} is @c{$\exp(-(2/3) x^{3/2})$} @math{exp(-(2/3) x^(3/2))}, and is 1 for @math{x<0}."
   :mode t)
 
-(defun-sf airy-Ai-deriv ((x :double))
+(defun-gsl airy-Ai-deriv ((x :double))
   "gsl_sf_airy_Ai_deriv_e"
   :return (sf-result)
   :documentation "The Airy function derivative Ai'(x)."
   :mode t)
 
-(defun-sf airy-Bi-deriv ((x :double))
+(defun-gsl airy-Bi-deriv ((x :double))
   "gsl_sf_airy_Bi_deriv_e"
   :return (sf-result)
   :documentation "The Airy function derivative Bi'(x)."
   :mode t)
 
-(defun-sf airy-Ai-deriv-scaled ((x :double))
+(defun-gsl airy-Ai-deriv-scaled ((x :double))
   "gsl_sf_airy_Ai_deriv_scaled_e"
   :return (sf-result)
   :documentation "The scaled Airy function derivative S_A(x) Ai'(x).  For @math{x>0} the scaling factor @math{S_A(x)} is @c{$\exp(+(2/3) x^{3/2})$} @math{\exp(+(2/3) x^(3/2))}, and is 1 for @math{x<0}."
   :mode t)
 
-(defun-sf airy-Bi-deriv-scaled ((x :double))
+(defun-gsl airy-Bi-deriv-scaled ((x :double))
   "gsl_sf_airy_Bi_deriv_scaled_e"
   :return (sf-result)
   :documentation "The scaled Airy function derivative S_B(x) Bi'(x).  For @math{x>0} the scaling factor @math{S_B(x)} is @c{$\exp(-(2/3) x^{3/2})$} @math{exp(-(2/3) x^(3/2))}, and is 1 for @math{x<0}."
   :mode t)
 
-(defun-sf airy-zero-Ai ((s :unsigned-int))
+(defun-gsl airy-zero-Ai ((s :unsigned-int))
   "gsl_sf_airy_zero_Ai_e"
   :return (sf-result)
   :documentation "The location of the @var{s}-th zero of the Airy function @math{Ai(x)}."
   :mode t)
 
-(defun-sf airy-zero-Bi ((s :unsigned-int))
+(defun-gsl airy-zero-Bi ((s :unsigned-int))
   "gsl_sf_airy_zero_Bi_e"
   :return (sf-result)
   :documentation "The location of the @var{s}-th zero of the Airy function @math{Bi(x)}."
   :mode t)
 
-(defun-sf airy-zero-Ai-deriv ((s :unsigned-int))
+(defun-gsl airy-zero-Ai-deriv ((s :unsigned-int))
   "gsl_sf_airy_zero_Ai_deriv_e"
   :return (sf-result)
   :documentation "The location of the @var{s}-th zero of the Airy
 function derivative @math{Ai'(x)}."
   :mode t)
 
-(defun-sf airy-zero-Bi-deriv ((s :unsigned-int))
+(defun-gsl airy-zero-Bi-deriv ((s :unsigned-int))
   "gsl_sf_airy_zero_Bi_deriv_e"
   :return (sf-result)
   :documentation "The location of the @var{s}-th zero of the Airy function derivative @math{Bi'(x)}."
diff --git a/special-functions/bessel.lisp b/special-functions/bessel.lisp
index c663706763fcc2e0cce34d1de3cfbeda78b8c86d..3cd66fd2236f086d21fa029731a2b150eb4eda9c 100644
--- a/special-functions/bessel.lisp
+++ b/special-functions/bessel.lisp
@@ -3,7 +3,7 @@
 ; description: Bessel functions                          
 ; date:        Fri Mar 17 2006 - 18:42                   
 ; author:      Liam M. Healy
-; modified:    Tue Mar 21 2006 - 13:50
+; modified:    Sat Mar 25 2006 - 22:11
 ;********************************************************
 
 (in-package :gsl)
@@ -12,25 +12,25 @@
 ;;;; Regular Cylindrical Bessel Functions
 ;;;;****************************************************************************
 
-(defun-sf cylindrical-bessel-J0 ((x :double))
+(defun-gsl cylindrical-bessel-J0 ((x :double))
   "gsl_sf_bessel_J0_e"
   :documentation
   "The regular cylindrical Bessel function of zeroth order, @math{J_0(x)}."
   :return (sf-result))
 
-(defun-sf cylindrical-bessel-J1 ((x :double))
+(defun-gsl cylindrical-bessel-J1 ((x :double))
   "gsl_sf_bessel_J1_e"
   :documentation
   "The regular cylindrical Bessel function of first order, @math{J_1(x)}."
   :return (sf-result))
 
-(defun-sf cylindrical-bessel-Jn ((n :int) (x :double))
+(defun-gsl cylindrical-bessel-Jn ((n :int) (x :double))
   "gsl_sf_bessel_Jn_e"
   :documentation
   "The regular cylindrical Bessel function of order @var{n}, @math{J_n(x)}."
   :return (sf-result))
 
-(defun-sf cylindrical-bessel-Jn-array ((nmin :int) (nmax :int) (x :double))
+(defun-gsl cylindrical-bessel-Jn-array ((nmin :int) (nmax :int) (x :double))
   "gsl_sf_bessel_Jn_array"
   :documentation
   "The values of the regular cylindrical Bessel functions @math{J_n(x)} for @math{n} from @var{nmin} to @var{nmax} inclusive.  The values are computed using recurrence relations for efficiency, and therefore may differ slightly from the exact values."
@@ -40,25 +40,25 @@
 ;;;; Irregular Cylindrical Bessel Functions
 ;;;;****************************************************************************
 
-(defun-sf cylindrical-bessel-Y0 ((x :double))
+(defun-gsl cylindrical-bessel-Y0 ((x :double))
   "gsl_sf_bessel_Y0_e"
   :documentation
   "The irregular cylindrical Bessel function of zeroth order, @math{Y_0(x)}."
   :return (sf-result))
 
-(defun-sf cylindrical-bessel-Y1 ((x :double))
+(defun-gsl cylindrical-bessel-Y1 ((x :double))
   "gsl_sf_bessel_Y1_e"
   :documentation
   "The irregular cylindrical Bessel function of first order, @math{Y_1(x)}."
   :return (sf-result))
 
-(defun-sf cylindrical-bessel-Yn ((n :int) (x :double))
+(defun-gsl cylindrical-bessel-Yn ((n :int) (x :double))
   "gsl_sf_bessel_Yn_e"
   :documentation
   "The irregular cylindrical Bessel function of order @var{n}, @math{Y_n(x)}."
   :return (sf-result))
 
-(defun-sf cylindrical-bessel-Yn-array ((nmin :int) (nmax :int) (x :double))
+(defun-gsl cylindrical-bessel-Yn-array ((nmin :int) (nmax :int) (x :double))
   "gsl_sf_bessel_Yn_array"
   :documentation
   "The values of the irregular cylindrical Bessel functions @math{Y_n(x)} for @math{n} from @var{nmin} to @var{nmax} inclusive.  The values are computed using recurrence relations for efficiency, and therefore may differ slightly from the exact values."
@@ -68,49 +68,49 @@
 ;;;; Regular Modified Cylindrical Bessel Functions
 ;;;;****************************************************************************
 
-(defun-sf cylindrical-bessel-I0 ((x :double))
+(defun-gsl cylindrical-bessel-I0 ((x :double))
   "gsl_sf_bessel_I0_e"
   :documentation
   "The regular modified cylindrical Bessel function of zeroth order, @math{I_0(x)}."
   :return (sf-result))
 
-(defun-sf cylindrical-bessel-I1 ((x :double))
+(defun-gsl cylindrical-bessel-I1 ((x :double))
   "gsl_sf_bessel_I1_e"
   :documentation
   "The regular modified cylindrical Bessel function of first order, @math{I_1(x)}."
   :return (sf-result))
 
-(defun-sf cylindrical-bessel-In ((n :int) (x :double))
+(defun-gsl cylindrical-bessel-In ((n :int) (x :double))
   "gsl_sf_bessel_In_e"
   :documentation
   "The regular modified cylindrical Bessel function of order @var{n}, @math{I_n(x)}."
   :return (sf-result))
 
-(defun-sf cylindrical-bessel-In-array ((nmin :int) (nmax :int) (x :double))
+(defun-gsl cylindrical-bessel-In-array ((nmin :int) (nmax :int) (x :double))
   "gsl_sf_bessel_In_array"
   :documentation
   "The values of the regular modified cylindrical Bessel functions @math{I_n(x)} for @math{n} from @var{nmin} to @var{nmax} inclusive.  The values are computed using recurrence relations for efficiency, and therefore may differ slightly from the exact values."
   :return ((:double (1+ (- nmax nmin)))))
 
-(defun-sf cylindrical-bessel-I0-scaled ((x :double))
+(defun-gsl cylindrical-bessel-I0-scaled ((x :double))
   "gsl_sf_bessel_I0_scaled_e"
   :documentation
   "The scaled regular modified cylindrical Bessel function of zeroth order, @math{\exp(-|x|) I_0(x)}."
   :return (sf-result))
 
-(defun-sf cylindrical-bessel-I1-scaled ((x :double))
+(defun-gsl cylindrical-bessel-I1-scaled ((x :double))
   "gsl_sf_bessel_I1_scaled_e"
   :documentation
   "The scaled regular modified cylindrical Bessel function of first order, @math{\exp(-|x|) I_1(x)}."
   :return (sf-result))
 
-(defun-sf cylindrical-bessel-In-scaled ((n :int) (x :double))
+(defun-gsl cylindrical-bessel-In-scaled ((n :int) (x :double))
   "gsl_sf_bessel_In_scaled_e"
   :documentation
   "The scaled regular modified cylindrical Bessel function of order @var{n}, @math{\exp(-|x|) I_n(x)}}."
   :return (sf-result))
 
-(defun-sf cylindrical-bessel-In-scaled-array ((nmin :int) (nmax :int) (x :double))
+(defun-gsl cylindrical-bessel-In-scaled-array ((nmin :int) (nmax :int) (x :double))
   "gsl_sf_bessel_In_scaled_array"
   :documentation
   ;; Bug in original documentation?  doesn't say "modified"
@@ -121,49 +121,49 @@
 ;;;; Irregular Modified Cylindrical Bessel Functions
 ;;;;****************************************************************************
 
-(defun-sf cylindrical-bessel-K0 ((x :double))
+(defun-gsl cylindrical-bessel-K0 ((x :double))
   "gsl_sf_bessel_K0_e"
   :documentation
   "The irregular modified cylindrical Bessel function of zeroth order, @math{K_0(x)}."
   :return (sf-result))
 
-(defun-sf cylindrical-bessel-K1 ((x :double))
+(defun-gsl cylindrical-bessel-K1 ((x :double))
   "gsl_sf_bessel_K1_e"
   :documentation
   "The irregular modified cylindrical Bessel function of first order, @math{K_1(x)}."
   :return (sf-result))
 
-(defun-sf cylindrical-bessel-Kn ((n :int) (x :double))
+(defun-gsl cylindrical-bessel-Kn ((n :int) (x :double))
   "gsl_sf_bessel_Kn_e"
   :documentation
   "The irregular modified cylindrical Bessel function of order @var{n}, @math{K_n(x)}."
   :return (sf-result))
 
-(defun-sf cylindrical-bessel-Kn-array ((nmin :int) (nmax :int) (x :double))
+(defun-gsl cylindrical-bessel-Kn-array ((nmin :int) (nmax :int) (x :double))
   "gsl_sf_bessel_Kn_array"
   :documentation
   "The values of the irregular modified cylindrical Bessel functions @math{K_n(x)} for @math{n} from @var{nmin} to @var{nmax} inclusive.  The values are computed using recurrence relations for efficiency, and therefore may differ slightly from the exact values."
   :return ((:double (1+ (- nmax nmin)))))
 
-(defun-sf cylindrical-bessel-K0-scaled ((x :double))
+(defun-gsl cylindrical-bessel-K0-scaled ((x :double))
   "gsl_sf_bessel_K0_scaled_e"
   :documentation
   "The scaled irregular modified cylindrical Bessel function of zeroth order, @math{\exp(-|x|) K_0(x)}."
   :return (sf-result))
 
-(defun-sf cylindrical-bessel-K1-scaled ((x :double))
+(defun-gsl cylindrical-bessel-K1-scaled ((x :double))
   "gsl_sf_bessel_K1_scaled_e"
   :documentation
   "The scaled irregular modified cylindrical Bessel function of first order, @math{\exp(-|x|) K_1(x)}."
   :return (sf-result))
 
-(defun-sf cylindrical-bessel-Kn-scaled ((n :int) (x :double))
+(defun-gsl cylindrical-bessel-Kn-scaled ((n :int) (x :double))
   "gsl_sf_bessel_Kn_scaled_e"
   :documentation
   "The scaled irregular modified cylindrical Bessel function of order @var{n}, @math{\exp(-|x|) K_n(x)}}."
   :return (sf-result))
 
-(defun-sf cylindrical-bessel-Kn-scaled-array ((nmin :int) (nmax :int) (x :double))
+(defun-gsl cylindrical-bessel-Kn-scaled-array ((nmin :int) (nmax :int) (x :double))
   "gsl_sf_bessel_Kn_scaled_array"
   :documentation
   ;; Bug in original documentation?  doesn't say "modified"
@@ -174,36 +174,36 @@
 ;;;; Regular Spherical Bessel Functions
 ;;;;****************************************************************************
 
-(defun-sf spherical-bessel-j0 ((x :double))
+(defun-gsl spherical-bessel-j0 ((x :double))
   "gsl_sf_bessel_j0_e"
   :documentation
   "The regular spherical Bessel function of zeroth order, @math{j_0(x) = \sin(x)/x}."
   :return (sf-result))
 
-(defun-sf spherical-bessel-j1 ((x :double))
+(defun-gsl spherical-bessel-j1 ((x :double))
   "gsl_sf_bessel_j1_e"
   :documentation
   "The regular spherical Bessel function of first order, @math{j_1(x) = (\sin(x)/x - \cos(x))/x}."
   :return (sf-result))
 
-(defun-sf spherical-bessel-j2 ((x :double))
+(defun-gsl spherical-bessel-j2 ((x :double))
   "gsl_sf_bessel_j2_e"
   :documentation
   "The regular spherical Bessel function of second order, @math{j_2(x) = ((3/x^2 - 1)\sin(x) - 3\cos(x)/x)/x}."
   :return (sf-result))
 
-(defun-sf spherical-bessel-jl ((l :int) (x :double))
+(defun-gsl spherical-bessel-jl ((l :int) (x :double))
   "gsl_sf_bessel_jl_e"
   :documentation "The regular spherical Bessel function of order @var{l}, @math{j_l(x)}, for @c{$l \geq 0$} @math{l >= 0} and @c{$x \geq 0$} @math{x >= 0}."
   :return (sf-result))
 
-(defun-sf spherical-bessel-jl-array ((lmax :int) (x :double))
+(defun-gsl spherical-bessel-jl-array ((lmax :int) (x :double))
   "gsl_sf_bessel_jl_array"
   :documentation
   "The regular spherical Bessel functions @math{j_l(x)} for @math{l} from 0 to @var{lmax} inclusive  for @c{$lmax \geq 0$} @math{lmax >= 0} and @c{$x \geq 0$} @math{x >= 0}, storing the results in the array @var{result_array}. The values are computed using recurrence relations for efficiency, and therefore may differ slightly from the exact values."
   :return ((:double (1+ lmax))))
 
-(defun-sf spherical-bessel-jl-steed-array ((lmax :int) (x :double))
+(defun-gsl spherical-bessel-jl-steed-array ((lmax :int) (x :double))
   "gsl_sf_bessel_jl_steed_array"
   :documentation
   "Uses Steed's method to compute the values of the regular spherical Bessel functions @math{j_l(x)} for @math{l} from 0 to @var{lmax} inclusive for @c{$lmax \geq 0$} @math{lmax >= 0} and @c{$x \geq 0$} @math{x >= 0}, storing the results in the array @var{result_array}. The Steed/Barnett algorithm is described in @cite{Comp. Phys. Comm.} 21, 297 (1981).  Steed's method is more stable than the recurrence used in the other functions but is also slower."
@@ -213,31 +213,31 @@
 ;;;; Irregular Spherical Bessel Functions
 ;;;;****************************************************************************
 
-(defun-sf spherical-bessel-y0 ((x :double))
+(defun-gsl spherical-bessel-y0 ((x :double))
   "gsl_sf_bessel_y0_e"
   :documentation
   "The irregular spherical Bessel function of zeroth order, @math{y_0(x) = -\cos(x)/x}."
   :return (sf-result))
 
-(defun-sf spherical-bessel-y1 ((x :double))
+(defun-gsl spherical-bessel-y1 ((x :double))
   "gsl_sf_bessel_y1_e"
   :documentation
   "The irregular spherical Bessel function of first order, @math{y_1(x) = -(\cos(x)/x + \sin(x))/x}."
   :return (sf-result))
 
-(defun-sf spherical-bessel-y2 ((x :double))
+(defun-gsl spherical-bessel-y2 ((x :double))
   "gsl_sf_bessel_y2_e"
   :documentation
   "The irregular spherical Bessel function of second order, @math{y_2(x) = (-3/x^3 + 1/x)\cos(x) - (3/x^2)\sin(x)}."
   :return (sf-result))
 
-(defun-sf spherical-bessel-yl ((l :int) (x :double))
+(defun-gsl spherical-bessel-yl ((l :int) (x :double))
   "gsl_sf_bessel_yl_e"
   :documentation
   "The irregular spherical Bessel function of order @var{l}, @math{y_l(x)}, for @c{$l \geq 0$} @math{l >= 0}."
   :return (sf-result))
 
-(defun-sf spherical-bessel-yl-array ((lmax :int) (x :double))
+(defun-gsl spherical-bessel-yl-array ((lmax :int) (x :double))
   "gsl_sf_bessel_yl_array"
   :documentation
   "The irregular spherical Bessel functions @math{y_l(x)} for @math{l} from 0 to @var{lmax} inclusive  for @c{$lmax \geq 0$} @math{lmax >= 0}, storing the results in the array @var{result_array}. The values are computed using recurrence relations for efficiency, and therefore may differ slightly from the exact values."
@@ -247,31 +247,31 @@
 ;;;; Regular Modified Spherical Bessel Functions
 ;;;;****************************************************************************
 
-(defun-sf spherical-bessel-i0-scaled ((x :double))
+(defun-gsl spherical-bessel-i0-scaled ((x :double))
   "gsl_sf_bessel_i0_scaled_e"
   :documentation
   "The scaled regular modified spherical Bessel function of zeroth order, @math{\exp(-|x|) i_0(x)}."
   :return (sf-result))
 
-(defun-sf spherical-bessel-i1-scaled ((x :double))
+(defun-gsl spherical-bessel-i1-scaled ((x :double))
   "gsl_sf_bessel_i1_scaled_e"
   :documentation
   "The scaled regular modified spherical Bessel function of first order, @math{\exp(-|x|) i_1(x)}."
   :return (sf-result))
 
-(defun-sf spherical-bessel-i2-scaled ((x :double))
+(defun-gsl spherical-bessel-i2-scaled ((x :double))
   "gsl_sf_bessel_i2_scaled_e"
   :documentation
   "The scaled regular modified spherical Bessel function of second order, @math{ \exp(-|x|) i_2(x) }."
   :return (sf-result))
 
-(defun-sf spherical-bessel-il-scaled ((n :int) (x :double))
+(defun-gsl spherical-bessel-il-scaled ((n :int) (x :double))
   "gsl_sf_bessel_il_scaled_e"
   :documentation
   "The scaled regular modified spherical Bessel function of order @var{l}, @math{ \exp(-|x|) i_l(x) }."
   :return (sf-result))
 
-(defun-sf spherical-bessel-il-scaled-array ((lmax :int) (x :double))
+(defun-gsl spherical-bessel-il-scaled-array ((lmax :int) (x :double))
   "gsl_sf_bessel_il_scaled_array"
   :documentation
   "The values of the scaled regular modified cylindrical Bessel functions @math{\exp(-|x|) i_l(x)} for @math{l} from 0 to @var{lmax} inclusive for @c{$lmax \geq 0$} @math{lmax >= 0}, storing the results in the array @var{result_array}.  The values are computed using recurrence relations for efficiency, and therefore may differ slightly from the exact values."
@@ -281,31 +281,31 @@
 ;;;; Irregular Modified Spherical Bessel Functions
 ;;;;****************************************************************************
 
-(defun-sf spherical-bessel-k0-scaled ((x :double))
+(defun-gsl spherical-bessel-k0-scaled ((x :double))
   "gsl_sf_bessel_k0_scaled_e"
   :documentation
   "The scaled irregular modified spherical Bessel function of zeroth order, @math{\exp(x) k_0(x)}, for @math{x>0}."
   :return (sf-result))
 
-(defun-sf spherical-bessel-k1-scaled ((x :double))
+(defun-gsl spherical-bessel-k1-scaled ((x :double))
   "gsl_sf_bessel_k1_scaled_e"
   :documentation
   "The scaled irregular modified spherical Bessel function of first order, @math{\exp(x) k_1(x)}, for @math{x>0}."
   :return (sf-result))
 
-(defun-sf spherical-bessel-k2-scaled ((x :double))
+(defun-gsl spherical-bessel-k2-scaled ((x :double))
   "gsl_sf_bessel_k2_scaled_e"
   :documentation
   "The scaled irregular modified spherical Bessel function of second order, @math{\exp(x) k_2(x)}, for @math{x>0}."
   :return (sf-result))
 
-(defun-sf spherical-bessel-kl-scaled ((n :int) (x :double))
+(defun-gsl spherical-bessel-kl-scaled ((n :int) (x :double))
   "gsl_sf_bessel_il_scaled_e"
   :documentation
   "The scaled irregular modified spherical Bessel function of order @var{l}, @math{\exp(x) k_l(x)}, for @math{x>0}."
   :return (sf-result))
 
-(defun-sf spherical-bessel-kl-scaled-array ((lmax :int) (x :double))
+(defun-gsl spherical-bessel-kl-scaled-array ((lmax :int) (x :double))
   "gsl_sf_bessel_kl_scaled_array"
   :documentation
   "The values of the scaled irregular modified spherical Bessel functions @math{\exp(x) k_l(x)} for @math{l} from 0 to @var{lmax} inclusive for @c{$lmax \geq 0$} @math{lmax >= 0} and @math{x>0}, storing the results in the array @var{result_array}.  The values are computed using recurrence relations for efficiency, and therefore may differ slightly from the exact values."
@@ -315,7 +315,7 @@
 ;;;; Regular Bessel Function - Fractional Order
 ;;;;****************************************************************************
 
-(defun-sf bessel-Jnu ((nu :double) (x :double))
+(defun-gsl bessel-Jnu ((nu :double) (x :double))
   "gsl_sf_bessel_Jnu_e"
   :documentation
   "The regular cylindrical Bessel function of fractional order @math{\nu}, @math{J_\nu(x)}."
@@ -323,7 +323,7 @@
 
 ;;; (double @var{nu}, gsl_mode_t @var{mode}, size_t @var{size}, double @var{v}[])
 #+development
-(defun-sf bessel-sequence-Jnu ((nu :double) (v :pointer))
+(defun-gsl bessel-sequence-Jnu ((nu :double) (v :pointer))
   "gsl_sf_bessel_sequence_Jnu_e"
   :documentation
   "The regular cylindrical Bessel function of
@@ -366,7 +366,7 @@ The array is over-written with the values of @math{J_nu(x_i)}."
 ;;;; Irregular Bessel Function - Fractional Order
 ;;;;****************************************************************************
 
-(defun-sf bessel-Ynu ((nu :double) (x :double))
+(defun-gsl bessel-Ynu ((nu :double) (x :double))
   "gsl_sf_bessel_Ynu_e"
   :documentation
   "The irregular cylindrical Bessel function of fractional order @math{\nu}, @math{Y_\nu(x)}."
@@ -376,13 +376,13 @@ The array is over-written with the values of @math{J_nu(x_i)}."
 ;;;; Regular Modified Bessel Functions - Fractional Order
 ;;;;****************************************************************************
 
-(defun-sf bessel-Inu ((nu :double) (x :double))
+(defun-gsl bessel-Inu ((nu :double) (x :double))
   "gsl_sf_bessel_Inu_e"
   :documentation
   "The regular modified Bessel function of fractional order @math{\nu}, @math{I_\nu(x)} for @math{x>0}, @math{\nu>0}."
   :return (sf-result))
 
-(defun-sf bessel-Inu-scaled ((nu :double) (x :double))
+(defun-gsl bessel-Inu-scaled ((nu :double) (x :double))
   "gsl_sf_bessel_Inu_scaled_e"
   :documentation
   "The scaled regular modified Bessel function of fractional order @math{\nu}, @math{\exp(-|x|)I_\nu(x)} for @math{x>0}, @math{\nu>0}."
@@ -392,19 +392,19 @@ The array is over-written with the values of @math{J_nu(x_i)}."
 ;;;; Irregular Modified Bessel Functions - Fractional Order
 ;;;;****************************************************************************
 
-(defun-sf bessel-Knu ((nu :double) (x :double))
+(defun-gsl bessel-Knu ((nu :double) (x :double))
   "gsl_sf_bessel_Knu_e"
   :documentation
   "The irregular modified Bessel function of fractional order @math{\nu}, @math{K_\nu(x)} for @math{x>0}, @math{\nu>0}."
   :return (sf-result))
 
-(defun-sf bessel-lnKnu ((nu :double) (x :double))
+(defun-gsl bessel-lnKnu ((nu :double) (x :double))
   "gsl_sf_bessel_lnKnu_e"
   :documentation
   "The logarithm of the irregular modified Bessel function of fractional order @math{\nu}, @math{\ln(K_\nu(x))} for @math{x>0}, @math{\nu>0}."
   :return (sf-result))
 
-(defun-sf bessel-Knu-scaled ((nu :double) (x :double))
+(defun-gsl bessel-Knu-scaled ((nu :double) (x :double))
   "gsl_sf_bessel_Knu_scaled_e"
   :documentation
   "The scaled irregular modified Bessel function of fractional order @math{\nu}, @math{\exp(+|x|) K_\nu(x)} for @math{x>0}, @math{\nu>0}."
@@ -414,19 +414,19 @@ The array is over-written with the values of @math{J_nu(x_i)}."
 ;;;; Zeros of Regular Bessel Functions
 ;;;;****************************************************************************
 
-(defun-sf bessel-zero-J0 ((s :int))
+(defun-gsl bessel-zero-J0 ((s :int))
   "gsl_sf_bessel_zero_J0_e"
   :documentation
   "The location of the @var{s}-th positive zero of the Bessel function @math{J_0(x)}."
   :return (sf-result))
 
-(defun-sf bessel-zero-J1 ((s :int))
+(defun-gsl bessel-zero-J1 ((s :int))
   "gsl_sf_bessel_zero_J1_e"
   :documentation
   "The location of the @var{s}-th positive zero of the Bessel function @math{J_1(x)}."
   :return (sf-result))
 
-(defun-sf bessel-zero-Jnu ((s :int))
+(defun-gsl bessel-zero-Jnu ((s :int))
   "gsl_sf_bessel_zero_Jnu_e"
   :documentation
   "These routines compute the location of the @var{s}-th positive zero of
diff --git a/special-functions/clausen.lisp b/special-functions/clausen.lisp
index c9a98cc2046e616df1778629d51d7977842e2f93..8a880c4b9d2ba5451262e48436eb4bfb4b5f526b 100644
--- a/special-functions/clausen.lisp
+++ b/special-functions/clausen.lisp
@@ -3,13 +3,13 @@
 ; description: Clausen function                          
 ; date:        Sat Mar 18 2006 - 23:18                   
 ; author:      Liam M. Healy                             
-; modified:    Sat Mar 18 2006 - 23:22
+; modified:    Sat Mar 25 2006 - 22:11
 ;********************************************************
 ;;; $Id:$
 
 (in-package :gsl)
 
-(defun-sf clausen ((x :double))
+(defun-gsl clausen ((x :double))
   "gsl_sf_clausen_e"
   :documentation
   "The Clausen integral @math{Cl_2(x)}."
diff --git a/special-functions/coulomb.lisp b/special-functions/coulomb.lisp
index 11dc2d4abf641f8c9d0bf013ffb8c8b1846736fa..97445c63f5f77fc8a195ec3991f5afabe772ca84 100644
--- a/special-functions/coulomb.lisp
+++ b/special-functions/coulomb.lisp
@@ -3,7 +3,7 @@
 ; description: Coulumb functions                         
 ; date:        Sat Mar 18 2006 - 23:23                   
 ; author:      Liam M. Healy                             
-; modified:    Sun Mar 19 2006 - 00:41
+; modified:    Sat Mar 25 2006 - 22:11
 ;********************************************************
 ;;; $Id:$
 
@@ -13,13 +13,13 @@
 ;;;; Normalized Hydrogenic Bound States
 ;;;;****************************************************************************
 
-(defun-sf hydrogenicR-1 ((x :double) (r :double))
+(defun-gsl hydrogenicR-1 ((x :double) (r :double))
   "gsl_sf_hydrogenicR_1_e"
   :documentation
   "The lowest-order normalized hydrogenic bound state radial wavefunction @c{$R_1 := 2Z \sqrt{Z} \exp(-Z r)$} @math{R_1 := 2Z \sqrt@{Z@} \exp(-Z r)}."
   :return (sf-result))
 
-(defun-sf hydrogenicR ((n :int) (l :int) (x :double) (r :double))
+(defun-gsl hydrogenicR ((n :int) (l :int) (x :double) (r :double))
   "gsl_sf_hydrogenicR_e"
   :documentation
   "The @var{n}-th normalized hydrogenic bound state radial wavefunction,
@@ -37,7 +37,7 @@ The normalization is chosen such that the wavefunction @math{\psi} is given by
 ;;; Comments are direct from GSL and aren't lispized yet.
 
 ;;; Returns should be reorganized sensibly.
-(defun-sf coulomb-wave-FG ((eta :double) (x :double) (L-F :double) (k :int))
+(defun-gsl coulomb-wave-FG ((eta :double) (x :double) (L-F :double) (k :int))
   "gsl_sf_coulomb_wave_FG_e"
   :documentation
   "The Coulomb wave functions @math{F_L(\eta,x)},
@@ -56,7 +56,7 @@ the modifiable parameters @var{exp_F}, @var{exp_G}."
   :return
   (sf-result sf-result sf-result sf-result :double :double))
 
-(defun-sf coulomb-wave-F-array
+(defun-gsl coulomb-wave-F-array
     ((L-min :double) (kmax :int) (eta :double) (x :double))
   "gsl_sf_coulomb_wave_F_array"
   :documentation
@@ -65,7 +65,7 @@ the modifiable parameters @var{exp_F}, @var{exp_G}."
 In the case of overflow the exponent is stored in @var{F_exponent}."
   :return ((:double (1+ kmax)) :double))
 
-(defun-sf coulomb-wave-FG-array
+(defun-gsl coulomb-wave-FG-array
     ((L-min :double) (kmax :int) (eta :double) (x :double))
   "gsl_sf_coulomb_wave_F_array"
   :documentation
@@ -75,7 +75,7 @@ results in @var{fc_array} and @var{gc_array}.  In the case of overflow the
 exponents are stored in @var{F_exponent} and @var{G_exponent}."
   :return ((:double (1+ kmax)) (:double (1+ kmax)) :double :double))
 
-(defun-sf coulomb-wave-FGp-array 
+(defun-gsl coulomb-wave-FGp-array 
     ((L-min :double) (kmax :int) (eta :double) (x :double))
   "gsl_sf_coulomb_wave_FGp_array"
   :documentation
@@ -89,7 +89,7 @@ and @var{G_exponent}."
 	   (:double (1+ kmax)) (:double (1+ kmax))
 	   :double :double))
 
-(defun-sf coulomb-wave-sphF-array
+(defun-gsl coulomb-wave-sphF-array
     ((L-min :double) (kmax :int) (eta :double) (x :double))
   "gsl_sf_coulomb_wave_sphF_array"
   :documentation
@@ -104,13 +104,13 @@ functions in the limit @math{\eta \to 0}."
 ;;;; Coulomb Wave Function Normalization Constant
 ;;;;****************************************************************************
 
-(defun-sf coulomb-CL ((L :double) (eta :double))
+(defun-gsl coulomb-CL ((L :double) (eta :double))
   "gsl_sf_coulomb_CL_e"
   :documentation
   "The Coulomb wave function normalization constant @math{C_L(\eta)} for @math{L > -1}."
   :return (sf-result))
 
-(defun-sf coulomb-CL-array ((Lmin :double) (kmax :int) (eta :double))
+(defun-gsl coulomb-CL-array ((Lmin :double) (kmax :int) (eta :double))
   "gsl_sf_coulomb_CL_array"
   :documentation
   "The Coulomb wave function normalization constant @math{C_L(\eta)} for @math{L = Lmin \dots Lmin + kmax}, @math{Lmin > -1}."
diff --git a/special-functions/coupling.lisp b/special-functions/coupling.lisp
index aecadf388907fb5e063837d917faa2d8e718564c..6f490a1c7e098b9378e939f7ee144e70c68b03e5 100644
--- a/special-functions/coupling.lisp
+++ b/special-functions/coupling.lisp
@@ -3,7 +3,7 @@
 ; description: Coupling coefficients                     
 ; date:        Sun Mar 19 2006 - 13:30                   
 ; author:      Liam M. Healy                             
-; modified:    Sun Mar 19 2006 - 14:25
+; modified:    Sat Mar 25 2006 - 22:11
 ;********************************************************
 ;;; $Id: $
 
@@ -19,7 +19,7 @@ section are declared in the header file @file{gsl_sf_coupling.h}.
 
 (in-package :gsl)
 
-(defun-sf coupling-3j ((two-ja :int) (two-jb :int) (two-jc :int)
+(defun-gsl coupling-3j ((two-ja :int) (two-jb :int) (two-jc :int)
 		       (two-ma :int) (two-mb :int) (two-mc :int)) 
   "gsl_sf_coupling_3j_e"
   :documentation
@@ -36,7 +36,7 @@ where the arguments are given in half-integer units, @math{ja} =
 @var{two_ja}/2, @math{ma} = @var{two_ma}/2, etc."
   :return (sf-result))
 
-(defun-sf coupling-6j ((two-ja :int) (two-jb :int) (two-jc :int)
+(defun-gsl coupling-6j ((two-ja :int) (two-jb :int) (two-jc :int)
 		       (two-jd :int) (two-je :int) (two-jf :int)) 
   "gsl_sf_coupling_6j_e"
   :documentation
@@ -53,7 +53,7 @@ where the arguments are given in half-integer units, @math{ja} =
 @var{two_ja}/2, @math{ma} = @var{two_ma}/2, etc."
   :return (sf-result))
 
-(defun-sf coupling-9j ((two-ja :int) (two-jb :int) (two-jc :int)
+(defun-gsl coupling-9j ((two-ja :int) (two-jb :int) (two-jc :int)
 		       (two-jd :int) (two-je :int) (two-jf :int)
 		       (two-jg :int) (two-jh :int) (two-ji :int)) 
   "gsl_sf_coupling_9j_e"
diff --git a/special-functions/dawson.lisp b/special-functions/dawson.lisp
index 88d3dfc6e065b2d23533c69321d549fc3c4c0570..63f54eb748134f8512f4acdc4b68343b38510936 100644
--- a/special-functions/dawson.lisp
+++ b/special-functions/dawson.lisp
@@ -3,7 +3,7 @@
 ; description: Dawson function                           
 ; date:        Sun Mar 19 2006 - 14:31                   
 ; author:      Liam M. Healy                             
-; modified:    Sun Mar 19 2006 - 14:33
+; modified:    Sat Mar 25 2006 - 22:11
 ;********************************************************
 ;;; $Id: $
 
@@ -16,7 +16,7 @@ Stegun, Table 7.5.  The Dawson functions are declared in the header file
 
 (in-package :gsl)
 
-(defun-sf dawson ((x :double))
+(defun-gsl dawson ((x :double))
   "gsl_sf_dawson_e"
   :documentation
   "Dawson's integral for @var{x}."
diff --git a/special-functions/debye.lisp b/special-functions/debye.lisp
index daf2c8a4b9e139a3e1e9ede9648513d35f573d17..9e4dfe036adcb9b6a4d7b647942c31f4f14e0659 100644
--- a/special-functions/debye.lisp
+++ b/special-functions/debye.lisp
@@ -3,7 +3,7 @@
 ; description: Deybe functions                           
 ; date:        Sun Mar 19 2006 - 14:34                   
 ; author:      Liam M. Healy                             
-; modified:    Sun Mar 19 2006 - 14:37
+; modified:    Sat Mar 25 2006 - 22:11
 ;********************************************************
 ;;; $Id: $
 
@@ -29,25 +29,25 @@ Stegun, Section 27.1.
 
 (in-package :gsl)
 
-(defun-sf debye-1  ((x :double))
+(defun-gsl debye-1  ((x :double))
   "gsl_sf_debye_1_e"
   :documentation
   "The first-order Debye function @math{D_1(x) = (1/x) \int_0^x dt (t/(e^t - 1))}."
   :return (sf-result))
 
-(defun-sf debye-2  ((x :double))
+(defun-gsl debye-2  ((x :double))
   "gsl_sf_debye_2_e"
   :documentation
   "The second-order Debye function @math{D_2(x) = (2/x^2) \int_0^x dt (t^2/(e^t - 1))}."
   :return (sf-result))
 
-(defun-sf debye-3  ((x :double))
+(defun-gsl debye-3  ((x :double))
   "gsl_sf_debye_3_e"
   :documentation
   "The third-order Debye function @math{D_3(x) = (3/x^3) \int_0^x dt (t^3/(e^t - 1))}."
   :return (sf-result))
 
-(defun-sf debye-4  ((x :double))
+(defun-gsl debye-4  ((x :double))
   "gsl_sf_debye_4_e"
   :documentation
   "The fourth-order Debye function @math{D_4(x) = (4/x^4) \int_0^x dt (t^4/(e^t - 1))}."
diff --git a/special-functions/dilogarithm.lisp b/special-functions/dilogarithm.lisp
index 83f633dfe5d9a54a9f216929970dec3ba2834431..a2e117acd82b9fa0720f29df58c7b6aaad8fc390 100644
--- a/special-functions/dilogarithm.lisp
+++ b/special-functions/dilogarithm.lisp
@@ -3,7 +3,7 @@
 ; description: Dilogarithm                               
 ; date:        Fri Mar 17 2006 - 18:44                   
 ; author:      Liam M. Healy
-; modified:    Sat Mar 18 2006 - 00:22
+; modified:    Sat Mar 25 2006 - 22:11
 ;********************************************************
 
 (in-package :gsl)
@@ -14,7 +14,7 @@
   (etypecase x
     (double-float
      (funcall
-      (defun-sf :lambda ((x :double)) 
+      (defun-gsl :lambda ((x :double)) 
 	"gsl_sf_dilog_e"
 	:return (sf-result))
       x))
@@ -22,7 +22,7 @@
      (multiple-value-bind (re re-err im im-err)
 	 (funcall
 	  ;; returns two gsl_sf_result
-	  (defun-sf :lambda
+	  (defun-gsl :lambda
 	      ((radius :double) (angle :double))
 	    "gsl_sf_complex_dilog_e"
 	    :return (sf-result sf-result))
diff --git a/special-functions/elementary.lisp b/special-functions/elementary.lisp
index 9bef2e086137d71b1290a68016e1065c21a4da7c..417cf2bb93f4d176103863d7b23c0400e3c89c66 100644
--- a/special-functions/elementary.lisp
+++ b/special-functions/elementary.lisp
@@ -3,20 +3,20 @@
 ; description: Elementary functions                      
 ; date:        Mon Mar 20 2006 - 21:43                   
 ; author:      Liam M. Healy                             
-; modified:    Mon Mar 20 2006 - 21:47
+; modified:    Sat Mar 25 2006 - 22:11
 ;********************************************************
 ;;; $Id: $
 
 (in-package :gsl)
 
-(defun-sf multiply ((x :double) (y :double))
+(defun-gsl multiply ((x :double) (y :double))
   "gsl_sf_multiply_e"
   :documentation
   "Multiplies @var{x} and @var{y} returning the product and
 associated error."
   :return (sf-result))
 
-(defun-sf multiply-err ((x :double) (dx :double) (y :double)  (dy :double))
+(defun-gsl multiply-err ((x :double) (dx :double) (y :double)  (dy :double))
   "gsl_sf_multiply_err_e"
   :documentation
   "Multiplies @var{x} and @var{y} with associated absolute
diff --git a/special-functions/elliptic-functions.lisp b/special-functions/elliptic-functions.lisp
index 1ffcb04a018b3974227db5d982b54eb07f605ac0..6c0ed1386455acc77c85b857ed148da652e7d5a7 100644
--- a/special-functions/elliptic-functions.lisp
+++ b/special-functions/elliptic-functions.lisp
@@ -3,13 +3,13 @@
 ; description: Jacobian elliptic functions                        
 ; date:        Mon Mar 20 2006 - 22:21                   
 ; author:      Liam M. Healy                             
-; modified:    Mon Mar 20 2006 - 23:11
+; modified:    Sat Mar 25 2006 - 22:11
 ;********************************************************
 ;;; $Id: $
 
 (in-package :gsl)
 
-(defun-sf jacobian-elliptic-functions ((u :double) (m :double))
+(defun-gsl jacobian-elliptic-functions ((u :double) (m :double))
   "gsl_sf_elljac_e"
   :documentation
   "The Jacobian elliptic functions @math{sn(u|m)},
diff --git a/special-functions/elliptic-integrals.lisp b/special-functions/elliptic-integrals.lisp
index 570c37691dc87afe81c017bda56562e3950c53b1..63bd2e75652da574207c4cc92f1a8e9981dfa38b 100644
--- a/special-functions/elliptic-integrals.lisp
+++ b/special-functions/elliptic-integrals.lisp
@@ -3,7 +3,7 @@
 ; description: Elliptic integrals                        
 ; date:        Mon Mar 20 2006 - 21:50                   
 ; author:      Liam M. Healy                             
-; modified:    Mon Mar 20 2006 - 22:15
+; modified:    Sat Mar 25 2006 - 22:11
 ;********************************************************
 ;;; $Id: $
 
@@ -13,14 +13,14 @@
 ;;;; Legendre form of complete elliptic integrals
 ;;;;****************************************************************************
 
-(defun-sf elliptic-integral-K-complete ((k :double))
+(defun-gsl elliptic-integral-K-complete ((k :double))
   "gsl_sf_ellint_Kcomp_e"
   :documentation
   "The complete elliptic integral @math{K(k)}."
   :mode t
   :return (sf-result))
 
-(defun-sf elliptic-integral-E-complete ((k :double))
+(defun-gsl elliptic-integral-E-complete ((k :double))
   "gsl_sf_ellint_Ecomp_e"
   :documentation
   "The complete elliptic integral @math{E(k)}."
@@ -31,28 +31,28 @@
 ;;;; Legendre form of incomplete elliptic integrals
 ;;;;****************************************************************************
 
-(defun-sf elliptic-integral-F ((phi :double) (k :double))
+(defun-gsl elliptic-integral-F ((phi :double) (k :double))
   "gsl_sf_ellint_F_e"
   :documentation
   "The incomplete elliptic integral @math{F(\phi,k)}."
   :mode t
   :return (sf-result))
 
-(defun-sf elliptic-integral-E ((phi :double) (k :double))
+(defun-gsl elliptic-integral-E ((phi :double) (k :double))
   "gsl_sf_ellint_E_e"
   :documentation
   "The incomplete elliptic integral @math{E(\phi,k)}."
   :mode t
   :return (sf-result))
 
-(defun-sf elliptic-integral-P ((phi :double) (k :double) (n :double))
+(defun-gsl elliptic-integral-P ((phi :double) (k :double) (n :double))
   "gsl_sf_ellint_P_e"
   :documentation
   "The incomplete elliptic integral @math{P(\phi,k,n)}."
   :mode t
   :return (sf-result))
 
-(defun-sf elliptic-integral-D ((phi :double) (k :double) (n :double))
+(defun-gsl elliptic-integral-D ((phi :double) (k :double) (n :double))
   "gsl_sf_ellint_D_e"
   :documentation
   "The incomplete elliptic integral
@@ -72,28 +72,28 @@ $$
 ;;;; Carlson forms
 ;;;;****************************************************************************
 
-(defun-sf elliptic-integral-RC ((x :double) (y :double))
+(defun-gsl elliptic-integral-RC ((x :double) (y :double))
   "gsl_sf_ellint_RC_e"
   :documentation
   "The incomplete elliptic integral @math{RC(x,y)}."
   :mode t
   :return (sf-result))
 
-(defun-sf elliptic-integral-RD ((x :double) (y :double) (z :double))
+(defun-gsl elliptic-integral-RD ((x :double) (y :double) (z :double))
   "gsl_sf_ellint_RD_e"
   :documentation
   "The incomplete elliptic integral @math{RD(x,y,z)}."
   :mode t
   :return (sf-result))
 
-(defun-sf elliptic-integral-RF ((x :double) (y :double) (z :double))
+(defun-gsl elliptic-integral-RF ((x :double) (y :double) (z :double))
   "gsl_sf_ellint_RF_e"
   :documentation
   "The incomplete elliptic integral @math{RF(x,y,z)}."
   :mode t
   :return (sf-result))
 
-(defun-sf elliptic-integral-RJ ((x :double) (y :double) (z :double) (p :double))
+(defun-gsl elliptic-integral-RJ ((x :double) (y :double) (z :double) (p :double))
   "gsl_sf_ellint_RJ_e"
   :documentation
   "The incomplete elliptic integral @math{RJ(x,y,z,p)}."
diff --git a/special-functions/error-functions.lisp b/special-functions/error-functions.lisp
index 801a75fa5197eb6873061872e2389f12d9c3caf9..fd88b1783c8f0ff9ab46622843e7076a2997e272 100644
--- a/special-functions/error-functions.lisp
+++ b/special-functions/error-functions.lisp
@@ -3,13 +3,13 @@
 ; description: Error functions                           
 ; date:        Mon Mar 20 2006 - 22:31                   
 ; author:      Liam M. Healy                             
-; modified:    Mon Mar 20 2006 - 22:41
+; modified:    Sat Mar 25 2006 - 22:11
 ;********************************************************
 ;;; $Id: $
 
 (in-package :gsl)
 
-(defun-sf erf ((x :double))
+(defun-gsl erf ((x :double))
   "gsl_sf_erf_e"
   :documentation
   "The error function @c{$\erf(x)$}
@@ -18,7 +18,7 @@
 @math{erf(x) = (2/\sqrt(\pi)) \int_0^x dt \exp(-t^2)}."
   :return (sf-result))
 
-(defun-sf erfc ((x :double))
+(defun-gsl erfc ((x :double))
   "gsl_sf_erfc_e"
   :documentation
   "The complementary error function 
@@ -26,13 +26,13 @@
 @math{erfc(x) = 1 - erf(x) = (2/\sqrt(\pi)) \int_x^\infty \exp(-t^2)}."
   :return (sf-result))
 
-(defun-sf log-erfc ((x :double))
+(defun-gsl log-erfc ((x :double))
   "gsl_sf_log_erfc_e"
   :documentation
   "The logarithm of the complementary error function @math{\log(\erfc(x))}."
   :return (sf-result))
 
-(defun-sf erf-Z ((x :double))
+(defun-gsl erf-Z ((x :double))
   "gsl_sf_erf_Z_e"
   :documentation
   "The Gaussian probability density function 
@@ -40,7 +40,7 @@
 @math{Z(x) = (1/\sqrt@{2\pi@}) \exp(-x^2/2)}."
   :return (sf-result))
 
-(defun-sf erf-Q ((x :double))
+(defun-gsl erf-Q ((x :double))
   "gsl_sf_erf_Q_e"
   :documentation
 "The upper tail of the Gaussian probability
@@ -49,7 +49,7 @@ function
 @math{Q(x) = (1/\sqrt@{2\pi@}) \int_x^\infty dt \exp(-t^2/2)}."
   :return (sf-result))
 
-(defun-sf hazard ((x :double))
+(defun-gsl hazard ((x :double))
   "gsl_sf_hazard_e"
   :documentation
   "The hazard function for the normal distribution."
diff --git a/special-functions/exponential-functions.lisp b/special-functions/exponential-functions.lisp
index 006a14c8b63d820661bbf2ce82e1ccf2e5c64cc8..70bdc9f2398cb528a4ac8106d95e08548c68a760 100644
--- a/special-functions/exponential-functions.lisp
+++ b/special-functions/exponential-functions.lisp
@@ -3,7 +3,7 @@
 ; description: Exponential functions                     
 ; date:        Tue Mar 21 2006 - 17:05                   
 ; author:      Liam M. Healy                             
-; modified:    Tue Mar 21 2006 - 17:30
+; modified:    Sat Mar 25 2006 - 22:11
 ;********************************************************
 ;;; $Id: $
 
@@ -13,26 +13,26 @@
 ;;;; Exponential Functions
 ;;;;****************************************************************************
 
-(defun-sf gsl-exp ((x :double))
+(defun-gsl gsl-exp ((x :double))
   "gsl_sf_exp_e"
   :documentation
   "The exponential function."
   :return (sf-result))
 
-(defun-sf exp-scaled ((x :double))
+(defun-gsl exp-scaled ((x :double))
   "gsl_sf_exp_e10_e"
   :documentation
   "The exponential function scaled. This function may be useful if the value
 of @math{\exp(x)} would overflow the  numeric range of @code{double}."
   :return (sf-result-e10))
 
-(defun-sf exp-mult ((x :double) (y :double))
+(defun-gsl exp-mult ((x :double) (y :double))
   "gsl_sf_exp_mult_e"
   :documentation
   "Exponentiate @var{x} and multiply by the factor @var{y} to return the product @math{y \exp(x)}."
   :return (sf-result))
 
-(defun-sf exp-mult-scaled ((x :double) (y :double))
+(defun-gsl exp-mult-scaled ((x :double) (y :double))
   "gsl_sf_exp_mult_e10_e"
   :documentation
   "The product @math{y \exp(x)} with extended numeric range."
@@ -42,25 +42,25 @@ of @math{\exp(x)} would overflow the  numeric range of @code{double}."
 ;;;; Relative Exponential Functions
 ;;;;****************************************************************************
 
-(defun-sf expm1 ((x :double))
+(defun-gsl expm1 ((x :double))
   "gsl_sf_expm1_e"
   :documentation
   "@math{\exp(x)-1} using an algorithm that is accurate for small @math{x}."
   :return (sf-result))
 
-(defun-sf exprel ((x :double))
+(defun-gsl exprel ((x :double))
   "gsl_sf_exprel_e"
   :documentation
   "@math{(\exp(x)-1)/x} using an algorithm that is accurate for small @math{x}.  For small @math{x} the algorithm is based on the expansion @math{(\exp(x)-1)/x = 1 + x/2 + x^2/(2*3) + x^3/(2*3*4) + \dots}."
   :return (sf-result))
 
-(defun-sf exprel-2 ((x :double))
+(defun-gsl exprel-2 ((x :double))
   "gsl_sf_exprel_2_e"
   :documentation
   "@math{2(\exp(x)-1-x)/x^2} using an algorithm that is accurate for small @math{x}.  For small @math{x} the algorithm is based on the expansion @math{2(\exp(x)-1-x)/x^2 = 1 + x/3 + x^2/(3*4) + x^3/(3*4*5) + \dots}."
   :return (sf-result))
 
-(defun-sf exprel-n ((x :double))
+(defun-gsl exprel-n ((x :double))
   "gsl_sf_exprel_n_e"
   :documentation
   "@math{N}-relative exponential, which is the @var{n}-th generalization of the functions @code{gsl_sf_exprel} and @code{gsl_sf_exprel2}."
@@ -70,25 +70,25 @@ of @math{\exp(x)} would overflow the  numeric range of @code{double}."
 ;;;; Exponentiation With Error Estimate
 ;;;;****************************************************************************
 
-(defun-sf exp-err ((x :double) (dx :double))
+(defun-gsl exp-err ((x :double) (dx :double))
   "gsl_sf_exp_err_e"
   :documentation
   "Exponentiate @var{x} with an associated absolute error @var{dx}."
   :return (sf-result))
 
-(defun-sf exp-err-scaled ((x :double) (dx :double))
+(defun-gsl exp-err-scaled ((x :double) (dx :double))
   "gsl_sf_exp_err_e10_e"
   :documentation
   "Exponentiate @var{x} with an associated absolute error @var{dx} and with extended numeric range."
   :return (sf-result))
 
-(defun-sf exp-mult-err ((x :double) (dx :double) (y :double) (dy :double))
+(defun-gsl exp-mult-err ((x :double) (dx :double) (y :double) (dy :double))
   "gsl_sf_exp_mult_err_e"
   :documentation
   "The product @math{y \exp(x)} for the quantities @var{x}, @var{y} with associated absolute errors @var{dx}, @var{dy}."
   :return (sf-result))
 
-(defun-sf exp-mult-err-scaled ((x :double) (y :double))
+(defun-gsl exp-mult-err-scaled ((x :double) (y :double))
   "gsl_sf_exp_mult_err_e10_e"
   :documentation
   "The product @math{y \exp(x)} for the quantities @var{x}, @var{y} with associated absolute errors @var{dx}, @var{dy} and with extended numeric range."
diff --git a/special-functions/exponential-integrals.lisp b/special-functions/exponential-integrals.lisp
index 64b11932a49d5b6436cff98fa102c9f30e641269..dfe7e1618e6e74c3dee7998549e589c67fa2a350 100644
--- a/special-functions/exponential-integrals.lisp
+++ b/special-functions/exponential-integrals.lisp
@@ -3,7 +3,7 @@
 ; description: Exponential integrals                     
 ; date:        Tue Mar 21 2006 - 17:37                   
 ; author:      Liam M. Healy                             
-; modified:    Tue Mar 21 2006 - 17:48
+; modified:    Sat Mar 25 2006 - 22:11
 ;********************************************************
 ;;; $Id: $
 
@@ -13,13 +13,13 @@
 ;;;; Exponential Integral
 ;;;;****************************************************************************
 
-(defun-sf expint-E1 ((x :double))
+(defun-gsl expint-E1 ((x :double))
   "gsl_sf_expint_E1_e"
   :documentation
   "The exponential integral @math{E_1(x)}, E_1(x) := \Re \int_1^\infty dt \exp(-xt)/t.."
   :return (sf-result))
 
-(defun-sf expint-E2 ((x :double))
+(defun-gsl expint-E2 ((x :double))
   "gsl_sf_expint_E2_e"
   :documentation
   "The second-order exponential integral @math{E_2(x)}, E_2(x) := \Re \int_1^\infty dt \exp(-xt)/t^2."
@@ -29,7 +29,7 @@
 ;;;; Ei
 ;;;;****************************************************************************
 
-(defun-sf expint-Ei ((x :double))
+(defun-gsl expint-Ei ((x :double))
   "gsl_sf_expint_Ei_e"
   :documentation
   "The exponential integral @math{Ei(x)}, Ei(x) := - PV\left(\int_{-x}^\infty dt \exp(-t)/t\right)."
@@ -39,13 +39,13 @@
 ;;;; Hyperbolic Integrals
 ;;;;****************************************************************************
 
-(defun-sf Shi ((x :double))
+(defun-gsl Shi ((x :double))
   "gsl_sf_Shi_e"
   :documentation
   "The integral @math{Shi(x) = \int_0^x dt \sinh(t)/t}."
   :return (sf-result))
 
-(defun-sf Chi ((x :double))
+(defun-gsl Chi ((x :double))
   "gsl_sf_Chi_e"
   :documentation
   "The integral @math{ Chi(x) := \Re[ \gamma_E + \log(x) + \int_0^x dt (\cosh[t]-1)/t] }, where @math{\gamma_E} is the Euler constant."
@@ -55,7 +55,7 @@
 ;;;; Ei-3
 ;;;;****************************************************************************
 
-(defun-sf expint-3 ((x :double))
+(defun-gsl expint-3 ((x :double))
   "gsl_sf_expint_3_e"
   :documentation
   "The third-order exponential integral @math{Ei_3(x) = \int_0^xdt \exp(-t^3)} for @c{$x \ge 0$} @math{x >= 0}."
@@ -65,13 +65,13 @@
 ;;;; Trigonometric Integrals
 ;;;;****************************************************************************
 
-(defun-sf Si ((x :double))
+(defun-gsl Si ((x :double))
   "gsl_sf_Si_e"
   :documentation
   "The Sine integral @math{Si(x) = \int_0^x dt \sin(t)/t}."
   :return (sf-result))
 
-(defun-sf Ci ((x :double))
+(defun-gsl Ci ((x :double))
   "gsl_sf_Ci_e"
   :documentation
   "The Cosine integral @math{Ci(x) = -\int_x^\infty dt \cos(t)/t} for @math{x > 0}."
@@ -81,7 +81,7 @@
 ;;;; Trigonometric Integrals
 ;;;;****************************************************************************
 
-(defun-sf atanint ((x :double))
+(defun-gsl atanint ((x :double))
   "gsl_sf_atanint_e"
   :documentation
   "The Arctangent integral, which is defined as @math{AtanInt(x) = \int_0^x dt \arctan(t)/t}."