* boot/translator.boot (bpOutItem): Handle namespace declaration.

	Update all boot files to use `namespace' instead of `)package'.
	* interp/: Likewise.

131 files changed, 149 insertions, 153 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2c05c573..9345d0ca 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-08  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* boot/translator.boot (bpOutItem): Handle namespace declaration.
+	Update all boot files to use `namespace' instead of `)package'.
+	* interp/: Likewise.
+
 2008-05-07  Bill Page <bill.page@newsynthesis.org>
             Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
diff --git a/src/boot/ast.boot b/src/boot/ast.boot
index 551c6835..e8e81c29 100644
--- a/src/boot/ast.boot
+++ b/src/boot/ast.boot
@@ -38,10 +38,9 @@
 --   for representing Boot programs.
 --
 
-module ast
 import includer
-
-)package "BOOTTRAN"
+module ast
+namespace BOOTTRAN
 
 ++ True means that Boot functions should be translated to use
 ++ hash tables to remember values.  By default, functions are
diff --git a/src/boot/includer.boot b/src/boot/includer.boot
index bb8da9a9..53558b27 100644
--- a/src/boot/includer.boot
+++ b/src/boot/includer.boot
@@ -37,10 +37,10 @@
 --   This file defines the includer (or preprocessor) of Boot programs.
 --
 
-module includer
 import tokens
+module includer
+namespace BOOTTRAN
 
-)package "BOOTTRAN"
 -- BOOT INCLUDER
  
 -- Line syntax is
diff --git a/src/boot/parser.boot b/src/boot/parser.boot
index 771fade4..b55de2bc 100644
--- a/src/boot/parser.boot
+++ b/src/boot/parser.boot
@@ -39,12 +39,11 @@
 --
 
 
-module parser
 import includer
 import scanner
 import ast
- 
-)package "BOOTTRAN"
+module parser
+namespace BOOTTRAN
  
 
 ++ true when the current function definition has its parameters 
diff --git a/src/boot/pile.boot b/src/boot/pile.boot
index c5f16064..a95f4bbe 100644
--- a/src/boot/pile.boot
+++ b/src/boot/pile.boot
@@ -32,11 +32,11 @@
 -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-module pile
 import includer
 import scanner
- 
-)package "BOOTTRAN"
+module pile
+namespace BOOTTRAN
+
 shoeFirstTokPosn t== shoeTokPosn CAAR t
 shoeLastTokPosn  t== shoeTokPosn CADR t
 shoePileColumn t==CDR shoeTokPosn CAAR t
diff --git a/src/boot/scanner.boot b/src/boot/scanner.boot
index 108fc58a..90a7945f 100644
--- a/src/boot/scanner.boot
+++ b/src/boot/scanner.boot
@@ -33,11 +33,10 @@
 --
 
 
-module scanner
 import tokens
 import includer
-
-)package "BOOTTRAN"
+module scanner
+namespace BOOTTRAN
 
 -- converts X to double-float.
 double x ==
diff --git a/src/boot/strap/translator.clisp b/src/boot/strap/translator.clisp
index e3bab9c4..5f88927f 100644
--- a/src/boot/strap/translator.clisp
+++ b/src/boot/strap/translator.clisp
@@ -916,6 +916,9 @@
                    (LET ((|n| (CAR |bfVar#35|))
                          (|e| (CADR |bfVar#35|)))
                      (|bpPush| (LIST (LIST 'DEFCONSTANT |n| |e|)))))
+               (|namespace|
+                   (LET ((|n| (CAR |bfVar#35|)))
+                     (|bpPush| (LIST (LIST 'IN-PACKAGE (STRING |n|))))))
                (T (|bpPush| (LIST (|translateToplevelExpression| |b|))))))))))))
 
 (DEFUN |shoeAddbootIfNec| (|s|) (|shoeAddStringIfNec| ".boot" |s|))
diff --git a/src/boot/tokens.boot b/src/boot/tokens.boot
index 5c8382a3..9502190d 100644
--- a/src/boot/tokens.boot
+++ b/src/boot/tokens.boot
@@ -32,10 +32,9 @@
 -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --
 
-module tokens
 import initial_-env
-
-)package "BOOTTRAN"
+module tokens
+namespace BOOTTRAN
 
 ++ Table of Boot keywords and their token name.
 shoeKeyWords == [  _
diff --git a/src/boot/translator.boot b/src/boot/translator.boot
index 53cfdb3b..02d809ba 100644
--- a/src/boot/translator.boot
+++ b/src/boot/translator.boot
@@ -33,14 +33,13 @@
 --
 
 
-module translator
 import includer
 import scanner
 import pile
 import parser
 import ast
-
-)package "BOOTTRAN"
+module translator
+namespace BOOTTRAN
 
 ++ If non nil, holds the name of the current module being translated.
 $currentModuleName := nil
@@ -497,6 +496,9 @@ bpOutItem()==
     ConstantDefinition(n, e) =>
       bpPush [["DEFCONSTANT", n, e]]
 
+    namespace(n) =>
+      bpPush [["IN-PACKAGE",STRING n]]
+
     otherwise =>
       bpPush [translateToplevelExpression b]
  
diff --git a/src/interp/alql.boot b/src/interp/alql.boot
index b00677a8..5b7431ad 100644
--- a/src/interp/alql.boot
+++ b/src/interp/alql.boot
@@ -31,7 +31,7 @@
 
 
 import br_-search
-)package "BOOT"
+namespace BOOT
 
 getBrowseDatabase(kind) ==
   $includeUnexposed? : local := true
diff --git a/src/interp/apply.boot b/src/interp/apply.boot
index 30aeefc2..4bc7a660 100644
--- a/src/interp/apply.boot
+++ b/src/interp/apply.boot
@@ -33,7 +33,7 @@
 
 
 import compiler
-)package "BOOT"
+namespace BOOT
 
 compAtomWithModemap: (%Form,%Mode,%Env,%Thing) -> %Maybe %Triple
 compAtomWithModemap(x,m,e,v) ==
diff --git a/src/interp/as.boot b/src/interp/as.boot
index 62b241ad..64e04098 100644
--- a/src/interp/as.boot
+++ b/src/interp/as.boot
@@ -33,7 +33,7 @@
 
 
 import macros
-)package "BOOT"
+namespace BOOT
 
 --global hash tables for new compiler
 $docHash  := MAKE_-HASH_-TABLE()
diff --git a/src/interp/astr.boot b/src/interp/astr.boot
index 81a28706..ecf8768a 100644
--- a/src/interp/astr.boot
+++ b/src/interp/astr.boot
@@ -32,8 +32,7 @@
 -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import vmlisp
-
-)package "BOOT"
+namespace BOOT
 
 --% Attributed Structures (astr)
 -- For objects which are pairs where the CAR field is either just a tag
diff --git a/src/interp/ax.boot b/src/interp/ax.boot
index c492d683..7ddee7e8 100644
--- a/src/interp/ax.boot
+++ b/src/interp/ax.boot
@@ -33,7 +33,7 @@
 
 
 import as
-)package "BOOT"
+namespace BOOT
 
 $stripTypes := false
 $pretendFlag := false
diff --git a/src/interp/bc-matrix.boot b/src/interp/bc-matrix.boot
index 8cba8faf..2ee2caaf 100644
--- a/src/interp/bc-matrix.boot
+++ b/src/interp/bc-matrix.boot
@@ -33,7 +33,7 @@
 
 
 import bc_-util
-)package "BOOT"
+namespace BOOT
 
 -- Basic Command matrix entry
 
diff --git a/src/interp/bc-misc.boot b/src/interp/bc-misc.boot
index 158baac3..46eaf266 100644
--- a/src/interp/bc-misc.boot
+++ b/src/interp/bc-misc.boot
@@ -33,7 +33,7 @@
 
 
 import bc_-util
-)package "BOOT"
+namespace BOOT
 
 --Hypertex commands other than solve and matrix
 
diff --git a/src/interp/bc-solve.boot b/src/interp/bc-solve.boot
index f481404b..b9b0912c 100644
--- a/src/interp/bc-solve.boot
+++ b/src/interp/bc-solve.boot
@@ -34,7 +34,7 @@
 
 import bc_-matrix
 import bc_-misc
-)package "BOOT"
+namespace BOOT
 
   -- HyperTeX basic Solve Command
 $systemType := nil
