diff --git a/tools/clxcom.lisp b/tools/clxcom.lisp
index 376969e7d5bc3980b0b59954fb65557cecfcdf3e..7412c51540b24d8b9c24ca32f4bebd849da75465 100644
--- a/tools/clxcom.lisp
+++ b/tools/clxcom.lisp
@@ -10,14 +10,14 @@
 (with-compiler-log-file
     ("target:compile-clx.log"
      :optimize
-     '(optimize (debug-info #-small 2 #+small .5) 
+     '(optimize (debug #-small 2 #+small .5) 
 		(speed 2) (inhibit-warnings 2)
 		(safety #-small 1 #+small 0))
      :optimize-interface
-     '(optimize-interface (debug-info .5))
+     '(optimize-interface (debug .5))
      :context-declarations
      '(((:and :external :global)
-	(declare (optimize-interface (safety 2) (debug-info 1))))
+	(declare (optimize-interface (safety 2) (debug 1))))
        ((:and :external :macro)
 	(declare (optimize (safety 2))))
        (:macro (declare (optimize (speed 0))))))
diff --git a/tools/comcom.lisp b/tools/comcom.lisp
index 2cb4c56f65e341159e8508e5118dcf2d2b5b032c..bb8be5a85a42be5b322b9a48ca07eba28ca253df 100644
--- a/tools/comcom.lisp
+++ b/tools/comcom.lisp
@@ -21,10 +21,10 @@
      :optimize
      '(optimize (speed 2) (space 2) (inhibit-warnings 2)
 		(safety #+small 0 #-small 1)
-		(debug-info #+small .5 #-small 2))
+		(debug #+small .5 #-small 2))
      :optimize-interface
      '(optimize-interface (safety #+small 1 #-small 2)
-			  (debug-info #+small .5 #-small 2))
+			  (debug #+small .5 #-small 2))
      :context-declarations
      '(#+small
        ((:or :macro
@@ -32,7 +32,7 @@
 		     "$PRIMITIVE-TRANSLATE-" "$PARSE-"))
 	(declare (optimize (safety 1))))
        (:macro (declare (optimize (speed 0))))
-       (:external (declare (optimize-interface (safety 2) (debug-info 1))))))
+       (:external (declare (optimize-interface (safety 2) (debug 1))))))
 
 (comf "target:compiler/macros" :load *load-stuff*)
 (comf "target:compiler/generic/vm-macs" :load *load-stuff* :proceed t)
@@ -73,7 +73,7 @@
 (comf "target:compiler/main")
 
 (with-compilation-unit
-    (:optimize '(optimize (debug-info 2) (safety 1)))
+    (:optimize '(optimize (debug 2) (safety 1)))
   (comf "target:compiler/ir1tran")
   (comf "target:compiler/ir1util")
   (comf "target:compiler/ir1opt"))
@@ -103,7 +103,7 @@
 (comf "target:assembly/assemfile" :load *load-stuff*)
 
 (with-compilation-unit
-    (:optimize '(optimize (safety #+small 0 #-small 1) #+small (debug-info 1)))
+    (:optimize '(optimize (safety #+small 0 #-small 1) #+small (debug 1)))
 
 (when (c:target-featurep :pmax)
   (comf "target:compiler/mips/insts")
@@ -274,26 +274,26 @@
 (comf "target:compiler/ltv")
 (comf "target:compiler/gtn")
 (with-compilation-unit
-    (:optimize '(optimize (debug-info 2) (safety 1)))
+    (:optimize '(optimize (debug 2) (safety 1)))
   (comf "target:compiler/ltn"))
 (comf "target:compiler/stack")
 (comf "target:compiler/control")
 (comf "target:compiler/entry")
 (with-compilation-unit
-    (:optimize '(optimize (debug-info 2) (safety 1)))
+    (:optimize '(optimize (debug 2) (safety 1)))
   (comf "target:compiler/ir2tran")
   (comf "target:compiler/generic/vm-ir2tran"))
 (comf "target:compiler/copyprop")
 (with-compilation-unit
-    (:optimize '(optimize (debug-info 2) (safety 1)))
+    (:optimize '(optimize (debug 2) (safety 1)))
   (comf "target:compiler/represent"))
 (comf "target:compiler/generic/vm-tran")
 (with-compilation-unit
-    (:optimize '(optimize (debug-info 2) (safety 1)))
+    (:optimize '(optimize (debug 2) (safety 1)))
   (comf "target:compiler/pack"))
 (comf "target:compiler/codegen")
 (with-compilation-unit
-    (:optimize '(optimize (debug-info 2) (safety 2)))
+    (:optimize '(optimize (debug 2) (safety 2)))
   (comf "target:compiler/debug"))
 (comf "target:compiler/statcount")
 (comf "target:compiler/dyncount")
diff --git a/tools/pclcom.lisp b/tools/pclcom.lisp
index 76cb9b2c676c7c8dd6d4fea005f2cdfb5a16c735..a01046cde93d4ba2fc1731e6ce55781747dc8e7b 100644
--- a/tools/pclcom.lisp
+++ b/tools/pclcom.lisp
@@ -23,11 +23,11 @@
 (import 'kernel:funcallable-instance-p (find-package "PCL"))
 
 (with-compilation-unit
-    (:optimize '(optimize (debug-info #+small .5 #-small 2)
+    (:optimize '(optimize (debug #+small .5 #-small 2)
 			  (speed 2) (safety #+small 0 #-small 2)
 			  (inhibit-warnings 2))
      :optimize-interface '(optimize-interface #+small (safety 1))
      :context-declarations
-     '((:external (declare (optimize-interface (safety 2) (debug-info 1))))
+     '((:external (declare (optimize-interface (safety 2) (debug 1))))
        (:macro (declare (optimize (speed 0))))))
  (pcl::compile-pcl))