diff --git a/code/alieneval.lisp b/code/alieneval.lisp
index d2bb08d6ffec58549a6ad4613c2f2b7f665045f5..c10e130103653716b5b43fef8d58a42f99b914be 100644
--- a/code/alieneval.lisp
+++ b/code/alieneval.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/alieneval.lisp,v 1.48 1999/09/15 15:14:45 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/alieneval.lisp,v 1.49 2001/03/13 16:52:13 pw Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -1777,7 +1777,7 @@
   (declare (ignore info))
   (setf (deref alien) value))
 
-(define-setf-method local-alien (&whole whole info alien)
+(define-setf-expander local-alien (&whole whole info alien)
   (let ((value (gensym))
 	(info (if (and (consp info)
 		       (eq (car info) 'quote))
diff --git a/code/extensions.lisp b/code/extensions.lisp
index 246b93b39a23f9e0c21914ab7b1479078c23e22d..9b7b07c0d382726f61f5eb869bcc4b3dfed02043 100644
--- a/code/extensions.lisp
+++ b/code/extensions.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/extensions.lisp,v 1.24 2001/03/04 20:12:34 pw Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/extensions.lisp,v 1.25 2001/03/13 16:52:14 pw Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -128,7 +128,7 @@
 	   ,form)))))
 
 
-(define-setf-method logbitp (index int &environment env)
+(define-setf-expander logbitp (index int &environment env)
   (multiple-value-bind (temps vals stores store-form access-form)
 		       (get-setf-method int env)
     (let ((ind (gensym))
diff --git a/code/macros.lisp b/code/macros.lisp
index 580b17fd229ef72ab38da62d0f20c164b0f886cd..ff0c518abc307495c6f18fe1d2e430f431820c9d 100644
--- a/code/macros.lisp
+++ b/code/macros.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/macros.lisp,v 1.67 2001/03/13 02:10:28 pw Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/macros.lisp,v 1.68 2001/03/13 16:52:14 pw Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -219,7 +219,7 @@
 (defparameter defsetf-error-string "Setf expander for ~S cannot be called with ~S args.")
 
 (defmacro define-setf-expander (access-fn lambda-list &body body)
-  "Syntax like DEFMACRO, but creates a Setf-Method generator.  The body
+  "Syntax like DEFMACRO, but creates a Setf-Expansion generator.  The body
   must be a form that returns the five magical values."
   (unless (symbolp access-fn)
     (error "~S -- Access-function name not a symbol in DEFINE-SETF-EXPANDER."
diff --git a/code/pprint.lisp b/code/pprint.lisp
index 9afec5b26a5da7a00613edd3ea0df3092f77947f..0ee8511a884a1fce6077845a16985faa1577f22c 100644
--- a/code/pprint.lisp
+++ b/code/pprint.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pprint.lisp,v 1.28 2001/03/13 02:10:30 pw Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pprint.lisp,v 1.29 2001/03/13 16:52:14 pw Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -1440,7 +1440,7 @@
     (ctypecase pprint-typecase)
     (defconstant pprint-block)
     (define-modify-macro pprint-defun)
-    (define-setf-method pprint-defun)
+    (define-setf-expander pprint-defun)
     (defmacro pprint-defun)
     (defparameter pprint-block)
     (defsetf pprint-defun)
diff --git a/compiler/globaldb.lisp b/compiler/globaldb.lisp
index a1770396ea00c19ae359fc61cad880524055f5df..b8ac6be658081b90489e8996afac6266331320ee 100644
--- a/compiler/globaldb.lisp
+++ b/compiler/globaldb.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/globaldb.lisp,v 1.40 2001/03/04 20:12:16 pw Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/globaldb.lisp,v 1.41 2001/03/13 16:52:16 pw Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -327,7 +327,7 @@
 		(get-info-value ,name ,(type-info-number info)
 				,@(when env-list `(,env-list))))))
 ;;;
-(define-setf-method info (class type name &optional env-list)
+(define-setf-expander info (class type name &optional env-list)
   "Set the global information for Name."
   (let* ((n-name (gensym))
 	 (n-env-list (if env-list (gensym)))
diff --git a/compiler/macros.lisp b/compiler/macros.lisp
index 7dd964b75fa275d22bf4401b588c12cd0b144a1a..dc1827d5dcd5c63517441b0c812367066c40a772 100644
--- a/compiler/macros.lisp
+++ b/compiler/macros.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/macros.lisp,v 1.45 2001/03/04 20:12:22 pw Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/macros.lisp,v 1.46 2001/03/13 16:52:17 pw Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -922,8 +922,8 @@
 	   `(logtest ,(compute-attribute-mask attribute-names ,const-name)
 		     (the attributes ,attributes)))
 
-	 (define-setf-method ,test-name (place &rest attributes
-					       &environment env)
+	 (define-setf-expander ,test-name (place &rest attributes
+						 &environment env)
 	   
 	   "Automagically generated boolean attribute setter.  See
 	    Def-Boolean-Attribute."