diff --git a/src/interp/bc-util.boot b/src/interp/bc-util.boot
index 55a454db..e9f590dc 100644
--- a/src/interp/bc-util.boot
+++ b/src/interp/bc-util.boot
@@ -33,7 +33,7 @@
 
 
 import ht_-util
-)package "BOOT"
+namespace BOOT
 
 ++
 $newConstructorList := nil
diff --git a/src/interp/br-con.boot b/src/interp/br-con.boot
index 1bc0482e..1bbb6d94 100644
--- a/src/interp/br-con.boot
+++ b/src/interp/br-con.boot
@@ -33,7 +33,7 @@
 
 
 import bc_-util
-)package "BOOT"
+namespace BOOT
 
 
 --====================> WAS b-con.boot <================================
diff --git a/src/interp/br-data.boot b/src/interp/br-data.boot
index 77d9d1c1..e704fc31 100644
--- a/src/interp/br-data.boot
+++ b/src/interp/br-data.boot
@@ -33,7 +33,7 @@
 
 
 import bc_-util
-)package "BOOT"
+namespace BOOT
 
 lefts u ==
    [x for x in HKEYS  _*HASCATEGORY_-HASH_* | CDR x = u]
diff --git a/src/interp/br-op1.boot b/src/interp/br-op1.boot
index 05be1d7f..8df539d2 100644
--- a/src/interp/br-op1.boot
+++ b/src/interp/br-op1.boot
@@ -33,7 +33,7 @@
 
 
 import bc_-util
-)package "BOOT"
+namespace BOOT
 
 --====================> WAS b-op1.boot <================================
 
diff --git a/src/interp/br-op2.boot b/src/interp/br-op2.boot
index bff5beac..4744cd5c 100644
--- a/src/interp/br-op2.boot
+++ b/src/interp/br-op2.boot
@@ -33,7 +33,7 @@
 
 
 import br_-op1
-)package "BOOT"
+namespace BOOT
 
 --====================> WAS br-op2.boot <================================
 
diff --git a/src/interp/br-prof.boot b/src/interp/br-prof.boot
index 762a6cde..d2f8111c 100644
--- a/src/interp/br-prof.boot
+++ b/src/interp/br-prof.boot
@@ -33,7 +33,7 @@
 
 
 import bc_-util
-)package "BOOT"
+namespace BOOT
 
 --====================> WAS b-prof.boot <================================
 
diff --git a/src/interp/br-saturn.boot b/src/interp/br-saturn.boot
index 6c18cdfd..1de6b47d 100644
--- a/src/interp/br-saturn.boot
+++ b/src/interp/br-saturn.boot
@@ -33,7 +33,7 @@
 
 
 import bc_-util
-)package "BOOT"
+namespace BOOT
 
 --====================> WAS b-saturn.boot <================================
 -- New file as of 6/95
diff --git a/src/interp/br-search.boot b/src/interp/br-search.boot
index 70f38187..be7213df 100644
--- a/src/interp/br-search.boot
+++ b/src/interp/br-search.boot
@@ -33,7 +33,7 @@
 
 
 import bc_-util
-)package "BOOT"
+namespace BOOT
 
 --====================> WAS b-search.boot <================================
 
diff --git a/src/interp/br-util.boot b/src/interp/br-util.boot
index 14b28659..cfa063f1 100644
--- a/src/interp/br-util.boot
+++ b/src/interp/br-util.boot
@@ -33,7 +33,7 @@
 
 
 import bc_-util
-)package "BOOT"
+namespace BOOT
 
 --====================> WAS b-util.boot <================================
 
diff --git a/src/interp/buildom.boot b/src/interp/buildom.boot
index f3daabca..6d94cc4c 100644
--- a/src/interp/buildom.boot
+++ b/src/interp/buildom.boot
@@ -41,7 +41,7 @@
 -- GDR, March 2008.
 
 import sys_-macros
-)package "BOOT"
+namespace BOOT
 
 $noCategoryDomains == '(Mode SubDomain)
 $nonLisplibDomains == APPEND($Primitives,$noCategoryDomains)
diff --git a/src/interp/c-doc.boot b/src/interp/c-doc.boot
index 5507c9f3..fdf34936 100644
--- a/src/interp/c-doc.boot
+++ b/src/interp/c-doc.boot
@@ -33,7 +33,7 @@
 
 
 import c_-util
-)package "BOOT"
+namespace BOOT
 
 batchExecute() ==
   _/RF_-1 '(GENCON INPUT)
diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot
index 1ba51e82..4e860c08 100644
--- a/src/interp/c-util.boot
+++ b/src/interp/c-util.boot
@@ -33,7 +33,7 @@
 
 
 import g_-util
