diff --git a/assembly/mips/alloc.lisp b/assembly/mips/alloc.lisp
index cbe1475b0c638f2c73c662352199383dcd1ed0c9..75f5c5f50d025510d2ba07db82186091fc88a5ec 100644
--- a/assembly/mips/alloc.lisp
+++ b/assembly/mips/alloc.lisp
@@ -1,4 +1,4 @@
-;;; -*- Log: code.log; Package: C -*-
+;;; -*- Package: MIPS -*-
 ;;;
 ;;; **********************************************************************
 ;;; This code was written as part of the Spice Lisp project at
@@ -7,31 +7,31 @@
 ;;; Scott Fahlman (FAHLMAN@CMUC). 
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/mips/alloc.lisp,v 1.1 1990/10/29 14:00:54 wlott Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/mips/alloc.lisp,v 1.2 1990/11/03 17:22:39 wlott Exp $
 ;;;
 ;;; Stuff to handle allocating simple objects.
 ;;;
 ;;; Written by William Lott.
 ;;;
 
-(in-package "C")
+(in-package "MIPS")
 
-(vm:define-for-each-primitive-object (obj)
-  (let* ((options (vm:primitive-object-options obj))
+(define-for-each-primitive-object (obj)
+  (let* ((options (primitive-object-options obj))
 	 (alloc-trans (getf options :alloc-trans))
 	 (alloc-vop (getf options :alloc-vop alloc-trans))
-	 (header (vm:primitive-object-header obj))
-	 (lowtag (vm:primitive-object-lowtag obj))
-	 (size (vm:primitive-object-size obj))
-	 (variable-length (vm:primitive-object-variable-length obj))
+	 (header (primitive-object-header obj))
+	 (lowtag (primitive-object-lowtag obj))
+	 (size (primitive-object-size obj))
+	 (variable-length (primitive-object-variable-length obj))
 	 (need-unbound-marker nil))
     (collect ((args) (init-forms))
       (when (and alloc-vop variable-length)
 	(args 'extra-words))
-      (dolist (slot (vm:primitive-object-slots obj))
-	(let* ((name (vm:slot-name slot))
-	       (offset (vm:slot-offset slot)))
-	  (ecase (getf (vm:slot-options slot) :init :zero)
+      (dolist (slot (primitive-object-slots obj))
+	(let* ((name (slot-name slot))
+	       (offset (slot-offset slot)))
+	  (ecase (getf (slot-options slot) :init :zero)
 	    (:zero)
 	    (:null
 	     (init-forms `(storew null-tn result ,offset ,lowtag)))
@@ -44,7 +44,7 @@
       (when (and (null alloc-vop) (args))
 	(error "Slots ~S want to be initialized, but there is no alloc vop ~
 	defined for ~S."
-	       (args) (vm:primitive-object-name obj)))
+	       (args) (primitive-object-name obj)))
       (when alloc-vop
 	`(define-assembly-routine
 	     (,alloc-vop
@@ -68,26 +68,26 @@
 	     ,@(cond ((and header variable-length)
 		      `((inst addu temp extra-words (fixnum (1- ,size)))
 			(inst addu alloc-tn alloc-tn temp)
-			(inst sll temp temp (- vm:type-bits vm:word-shift))
+			(inst sll temp temp (- type-bits word-shift))
 			(inst or temp temp ,header)
 			(storew temp result 0 ,lowtag)
 			(inst addu alloc-tn alloc-tn
-			      (+ (fixnum 1) vm:lowtag-mask))
-			(inst li temp (lognot vm:lowtag-mask))
+			      (+ (fixnum 1) lowtag-mask))
+			(inst li temp (lognot lowtag-mask))
 			(inst and alloc-tn alloc-tn temp)))
 		     (variable-length
 		      (error ":REST-P T with no header in ~S?"
-			     (vm:primitive-object-name obj)))
+			     (primitive-object-name obj)))
 		     (header
 		      `((inst addu alloc-tn alloc-tn
-			      (vm:pad-data-block ,size))
+			      (pad-data-block ,size))
 			(inst li temp
-			      ,(logior (ash (1- size) vm:type-bits)
+			      ,(logior (ash (1- size) type-bits)
 				       (symbol-value header)))
 			(storew temp result 0 ,lowtag)))
 		     (t
 		      `((inst addu alloc-tn alloc-tn
-			      (vm:pad-data-block ,size)))))
+			      (pad-data-block ,size)))))
 	     ,@(when need-unbound-marker
-		 `((inst li temp vm:unbound-marker-type)))
+		 `((inst li temp unbound-marker-type)))
 	     ,@(init-forms)))))))
diff --git a/assembly/mips/arith.lisp b/assembly/mips/arith.lisp
index 7b084d5135a79f78eeaf203f1567caa0aece8c81..6fb44db1424a5bf35749a6f40c4464b4903b2ba1 100644
--- a/assembly/mips/arith.lisp
+++ b/assembly/mips/arith.lisp
@@ -1,4 +1,4 @@
-;;; -*- Log: code.log; Package: C -*-
+;;; -*- Package: MIPS -*-
 ;;;
 ;;; **********************************************************************
 ;;; This code was written as part of the Spice Lisp project at
@@ -7,14 +7,14 @@
 ;;; Scott Fahlman (FAHLMAN@CMUC). 
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/mips/arith.lisp,v 1.3 1990/10/28 08:21:54 wlott Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/mips/arith.lisp,v 1.4 1990/11/03 17:22:51 wlott Exp $
 ;;;
 ;;; Stuff to handle simple cases for generic arithmetic.
 ;;;
 ;;; Written by William Lott.
 ;;;
 
-(in-package "C")
+(in-package "MIPS")
 
 
 (define-assembly-routine (generic-+
diff --git a/assembly/mips/array.lisp b/assembly/mips/array.lisp
index 8ff565af471f90f9c002018219ab446f217c3979..7e83f7406d34098a0c1bfb3223a3be93186b221b 100644
--- a/assembly/mips/array.lisp
+++ b/assembly/mips/array.lisp
@@ -1,4 +1,4 @@
-;;; -*- Package: C; Log: C.Log -*-
+;;; -*- Package: MIPS -*-
 ;;;
 ;;; **********************************************************************
 ;;; This code was written as part of the Spice Lisp project at
@@ -7,13 +7,13 @@
 ;;; Scott Fahlman (FAHLMAN@CMUC). 
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/mips/array.lisp,v 1.15 1990/10/28 06:01:20 wlott Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/mips/array.lisp,v 1.16 1990/11/03 17:22:54 wlott Exp $
 ;;;
 ;;;    This file contains the support routines for arrays and vectors.
 ;;;
 ;;; Written by William Lott.
 ;;; 
-(in-package "C")
+(in-package "MIPS")
 
 
 #+assembler
diff --git a/assembly/mips/assem-rtns.lisp b/assembly/mips/assem-rtns.lisp
index f73b94e701623c565a5841d9dc259facb218fbd5..1fb43ac3c7d7f427c8b35d13ac01cd9877b96f03 100644
--- a/assembly/mips/assem-rtns.lisp
+++ b/assembly/mips/assem-rtns.lisp
@@ -1,4 +1,4 @@
-;;; -*- Package: C; Log: C.Log -*-
+;;; -*- Package: MIPS -*-
 ;;;
 ;;; **********************************************************************
 ;;; This code was written as part of the Spice Lisp project at
@@ -7,10 +7,10 @@
 ;;; Scott Fahlman (FAHLMAN@CMUC). 
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/mips/assem-rtns.lisp,v 1.26 1990/10/28 06:01:38 wlott Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/mips/assem-rtns.lisp,v 1.27 1990/11/03 17:22:57 wlott Exp $
 ;;;
 ;;;
-(in-package "C")
+(in-package "MIPS")
 
 
 ;;;; Return-multiple with other than one value
diff --git a/assembly/mips/bit-bash.lisp b/assembly/mips/bit-bash.lisp
index 591bdbb944d2037e8eded5a900d104acceb5845d..f9ac823e127450b3aa17927ba7ff6182e3569e8f 100644
--- a/assembly/mips/bit-bash.lisp
+++ b/assembly/mips/bit-bash.lisp
@@ -1,4 +1,4 @@
-;;; -*- Log: code.log; Package: C -*-
+;;; -*- Package: MIPS -*-
 ;;;
 ;;; **********************************************************************
 ;;; This code was written as part of the Spice Lisp project at
@@ -7,14 +7,14 @@
 ;;; Scott Fahlman (FAHLMAN@CMUC). 
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/mips/bit-bash.lisp,v 1.10 1990/10/28 06:01:42 wlott Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/assembly/mips/bit-bash.lisp,v 1.11 1990/11/03 17:23:00 wlott Exp $
 ;;;
 ;;; Stuff to implement bit bashing.
 ;;;
 ;;; Written by William Lott.
 ;;;
 
-(in-package "C")
+(in-package "MIPS")
 
 
 ;;;; Blitting macros.  Used only at assemble time.