Rename %veclit to %vector and %listlit to %list

19 files changed, 89 insertions, 89 deletions

diff --git a/src/interp/br-op1.boot b/src/interp/br-op1.boot
index bebe6a5d..6d3cf5b2 100644
--- a/src/interp/br-op1.boot
+++ b/src/interp/br-op1.boot
@@ -980,7 +980,7 @@ evalDomainOpPred(dom,pred) == process(dom,pred) where
     systemError nil
   convertCatArg p ==
     atom p or #p = 1 => MKQ p
-    ['%listlit,MKQ first p,:[convertCatArg x for x in rest p]]
+    ['%list,MKQ first p,:[convertCatArg x for x in rest p]]
   evpred(dom,pred) ==
     k := POSN1(pred,$predicateList) => testBitVector(dom.3,k + 1)
     evpred1(dom,pred)
diff --git a/src/interp/br-util.boot b/src/interp/br-util.boot
index 298af29a..8ee40a5d 100644
--- a/src/interp/br-util.boot
+++ b/src/interp/br-util.boot
@@ -178,7 +178,7 @@ htPred2English(x,:options) ==
 
 unMkEvalable u ==
  u is ['QUOTE,a] => a
- u is ['%listlit,:r] => [unMkEvalable x for x in r]
+ u is ['%list,:r] => [unMkEvalable x for x in r]
  u
 
 lisp2HT u == ['"_'",:fn u] where fn u ==
diff --git a/src/interp/buildom.boot b/src/interp/buildom.boot
index b2b5c8c3..7fd36e0f 100644
--- a/src/interp/buildom.boot
+++ b/src/interp/buildom.boot
@@ -348,7 +348,7 @@ mkNewUnionFunList(name,form is ["Union",:listOfEntries],e) ==
         ["hash",[$SingleInteger,name],["ELT",dc,0]],
 	 ["coerce",[$OutputForm,name],["ELT",dc,$FirstParamSlot+nargs+1]],:
 	   ("append"/
-	    [[["construct",[name,type],["XLAM",["#1"],["%makepair",i,"#1"]]],
+	    [[["construct",[name,type],["XLAM",["#1"],["%pair",i,"#1"]]],
 	      ["elt",[type,name,tag],cdownFun],
 		["case",[$Boolean,name,tag],
 		   ["XLAM",["#1","#2"],['%ieq,['%head,"#1"],i]]]]
@@ -395,7 +395,7 @@ mkUnionFunList(op,form is ["Union",:listOfEntries],e) ==
 	     for p in predList for t in listOfEntries])] where
 		upFun() ==
 		  p is ['%ieq,['%head,x],n] =>
-                    ["XLAM",["#1"],["%makepair",n,"#1"]]
+                    ["XLAM",["#1"],["%pair",n,"#1"]]
 		  ["XLAM",["#1"],"#1"]
 		cdownFun() ==
 		  gg:=gensym()
diff --git a/src/interp/clam.boot b/src/interp/clam.boot
index 5472a22a..6a85ca07 100644
--- a/src/interp/clam.boot
+++ b/src/interp/clam.boot
@@ -131,7 +131,7 @@ compClam(op,argl,body,$clamList) ==
       :hitCountCode,
         returnFoundValue]
   resetCacheEntry:=
-    countFl => ['%makepair,1,g2]
+    countFl => ['%pair,1,g2]
     g2
   thirdPredPair:=
     ['%otherwise,
@@ -199,7 +199,7 @@ compHash(op,argl,body,cacheNameOrNil,eqEtc,countFl) ==
     null argl => [nil,nil,[auxfn]]
     argl is [.] =>
       key:= (cacheNameOrNil => ['devaluate,g1]; g1)
-      [[g1],['%listlit,key],[auxfn,g1]]  --g1 is a parameter
+      [[g1],['%list,key],[auxfn,g1]]  --g1 is a parameter
     key:= (cacheNameOrNil => ['devaluateList,g1] ; g1)
     [g1,key,['APPLY,['function,auxfn],g1]]   --g1 is a parameter list
   cacheName:= cacheNameOrNil or mkCacheName op
@@ -235,12 +235,12 @@ compHash(op,argl,body,cacheNameOrNil,eqEtc,countFl) ==
       cacheNameOrNil =>
         countFl =>
           ['CDDAR,['HPUT,cacheNameOrNil,MKQ op,
-            ['%listlit,['%makepair,'%nil,['%makepair,1,computeValue]]]]]
+            ['%list,['%pair,'%nil,['%pair,1,computeValue]]]]]
         ['HPUT,cacheNameOrNil,MKQ op,
-          ['%listlit,['%makepair,'%nil,computeValue]]]
+          ['%list,['%pair,'%nil,computeValue]]]
       systemError '"unexpected"
     cacheNameOrNil => computeValue
-    countFl => ['%tail,['HPUT,cacheName,g1,['%makepair,1,computeValue]]]
+    countFl => ['%tail,['HPUT,cacheName,g1,['%pair,1,computeValue]]]
     ['HPUT,cacheName,g1,computeValue]
   if cacheNameOrNil then putCode :=
      ['UNWIND_-PROTECT,['PROG1,putCode,['%store,g2,'%true]],
@@ -299,9 +299,9 @@ compHashGlobal(op,argl,body,cacheName,eqEtc,countFl) ==
     g2
   getCode:= ['HGET,cacheName,cacheArgKey]
   secondPredPair:= [['%store,g2,getCode],returnFoundValue]
-  putForm:= ['%makepair,MKQ op,g1]
+  putForm:= ['%pair,MKQ op,g1]
   putCode:=
-    countFl => ['HPUT,cacheName,putForm,['%makepair,1,computeValue]]
+    countFl => ['HPUT,cacheName,putForm,['%pair,1,computeValue]]
     ['HPUT,cacheName,putForm,computeValue]
   thirdPredPair:= ['%otherwise,putCode]
   codeBody:= ['PROG,[g2], ['RETURN,['%when,secondPredPair,thirdPredPair]]]
diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot
index 34f55b20..b3e48cf7 100644
--- a/src/interp/compiler.boot
+++ b/src/interp/compiler.boot
@@ -340,7 +340,7 @@ finishLambdaExpression(expr is ["LAMBDA",vars,.],env) ==
       CDDR expandedFunction
     if scode ~= nil then
       body := [['%bind,nreverse scode,:body]]
-    vec := ['%veclit,:nreverse vec]
+    vec := ['%vector,:nreverse vec]
     ["LAMBDA",[:vars,"$$"],:body]
   fname := ["CLOSEDFN",expandedFunction] --Like QUOTE, but gets compiled
   ["CONS",fname,vec]
@@ -485,7 +485,7 @@ compArgumentsAndTryAgain(form is [.,:argl],m,e) ==
 outputComp(x,e) ==
   u:=comp(['_:_:,x,$OutputForm],$OutputForm,e) => u
   x is ['construct,:argl] =>
-    [['%listlit,:[([.,.,e]:=outputComp(x,e)).expr for x in argl]],$OutputForm,e]
+    [['%list,:[([.,.,e]:=outputComp(x,e)).expr for x in argl]],$OutputForm,e]
   (v:= get(x,"value",e)) and (v.mode is ['Union,:l]) =>
     [['coerceUn2E,x,v.mode],$OutputForm,e]
   [x,$OutputForm,e]
@@ -756,16 +756,16 @@ compCons(form,m,e) == compCons1(form,m,e) or compForm(form,m,e)
 
 compCons1(["CONS",x,y],m,e) ==
   [x,mx,e]:= comp(x,$EmptyMode,e) or return nil
-  null y => coerce([['%listlit,x],["List",mx],e],m)
+  null y => coerce([['%list,x],["List",mx],e],m)
   yt:= [y,my,e]:= comp(y,$EmptyMode,e) or return nil
   T:=
     my is ["List",m',:.] =>
       mr:= ["List",resolve(m',mx) or return nil]
       yt':= coerce(yt,mr) or return nil
       [x,.,e]:= coerce([x,mx,yt'.env],second mr) or return nil
-      yt'.expr is ['%listlit,:.] => [['%listlit,x,:rest yt'.expr],mr,e]
-      [['%makepair,x,yt'.expr],mr,e]
-    [['%makepair,x,y],["Pair",mx,my],e]
+      yt'.expr is ['%list,:.] => [['%list,x,:rest yt'.expr],mr,e]
+      [['%pair,x,yt'.expr],mr,e]
+    [['%pair,x,y],["Pair",mx,my],e]
   coerce(T,m)
 
 --% SETQ
@@ -969,14 +969,14 @@ compList(l,m is ["List",mUnder],e) ==
   null l => ['%nil,m,e]
   Tl:= [[.,mUnder,e]:= comp(x,mUnder,e) or return "failed" for x in l]
   Tl="failed" => nil
-  T:= [['%listlit,:[T.expr for T in Tl]],["List",mUnder],e]
+  T:= [['%list,:[T.expr for T in Tl]],["List",mUnder],e]
 
 compVector: (%Form,%Mode,%Env) -> %Maybe %Triple
 compVector(l,m is ["Vector",mUnder],e) ==
   Tl:= [[.,mUnder,e]:= comp(x,mUnder,e) or return "failed" for x in l]
   Tl="failed" => nil
   [["MAKE-ARRAY", #Tl, KEYWORD::ELEMENT_-TYPE, quoteForm getVMType mUnder,
-     KEYWORD::INITIAL_-CONTENTS, ['%listlit, :[T.expr for T in Tl]]],m,e]
+     KEYWORD::INITIAL_-CONTENTS, ['%list, :[T.expr for T in Tl]]],m,e]
 
 --% MACROS
 
diff --git a/src/interp/define.boot b/src/interp/define.boot
index 76b8cc3c..1d41c54e 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -507,9 +507,9 @@ compDefineCategory2(form,signature,specialCases,body,m,e,
       for u in $extraParms repeat
         formals:=[first u,:formals]
         actuals:=[MKQ rest u,:actuals]
-      body := ['sublisV,['PAIR,['QUOTE,formals],['%listlit,:actuals]],body]
+      body := ['sublisV,['PAIR,['QUOTE,formals],['%list,:actuals]],body]
     if argl then body:=  -- always subst for args after extraparms
-        ['sublisV,['PAIR,['QUOTE,sargl],['%listlit,:
+        ['sublisV,['PAIR,['QUOTE,sargl],['%list,:
           [['devaluate,u] for u in sargl]]],body]
     body:=
       ["%bind",[[g:= gensym(),body]],
@@ -554,7 +554,7 @@ mkConstructor: %Form -> %Form
 mkConstructor form ==
   atom form => ['devaluate,form]
   null form.args => ['QUOTE,[form.op]]
-  ['%listlit,MKQ form.op,:[mkConstructor x for x in form.args]]
+  ['%list,MKQ form.op,:[mkConstructor x for x in form.args]]
  
 compDefineCategory(df,m,e,prefix,fal) ==
   $domainShell: local := nil -- holds the category of the object being compiled
@@ -855,8 +855,8 @@ genDomainOps(viewName,dom,cat) ==
   siglist:= [sig for [sig,:.] in oplist]
   oplist:= substNames(dom,viewName,dom,oplist)
   cd:=
-    ["%LET",viewName,['mkOpVec,dom,['%listlit,:
-      [['%listlit,MKQ op,['%listlit,:[mkTypeForm mode for mode in sig]]]
+    ["%LET",viewName,['mkOpVec,dom,['%list,:
+      [['%list,MKQ op,['%list,:[mkTypeForm mode for mode in sig]]]
         for [op,sig] in siglist]]]]
   $getDomainCode:= [cd,:$getDomainCode]
   for [opsig,cond,:.] in oplist for i in 0.. repeat
@@ -1342,8 +1342,8 @@ uncons x ==
 bootStrapError(functorForm,sourceFile) ==
   ['%when, _
     ['$bootStrapMode, _
-        ['%veclit,mkTypeForm functorForm,nil,nil,nil,nil,nil]],
-    ['%otherwise, ['systemError,['%listlit,'"%b",MKQ functorForm.op,'"%d",'"from", _
+        ['%vector,mkTypeForm functorForm,nil,nil,nil,nil,nil]],
+    ['%otherwise, ['systemError,['%list,'"%b",MKQ functorForm.op,'"%d",'"from", _
       '"%b",MKQ namestring sourceFile,'"%d",'"needs to be compiled"]]]]
 
 registerInlinableDomain(x,e) ==
@@ -1366,7 +1366,7 @@ compAdd(['add,$addForm,capsule],m,e) ==
     [['%when, _
        ['$bootStrapMode, _
            code],_
-       ['%otherwise, ['systemError,['%listlit,'"%b",MKQ $functorForm.op,'"%d",'"from", _
+       ['%otherwise, ['systemError,['%list,'"%b",MKQ $functorForm.op,'"%d",'"from", _
          '"%b",MKQ namestring _/EDITFILE,'"%d",'"needs to be compiled"]]]],m,e]
   $addFormLhs: local:= $addForm
   if $addForm is ["SubDomain",domainForm,predicate] then
@@ -1652,8 +1652,8 @@ wrapDomainSub(parameters,x) ==
  
 mkExplicitCategoryFunction(domainOrPackage,sigList,atList) ==
   body:=
-    ["mkCategory",MKQ domainOrPackage,['%listlit,:reverse sigList],
-      ['%listlit,:reverse atList],MKQ domList,nil] where
+    ["mkCategory",MKQ domainOrPackage,['%list,:reverse sigList],
+      ['%list,:reverse atList],MKQ domList,nil] where
         domList() ==
           ("union"/[fn sig for ["QUOTE",[[.,sig,:.],:.]] in sigList]) where
             fn sig == [D for D in sig | mustInstantiate D]
diff --git a/src/interp/format.boot b/src/interp/format.boot
index fdc02087..2acc4e80 100644
--- a/src/interp/format.boot
+++ b/src/interp/format.boot
@@ -497,12 +497,12 @@ formatJoinKey(r,key) ==
   key = 'mkCategory =>
     r is [opPart,catPart,:.] =>
       opString :=
-        opPart is ['%listlit,:u] =>
+        opPart is ['%list,:u] =>
           "append"/[concat("%l",formatOpSignature(op,sig),formatIf pred)
             for ['QUOTE,[[op,sig],pred]] in u]
         nil
       catString :=
-        catPart is ['%listlit,:u] =>
+        catPart is ['%list,:u] =>
           "append"/[concat("%l",'" ",form2StringLocal con,formatIf pred)
             for ['QUOTE,[con,pred]] in u]
         nil
@@ -689,7 +689,7 @@ formatIf pred ==
 
 formatPredParts s ==
   s is ['QUOTE,s1] => formatPredParts s1
-  s is ['%listlit,:s1] => [formatPredParts s2 for s2 in s1]
+  s is ['%list,:s1] => [formatPredParts s2 for s2 in s1]
   s is ['devaluate,s1] => formatPredParts s1
   s is ['getDomainView,s1,.] => formatPredParts s1
   s is ['SUBST,a,b,c] =>    -- this is a signature
diff --git a/src/interp/functor.boot b/src/interp/functor.boot
index 30a1c9e1..073ad5d4 100644
--- a/src/interp/functor.boot
+++ b/src/interp/functor.boot
@@ -165,7 +165,7 @@ mkDevaluate a ==
     a' = nil => nil
     a
   a = '$ => MKQ '$
-  a is ['%listlit,:.] =>
+  a is ['%list,:.] =>
     a.args = nil => nil
     a
   ['devaluate,a]
@@ -190,7 +190,7 @@ getPrincipalView domain ==
  
 CategoriesFromGDC x ==
   atom x => nil
-  x is ['%listlit,a,:b] and a is ['QUOTE,a'] =>
+  x is ['%list,a,:b] and a is ['QUOTE,a'] =>
     union([[a']],"union"/[CategoriesFromGDC u for u in b])
   x is ['QUOTE,a] and a is [b] => [a]
  
@@ -239,12 +239,12 @@ optFunctorBody x ==
   atomic? x => x
   x is ['DomainSubstitutionMacro,parms,body] =>
     optFunctorBody DomainSubstitutionFunction(parms,body)
-  x is ['%listlit,:l] =>
+  x is ['%list,:l] =>
     null l => nil
     l:= [optFunctorBody u for u in l]
     and/[optFunctorBodyQuotable u for u in l] =>
       ['QUOTE,[optFunctorBodyRequote u for u in l]]
-    ['%listlit,:l]
+    ['%list,:l]
   x is ['PROGN,:l] => ['PROGN,:optFunctorPROGN l]
   x is ['%when,:l] =>
     l := [v for u in l | v := relevantClause u] where
@@ -288,7 +288,7 @@ optFunctorPROGN l ==
 worthlessCode x ==
   x is ['%when,:l] and (and/[x is [.,y] and worthlessCode y for x in l]) => true
   x is ['PROGN,:l] => (null (l':= optFunctorPROGN l) => true; false)
-  x is ['%listlit] => true
+  x is ['%list] => true
   null x => true
   false
  
@@ -321,7 +321,7 @@ setVector12 args ==
   freeof($domainShell.1,args1) and
       freeof($domainShell.2,args1) and
           freeof($domainShell.4,args1) => nil  
-  [['SetDomainSlots124,'$,['QUOTE,args1],['%listlit,:args2]]]
+  [['SetDomainSlots124,'$,['QUOTE,args1],['%list,:args2]]]
  where freeof(a,b) ==
          atom a => null MEMQ(a,b)
          freeof(first a,b) => freeof(rest a,b)
@@ -378,16 +378,16 @@ mkTypeForm x ==
   atom x => mkDevaluate x
   x.op in '(CATEGORY mkCategory) => MKQ x
   x is ['_:,selector,dom] =>
-    ['%listlit,MKQ '_:,MKQ selector,mkTypeForm dom]
+    ['%list,MKQ '_:,MKQ selector,mkTypeForm dom]
   x.op is 'Record =>
-    ['%listlit,MKQ 'Record,:[mkTypeForm y for y in x.args]]
+    ['%list,MKQ 'Record,:[mkTypeForm y for y in x.args]]
   x.op is '%call => ['MKQ, optCall x]
         --The previous line added JHD/BMT 20/3/84
         --Necessary for proper compilation of DPOLY SPAD
   x is [op] =>
-    op in '(Join %listlit) => nil
+    op in '(Join %list) => nil
     MKQ x
-  ['%listlit,MKQ x.op,:[mkTypeForm a for a in x.args]]
+  ['%list,MKQ x.op,:[mkTypeForm a for a in x.args]]
  
 setVector5(catNames,locals) ==
   generated:= nil
@@ -402,10 +402,10 @@ setVector5(catNames,locals) ==
           for u in generated]
  
 mkVectorWithDeferral(objects,tag) ==
--- Construct a %veclit form, but spots things that aren't safe to instantiate
+-- Construct a %vector form, but spots things that aren't safe to instantiate
 -- and places them at the end of $ConstantAssignments, so that they get
 -- called AFTER the constants of $ have been set up.   JHD 26.July.89
-  ['%veclit,:
+  ['%vector,:
    [if CONTAINED('$,u) then -- It's not safe to instantiate this now
       $ConstantAssignments:=[:$ConstantAssignments,
                              ["setShellEntry",
@@ -551,9 +551,9 @@ DescendCode(code,flag,viewAssoc,EnvToPass) ==
       $ConstantAssignments:= [u,:$ConstantAssignments]
       nil
     u
-  code is ['_:,:.] => (code.first := '%listlit; code.rest := NIL)
+  code is ['_:,:.] => (code.first := '%list; code.rest := NIL)
       --Yes, I know that's a hack, but how else do you kill a line?
-  code is ['%listlit,:.] => nil
+  code is ['%list,:.] => nil
   code is ['devaluate,:.] => nil
   code is ['MDEF,:.] => nil
   code is ['%call,:.] => code
diff --git a/src/interp/g-opt.boot b/src/interp/g-opt.boot
index d18899dc..2286be5b 100644
--- a/src/interp/g-opt.boot
+++ b/src/interp/g-opt.boot
@@ -292,9 +292,9 @@ compileTimeBindingOf u ==
   name
  
 optMkRecord ["mkRecord",:u] ==
-  u is [x] => ['%listlit,x]
-  #u=2 => ['%makepair,:u]
-  ['%veclit,:u]
+  u is [x] => ['%list,x]
+  #u=2 => ['%pair,:u]
+  ['%vector,:u]
  
 optCond (x is ['%when,:l]) ==
   if l is [a,[aa,b]] and aa = '%otherwise and b is ['%when,:c] then
@@ -421,8 +421,8 @@ optSETRECORDELT ["SETRECORDELT",name,ind,len,expr] ==
   ['%store,['%vref,name,ind],expr]
  
 optRECORDCOPY ["RECORDCOPY",name,len] ==
-  len = 1 => ['%listlit,['%head,name]]
-  len = 2 => ['%makepair,['%head,name],['%tail,name]]
+  len = 1 => ['%list,['%head,name]]
+  len = 2 => ['%pair,['%head,name],['%tail,name]]
   ["REPLACE",["MAKE_-VEC",len],name]
  
 optSuchthat [.,:u] == ["SUCHTHAT",:u]
@@ -446,11 +446,11 @@ $VMsideEffectFreeOperators ==
     %val2z %z2val %zlit %zreal %zimag
     %zexp %zlog %zsin %zcos %ztan %zasin %zacos %zatan
     %zsinh %zcosh %ztanh %zasinh %zacosh %zatanh
-    %nil %pair? %lconcat %llength %lfirst %lsecond %lthird %listlit
+    %nil %pair? %lconcat %llength %lfirst %lsecond %lthird
     %lreverse %lempty? %hash %ismall? %string? %f2s
     %ccst %ceq %clt %cle %cgt %cge %c2i %i2c %s2c %cup %cdown %sname
-    %strlength %streq %i2s %schar %strlt %strconc %strcopy %strstc
-    %aref %vref %vlength %veclit
+    %strlength %streq %i2s %schar %strlt %strconc %strcopy
+    %aref %vref %vlength
     %bitvecnot %bitvecand %bitvecnand %bivecor %bitvecnor %bitvecxor
     %bitveccopy %bitvecconc %bitveclength %bitvecref %bitveceq %bitveclt
     %before? %equal %sptreq %ident? %property)
@@ -458,8 +458,8 @@ $VMsideEffectFreeOperators ==
 ++ List of simple VM operators
 $simpleVMoperators == 
   append($VMsideEffectFreeOperators,
-    ['STRINGIMAGE,'FUNCALL,'%gensym, '%lreverse_!,
-      '%strstc,'%makepair,'%makebitvec,'%makevector,
+    ['STRINGIMAGE,'FUNCALL,'%gensym, '%lreverse_!,'%pair,'%list,
+      '%strstc,'%makebitvec,'%makevector,'%vector,
         "MAKE-FULL-CVEC","BVEC-MAKE-FULL"])
 
 ++ Return true if the `form' is semi-simple with respect to
@@ -629,8 +629,8 @@ optTry form ==
   form isnt ['%try,e,hs,f] or not(isFloatableVMForm e) or f ~= nil => form
   e
 
-optListlit form ==
-  form is ['%listlit] => '%nil
+optList form ==
+  form is ['%list] => '%nil
   form
 
 optCollectVector form ==
@@ -817,7 +817,7 @@ for x in '( (%call         optCall) _
            (%imul        optImul)_
            (%2bit        opt2bit)_
            (%2bool       opt2bool)_
-           (%listlit     optListlit)_
+           (%list        optList)_
            (SPADCALL     optSPADCALL)_
            (_|           optSuchthat)_
            (CATCH        optCatch)_
diff --git a/src/interp/g-timer.boot b/src/interp/g-timer.boot
index 7acf5804..2877c4b7 100644
--- a/src/interp/g-timer.boot
+++ b/src/interp/g-timer.boot
@@ -260,8 +260,8 @@ timedEVALFUN(code) ==
   r
  
 timedEvaluate code ==
-  code is ['%listlit,:a] and #a > 200 =>
-    "append"/[eval ['%listlit,:x] for x in splitIntoBlocksOf200 a]
+  code is ['%list,:a] and #a > 200 =>
+    "append"/[eval ['%list,:x] for x in splitIntoBlocksOf200 a]
   eval code
  
 displayHeapStatsIfWanted() ==
diff --git a/src/interp/g-util.boot b/src/interp/g-util.boot
index c96691e7..52edaf40 100644
--- a/src/interp/g-util.boot
+++ b/src/interp/g-util.boot
@@ -175,7 +175,7 @@ isSubDomain(d1,d2) ==
 --%
 
 mkList u ==
-  u => ['%listlit,:u]
+  u => ['%list,:u]
   nil
 
 ELEMN(x, n, d) ==
diff --git a/src/interp/i-object.boot b/src/interp/i-object.boot
index 93a4f261..a8049f29 100644
--- a/src/interp/i-object.boot
+++ b/src/interp/i-object.boot
@@ -145,7 +145,7 @@ asTupleNew0(eltType,listOfElts) ==
   [#listOfElts,:makeSimpleArrayFromList(eltType,listOfElts)]
 
 asTupleNewCode(eltType, size, listOfElts) == 
-  ["asTupleNew", quoteForm getVMType eltType, size, ['%listlit, :listOfElts]]
+  ["asTupleNew", quoteForm getVMType eltType, size, ['%list, :listOfElts]]
 
 asTupleNewCode0(eltType,listForm) == 
   ["asTupleNew0", quoteForm getVMType eltType, listForm]
diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot
index cda260f4..75264e8c 100644
--- a/src/interp/i-output.boot
+++ b/src/interp/i-output.boot
@@ -517,7 +517,7 @@ outputTran x ==
   x is ['matrix,['construct,c]] and
     c is ['COLLECT,:m,d] and d is ['construct,e] and e is ['COLLECT,:.] =>
       outputTran ['COLLECT,:m,e]
-  x is ['%listlit,:l] => outputTran ['BRACKET,['AGGLST,:l]]
+  x is ['%list,:l] => outputTran ['BRACKET,['AGGLST,:l]]
   x is ["%Map",:l] => outputMapTran l
   x is ['brace, :l]    =>
     ['BRACE,  ['AGGLST,:[outputTran y for y in l]]]
diff --git a/src/interp/i-spec1.boot b/src/interp/i-spec1.boot
index 3c692e3d..eacd23d3 100644
--- a/src/interp/i-spec1.boot
+++ b/src/interp/i-spec1.boot
@@ -1084,9 +1084,9 @@ upRecordConstruct(op,l,tar) ==
         for arg in l for ['_:,.,type] in types]
   len := #l
   code :=
-    (len = 1) => ['%listlit,:argCode]
-    (len = 2) => ['%makepair,:argCode]
-    ['%veclit,:argCode]
+    (len = 1) => ['%list,:argCode]
+    (len = 2) => ['%pair,:argCode]
+    ['%vector,:argCode]
   putValue(op,object(code,tar))
   putModeSet(op,[tar])
 
diff --git a/src/interp/lisp-backend.boot b/src/interp/lisp-backend.boot
index 915b4efb..7dae6c12 100644
--- a/src/interp/lisp-backend.boot
+++ b/src/interp/lisp-backend.boot
@@ -165,7 +165,7 @@ expandCollect ['%collect,:iters,body] ==
   -- in reverse order.
   expandLoop ['%loop,:iters,["%init",val,nil],body,["NREVERSE",val]]
 
-expandListlit(x is ['%listlit,:args]) ==
+expandList(x is ['%list,:args]) ==
   args := [expandToVMForm arg for arg in args]
   args = nil => nil
   args' := [simpleValue? arg or leave 'failed for arg in args]
@@ -373,8 +373,8 @@ expandVal2z ['%val2z,x] ==
 expandZ2val ['%z2val,x] ==
   cons? x =>
     g := gensym()
-    expandToVMForm ['%bind,[[g,x]],['%makepair,['%zreal,g],['%zimag,g]]]
-  expandToVMForm ['%makepair,['%zreal,x],['%zimag,x]]
+    expandToVMForm ['%bind,[[g,x]],['%pair,['%zreal,g],['%zimag,g]]]
+  expandToVMForm ['%pair,['%zreal,x],['%zimag,x]]
   
 
 -- Local variable bindings
@@ -546,7 +546,7 @@ for x in [
     -- ['%nil, :'NIL],
     -- unary list operations
     ['%head,      :'CAR],
-    ['%makepair,  :'CONS],
+    ['%pair,  :'CONS],
     ['%lempty?,   :'NULL],
     ['%lfirst,    :'CAR],
     ['%llength,   :'LIST_-LENGTH],
@@ -562,7 +562,7 @@ for x in [
     -- simple vector operations
     ['%vfill,     :'FILL],
     ['%vlength,   :'sizeOfSimpleArray],
-    ['%veclit,    :'VECTOR],
+    ['%vector,    :'VECTOR],
     ['%vref,      :'SVREF],
     ['%aref,      :'getSimpleArrayEntry],
     ['%makevector,:'MAKE_-ARRAY],
@@ -593,7 +593,7 @@ for x in [
 
 ++ Table of opcode-expander pairs.  
 for x in [
-   ['%listlit, :function expandListlit],
+   ['%list,    :function expandList],
    ['%collect, :function expandCollect],
    ['%loop,    :function expandLoop],
    ['%return,  :function expandReturn],
diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot
index f09d5b67..7eb5e004 100644
--- a/src/interp/nruncomp.boot
+++ b/src/interp/nruncomp.boot
@@ -333,7 +333,7 @@ consDomainName(x,dc) ==
   x is [op,:argl] =>
     (op = 'Record) or (op = 'Union and argl is [[":",:.],:.])  =>
        mkList [MKQ op,
-         :[['%listlit,MKQ '_:,MKQ tag,consDomainName(dom,dc)]
+         :[['%list,MKQ '_:,MKQ tag,consDomainName(dom,dc)]
                    for [.,tag,dom] in argl]]
     isFunctor op or op = 'Mapping or constructor? op =>
          -- call to constructor? needed if op was compiled in $bootStrapMode
@@ -364,10 +364,10 @@ consDomainForm(x,dc) ==
 ++ of compiled functions
 NRTdescendCodeTran(u,condList) ==
   null u => nil
-  u is ['%listlit] => nil
+  u is ['%list] => nil
   u is [op,.,i,a] and op in '(setShellEntry QSETREFV) =>
     null condList and a is ['CONS,fn,:.] =>
-      u.first := '%listlit
+      u.first := '%list
       u.rest := nil
       $template.i :=
         fn = 'IDENTITY => a
@@ -397,7 +397,7 @@ washFunctorBody form == main form where
       stmts = nil => nil
       rest stmts = nil => first stmts
       ["PROGN",:stmts]
-    x is ['%listlit] => nil
+    x is ['%list] => nil
     x
 
 buildFunctor($definition is [name,:args],sig,code,$locals,$e) ==
@@ -486,7 +486,7 @@ buildFunctor($definition is [name,:args],sig,code,$locals,$e) ==
                  createViewCode,createPredVecCode] where
     devaluateCode:= [[b,["devaluate",a]] for [a,:b] in $devaluateList]
     createDomainCode:=
-      [domname,['%listlit,MKQ name,:ASSOCRIGHT $devaluateList]]
+      [domname,['%list,MKQ name,:ASSOCRIGHT $devaluateList]]
     createViewCode:= ["$",["newShell", $NRTbase + $NRTdeltaLength]]
     createPredVecCode := ["pv$",predBitVectorCode1]
 
@@ -610,7 +610,7 @@ NRToptimizeHas u ==
 NRTaddToSlam([name,:argnames],shell) ==
   $mutableDomain => return nil
   null argnames => addToConstructorCache(name,nil,shell)
-  args:= ['%listlit,:ASSOCRIGHT $devaluateList]
+  args:= ['%list,:ASSOCRIGHT $devaluateList]
   addToConstructorCache(name,args,shell)
 
 changeDirectoryInSlot1() ==  --called by buildFunctor
diff --git a/src/interp/nrunopt.boot b/src/interp/nrunopt.boot
index d83087d8..2e943e3f 100644
--- a/src/interp/nrunopt.boot
+++ b/src/interp/nrunopt.boot
@@ -266,7 +266,7 @@ makePredicateBitVector pl ==   --called by buildFunctor
   [$lisplibPredicates,firstCode,:lastCode]  --$pairlis set by compDefineFunctor1
 
 augmentPredCode(n,lastPl) ==
-  ['%listlit,:pl] := mungeAddGensyms(lastPl,$predGensymAlist)
+  ['%list,:pl] := mungeAddGensyms(lastPl,$predGensymAlist)
   delta := 2 ** n
   l := [(u := MKPF([x,['augmentPredVector,"$",delta]],'AND); 
          delta:=2 * delta; u) for x in pl]
@@ -308,7 +308,7 @@ transHasCode x ==
   [transHasCode y for y in x]
  
 mungeAddGensyms(u,gal) ==
-  ['%listlit,:[fn(x,gal,0) for x in u]] where fn(x,gal,n) ==
+  ['%list,:[fn(x,gal,0) for x in u]] where fn(x,gal,n) ==
     atom x => x
     g := LASSOC(x,gal) =>
       n = 0 => ["%LET",g,x]
diff --git a/src/interp/slam.boot b/src/interp/slam.boot
index ef68929f..45cf192e 100644
--- a/src/interp/slam.boot
+++ b/src/interp/slam.boot
@@ -263,7 +263,7 @@ compileRecurrenceRelation(op,nam,argl,junk,[body,sharpArg,n,:initCode]) ==
   extraArgumentCode :=
     extraArguments := [x for x in argl | x ~= sharpArg] =>
       extraArguments is [x] => x
-      ['%listlit,:extraArguments]
+      ['%list,:extraArguments]
     nil
   g:= gensym()
   gIndex:= gensym()
@@ -281,7 +281,7 @@ compileRecurrenceRelation(op,nam,argl,junk,[body,sharpArg,n,:initCode]) ==
   rotateCode:= [["%LET",p,q] for p in gsRev for q in [:rest gsRev,g]]
   advanceCode:= ["%LET",gIndex,['ADD1,gIndex]]
  
-  newTripleCode := ['%listlit,sharpArg,:gsList]
+  newTripleCode := ['%list,sharpArg,:gsList]
   newStateCode :=
     null extraArguments => ["%store",["%dynval", MKQ stateNam],newTripleCode]
     ["HPUT",["%dynval", MKQ stateNam],extraArgumentCode,newTripleCode]
@@ -305,7 +305,7 @@ compileRecurrenceRelation(op,nam,argl,junk,[body,sharpArg,n,:initCode]) ==
   mainFunction:= [nam,["LAM",margl,mbody]] where
     margl:= [:argl,'envArg]
     max:= gensym()
-    tripleCode := ['%makepair,n,['%listlit,:initCode]]
+    tripleCode := ['%pair,n,['%list,:initCode]]
  
     -- initialSetCode initializes the global variable if necessary and
     --  also binds "stateVar" to its current value
@@ -333,9 +333,9 @@ compileRecurrenceRelation(op,nam,argl,junk,[body,sharpArg,n,:initCode]) ==
                   [auxfn,:argl,stateVar]]
       phrase2:= [['%igt,sharpArg,['%store,max,["DIFFERENCE",max,k]]],
                   ["ELT",stateVar,['%iinc,["QSDIFFERENCE",k,["DIFFERENCE",sharpArg,max]]]]]
-      phrase3:= [['%igt,sharpArg,n],[auxfn,:argl,['%listlit,n,:initCode]]]
+      phrase3:= [['%igt,sharpArg,n],[auxfn,:argl,['%list,n,:initCode]]]
       phrase4:= [['%igt,sharpArg,n-k],
-        ["ELT",['%listlit,:initCode],["QSDIFFERENCE",n,sharpArg]]]
+        ["ELT",['%list,:initCode],["QSDIFFERENCE",n,sharpArg]]]
       phrase5:= ['%otherwise,['recurrenceError,MKQ op,sharpArg]]
       ['PROGN,:preset,['%when,phrase1,phrase2,phrase3,phrase4,phrase5]]
   if $verbose then
diff --git a/src/interp/wi1.boot b/src/interp/wi1.boot
index 943515eb..62e25ccf 100644
--- a/src/interp/wi1.boot
+++ b/src/interp/wi1.boot
@@ -689,7 +689,7 @@ compList(l,m is ["List",mUnder],e) ==
   Tl:= [[.,mUnder,e]:=
     comp(x,mUnder,e) or return "failed" for i in 1.. for x in l]
   Tl="failed" => nil
-  T:= [['%listlit,:[T.expr for T in Tl]],["List",mUnder],e]
+  T:= [['%list,:[T.expr for T in Tl]],["List",mUnder],e]
 
 compVector(l,m is ["Vector",mUnder],e) ==
   markImport m
@@ -1211,9 +1211,9 @@ compDefineCategory2(form,signature,specialCases,body,m,e,
       for u in $extraParms repeat
         formals:=[first u,:formals]
         actuals:=[MKQ rest u,:actuals]
-      body := ['sublisV,['PAIR,['QUOTE,formals],['%listlit,:actuals]],body]
+      body := ['sublisV,['PAIR,['QUOTE,formals],['%list,:actuals]],body]
     if argl then body:=  -- always subst for args after extraparms
-        ['sublisV,['PAIR,['QUOTE,sargl],['%listlit,:
+        ['sublisV,['PAIR,['QUOTE,sargl],['%list,:
           [['devaluate,u] for u in sargl]]],body]
     body:=
       ['PROG1,["%LET",g:= gensym(),body],