-)package "BOOT"
+namespace BOOT
 
 ++ If using old `Rep' definition semantics, return `$' when m is `Rep'.
 ++ Otherwise, return `m'.
diff --git a/src/interp/category.boot b/src/interp/category.boot
index a9f46ec8..90145569 100644
--- a/src/interp/category.boot
+++ b/src/interp/category.boot
@@ -33,7 +33,7 @@
 
 
 import g_-util
-)package "BOOT"
+namespace BOOT
  
 -- Functions for building categories
  
diff --git a/src/interp/cattable.boot b/src/interp/cattable.boot
index 6f2a42b1..29632e2c 100644
--- a/src/interp/cattable.boot
+++ b/src/interp/cattable.boot
@@ -34,7 +34,7 @@
 
 import simpbool
 import g_-util
-)package "BOOT"
+namespace BOOT
 
 hasCat(domainOrCatName,catName) ==
   catName='Object or catName='Type  -- every domain is a Type (Object)
diff --git a/src/interp/cformat.boot b/src/interp/cformat.boot
index 5155a277..29bb555b 100644
--- a/src/interp/cformat.boot
+++ b/src/interp/cformat.boot
@@ -34,8 +34,7 @@
 
 import unlisp
 import posit
-
-)package "BOOT"
+namespace BOOT
 
 --% Formatting functions for various compiler data objects.
 --  These are used as [%origin o, %id n] for %1f %2f... style arguments
diff --git a/src/interp/clam.boot b/src/interp/clam.boot
index 273ed119..7ba68452 100644
--- a/src/interp/clam.boot
+++ b/src/interp/clam.boot
@@ -33,7 +33,7 @@
 
 
 import g_-timer
-)package "BOOT"
+namespace BOOT
 
 --% Cache Lambda Facility
 -- for remembering previous values to functions
diff --git a/src/interp/clammed.boot b/src/interp/clammed.boot
index 30348f55..f89c9b14 100644
--- a/src/interp/clammed.boot
+++ b/src/interp/clammed.boot
@@ -32,7 +32,7 @@
 -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import g_-timer
-)package "BOOT"
+namespace BOOT
 
 ++ All functions defined in this file are `clammed', e.g. they are
 ++ translated in such a way that they cache results they compute.
diff --git a/src/interp/compat.boot b/src/interp/compat.boot
index 7ff3c776..6916d25f 100644
--- a/src/interp/compat.boot
+++ b/src/interp/compat.boot
@@ -33,7 +33,7 @@
 
 
 import pathname
-)package "BOOT"
+namespace BOOT
 
 -- some functions that may need to be changed on different lisp
 -- systems.
diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot
index e0530427..e134eb22 100644
--- a/src/interp/compiler.boot
+++ b/src/interp/compiler.boot
@@ -37,7 +37,7 @@ import pathname
 import modemap
 import define
 import iterator
-)package "BOOT"
+namespace BOOT
 
 ++ A list of routines for diagnostic reports.  These functions, in an
 ++ abstract sense, have type: forall T: Type . String -> T, so they
diff --git a/src/interp/compress.boot b/src/interp/compress.boot
index 358dbb14..60634498 100644
--- a/src/interp/compress.boot
+++ b/src/interp/compress.boot
@@ -33,7 +33,7 @@
 
 
 import sys_-macros
-)package "BOOT"
+namespace BOOT
 
 -- This one is not currently in general use, but can be applied
 -- to various situations are required
diff --git a/src/interp/cparse.boot b/src/interp/cparse.boot
index 8d3972ec..ab65c697 100644
--- a/src/interp/cparse.boot
+++ b/src/interp/cparse.boot
@@ -32,8 +32,7 @@
 -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import ptrees
-
-)package "BOOT"
+namespace BOOT
 
 -- npTerm introduced between npRemainder and npSum
 -- rhs of assignment changed from npStatement to npGives
diff --git a/src/interp/cstream.boot b/src/interp/cstream.boot
index 02621cbb..08e8ab97 100644
--- a/src/interp/cstream.boot
+++ b/src/interp/cstream.boot
@@ -33,8 +33,7 @@
 
 
 import sys_-macros
-
-)package "BOOT"
+namespace BOOT
 
 --% Stream Utilities
  
diff --git a/src/interp/database.boot b/src/interp/database.boot
index bfe0107e..fb2e6bf5 100644
--- a/src/interp/database.boot
+++ b/src/interp/database.boot
@@ -37,7 +37,7 @@ import g_-cndata
 import clam
 import cattable
 import compat
-)package "BOOT"
+namespace BOOT
 
 $getUnexposedOperations := true
 $globalExposureGroupAlist := []
diff --git a/src/interp/define.boot b/src/interp/define.boot
index 6d04bfcf..94df2a18 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -35,7 +35,7 @@
 import c_-util
 import cattable
 import category
-)package "BOOT"
+namespace BOOT
 
 NRTPARSE := false
 $newCompCompare := false
diff --git a/src/interp/diagnostics.boot b/src/interp/diagnostics.boot
index c868815a..33111966 100644
--- a/src/interp/diagnostics.boot
+++ b/src/interp/diagnostics.boot
@@ -41,7 +41,7 @@
 import sys_-constants
 import sys_-globals
 import vmlisp
-)package "BOOT"
+namespace BOOT
 
 
 ++ This routine is used by the interperter to count syntax, or
diff --git a/src/interp/dq.boot b/src/interp/dq.boot
index c1d4c03e..43b1f009 100644
--- a/src/interp/dq.boot
+++ b/src/interp/dq.boot
@@ -33,7 +33,7 @@
 
 
 import types
-)package "BOOT"
+namespace BOOT
 
 -- Dequeue functions
  
diff --git a/src/interp/format.boot b/src/interp/format.boot
index 5256c87b..3144410e 100644
--- a/src/interp/format.boot
+++ b/src/interp/format.boot
@@ -33,7 +33,7 @@
 
 
 import macros
-)package "BOOT"
+namespace BOOT
 
 --% Functions for display formatting system objects
 
diff --git a/src/interp/fortcall.boot b/src/interp/fortcall.boot
index 5fcb6611..d5cefb20 100644
--- a/src/interp/fortcall.boot
+++ b/src/interp/fortcall.boot
@@ -33,7 +33,7 @@
 
 
 import sys_-macros
-)package "BOOT"
+namespace BOOT
 
 makeVector(elts, t) ==
   MAKE_-ARRAY(#elts, KEYWORD::ELEMENT_-TYPE, t or true,
diff --git a/src/interp/functor.boot b/src/interp/functor.boot
index 5026bc2e..657a7a13 100644
--- a/src/interp/functor.boot
+++ b/src/interp/functor.boot
@@ -34,7 +34,7 @@
 
 import c_-util
 import category
-)package "BOOT"
+namespace BOOT
 
 --%  Domain printing
 keyItem a ==
diff --git a/src/interp/g-boot.boot b/src/interp/g-boot.boot
index 3b5bdc56..db7efaff 100644
--- a/src/interp/g-boot.boot
+++ b/src/interp/g-boot.boot
@@ -34,7 +34,7 @@
 
 import def
 import g_-util
