diff --git a/compiler/mips/macros.lisp b/compiler/mips/macros.lisp
index 550b4316e133950cccaa601e0755e40c4e1c3821..549131cfcc8036230c4621383214e61028174138 100644
--- a/compiler/mips/macros.lisp
+++ b/compiler/mips/macros.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman (FAHLMAN@CMUC). 
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/macros.lisp,v 1.19 1990/02/27 11:37:15 wlott Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/macros.lisp,v 1.20 1990/02/28 18:25:17 wlott Exp $
 ;;;
 ;;;    This file contains various useful macros for generating MIPS code.
 ;;;
@@ -157,18 +157,18 @@
   (once-only ((n-reg reg)
 	      (n-stack stack))
     `(sc-case ,n-reg
-       ((any-reg descriptor-reg string-char-reg sap-reg)
+       ((any-reg descriptor-reg base-character-reg sap-reg)
 	(sc-case ,n-stack
-	  ((control-stack number-stack string-char-stack sap-stack)
+	  ((control-stack number-stack base-character-stack sap-stack)
 	   (loadw ,n-reg cont-tn (tn-offset ,n-stack))))))))
 
 (defmacro store-stack-tn (stack reg)
   (once-only ((n-stack stack)
 	      (n-reg reg))
     `(sc-case ,n-reg
-       ((any-reg descriptor-reg string-char-reg sap-reg)
+       ((any-reg descriptor-reg base-character-reg sap-reg)
 	(sc-case ,n-stack
-	  ((control-stack number-stack string-char-stack sap-stack)
+	  ((control-stack number-stack base-character-stack sap-stack)
 	   (storew ,n-reg cont-tn (tn-offset ,n-stack))))))))
 
 
diff --git a/compiler/mips/move.lisp b/compiler/mips/move.lisp
index c9a325c28f2870b09fcc478b10134068d548618c..9f573ee489d3b9cb7d22fcec8ede850a66318957 100644
--- a/compiler/mips/move.lisp
+++ b/compiler/mips/move.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman (FAHLMAN@CMUC). 
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/move.lisp,v 1.7 1990/02/23 20:22:52 wlott Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/move.lisp,v 1.8 1990/02/28 18:26:05 wlott Exp $
 ;;;
 ;;;    This file contains the RT VM definition of operand loading/saving and
 ;;; the Move VOP.
@@ -27,11 +27,12 @@
   (assemble node
     (sc-case x
       ((zero negative-immediate unsigned-immediate immediate
-	     null random-immediate immediate-string-char immediate-sap)
+	     null random-immediate immediate-base-character immediate-sap)
        (let ((val (tn-value x))
 	     (dest (sc-case y
-		     ((any-reg descriptor-reg string-char-reg sap-reg) y)
-		     ((control-stack number-stack sap-stack string-char-stack)
+		     ((any-reg descriptor-reg base-character-reg sap-reg) y)
+		     ((control-stack number-stack sap-stack
+				     base-character-stack)
 		      temp))))
 	 (etypecase val
 	   (integer
@@ -42,7 +43,7 @@
 	    (load-symbol dest val))
 	   (string-char
 	    (loadi dest (logior (ash (char-code val) type-bits)
-				character-type))))
+				base-character-type))))
 	 (unless (eq dest y)
 	   (store-stack-tn y temp))))
       (constant
@@ -132,12 +133,12 @@
 	 ((any-reg descriptor-reg)
 	  (load-stack-tn y x))
 	 #+nil
-	 (string-char-reg
+	 (base-character-reg
 	  (load-stack-tn y x)
 	  (inst nilz y y system:%character-code-mask))))
-      (string-char-stack
+      (base-character-stack
        (sc-case y
-	 (string-char-reg
+	 (base-character-reg
 	  (load-stack-tn y x))))
       (t
        (unassemble (load-constant-tn x y nil node))))))
@@ -152,12 +153,12 @@
 	 ((any-reg descriptor-reg)
 	  (store-stack-tn y x))
 	 #+nil
-	 (string-char-reg
+	 (base-character-reg
 	  (inst oiu x x (ash system:%string-char-type clc::type-shift-16))
 	  (store-stack-tn y x))))
-      (string-char-stack
+      (base-character-stack
        (sc-case x
-	 (string-char-reg
+	 (base-character-reg
 	  (store-stack-tn y x)))))))