Cleanup STRCONC uses

author: dos-reis <gdr@axiomatics.org> 2010-05-09 18:37:10 +0000
committer: dos-reis <gdr@axiomatics.org> 2010-05-09 18:37:10 +0000
commit: 4c2ef607671da29d8ee0aefd393227af72936b44 (patch)
tree: 0c515e0003e4c164390e66d3aa39bfb342520601 /src/interp
parent: dc2b7bf37f89919116cc3f599ca7744803013d1e (diff)
download: open-axiom-4c2ef607671da29d8ee0aefd393227af72936b44.tar.gz
55 files changed, 458 insertions, 458 deletions
diff --git a/src/interp/as.boot b/src/interp/as.boot
index 06c61e6c..3ba00e5e 100644
--- a/src/interp/as.boot
+++ b/src/interp/as.boot
@@ -56,7 +56,7 @@ asAll lines ==
   'done
 
 as name ==
-  astran STRCONC(STRINGIMAGE name,'".asy")
+  astran strconc(STRINGIMAGE name,'".asy")
   'done
 
 astran asyFile ==
@@ -66,7 +66,7 @@ astran asyFile ==
   $constantHash := MAKE_-HASH_-TABLE()
   $niladics : local := nil
   $asyFile: local := asyFile
-  $asFilename: local := STRCONC(PATHNAME_-NAME asyFile,'".as")
+  $asFilename: local := strconc(PATHNAME_-NAME asyFile,'".as")
   asytran asyFile
   conlist := [x for x in HKEYS $conHash | HGET($conHash,x) isnt [.,.,"function",:.]]
   $mmAlist : local :=
@@ -154,7 +154,7 @@ asMakeAlist con ==
   attributeAlist := REMDUP [:second alists,:catAttrs]
   documentation :=
     SUBLISLIS($FormalMapVariableList,KDR form,LASSOC(con,$docAlist))
-  filestring := STRCONC(PATHNAME_-NAME STRINGIMAGE filename,'".as")
+  filestring := strconc(PATHNAME_-NAME STRINGIMAGE filename,'".as")
   constantPart := HGET($constantHash,con) and [['constant,:true]]
   niladicPart := MEMQ(con,$niladics) and [['NILADIC,:true]]
   falist :=  TAKE(#KDR form,$FormalMapVariableList)
diff --git a/src/interp/ax.boot b/src/interp/ax.boot
index 2effa6b6..294e780a 100644
--- a/src/interp/ax.boot
+++ b/src/interp/ax.boot
@@ -121,7 +121,7 @@ modemapToAx(modemap) ==
      null args =>
         ['Extend, ['Define, ['Declare, constructor, resultType],
             ['Add, ['PretendTo, ['Add, [], []], resultType], []]]]
-     conscat := INTERN(STRCONC(SYMBOL_-NAME(constructor), "ExtendCategory"),"BOOT")
+     conscat := INTERN(strconc(SYMBOL_-NAME(constructor), "ExtendCategory"),"BOOT")
      rtype := ['Apply, conscat, :args]
 --     if resultType is ['With,a,b] then
 --        if not(b is ['Sequence,:withseq]) then withseq := [b]
diff --git a/src/interp/bc-matrix.boot b/src/interp/bc-matrix.boot
index 134799bb..91e326a1 100644
--- a/src/interp/bc-matrix.boot
+++ b/src/interp/bc-matrix.boot
@@ -99,7 +99,7 @@ bcInputMatrixByFormulaGen htPage ==
   colVar := htpLabelInputString(htPage,'colVar)
   nrows := htpProperty(htPage,'nrows)
   ncols := htpProperty(htPage,'ncols)
-  bcGen STRCONC('"matrix([[",formula,'" for ",colVar,'" in 1..",
+  bcGen strconc('"matrix([[",formula,'" for ",colVar,'" in 1..",
     STRINGIMAGE ncols,'"] for ",rowVar,'" in 1..",STRINGIMAGE nrows,'"])")
 
 bcInputExplicitMatrix(htPage,junk) ==
@@ -115,10 +115,10 @@ bcInputExplicitMatrix(htPage,junk) ==
   wcols := # STRINGIMAGE ncols
   labelList := 
     "append"/[[f for j in 1..ncols] for i in 1..nrows] where f() ==
-      rowpart := STRCONC('"{\em Row",htStringPad(i,wrows))
-      colpart := STRCONC('", Column",htStringPad(j,wcols),'":}\space{2}")
-      prefix := STRCONC(rowpart,colpart)
- --     name := INTERN STRCONC(htMkName('"row",i),htMkName('"col",j))
+      rowpart := strconc('"{\em Row",htStringPad(i,wrows))
+      colpart := strconc('", Column",htStringPad(j,wcols),'":}\space{2}")
+      prefix := strconc(rowpart,colpart)
+ --     name := INTERN strconc(htMkName('"row",i),htMkName('"col",j))
       name := INTERN STRINGIMAGE (k := k + 1)
       [prefix,'"",30, 0,name,'P]
   labelList := 
@@ -145,7 +145,7 @@ bcMatrixGen htPage ==
     formula := formula.0
     rowVar := (LASSOC('rowVar,mat)).0
     colVar := (LASSOC('colVar,mat)).0
-    STRCONC('"matrix([[",formula,'" for ",colVar,'" in 1..",
+    strconc('"matrix([[",formula,'" for ",colVar,'" in 1..",
       STRINGIMAGE ncols,'"] for ",rowVar,'" in 1..",STRINGIMAGE nrows,'"])")
   mat := htpProperty(htPage,'matrix) =>
     mat := reverse mat
@@ -153,6 +153,6 @@ bcMatrixGen htPage ==
     matform := [[mat.(k := k + 1).1
       for j in 0..(ncols-1)] for i in 0..(nrows-1)]
     matstring := bcwords2liststring [bcwords2liststring x for x in matform]
-    STRCONC('"matrix(",matstring,'")")
+    strconc('"matrix(",matstring,'")")
   systemError nil
   
diff --git a/src/interp/bc-misc.boot b/src/interp/bc-misc.boot
index 020a5af6..c6a1dcbc 100644
--- a/src/interp/bc-misc.boot
+++ b/src/interp/bc-misc.boot
@@ -37,7 +37,7 @@ namespace BOOT
 
 --Hypertex commands other than solve and matrix
 
-bcDrawIt2(ind,a,b) == STRCONC('"{}",ind,'"=",a,'"{}..",b,'"{}")
+bcDrawIt2(ind,a,b) == strconc('"{}",ind,'"=",a,'"{}..",b,'"{}")
 
 bcIndefiniteIntegrate() ==
   htInitPage("Indefinite Integration Basic Command",nil)
@@ -63,7 +63,7 @@ bcIndefiniteIntegrate() ==
 bcIndefiniteIntegrateGen htPage ==
   integrand := htpLabelInputString(htPage,'integrand)
   var := htpLabelInputString(htPage,'symbol)
-  bcGen STRCONC('"integrate(",integrand,'",",var,")")
+  bcGen strconc('"integrate(",integrand,'",",var,")")
 
 
 bcDefiniteIntegrate() ==
@@ -116,9 +116,9 @@ bcDefiniteIntegrateGen htPage ==
     htpButtonValue(htPage,'toButton) = 'toPoint =>
       htpLabelInputString(htPage,'to)
     '"%plusInfinity"
-  varpart := STRCONC(var,'" = ",lowerLimit,'"..",upperLimit)
+  varpart := strconc(var,'" = ",lowerLimit,'"..",upperLimit)
   bcGen
-   STRCONC('"integrate(",integrand,'",",varpart,'")")
+   strconc('"integrate(",integrand,'",",varpart,'")")
 
 bcSum() ==
   htInitPage("Sum Basic Command",nil)
@@ -155,7 +155,7 @@ bcSumGen htPage ==
   index := htpLabelInputString(htPage,'index)
   first := htpLabelInputString(htPage,'first)
   last := htpLabelInputString(htPage,'last)
-  bcGen STRCONC('"sum(",mand,'",",index,'" = ",first,'"..",last,'")")
+  bcGen strconc('"sum(",mand,'",",index,'" = ",first,'"..",last,'")")
 
 bcProduct() ==
   htInitPage("Product Basic Command",nil)
@@ -180,7 +180,7 @@ bcProductGen htPage ==
   index := htpLabelInputString(htPage,'index)
   first := htpLabelInputString(htPage,'first)
   last := htpLabelInputString(htPage,'last)
-  bcGen STRCONC('"product(",mand,'",",index,'",",first,'",",last,'")")
+  bcGen strconc('"product(",mand,'",",index,'",",first,'",",last,'")")
 
 bcDifferentiate() ==
   htInitPage("Differentiate Basic Command",nil)
@@ -222,9 +222,9 @@ bcDifferentiateGen htPage ==
     #indexList = #varlist => bcwords2liststring indexList
     bcError '"You must say how many times you want to differentiate with respect to each variable---or leave that entry blank"
   lastPart :=
-    indexpart => STRCONC('",",indexpart,'")")
+    indexpart => strconc('",",indexpart,'")")
     '")"
-  bcGen STRCONC('"differentiate(",mand,'",",varpart,lastPart)
+  bcGen strconc('"differentiate(",mand,'",",varpart,lastPart)
 
 bcDraw() ==
   htInitPage('"Draw Basic Command",nil)
@@ -288,7 +288,7 @@ bcDraw2DfunGen htPage ==
   to1 := htpLabelInputString(htPage,'to1)
   title := htpLabelInputString(htPage,'title)
   if (title ~= '"") then
-    titlePart := STRCONC('"{}",'"title ==_"",title,'"_"")
+    titlePart := strconc('"{}",'"title ==_"",title,'"_"")
     bcFinish('"draw",fun,bcDrawIt2(ind,from1,to1),titlePart)
   else
     bcFinish('"draw",fun,bcDrawIt2(ind,from1,to1))
@@ -333,9 +333,9 @@ bcDraw2DparGen htPage ==
   from1 := htpLabelInputString(htPage,'from1)
   to1 := htpLabelInputString(htPage,'to1)
   title := htpLabelInputString(htPage,'title)
-  curvePart := STRCONC('"curve(",'"{}",fun1,'",{}",fun2,'")")
+  curvePart := strconc('"curve(",'"{}",fun1,'",{}",fun2,'")")
   if (title ~= '"") then
-    titlePart := (title = '"" => nil; STRCONC('"{}",'"title ==_"",title,'"_""))
+    titlePart := (title = '"" => nil; strconc('"{}",'"title ==_"",title,'"_""))
     bcFinish('"draw",curvePart,bcDrawIt2(ind,from1,to1),titlePart)
   else
     bcFinish('"draw",curvePart,bcDrawIt2(ind,from1,to1))
@@ -383,12 +383,12 @@ bcDraw2DSolveGen htPage ==
   from2 := htpLabelInputString(htPage,'from2)
   to2 := htpLabelInputString(htPage,'to2)
   title := htpLabelInputString(htPage,'title)
-  clipPart := STRCONC('"{}",'"range==[{}",from1,'"..",to1,",{}",from2,'"..",to2,'"]")
+  clipPart := strconc('"{}",'"range==[{}",from1,'"..",to1,",{}",from2,'"..",to2,'"]")
   if (title ~= '"") then
-    titlePart := (title = '"" => nil; STRCONC('"{}",'"title ==_"",title,'"_""))
-    bcFinish('"draw",STRCONC(fun,'" = 0 "),ind1,ind2,clipPart,titlePart)
+    titlePart := (title = '"" => nil; strconc('"{}",'"title ==_"",title,'"_""))
+    bcFinish('"draw",strconc(fun,'" = 0 "),ind1,ind2,clipPart,titlePart)
   else
-    bcFinish('"draw",STRCONC(fun,'" = 0 "),ind1,ind2,clipPart)
+    bcFinish('"draw",strconc(fun,'" = 0 "),ind1,ind2,clipPart)
 
 bcDraw3Dfun() ==
   htInitPage('"Three Dimensional Draw Basic Command",nil)
@@ -439,7 +439,7 @@ bcDraw3DfunGen htPage ==
   to2 := htpLabelInputString(htPage,'to2)
   title := htpLabelInputString(htPage,'title)
   if (title ~= '"") then
-    titlePart := (title = '"" => nil;STRCONC('"{}",'"title ==_"",title,'"_""))
+    titlePart := (title = '"" => nil;strconc('"{}",'"title ==_"",title,'"_""))
     bcFinish('"draw",fun,bcDrawIt2(ind1,from1,to1),bcDrawIt2(ind2,from2,to2),titlePart)
   else
     bcFinish('"draw",fun,bcDrawIt2(ind1,from1,to1),bcDrawIt2(ind2,from2,to2))
@@ -486,10 +486,10 @@ bcDraw3DparGen htPage ==
   from1 := htpLabelInputString(htPage,'from1)
   to1 := htpLabelInputString(htPage,'to1)
   title := htpLabelInputString(htPage,'title)
-  curvePart := STRCONC('"curve(",'"{}",fun1,'",{}",fun2,'",{}",fun3,'")")
+  curvePart := strconc('"curve(",'"{}",fun1,'",{}",fun2,'",{}",fun3,'")")
   tubePart := '"{}tubeRadius==.25,{}tubePoints==16"
   if (title ~= '"") then
-    titlePart := (title = '"" => nil; STRCONC('"{}",'"title ==_"",title,'"_""))
+    titlePart := (title = '"" => nil; strconc('"{}",'"title ==_"",title,'"_""))
     bcFinish('"draw",curvePart,bcDrawIt2(ind,from1,to1),tubePart,titlePart)
   else
     bcFinish('"draw",curvePart,bcDrawIt2(ind,from1,to1),tubePart)
@@ -552,9 +552,9 @@ bcDraw3Dpar1Gen htPage ==
   title := htpLabelInputString(htPage,'title)
   r1 := bcDrawIt2(ind1,from1,to1)
   r2 := bcDrawIt2(ind2,from2,to2)
-  surfacePart := STRCONC('"surface(",'"{}",fun1,'",{}",fun2,'",{}",fun3,'")")
+  surfacePart := strconc('"surface(",'"{}",fun1,'",{}",fun2,'",{}",fun3,'")")
   if (title ~= '"") then
-    titlePart := (title = '"" => nil; STRCONC('"{}",'"title ==_"",title,'"_""))
+    titlePart := (title = '"" => nil; strconc('"{}",'"title ==_"",title,'"_""))
     bcFinish('"draw",surfacePart,r1,r2,titlePart)
   else
     bcFinish('"draw",surfacePart,r1,r2)
@@ -610,7 +610,7 @@ bcSeriesExpansionGen htPage ==
   var := htpLabelInputString(htPage,'variable)
   point := htpLabelInputString(htPage,'point)
   terms := htpLabelInputString(htPage,'numberOfTerms)
-  bcFinish("series",fun,STRCONC(var,'" = ",point))
+  bcFinish("series",fun,strconc(var,'" = ",point))
 
 bcSeriesByFormula(a,b) ==
   htInitPage('"Power Series Basic Command",nil)
@@ -782,9 +782,9 @@ bcSeriesGen(htPage) ==
   index   := htpLabelInputString(htPage,'index)
   var := htpLabelInputString(htPage,'variable)
   point := htpLabelInputString(htPage,'point)
-  varPart := STRCONC(var,'" = ",point)
-  minPart := STRCONC(min,'"..")
-  bcFinish('"series",STRCONC(index,'" +-> ",formula),varPart,minPart,step)
+  varPart := strconc(var,'" = ",point)
+  minPart := strconc(min,'"..")
+  bcFinish('"series",strconc(index,'" +-> ",formula),varPart,minPart,step)
 
 bcLimit() ==
   htInitPage('"Limit Basic Command",nil)
@@ -850,7 +850,7 @@ bcRealLimitGen htPage ==
     loc :=
       p = 'plusInfinity => '"%plusInfinity"
       '"%minusInfinity"
-    bcFinish('"limit",fun,STRCONC(var,'" = ",loc))
+    bcFinish('"limit",fun,strconc(var,'" = ",loc))
   page := htInitPage('"Real Limit Basic Command",nil)
   htMakePage '(
     (text . "Compute the limit")
@@ -871,7 +871,7 @@ bcRealLimitGen1(htPage,key) ==
   fun := htpProperty(htPage,'fun)
   var := htpProperty(htPage,'var)
   loc := htpProperty(htPage,'loc)
-  varPart := STRCONC(var,'" = ",loc)
+  varPart := strconc(var,'" = ",loc)
   bcFinish('"limit",fun,varPart,direction)
 
 bcComplexLimit(a,b) ==
@@ -917,14 +917,14 @@ bcComplexLimitGen htPage ==
       complexPart :=
         comp = '"0" => '""
         comp = '"1" => '"%i"
-        STRCONC(comp,'"*%i")
+        strconc(comp,'"*%i")
       real = '"0" =>
         complexPart = '"" => "0"
         complexPart
       complexPart = '"" => real
-      STRCONC(real,'" + ",complexPart)
+      strconc(real,'" + ",complexPart)
     '"%infinity"
-  varPart := STRCONC(var,'" = ",loc)
+  varPart := strconc(var,'" = ",loc)
   bcFinish('"complexLimit",fun,varPart)
 
 
diff --git a/src/interp/bc-solve.boot b/src/interp/bc-solve.boot
index a2984641..4cea69a1 100644
--- a/src/interp/bc-solve.boot
+++ b/src/interp/bc-solve.boot
@@ -144,10 +144,10 @@ bcInputEquations(htPage,solutionMethod) ==
       (bcStrings (6 0 r1 P)))
     "append"/[f(i,numEqs,linearPred) for i in 1..numEqs] where f(i,n,linearp) ==
       spacer := (i > 99 => 0; i > 9 => 1; 2)
-      prefix := STRCONC('"\newline\tab{2}{\em Equation ",STRINGIMAGE i,'":}")
-      prefix := STRCONC(prefix,'"\space{",STRINGIMAGE spacer,'"}")
-      lnam := INTERN STRCONC('"l",STRINGIMAGE i)
-      rnam := INTERN STRCONC('"r",STRINGIMAGE i)
+      prefix := strconc('"\newline\tab{2}{\em Equation ",STRINGIMAGE i,'":}")
+      prefix := strconc(prefix,'"\space{",STRINGIMAGE spacer,'"}")
+      lnam := INTERN strconc('"l",STRINGIMAGE i)
+      rnam := INTERN strconc('"r",STRINGIMAGE i)
       var:= 
         linearp => bcMakeLinearEquations(i,n)
         bcMakeEquations(i,n)
@@ -181,29 +181,29 @@ bcInputEquations(htPage,solutionMethod) ==
   htShowPage()
 
 bcCreateVariableString(i) == 
-   STRCONC('"x",STRINGIMAGE i)
+   strconc('"x",STRINGIMAGE i)
 
 bcMakeUnknowns(number)==
-   apply(function strconc,[STRCONC(bcCreateVariableString(i)," ") for i in 1..number])
+   apply(function strconc,[strconc(bcCreateVariableString(i)," ") for i in 1..number])
    
 bcMakeEquations(i,number)==
-   number =1 => STRCONC(bcCreateVariableString(1),"^2+1")
+   number =1 => strconc(bcCreateVariableString(1),"^2+1")
    bcCreateVariableString(i)
-   STRCONC(
-     STRCONC(
-      apply(function strconc,[STRCONC(bcCreateVariableString(j),"+") for j in 1..number]),"1"),
-        STRCONC("-2*",STRCONC(bcCreateVariableString(i),"^2")))
+   strconc(
+     strconc(
+      apply(function strconc,[strconc(bcCreateVariableString(j),"+") for j in 1..number]),"1"),
+        strconc("-2*",strconc(bcCreateVariableString(i),"^2")))
 
 
 bcMakeLinearEquations(i,number)==
    number = 1 => bcCreateVariableString(1)
    number = 2 => 
-        i=1 => STRCONC(bcCreateVariableString(1),STRCONC("+",bcCreateVariableString(2)))
-        STRCONC(bcCreateVariableString(1),STRCONC("-",bcCreateVariableString(2)))
-   STRCONC(
-     STRCONC(
-      apply(function strconc,[STRCONC(bcCreateVariableString(j),"+") for j in 1..number]),"1"),
-        STRCONC("-2*",bcCreateVariableString(i)))
+        i=1 => strconc(bcCreateVariableString(1),strconc("+",bcCreateVariableString(2)))
+        strconc(bcCreateVariableString(1),strconc("-",bcCreateVariableString(2)))
+   strconc(
+     strconc(
+      apply(function strconc,[strconc(bcCreateVariableString(j),"+") for j in 1..number]),"1"),
+        strconc("-2*",bcCreateVariableString(i)))
       
 
 bcInputEquationsEnd htPage ==
@@ -237,8 +237,8 @@ bcSolveEquations(htPage,solutionMethod) ==
     digits := htpLabelInputString(htPage,'acc)
     kind := htpButtonValue(htPage,'choice)
     accString :=
-      kind in '(rf cf) => STRCONC('"1.e-",digits)
-      STRCONC('"1/10**",digits)
+      kind in '(rf cf) => strconc('"1.e-",digits)
+      strconc('"1/10**",digits)
   alist := htpProperty(htPage,'inputArea)
   [[.,varpart,:.],:r] := alist
   varlist := bcString2WordList varpart
@@ -275,10 +275,10 @@ bcLinearSolveMatrixInhomo(htPage,junk) ==
   labelList := 
     [f(i) for i in 1..ncols] where f(i) ==
       spacer := (i > 99 => 0; i > 9 => 1; 2)
-      prefix := STRCONC('"{\em Coefficient ",STRINGIMAGE i,'":}")
+      prefix := strconc('"{\em Coefficient ",STRINGIMAGE i,'":}")
       if spacer ~= 0 then
-        prefix := STRCONC(prefix,'"\space{",STRINGIMAGE spacer,'"}")
-      name := INTERN STRCONC('"c",STRINGIMAGE i)
+        prefix := strconc(prefix,'"\space{",STRINGIMAGE spacer,'"}")
+      name := INTERN strconc('"c",STRINGIMAGE i)
       [prefix,"",30, 0,name, 'P]
   page := htInitPage('"Linear Solve Basic Command",htpPropertyList htPage)
   htpSetProperty(page,'matrix,htpProperty(htPage,'matrix))
@@ -305,7 +305,7 @@ bcLinearMatrixGen(htPage,key) ==
   vecform := bcVectorGen vector 
   form := bcMkFunction('"solve",matform,[vecform])
   bcGen
-    key = 'particular => STRCONC(form,'".particular")
+    key = 'particular => strconc(form,'".particular")
     form
   
 linearFinalRequest(nhh,mat,vect) ==     
@@ -352,7 +352,7 @@ bcGenEquations alist ==
     y := rest y
     left := (first y).1
     y := rest y
-    eqnlist := [STRCONC(left,'" = ",right),:eqnlist]
+    eqnlist := [strconc(left,'" = ",right),:eqnlist]
   rest eqnlist => bcwords2liststring eqnlist
   first eqnlist
   
diff --git a/src/interp/bc-util.boot b/src/interp/bc-util.boot
index 2cd0ae5f..6ee3f9b0 100644
--- a/src/interp/bc-util.boot
+++ b/src/interp/bc-util.boot
@@ -47,12 +47,12 @@ bcFinish(name,arg,:args) == bcGen bcMkFunction(name,arg,args)
 
 bcMkFunction(name,arg,args) ==
   args := [x for x in args | x]
-  STRCONC(name,'"(",arg,"STRCONC"/[STRCONC('",", x) for x in args],'")")
+  strconc(name,'"(",arg,"STRCONC"/[strconc('",", x) for x in args],'")")
 
 bcString2HyString2 s ==
   (string? s) and (s.0 = char '_")  =>
     len := #s
-    STRCONC('"\_"", SUBSTRING(s, 1, len-2), '"\_"")
+    strconc('"\_"", SUBSTRING(s, 1, len-2), '"\_"")
   s
 
 bcString2HyString s == s
@@ -62,8 +62,8 @@ bcFindString(s,i,n,char) ==  or/[j for j in i..n | s.j = char]
 bcGen command ==
   htInitPage('"Basic Command",nil)
   string :=
-    #command < 50 => STRCONC('"{\centerline{\tt ",command,'" }}")
-    STRCONC('"{\tt ",command,'" }")
+    #command < 50 => strconc('"{\centerline{\tt ",command,'" }}")
+    strconc('"{\tt ",command,'" }")
   htMakePage [
      '(text
         "{Here is the AXIOM command you could have issued to compute this result:}"
@@ -76,7 +76,7 @@ bcGen command ==
 linkGen command ==
   htInitPage('"AXIOM-Nag Link Command",nil)
   string := 
-    #command < 50 => STRCONC('"{\centerline{ ",command,'" }}")
+    #command < 50 => strconc('"{\centerline{ ",command,'" }}")
     command
   htMakePage [
      '(text 
@@ -105,10 +105,10 @@ bcString2WordList s == fn(s,0,MAXINDEX s) where
 
 bcwords2liststring u ==
   null u => nil
-  STRCONC('"[",first u,fn rest u) where
+  strconc('"[",first u,fn rest u) where
     fn(u) ==
       null u => '"]"
-      STRCONC('", ",first u,fn rest u)
+      strconc('", ",first u,fn rest u)
 
 bcVectorGen vec == bcwords2liststring vec
 
@@ -116,7 +116,7 @@ bcError string ==
   sayBrightlyNT '"NOTE: "
   sayBrightly string
 
-bcDrawIt(ind,a,b) == STRCONC(ind,'"=",a,'"..",b)
+bcDrawIt(ind,a,b) == strconc(ind,'"=",a,'"..",b)
 
 bcNotReady htPage ==
   htInitPage('"Basic Command",nil)
@@ -128,11 +128,11 @@ bcNotReady htPage ==
 htStringPad(n,w) ==
   s := STRINGIMAGE n
   ws := #s
-  STRCONC('"\space{",STRINGIMAGE (w - ws + 1),'"}",s)
+  strconc('"\space{",STRINGIMAGE (w - ws + 1),'"}",s)
 
 stringList2String x ==
   null x => '"()"
-  STRCONC('"(",first x,"STRCONC"/[STRCONC('",",y) for y in rest x],'")")
+  strconc('"(",first x,"STRCONC"/[strconc('",",y) for y in rest x],'")")
 
-htMkName(s,n) == STRCONC(s,STRINGIMAGE n)
+htMkName(s,n) == strconc(s,STRINGIMAGE n)
 
diff --git a/src/interp/br-con.boot b/src/interp/br-con.boot
index 88aa8d8d..3349e6b1 100644
--- a/src/interp/br-con.boot
+++ b/src/interp/br-con.boot
@@ -113,7 +113,7 @@ conPageConEntry entry ==
 --%   sourceFileName  := dbSourceFile INTERN name
 --%   constrings      :=
 --%     KDR form => dbConformGenUnder form
---%     [STRCONC(name,args)]
+--%     [strconc(name,args)]
 --%   emString        := ['"{\sf ",:constrings,'"}"]
 --%   heading := [capitalKind,'" ",:emString]
 --%   if not isExposedConstructor conname then heading := ['"Unexposed ",:heading]
@@ -294,7 +294,7 @@ kiPage(htPage,junk) ==
 
 kePage(htPage,junk) ==
   [kind,name,nargs,xflag,sig,args,abbrev,comments] := htpProperty(htPage,'parts)
-  constring       := STRCONC(name,args)
+  constring       := strconc(name,args)
   domname         := kDomainName(htPage,kind,name,nargs)
   domname is ['error,:.] => errorPage(htPage,domname)
   htpSetProperty(htPage,'domname,domname)
@@ -427,7 +427,7 @@ kcPage(htPage,junk) ==
     htpSetProperty(htPage,'heading,heading)
   if kind = '"category" and dbpHasDefaultCategory? xpart then
     htSay '"This category has default package "
-    bcCon(STRCONC(name,char '_&),'"")
+    bcCon(strconc(name,char '_&),'"")
   htSayStandard '"\newline"
   htBeginMenu(3)
   htSayStandard '"\item "
@@ -578,12 +578,12 @@ augmentHasArgs(alist,conform) ==
 kcdePage(htPage,junk) ==
   [kind,name,nargs,xflag,sig,args,abbrev,comments] := htpProperty(htPage,'parts)
   conname         := INTERN name
-  constring       := STRCONC(name,args)
+  constring       := strconc(name,args)
   conform         :=
     kind ~= '"default package" => ncParseFromString constring
-    [INTERN name,:rest ncParseFromString STRCONC(char 'd,args)]  --because of &
+    [INTERN name,:rest ncParseFromString strconc(char 'd,args)]  --because of &
   pakname         :=
---  kind = '"category" => INTERN STRCONC(name,char '_&)
+--  kind = '"category" => INTERN strconc(name,char '_&)
     opOf conform
   domList := getDependentsOfConstructor pakname
   cAlist := [[getConstructorForm x,:true] for x in domList]
@@ -594,12 +594,12 @@ kcdePage(htPage,junk) ==
 kcuPage(htPage,junk) ==
   [kind,name,nargs,xflag,sig,args,abbrev,comments] := htpProperty(htPage,'parts)
   conname         := INTERN name
-  constring       := STRCONC(name,args)
+  constring       := strconc(name,args)
   conform         :=
     kind ~= '"default package" => ncParseFromString constring
-    [INTERN name,:rest ncParseFromString STRCONC(char 'd,args)]  --because of &
+    [INTERN name,:rest ncParseFromString strconc(char 'd,args)]  --because of &
   pakname         :=
-    kind = '"category" => INTERN STRCONC(name,char '_&)
+    kind = '"category" => INTERN strconc(name,char '_&)
     opOf conform
   domList := getUsersOfConstructor pakname
   cAlist := [[getConstructorForm x,:true] for x in domList]
@@ -620,7 +620,7 @@ kcnPage(htPage,junk) ==
     htpSetProperty(htPage,'heading,heading)
   conform:= htpProperty(htPage,'conform)
   pakname         :=
-    kind = '"category" => INTERN STRCONC(PNAME name,char '_&)
+    kind = '"category" => INTERN strconc(PNAME name,char '_&)
     opOf conform
   domList := getImports pakname
   if domname then
@@ -631,7 +631,7 @@ kcnPage(htPage,junk) ==
   dbShowCons(htPage,'names)
 
 koPageInputAreaUnchanged?(htPage, nargs) ==
-  [htpLabelInputString(htPage,INTERN STRCONC('"*",STRINGIMAGE i)) for i in 1..nargs]
+  [htpLabelInputString(htPage,INTERN strconc('"*",STRINGIMAGE i)) for i in 1..nargs]
       = htpProperty(htPage,'inputAreaList)
 
 kDomainName(htPage,kind,name,nargs) ==
@@ -652,9 +652,9 @@ kDomainName(htPage,kind,name,nargs) ==
       "STRCONC"/["STRCONC"/ ['",",:x] for x in KDR args]
     "STRCONC"/['"(",:first args,argTailPart,'")"]
   typeForm := CATCH($SpadReaderTag, unabbrev mkConform(kind,name,argString)) or
-    ['error,'invalidType,STRCONC(name,argString)]
+    ['error,'invalidType,strconc(name,argString)]
   null (evaluatedTypeForm := kisValidType typeForm) =>
-    ['error,'invalidType,STRCONC(name,argString)]
+    ['error,'invalidType,strconc(name,argString)]
   dbMkEvalable evaluatedTypeForm
 
 kArgumentCheck(domain?,s) ==
@@ -703,7 +703,7 @@ parseNoMacroFromString(s) ==
 
 mkConform(kind,name,argString) ==
   kind ~= '"default package" =>
-    form := STRCONC(name,argString)
+    form := strconc(name,argString)
     parse := parseNoMacroFromString form
     null parse =>
       sayBrightlyNT '"Won't parse: "
@@ -711,7 +711,7 @@ mkConform(kind,name,argString) ==
       systemError '"Keywords in argument list?"
     atom parse => [parse]
     parse
-  [INTERN name,:rest ncParseFromString STRCONC(char 'd,argString)]  --& case
+  [INTERN name,:rest ncParseFromString strconc(char 'd,argString)]  --& case
 
 --=======================================================================
 --           Operation Page for a Domain Form from Scratch
@@ -750,7 +750,7 @@ conOpPage1(conform,:options) ==
   isFile := null kind
   kind := kind or '"package"
   parts.first := kind
-  constring       := STRCONC(name,args)
+  constring       := strconc(name,args)
   conform         := mkConform(kind,name,args)
   capitalKind     := capitalize kind
   signature       := ncParseFromString sig
@@ -777,7 +777,7 @@ conOpPage1(conform,:options) ==
 --=======================================================================
 koPage(htPage,which) ==
   [kind,name,nargs,xflag,sig,args,abbrev,comments] := htpProperty(htPage,'parts)
-  constring       := STRCONC(name,args)
+  constring       := strconc(name,args)
   conname         := INTERN name
   domname         :=
     (u := htpProperty(htPage,'domname)) is [=conname,:.]
@@ -1200,7 +1200,7 @@ Y := '"In general, the {\sf Record} constructor can take any number of arguments
 
 Z := '"{\sf Record} is a primitive domain of \Language{} which cannot be defined in the \Language{} language."
 
-MESSAGE := STRCONC(X,Y,Z)
+MESSAGE := strconc(X,Y,Z)
 
 PUT('Record,'documentation,substitute(MESSAGE,'MESSAGE,'(
   (constructor (NIL MESSAGE))
@@ -1224,7 +1224,7 @@ X := '"{\sf Union(A,B)} denotes the class of objects which are which are either
 
 Y := '"For an alternate form of {\sf Union} with _"tags_", see \downlink{Union(a:A,b:B)}{DomainUnion}. {\sf Union} is a primitive domain of \Language{} which cannot be defined in the \Language{} language."
 
-MESSAGE := STRCONC(X,Y)
+MESSAGE := strconc(X,Y)
 
 PUT('UntaggedUnion,'documentation,substitute(MESSAGE,'MESSAGE,'(
   (constructor (NIL MESSAGE))
@@ -1254,7 +1254,7 @@ W := '"This tagged {\sf Union} type is necessary, for example, to disambiguate t
 
 A := '"{\sf Union} is a primitive domain of \Language{} which cannot be defined in the \Language{} language."
 
-MESSAGE := STRCONC(X,Y,Z,W,A)
+MESSAGE := strconc(X,Y,Z,W,A)
 
 PUT('Union,'documentation,substitute(MESSAGE,'MESSAGE,'(
   (constructor (NIL MESSAGE))
@@ -1280,7 +1280,7 @@ Y := '" All but the first argument is regarded as part of a source tuple for the
 
 Z := '"{\sf Mapping} is a primitive domain of \Language{} which cannot be defined in the \Language{} language."
 
-MESSAGE := STRCONC(X,Y,Z)
+MESSAGE := strconc(X,Y,Z)
 
 PUT('Mapping,'documentation, substitute(MESSAGE,'MESSAGE,'(
   (constructor (NIL MESSAGE))
@@ -1292,7 +1292,7 @@ X := '"{\em Enumeration(a1, a2 ,..., aN)} creates an object which is exactly one
 
 Y := '" The {\em Enumeration} can constructor can take any number of symbols as arguments."
 
-MESSAGE := STRCONC(X, Y)
+MESSAGE := strconc(X, Y)
 
 PUT('Enumeration, 'documentation, substitute(MESSAGE, 'MESSAGE, '(
   (constructor (NIL MESSAGE))
diff --git a/src/interp/br-data.boot b/src/interp/br-data.boot
index ba3e191e..d585d1dc 100644
--- a/src/interp/br-data.boot
+++ b/src/interp/br-data.boot
@@ -120,13 +120,13 @@ buildLibdbConEntry conname ==
       '""
     argpart:= SUBSTRING(form2HtString ['f,:argl],1,nil)
     sigpart:= libConstructorSig $conform
-    header := STRCONC($kind,PNAME conname)
+    header := strconc($kind,PNAME conname)
     buildLibdbString [header,#argl,$exposed?,sigpart,argpart,abb,conComments]
 
 dbMkForm x == atom x and [x] or x
 
 buildLibdbString [x,:u] ==
-  STRCONC(STRINGIMAGE x,"STRCONC"/[STRCONC('"`",STRINGIMAGE y) for y in u])
+  strconc(STRINGIMAGE x,"STRCONC"/[strconc('"`",STRINGIMAGE y) for y in u])
 
 libConstructorSig [conname,:argl] ==
   [[.,:sig],:.] := getConstructorModemapFromDB conname
@@ -150,7 +150,7 @@ libConstructorSig [conname,:argl] ==
 
 concatWithBlanks r ==
   r is [head,:tail] =>
-    tail => STRCONC(head,'" ",concatWithBlanks tail)
+    tail => strconc(head,'" ",concatWithBlanks tail)
     head
   '""
 
@@ -161,8 +161,8 @@ writedb(u) ==
   TERPRI $outStream
 
 addPatchesToLongLines(s,n) ==
-  #s > n => STRCONC(SUBSTRING(s,0,n),
-              addPatchesToLongLines(STRCONC('"--",SUBSTRING(s,n,nil)),n))
+  #s > n => strconc(SUBSTRING(s,0,n),
+              addPatchesToLongLines(strconc('"--",SUBSTRING(s,n,nil)),n))
   s
 
 buildLibOps oplist == for [op,sig,:pred] in oplist repeat buildLibOp(op,sig,pred)
@@ -179,8 +179,8 @@ buildLibOp(op,sig,pred) ==
     (s := STRINGIMAGE op) = '"One" => '"1"
     s = '"Zero" => '"0"
     s
-  header := STRCONC('"o",sop)
-  conform:= STRCONC($kind,form2LispString $conform)
+  header := strconc('"o",sop)
+  conform:= strconc($kind,form2LispString $conform)
   comments:= libdbTrim concatWithBlanks LASSOC(sig,LASSOC(op,$doc))
   checkCommentsForBraces('operation,sop,sigpart,comments)
   writedb
@@ -215,12 +215,12 @@ buildLibAttrs attrlist ==
 
 buildLibAttr(name,argl,pred) ==
 --attributes      AKname\#\args\conname\pred\comments (K is U or C)
-  header := STRCONC('"a",STRINGIMAGE name)
+  header := strconc('"a",STRINGIMAGE name)
   argPart:= SUBSTRING(form2LispString ['f,:argl],1,nil)
   pred := SUBLISLIS(rest $conform,$FormalMapVariableList,pred)
   predString := (pred = 'T => '""; form2LispString pred)
-  header := STRCONC('"a",STRINGIMAGE name)
-  conname := STRCONC($kind,form2LispString $conname)
+  header := strconc('"a",STRINGIMAGE name)
+  conname := strconc($kind,form2LispString $conname)
   comments:= concatWithBlanks LASSOC(['attribute,:argl],LASSOC(name,$doc))
   checkCommentsForBraces('attribute,STRINGIMAGE name,argl,comments)
   writedb
@@ -246,12 +246,12 @@ dbHasExamplePage conname ==
   sname    := STRINGIMAGE conname
   abb      := constructor? conname
   ucname   := UPCASE STRINGIMAGE abb
-  pathname :=STRCONC(systemRootDirectory(),'"/share/hypertex/pages/",ucname,'".ht")
-  isExistingFile pathname => INTERN STRCONC(sname,'"XmpPage")
+  pathname :=strconc(systemRootDirectory(),'"/share/hypertex/pages/",ucname,'".ht")
+  isExistingFile pathname => INTERN strconc(sname,'"XmpPage")
   nil
 
 dbRead(n) ==
-  instream := MAKE_-INSTREAM STRCONC(systemRootDirectory(), '"/algebra/libdb.text")
+  instream := MAKE_-INSTREAM strconc(systemRootDirectory(), '"/algebra/libdb.text")
   FILE_-POSITION(instream,n)
   line := READLINE instream
   SHUT instream
@@ -259,7 +259,7 @@ dbRead(n) ==
 
 dbReadComments(n) ==
   n = 0 => '""
-  instream := MAKE_-INSTREAM STRCONC(systemRootDirectory(),'"/algebra/comdb.text")
+  instream := MAKE_-INSTREAM strconc(systemRootDirectory(),'"/algebra/comdb.text")
   FILE_-POSITION(instream,n)
   line := READLINE instream
   k := dbTickIndex(line,1,1)
@@ -269,7 +269,7 @@ dbReadComments(n) ==
       x.(j := j + 1) = char '_- and x.(j := j + 1) = char '_- repeat
         xtralines := [SUBSTRING(x,j + 1,nil),:xtralines]
   SHUT instream
-  STRCONC(line, "STRCONC"/nreverse xtralines)
+  strconc(line, "STRCONC"/nreverse xtralines)
 
 dbSplitLibdb() ==
   instream := MAKE_-INSTREAM  '"olibdb.text"
@@ -316,7 +316,7 @@ dbSpreadComments(line,n) ==
   k >= MAXINDEX line => [SUBSTRING(line,n,nil)]
   line.(k + 1) ~= char '_- =>
     u := dbSpreadComments(line,k)
-    [STRCONC(SUBSTRING(line,n,k - n),first u),:rest u]
+    [strconc(SUBSTRING(line,n,k - n),first u),:rest u]
   [SUBSTRING(line,n,k - n),:dbSpreadComments(SUBSTRING(line,k,nil),0)]
 
 --============================================================================
@@ -329,7 +329,7 @@ buildGloss() ==  --called by buildDatabase (database.boot)
   $outStream: local := MAKE_-OUTSTREAM '"temp.text"
   $x : local := nil
   $attribute? : local := true     --do not surround first word
-  pathname := STRCONC(systemRootDirectory(),'"doc/gloss.text")
+  pathname := strconc(systemRootDirectory(),'"doc/gloss.text")
   instream := MAKE_-INSTREAM pathname
   keypath  := '"glosskey.text"
   removeFile keypath
@@ -407,7 +407,7 @@ getGlossLines instream ==
         #last > 0 and last.(MAXINDEX last) ~= $charBlank => $charBlank
         '""
       lastLineHadTick := false
-      text := [STRCONC(last,fill,line),:rest text]
+      text := [strconc(last,fill,line),:rest text]
     lastLineHadTick := true
     keys := [SUBSTRING(line,0,n),:keys]
     text := [SUBSTRING(line,n + 1,nil),:text]
@@ -435,7 +435,7 @@ mkUsersHashTable() ==  --called by buildDatabase (database.boot)
 getDefaultPackageClients con ==  --called by mkUsersHashTable
   catname := INTERN SUBSTRING(s := PNAME con,0,MAXINDEX s)
   for [catAncestor,:.] in childrenOf([catname]) repeat
-    pakname := INTERN STRCONC(PNAME catAncestor,'"&")
+    pakname := INTERN strconc(PNAME catAncestor,'"&")
     if getCDTEntry(pakname,true) then acc := [pakname,:acc]
     acc := union([CAAR x for x in domainsOf([catAncestor],nil)],acc)
   listSort(function GLESSEQP,acc)
diff --git a/src/interp/br-op1.boot b/src/interp/br-op1.boot
index c3737af7..852d5153 100644
--- a/src/interp/br-op1.boot
+++ b/src/interp/br-op1.boot
@@ -903,18 +903,18 @@ evalableConstructor2HtString domform ==
 mathform2HtString form == escapeString
   $fortInts2Floats: local := false
   form := niladicHack form
-  form is ['QUOTE,a] => STRCONC('"'","STRCONC"/fortexp0 a)
+  form is ['QUOTE,a] => strconc('"'","STRCONC"/fortexp0 a)
   form is ['BRACKET,['AGGLST,:arg]] =>
     if arg is ['construct,:r] then arg := r
     arg :=
       atom arg => [arg]
       [y for x in arg | y := (x is ['QUOTE,a] => a; x)]
-    tailPart := "STRCONC"/[STRCONC('",",STRINGIMAGE x) for x in rest arg]
-    STRCONC('"[",STRINGIMAGE first arg,tailPart,'"]")
+    tailPart := "STRCONC"/[strconc('",",STRINGIMAGE x) for x in rest arg]
+    strconc('"[",STRINGIMAGE first arg,tailPart,'"]")
   form is ['BRACKET,['AGGLST,'QUOTE,arg]] =>
     if atom arg then arg := [arg]
-    tailPart := "STRCONC"/[STRCONC('",",x) for x in rest arg]
-    STRCONC('"[",first arg,tailPart,'"]")
+    tailPart := "STRCONC"/[strconc('",",x) for x in rest arg]
+    strconc('"[",first arg,tailPart,'"]")
   atom form => form
   "STRCONC"/fortexp0 form
 
diff --git a/src/interp/br-op2.boot b/src/interp/br-op2.boot
index 2ad1c5bc..61e76d98 100644
--- a/src/interp/br-op2.boot
+++ b/src/interp/br-op2.boot
@@ -495,9 +495,9 @@ dbHeading(items,which,heading,:options) ==
   capwhich := capitalize which
   prefix :=
     count < 2 =>
-      names? => pluralSay(count,STRCONC(capwhich," Name"),nil)
+      names? => pluralSay(count,strconc(capwhich," Name"),nil)
       pluralSay(count,capwhich,nil)
-    names? => pluralSay(count,nil,STRCONC(capwhich," Names"))
+    names? => pluralSay(count,nil,strconc(capwhich," Names"))
     pluralSay(count,nil,pluralize capwhich)
   [:prefix,'" for ",:heading]
 
diff --git a/src/interp/br-prof.boot b/src/interp/br-prof.boot
index b67bb4a4..a154127a 100644
--- a/src/interp/br-prof.boot
+++ b/src/interp/br-prof.boot
@@ -78,7 +78,7 @@ dbShowInfoOp(htPage,op,sig,alist) ==
   kind     := getConstructorKindFromDB conname
   honestConform :=
     kind = 'category =>
-      [INTERN STRCONC(PNAME conname,'"&"),"$",:rest conform]
+      [INTERN strconc(PNAME conname,'"&"),"$",:rest conform]
     conform
   faTypes  := CDDAR getConstructorModemapFromDB conname
 
@@ -252,12 +252,12 @@ hasNewInfoText u ==
 
 getInfoAlist conname ==
   cat? := getConstructorKindFromDB conname = "category"
-  if cat? then conname := INTERN STRCONC(STRINGIMAGE conname,'"&")
+  if cat? then conname := INTERN strconc(STRINGIMAGE conname,'"&")
   abb := constructor? conname or return '"not a constructor"
-  fs  := STRCONC(PNAME abb,'".NRLIB/info")
+  fs  := strconc(PNAME abb,'".NRLIB/info")
   inStream :=
     PROBE_-FILE fs => OPEN fs
-    filename := STRCONC('"/spad/int/algebra/",PNAME abb,'".NRLIB/info")
+    filename := strconc('"/spad/int/algebra/",PNAME abb,'".NRLIB/info")
     PROBE_-FILE filename => OPEN filename
     return nil
   alist := mySort READ inStream
diff --git a/src/interp/br-saturn.boot b/src/interp/br-saturn.boot
index b9779a85..09f6e425 100644
--- a/src/interp/br-saturn.boot
+++ b/src/interp/br-saturn.boot
@@ -202,8 +202,8 @@ issueHTSaturn line == --called by htMakePageNoScroll and htMakeErrorPage
      writeSaturn(line)
      writeSaturnSuffix()
      if $saturnFileNumber then
-       fn := STRCONC('"sat", STRINGIMAGE $saturnFileNumber, '".tex")
-       obey STRCONC('"doswrite -a saturn.tex ",fn, '".tex")
+       fn := strconc('"sat", STRINGIMAGE $saturnFileNumber, '".tex")
+       obey strconc('"doswrite -a saturn.tex ",fn, '".tex")
        $saturnFileNumber := $saturnFileNumber + 1
 
 writeSaturnPrefix() ==
@@ -439,7 +439,7 @@ menuButton() == '"\menuitemstyle{}"
 --replaces htMakeButton
 getCallBackFn form ==
   func := mkCurryFun(first form, rest form)
-  STRCONC('"(|htDoneButton| '|", func, '"| ",htpName page(), '")")
+  strconc('"(|htDoneButton| '|", func, '"| ",htpName page(), '")")
 
 mkDocLink(code,s) ==
   if atom code then code := [code]
@@ -630,7 +630,7 @@ kPage(line,:options) == --any cat, dom, package, default package
   sourceFileName  := dbSourceFile INTERN name
   constrings      :=
     KDR form => dbConformGenUnder form
-    [STRCONC(name,args)]
+    [strconc(name,args)]
   emString        := ['"{\sf ",:constrings,'"}"]
   heading := [capitalKind,'" ",:emString]
   if not isExposedConstructor conname then heading := ['"Unexposed ",:heading]
@@ -741,7 +741,7 @@ kPageContextMenuSaturn page ==
 
 saturnExampleLink lname ==
   htSay '"\docLink{\csname "
-  htSay STRCONC(second lname, '"\endcsname}{E&xamples}")
+  htSay strconc(second lname, '"\endcsname}{E&xamples}")
 
 $exampleConstructors := nil
 
@@ -751,7 +751,7 @@ saturnHasExamplePage conname ==
   ASSQ(conname, $exampleConstructors)
   
 getSaturnExampleList() == 
-  file := STRCONC(systemRootDirectory(), "/doc/axug/examples.lsp")
+  file := strconc(systemRootDirectory(), "/doc/axug/examples.lsp")
   not PROBE_-FILE file => nil
   fp := MAKE_-INSTREAM file
   lst := VMREAD fp
@@ -1489,7 +1489,7 @@ htSaySaturnAmpersand() == htSaySaturn $saturnAmpersand
 htBlank(:options) ==
   options is [n] =>
     htSaySaturn("STRCONC"/['"\phantom{*}" for i in 1..n])
-    htSayStandard STRCONC('"\space{",STRINGIMAGE n,'"}")
+    htSayStandard strconc('"\space{",STRINGIMAGE n,'"}")
   htSaySaturn '"\phantom{*}"
   htSayStandard '"\space{1}"
 
@@ -1539,7 +1539,7 @@ satTypeDownLink(s,code) ==
   htSayStandard code
   htSayStandard '"}"
 
-mkButtonBox n == STRCONC('"\buttonbox{", STRINGIMAGE n, '"}")
+mkButtonBox n == strconc('"\buttonbox{", STRINGIMAGE n, '"}")
 
 --=======================================================================
 --      Create separate databases for operations, constructors
@@ -1588,7 +1588,7 @@ mkButtonBox n == STRCONC('"\buttonbox{", STRINGIMAGE n, '"}")
 --    if key ~= line.0 then
 --      if outstream then SHUT outstream
 --      key := line . 0
---      outstream := MAKE_-OUTSTREAM STRCONC(STRINGIMAGE key,'"libdb.text")
+--      outstream := MAKE_-OUTSTREAM strconc(STRINGIMAGE key,'"libdb.text")
 --    outP := FILE_-POSITION outstream
 --    [prefix,:comments] := dbSplit(line,6,1)
 --    PRINTEXP(prefix,outstream)
@@ -1617,8 +1617,8 @@ mkButtonBox n == STRCONC('"\buttonbox{", STRINGIMAGE n, '"}")
 dbSort(x,y) ==
   sin := STRINGIMAGE x
   sout:= STRINGIMAGE y
-  runCommand STRCONC('"sort -f _"",sin,'".text_" > _"", sout, '".text_"")
-  removeFile STRCONC(sin, '".text")
+  runCommand strconc('"sort -f _"",sin,'".text_" > _"", sout, '".text_"")
+  removeFile strconc(sin, '".text")
 
 
 bcConform1 form == main where
@@ -1732,12 +1732,12 @@ purgeLocalLibdb() ==   --called by the user through a clear command?
 --moveFile(before,after) ==
 --  $saturn => MOVE_-FILE(before, after)
 --  RENAME_-FILE(before, after)
---  --obey STRCONC('"mv ", before, '" ", after)
+--  --obey strconc('"mv ", before, '" ", after)
 
 -- deleted JHD/MCD, since already one in pathname.boot
 --removeFile fn ==
 --  $saturn => DELETE_-FILE fn
---  obey STRCONC('"rm ",fn)
+--  obey strconc('"rm ",fn)
 
 --=======================================================================
 --            from DAASE.LISP
diff --git a/src/interp/br-search.boot b/src/interp/br-search.boot
index 5bc3b53b..42336d4f 100644
--- a/src/interp/br-search.boot
+++ b/src/interp/br-search.boot
@@ -176,7 +176,7 @@ pmParseFromString s ==
   u := ncParseFromString pmPreparse s
   dnForm flatten u where flatten s ==
     s is [op,:argl] =>
-      string? op => STRCONC(op,"STRCONC"/[STRCONC('" ",x) for x in argl])
+      string? op => strconc(op,"STRCONC"/[strconc('" ",x) for x in argl])
       [op,:[flatten x for x in argl]]
     s
 
@@ -192,11 +192,11 @@ pmPreparse s == hn fn(s,0,#s) where--stupid insertion of chars to get correct pa
       --the following 2 lines make commutative("*") parse correctly!!!!
       t.0 = char '_" => t
       j < siz - 1 and s.j = char '_( => t
-      STRCONC(char '_",t,char '_")
-    STRCONC(SUBSTRING(s,n,i - n),middle,fn(s,j,siz))
+      strconc(char '_",t,char '_")
+    strconc(SUBSTRING(s,n,i - n),middle,fn(s,j,siz))
   gn(s,i,j) ==    --replace each underscore by 4 underscores!
     n := or/[k for k in i..j | s.k = $charUnderscore] =>
-      STRCONC(SUBSTRING(s,i,n - i + 1),$charUnderscore,gn(s,n + 1,j))
+      strconc(SUBSTRING(s,i,n - i + 1),$charUnderscore,gn(s,n + 1,j))
     SUBSTRING(s,i,j - i + 1)
 
 firstNonDelim(s,n) ==  or/[k for k in n..MAXINDEX s | not isFilterDelimiter? s.k]
@@ -206,7 +206,7 @@ isFilterDelimiter? c == MEMQ(c,$pmFilterDelimiters)
 
 grepSplit(lines,doc?) ==
   if doc? then
-    instream2 := OPEN STRCONC(systemRootDirectory(),'"/algebra/libdb.text")
+    instream2 := OPEN strconc(systemRootDirectory(),'"/algebra/libdb.text")
   cons := atts := doms := nil
   while lines is [line, :lines] repeat
     if doc? then
@@ -238,10 +238,10 @@ grepSplit(lines,doc?) ==
 mkUpDownPattern s == recurse(s,0,#s) where
   recurse(s,i,n) ==
     i = n => '""
-    STRCONC(fixchar(s.i),recurse(s,i + 1,n))
+    strconc(fixchar(s.i),recurse(s,i + 1,n))
   fixchar(c) ==
     ALPHA_-CHAR_-P c =>
-      STRCONC(char '_[,CHAR_-UPCASE c,CHAR_-DOWNCASE c,char '_])
+      strconc(char '_[,CHAR_-UPCASE c,CHAR_-DOWNCASE c,char '_])
     c
 
 mkGrepPattern(s,key) ==
@@ -271,7 +271,7 @@ mkGrepPattern1(x,:options) == --called by mkGrepPattern (and grepConstructName?)
       "STRCONC"/nreverse res
     remUnderscores s ==
       (k := charPosition(char $charUnderscore,s,0)) < MAXINDEX s =>
-        STRCONC(SUBSTRING(s,0,k),'"[",s.(k + 1),'"]",
+        strconc(SUBSTRING(s,0,k),'"[",s.(k + 1),'"]",
                 remUnderscores(SUBSTRING(s,k + 2,nil)))
       s
     split(s,char) ==
@@ -297,18 +297,18 @@ mkGrepPattern1(x,:options) == --called by mkGrepPattern (and grepConstructName?)
       one := ($options is [x,:$options] and x => x; '"[^x]")
       tick := '"[^`]*`"
       one = 'w => s
-      one = 'none => (s = '"`" => '"^."; STRCONC('"^",s))
+      one = 'none => (s = '"`" => '"^."; strconc('"^",s))
       prefix :=
-        one = 't => STRCONC(tick,tick,tick,tick,tick,".*")
+        one = 't => strconc(tick,tick,tick,tick,tick,".*")
         one = 'n => tick
-        one = 'i => STRCONC(tick,tick,tick,tick)
-        one = 's => STRCONC(tick,tick,tick)
+        one = 'i => strconc(tick,tick,tick,tick)
+        one = 's => strconc(tick,tick,tick)
 --      true => '""    ----> never put on following prefixes
         one = 'k => '"[cdp]"
         one = 'y => '"[cdpx]"
         STRINGIMAGE one
-      s = $wild1 => STRCONC('"^",prefix)
-      STRCONC('"^",prefix,s)
+      s = $wild1 => strconc('"^",prefix)
+      strconc('"^",prefix,s)
 
 conform2OutputForm(form) ==
   [op,:args] := form
@@ -707,7 +707,7 @@ dbWordFrom(l,i) ==
     ch :=
       c = char '__   => l.(k := 1+k)  --this may exceed bounds
       c
-    buf := STRCONC(buf,ch)
+    buf := strconc(buf,ch)
     k := k + 1
   [buf,k]
 
@@ -833,14 +833,14 @@ generalSearchDo(htPage,flag) ==
     which = 'ops => char 'o
     which = 'attrs => char 'a
     acc := '""
-    if htButtonOn?(htPage,'cats) then acc := STRCONC(char 'c,acc)
-    if htButtonOn?(htPage,'doms) then acc := STRCONC(char 'd,acc)
-    if htButtonOn?(htPage,'paks) then acc := STRCONC(char 'p,acc)
-    if htButtonOn?(htPage,'defs) then acc := STRCONC(char 'x,acc)
+    if htButtonOn?(htPage,'cats) then acc := strconc(char 'c,acc)
+    if htButtonOn?(htPage,'doms) then acc := strconc(char 'd,acc)
+    if htButtonOn?(htPage,'paks) then acc := strconc(char 'p,acc)
+    if htButtonOn?(htPage,'defs) then acc := strconc(char 'x,acc)
     n := #acc
     n = 0 or n = 4 => '"[cdpx]"
     n = 1 => acc
-    STRCONC(char '_[,acc,char '_])
+    strconc(char '_[,acc,char '_])
   form := mkDetailedGrepPattern(kindCode,name,nargs,npat)
   lines := applyGrep(form,'libdb)
 --lines := dbReadLines resultFile
@@ -871,15 +871,15 @@ mkDetailedGrepPattern(kind,name,nargs,argOrSig) == main where
     nottick := '"[^`]"
     name := replaceGrepStar name
     firstPart :=
-      $saturn => STRCONC(char "^",name)
-      STRCONC(char "^",kind,name)
+      $saturn => strconc(char "^",name)
+      strconc(char "^",kind,name)
     nargsPart := replaceGrepStar nargs
     exposedPart := char '_.   --always get exposed/unexposed
     patPart := replaceGrepStar argOrSig
-    simp STRCONC(conc(firstPart,conc(nargsPart,conc(exposedPart, patPart))),$tick)
+    simp strconc(conc(firstPart,conc(nargsPart,conc(exposedPart, patPart))),$tick)
   conc(a,b) ==
     b = '"[^`]*" or b = char '_. => a
-    STRCONC(a,$tick,b)
+    strconc(a,$tick,b)
   simp a ==
     m := MAXINDEX a
     m > 6 and a.(m-5) = char '_[ and a.(m-4) = char "^"
@@ -893,19 +893,19 @@ replaceGrepStar s ==
   final := MAXINDEX s
   i := charPosition(char '_*,s,0)
   i > final => s
-  STRCONC(SUBSTRING(s,0,i),'"[^`]*",replaceGrepStar SUBSTRING(s,i + 1,nil))
+  strconc(SUBSTRING(s,0,i),'"[^`]*",replaceGrepStar SUBSTRING(s,i + 1,nil))
 
 standardizeSignature(s) == underscoreDollars
   s.0 = char '_( => s
   k := STRPOS('"->",s,0,nil) or return s --will fail except perhaps on constants
-  s.(k - 1) = char '_) => STRCONC(char '_(,s)
-  STRCONC(char '_(,SUBSTRING(s,0,k),char '_),SUBSTRING(s,k,nil))
+  s.(k - 1) = char '_) => strconc(char '_(,s)
+  strconc(char '_(,SUBSTRING(s,0,k),char '_),SUBSTRING(s,k,nil))
 
 underscoreDollars(s) == fn(s,0,MAXINDEX s) where
   fn(s,i,n) ==
     i > n => '""
     (m := charPosition(char '_$,s,i)) > n => SUBSTRING(s,i,nil)
-    STRCONC(SUBSTRING(s,i,m - i),'"___$",fn(s,m + 1,n))
+    strconc(SUBSTRING(s,i,m - i),'"___$",fn(s,m + 1,n))
 
 --=======================================================================
 --                     Code dependent on $saturn
@@ -951,22 +951,22 @@ dbGetCommentOrigin line ==
   line
 
 grepSource key ==
-  key = 'libdb   => STRCONC(systemRootDirectory(),'"/algebra/libdb.text")
-  key = 'gloss   => STRCONC(systemRootDirectory(),'"doc/glosskey.text")
+  key = 'libdb   => strconc(systemRootDirectory(),'"/algebra/libdb.text")
+  key = 'gloss   => strconc(systemRootDirectory(),'"doc/glosskey.text")
   key = $localLibdb => $localLibdb
   mkGrepTextfile
     key in '(_. a c d k o p x) => 'libdb
     'comdb
 
 mkGrepTextfile s == 
-  STRCONC(systemRootDirectory(),"/algebra/", STRINGIMAGE s, '".text")
+  strconc(systemRootDirectory(),"/algebra/", STRINGIMAGE s, '".text")
 
 mkGrepFile s ==  --called to generate a path name for a temporary grep file
   prefix :=
     $standard or $aixTestSaturn => '"/tmp/"
-    STRCONC(systemRootDirectory(),'"/algebra/")
+    strconc(systemRootDirectory(),'"/algebra/")
   suffix := getEnv '"SPADNUM"
-  STRCONC(prefix, PNAME s,'".txt.", suffix)
+  strconc(prefix, PNAME s,'".txt.", suffix)
 
 --=======================================================================
 --                     Grepping Code
@@ -983,11 +983,11 @@ grepFile(pattern,:options) ==
       casepart :=
         'iv in options => '"-vi"
         '"-i"
-      command := STRCONC('"grep ",casepart,'" _'",pattern,'"_' ",source)
+      command := strconc('"grep ",casepart,'" _'",pattern,'"_' ",source)
       obey
         member(key,'(a o c d p x)) =>
-          STRCONC(command, '" | sed 's/~/", STRINGIMAGE key, '"/' > ", target)
-        STRCONC(command, '" > ",target)
+          strconc(command, '" | sed 's/~/", STRINGIMAGE key, '"/' > ", target)
+        strconc(command, '" > ",target)
       dbReadLines target
     ----Windows Version------
     invert? := 'iv in options
@@ -1001,7 +1001,7 @@ dbUnpatchLines lines ==  --concatenate long lines together, skip blank lines
     #line = 0 => 'skip     --skip blank lines
     acc :=
       line.0 = dash and line.1 = dash =>
-        [STRCONC(first acc,SUBSTRING(line,2,nil)),:rest acc]
+        [strconc(first acc,SUBSTRING(line,2,nil)),:rest acc]
       [line,:acc]
   -- following call to nreverse needed to keep lines properly sorted
   nreverse acc  ------> added by BMT 12/95
diff --git a/src/interp/br-util.boot b/src/interp/br-util.boot
index d8ec427b..0003cf3c 100644
--- a/src/interp/br-util.boot
+++ b/src/interp/br-util.boot
@@ -96,7 +96,7 @@ pluralize k ==
   k = '"child" => '"children"
   k = '"category" => '"categories"
   k = '"entry" => '"entries"
-  STRCONC(k,'"s")
+  strconc(k,'"s")
 
 capitalize s ==
   LASSOC(s,'(
@@ -202,66 +202,66 @@ form2HtString(x,:options) ==
   fn(x) where
     fn x ==
       atom x =>
-        MEMQ(x,$FormalMapVariableList) => STRCONC('"\",STRINGIMAGE x)
+        MEMQ(x,$FormalMapVariableList) => strconc('"\",STRINGIMAGE x)
         u := escapeSpecialChars STRINGIMAGE x
-        MEMQ(x,$emList) => STRCONC('"{\em ",u,'"}")
-        string? x => STRCONC('"_"",u,'"_"")
+        MEMQ(x,$emList) => strconc('"{\em ",u,'"}")
+        string? x => strconc('"_"",u,'"_"")
         u
-      first x = 'QUOTE => STRCONC('"'",sexpr2HtString second x)
-      first x = ":" => STRCONC(fn second x,'": ",fn third x)
+      first x = 'QUOTE => strconc('"'",sexpr2HtString second x)
+      first x = ":" => strconc(fn second x,'": ",fn third x)
       first x = 'Mapping =>
-        STRCONC(fnTail(rest rest x,'"()"),'"->",fn second x)
+        strconc(fnTail(rest rest x,'"()"),'"->",fn second x)
       first x = 'construct => fnTail(rest x,'"[]")
       tail := fnTail(rest x,'"()")
       head := fn first x
---    $brief and #head + #tail > 35 => STRCONC(head,'"(...)")
-      STRCONC(head,tail)
+--    $brief and #head + #tail > 35 => strconc(head,'"(...)")
+      strconc(head,tail)
     fnTail(x,str) ==
       null x => '""
-      STRCONC(str . 0,fn first x,fnTailTail rest x,str . 1)
+      strconc(str . 0,fn first x,fnTailTail rest x,str . 1)
     fnTailTail x ==
       null x => '""
-      STRCONC('",",fn first x,fnTailTail rest x)
+      strconc('",",fn first x,fnTailTail rest x)
 
 sexpr2HtString x ==
   atom x => form2HtString x
-  STRCONC('"(",fn x,'")") where fn x ==
+  strconc('"(",fn x,'")") where fn x ==
     r := rest x
     suffix :=
       null r => '""
-      atom r => STRCONC('" . ",form2HtString rest x)
-      STRCONC('" ",fn r)
-    STRCONC(sexpr2HtString first x,suffix)
+      atom r => strconc('" . ",form2HtString rest x)
+      strconc('" ",fn r)
+    strconc(sexpr2HtString first x,suffix)
 
 form2LispString(x) ==
   atom x =>
     x = '_$ => '"__$"
-    MEMQ(x,$FormalMapVariableList) => STRCONC(STRINGIMAGE '__, STRINGIMAGE x)
-    string? x => STRCONC('"_"",STRINGIMAGE x,'"_"")
+    MEMQ(x,$FormalMapVariableList) => strconc(STRINGIMAGE '__, STRINGIMAGE x)
+    string? x => strconc('"_"",STRINGIMAGE x,'"_"")
     STRINGIMAGE x
-  x is ['QUOTE,a] => STRCONC('"'",sexpr2LispString a)
-  x is [":",a,b] => STRCONC(form2LispString a,'":",form2LispString b)
+  x is ['QUOTE,a] => strconc('"'",sexpr2LispString a)
+  x is [":",a,b] => strconc(form2LispString a,'":",form2LispString b)
   first x = 'Mapping =>
-    null rest (r := rest x) => STRCONC('"()->",form2LispString first r)
-    STRCONC(args2LispString rest r,'"->",form2LispString first r)
-  STRCONC(form2LispString first x,args2LispString rest x)
+    null rest (r := rest x) => strconc('"()->",form2LispString first r)
+    strconc(args2LispString rest r,'"->",form2LispString first r)
+  strconc(form2LispString first x,args2LispString rest x)
 
 sexpr2LispString x ==
   atom x => form2LispString x
-  STRCONC('"(",fn x,'")") where fn x ==
+  strconc('"(",fn x,'")") where fn x ==
     r := rest x
     suffix :=
       null r => '""
-      atom r => STRCONC('" . ",form2LispString rest x)
-      STRCONC('" ",fn r)
-    STRCONC(sexpr2HtString first x,suffix)
+      atom r => strconc('" . ",form2LispString rest x)
+      strconc('" ",fn r)
+    strconc(sexpr2HtString first x,suffix)
 
 args2LispString x ==
   null x => '""
-  STRCONC('"(",form2LispString first x,fnTailTail rest x,'")") where
+  strconc('"(",form2LispString first x,fnTailTail rest x,'")") where
     fnTailTail x ==
       null x => '""
-      STRCONC('",",form2LispString first x,fnTailTail rest x)
+      strconc('",",form2LispString first x,fnTailTail rest x)
 
 dbConstructorKind x ==
   target := CADAR getConstructorModemapFromDB x
@@ -360,7 +360,7 @@ dbSourceFile name ==
   null u => '""
   n := PATHNAME_-NAME u
   t := PATHNAME_-TYPE u
-  STRCONC(n,'".",t)
+  strconc(n,'".",t)
 
 asharpConstructorName? name ==
   u:= getConstructorSourceFileFromDB name
@@ -610,7 +610,7 @@ dbKindString kind == LASSOC(kind,$dbKindAlist)
 
 dbName line == escapeString SUBSTRING(line,1,charPosition($tick,line,1) - 1)
 
-dbAttr line == STRCONC(dbName line,escapeString dbPart(line,4,0))
+dbAttr line == strconc(dbName line,escapeString dbPart(line,4,0))
 
 dbPart(line,n,k) ==  --returns part n of line (n=1,..) beginning in column k
   n = 1 => SUBSTRING(line,k + 1,charPosition($tick,line,k + 1) - k - 1)
diff --git a/src/interp/c-doc.boot b/src/interp/c-doc.boot
index 32332448..3b93a9f0 100644
--- a/src/interp/c-doc.boot
+++ b/src/interp/c-doc.boot
@@ -144,16 +144,16 @@ finalizeDocumentation() ==
       sayKeyedMsg("S2CD0001",NIL)
       bigcnt := 1
       if noHeading or signatures or attributes then
-        sayKeyedMsg("S2CD0002",[STRCONC(STRINGIMAGE bigcnt,'"."),name])
+        sayKeyedMsg("S2CD0002",[strconc(STRINGIMAGE bigcnt,'"."),name])
         bigcnt := bigcnt + 1
         litcnt := 1
         if noHeading then
           sayKeyedMsg("S2CD0003",
-            [STRCONC('"(",STRINGIMAGE litcnt,'")"),name])
+            [strconc('"(",STRINGIMAGE litcnt,'")"),name])
           litcnt := litcnt + 1
         if signatures then
           sayKeyedMsg("S2CD0004",
-            [STRCONC('"(",STRINGIMAGE litcnt,'")")])
+            [strconc('"(",STRINGIMAGE litcnt,'")")])
           litcnt := litcnt + 1
           for [op,sig] in signatures repeat
             s := formatOpSignature(op,sig)
@@ -162,7 +162,7 @@ finalizeDocumentation() ==
               ['%x9,:s]
         if attributes then
           sayKeyedMsg("S2CD0005",
-            [STRCONC('"(",STRINGIMAGE litcnt,'")")])
+            [strconc('"(",STRINGIMAGE litcnt,'")")])
           litcnt := litcnt + 1
           for x in attributes repeat
             a := form2String x
@@ -170,7 +170,7 @@ finalizeDocumentation() ==
               atom a => ['%x9,a]
               ['%x9,:a]
       if unusedCommentLineNumbers then
-        sayKeyedMsg("S2CD0006",[STRCONC(STRINGIMAGE bigcnt,'"."),name])
+        sayKeyedMsg("S2CD0006",[strconc(STRINGIMAGE bigcnt,'"."),name])
         for [n,r] in unusedCommentLineNumbers repeat
           sayMSG ['"   ",:bright n,'"   ",r]
   hn [[:fn(sig,$e),:doc] for [sig,:doc] in docList] where
@@ -245,7 +245,7 @@ transDoc(conname,doclist) ==
       $x = 'constructor =>
         v :=checkExtract('"Description:",u) or u and
               checkExtract('"Description:",
-                [STRCONC('"Description: ",first u),:rest u])
+                [strconc('"Description: ",first u),:rest u])
         transformAndRecheckComments('constructor,v or u)
       transformAndRecheckComments($x,u)
     acc := [[$x,longline],:acc]  --processor assumes a list of lines
@@ -410,7 +410,7 @@ removeBackslashes s ==
     s = '"" => '""
     (k := charPosition($charBack,s,0)) < #s =>
       k = 0 => removeBackslashes SUBSTRING(s,1,nil)
-      STRCONC(SUBSTRING(s,0,k),removeBackslashes SUBSTRING(s,k + 1,nil))
+      strconc(SUBSTRING(s,0,k),removeBackslashes SUBSTRING(s,k + 1,nil))
     s
 
 ++ returns the arity (as known to the global DB) of the functor
@@ -613,7 +613,7 @@ checkIndentedLines(u, margin) ==
         u2 := [:u2, s]
     verbatim => u2 := [:u2, SUBSTRING(x, margin, nil)]
     margin = k => u2 := [:u2, s]
-    u2 := [:u2, STRCONC('"\indented{",STRINGIMAGE(k-margin),'"}{",checkAddSpaceSegments(s,0),'"}")]
+    u2 := [:u2, strconc('"\indented{",STRINGIMAGE(k-margin),'"}{",checkAddSpaceSegments(s,0),'"}")]
   u2
 
 newString2Words l ==
@@ -633,7 +633,7 @@ newWordFrom(l,i,m) ==
   while i <= m and not done repeat
     ch := l.i
     ch = $charBlank or ch = $charFauxNewline => done := true
-    buf := STRCONC(buf, STRING ch)
+    buf := strconc(buf, STRING ch)
     i := i + 1
   [buf,i]
 
@@ -682,7 +682,7 @@ checkAddIndented(x,margin) ==
   k := firstNonBlankPosition x
   k = -1 => '"\blankline "
   margin = k => x
-  STRCONC('"\indented{",STRINGIMAGE(k-margin),'"}{",checkAddSpaceSegments(SUBSTRING(x,k,nil),0),'"}")
+  strconc('"\indented{",STRINGIMAGE(k-margin),'"}{",checkAddSpaceSegments(SUBSTRING(x,k,nil),0),'"}")
 
 checkAddSpaceSegments(u,k) ==
   m := MAXINDEX u
@@ -691,7 +691,7 @@ checkAddSpaceSegments(u,k) ==
   j := i
   while (j := j + 1) < m and u.j = (char '_  ) repeat 'continue
   n := j - i   --number of blanks
-  n > 1 => STRCONC(SUBSTRING(u,0,i),'"\space{",
+  n > 1 => strconc(SUBSTRING(u,0,i),'"\space{",
              STRINGIMAGE n,'"}",checkAddSpaceSegments(SUBSTRING(u,i + n,nil),0))
   checkAddSpaceSegments(u,j)
 
@@ -841,7 +841,7 @@ isVowel c ==
 
 checkAddBackSlashes s ==
   (CHARP s and (c := s)) or (#s = 1 and (c := s.0)) =>
-    MEMQ(s,$charEscapeList) => STRCONC($charBack,c)
+    MEMQ(s,$charEscapeList) => strconc($charBack,c)
     s
   k := 0
   m := MAXINDEX s
@@ -852,7 +852,7 @@ checkAddBackSlashes s ==
       char = $charBack => k := k + 2
       MEMQ(char,$charEscapeList) => return (insertIndex := k)
     k := k + 1
-  insertIndex => checkAddBackSlashes STRCONC(SUBSTRING(s,0,insertIndex),$charBack,s.k,SUBSTRING(s,insertIndex + 1,nil))
+  insertIndex => checkAddBackSlashes strconc(SUBSTRING(s,0,insertIndex),$charBack,s.k,SUBSTRING(s,insertIndex + 1,nil))
   s
 
 checkAddSpaces u ==
@@ -1120,7 +1120,7 @@ checkTransformFirsts(opname,u,margin) ==
   else if namestring = '"One" then namestring := '"1"
   margin > 0 =>
     s := leftTrim u
-    STRCONC(fillerSpaces margin,checkTransformFirsts(opname,s,0))
+    strconc(fillerSpaces margin,checkTransformFirsts(opname,s,0))
   m := MAXINDEX u
   m < 2 => u
   u.0 = $charBack => u
@@ -1139,7 +1139,7 @@ checkTransformFirsts(opname,u,margin) ==
            then checkDocError ['"Missing close bracket on first line: ", u]
            else checkDocError ['"Missing close parenthesis on first line: ", u]
          u
-      STRCONC('"\spad{",SUBSTRING(u,0,k + 1),'"}",SUBSTRING(u,k + 1,nil))
+      strconc('"\spad{",SUBSTRING(u,0,k + 1),'"}",SUBSTRING(u,k + 1,nil))
     k := checkSkipToken(u,j,m) or return u
     infixOp := INTERN SUBSTRING(u,j,k - j)
     not GETL(infixOp,'Led) =>                                     --case 3
@@ -1150,14 +1150,14 @@ checkTransformFirsts(opname,u,margin) ==
         (close := LASSOC(open,$checkPrenAlist)) =>  --have an open bracket
           l := getMatchingRightPren(u,k + 1,open,close)
           if l > MAXINDEX u then l := k - 1
-          STRCONC('"\spad{",SUBSTRING(u,0,l + 1),'"}",SUBSTRING(u,l + 1,nil))
-      STRCONC('"\spad{",SUBSTRING(u,0,k),'"}",SUBSTRING(u,k,nil))
+          strconc('"\spad{",SUBSTRING(u,0,l + 1),'"}",SUBSTRING(u,l + 1,nil))
+      strconc('"\spad{",SUBSTRING(u,0,k),'"}",SUBSTRING(u,k,nil))
     l := checkSkipBlanks(u,k,m) or return u
     n := checkSkipToken(u,l,m) or return u
     namestring ~= PNAME infixOp =>
       checkDocError ['"Improper initial operator in comments: ",infixOp]
       u
-    STRCONC('"\spad{",SUBSTRING(u,0,n),'"}",SUBSTRING(u,n,nil))   --case 5
+    strconc('"\spad{",SUBSTRING(u,0,n),'"}",SUBSTRING(u,n,nil))   --case 5
   true =>          -- not ALPHA_-CHAR_-P u.0 =>
     i := checkSkipToken(u,0,m) or return u
     namestring ~= (firstWord := SUBSTRING(u,0,i)) =>
@@ -1170,12 +1170,12 @@ checkTransformFirsts(opname,u,margin) ==
     u.j = char '_( =>                                            --case 4
       j := getMatchingRightPren(u,j + 1,char '_(,char '_))
       j > m => u
-      STRCONC('"\spad{",SUBSTRING(u,0,j + 1),'"}",SUBSTRING(u,j + 1,nil))
+      strconc('"\spad{",SUBSTRING(u,0,j + 1),'"}",SUBSTRING(u,j + 1,nil))
     k := checkSkipToken(u,j,m) or return u
     namestring ~= (firstWord := SUBSTRING(u,0,i)) =>
       checkDocError ['"Improper first word in comments: ",firstWord]
       u
-    STRCONC('"\spad{",SUBSTRING(u,0,k),'"}",SUBSTRING(u,k,nil))
+    strconc('"\spad{",SUBSTRING(u,0,k),'"}",SUBSTRING(u,k,nil))
 
 getMatchingRightPren(u,j,open,close) ==
   count := 0
@@ -1220,9 +1220,9 @@ checkAlphabetic c ==
 docreport(nam) ==
 --creates a report for person "nam" using file "whofiles"
   removeFile '"docreport.input"
-  runCommand STRCONC('"echo _")bo setOutStream('",STRINGIMAGE nam,'")_" > temp.input")
+  runCommand strconc('"echo _")bo setOutStream('",STRINGIMAGE nam,'")_" > temp.input")
   runCommand '"cat docreport.header temp.input > docreport.input"
-  runCommand STRCONC('"awk '/",STRINGIMAGE nam,'"/ {printf(_")co %s.spad\n_",$2)}' whofiles > temp.input")
+  runCommand strconc('"awk '/",STRINGIMAGE nam,'"/ {printf(_")co %s.spad\n_",$2)}' whofiles > temp.input")
   runCommand '"cat docreport.input temp.input > temp1.input"
   runCommand '"cat temp1.input docreport.trailer > docreport.input"
   removeFile '"temp.input"
@@ -1231,7 +1231,7 @@ docreport(nam) ==
   _/RQ()
 
 setOutStream nam ==
-  filename := STRCONC('"/tmp/",STRINGIMAGE nam,".docreport")
+  filename := strconc('"/tmp/",STRINGIMAGE nam,".docreport")
   $outStream := MAKE_-OUTSTREAM filename
 
 whoOwns(con) ==
@@ -1239,7 +1239,7 @@ whoOwns(con) ==
 --con=constructor name (id beginning with a capital), returns owner as a string
   filename := getConstructorSourceFileFromDB con
   quoteChar := char '_"
-  runCommand STRCONC('"awk '$2 == ",quoteChar,filename,quoteChar,'" {print $1}' whofiles > /tmp/temp")
+  runCommand strconc('"awk '$2 == ",quoteChar,filename,quoteChar,'" {print $1}' whofiles > /tmp/temp")
   instream := MAKE_-INSTREAM '"/tmp/temp"
   value :=
     EOFP instream => nil
diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot
index 9ce5ab3f..bdf55366 100644
--- a/src/interp/c-util.boot
+++ b/src/interp/c-util.boot
@@ -240,7 +240,7 @@ mkErrorExpr level ==
           highlight(b,a) ==
             atom b =>
               substitute(var,b,a) where
-                var:= INTERN STRCONC(STRINGIMAGE $bright,STRINGIMAGE b,STRINGIMAGE $dim)
+                var:= INTERN strconc(STRINGIMAGE $bright,STRINGIMAGE b,STRINGIMAGE $dim)
             highlight1(b,a) where
               highlight1(b,a) ==
                 atom a => a
@@ -704,13 +704,13 @@ flatten(l,key) ==
  
 genDomainVar() ==
   $Index:= $Index+1
-  INTERNL STRCONC("#D",STRINGIMAGE $Index)
+  INTERNL strconc("#D",STRINGIMAGE $Index)
  
 genVariable() ==
-  INTERNL STRCONC("#G",STRINGIMAGE ($genSDVar:= $genSDVar+1))
+  INTERNL strconc("#G",STRINGIMAGE ($genSDVar:= $genSDVar+1))
  
 genSomeVariable() ==
-  INTERNL STRCONC("##",STRINGIMAGE ($genSDVar:= $genSDVar+1))
+  INTERNL strconc("##",STRINGIMAGE ($genSDVar:= $genSDVar+1))
  
 listOfIdentifiersIn x ==
   IDENTP x => [x]
diff --git a/src/interp/clam.boot b/src/interp/clam.boot
index b7449f7c..8fe02a93 100644
--- a/src/interp/clam.boot
+++ b/src/interp/clam.boot
@@ -355,13 +355,13 @@ clearConstructorAndLisplibCaches() ==
 clearCategoryCaches() ==
   for name in allConstructors() repeat
     if getConstructorKindFromDB name = "category" then
-      if BOUNDP(cacheName:= INTERNL STRCONC(PNAME name,'";AL"))
+      if BOUNDP(cacheName:= INTERNL strconc(PNAME name,'";AL"))
             then setDynamicBinding(cacheName,nil)
-    if BOUNDP(cacheName:= INTERNL STRCONC(PNAME name,'";CAT"))
+    if BOUNDP(cacheName:= INTERNL strconc(PNAME name,'";CAT"))
           then setDynamicBinding(cacheName,nil)
  
 clearCategoryCache catName ==
-  cacheName:= INTERNL STRCONC(PNAME catName,'";AL")
+  cacheName:= INTERNL strconc(PNAME catName,'";AL")
   setDynamicBinding(cacheName,nil)
  
 displayHashtable x ==
@@ -707,4 +707,4 @@ domainEqualList(argl1,argl2) ==
 removeAllClams() ==
   for [fun,:.] in $clamList repeat
     sayBrightly ['"Un-clamming function",'%b,fun,'%d]
-    setDynamicBinding(fun,eval INTERN STRCONC(STRINGIMAGE fun,'";"))
+    setDynamicBinding(fun,eval INTERN strconc(STRINGIMAGE fun,'";"))
diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot
index 79735fab..bee89e0c 100644
--- a/src/interp/compiler.boot
+++ b/src/interp/compiler.boot
@@ -259,7 +259,7 @@ applyMapping([op,:argl],m,e,ml) ==
 --   form:=
 --     not MEMQ(op,$formalArgList) and atom op =>
 --       [op',:argl',"$"] where
---         op':= INTERN STRCONC(STRINGIMAGE $prefix,";",STRINGIMAGE op)
+--         op':= INTERN strconc(STRINGIMAGE $prefix,";",STRINGIMAGE op)
 --     ["%Call",["applyFun",op],:argl']
 --   pairlis:= [[v,:a] for a in argl' for v in $FormalMapVariableList]
 --   convert([form,SUBLIS(pairlis,first ml),e],m)
diff --git a/src/interp/define.boot b/src/interp/define.boot
index a7c28738..9c799c1f 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -298,7 +298,7 @@ compDefine1(form,m,e) ==
       $formalArgList)
   null $form => stackAndThrow ['"bad == form ",form]
   newPrefix:=
-    $prefix => INTERN STRCONC(encodeItem $prefix,'",",encodeItem $op)
+    $prefix => INTERN strconc(encodeItem $prefix,'",",encodeItem $op)
     getConstructorAbbreviationFromDB $op
   compDefineCapsuleFunction(form,m,e,newPrefix,$formalArgList)
 
@@ -420,8 +420,8 @@ makeCategoryPredicates(form,u) ==
           pl
  
 mkCategoryPackage(form is [op,:argl],cat,def) ==
-  packageName:= INTERN(STRCONC(PNAME op,'"&"))
-  packageAbb := INTERN(STRCONC(getConstructorAbbreviationFromDB op,'"-"))
+  packageName:= INTERN(strconc(PNAME op,'"&"))
+  packageAbb := INTERN(strconc(getConstructorAbbreviationFromDB op,'"-"))
   $options:local := []
   -- This stops the next line from becoming confused
   abbreviationsSpad2Cmd ['domain,packageAbb,packageName]
@@ -1184,7 +1184,7 @@ compile u ==
              (and/[modeEqual(x,y) for x in sig for y in $signatureOfForm])]
       isLocalFunction op =>
         if opexport then userError ['%b,op,'%d,'" is local and exported"]
-        INTERN STRCONC(encodeItem $prefix,'";",encodeItem op) 
+        INTERN strconc(encodeItem $prefix,'";",encodeItem op) 
       encodeFunctionName(op,$functorForm,$signatureOfForm,";",$suffix)
      where
        isLocalFunction op ==
@@ -1642,7 +1642,7 @@ DomainSubstitutionFunction(parameters,body) ==
   atom $definition => body
   null rest $definition => body 
            --should not bother if it will only be called once
-  name:= INTERN STRCONC(KAR $definition,";CAT")
+  name:= INTERN strconc(KAR $definition,";CAT")
   SETANDFILE(name,nil)
   body:= ["COND",[name],['(QUOTE T),['SETQ,name,body]]]
   body
diff --git a/src/interp/format.boot b/src/interp/format.boot
index 4dce8583..784562d7 100644
--- a/src/interp/format.boot
+++ b/src/interp/format.boot
@@ -52,7 +52,7 @@ sayModemap m ==
 
 sayModemapWithNumber(m,n) ==
   msg := reverse cleanUpSegmentedMsg reverse ["%i","%i",'" ",
-    STRCONC(lbrkSch(),object2String n,rbrkSch()),
+    strconc(lbrkSch(),object2String n,rbrkSch()),
       :formatModemap displayTranModemap m,"%u","%u"]
   sayMSG flowSegmentedMsg(reverse msg,$LINELENGTH,3)
 
@@ -542,13 +542,13 @@ tuple2String argl ==
   null argl => nil
   string := first argl
   if member(string, '("failed" "nil" "prime" "sqfr" "irred"))
-    then string := STRCONC('"_"",string,'"_"")
+    then string := strconc('"_"",string,'"_"")
     else string :=
       atom string => object2String string
       [f x for x in string]
   for x in rest argl repeat
     if member(x,'("failed" "nil" "prime" "sqfr" "irred")) then
-      x := STRCONC('"_"",x,'"_"")
+      x := strconc('"_"",x,'"_"")
     string:= concat(string,concat(",",f x))
   string
  where
@@ -734,7 +734,7 @@ object2String x ==
   string? x => x
   IDENTP x  => PNAME x
   null x    => '""
-  cons?  x  => STRCONC(object2String first x, object2String rest x)
+  cons?  x  => strconc(object2String first x, object2String rest x)
   WRITE_-TO_-STRING x
 
 object2Identifier x ==
diff --git a/src/interp/fortcall.boot b/src/interp/fortcall.boot
index b464093f..9ac32be6 100644
--- a/src/interp/fortcall.boot
+++ b/src/interp/fortcall.boot
@@ -70,7 +70,7 @@ makeFort1(name,args,userArgs,dummies,decls,results,returnType,aspInfo) ==
   arrayArgs := [u for u in args | not member(u,scalarArgs)]
   orderedArgs := [:scalarArgs,:arrayArgs]
   file := if $fortranDirectory then
-    STRCONC($fortranDirectory,"/",STRINGIMAGE name)
+    strconc($fortranDirectory,"/",STRINGIMAGE name)
   else
     STRINGIMAGE name
   makeFortranFun(name,orderedArgs,args,dummies,decls,results,file,
@@ -82,11 +82,11 @@ makeFort1(name,args,userArgs,dummies,decls,results,returnType,aspInfo) ==
 makeFortranFun(name,args,fortranArgs,dummies,decls,results,file,dir,
                returnType,asps) ==
   -- Create a C file to call the library function, and compile it.
-  fp := MAKE_-OUTSTREAM(STRCONC(file,".c"))
+  fp := MAKE_-OUTSTREAM(strconc(file,".c"))
   writeCFile(name,args,fortranArgs,dummies,decls,results,returnType,asps,fp)
   if null dir then dir := '"."
-  asps => SYSTEM STRCONC("cc -c ",file,".c ; mv ",file,".o ",dir)
-  SYSTEM STRCONC("cc ",file,".c -o ",file,".spadexe ",$fortranLibraries)
+  asps => SYSTEM strconc("cc -c ",file,".c ; mv ",file,".o ",dir)
+  SYSTEM strconc("cc ",file,".c -o ",file,".spadexe ",$fortranLibraries)
 
 writeCFile(name,args,fortranArgs,dummies,decls,results,returnType,asps,fp) ==
   WRITE_-LINE('"#include <stdio.h>",fp)
@@ -102,12 +102,12 @@ writeCFile(name,args,fortranArgs,dummies,decls,results,returnType,asps,fp) ==
   WRITE_-LINE('"  XDR xdrs;",fp)
   WRITE_-LINE('"  {",fp)
   if $addUnderscoreToFortranNames then
-    routineName := STRCONC(name,STRING CODE_-CHAR 95)
+    routineName := strconc(name,STRING CODE_-CHAR 95)
   else
     routineName := name
   -- If it is a function then give it somewhere to stick its result:
   if returnType then
-    returnName := INTERN STRCONC(name,"__result")
+    returnName := INTERN strconc(name,"__result")
     wl(['"    ",getCType returnType,'" ",returnName,'",",routineName,'"();"],fp)
   -- print out type declarations for the Fortran parameters, and build an
   -- ordered list of pairs [<parameter> , <type>]
@@ -301,27 +301,27 @@ makeSpadFun(name,userArgs,args,dummies,decls,results,returnType,asps,aspInfo,
 
   -- To make sure the spad interpreter isn't confused:
   if returnType then
-    returnName := INTERN STRCONC(name,"Result")
+    returnName := INTERN strconc(name,"Result")
     decls := [[returnType,returnName], :decls]
     results := [returnName, :results]
-  argNames := [INTERN STRCONC(STRINGIMAGE(u),'"__arg") for u in userArgs]
+  argNames := [INTERN strconc(STRINGIMAGE(u),'"__arg") for u in userArgs]
   aType := [axiomType(a,decls,asps,aspInfo) for a in userArgs]
   aspTypes := [SECOND NTH(POSITION(u,userArgs),aType) for u in asps]
   nilLst := MAKE_-LIST(#args+1)
   decPar := [["$elt","Lisp","construct"],:makeLispList decls]
-  fargNames := [INTERN STRCONC(STRINGIMAGE(u),'"__arg") for u in args |
+  fargNames := [INTERN strconc(STRINGIMAGE(u),'"__arg") for u in args |
                  not (MEMQ(u,dummies) or MEMQ(u,asps)) ]
   for u in asps repeat
-    fargNames := delete(INTERN STRCONC(STRINGIMAGE(u),'"__arg"),fargNames)
+    fargNames := delete(INTERN strconc(STRINGIMAGE(u),'"__arg"),fargNames)
   resPar := ["construct",["@",["construct",:fargNames],_
              ["List",["Any"]]]]
-  call := [["$elt","Lisp","invokeFortran"],STRCONC(file,".spadexe"),_
+  call := [["$elt","Lisp","invokeFortran"],strconc(file,".spadexe"),_
            [["$elt","Lisp","construct"],:mkQuote args],_
            [["$elt","Lisp","construct"],:mkQuote union(asps,dummies)], decPar,_
            [["$elt","Lisp","construct"],:mkQuote results],resPar]
   if asps then
     -- Make a unique(ish) id for asp files
-    aspId := STRCONC(getEnv('"SPADNUM"), GENSYM('"NAG"))
+    aspId := strconc(getEnv('"SPADNUM"), GENSYM('"NAG"))
     body := ["SEQ",:makeAspGenerators(asps,aspTypes,aspId),_
              makeCompilation(asps,file,aspId),_
              ["pretend",call,fType] ]
@@ -363,8 +363,8 @@ makeAspGenerators(asps,types,aspId) ==
 
 makeAspGenerators1(asp,type,aspId) ==
   [[["$elt","FOP","pushFortranOutputStack"] ,_
-    ["filename",'"",STRCONC(STRINGIMAGE asp,aspId),'"f"]] , _
-   makeOutputAsFortran INTERN STRCONC(STRINGIMAGE(asp),'"__arg"), _
+    ["filename",'"",strconc(STRINGIMAGE asp,aspId),'"f"]] , _
+   makeOutputAsFortran INTERN strconc(STRINGIMAGE(asp),'"__arg"), _
    [["$elt","FOP","popFortranOutputStack"]]   _
   ]
 
@@ -374,20 +374,20 @@ makeOutputAsFortran arg ==
 
 makeCompilation(asps,file,aspId) ==
   [["$elt","Lisp","compileAndLink"],_
-   ["construct",:[STRCONC(STRINGIMAGE a,aspId,'".f") for a in asps]], _
+   ["construct",:[strconc(STRINGIMAGE a,aspId,'".f") for a in asps]], _
    $fortranCompilerName,_
-   STRCONC(file,'".o"),_
-   STRCONC(file,'".spadexe"),_
+   strconc(file,'".o"),_
+   strconc(file,'".spadexe"),_
    $fortranLibraries]
 
 
 compileAndLink(fortFileList,fortCompiler,cFile,outFile,linkerArgs) ==
-  SYSTEM STRCONC (fortCompiler, addSpaces fortFileList,_
+  SYSTEM strconc (fortCompiler, addSpaces fortFileList,_
                   cFile, " -o ",outFile," ",linkerArgs)
 
 addSpaces(stringList) ==
   l := " "
-  for s in stringList repeat l := STRCONC(l,s," ")
+  for s in stringList repeat l := strconc(l,s," ")
   l
 
 complexRows z ==
@@ -672,16 +672,16 @@ readData(tmpFile,results) ==
   SHUT(str)
   results
 
-generateDataName()==STRCONC($fortranTmpDir,getEnv('"HOST"),
+generateDataName()==strconc($fortranTmpDir,getEnv('"HOST"),
     getEnv('"SPADNUM"), GENSYM('"NAG"),'"data")
-generateResultsName()==STRCONC($fortranTmpDir,getEnv('"HOST"),
+generateResultsName()==strconc($fortranTmpDir,getEnv('"HOST"),
     getEnv('"SPADNUM"), GENSYM('"NAG"),'"results")
 
 
 fortCall(objFile,data,results) ==
   tmpFile1 := writeData(generateDataName(),data)
   tmpFile2 := generateResultsName()
-  SYSTEM STRCONC(objFile," < ",tmpFile1," > ",tmpFile2)
+  SYSTEM strconc(objFile," < ",tmpFile1," > ",tmpFile2)
   results := readData(tmpFile2,results)
   removeFile tmpFile1
   removeFile tmpFile2
@@ -694,7 +694,7 @@ invokeNagman(objFiles,nfile,args,dummies,decls,results,actual) ==
                  prepareResults(results,args,dummies,actual,decls)),_
                  results,decls,inFirstNotSecond(args,dummies),actual)
   -- Tidy up asps
-  -- if objFiles then SYSTEM STRCONC("rm -f ",addSpaces objFiles)
+  -- if objFiles then SYSTEM strconc("rm -f ",addSpaces objFiles)
   for fn in objFiles repeat removeFile fn
   result
 
@@ -704,7 +704,7 @@ nagCall(objFiles,nfile,data,results,tmpFiled,tmpFiler) ==
      $nagMessages => '"on"
      '"off"
   writeData(tmpFiled,data)
-  toSend:=STRCONC($nagHost," ",nfile," ",tmpFiler," ",tmpFiled," ",_
+  toSend:=strconc($nagHost," ",nfile," ",tmpFiler," ",tmpFiled," ",_
       STRINGIMAGE($fortPersistence)," ", nagMessagesString," ",addSpaces objFiles)
   sockSendString(8,toSend)
   if sockGetInt(8)=1 then
diff --git a/src/interp/functor.boot b/src/interp/functor.boot
index a317a844..72585c6e 100644
--- a/src/interp/functor.boot
+++ b/src/interp/functor.boot
@@ -76,7 +76,7 @@ DomainPrint1(D,brief,$e) ==
              --if we were passed a vector, go to the domain
   Sublis:=
     [:
-      [[rest u,:INTERNL STRCONC('"View",STRINGIMAGE i)]
+      [[rest u,:INTERNL strconc('"View",STRINGIMAGE i)]
         for u in D for i in 1..],:$Sublis]
   for u in D for i in 1.. repeat
     brief and i>1 => nil
@@ -118,7 +118,7 @@ DomainPrint1(D,brief,$e) ==
     if brief then PRETTYPRINT uu.0 else PRETTYPRINT uu
  
 DPname() ==
-  name:= INTERNL STRCONC('"Where",STRINGIMAGE $WhereCounter)
+  name:= INTERNL strconc('"Where",STRINGIMAGE $WhereCounter)
   $WhereCounter:= $WhereCounter+1
   name
  
@@ -928,7 +928,7 @@ encodeFunctionName(fun,package is [packageName,:arglist],signature,sep,count)
       ("STRCONC"/[encodedPair for [n,:x] in reducedSig]) where
         encodedPair() ==
           n=1 => encodeItem x
-          STRCONC(STRINGIMAGE n,encodeItem x)
+          strconc(STRINGIMAGE n,encodeItem x)
     encodedName:= INTERNL(getConstructorAbbreviationFromDB packageName,";",
         encodeItem fun,";",encodedSig, sep,STRINGIMAGE count)
     if $LISPLIB then
@@ -1007,6 +1007,6 @@ alistSize c ==
  
 addSuffix(n,u) ==
   ALPHA_-CHAR_-P((s:= STRINGIMAGE u).(MAXINDEX s)) => 
-    INTERN STRCONC(s,STRINGIMAGE n)
-  INTERNL STRCONC(s,STRINGIMAGE ";",STRINGIMAGE n)
+    INTERN strconc(s,STRINGIMAGE n)
+  INTERNL strconc(s,STRINGIMAGE ";",STRINGIMAGE n)
  
diff --git a/src/interp/g-boot.boot b/src/interp/g-boot.boot
index f7e81cf1..fe3fe608 100644
--- a/src/interp/g-boot.boot
+++ b/src/interp/g-boot.boot
@@ -267,7 +267,7 @@ defLET1(lhs,rhs) ==
     l2 is ["PROGN",:.] => MKPROGN [l1,:rest l2]
     if IDENTP first l2 then l2 := [l2,:nil]
     MKPROGN [l1,:l2,name]
-  g := INTERN STRCONC('"LETTMP#",STRINGIMAGE $letGenVarCounter)
+  g := INTERN strconc('"LETTMP#",STRINGIMAGE $letGenVarCounter)
   $letGenVarCounter := $letGenVarCounter + 1
   rhs' := [$LET,g,rhs]
   let' := defLET1(lhs,g)
@@ -299,7 +299,7 @@ defLET2(lhs,rhs) ==
   lhs is ['APPEND,var1,var2] =>
     patrev := defISReverse(var2,var1)
     rev := ['REVERSE,rhs]
-    g := INTERN STRCONC('"LETTMP#",STRINGIMAGE $letGenVarCounter)
+    g := INTERN strconc('"LETTMP#",STRINGIMAGE $letGenVarCounter)
     $letGenVarCounter := $letGenVarCounter + 1
     l2 := defLET2(patrev,g)
     if cons? l2 and atom first l2 then l2 := [l2,:nil]
@@ -369,7 +369,7 @@ defIS1(lhs,rhs) ==
   rhs is ['EQUAL,a] =>
     ['EQUAL,lhs,a]
   cons? lhs =>
-    g := INTERN STRCONC('"ISTMP#",STRINGIMAGE $isGenVarCounter)
+    g := INTERN strconc('"ISTMP#",STRINGIMAGE $isGenVarCounter)
     $isGenVarCounter := $isGenVarCounter + 1
     MKPROGN [[$LET,g,lhs],defIS1(g,rhs)]
   rhs is ['CONS,a,b] =>
@@ -392,7 +392,7 @@ defIS1(lhs,rhs) ==
     ['AND,['CONSP,lhs],a1,b1]
   rhs is ['APPEND,a,b] =>
     patrev := defISReverse(b,a)
-    g := INTERN STRCONC('"ISTMP#",STRINGIMAGE $isGenVarCounter)
+    g := INTERN strconc('"ISTMP#",STRINGIMAGE $isGenVarCounter)
     $isGenVarCounter := $isGenVarCounter + 1
     rev := ['AND,['CONSP,lhs],['PROGN,[$LET,g,['REVERSE,lhs]],''T]]
     l2 := defIS1(g,patrev)
diff --git a/src/interp/g-error.boot b/src/interp/g-error.boot
index 6828e1ff..30d55035 100644
--- a/src/interp/g-error.boot
+++ b/src/interp/g-error.boot
@@ -58,7 +58,7 @@ $ReadingFile := false
 -- REDERR msg == error msg
 
 -- BFLERRMSG func ==
---  errorSupervisor($AlgebraError,STRCONC(
+--  errorSupervisor($AlgebraError,strconc(
 --    '"BigFloat: invalid argument to ",func))
 
 argumentDataError(argnum, condit, funname) ==
diff --git a/src/interp/g-opt.boot b/src/interp/g-opt.boot
index 95210266..00b6e5a4 100644
--- a/src/interp/g-opt.boot
+++ b/src/interp/g-opt.boot
@@ -365,10 +365,10 @@ optRECORDCOPY ["RECORDCOPY",name,len] ==
  
 --mkRecordAccessFunction(ind,len) ==
 --  stringOfDs:= $EmptyString
---  for i in 0..(ind-1) do stringOfDs:= STRCONC(stringOfDs,PNAME "D")
+--  for i in 0..(ind-1) do stringOfDs:= strconc(stringOfDs,PNAME "D")
 --  prefix:= if ind=len-1 then PNAME "C" else PNAME "CA"
---  if $QuickCode then prefix:=STRCONC("Q",prefix)
---  INTERN(STRCONC(prefix,stringOfDs,PNAME "R"))
+--  if $QuickCode then prefix:=strconc("Q",prefix)
+--  INTERN(strconc(prefix,stringOfDs,PNAME "R"))
  
 optSuchthat [.,:u] == ["SUCHTHAT",:u]
  
diff --git a/src/interp/g-timer.boot b/src/interp/g-timer.boot
index 025f1050..49f73575 100644
--- a/src/interp/g-timer.boot
+++ b/src/interp/g-timer.boot
@@ -90,9 +90,9 @@ makeLongStatStringByProperty _
       total := total + n
       timestr := normalizeStatAndStringify n
       str := makeStatString(str,timestr,ab,flag)
-  total := STRCONC(normalizeStatAndStringify total,'" ", units)
+  total := strconc(normalizeStatAndStringify total,'" ", units)
   str = '"" =>  total
-  STRCONC(str, '" = ", total)
+  strconc(str, '" = ", total)
  
 normalizeStatAndStringify t ==
   RNUMP t =>
@@ -119,8 +119,8 @@ roundStat t ==
 makeStatString(oldstr,time,abb,flag) ==
   time = '"" => oldstr
   opening := (flag = 'long => '"("; '" (")
-  oldstr = '"" => STRCONC(time,opening,abb,'")")
-  STRCONC(oldstr,'" + ",time,opening,abb,'")")
+  oldstr = '"" => strconc(time,opening,abb,'")")
+  strconc(oldstr,'" + ",time,opening,abb,'")")
  
 peekTimedName() == IFCAR $timedNameStack
  
diff --git a/src/interp/g-util.boot b/src/interp/g-util.boot
index 4495805f..89254289 100644
--- a/src/interp/g-util.boot
+++ b/src/interp/g-util.boot
@@ -421,9 +421,9 @@ centerString(text,width,fillchar) ==
   f := DIVIDE(width - wid,2)
   fill1 := ""
   for i in 1..(f.0) repeat
-    fill1 := STRCONC(fillchar,fill1)
+    fill1 := strconc(fillchar,fill1)
   fill2:= fill1
-  if f.1 ~= 0 then fill1 := STRCONC(fillchar,fill1)
+  if f.1 ~= 0 then fill1 := strconc(fillchar,fill1)
   [fill1,text,fill2]
 
 stringPrefix?(pref,str) ==
@@ -541,7 +541,7 @@ isLetter c ==
 
 update() ==
   runCommand
-    STRCONC(textEditor(), '" ",STRINGIMAGE _/VERSION,'" ",STRINGIMAGE _/WSNAME,'" A")
+    strconc(textEditor(), '" ",STRINGIMAGE _/VERSION,'" ",STRINGIMAGE _/WSNAME,'" A")
   _/UPDATE()
 
 --% Inplace Merge Sort for Lists
diff --git a/src/interp/ht-root.boot b/src/interp/ht-root.boot
index 3f3f5c85..4933bcd8 100644
--- a/src/interp/ht-root.boot
+++ b/src/interp/ht-root.boot
@@ -51,7 +51,7 @@ downlinkSaturn fn ==
     n := MAXINDEX line
     n < 1 => nil
     line.0 = (char '_%) => nil
-    lines := STRCONC(lines,line)
+    lines := strconc(lines,line)
   issueHTSaturn lines
 
 dbNonEmptyPattern pattern ==
@@ -146,7 +146,7 @@ htGlossPage(htPage,pattern,tryAgain?) ==
   grepForm := mkGrepPattern(filter,'none)
   $key: local := 'none
   results := applyGrep(grepForm,'gloss)
-  defstream := MAKE_-INSTREAM STRCONC(systemRootDirectory(),'"doc/glossdef.text")
+  defstream := MAKE_-INSTREAM strconc(systemRootDirectory(),'"doc/glossdef.text")
   lines := gatherGlossLines(results,defstream)
   -- removeFile pathname 
   --SHUT instream
@@ -191,7 +191,7 @@ gatherGlossLines(results,defstream) ==
       (j := charPosition($tick,x,1)) and (nextPointer := SUBSTRING(x,0,j))
         and (nextPointer = pointer) repeat
           xtralines := [SUBSTRING(x,j + 1,nil),:xtralines]
-    acc := [STRCONC(keyAndTick,def, "STRCONC"/nreverse xtralines),:acc]
+    acc := [strconc(keyAndTick,def, "STRCONC"/nreverse xtralines),:acc]
   reverse acc
 
 htGlossSearch(htPage,junk) ==  htGloss htpLabelInputString(htPage,'filter)
@@ -268,7 +268,7 @@ htTutorialSearch pattern ==
   s := mkUnixPattern s
   source := '"$AXIOM/share/hypertex/pages/ht.db"
   target :='"/tmp/temp.text.$SPADNUM"
-  runCommand STRCONC('"$AXIOM/lib/hthits",'" _"",s,'"_" ",source,'" > ",target)
+  runCommand strconc('"$AXIOM/lib/hthits",'" _"",s,'"_" ",source,'" > ",target)
   lines := dbReadLines 'temp
   htInitPageNoScroll(nil,['"Tutorial Pages mentioning {\em ",pattern,'"}"])
   htSay('"\beginscroll\table{")
@@ -282,10 +282,10 @@ mkUnixPattern s ==
   u := mkUpDownPattern s
   starPositions := reverse [i for i in 1..(-1 + MAXINDEX u) | u.i = $wild]
   for i in starPositions repeat
-    u := STRCONC(SUBSTRING(u,0,i),'".*",SUBSTRING(u,i + 1,nil))
-  if u.0 ~= $wild then u := STRCONC('"[^a-zA-Z]",u)
+    u := strconc(SUBSTRING(u,0,i),'".*",SUBSTRING(u,i + 1,nil))
+  if u.0 ~= $wild then u := strconc('"[^a-zA-Z]",u)
                   else u := SUBSTRING(u,1,nil)
-  if u.(k := MAXINDEX u) ~= $wild then u := STRCONC(u,'"[^a-zA-Z]")
+  if u.(k := MAXINDEX u) ~= $wild then u := strconc(u,'"[^a-zA-Z]")
                                   else u := SUBSTRING(u,0,k)
   u
 
diff --git a/src/interp/ht-util.boot b/src/interp/ht-util.boot
index 000dedfa..a0ea710e 100644
--- a/src/interp/ht-util.boot
+++ b/src/interp/ht-util.boot
@@ -138,7 +138,7 @@ replacePercentByDollar s == fn(s,0,MAXINDEX s) where
   fn(s,i,n) ==
     i > n => '""
     (m := charPosition(char "%",s,i)) > n => SUBSTRING(s,i,nil)
-    STRCONC(SUBSTRING(s,i,m - i),'"$",fn(s,m + 1,n))
+    strconc(SUBSTRING(s,i,m - i),'"$",fn(s,m + 1,n))
 
 htpSetLabelInputString(htPage, label, val) ==
 -- value user typed as input string on page
diff --git a/src/interp/htsetvar.boot b/src/interp/htsetvar.boot
index 9cf6a8e8..29fe5431 100644
--- a/src/interp/htsetvar.boot
+++ b/src/interp/htsetvar.boot
@@ -63,7 +63,7 @@ htShowSetTree(setTree) ==
   htSay('"\tab{2}\newline Variable\tab{",STRINGIMAGE (maxWidth1 + QUOTIENT(maxWidth2,3)),'"}Description\tab{",STRINGIMAGE(maxWidth2 + maxWidth1 + 2),'"}Value\newline\beginitems ")
   for setData in reverse okList repeat
       htSay '"\item"
-      label := STRCONC('"\menuitemstyle{",setData.setName,'"}")
+      label := strconc('"\menuitemstyle{",setData.setName,'"}")
       links := [label,[['text,'"\tab{",tabset1,'"}",setData.setLabel,'"\tab{",tabset2,'"}{\em ",htShowSetTreeValue setData,'"}"]],
                 'htShowSetPage, setData.setName]
       htMakePage [['bcLispLinks, links,'options,'(indent . 0)]]
@@ -92,11 +92,11 @@ htShowSetTreeValue(setData) ==
   st = 'TREE     => '"..."
   systemError()
 
-mkSetTitle() == STRCONC('"Command {\em )set ",listOfStrings2String $path,'"}")
+mkSetTitle() == strconc('"Command {\em )set ",listOfStrings2String $path,'"}")
 
 listOfStrings2String u ==
   null u => '""
-  STRCONC(listOfStrings2String rest u,'" ",stringize first u)
+  strconc(listOfStrings2String rest u,'" ",stringize first u)
 
 htShowSetPage(htPage, branch) ==
   setTree := htpProperty(htPage, 'setTree)
@@ -125,7 +125,7 @@ htSetLiterals(htPage,name,message,variable,values,functionToCall) ==
   bcHt ['"\centerline{Set {\em ", name, '"}}\newline"]
   bcHt ['"{\em Description: } ", message, '"\newline\vspace{1} "]
   bcHt '"Select one of the following: \newline\tab{3} "
-  links := [[STRCONC('"",STRINGIMAGE opt), '"\newline\tab{3}", functionToCall, opt] for opt in values]
+  links := [[strconc('"",STRINGIMAGE opt), '"\newline\tab{3}", functionToCall, opt] for opt in values]
   htMakePage [['bcLispLinks, :links]]
   bcHt ["\indent{0}\newline\vspace{1} The current setting is: {\em ",
         translateTrueFalse2YesNo EVAL variable, '"} "]
@@ -238,7 +238,7 @@ htSetFunCommandContinue(htPage,value) ==
 
 htKill(htPage,value) ==
   htInitPage('"System Command", nil)
-  string := STRCONC('"{\em )set ",listOfStrings2String [value,:$path],'"}")
+  string := strconc('"{\em )set ",listOfStrings2String [value,:$path],'"}")
   htMakePage [
      '(text
         "{Here is the AXIOM system command you could have issued:}"
@@ -253,7 +253,7 @@ htKill(htPage,value) ==
 htSetNotAvailable(htPage,whatToType) ==
   page := htInitPage('"Unavailable Set Command", htpPropertyList htPage)
   htInitPage('"Unavailable System Command", nil)
-  string := STRCONC('"{\em ",whatToType,'"}")
+  string := strconc('"{\em ",whatToType,'"}")
   htMakePage [
      '(text "\vspace{1}\newline"
         "{Sorry, but this system command is not available through HyperDoc. Please directly issue this command in an AXIOM window for more information:}"
@@ -290,8 +290,8 @@ htCheckList(checker,value) ==
       n
   value in checker => value
   first checker
---  emlist := "STRCONC"/[STRCONC('" {\em ",PNAME x,'"} ") for x in checker]
---  STRCONC('"Please enter one of: ",emlist)
+--  emlist := "STRCONC"/[strconc('" {\em ",PNAME x,'"} ") for x in checker]
+--  strconc('"Please enter one of: ",emlist)
 
 translateYesNoToTrueFalse x ==
   x = 'yes => true
@@ -323,8 +323,8 @@ chkRange s ==
     and u >= $htInitial and (null $htFinal or u <= $htFinal)
       => u
   null $htFinal =>
-    STRCONC('"Please enter an integer greater than ",stringize ($htInitial - 1))
-  STRCONC('"Please enter an integer between ",stringize $htInitial,'" and ",
+    strconc('"Please enter an integer greater than ",stringize ($htInitial - 1))
+  strconc('"Please enter an integer between ",stringize $htInitial,'" and ",
             stringize $htFinal)
 
 chkAllNonNegativeInteger s ==
@@ -337,7 +337,7 @@ htMakePathKey path ==
   INTERN fn(PNAME first path,rest path) where
     fn(a,b) ==
       null b => a
-      fn(STRCONC(a,'".",PNAME first b),rest b)
+      fn(strconc(a,'".",PNAME first b),rest b)
 
 htMarkTree(tree,n) ==
   LASTTAIL(tree).rest := n
@@ -417,12 +417,12 @@ htCacheAddChoice htPage ==
       "For each function name, enter {\em all} or a positive integer:"))
   for i in 1.. for name in names repeat htMakePage [
       ['inputStrings,
-        [STRCONC('"Function {\em ",name,'"} will cache"),
+        [strconc('"Function {\em ",name,'"} will cache"),
           '"values",5,10,htMakeLabel('"c",i),'ALLPI]]]
   htSetvarDoneButton('"Select to Set Values",'htCacheSet)
   htShowPage()
 
-htMakeLabel(prefix,i) == INTERN STRCONC(prefix,stringize i)
+htMakeLabel(prefix,i) == INTERN strconc(prefix,stringize i)
 
 htCacheSet htPage ==
   names := htpProperty(htPage,'names)
@@ -455,7 +455,7 @@ htCacheSet htPage ==
 htAllOrNum val == bcHt
   val = 'all => '"{\em all"
   val = 0 => '"{\em no"
-  STRCONC('"the last {\em ",stringize val)
+  strconc('"the last {\em ",stringize val)
 
 htCacheOne names ==
   page := htInitPage(mkSetTitle(),nil)
diff --git a/src/interp/i-coerce.boot b/src/interp/i-coerce.boot
index c1f8ef61..a5842d89 100644
--- a/src/interp/i-coerce.boot
+++ b/src/interp/i-coerce.boot
@@ -269,7 +269,7 @@ coerceRetract(object,t2) ==
   (c := retractByFunction(object, t2)) => c
   t1 is [D,:.] =>
     fun := GETL(D,'retract) or
-           INTERN STRCONC('"retract",STRINGIMAGE D)
+           INTERN strconc('"retract",STRINGIMAGE D)
     functionp fun =>
       PUT(D,'retract,fun)
       c := CATCH('coerceFailure,FUNCALL(fun,object,t2))
@@ -1167,7 +1167,7 @@ coerceIntCommute(obj,target) ==
 
   source is [D,:.] =>
     fun := GETL(D,'coerceCommute) or
-           INTERN STRCONC('"commute",STRINGIMAGE D)
+           INTERN strconc('"commute",STRINGIMAGE D)
     functionp fun =>
       PUT(D,'coerceCommute,fun)
       u := objValUnwrap obj
diff --git a/src/interp/i-funsel.boot b/src/interp/i-funsel.boot
index faac9233..c7c9c11a 100644
--- a/src/interp/i-funsel.boot
+++ b/src/interp/i-funsel.boot
@@ -1703,8 +1703,8 @@ printMms(mmS) ==
   -- mmS a list of modemap signatures
   sayMSG '" "
   for [sig,imp,.] in mmS for i in 1.. repeat
-    istr := STRCONC('"[",STRINGIMAGE i,'"]")
-    if QCSIZE(istr) = 3 then istr := STRCONC(istr,'" ")
+    istr := strconc('"[",STRINGIMAGE i,'"]")
+    if QCSIZE(istr) = 3 then istr := strconc(istr,'" ")
     sayMSG [:bright istr,'"signature:   ",:formatSignature rest sig]
     first sig='local =>
       sayMSG ['"      implemented: local function ",imp]
diff --git a/src/interp/i-map.boot b/src/interp/i-map.boot
index a5ccd815..a93883cd 100644
--- a/src/interp/i-map.boot
+++ b/src/interp/i-map.boot
@@ -67,8 +67,8 @@ isInternalMapName name ==
 
 makeInternalMapMinivectorName(name) ==
   string? name =>
-    INTERN STRCONC(name,'";MV")
-  INTERN STRCONC(PNAME name,'";MV")
+    INTERN strconc(name,'";MV")
+  INTERN strconc(PNAME name,'";MV")
 
 mkCacheName(name) == INTERNL(STRINGIMAGE name,'";AL")
 
@@ -472,7 +472,7 @@ getEqualSublis pred == fn(pred,nil) where fn(x,sl) ==
 --% User function analysis
 
 mapCatchName mapname ==
-   INTERN STRCONC('"$",STRINGIMAGE mapname,'"CatchMapIdentifier$")
+   INTERN strconc('"$",STRINGIMAGE mapname,'"CatchMapIdentifier$")
 
 analyzeMap(op,argTypes,mapDef, tar) ==
   -- Top level enty point for map type analysis.  Sets up catch point
@@ -713,7 +713,7 @@ genMapCode(op,body,sig,fnName,parms,isRecursive) ==
   if lmm:= get(op,'localModemap,$InteractiveFrame) then
     untraceMapSubNames [CADAR lmm]
   op0 :=
-    ( n := isSharpVarWithNum op ) => STRCONC('"<argument ",object2String n,'">")
+    ( n := isSharpVarWithNum op ) => strconc('"<argument ",object2String n,'">")
     op
   if $verbose then
     if get(op,'isInterpreterRule,$e) then
diff --git a/src/interp/i-object.boot b/src/interp/i-object.boot
index 56a09579..460b76c4 100644
--- a/src/interp/i-object.boot
+++ b/src/interp/i-object.boot
@@ -426,7 +426,7 @@ srcPosColumn(sp) ==
 
 srcPosDisplay(sp) ==
   null sp => nil
-  s := STRCONC('"_"", srcPosFile sp, '"_", line ",
+  s := strconc('"_"", srcPosFile sp, '"_", line ",
       STRINGIMAGE srcPosLine sp, '": ")
   sayBrightly [s, srcPosSource sp]
   col  := srcPosColumn sp
diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot
index 67fde10e..80f8c09c 100644
--- a/src/interp/i-output.boot
+++ b/src/interp/i-output.boot
@@ -398,7 +398,7 @@ isBinaryInfix x ==
   member(x, '(_= _+ _- _* _/ _*_* _^ "=" "+" "-" "*" "/" "**" "^"))
 
 stringApp([.,u],x,y,d) ==
-  appChar(STRCONC($DoubleQuote,atom2String u,$DoubleQuote),x,y,d)
+  appChar(strconc($DoubleQuote,atom2String u,$DoubleQuote),x,y,d)
 
 stringWidth u ==
   u is [.,u] or THROW('outputFailure,'outputFailure)
@@ -482,7 +482,7 @@ sayMath u ==
 
 outputTran x ==
   member(x,'("failed" "nil" "prime" "sqfr" "irred")) =>
-    STRCONC('"_"",x,'"_"")
+    strconc('"_"",x,'"_"")
   string? x => x
   VECP x =>
     outputTran ['BRACKET,['AGGLST,:[x.i for i in 0..MAXINDEX x]]]
@@ -1178,7 +1178,7 @@ maprinRows matrixList ==
     for [name,:m] in y for n in 0.. repeat
       if not $collectOutput then TERPRI($algebraOutputStream)
       andWhere := (name = firstName => '"where "; '"and ")
-      line := STRCONC(andWhere, PNAME name)
+      line := strconc(andWhere, PNAME name)
       maprinChk ["=",line,m]
       -- note that this could place a new element on $MatrixList, hence the loop
 
@@ -1645,7 +1645,7 @@ outputOp x ==
     n:=
       GETL(op,"NARY") => 2
       #args
-    newop:= INTERN STRCONC("*",STRINGIMAGE n,PNAME op)
+    newop:= INTERN strconc("*",STRINGIMAGE n,PNAME op)
     [newop,:[outputOp y for y in args]]
   x
 
@@ -2350,11 +2350,11 @@ bracketagglist(u, start, linelength, tchr, open, close) ==
 prnd(start, op) ==
 -->
   $testOutputLineFlag =>
-    string := STRCONC(fillerSpaces MAX(0,start - 1),op)
+    string := strconc(fillerSpaces MAX(0,start - 1),op)
     $testOutputLineList := [string,:$testOutputLineList]
   PRINTEXP(fillerSpaces MAX(0,start - 1),$algebraOutputStream)
   $collectOutput =>
-    string := STRCONC(fillerSpaces MAX(0,start - 1),op)
+    string := strconc(fillerSpaces MAX(0,start - 1),op)
     $outputLines := [string, :$outputLines]
   PRINTEXP(op,$algebraOutputStream)
   TERPRI $algebraOutputStream
diff --git a/src/interp/i-spec1.boot b/src/interp/i-spec1.boot
index 371d2fc2..88a7675b 100644
--- a/src/interp/i-spec1.boot
+++ b/src/interp/i-spec1.boot
@@ -223,7 +223,7 @@ upAlgExtension t ==
   null (canonicalAE:= coerceInteractive(T,pd)) =>
     throwKeyedMsgCannotCoerceWithValue(objVal T,objMode T,pd)
   sae:= ['SimpleAlgebraicExtension,field,pd,objValUnwrap canonicalAE]
-  saeTypeSynonym := INTERN STRCONC('"SAE",STRINGIMAGE a)
+  saeTypeSynonym := INTERN strconc('"SAE",STRINGIMAGE a)
   saeTypeSynonymValue := objNew(sae,'(Domain))
   fun := getFunctionFromDomain('generator,sae,NIL)
   expr:= wrap SPADCALL(fun)
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index bb0833ba..e251c5e4 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -560,14 +560,14 @@ compileAsharpCmd1 args ==
         fullopt = 'library   => doLibrary  := true
         fullopt = 'nolibrary => doLibrary  := false
 
-        throwKeyedMsg("S2IZ0036",[STRCONC('")",object2String optname)])
+        throwKeyedMsg("S2IZ0036",[strconc('")",object2String optname)])
 
     tempArgs :=
         pathType = '"ao" =>
             -- want to strip out -Fao
             (p := STRPOS('"-Fao", $asharpCmdlineFlags, 0, NIL)) =>
                 p = 0 => SUBSTRING($asharpCmdlineFlags, 5, NIL)
-                STRCONC(SUBSTRING($asharpCmdlineFlags, 0, p), '" ",
+                strconc(SUBSTRING($asharpCmdlineFlags, 0, p), '" ",
                     SUBSTRING($asharpCmdlineFlags, p+5, NIL))
             $asharpCmdlineFlags
         $asharpCmdlineFlags
@@ -576,19 +576,19 @@ compileAsharpCmd1 args ==
         onlyArgs =>
             s := ""
             for a in onlyArgs repeat
-                s := STRCONC(s, '" ", object2String a)
+                s := strconc(s, '" ", object2String a)
             s
         moreArgs =>
             s := tempArgs
             for a in moreArgs repeat
-                s := STRCONC(s, '" ", object2String a)
+                s := strconc(s, '" ", object2String a)
             s
         tempArgs
 
     if not beQuiet then sayKeyedMsg("S2IZ0038A",[namestring args, asharpArgs])
 
     command :=
-     STRCONC(STRCONC(getEnv('"ALDORROOT"),'"/bin/"),_
+     strconc(strconc(getEnv('"ALDORROOT"),'"/bin/"),_
                "aldor ", asharpArgs, '" ", namestring args)
     rc := runCommand command
 
@@ -643,7 +643,7 @@ compileAsharpArchiveCmd args ==
 
     cd [ object2Identifier namestring dir ]
 
-    cmd := STRCONC( '"ar x ", namestring path )
+    cmd := strconc( '"ar x ", namestring path )
     rc := runCommand cmd
     rc ~= 0 =>
         cd [ object2Identifier namestring curDir ]
@@ -694,7 +694,7 @@ compileAsharpLispCmd args ==
         fullopt = 'library   => doLibrary  := true
         fullopt = 'nolibrary => doLibrary  := false
 
-        throwKeyedMsg("S2IZ0036",[STRCONC('")",object2String optname)])
+        throwKeyedMsg("S2IZ0036",[strconc('")",object2String optname)])
 
     lsp := fnameMake(pathnameDirectory path, pathnameName path, pathnameType path)
     if fnameReadable?(lsp) then
@@ -738,7 +738,7 @@ compileSpadLispCmd args ==
         fullopt = 'library   => doLibrary  := true
         fullopt = 'nolibrary => doLibrary  := false
 
-        throwKeyedMsg("S2IZ0036",[STRCONC('")",object2String optname)])
+        throwKeyedMsg("S2IZ0036",[strconc('")",object2String optname)])
 
     lsp := fnameMake(pathnameDirectory path, pathnameName path, pathnameType path)
     if fnameReadable?(lsp) then
@@ -835,7 +835,7 @@ compileSpad2Cmd args ==
            null optargs => throwKeyedMsg("S2IZ0037",['")report"])
            if "insn" in optargs then
              $reportOptimization := true
-        throwKeyedMsg("S2IZ0036",[STRCONC('")",object2String optname)])
+        throwKeyedMsg("S2IZ0036",[strconc('")",object2String optname)])
 
     $InteractiveMode : local := nil
     -- avoid Boolean semantics transformations based on syntax only
@@ -1092,7 +1092,7 @@ displayMacro name ==
   null m =>
     sayBrightly ['"  ",:bright name,'"is not an interpreter macro."]
   -- $op is needed in the output routines.
-  $op : local := STRCONC('"macro ",object2String name)
+  $op : local := strconc('"macro ",object2String name)
   [args,:body] := m
   args :=
     null args => nil
@@ -1141,7 +1141,7 @@ interpFunctionDepAlists() ==
 fixObjectForPrinting(v) ==
     v' := object2Identifier v
     EQ(v',"%") => '"\%"
-    member(v',$msgdbPrims) => STRCONC('"\",PNAME v')
+    member(v',$msgdbPrims) => strconc('"\",PNAME v')
     v
 
 displayProperties(option,l) ==
@@ -1266,7 +1266,7 @@ displayValue($op,u,omitVariableNameIfTrue) ==
         rhs := '"):  "
         '"Value (has type "
     rhs := '":  "
-    STRCONC('"Value of ", PNAME $op,'": ")
+    strconc('"Value of ", PNAME $op,'": ")
   labmode := prefix2String objMode(u)
   if atom labmode then labmode := [labmode]
   IDENTP expr and getConstructorKindFromDB expr = "domain" =>
@@ -1692,7 +1692,7 @@ writeInputLines(fn,initial) ==
         for j in 1..maxn while not done repeat
           k := 1 + maxn - j
           MEMQ(vec.k,breakChars) =>
-            svec := STRCONC(SUBSTRING(vec,0,k+1),UNDERBAR)
+            svec := strconc(SUBSTRING(vec,0,k+1),UNDERBAR)
             lineList := [svec,:lineList]
             done := true
             vec := SUBSTRING(vec,k+1,NIL)
@@ -2192,7 +2192,7 @@ dewritify ob ==
                     vec := dewritifyInner ob.2
                     name := ob.3
                     not FBOUNDP name => 
-                       error STRCONC('"undefined function: ", SYMBOL_-NAME name)
+                       error strconc('"undefined function: ", SYMBOL_-NAME name)
                     nob := [SYMBOL_-FUNCTION name,:vec]
                     HPUT($seen, ob, nob)
                     HPUT($seen, nob, nob)
@@ -2489,7 +2489,7 @@ reportOpsFromUnitDirectly unitForm ==
       '"is not"
     sayBrightly ['" This constructor",:bright verb,
       '"exposed in this frame."]
-    sayBrightly ['" Issue",:bright STRCONC('")edit ",
+    sayBrightly ['" Issue",:bright strconc('")edit ",
       namestring sourceFile),'"to see algebra source code for",
         :bright abb,'%l]
 
@@ -2547,7 +2547,7 @@ reportOpsFromLisplib(op,u) ==
   sayBrightly ['" This constructor",:bright verb,
     '"exposed in this frame."]
   sourceFile := getConstructorSourceFileFromDB op
-  sayBrightly ['" Issue",:bright STRCONC('")edit ",
+  sayBrightly ['" Issue",:bright strconc('")edit ",
     namestring sourceFile),
       '"to see algebra source code for",:bright fn,'%l]
 
@@ -2717,7 +2717,7 @@ diffAlist(new,old) ==
 
 reportUndo acc ==
   for [name,:proplist] in acc repeat
-    sayBrightly STRCONC("Properties of ",PNAME name,'" ::")
+    sayBrightly strconc("Properties of ",PNAME name,'" ::")
     curproplist := LASSOC(name,CAAR $InteractiveFrame)
     for [prop,:value] in proplist repeat
       sayBrightlyNT ['"  ",prop,'" was: "]
@@ -2739,7 +2739,7 @@ undoCount(n) ==  --computes the number of undo's, given $IOindex
   m :=
     n >= 0 => $IOindex - n - 1
     -n
-  m >= $IOindex => userError STRCONC('"Magnitude of undo argument must be less than step number (",STRINGIMAGE $IOindex,'").")
+  m >= $IOindex => userError strconc('"Magnitude of undo argument must be less than step number (",STRINGIMAGE $IOindex,'").")
   m
 
 
@@ -2942,7 +2942,7 @@ printLabelledList(ls,label1,label2,prefix,patterns) ==
   sayBrightly '""
 
 whatCommands(patterns) ==
-  label := STRCONC("System Commands for User Level: ",
+  label := strconc("System Commands for User Level: ",
     STRINGIMAGE $UserLevel)
   centerAndHighlight(label,$LINELENGTH,specialChar 'hbar)
   l := filterListOfStrings(patterns,
@@ -3091,14 +3091,14 @@ processSynonyms() ==
   fun := eval fun              -- fun may have been a suspension
   to := STRPOS('")",fun,1,NIL)
   if to and to ~= SIZE(fun)-1 then
-    opt := STRCONC('" ",SUBSTRING(fun,to,NIL))
+    opt := strconc('" ",SUBSTRING(fun,to,NIL))
     fun := SUBSTRING(fun,0,to-1)
   else opt := '" "
   if (SIZE synstr) > (SIZE fun) then
     for i in (SIZE fun)..(SIZE synstr) repeat
       fun := strconc (fun, '" ")
---  $currentLine := STRCONC(fill,RPLACSTR(line, 1, SIZE synstr, fun),opt)
-  cl := STRCONC(fill,RPLACSTR(line, 1, SIZE synstr, fun),opt)
+--  $currentLine := strconc(fill,RPLACSTR(line, 1, SIZE synstr, fun),opt)
+  cl := strconc(fill,RPLACSTR(line, 1, SIZE synstr, fun),opt)
   SETQ(LINE,cl)
   SETQ(CHR,LINE.(p+1))
   processSynonyms ()
@@ -3111,7 +3111,7 @@ tabsToBlanks s ==
    n := #s
    k < n =>
       k = 0 => tabsToBlanks SUBSTRING(s,1,nil)
-      STRCONC(SUBSTRING(s,0,k),$charBlank, tabsToBlanks SUBSTRING(s,k + 1,nil))
+      strconc(SUBSTRING(s,0,k),$charBlank, tabsToBlanks SUBSTRING(s,k + 1,nil))
    s
 
 doSystemCommand string ==
diff --git a/src/interp/i-util.boot b/src/interp/i-util.boot
index 4762fccb..c3a5b0ca 100644
--- a/src/interp/i-util.boot
+++ b/src/interp/i-util.boot
@@ -50,29 +50,29 @@ inputPrompt str ==
   p := first(x) - 2
   y := $OLDLINE
   SETQ($OLDLINE,NIL)
-  y => _$SHOWLINE(STRCONC(str,EBCDIC 19,y),p)
+  y => _$SHOWLINE(strconc(str,EBCDIC 19,y),p)
   0 = SIZE str => NIL
-  _$SHOWLINE(STRCONC(str,EBCDIC 19),p)
+  _$SHOWLINE(strconc(str,EBCDIC 19),p)
  
 protectedPrompt(:p) ==
   [str,:br] := p
   0 = SIZE str => inputPrompt str
   msg := EBCDIC 29                       -- start of field
   msg :=
-    if br then STRCONC(msg,EBCDIC 232)   -- bright write protect
-    else       STRCONC(msg,EBCDIC  96)   -- write protect
-  msg := STRCONC(msg,str,EBCDIC 29,EBCDIC 64)  -- unprotect again
+    if br then strconc(msg,EBCDIC 232)   -- bright write protect
+    else       strconc(msg,EBCDIC  96)   -- write protect
+  msg := strconc(msg,str,EBCDIC 29,EBCDIC 64)  -- unprotect again
   inputPrompt msg
  
 MKPROMPT() ==
   $inputPromptType = 'none    => '""
   $inputPromptType = 'plain   => '"-> "
   $inputPromptType = 'step    =>
-    STRCONC('"(",STRINGIMAGE $IOindex,'") -> ")
+    strconc('"(",STRINGIMAGE $IOindex,'") -> ")
   $inputPromptType = 'frame   =>
-    STRCONC(STRINGIMAGE $interpreterFrameName,
+    strconc(STRINGIMAGE $interpreterFrameName,
       '" (",STRINGIMAGE $IOindex,'") -> ")
-  STRCONC(STRINGIMAGE $interpreterFrameName,
+  strconc(STRINGIMAGE $interpreterFrameName,
    '" [", SUBSTRING(CURRENTTIME(),8,NIL),'"] [",
     STRINGIMAGE $IOindex, '"] -> ")
  
diff --git a/src/interp/mark.boot b/src/interp/mark.boot
index e3c58efd..d1469405 100644
--- a/src/interp/mark.boot
+++ b/src/interp/mark.boot
@@ -1046,7 +1046,7 @@ markPrint(:options) ==   --print $def
     else      
       ['add,a,:r] := $originalBody
       xtraLines := 
-        "append"/[[STRCONC(name,'": Category == with"),'""] 
+        "append"/[[strconc(name,'": Category == with"),'""] 
            for name in markCheckForAttributes a]
       nbody :=
         $originalBody is ['add,a,b] =>
@@ -1440,7 +1440,7 @@ combineDefinitions() ==
         [predl,.,:def]    := item
         ['DEF, form, :.] := def
         ops := PNAME op
-        opName := INTERN(STRCONC(ops,'"X",STRINGIMAGE i))
+        opName := INTERN(strconc(ops,'"X",STRINGIMAGE i))
         form.first := opName
 --      rplacaSubst(op, opName, def)
         $acc := [[form,:predl], :$acc]
diff --git a/src/interp/match.boot b/src/interp/match.boot
index 421f86ad..37bc2a61 100644
--- a/src/interp/match.boot
+++ b/src/interp/match.boot
@@ -109,13 +109,13 @@ patternCheck pattern == main where
 --  pp pattern
     pattern
   mknew(old,i,r,new) ==
-    new := STRCONC(new,old.(i + 1))  --add underscored character to string
-    null r => STRCONC(new,subWild(SUBSTRING(old,i + 2,nil),0))
+    new := strconc(new,old.(i + 1))  --add underscored character to string
+    null r => strconc(new,subWild(SUBSTRING(old,i + 2,nil),0))
     mknew(old,first r,rest r,
-          STRCONC(new,subWild(SUBSTRING(old,i + 2,(first r) - i - 1),i + 1)))
+          strconc(new,subWild(SUBSTRING(old,i + 2,(first r) - i - 1),i + 1)))
   subWild(s,i) ==
     (k := charPosition($oldWild,s,i)) < #s =>
-      STRCONC(SUBSTRING(s,i,k - i),$wildCard,subWild(s,k + 1))
+      strconc(SUBSTRING(s,i,k - i),$wildCard,subWild(s,k + 1))
     SUBSTRING(s,i,nil)
   pos(c,s) ==
     i := 0
diff --git a/src/interp/msg.boot b/src/interp/msg.boot
index 74b97dc2..8d59e963 100644
--- a/src/interp/msg.boot
+++ b/src/interp/msg.boot
@@ -165,7 +165,7 @@ processChPosesForOneLine msgList ==
             putFTText (msg,chPosList)
         posLetter := rest assoc(poCharPosn getMsgPos msg,chPosList)
         oldPre := getMsgPrefix msg
-        setMsgPrefix (msg,STRCONC(oldPre,_
+        setMsgPrefix (msg,strconc(oldPre,_
                      MAKE_-FULL_-CVEC ($preLength - 4 - SIZE oldPre),posLetter) )
     leaderMsg := makeLeaderMsg chPosList
     NCONC(msgList,LIST leaderMsg)  --a back cons
@@ -506,7 +506,7 @@ makeLeaderMsg chPosList ==
     st := MAKE_-FULL_-CVEC ($preLength- 3)
     oldPos := -1
     for [posNum,:posLetter] in reverse chPosList repeat
-        st := STRCONC(st, _
+        st := strconc(st, _
             rep(char ".", (posNum - oldPos - 1)),posLetter)
         oldPos := posNum
     ['leader,$nopos,'nokey,NIL,NIL,[st]]
@@ -518,9 +518,9 @@ makeMsgFromLine line ==
     localNumOfLine  :=
         i := poLinePosn posOfLine
         stNum := STRINGIMAGE i
-        STRCONC(rep(char " ", ($preLength - 7 - SIZE stNum)),_
+        strconc(rep(char " ", ($preLength - 7 - SIZE stNum)),_
          stNum)
-    ['line,posOfLine,NIL,NIL, STRCONC('"Line", localNumOfLine),_
+    ['line,posOfLine,NIL,NIL, strconc('"Line", localNumOfLine),_
         textOfLine]
  
 getMsgTag msg == ncTag msg
diff --git a/src/interp/msgdb.boot b/src/interp/msgdb.boot
index 52d06d14..18444188 100644
--- a/src/interp/msgdb.boot
+++ b/src/interp/msgdb.boot
@@ -106,9 +106,9 @@ wordFrom(l,i) ==
     ch :=
       c = char '__   => l.(k := 1+k)  --this may exceed bounds
       c
-    buf := STRCONC(buf,ch)
+    buf := strconc(buf,ch)
     k := k + 1
-  if k = maxIndex and (c := l.k) ~= char ('_ ) then buf := STRCONC(buf,c)
+  if k = maxIndex and (c := l.k) ~= char ('_ ) then buf := strconc(buf,c)
   [buf,k+1]
 
 getKeyedMsg key == fetchKeyedMsg(key,false)
@@ -370,7 +370,7 @@ throwListOfKeyedMsgs(descKey,descArgs,l) ==
   sayKeyedMsg(descKey,descArgs)
   sayMSG '" "
   for [key,args] in l for i in 1.. repeat
-    n := STRCONC(object2String i,'".")
+    n := strconc(object2String i,'".")
     sayKeyedMsg(key,[n,:args])
   countError()
   spadThrow()
@@ -522,8 +522,8 @@ flowSegmentedMsg(msg, len, offset) ==
       if firstLine then
         firstLine  := false
         offset := offset + offset
-        off1   := STRCONC(off, off1)
-        off    := STRCONC(off, off)
+        off1   := strconc(off, off1)
+        off    := strconc(off, off)
       if (tot <= len) or (sbl = 1 and tot = len) then
         nl := [f,:nl]
         lnl := lnl + sbl
@@ -869,7 +869,7 @@ sayAsManyPerLineAsPossible l ==
   str := '""
   for i in 0..(n-1) repeat
     [c,:l] := l
-    str := STRCONC(str,c,fillerSpaces(w - #c,'" "))
+    str := strconc(str,c,fillerSpaces(w - #c,'" "))
     REMAINDER(i+1,p) = 0 => (sayMSG str ; str := '"" )
   if str ~= '"" then sayMSG str
   NIL
@@ -965,8 +965,8 @@ centerAndHighlight(text,:argList) ==
   f := DIVIDE(width - wid - 2,2)
   fill1 := '""
   for i in 1..(f.0) repeat
-    fill1 := STRCONC(fillchar,fill1)
-  if f.1 = 0 then fill2 := fill1 else fill2 := STRCONC(fillchar,fill1)
+    fill1 := strconc(fillchar,fill1)
+  if f.1 = 0 then fill2 := fill1 else fill2 := strconc(fillchar,fill1)
   sayBrightly [fill1,'%b,text,'%d,fill2]
   nil
 
@@ -981,8 +981,8 @@ center(text,argList) ==
   f := DIVIDE(width - wid - 2,2)
   fill1 := '""
   for i in 1..(f.0) repeat
-    fill1 := STRCONC(fillchar,fill1)
-  if f.1 = 0 then fill2 := fill1 else fill2 := STRCONC(fillchar,fill1)
+    fill1 := strconc(fillchar,fill1)
+  if f.1 = 0 then fill2 := fill1 else fill2 := strconc(fillchar,fill1)
   concat(fill1,text,fill2)
 
 splitSayBrightly u ==
@@ -1027,14 +1027,14 @@ $htCharAlist == '(
 
 escapeSpecialChars s ==
   u := LASSOC(s,$htCharAlist) => u
-  member(s, $htSpecialChars) => STRCONC('"_\", s)
+  member(s, $htSpecialChars) => strconc('"_\", s)
   null $saturn => s
   ALPHA_-CHAR_-P (s.0) => s
   not (or/[dbSpecialDisplayOpChar? s.i for i in 0..MAXINDEX s]) => s
   buf := '""
   for i in 0..MAXINDEX s repeat buf :=
-    dbSpecialDisplayOpChar?(s.i) => STRCONC(buf,'"\verb!",s.i,'"!")
-    STRCONC(buf,s.i)
+    dbSpecialDisplayOpChar?(s.i) => strconc(buf,'"\verb!",s.i,'"!")
+    strconc(buf,s.i)
   buf
 
 dbSpecialDisplayOpChar? c == (c = char '_~)
diff --git a/src/interp/newfort.boot b/src/interp/newfort.boot
index 2f198e1d..e506ce05 100644
--- a/src/interp/newfort.boot
+++ b/src/interp/newfort.boot
@@ -79,7 +79,7 @@ expression2Fortran1(name,e) ==
 
 newFortranTempVar() ==
   $exp2FortTempVarIndex := 1 + $exp2FortTempVarIndex
-  newVar := INTERN STRCONC('"T",STRINGIMAGE $exp2FortTempVarIndex)
+  newVar := INTERN strconc('"T",STRINGIMAGE $exp2FortTempVarIndex)
   updateSymbolTable(newVar,$defaultFortranType)
   newVar
  
@@ -298,8 +298,8 @@ fortran2Lines1 f ==
   -- f is a list of strings making up 1 FORTRAN statement
   -- return: a reverse list of FORTRAN lines
   normPref := MAKE_-STRING($fortIndent)
-  --contPref := STRCONC(MAKE_-STRING($fortIndent-1),"&")
-  contPref := STRCONC("     &",MAKE_-STRING($fortIndent-6))
+  --contPref := strconc(MAKE_-STRING($fortIndent-1),"&")
+  contPref := strconc("     &",MAKE_-STRING($fortIndent-6))
   lines := NIL
   ll := $fortIndent
   while f repeat
@@ -309,7 +309,7 @@ fortran2Lines1 f ==
     while ok repeat
       (ll + (sff := SIZE ff)) <= $fortLength =>
         ll := ll + sff
-        line := STRCONC(line,ff)
+        line := strconc(line,ff)
         f := rest f
         if f then ff := first f
         else ok := nil
@@ -320,7 +320,7 @@ fortran2Lines1 f ==
       -- legal format. MCD
       if (ll < $fortLength) and (ll + sff) > $fortLength then
         spaceLeft := $fortLength - ll
-        line := STRCONC(line,SUBSEQ(ff,0,spaceLeft))
+        line := strconc(line,SUBSEQ(ff,0,spaceLeft))
         ff := SUBSEQ(ff,spaceLeft)
       lines := [line,:lines]
       ll := $fortIndent
@@ -337,7 +337,7 @@ fortError1 u ==
  
 fortError(u,v) ==
   $fortError := "t"
-  msg := STRCONC("   ",STRINGIMAGE u);
+  msg := strconc("   ",STRINGIMAGE u);
   sayErrorly("Fortran translation error",msg)
   mathPrint v
  
@@ -374,7 +374,7 @@ formatAsFortranExpresion x ==
 dispfortexp x ==
   if atom(x) or x is [op,:.] and not object2Identifier op in
     '(_= MATRIX construct ) then
-      var := INTERN STRCONC('"R",object2String $IOindex)
+      var := INTERN strconc('"R",object2String $IOindex)
       x := ['"=",var,x]
   dispfortexp1 x
  
@@ -439,8 +439,8 @@ exp2FortSpecial(op,args,nargs) ==
   --  called to get a linearized form for the browser
   op = "QUOTE" =>
     atom (arg := first args) => STRINGIMAGE arg
-    tailPart := "STRCONC"/[STRCONC('",",x) for x in rest arg]
-    STRCONC('"[",first arg,tailPart,'"]")
+    tailPart := "STRCONC"/[strconc('",",x) for x in rest arg]
+    strconc('"[",first arg,tailPart,'"]")
   op = "PAREN" =>
     args := first args
     not(first(args)="CONCATB") => fortError1 [op,:args]
@@ -617,9 +617,9 @@ fortFormatLabelledIfGoto(switch,label1,label2) ==
     l := [first(r),:l]
     r := rest(r)
   labString := STRINGIMAGE label1
-  for i in #(labString)..5 repeat labString := STRCONC(labString,'" ")
+  for i in #(labString)..5 repeat labString := strconc(labString,'" ")
   lines := fortran2Lines nreverse [:nreverse l,'"IF(",:r]
-  lines := [STRCONC(labString,SUBSEQ(first lines,6)),:rest lines]
+  lines := [strconc(labString,SUBSEQ(first lines,6)),:rest lines]
   checkLines lines
 
 fortFormatIf(switch) ==
@@ -790,7 +790,7 @@ fortPre1 e ==
     e
   isFloat(e) => checkPrecision(e)
   -- Keep strings as strings:
-  -- string?(e) => STRCONC(STRING(34),e,STRING(34))
+  -- string?(e) => strconc(STRING(34),e,STRING(34))
   string?(e) => e
   e = "%e" => fortPre1 ["exp" , 1]
   imags := ['"%i","%i"]
@@ -843,8 +843,8 @@ fortPreRoot e ==
  
 fix2FortranFloat e ==
   -- Return a Fortran float for a given integer.
-  $fortranPrecision = "double" => STRCONC(STRINGIMAGE(e),".0D0")
-  STRCONC(STRINGIMAGE(e),".")
+  $fortranPrecision = "double" => strconc(STRINGIMAGE(e),".0D0")
+  strconc(STRINGIMAGE(e),".")
  
 isFloat e ==
   FLOATP(e) or string?(e) and FIND(char ".",e)
@@ -860,7 +860,7 @@ checkPrecision e ==
       ePos => SUBSEQ(e,period+1,ePos)
       period+1 < LENGTH e => SUBSEQ(e,period+1)
       "0"
-    STRCONC(iPart,rPart,"D",expt)
+    strconc(iPart,rPart,"D",expt)
   e
  
 ----------------- segment.boot -----------------------
diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot
index 7c5f4fb6..14f694c0 100644
--- a/src/interp/nruncomp.boot
+++ b/src/interp/nruncomp.boot
@@ -543,7 +543,7 @@ NRTcheckVector domainShell ==
     alist := [[first v,:$SetFunctions.i],:alist]
   alist
 
-mkDomainCatName id == INTERN STRCONC(id,";CAT")
+mkDomainCatName id == INTERN strconc(id,";CAT")
 
 NRTsetVector4(siglist,formlist,condlist) ==
   $uncondList: local := nil
@@ -617,7 +617,7 @@ catList2catPackageList u ==
 --converts ((Set) (Module R) ...) to ((Set& $) (Module& $ R)...)
   [fn x for x in u] where
     fn [op,:argl] ==
-      newOp := INTERN(STRCONC(PNAME op,"&"))
+      newOp := INTERN(strconc(PNAME op,"&"))
       addConsDB [newOp,"$",:argl]
 
 NRTsetVector4a(sig,form,cond) ==
diff --git a/src/interp/nrunopt.boot b/src/interp/nrunopt.boot
index 19ba1f83..b6209703 100644
--- a/src/interp/nrunopt.boot
+++ b/src/interp/nrunopt.boot
@@ -382,7 +382,7 @@ encodeCatform x ==
 NRTcatCompare [catform,:pred] == LASSOC(first catform,$levelAlist)
  
 hasDefaultPackage catname ==
-  defname := INTERN STRCONC(catname,'"&")
+  defname := INTERN strconc(catname,'"&")
   constructor? defname => defname
   nil
  
@@ -475,7 +475,7 @@ dcSlots con ==
     sayBrightlyNT bright i
     item := template.i
     item is [n,:op] and integer? n => dcOpLatchPrint(op,n)
-    null item and i > 5 => sayBrightly ['"arg  ",STRCONC('"#",STRINGIMAGE(i - 5))]
+    null item and i > 5 => sayBrightly ['"arg  ",strconc('"#",STRINGIMAGE(i - 5))]
     atom item => sayBrightly ['"fun  ",item]
     item is ['CONS,.,['FUNCALL,[.,a],b]] => sayBrightly ['"constant ",a]
     sayBrightly concat('"lazy ",form2String formatSlotDomain i)
@@ -513,7 +513,7 @@ formatSlotDomain x ==
   x = 2 => ["$$"]
   integer? x =>
     val := $infovec.0.x
-    null val => [STRCONC('"#",STRINGIMAGE (x  - 5))]
+    null val => [strconc('"#",STRINGIMAGE (x  - 5))]
     formatSlotDomain val
   atom x => x
   x is ['NRTEVAL,y] => (atom y => [y]; y)
diff --git a/src/interp/parse.boot b/src/interp/parse.boot
index 5219d63d..3455ff2c 100644
--- a/src/interp/parse.boot
+++ b/src/interp/parse.boot
@@ -419,23 +419,23 @@ superSub(name,x) ==
   for u in x repeat y:= [:y,:u]
   code:=
     x is [[u]] => $quadSymbol
-    STRCONC('"_(",scriptTranRow first x,scriptTran rest x,'"_)")
+    strconc('"_(",scriptTranRow first x,scriptTran rest x,'"_)")
   [INTERNL(PNAME name,"$",code),:y]
  
 scriptTran: %List -> %String
 scriptTran x ==
   null x => '""
-  STRCONC('";",scriptTranRow first x,scriptTran rest x)
+  strconc('";",scriptTranRow first x,scriptTran rest x)
  
 scriptTranRow: %List -> %String
 scriptTranRow x ==
   null x => '""
-  STRCONC($quadSymbol,scriptTranRow1 rest x)
+  strconc($quadSymbol,scriptTranRow1 rest x)
 
 scriptTranRow1: %List -> %String 
 scriptTranRow1 x ==
   null x => '""
-  STRCONC('",",$quadSymbol,scriptTranRow1 rest x)
+  strconc('",",$quadSymbol,scriptTranRow1 rest x)
  
 parseVCONS: %List -> %Form
 parseVCONS l == 
diff --git a/src/interp/postpar.boot b/src/interp/postpar.boot
index fc7ac484..09837b26 100644
--- a/src/interp/postpar.boot
+++ b/src/interp/postpar.boot
@@ -346,7 +346,7 @@ postTranScripts a ==
 
 decodeScripts: %ParseTree -> %ParseForm
 decodeScripts a ==
-  a is ["PrefixSC",b] => STRCONC(STRINGIMAGE 0,decodeScripts b)
+  a is ["PrefixSC",b] => strconc(STRINGIMAGE 0,decodeScripts b)
   a is [";",:b] => APPLX('STRCONC,[decodeScripts x for x in b])
   a is [",",:b] =>
     STRINGIMAGE fn a where fn a == (a is [",",:b] => +/[fn x for x in b]; 1)
diff --git a/src/interp/pspad1.boot b/src/interp/pspad1.boot
index 1b6c4050..62703b9f 100644
--- a/src/interp/pspad1.boot
+++ b/src/interp/pspad1.boot
@@ -106,7 +106,7 @@ fragmentsToLine fragments ==
 lispStringList2String x ==
   null x => '""
   atom x => STRINGIMAGE x
-  rest x => apply(function STRCONC,MAPCAR(function lispStringList2String,x))
+  rest x => apply(function strconc,MAPCAR(function lispStringList2String,x))
   lispStringList2String first x
  
 --% routines for buffer and margin adjustment
@@ -126,7 +126,7 @@ formatOutput x ==
     line:= fragmentsToLine x
     x:=
       #line+#y>$lineLength =>
-        (y:= STRCONC(nBlanks $m,y); extraLines:= [y,:extraLines]; x)
+        (y:= strconc(nBlanks $m,y); extraLines:= [y,:extraLines]; x)
       [line,y]
   consLineBuffer x
   for y in extraLines repeat consLineBuffer LIST y
@@ -339,7 +339,7 @@ formatUnion(['Union,:r]) ==
     x is [":",y,'Branch] => fn STRINGIMAGE y
     string? x => [":", INTERN x, ['Enumeration,x]]
     x is [":",:.] => x
-    tag := INTERN STRCONC("value",STRINGIMAGE ($count := $count + 1))
+    tag := INTERN strconc("value",STRINGIMAGE ($count := $count + 1))
     [":", tag, x]      
 
 formatTestForPartial u ==
diff --git a/src/interp/pspad2.boot b/src/interp/pspad2.boot
index 97db3788..055e9a65 100644
--- a/src/interp/pspad2.boot
+++ b/src/interp/pspad2.boot
@@ -509,7 +509,7 @@ consCommentsTran s ==
   k := or/[i for i in 0..(m - 7) | substring?('"\spad{",s,i)] =>
     r := charPosition(char '_},s,k + 6)
     r = m + 1 => s
-    STRCONC(SUBSTRING(s,0,k),'"`",SUBSTRING(s,k+6,r-k-6),'"'",consCommentsTran SUBSTRING(s,r+1,nil))
+    strconc(SUBSTRING(s,0,k),'"`",SUBSTRING(s,k+6,r-k-6),'"'",consCommentsTran SUBSTRING(s,r+1,nil))
   s
   
 formatDoCommentLine line ==
@@ -565,7 +565,7 @@ string2PrintImage s ==
  
 ident2PrintImage s ==
   m := MAXINDEX s
-  if m > 1 and s.(m - 1) = $underScore then s := STRCONC(SUBSTRING(s,0,m-1),s.m)
+  if m > 1 and s.(m - 1) = $underScore then s := strconc(SUBSTRING(s,0,m-1),s.m)
   u:= GETSTR (2*SIZE s)
   if not (ALPHA_-CHAR_-P s.(0) or s.(0)=char '"$") then SUFFIX('__,u)
   u:= SUFFIX(s.(0),u)
diff --git a/src/interp/record.boot b/src/interp/record.boot
index 023f985c..98b75b32 100644
--- a/src/interp/record.boot
+++ b/src/interp/record.boot
@@ -139,7 +139,7 @@ hyperize(u,w) ==
  
 verbatimize u ==
   u = '"" => u
-  STRCONC('"\begin{verbatim}",u,'"\end{verbatim}")
+  strconc('"\begin{verbatim}",u,'"\end{verbatim}")
 --=======================================================================
 --                Function for Verifying a `record' file
 --=======================================================================
@@ -239,7 +239,7 @@ htCommandToInputLine s == fn(s,0) where fn(s,init) ==
 --similar to htTrimAtBackSlash except removes all \
   k := or/[i for i in init..MAXINDEX s | s.i = char '_\] =>
     member(s.(k + 1),[char 'f,char 'b]) => SUBSTRING(s,init,k - init)
-    STRCONC(SUBSTRING(s,init,k - init),fn(s,k + 1))
+    strconc(SUBSTRING(s,init,k - init),fn(s,k + 1))
   SUBSTRING(s,init,nil)
  
 htTrimAtBackSlash s ==
@@ -249,9 +249,9 @@ htTrimAtBackSlash s ==
   s
  
 htMkPath(directory,name,typ) ==
-  nameType := STRCONC(name,'".",typ)
+  nameType := strconc(name,'".",typ)
   null directory => nameType
-  STRCONC(directory,nameType)
+  strconc(directory,nameType)
       
 --=======================================================================
 --              Creating Record File from HT Files
@@ -269,7 +269,7 @@ recordAndPrintTest md ==  --called by recordAndPrint
       x is [y,:r] =>     
         y.(k := MAXINDEX y) = char '__ => 
           u := fn r
-          [STRCONC(SUBSTRING(y,0,k),'" ",first u),:rest u]
+          [strconc(SUBSTRING(y,0,k),'" ",first u),:rest u]
         [y,:fn r]
       x
   output := nreverse $mkTestOutputStack -- set by maPrin
diff --git a/src/interp/setvars.boot b/src/interp/setvars.boot
index 590f4cfe..22b723a4 100644
--- a/src/interp/setvars.boot
+++ b/src/interp/setvars.boot
@@ -274,7 +274,7 @@ displaySetOptionInformation(arg,setData) ==
     displaySetVariableSettings(setData.setLeaf,setData.setName)
 
   -- otherwise we want to show the current setting
-  centerAndHighlight (STRCONC('"The ",object2String arg,'" Option"),
+  centerAndHighlight (strconc('"The ",object2String arg,'" Option"),
                       $LINELENGTH,specialChar 'hbar)
   sayBrightly ['%l,:bright '"Description:",setData.setLabel]
 
@@ -314,8 +314,8 @@ displaySetOptionInformation(arg,setData) ==
 
 displaySetVariableSettings(setTree,label) ==
   if label = "" then label := '")set"
-    else label := STRCONC('" ",object2String label,'" ")
-  centerAndHighlight(STRCONC('"Current Values of ",label,
+    else label := strconc('" ",object2String label,'" ")
+  centerAndHighlight(strconc('"Current Values of ",label,
     '" Variables"),$LINELENGTH," ")
   TERPRI()
   sayBrightly ["Variable     ",
@@ -326,9 +326,9 @@ displaySetVariableSettings(setTree,label) ==
   for setData in setTree repeat
     null satisfiesUserLevel setData.setLevel => nil
     setOption := object2String setData.setName
-    setOption := STRCONC(setOption,fillerSpaces(13-#setOption,'" "),
+    setOption := strconc(setOption,fillerSpaces(13-#setOption,'" "),
                          setData.setLabel)
-    setOption := STRCONC(setOption,fillerSpaces(55-#setOption,'" "))
+    setOption := strconc(setOption,fillerSpaces(55-#setOption,'" "))
     st := setData.setType
     st = 'FUNCTION =>
       opt :=
@@ -980,7 +980,7 @@ setOutputAlgebra arg ==
 
   arg = "%display%" =>
     if $algebraFormat then label := '"On:" else label := '"Off:"
-    STRCONC(label,$algebraOutputFile)
+    strconc(label,$algebraOutputFile)
 
   (null arg) or (arg = "%describe%") or (first arg = '_?) =>
     describeSetOutputAlgebra()
@@ -1005,7 +1005,7 @@ setOutputAlgebra arg ==
 
   (arg is [fn,ft]) or (arg is [fn,ft,fm]) => -- aha, a file
     if (ptype := pathnameType fn) then
-      fn := STRCONC(pathnameDirectory fn,pathnameName fn)
+      fn := strconc(pathnameDirectory fn,pathnameName fn)
       ft := ptype
     if null fm then fm := 'A
     filename := $FILEP(fn,ft,fm)
@@ -1101,7 +1101,7 @@ setOutputCharacters arg ==
     sayBrightly '" current choice of special characters looks like:"
     l := NIL
     for [char,:.] in $specialCharacterAlist repeat
-      s := STRCONC('"   ",PNAME char,'" is shown as ",
+      s := strconc('"   ",PNAME char,'" is shown as ",
         PNAME specialChar(char))
       l := [s,:l]
     sayAsManyPerLineAsPossible reverse l
@@ -1162,7 +1162,7 @@ setOutputFortran arg ==
 
   arg = "%display%" =>
     if $fortranFormat then label := '"On:" else label := '"Off:"
-    STRCONC(label,$fortranOutputFile)
+    strconc(label,$fortranOutputFile)
 
   (null arg) or (arg = "%describe%") or (first arg = '_?) =>
     describeSetOutputFortran()
@@ -1195,7 +1195,7 @@ setOutputFortran arg ==
   (arg is [fn,ft]) or (arg is [fn,ft,fm]) => -- aha, a file
     fn := STRING fn
     if (ptype := pathnameType fn) then
-      fn := STRCONC(pathnameDirectory fn,pathnameName fn)
+      fn := strconc(pathnameDirectory fn,pathnameName fn)
       ft := ptype
     if null fm then fm := 'A
     filename := $FILEP(fn,ft,fm)
@@ -1280,7 +1280,7 @@ setOutputMathml arg ==
 
   arg = "%display%" =>
     if $mathmlFormat then label := '"On:" else label := '"Off:"
-    STRCONC(label,$mathmlOutputFile)
+    strconc(label,$mathmlOutputFile)
 
   (null arg) or (arg = "%describe%") or (first arg = '_?) =>
     describeSetOutputMathml()
@@ -1305,7 +1305,7 @@ setOutputMathml arg ==
 
   (arg is [fn,ft]) or (arg is [fn,ft,fm]) => -- aha, a file
     if (ptype := pathnameType fn) then
-      fn := STRCONC(pathnameDirectory fn,pathnameName fn)
+      fn := strconc(pathnameDirectory fn,pathnameName fn)
       ft := ptype
     if null fm then fm := 'A
     filename := $FILEP(fn,ft,fm)
@@ -1389,7 +1389,7 @@ setOutputOpenMath arg ==
 
   arg = "%display%" =>
     if $openMathFormat then label := '"On:" else label := '"Off:"
-    STRCONC(label,$openMathOutputFile)
+    strconc(label,$openMathOutputFile)
 
   (null arg) or (arg = "%describe%") or (first arg = '_?) =>
     describeSetOutputOpenMath()
@@ -1414,7 +1414,7 @@ setOutputOpenMath arg ==
 
   (arg is [fn,ft]) or (arg is [fn,ft,fm]) => -- aha, a file
     if (ptype := pathnameType fn) then
-      fn := STRCONC(pathnameDirectory fn,pathnameName fn)
+      fn := strconc(pathnameDirectory fn,pathnameName fn)
       ft := ptype
     if null fm then fm := 'A
     filename := $FILEP(fn,ft,fm)
@@ -1501,7 +1501,7 @@ setOutputFormula arg ==
 
   arg = "%display%" =>
     if $formulaFormat then label := '"On:" else label := '"Off:"
-    STRCONC(label,$formulaOutputFile)
+    strconc(label,$formulaOutputFile)
 
   (null arg) or (arg = "%describe%") or (first arg = '_?) =>
     describeSetOutputFormula()
@@ -1526,7 +1526,7 @@ setOutputFormula arg ==
 
   (arg is [fn,ft]) or (arg is [fn,ft,fm]) => -- aha, a file
     if (ptype := pathnameType fn) then
-      fn := STRCONC(pathnameDirectory fn,pathnameName fn)
+      fn := strconc(pathnameDirectory fn,pathnameName fn)
       ft := ptype
     if null fm then fm := 'A
     filename := $FILEP(fn,ft,fm)
@@ -1612,7 +1612,7 @@ setOutputTex arg ==
 
   arg = "%display%" =>
     if $texFormat then label := '"On:" else label := '"Off:"
-    STRCONC(label,$texOutputFile)
+    strconc(label,$texOutputFile)
 
   (null arg) or (arg = "%describe%") or (first arg = '_?) =>
     describeSetOutputTex()
@@ -1637,7 +1637,7 @@ setOutputTex arg ==
 
   (arg is [fn,ft]) or (arg is [fn,ft,fm]) => -- aha, a file
     if (ptype := pathnameType fn) then
-      fn := STRCONC(pathnameDirectory fn,pathnameName fn)
+      fn := strconc(pathnameDirectory fn,pathnameName fn)
       ft := ptype
     if null fm then fm := 'A
     filename := $FILEP(fn,ft,fm)
diff --git a/src/interp/slam.boot b/src/interp/slam.boot
index b3d2a2e3..b0dc70bd 100644
--- a/src/interp/slam.boot
+++ b/src/interp/slam.boot
@@ -178,7 +178,7 @@ compileRecurrenceRelation(op,nam,argl,junk,[body,sharpArg,n,:initCode]) ==
   stateNam:= GENVAR()
   stateVar:= GENSYM()
   stateVal:= GENSYM()
-  lastArg := INTERNL STRCONC('"#",STRINGIMAGE QSADD1 LENGTH argl)
+  lastArg := INTERNL strconc('"#",STRINGIMAGE QSADD1 LENGTH argl)
   decomposeCode:=
     [["%LET",gIndex,["ELT",lastArg,0]],:[["%LET",g,["ELT",lastArg,i]]
       for g in gsList for i in 1..]]
diff --git a/src/interp/trace.boot b/src/interp/trace.boot
index 099d9ece..ea1d65fe 100644
--- a/src/interp/trace.boot
+++ b/src/interp/trace.boot
@@ -187,7 +187,7 @@ getTraceOption (x is [key,:l]) ==
     stackTraceOptionError ["S2IT0008",NIL]
   key='restore =>
     null l => x
-    stackTraceOptionError ["S2IT0009",[STRCONC('")",object2String key)]]
+    stackTraceOptionError ["S2IT0009",[strconc('")",object2String key)]]
   key='only => ['only,:transOnlyOption l]
   key='within =>
     l is [a] and IDENTP a => x
@@ -197,7 +197,7 @@ getTraceOption (x is [key,:l]) ==
       key="cond" => "when"
       key
     l is [a] => [key,:l]
-    stackTraceOptionError ["S2IT0011",[STRCONC('")",object2String key)]]
+    stackTraceOptionError ["S2IT0011",[strconc('")",object2String key)]]
   key='depth =>
     l is [n] and FIXP n => x
     stackTraceOptionError ["S2IT0012",['")depth"]]
@@ -215,14 +215,14 @@ getTraceOption (x is [key,:l]) ==
   key in '(local ops vars) =>
     null l or l is ["all"] => [key,:"all"]
     isListOfIdentifiersOrStrings l => x
-    stackTraceOptionError ["S2IT0015",[STRCONC('")",object2String key)]]
+    stackTraceOptionError ["S2IT0015",[strconc('")",object2String key)]]
   key='varbreak =>
     null l or l is ["all"] => ["varbreak",:"all"]
     isListOfIdentifiers l => x
-    stackTraceOptionError ["S2IT0016",[STRCONC('")",object2String key)]]
+    stackTraceOptionError ["S2IT0016",[strconc('")",object2String key)]]
   key='mathprint =>
     null l => x
-    stackTraceOptionError ["S2IT0009",[STRCONC('")",object2String key)]]
+    stackTraceOptionError ["S2IT0009",[strconc('")",object2String key)]]
   key => throwKeyedMsg("S2IT0005",[key])
 
 traceOptionError(opt,keys) ==
@@ -231,33 +231,33 @@ traceOptionError(opt,keys) ==
 
 resetTimers () ==
   for timer in _/TIMERLIST repeat
-    setDynamicBinding(INTERN STRCONC(timer,'"_,TIMER"),0)
+    setDynamicBinding(INTERN strconc(timer,'"_,TIMER"),0)
 
 resetSpacers () ==
   for spacer in _/SPACELIST repeat
-    setDynamicBinding(INTERN STRCONC(spacer,'"_,SPACE"),0)
+    setDynamicBinding(INTERN strconc(spacer,'"_,SPACE"),0)
 
 resetCounters () ==
   for k in _/COUNTLIST repeat
-    setDynamicBinding(INTERN STRCONC(k,'"_,COUNT"),0)
+    setDynamicBinding(INTERN strconc(k,'"_,COUNT"),0)
 
 ptimers() ==
   null _/TIMERLIST => sayBrightly '"   no functions are timed"
   for timer in _/TIMERLIST repeat
     sayBrightly ["  ",:bright timer,'_:,'" ",
-      EVAL(INTERN STRCONC(timer,'"_,TIMER")) / float $timerTicksPerSecond,'" sec."]
+      EVAL(INTERN strconc(timer,'"_,TIMER")) / float $timerTicksPerSecond,'" sec."]
 
 pspacers() ==
   null _/SPACELIST => sayBrightly '"   no functions have space monitored"
   for spacer in _/SPACELIST repeat
     sayBrightly ["  ",:bright spacer,'_:,'" ",
-      EVAL INTERN STRCONC(spacer,'"_,SPACE"),'" bytes"]
+      EVAL INTERN strconc(spacer,'"_,SPACE"),'" bytes"]
 
 pcounters() ==
   null _/COUNTLIST => sayBrightly '"   no functions are being counted"
   for k in _/COUNTLIST repeat
     sayBrightly ["  ",:bright k,'_:,'" ",
-      EVAL INTERN STRCONC(k,'"_,COUNT"),'" times"]
+      EVAL INTERN strconc(k,'"_,COUNT"),'" times"]
 
 transOnlyOption l ==
   l is [n,:y] =>
@@ -496,7 +496,7 @@ traceDomainLocalOps(dom,lops,options) ==
 --  lops = 'all => _/TRACE_,1(actualLops,options)
 --  l := NIL
 --  for lop in lops repeat
---    internalName := INTERN STRCONC(PNAME abb,'";",PNAME lop)
+--    internalName := INTERN strconc(PNAME abb,'";",PNAME lop)
 --    not MEMQ(internalName,actualLops) =>
 --      sayMSG ['"  ",:bright abb,'"does not have a local",
 --        '" function called",:bright lop]
@@ -516,7 +516,7 @@ untraceDomainLocalOps(dom,lops) ==
 --    sayMSG ['"  ",:bright abb,'"has no local functions to untrace."]
 --  l := NIL
 --  for lop in lops repeat
---    internalName := INTERN STRCONC(PNAME abb,'";",PNAME lop)
+--    internalName := INTERN strconc(PNAME abb,'";",PNAME lop)
 --    not MEMQ(internalName,actualLops) =>
 --      sayMSG ['"  ",:bright abb,'"does not have a local",
 --        '" function called",:bright lop]
@@ -544,7 +544,7 @@ traceDomainConstructor(domainConstructor,options) ==
   for [argl,.,:domain] in HGET($ConstructorCache,domainConstructor)
     repeat spadTrace(domain,options)
   SETQ(_/TRACENAMES,[domainConstructor,:_/TRACENAMES])
-  innerDomainConstructor := INTERN STRCONC(domainConstructor,'";")
+  innerDomainConstructor := INTERN strconc(domainConstructor,'";")
   if FBOUNDP innerDomainConstructor then domainConstructor := innerDomainConstructor
   EMBED(domainConstructor,
     ['LAMBDA, ['_&REST, 'args],
@@ -564,7 +564,7 @@ untraceDomainConstructor domainConstructor ==
                false
         true
   untraceAllDomainLocalOps domainConstructor
-  innerDomainConstructor := INTERN STRCONC(domainConstructor,'";")
+  innerDomainConstructor := INTERN strconc(domainConstructor,'";")
   if FBOUNDP innerDomainConstructor then UNEMBED innerDomainConstructor
     else UNEMBED domainConstructor
   SETQ(_/TRACENAMES,delete(domainConstructor,_/TRACENAMES))
diff --git a/src/interp/wi1.boot b/src/interp/wi1.boot
index 82b789d9..759acbcf 100644
--- a/src/interp/wi1.boot
+++ b/src/interp/wi1.boot
@@ -47,7 +47,7 @@ tr fn ==
   $convertingSpadFile : local := true
   $options: local := nil
   sfn  := STRINGIMAGE fn
-  newname := STRCONC(sfn,'".as")
+  newname := strconc(sfn,'".as")
   $outStream :local := MAKE_-OUTSTREAM newname
   markSay '"#pile"
   markSay('"#include _"axiom.as_"")
@@ -1014,7 +1014,7 @@ genCaseTag(t,l,n) ==
   l is [x, :l] =>
     x = t     => 
       string? x => INTERN x
-      INTERN STRCONC("value", STRINGIMAGE n)
+      INTERN strconc("value", STRINGIMAGE n)
     x is ["::",=t,:.] => t
     string? x => genCaseTag(t, l, n)
     genCaseTag(t, l, n + 1)
@@ -1107,7 +1107,7 @@ compDefine1(form,m,e) ==
       $formalArgList)
   null $form => stackAndThrow ['"bad == form ",form]
   newPrefix:=
-    $prefix => INTERN STRCONC(encodeItem $prefix,'",",encodeItem $op)
+    $prefix => INTERN strconc(encodeItem $prefix,'",",encodeItem $op)
     getAbbreviation($op,#rest $form)
   compDefineCapsuleFunction(form,m,e,newPrefix,$formalArgList)
 
diff --git a/src/interp/wi2.boot b/src/interp/wi2.boot
index 781c9e63..32b64c19 100644
--- a/src/interp/wi2.boot
+++ b/src/interp/wi2.boot
@@ -436,7 +436,7 @@ applyMapping([op,:argl],m,e,ml) ==
    -- following needed for referencing local funs at capsule level
         getAbbreviation($op,#rest $form)
       [op',:argl',"$"] where
-        op':= INTERN STRCONC(encodeItem nprefix,";",encodeItem op)
+        op':= INTERN strconc(encodeItem nprefix,";",encodeItem op)
     ["%Call",['applyFun,op],:argl']
   pairlis := pairList(argl',$FormalMapVariableList)
   convert([form,SUBLIS(pairlis,first ml),e],m)
author	dos-reis <gdr@axiomatics.org>	2010-05-09 18:37:10 +0000
committer	dos-reis <gdr@axiomatics.org>	2010-05-09 18:37:10 +0000
commit	4c2ef607671da29d8ee0aefd393227af72936b44 (patch)
tree	0c515e0003e4c164390e66d3aa39bfb342520601 /src/interp
parent	dc2b7bf37f89919116cc3f599ca7744803013d1e (diff)
download	open-axiom-4c2ef607671da29d8ee0aefd393227af72936b44.tar.gz