-)package "BOOT"
+namespace BOOT
 
 -- @(#)g-boot.boot      2.2      89/11/02  14:44:09
 
diff --git a/src/interp/g-cndata.boot b/src/interp/g-cndata.boot
index 647c52a1..285dc570 100644
--- a/src/interp/g-cndata.boot
+++ b/src/interp/g-cndata.boot
@@ -33,7 +33,7 @@
 
 
 import sys_-macros
-)package "BOOT"
+namespace BOOT
 
 --% Manipulation of Constructor Datat
 
diff --git a/src/interp/g-error.boot b/src/interp/g-error.boot
index dbb991ba..c3bcdf5a 100644
--- a/src/interp/g-error.boot
+++ b/src/interp/g-error.boot
@@ -34,7 +34,7 @@
 
 import diagnostics
 import g_-util
-)package "BOOT"
+namespace BOOT
 
 -- This file contains the error printing code used in BOOT and SPAD.
 -- While SPAD only calls "error" (which is then labeled as an algebra
diff --git a/src/interp/g-opt.boot b/src/interp/g-opt.boot
index 4e2b4484..00d8c6e0 100644
--- a/src/interp/g-opt.boot
+++ b/src/interp/g-opt.boot
@@ -33,8 +33,7 @@
 
 
 import def
-
-)package "BOOT"
+namespace BOOT
 
 --% OPTIMIZER
  
diff --git a/src/interp/g-timer.boot b/src/interp/g-timer.boot
index a000929a..8e3dee73 100644
--- a/src/interp/g-timer.boot
+++ b/src/interp/g-timer.boot
@@ -34,7 +34,7 @@
 
 import macros
 import g_-util
-)package "BOOT"
+namespace BOOT
 
 --% Code instrumentation facilities
 --  These functions can be used with arbitrary lists of
diff --git a/src/interp/g-util.boot b/src/interp/g-util.boot
index 580fb329..e82e8edb 100644
--- a/src/interp/g-util.boot
+++ b/src/interp/g-util.boot
@@ -34,7 +34,7 @@
 
 import macros
 import sys_-utility
-)package "BOOT"
+namespace BOOT
 
 ++
 $interpOnly := false
diff --git a/src/interp/hashcode.boot b/src/interp/hashcode.boot
index 692710ac..95a56ce6 100644
--- a/src/interp/hashcode.boot
+++ b/src/interp/hashcode.boot
@@ -33,7 +33,7 @@
 
 
 import g_-util
-)package "BOOT"
+namespace BOOT
 
 $DomainsWithoutLisplibs ==
   '(CAPSULE Union Record SubDomain Mapping Enumeration Mode)
diff --git a/src/interp/ht-root.boot b/src/interp/ht-root.boot
index a96de4c5..965b1f7e 100644
--- a/src/interp/ht-root.boot
+++ b/src/interp/ht-root.boot
@@ -33,7 +33,7 @@
 
 
 import ht_-util
-)package "BOOT"
+namespace BOOT
 
 $historyDisplayWidth := 120
 $newline := char 10
diff --git a/src/interp/ht-util.boot b/src/interp/ht-util.boot
index ded0a051..612131bc 100644
--- a/src/interp/ht-util.boot
+++ b/src/interp/ht-util.boot
@@ -33,7 +33,7 @@
 
 
 import macros
-)package "BOOT"
+namespace BOOT
 
 -- HyperTeX Utilities for generating basic Command pages
 
diff --git a/src/interp/htcheck.boot b/src/interp/htcheck.boot
index 18ab09d0..cd4639cb 100644
--- a/src/interp/htcheck.boot
+++ b/src/interp/htcheck.boot
@@ -34,7 +34,7 @@
 
 import sys_-driver
 import macros
-)package "BOOT"
+namespace BOOT
 
 $primitiveHtCommands := '(
   ("\ContinueButton"     . 1)
diff --git a/src/interp/htsetvar.boot b/src/interp/htsetvar.boot
index 15524191..dd1bc8cc 100644
--- a/src/interp/htsetvar.boot
+++ b/src/interp/htsetvar.boot
@@ -33,7 +33,7 @@
 
 
 import macros
-)package "BOOT"
+namespace BOOT
 
 htsv() ==
   startHTPage(50)
diff --git a/src/interp/hypertex.boot b/src/interp/hypertex.boot
index ff683357..7f90801a 100644
--- a/src/interp/hypertex.boot
+++ b/src/interp/hypertex.boot
@@ -33,7 +33,7 @@
 
 
 import types
-)package "BOOT"
+namespace BOOT
 
 -- HyperTex Spad interface
 
diff --git a/src/interp/i-analy.boot b/src/interp/i-analy.boot
index 2f2bc259..6825df75 100644
--- a/src/interp/i-analy.boot
+++ b/src/interp/i-analy.boot
@@ -33,7 +33,7 @@
 
 
 import i_-object
-)package "BOOT"
+namespace BOOT
 
 $univariateDomains ==
   '(UnivariatePolynomial
diff --git a/src/interp/i-code.boot b/src/interp/i-code.boot
index b2d5d132..99894ae4 100644
--- a/src/interp/i-code.boot
+++ b/src/interp/i-code.boot
@@ -31,7 +31,7 @@
 
 
 import i_-object
-)package "BOOT"
+namespace BOOT
 
 --% Interpreter Code Generation Routines
 
diff --git a/src/interp/i-coerce.boot b/src/interp/i-coerce.boot
index 769a5990..2ab91994 100644
--- a/src/interp/i-coerce.boot
+++ b/src/interp/i-coerce.boot
@@ -34,7 +34,7 @@
 
 import i_-analy
 import i_-resolv
-)package "BOOT"
+namespace BOOT
 
 $useCoerceOrCroak := true
 $useConvertForCoercions := false
diff --git a/src/interp/i-coerfn.boot b/src/interp/i-coerfn.boot
index 911df807..4574d9a2 100644
--- a/src/interp/i-coerfn.boot
+++ b/src/interp/i-coerfn.boot
@@ -31,7 +31,7 @@
 
 
 import i_-coerce
-)package "BOOT"
+namespace BOOT
 
 $coerceFailure := GENSYM()
 
diff --git a/src/interp/i-eval.boot b/src/interp/i-eval.boot
index 08e9c0a8..574cbcb0 100644
--- a/src/interp/i-eval.boot
+++ b/src/interp/i-eval.boot
@@ -31,7 +31,7 @@
 
 
 import i_-analy
-)package "BOOT"
+namespace BOOT
 
 --% Constructor Evaluation
 
diff --git a/src/interp/i-funsel.boot b/src/interp/i-funsel.boot
index 3c618749..e0b841d9 100644
--- a/src/interp/i-funsel.boot
+++ b/src/interp/i-funsel.boot
@@ -33,7 +33,7 @@
 
 
 import i_-coerfn
