diff --git a/code/debug.lisp b/code/debug.lisp
index a8150a7a7ac17752f1c0eaab0d70f0735a156914..dc88110900dcce7583ea321d3381b34878bda033 100644
--- a/code/debug.lisp
+++ b/code/debug.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/debug.lisp,v 1.33 1992/09/05 19:42:52 wlott Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/debug.lisp,v 1.34 1993/06/24 12:50:29 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -422,7 +422,7 @@ See the CMU Common Lisp User's Manual for more information.
 	     (step current-frame))
 	    ((and step-hit-info (= 1 *number-of-steps*))
 	     (build-string "*Step*")
-	     (break (make-condition 'step-condition :format-string string)))
+	     (break (make-condition 'step-condition :format-control string)))
 	    (step-hit-info
 	     (decf *number-of-steps*)
 	     (step current-frame))
diff --git a/code/interr.lisp b/code/interr.lisp
index 128055da73f9a900653fe1d9ed2bf306878e50b5..6ce5f0489999604d26f34bf01877626e85c09667 100644
--- a/code/interr.lisp
+++ b/code/interr.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/interr.lisp,v 1.27 1993/05/29 07:02:15 wlott Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/interr.lisp,v 1.28 1993/06/24 12:53:57 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -229,13 +229,13 @@
 (deferr invalid-argument-count-error (nargs)
   (error 'simple-error
 	 :function-name name
-	 :format-string "Invalid number of arguments: ~S"
+	 :format-control "Invalid number of arguments: ~S"
 	 :format-arguments (list nargs)))
 
 (deferr bogus-argument-to-values-list-error (list)
   (error 'simple-error
 	 :function-name name
-	 :format-string "Attempt to use VALUES-LIST on a dotted-list:~%  ~S"
+	 :format-control "Attempt to use VALUES-LIST on a dotted-list:~%  ~S"
 	 :format-arguments (list list)))
 
 (deferr unbound-symbol-error (symbol)
@@ -256,19 +256,19 @@
 (deferr invalid-unwind-error ()
   (error 'control-error
 	 :function-name name
-	 :format-string
+	 :format-control
 	 "Attempt to RETURN-FROM a block or GO to a tag that no longer exists"))
 
 (deferr unseen-throw-tag-error (tag)
   (error 'control-error
 	 :function-name name
-	 :format-string "Attempt to THROW to a tag that does not exist: ~S"
+	 :format-control "Attempt to THROW to a tag that does not exist: ~S"
 	 :format-arguments (list tag)))
 
 (deferr nil-function-returned-error (function)
   (error 'control-error
 	 :function-name name
-	 :format-string
+	 :format-control
 	 "Function with declared result type NIL returned:~%  ~S"
 	 :format-arguments (list function)))
 
@@ -296,18 +296,18 @@
 (deferr odd-keyword-arguments-error ()
   (error 'simple-error
 	 :function-name name
-	 :format-string "Odd number of keyword arguments."))
+	 :format-control "Odd number of keyword arguments."))
 
 (deferr unknown-keyword-argument-error (key)
   (error 'simple-error
 	 :function-name name
-	 :format-string "Unknown keyword: ~S"
+	 :format-control "Unknown keyword: ~S"
 	 :format-arguments (list key)))
 
 (deferr invalid-array-index-error (array bound index)
   (error 'simple-error
 	 :function-name name
-	 :format-string
+	 :format-control
 	 "Invalid array index, ~D for ~S.  Should have been less than ~D"
 	 :format-arguments (list index array bound)))
 
@@ -512,7 +512,7 @@
 	   (cond ((null handler)
 		  (error 'simple-error
 			 :function-name name
-			 :format-string
+			 :format-control
 			 "Unknown internal error, ~D?  args=~S"
 			 :format-arguments
 			 (list error-number
@@ -523,7 +523,7 @@
 		 ((not (functionp handler))
 		  (error 'simple-error
 			 :function-name name
-			 :format-string
+			 :format-control
 			 "Internal error ~D: ~A.  args=~S"
 			 :format-arguments
 			 (list error-number
diff --git a/code/macros.lisp b/code/macros.lisp
index 1a2f1d22f3af0e6909f56aa0007bf69009898bd0..dcfd0ddaa54c02e491fa3426041216b899ff6845 100644
--- a/code/macros.lisp
+++ b/code/macros.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/macros.lisp,v 1.39 1993/06/24 12:22:27 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/macros.lisp,v 1.40 1993/06/24 12:55:25 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -1291,7 +1291,7 @@
   (error 'simple-type-error
 	 :datum assertion
 	 :expected-type nil ;this needs some work in next revision. -kmp
-	 :format-string "The assertion ~S failed."
+	 :format-control "The assertion ~S failed."
 	 :format-arguments (list assertion)))
 
 (defun assert-report (names stream)
@@ -1336,13 +1336,13 @@
   (restart-case (if type-string
 		    (error 'simple-type-error
 			   :datum place :expected-type type
-			   :format-string
+			   :format-control
 			   "The value of ~S is ~S, which is not ~A."
 			   :format-arguments
 			   (list place place-value type-string))
 		    (error 'simple-type-error
 			   :datum place :expected-type type
-			   :format-string
+			   :format-control
 			   "The value of ~S is ~S, which is not of type ~S."
 			   :format-arguments
 			   (list place place-value type)))
diff --git a/code/numbers.lisp b/code/numbers.lisp
index 5cdd50a96790ff6f60981012551426070d1aff86..9bc5e7ee8c05e6670c6af3b6f9c9dba35fa7232b 100644
--- a/code/numbers.lisp
+++ b/code/numbers.lisp
@@ -7,11 +7,11 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/numbers.lisp,v 1.22 1993/06/17 22:14:56 wlott Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/numbers.lisp,v 1.23 1993/06/24 12:56:22 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/numbers.lisp,v 1.22 1993/06/17 22:14:56 wlott Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/numbers.lisp,v 1.23 1993/06/24 12:56:22 ram Exp $
 ;;;
 ;;; This file contains the definitions of most number functions.
 ;;;
@@ -153,7 +153,7 @@
 		    ,block
 		    (error 'simple-type-error :datum ,var
 			   :expected-type ',type
-			   :format-string
+			   :format-control
 			   "Argument ~A is not a ~S: ~S."
 			   :format-arguments
 			   (list ',var ',type ,var))))))
diff --git a/code/rand.lisp b/code/rand.lisp
index f7d00d80b9e9916c94e8c061d2257e2ead5d56d0..1984bd3999cfe7c35483154c695dce768ba4f0f4 100644
--- a/code/rand.lisp
+++ b/code/rand.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/rand.lisp,v 1.5 1993/05/07 19:01:51 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/rand.lisp,v 1.6 1993/06/24 12:57:50 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -199,5 +199,5 @@
     (%random-integer arg state))
    (t
     (error 'simple-type-error :expected-type '(real (0)) :datum arg
-	   :format-string "Argument is not a positive real number: ~S"
+	   :format-control "Argument is not a positive real number: ~S"
 	   :format-arguments (list arg)))))