diff --git a/compiler/eval.lisp b/compiler/eval.lisp
index 162b1fd798bc4abf7e049ae079f3f9fd4e176b67..732d5c829108f13bf5ba1defb3d11db45256f7da 100644
--- a/compiler/eval.lisp
+++ b/compiler/eval.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/eval.lisp,v 1.26 1993/08/25 01:42:38 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/eval.lisp,v 1.27 1993/12/05 11:58:03 wlott Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -977,10 +977,9 @@
        (locally
 	 (declare (optimize (ext:inhibit-warnings 3)))
 	 (setf (dylan::value-datum
-		(dylan::lookup-varinfo-value (c::dylan-var-name var)
-					     (dylan::find-module
-					      (c::dylan-var-module-name var))
-					     t))
+		(dylan::lookup-variable-value (c::dylan-var-name var)
+					      (c::dylan-var-module-name var)
+					      t))
 	       value))))))
 
 ;;; SET-LEAF-VALUE-LAMBDA-VAR -- Internal Interface.
@@ -1052,10 +1051,9 @@
        (locally
 	 (declare (optimize (ext:inhibit-warnings 3)))
 	 (dylan::value-datum
-	  (dylan::lookup-varinfo-value (c::dylan-var-name leaf)
-				       (dylan::find-module
-					(c::dylan-var-module-name leaf))
-				       t))))
+	  (dylan::lookup-variable-value (c::dylan-var-name leaf)
+					(c::dylan-var-module-name leaf)
+					t))))
       (c::lambda-var
        (leaf-value-lambda-var node leaf frame-ptr closure))
       (c::functional
diff --git a/compiler/generic/core.lisp b/compiler/generic/core.lisp
index 23ffa0a7a90f03be9fcd84e98e8684ed07327242..d1a968addc38fa8a743dd76b538d696a57f2518e 100644
--- a/compiler/generic/core.lisp
+++ b/compiler/generic/core.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/generic/core.lisp,v 1.29 1993/09/14 00:09:27 wlott Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/generic/core.lisp,v 1.30 1993/12/05 11:58:26 wlott Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -189,10 +189,9 @@
 		(setf (code-header-ref code-obj index)
 		      (locally
 		       (declare (optimize (inhibit-warnings 3)))
-		       (dylan::lookup-varinfo-value
-			(cadr const)
-			(dylan::find-module (cddr const))
-			t)))))))))))
+		       (dylan::lookup-variable-value (cadr const)
+						     (cddr const)
+						     t)))))))))))
   (undefined-value))
 
 
@@ -250,10 +249,9 @@
 		(setf (code-header-ref code-obj code-obj-index)
 		      (locally
 		       (declare (optimize (inhibit-warnings 3)))
-		       (dylan::lookup-varinfo-value
-			(cadr const)
-			(dylan::find-module (cddr const))
-			t))))
+		       (dylan::lookup-variable-value (cadr const)
+						     (cddr const)
+						     t))))
 	       (:type-predicate
 		(let ((*unparse-function-type-simplify* t))
 		  (setf (code-header-ref code-obj code-obj-index)