-)package "BOOT"
+namespace BOOT
 
 $constructorExposureList := '(Boolean Integer String)
 $domPvar := nil
diff --git a/src/interp/i-intern.boot b/src/interp/i-intern.boot
index c0a2244e..7a373563 100644
--- a/src/interp/i-intern.boot
+++ b/src/interp/i-intern.boot
@@ -34,7 +34,7 @@
 
 import i_-object
 import ptrees
-)package "BOOT"
+namespace BOOT
 
 $useParserSrcPos :=  NIL
 $transferParserSrcPos := NIL
diff --git a/src/interp/i-map.boot b/src/interp/i-map.boot
index b2481035..0da27dee 100644
--- a/src/interp/i-map.boot
+++ b/src/interp/i-map.boot
@@ -33,7 +33,7 @@
 
 
 import i_-object
-)package "BOOT"
+namespace BOOT
 
 --% User Function Creation and Analysis Code
 
diff --git a/src/interp/i-object.boot b/src/interp/i-object.boot
index 14255c0c..7db445dc 100644
--- a/src/interp/i-object.boot
+++ b/src/interp/i-object.boot
@@ -32,7 +32,7 @@
 -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import g_-util
-)package "BOOT"
+namespace BOOT
 
 ++ true when the interpreter should evaluate forms to values, as
 ++ opposed to just generating code to compute values.
diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot
index 222d03fb..20f15757 100644
--- a/src/interp/i-output.boot
+++ b/src/interp/i-output.boot
@@ -33,7 +33,7 @@
 
 
 import sys_-macros
-)package "BOOT"
+namespace BOOT
 
 --Modified JHD February 1993: see files miscout.input for some tests of this
 -- General principle is that maprin0 is the top-level routine,
diff --git a/src/interp/i-parser.boot b/src/interp/i-parser.boot
index ec1ef706..828961d9 100644
--- a/src/interp/i-parser.boot
+++ b/src/interp/i-parser.boot
@@ -37,7 +37,7 @@
 
 import cparse
 import pf2sex
-)package "BOOT"
+namespace BOOT
 
 ++ returns the list of tokens making up a line in the stream `s'
 tokenizeLine s ==
diff --git a/src/interp/i-resolv.boot b/src/interp/i-resolv.boot
index f8223435..56561df3 100644
--- a/src/interp/i-resolv.boot
+++ b/src/interp/i-resolv.boot
@@ -31,7 +31,7 @@
 
 
 import i_-object
-)package "BOOT"
+namespace BOOT
 
 resolveTypeList u ==
   u is [a,:tail] =>
diff --git a/src/interp/i-spec1.boot b/src/interp/i-spec1.boot
index d2170a90..f3bbb54d 100644
--- a/src/interp/i-spec1.boot
+++ b/src/interp/i-spec1.boot
@@ -33,7 +33,7 @@
 
 
 import i_-analy
-)package "BOOT"
+namespace BOOT
 
 
 -- Functions which require special handlers (also see end of file)
diff --git a/src/interp/i-spec2.boot b/src/interp/i-spec2.boot
index 9e25b2a3..755d8f98 100644
--- a/src/interp/i-spec2.boot
+++ b/src/interp/i-spec2.boot
@@ -33,7 +33,7 @@
 
 
 import i_-spec1
-)package "BOOT"
+namespace BOOT
 
 ++ Interpreter macros
 $InterpreterMacroAlist ==
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index 00ef8fe6..f2c554e7 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -33,7 +33,7 @@
 
 
 import i_-object
-)package "BOOT"
+namespace BOOT
 
 --% Utility Variable Initializations
 
diff --git a/src/interp/i-toplev.boot b/src/interp/i-toplev.boot
index 34f6813f..686531f4 100644
--- a/src/interp/i-toplev.boot
+++ b/src/interp/i-toplev.boot
@@ -33,7 +33,7 @@
 
 
 import i_-analy
-)package "BOOT"
+namespace BOOT
 
 --% Top Level Interpreter Code
 
diff --git a/src/interp/i-util.boot b/src/interp/i-util.boot
index 8c10a164..fceb9cfe 100644
--- a/src/interp/i-util.boot
+++ b/src/interp/i-util.boot
@@ -31,7 +31,7 @@
 
 
 import g_-util
-)package "BOOT"
+namespace BOOT
 
 --% The function for making prompts
  
diff --git a/src/interp/incl.boot b/src/interp/incl.boot
index 91795e30..016a2fa5 100644
--- a/src/interp/incl.boot
+++ b/src/interp/incl.boot
@@ -35,8 +35,7 @@
 import unlisp
 import cstream
 import cformat
-
-)package "BOOT"
+namespace BOOT
  
 ++ The following symbol constants tag input source program parts, for
 ++ conditional inclusion purposes.
diff --git a/src/interp/info.boot b/src/interp/info.boot
index b4c978b8..8f8cd290 100644
--- a/src/interp/info.boot
+++ b/src/interp/info.boot
@@ -57,7 +57,7 @@
 
 
 import g_-util
-)package "BOOT"
+namespace BOOT
 
 printInfo $e ==
   for u in get("$Information","special",$e) repeat PRETTYPRINT u
diff --git a/src/interp/int-top.boot b/src/interp/int-top.boot
index 7dc611be..055074ca 100644
--- a/src/interp/int-top.boot
+++ b/src/interp/int-top.boot
@@ -35,7 +35,7 @@
 import incl
 import i_-toplev
 import unlisp
-)package "BOOT"
+namespace BOOT
 
 ncParseAndInterpretString s ==
   processInteractive(packageTran parseFromString s, nil)
diff --git a/src/interp/interop.boot b/src/interp/interop.boot
index 3ca88058..99f0b7d8 100644
--- a/src/interp/interop.boot
+++ b/src/interp/interop.boot
@@ -33,7 +33,7 @@
 
 
 import c_-util
-)package "BOOT"
+namespace BOOT
 
 -- note domainObjects are now (dispatchVector hashCode . domainVector)
 -- lazy oldAxiomDomainObjects are (dispatchVector hashCode  (Call form) . backptr), 
diff --git a/src/interp/intfile.boot b/src/interp/intfile.boot
index 08d474fd..967eb9ae 100644
--- a/src/interp/intfile.boot
+++ b/src/interp/intfile.boot
@@ -33,7 +33,7 @@
 
 
 import cstream
-)package "BOOT"
+namespace BOOT
 
 shoeInternFile(fn)==
    a:=shoeInputFile fn
diff --git a/src/interp/iterator.boot b/src/interp/iterator.boot
index e0fbc485..52642669 100644
--- a/src/interp/iterator.boot
+++ b/src/interp/iterator.boot
@@ -33,7 +33,7 @@
 
 
 import g_-util
-)package "BOOT"
+namespace BOOT
 
 --% ITERATORS
  
diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot
index d6fed03d..286eb3eb 100644
--- a/src/interp/lisplib.boot
+++ b/src/interp/lisplib.boot
@@ -35,7 +35,7 @@
 import nlib
 import c_-util
 import debug
-)package "BOOT"
+namespace BOOT
 
 ++
 $functionLocations := []
diff --git a/src/interp/macex.boot b/src/interp/macex.boot
index 8aa1d6e9..41b4c6b9 100644
--- a/src/interp/macex.boot
+++ b/src/interp/macex.boot
@@ -33,7 +33,7 @@
 
 
 import ptrees
-)package "BOOT"
+namespace BOOT
 
 --% Macro expansion
 --  Functions to transform parse forms.
diff --git a/src/interp/mark.boot b/src/interp/mark.boot
index 316c3531..b8ae9716 100644
--- a/src/interp/mark.boot
+++ b/src/interp/mark.boot
@@ -42,7 +42,7 @@
 
 
 import macros
-)package "BOOT"
+namespace BOOT
 
 REMPROP("and",'parseTran)
 REMPROP("or",'parseTran)
diff --git a/src/interp/match.boot b/src/interp/match.boot
index 31cc742b..658fca4c 100644
--- a/src/interp/match.boot
+++ b/src/interp/match.boot
@@ -33,7 +33,7 @@
 
 
 import sys_-macros
-)package "BOOT"
+namespace BOOT
 
 $wildCard := char "*"
 
diff --git a/src/interp/modemap.boot b/src/interp/modemap.boot
index 3ad013bd..f941c3aa 100644
--- a/src/interp/modemap.boot
+++ b/src/interp/modemap.boot
@@ -34,7 +34,7 @@
 
 import c_-util
 import info
-)package "BOOT"
+namespace BOOT
 
 --% EXTERNAL ROUTINES
  
diff --git a/src/interp/msg.boot b/src/interp/msg.boot
index 0e47862d..a4b40645 100644
--- a/src/interp/msg.boot
+++ b/src/interp/msg.boot
@@ -34,7 +34,7 @@
 
 import sys_-macros
 import astr
-)package "BOOT"
+namespace BOOT
 
 $erLocMsgDatabaseName     := pathname '(co_-eng msgs a)
 $erGlbMsgDatabaseName     := pathname '(co_-eng msgs i)
diff --git a/src/interp/msgdb.boot b/src/interp/msgdb.boot
index 9128d3c1..f1defd1f 100644
--- a/src/interp/msgdb.boot
+++ b/src/interp/msgdb.boot
@@ -77,7 +77,7 @@
 
 
 import g_-util
-)package "BOOT"
+namespace BOOT
 
 --% Message Database Code and Message Utility Functions
 
diff --git a/src/interp/newfort.boot b/src/interp/newfort.boot
index c57e0163..d4bbf6b6 100644
--- a/src/interp/newfort.boot
+++ b/src/interp/newfort.boot
@@ -33,7 +33,7 @@
 
 
 import macros
-)package "BOOT"
+namespace BOOT
 
 $fortranArrayStartingIndex := 0
 
diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot
index 7c5015b7..6d11867c 100644
--- a/src/interp/nruncomp.boot
+++ b/src/interp/nruncomp.boot
@@ -34,7 +34,7 @@
 
 import c_-util
 import simpbool
-)package "BOOT"
+namespace BOOT
 
 
 ++ The base index for encoding items into a functor template 
diff --git a/src/interp/nrunfast.boot b/src/interp/nrunfast.boot
index 0bee8ef9..44fa5463 100644
--- a/src/interp/nrunfast.boot
+++ b/src/interp/nrunfast.boot
@@ -33,7 +33,7 @@
 
 
 import c_-util
-)package "BOOT"
+namespace BOOT
 
 ++
 $doNotCompressHashTableIfTrue := false
diff --git a/src/interp/nrungo.boot b/src/interp/nrungo.boot
index 3f2c4e53..8c927a0c 100644
--- a/src/interp/nrungo.boot
+++ b/src/interp/nrungo.boot
@@ -33,7 +33,7 @@
 
 
 import c_-util
-)package "BOOT"
+namespace BOOT
 
 ++
 $insideCompileBodyIfTrue := false
diff --git a/src/interp/nrunopt.boot b/src/interp/nrunopt.boot
index 4bf2d1f9..e768caef 100644
--- a/src/interp/nrunopt.boot
+++ b/src/interp/nrunopt.boot
@@ -33,7 +33,7 @@
 
 
 import c_-util
-)package "BOOT"
+namespace BOOT
 
 --=======================================================================
 --            Generate Code to Create Infovec
diff --git a/src/interp/nruntime.boot b/src/interp/nruntime.boot
index 89d2aa5f..4861e7b0 100644
--- a/src/interp/nruntime.boot
+++ b/src/interp/nruntime.boot
@@ -33,7 +33,7 @@
 
 
 import c_-util
-)package "BOOT"
+namespace BOOT
 
 ++ fetchs the item in the nth entry of a domain shell.
 getShellEntry: (%Shell,%Short) -> %Thing
diff --git a/src/interp/osyscmd.boot b/src/interp/osyscmd.boot
index 21ed923c..68a0eac9 100644
--- a/src/interp/osyscmd.boot
+++ b/src/interp/osyscmd.boot
@@ -33,7 +33,7 @@
 
 
 import int_-top
-)package "BOOT"
+namespace BOOT
 
 
 InterpExecuteSpadSystemCommand string ==
diff --git a/src/interp/package.boot b/src/interp/package.boot
index ae98ea1c..454d6cca 100644
--- a/src/interp/package.boot
+++ b/src/interp/package.boot
@@ -33,7 +33,7 @@
 
 
 import clam
-)package "BOOT"
+namespace BOOT
 
 isPackageFunction() ==
   -- called by compile/putInLocalDomainReferences
diff --git a/src/interp/packtran.boot b/src/interp/packtran.boot
index 0826ccbf..89593899 100644
--- a/src/interp/packtran.boot
+++ b/src/interp/packtran.boot
@@ -33,7 +33,7 @@
 
 
 import sys_-macros
-)package "BOOT"
+namespace BOOT
 
 rePackageTran(sex, package) ==
   SETQ(_*PACKAGE_*,FIND_-PACKAGE STRING package)
diff --git a/src/interp/parse.boot b/src/interp/parse.boot
index 0ba361ba..ce48ef98 100644
--- a/src/interp/parse.boot
+++ b/src/interp/parse.boot
@@ -33,7 +33,7 @@
 
 
 import postpar
-)package "BOOT"
+namespace BOOT
 
 --% Transformation of Parser Output
 
diff --git a/src/interp/pathname.boot b/src/interp/pathname.boot
index b6e17f50..9c466a07 100644
--- a/src/interp/pathname.boot
+++ b/src/interp/pathname.boot
@@ -33,7 +33,7 @@
 
 
 import nlib
-)package "BOOT"
+namespace BOOT
 
 -- This file implements the Common Lisp pathname functions for
 -- Lisp/VM.  On VM, a filename is 3-list consisting of the filename,
diff --git a/src/interp/pf2sex.boot b/src/interp/pf2sex.boot
index 45f4cdfc..85ebedb1 100644
--- a/src/interp/pf2sex.boot
+++ b/src/interp/pf2sex.boot
@@ -33,7 +33,7 @@
 
 
 import ptrees
-)package "BOOT"
+namespace BOOT
 
 $dotdot := INTERN('"..", '"BOOT")
 $specificMsgTags := nil
diff --git a/src/interp/pile.boot b/src/interp/pile.boot
index 725993fd..68f040fe 100644
--- a/src/interp/pile.boot
+++ b/src/interp/pile.boot
@@ -32,8 +32,7 @@
 -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import scan
-
-)package "BOOT"
+namespace BOOT
 
 -- insertpiles converts a line-list to a line-forest where
  
diff --git a/src/interp/posit.boot b/src/interp/posit.boot
index 3dc3fa90..0e12dbfc 100644
--- a/src/interp/posit.boot
+++ b/src/interp/posit.boot
@@ -33,8 +33,7 @@
 
 import sys_-macros
 import astr
-
-)package "BOOT"
+namespace BOOT
 
 $nopos ==
   ['noposition]
diff --git a/src/interp/postpar.boot b/src/interp/postpar.boot
index 15b43600..9c6a3662 100644
--- a/src/interp/postpar.boot
+++ b/src/interp/postpar.boot
@@ -33,7 +33,7 @@
 
 
 import macros
-)package "BOOT"
+namespace BOOT
 
 ++ The type of parse trees.
 %ParseTree <=> 
diff --git a/src/interp/profile.boot b/src/interp/profile.boot
index 81c4b067..03da2628 100644
--- a/src/interp/profile.boot
+++ b/src/interp/profile.boot
@@ -33,7 +33,7 @@
 
 
 import macros
-)package "BOOT"
+namespace BOOT
 
 --$profileCompiler := true
 $profileAlist := nil
diff --git a/src/interp/pspad1.boot b/src/interp/pspad1.boot
index 5eb6df45..5813a431 100644
--- a/src/interp/pspad1.boot
+++ b/src/interp/pspad1.boot
@@ -33,7 +33,7 @@
 
 
 import macros
-)package "BOOT"
+namespace BOOT
 
 $escapeWords := ["always", "assert", "but", "define", 
   "delay", "do", "except", "export", "extend", "fix", "fluid",
diff --git a/src/interp/pspad2.boot b/src/interp/pspad2.boot
index 3be0e640..d30defdb 100644
--- a/src/interp/pspad2.boot
+++ b/src/interp/pspad2.boot
@@ -33,7 +33,7 @@
 
 
 import pspad1
-)package "BOOT"
+namespace BOOT
 
 --======================================================================
 --                Constructor Transformation Functions
diff --git a/src/interp/ptrees.boot b/src/interp/ptrees.boot
index 85cfc48a..fc4f57e1 100644
--- a/src/interp/ptrees.boot
+++ b/src/interp/ptrees.boot
@@ -49,8 +49,7 @@
 
 import posit
 import serror
-
-)package "BOOT"
+namespace BOOT
 
 --% SPECIAL NODES
 pfListOf x          == pfTree('listOf,x)
diff --git a/src/interp/record.boot b/src/interp/record.boot
index c7c13e5c..cdd02714 100644
--- a/src/interp/record.boot
+++ b/src/interp/record.boot
@@ -52,7 +52,7 @@
 
 import nlib
 import pathname
-)package "BOOT"
+namespace BOOT
 
 --=======================================================================
 --                      Global Variables
diff --git a/src/interp/rulesets.boot b/src/interp/rulesets.boot
index 6bb7bddf..73006b44 100644
--- a/src/interp/rulesets.boot
+++ b/src/interp/rulesets.boot
@@ -33,7 +33,7 @@
 
 
 import vmlisp
-)package "BOOT"
+namespace BOOT
 
 $ruleSetsInitialized := false
 
diff --git a/src/interp/scan.boot b/src/interp/scan.boot
index b6e4f61b..34dc2bb6 100644
--- a/src/interp/scan.boot
+++ b/src/interp/scan.boot
@@ -35,8 +35,7 @@
 import bits
 import dq
 import incl
-
-)package "BOOT"
+namespace BOOT
 
 --% Separators
 
diff --git a/src/interp/serror.boot b/src/interp/serror.boot
index cbc98480..1b3ead5c 100644
--- a/src/interp/serror.boot
+++ b/src/interp/serror.boot
@@ -32,10 +32,10 @@
 -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import posit
+namespace BOOT
 
 --% Functions to handle specific errors (mostly syntax)
  
-)package "BOOT"
 
 syGeneralErrorHere: () -> %Thing
 syGeneralErrorHere() ==
diff --git a/src/interp/server.boot b/src/interp/server.boot
index ea65ff3c..48818fe7 100644
--- a/src/interp/server.boot
+++ b/src/interp/server.boot
@@ -33,7 +33,7 @@
 
 
 import macros
-)package "BOOT"
+namespace BOOT
 
 -- Scratchpad-II server
 
diff --git a/src/interp/setvars.boot b/src/interp/setvars.boot
index f2143e5e..db8ad53d 100644
--- a/src/interp/setvars.boot
+++ b/src/interp/setvars.boot
@@ -55,7 +55,7 @@
 
 import macros
 import debug
-)package "BOOT"
+namespace BOOT
 
 
 $InitialCommandSynonymAlist == [
diff --git a/src/interp/setvart.boot b/src/interp/setvart.boot
index 5df4ff7f..de85d43e 100644
--- a/src/interp/setvart.boot
+++ b/src/interp/setvart.boot
@@ -33,7 +33,7 @@
 
 
 import macros
-)package "BOOT"
+namespace BOOT
 
 --% Table of )set options
 $setOptions := '(
diff --git a/src/interp/sfsfun.boot b/src/interp/sfsfun.boot
index 3c4cbd92..8118fb4b 100644
--- a/src/interp/sfsfun.boot
+++ b/src/interp/sfsfun.boot
@@ -68,7 +68,7 @@
 
 
 import macros
-)package "BOOT" 
+namespace BOOT
 
 FloatError(formatstring,arg) ==
 --        ERROR(formatstring,arg)
diff --git a/src/interp/showimp.boot b/src/interp/showimp.boot
index a8830f47..b94fe63f 100644
--- a/src/interp/showimp.boot
+++ b/src/interp/showimp.boot
@@ -33,7 +33,7 @@
 
 
 import macros
-)package "BOOT"
+namespace BOOT
 
 $returnNowhereFromGoGet := false
 
diff --git a/src/interp/simpbool.boot b/src/interp/simpbool.boot
index a49eb909..8154dbcd 100644
--- a/src/interp/simpbool.boot
+++ b/src/interp/simpbool.boot
@@ -32,7 +32,7 @@
 -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import macros
-)package "BOOT"
+namespace BOOT
 
 simpBool x == dnf2pf reduceDnf be x
  
diff --git a/src/interp/slam.boot b/src/interp/slam.boot
index 8629a5ed..b6ad0acc 100644
--- a/src/interp/slam.boot
+++ b/src/interp/slam.boot
@@ -33,7 +33,7 @@
 
 
 import g_-timer
-)package "BOOT"
+namespace BOOT
 
 ++ List of compiled function names.
 $compiledOpNameList := []
diff --git a/src/interp/spad-parser.boot b/src/interp/spad-parser.boot
index 94cf610a..cf45b619 100644
--- a/src/interp/spad-parser.boot
+++ b/src/interp/spad-parser.boot
@@ -44,7 +44,7 @@
 
 import metalex
 import parse
-)package "BOOT"
+namespace BOOT
 
 ++ Given a pathname to a source file containing Spad code, returns
 ++ a list of (old) AST objects representing the toplevel expressions
diff --git a/src/interp/sys-constants.boot b/src/interp/sys-constants.boot
index ee9a1801..9b4b1109 100644
--- a/src/interp/sys-constants.boot
+++ b/src/interp/sys-constants.boot
@@ -38,7 +38,7 @@
 --
 
 import types
-)package "BOOT"
+namespace BOOT
 
 
 ++ Clock time unit per second.
diff --git a/src/interp/sys-driver.boot b/src/interp/sys-driver.boot
index 6d8dbe9a..4b38b5cd 100644
--- a/src/interp/sys-driver.boot
+++ b/src/interp/sys-driver.boot
@@ -37,7 +37,7 @@
 --
 
 import types
-)package "BOOT"
+namespace BOOT
 
 ++ true means try starting an open server
 $openServerIfTrue := true
diff --git a/src/interp/sys-globals.boot b/src/interp/sys-globals.boot
index 551f2b56..458ea603 100644
--- a/src/interp/sys-globals.boot
+++ b/src/interp/sys-globals.boot
@@ -39,7 +39,7 @@
 
 import hash
 import sys_-constants
-)package "BOOT"
+namespace BOOT
 
 ++ FIXME
 $saturn := false
diff --git a/src/interp/sys-os.boot b/src/interp/sys-os.boot
index 827ae5b3..34836d16 100644
--- a/src/interp/sys-os.boot
+++ b/src/interp/sys-os.boot
@@ -41,7 +41,7 @@
 module sys_-os
 import types
 import cfuns
-)package "BOOT"
+namespace BOOT
 
 )if not %hasFeature KEYWORD::GCL
 loadSystemRuntimeCore()
diff --git a/src/interp/sys-utility.boot b/src/interp/sys-utility.boot
index 0c1d62e0..41deb426 100644
--- a/src/interp/sys-utility.boot
+++ b/src/interp/sys-utility.boot
@@ -35,7 +35,7 @@
 
 import sys_-os
 import vmlisp
-)package "BOOT"
+namespace BOOT
 
 
 --%
@@ -43,7 +43,6 @@ import vmlisp
 ++ getVMType returns an approximation of the underlying object type
 ++ representation of a domain, as a Lisp type specifier as seen by
 ++ the runtime system.
-getVMType: %Shell -> %Form
 getVMType d ==
   case (d' := devaluate d) of
     Void => "%Void"
diff --git a/src/interp/template.boot b/src/interp/template.boot
index 7cf7a7a3..196a3349 100644
--- a/src/interp/template.boot
+++ b/src/interp/template.boot
@@ -32,7 +32,7 @@
 -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import c_-util
-)package "BOOT"
+namespace BOOT
 
 getOperationAlistFromLisplib x ==
   -- used to be in clammed.boot. Moved on 1/24/94
diff --git a/src/interp/termrw.boot b/src/interp/termrw.boot
index 2edf0e3c..36380e04 100644
--- a/src/interp/termrw.boot
+++ b/src/interp/termrw.boot
@@ -32,7 +32,7 @@
 -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import macros
-)package "BOOT"
+namespace BOOT
  
 termRW(t,R) ==
   -- reduce t by rewrite system R
diff --git a/src/interp/topics.boot b/src/interp/topics.boot
index a1f717f4..663970a9 100644
--- a/src/interp/topics.boot
+++ b/src/interp/topics.boot
@@ -32,7 +32,7 @@
 -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import macros
-)package "BOOT"
+namespace BOOT
 
 $topicsDefaults := '(
   (basic elt setelt qelt qsetelt eval xRange yRange zRange map map_! qsetelt_!)
diff --git a/src/interp/trace.boot b/src/interp/trace.boot
index 50acb76b..d843d10f 100644
--- a/src/interp/trace.boot
+++ b/src/interp/trace.boot
@@ -33,7 +33,7 @@
 
 
 import debug
-)package "BOOT"
+namespace BOOT
 
 --% Code for tracing functions
 
diff --git a/src/interp/types.boot b/src/interp/types.boot
index 72db77ab..2ebd6f5b 100644
--- a/src/interp/types.boot
+++ b/src/interp/types.boot
@@ -32,7 +32,7 @@
 --
 
 import boot_-pkg
-)package "BOOT"
+namespace BOOT
 
 --% Basic types used throughout Boot codes.
 
diff --git a/src/interp/wi1.boot b/src/interp/wi1.boot
index a0602500..7d327fa4 100644
--- a/src/interp/wi1.boot
+++ b/src/interp/wi1.boot
@@ -33,7 +33,7 @@
 
 
 import macros
-)package "BOOT"
+namespace BOOT
 
 -- !! do not delete the next function !
 
diff --git a/src/interp/wi2.boot b/src/interp/wi2.boot
index ecad0fb5..35dcf1e7 100644
--- a/src/interp/wi2.boot
+++ b/src/interp/wi2.boot
@@ -34,7 +34,7 @@
 
 import macros
 import define
-)package "BOOT"
+namespace BOOT
 
 compDefineFunctor1(df, m,$e,$prefix,$formalArgList) ==
     ['DEF,form,signature,$functorSpecialCases,body] := df