diff --git a/books/bookvol10.3.pamphlet b/books/bookvol10.3.pamphlet
index 257be7e..3beba17 100644
--- a/books/bookvol10.3.pamphlet
+++ b/books/bookvol10.3.pamphlet
@@ -64439,7 +64439,7 @@ InputForm():
       ++ would transform s to f.
       ++ Error: if f is not the parsed form of a string.
     parse : String -> %
-      ++ parse is the inverse of unparse. It parses a string to InputForm.
+      ++ parse(s) is the inverse of unparse. It parses a string to InputForm.
     declare  : List %   -> Symbol
       ++ declare(t) returns a name f such that f has been
       ++ declared to the interpreter to be of type t, but has
@@ -64507,8 +64507,9 @@ InputForm():
       symbol? s => string symbol s
       error "strsym: form is neither a string or symbol"
 
+    -- given a function this will attempt to recreate the input string
     unparse x ==
-      atom?(s:% := form2String(x)$Lisp) => strsym s
+      atom?(s:% := unparseInputForm(x)$Lisp) => strsym s
       concat [strsym a for a in destruct s]
 
     parse(s:String):% ==
diff --git a/books/bookvol10.4.pamphlet b/books/bookvol10.4.pamphlet
index 5d88cf9..81328bf 100644
--- a/books/bookvol10.4.pamphlet
+++ b/books/bookvol10.4.pamphlet
@@ -156533,11 +156533,11 @@ ViewDefaultsPackage():Exports == Implementation where
       ++ pointSizeDefault(i) sets the default size of the points in a 2D 
       ++ viewport to i.
     viewPosDefault      :  () -> L NNI
-      ++ viewPosDefault() returns the default X and Y position of a
+      ++ viewPosDefault() returns the default x and y position of a
       ++ viewport window unless overriden explicityly, newly created
       ++ viewports will have this X and Y coordinate.
     viewPosDefault      :  L NNI -> L NNI
-      ++ viewPosDefault([x,y]) sets the default X and Y position of a
+      ++ viewPosDefault([x,y]) sets the default x and y position of a
       ++ viewport window unless overriden explicityly, newly created
       ++ viewports will have th X and Y coordinates x, y.
     viewSizeDefault : () -> L PI
diff --git a/books/bookvol5.pamphlet b/books/bookvol5.pamphlet
index 71b5414..a54c06d 100644
--- a/books/bookvol5.pamphlet
+++ b/books/bookvol5.pamphlet
@@ -140,9 +140,9 @@ of effort. We would like to acknowledge and thank the following people:
 "Tony Kennedy           Ted Kosan              Paul Kosinski"
 "Klaus Kusche           Bernhard Kutzler"
 "Tim Lahey              Larry Lambe            Kaj Laurson"
-"George L. Legendre     Franz Lehner           Frederic Lehobey"
-"Michel Levaud          Howard Levy            Liu Xiaojun"
-"Rudiger Loos           Michael Lucks          Richard Luczak"
+"Franz Lehner           Frederic Lehobey       Michel Levaud"
+"Howard Levy            Liu Xiaojun            Rudiger Loos"
+"Michael Lucks          Richard Luczak"
 "Camm Maguire           Francois Maltey        Alasdair McAndrew"
 "Bob McElrath           Michael McGettrick     Ian Meikle"
 "David Mentre           Victor S. Miller       Gerard Milmeister"
@@ -38929,6 +38929,23 @@ but the Axiom semantics are not the same. Because Axiom was originally
 written in Maclisp, then VMLisp, and then Common Lisp some of these old
 semantics survive. 
 
+\section{InputForm}
+\defun{unparseInputForm}{unparseInputForm}
+This fixes bug 7217. The default title generation is bogus.
+This is called from the unparse function in InputForm, bookvol10.3
+Given a form, $u$, we try to recover the input line that created it.
+\defsdollar{unparseInputForm}{InteractiveMode}
+\defsdollar{unparseInputForm}{formatSigAsTex}
+\begin{chunk}{defun unparseInputForm}
+(defun |unparseInputForm| (u)
+ (let (|$formatSigAsTeX| |$InteractiveMode|)
+ (declare (special |$formatSigAsTeX| |$InteractiveMode|))
+  (setq |$formatSigAsTeX| 1)
+  (setq |$InteractiveMode| nil)
+  (|form2StringLocal| u)))
+
+\end{chunk}
+
 \section{Void}
 \defun{voidValue}{voidValue}
 \begin{chunk}{defun voidValue}
@@ -44959,6 +44976,7 @@ This needs to work off the internal exposure list, not the file.
 \getchunk{defun unescapeStringsInForm}
 \getchunk{defun unifyStruct}
 \getchunk{defun unifyStructVar}
+\getchunk{defun unparseInputForm}
 \getchunk{defun unsqueeze}
 \getchunk{defun untrace}
 \getchunk{defun untraceDomainConstructor}
diff --git a/buglist b/buglist
index a9aa39b..848a407 100644
--- a/buglist
+++ b/buglist
@@ -1,12 +1,40 @@
 =========================================================================
 
-bug 7226: 
+bug 7229: 
 todo 329:
 wish 1011:
 meh 5:
 
 =========================================================================
 
+bug 7228: graphics crash running space3
+
+The src/input/space3.input causes an early exit
+
+=========================================================================
+
+bug 7227: Unexpected end of #<input stream 
+
+see exampleagcode.output, test 3. Now gives the result
+
+Unexpected end of 
+  #<input stream "/research/test/mnt/ubuntu/algebra/interp.daase">
+
+This is caused by the removal of PAFFFF from the current system.
+
+=========================================================================
+
+bug 7226: )d op coerce regression caused by waldek format update.
+
+correct in git 95402C
+
+see src/input/dop test 69
+appears to be in ALGSC
+[4] Vector D2 -> AlgebraGivenByStructuralConstants(D2,D3,D4,D5)
+    from AlgebraGivenByStructuralConstants(D2,D3,D4,D5)
+
+=========================================================================
+
 bug 7225: Lasagna Larga Doppia Riccia does not plot 0.0
 
 See bookvol8.1, section Lasagna Larga Doppia Riccia
@@ -255,28 +283,6 @@ so I suspect the equations are wrong in some way. --tpd
 
 =========================================================================
 
-bug 7217: bad title generated in Axiom 3D output
-
-given:
-
-cf(x,y) == 0.5
-draw(exp(cos(x-y)-sin(x*y))-2,x=-5..5,y=-5..5,_
-     colorFunction==cf,style=="smooth")
-
-The title reads:
-  DEXP((-DSIN(x*y))+DCOS(y-x))-2
-but should read:
-  exp(cos(x-y)-sin(x*y))-2
-
-bug is probably here:
-src/interp/newfort.lisp.pamphlet:;    op = '"cos" => '"DCOS"
-src/interp/newfort.lisp.pamphlet:;    op = '"cosh" => '"DCOSH"
-src/interp/newfort.lisp.pamphlet:           ((BOOT-EQUAL |op| "cos") "DCOS")
-src/interp/newfort.lisp.pamphlet:           ((BOOT-EQUAL |op| "cosh") "DCOSH")
-
-
-=========================================================================
-
 bug 7216: 
 
 t0207:= -a^3*(a+b*x)*Ei(log(c*(a+b*x)^n)/n)/((c*(a+b*x)^n)^(1/n))/b^4/n+3*a^2*(a+b*x)^2*Ei(2*log(c*(a+b*x)^n)/n)/((c*(a+b*x)^n)^(2/n))/b^4/n-3*a*(a+b*x)^3*Ei(3*log(c*(a+b*x)^n)/n)/((c*(a+b*x)^n)^(3/n))/b^4/n+(a+b*x)^4*Ei(4*log(c*(a+b*x)^n)/n)/((c*(a+b*x)^n)^(4/n))/b^4/n
@@ -24310,3 +24316,29 @@ endif
 export COMPILER
 
 
+=========================================================================
+fixed 20120219. 
+
+merged waldek's format.lisp with my format.lisp.
+Note that this breaks the printing of types.
+
+bug 7217: bad title generated in Axiom 3D output
+
+given:
+
+cf(x,y) == 0.5
+draw(exp(cos(x-y)-sin(x*y))-2,x=-5..5,y=-5..5,_
+     colorFunction==cf,style=="smooth")
+
+The title reads:
+  DEXP((-DSIN(x*y))+DCOS(y-x))-2
+but should read:
+  exp(cos(x-y)-sin(x*y))-2
+
+bug is probably here:
+src/interp/newfort.lisp.pamphlet:;    op = '"cos" => '"DCOS"
+src/interp/newfort.lisp.pamphlet:;    op = '"cosh" => '"DCOSH"
+src/interp/newfort.lisp.pamphlet:           ((BOOT-EQUAL |op| "cos") "DCOS")
+src/interp/newfort.lisp.pamphlet:           ((BOOT-EQUAL |op| "cosh") "DCOSH")
+
+
diff --git a/changelog b/changelog
index 54ea166..87a547e 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,305 @@
+20120227 tpd src/axiom-website/patches.html 20120227.01.tpd.patch
+20120227 tpd src/interp/format.lisp fix bug 7217
+20120227 tpd src/input/zimmer.input fix bug 7217
+20120227 tpd src/input/zimmbron.input fix bug 7217
+20120227 tpd src/input/unittest4.input fix bug 7217
+20120227 tpd src/input/unittest1.input fix bug 7217
+20120227 tpd src/input/uniseg.input fix bug 7217
+20120227 tpd src/input/typetower.input fix bug 7217
+20120227 tpd src/input/tutchap1.input fix bug 7217
+20120227 tpd src/input/tsetcatvermeer.input fix bug 7217
+20120227 tpd src/input/tpiezas002.input fix bug 7217
+20120227 tpd src/input/tpiezas001.input fix bug 7217
+20120227 tpd src/input/testprob.input fix bug 7217
+20120227 tpd src/input/test.input fix bug 7217
+20120227 tpd src/input/telford.input fix bug 7217
+20120227 tpd src/input/tanhcoth.input fix bug 7217
+20120227 tpd src/input/tancot.input fix bug 7217
+20120227 tpd src/input/tanatan.input fix bug 7217
+20120227 tpd src/input/table.input fix bug 7217
+20120227 tpd src/input/t111293.input fix bug 7217
+20120227 tpd src/input/symbol.input fix bug 7217
+20120227 tpd src/input/summation.input fix bug 7217
+20120227 tpd src/input/strtbl.input fix bug 7217
+20120227 tpd src/input/string.input fix bug 7217
+20120227 tpd src/input/streams.input fix bug 7217
+20120227 tpd src/input/stream2.input fix bug 7217
+20120227 tpd src/input/stream.input fix bug 7217
+20120227 tpd src/input/stbl.input fix bug 7217
+20120227 tpd src/input/sregset.input fix bug 7217
+20120227 tpd src/input/sqrt3.input fix bug 7217
+20120227 tpd src/input/sqmatrix.input fix bug 7217
+20120227 tpd src/input/spline.input fix bug 7217
+20120227 tpd src/input/space3.input fix bug 7217
+20120227 tpd src/input/solvetra.input fix bug 7217
+20120227 tpd src/input/solveperf.input fix bug 7217
+20120227 tpd src/input/slowint.input fix bug 7217
+20120227 tpd src/input/skew.input fix bug 7217
+20120227 tpd src/input/sinhcosh.input fix bug 7217
+20120227 tpd src/input/sincosex.input fix bug 7217
+20120227 tpd src/input/sincos.input fix bug 7217
+20120227 tpd src/input/set.input fix bug 7217
+20120227 tpd src/input/sersolve.input fix bug 7217
+20120227 tpd src/input/series2.input fix bug 7217
+20120227 tpd src/input/series.input fix bug 7217
+20120227 tpd src/input/segbind.input fix bug 7217
+20120227 tpd src/input/seg.input fix bug 7217
+20120227 tpd src/input/seccsc.input fix bug 7217
+20120227 tpd src/input/sae.input fix bug 7217
+20120227 tpd src/input/ruleset.input fix bug 7217
+20120227 tpd src/input/rules.input fix bug 7217
+20120227 tpd src/input/rubey.input fix bug 7217
+20120227 tpd src/input/roots.input fix bug 7217
+20120227 tpd src/input/roman.input fix bug 7217
+20120227 tpd src/input/robidoux.input fix bug 7217
+20120227 tpd src/input/risch.input fix bug 7217
+20120227 tpd src/input/repa6.input fix bug 7217
+20120227 tpd src/input/regset.input fix bug 7217
+20120227 tpd src/input/reclos2.input fix bug 7217
+20120227 tpd src/input/reclos.input fix bug 7217
+20120227 tpd src/input/realclos.input fix bug 7217
+20120227 tpd src/input/radix.input fix bug 7217
+20120227 tpd src/input/radff.input fix bug 7217
+20120227 tpd src/input/r21bugsbig.input fix bug 7217
+20120227 tpd src/input/r21bugs.input fix bug 7217
+20120227 tpd src/input/r20bugs.input fix bug 7217
+20120227 tpd src/input/r20abugs.input fix bug 7217
+20120227 tpd src/input/quat1.input fix bug 7217
+20120227 tpd src/input/quat.input fix bug 7217
+20120227 tpd src/input/psgenfcn.input fix bug 7217
+20120227 tpd src/input/polycoer.input fix bug 7217
+20120227 tpd src/input/poly1.input fix bug 7217
+20120227 tpd src/input/poly.input fix bug 7217
+20120227 tpd src/input/pmint.input fix bug 7217
+20120227 tpd src/input/pfr1.input fix bug 7217
+20120227 tpd src/input/pfr.input fix bug 7217
+20120227 tpd src/input/pfaffian.input fix bug 7217
+20120227 tpd src/input/perman.input fix bug 7217
+20120227 tpd src/input/perm.input fix bug 7217
+20120227 tpd src/input/patmatch.input fix bug 7217
+20120227 tpd src/input/patch51.input fix bug 7217
+20120227 tpd src/input/pat.input fix bug 7217
+20120227 tpd src/input/pascal1.input fix bug 7217
+20120227 tpd src/input/pascal.input fix bug 7217
+20120227 tpd src/input/parabola.input fix bug 7217
+20120227 tpd src/input/page.input fix bug 7217
+20120227 tpd src/input/padic.input fix bug 7217
+20120227 tpd src/input/overload.input fix bug 7217
+20120227 tpd src/input/ovar.input fix bug 7217
+20120227 tpd src/input/operator.input fix bug 7217
+20120227 tpd src/input/opalg.input fix bug 7217
+20120227 tpd src/input/op1.input fix bug 7217
+20120227 tpd src/input/op.input fix bug 7217
+20120227 tpd src/input/odpol.input fix bug 7217
+20120227 tpd src/input/ode.input fix bug 7217
+20120227 tpd src/input/octonion.input fix bug 7217
+20120227 tpd src/input/oct.input fix bug 7217
+20120227 tpd src/input/numericgamma.input fix bug 7217
+20120227 tpd src/input/numbers.input fix bug 7217
+20120227 tpd src/input/nsfip.input fix bug 7217
+20120227 tpd src/input/nqip.input fix bug 7217
+20120227 tpd src/input/noptip.input fix bug 7217
+20120227 tpd src/input/noonburg.input fix bug 7217
+20120227 tpd src/input/nonlinhomodiffeq.input fix bug 7217
+20120227 tpd src/input/none.input fix bug 7217
+20120227 tpd src/input/nlode.input fix bug 7217
+20120227 tpd src/input/newtonlisp.input fix bug 7217
+20120227 tpd src/input/newton.input fix bug 7217
+20120227 tpd src/input/newlodo.input fix bug 7217
+20120227 tpd src/input/nepip.input fix bug 7217
+20120227 tpd src/input/ndftip.input fix bug 7217
+20120227 tpd src/input/multiple.input fix bug 7217
+20120227 tpd src/input/multfact.input fix bug 7217
+20120227 tpd src/input/mset2.input fix bug 7217
+20120227 tpd src/input/mset.input fix bug 7217
+20120227 tpd src/input/mpoly.input fix bug 7217
+20120227 tpd src/input/mkfunc.input fix bug 7217
+20120227 tpd src/input/mfinfact.input fix bug 7217
+20120227 tpd src/input/matrix1.input fix bug 7217
+20120227 tpd src/input/matrix.input fix bug 7217
+20120227 tpd src/input/mathml.input fix bug 7217
+20120227 tpd src/input/matbug.input fix bug 7217
+20120227 tpd src/input/mapleok.input fix bug 7217
+20120227 tpd src/input/manuel.input fix bug 7217
+20120227 tpd src/input/magma.input fix bug 7217
+20120227 tpd src/input/macbug.input fix bug 7217
+20120227 tpd src/input/lword.input fix bug 7217
+20120227 tpd src/input/lupfact.input fix bug 7217
+20120227 tpd src/input/lpoly.input fix bug 7217
+20120227 tpd src/input/log.input fix bug 7217
+20120227 tpd src/input/lodof.input fix bug 7217
+20120227 tpd src/input/lodo3.input fix bug 7217
+20120227 tpd src/input/lodo2.input fix bug 7217
+20120227 tpd src/input/lodo1.input fix bug 7217
+20120227 tpd src/input/lodo.input fix bug 7217
+20120227 tpd src/input/lodesys.input fix bug 7217
+20120227 tpd src/input/lode.input fix bug 7217
+20120227 tpd src/input/list.input fix bug 7217
+20120227 tpd src/input/liska.input fix bug 7217
+20120227 tpd src/input/lindep.input fix bug 7217
+20120227 tpd src/input/limit.input fix bug 7217
+20120227 tpd src/input/leg.input fix bug 7217
+20120227 tpd src/input/laplace.input fix bug 7217
+20120227 tpd src/input/kuipers.input fix bug 7217
+20120227 tpd src/input/kovacic.input fix bug 7217
+20120227 tpd src/input/knot2.input fix bug 7217
+20120227 tpd src/input/kernel.input fix bug 7217
+20120227 tpd src/input/isprime.input fix bug 7217
+20120227 tpd src/input/is.input fix bug 7217
+20120227 tpd src/input/ipftest.input fix bug 7217
+20120227 tpd src/input/intrf.input fix bug 7217
+20120227 tpd src/input/intmix2.input fix bug 7217
+20120227 tpd src/input/intmix.input fix bug 7217
+20120227 tpd src/input/intheory.input fix bug 7217
+20120227 tpd src/input/intg0.input fix bug 7217
+20120227 tpd src/input/intef2.input fix bug 7217
+20120227 tpd src/input/intef.input fix bug 7217
+20120227 tpd src/input/intdeq.input fix bug 7217
+20120227 tpd src/input/intbypart.input fix bug 7217
+20120227 tpd src/input/intaf.input fix bug 7217
+20120227 tpd src/input/int.input fix bug 7217
+20120227 tpd src/input/ifthenelse.input fix bug 7217
+20120227 tpd src/input/ifact.input fix bug 7217
+20120227 tpd src/input/ideal.input fix bug 7217
+20120227 tpd src/input/ico.input fix bug 7217
+20120227 tpd src/input/i2e.input fix bug 7217
+20120227 tpd src/input/hyperell.input fix bug 7217
+20120227 tpd src/input/hyperbolicrules.input fix bug 7217
+20120227 tpd src/input/hexadec.input fix bug 7217
+20120227 tpd src/input/heugcd.input fix bug 7217
+20120227 tpd src/input/herm.input fix bug 7217
+20120227 tpd src/input/help.input fix bug 7217
+20120227 tpd src/input/heat.input fix bug 7217
+20120227 tpd src/input/heap.input fix bug 7217
+20120227 tpd src/input/gstbl.input fix bug 7217
+20120227 tpd src/input/grpthry.input fix bug 7217
+20120227 tpd src/input/gonshor.input fix bug 7217
+20120227 tpd src/input/genups.input fix bug 7217
+20120227 tpd src/input/gbf.input fix bug 7217
+20120227 tpd src/input/gamma.input fix bug 7217
+20120227 tpd src/input/galois.input fix bug 7217
+20120227 tpd src/input/function.input fix bug 7217
+20120227 tpd src/input/free.input fix bug 7217
+20120227 tpd src/input/frame.input fix bug 7217
+20120227 tpd src/input/frac.input fix bug 7217
+20120227 tpd src/input/fr2.input fix bug 7217
+20120227 tpd src/input/fr1.input fix bug 7217
+20120227 tpd src/input/fr.input fix bug 7217
+20120227 tpd src/input/fparfrc.input fix bug 7217
+20120227 tpd src/input/fparfrac.input fix bug 7217
+20120227 tpd src/input/fns.input fix bug 7217
+20120227 tpd src/input/fname.input fix bug 7217
+20120227 tpd src/input/float1.input fix bug 7217
+20120227 tpd src/input/fixed.input fix bug 7217
+20120227 tpd src/input/finitegraph.input fix bug 7217
+20120227 tpd src/input/file.input fix bug 7217
+20120227 tpd src/input/ffx72.input fix bug 7217
+20120227 tpd src/input/ffieldbug.input fix bug 7217
+20120227 tpd src/input/fferr.input fix bug 7217
+20120227 tpd src/input/ffdemo.input fix bug 7217
+20120227 tpd src/input/farray.input fix bug 7217
+20120227 tpd src/input/exsum.input fix bug 7217
+20120227 tpd src/input/exseries.input fix bug 7217
+20120227 tpd src/input/exprpoly.input fix bug 7217
+20120227 tpd src/input/exprode.input fix bug 7217
+20120227 tpd src/input/expr1.input fix bug 7217
+20120227 tpd src/input/expr.input fix bug 7217
+20120227 tpd src/input/explim.input fix bug 7217
+20120227 tpd src/input/expexpan.input fix bug 7217
+20120227 tpd src/input/exp.input fix bug 7217
+20120227 tpd src/input/exlimit.input fix bug 7217
+20120227 tpd src/input/exlap.input fix bug 7217
+20120227 tpd src/input/exint.input fix bug 7217
+20120227 tpd src/input/exdiff.input fix bug 7217
+20120227 tpd src/input/exampleagcode.input fix bug 7217
+20120227 tpd src/input/evalex.input fix bug 7217
+20120227 tpd src/input/eval.input fix bug 7217
+20120227 tpd src/input/erf.input fix bug 7217
+20120227 tpd src/input/equation2.input fix bug 7217
+20120227 tpd src/input/equation.input fix bug 7217
+20120227 tpd src/input/eqtbl.input fix bug 7217
+20120227 tpd src/input/eq.input fix bug 7217
+20120227 tpd src/input/en.input fix bug 7217
+20120227 tpd src/input/elt.input fix bug 7217
+20120227 tpd src/input/elfuts.input fix bug 7217
+20120227 tpd src/input/elemnum.input fix bug 7217
+20120227 tpd src/input/elemfun.input fix bug 7217
+20120227 tpd src/input/eigen.input fix bug 7217
+20120227 tpd src/input/ei.input fix bug 7217
+20120227 tpd src/input/efi.input fix bug 7217
+20120227 tpd src/input/easter.input fix bug 7217
+20120227 tpd src/input/e1.input fix bug 7217
+20120227 tpd src/input/dpol.input fix bug 7217
+20120227 tpd src/input/dop.input fix bug 7217
+20120227 tpd src/input/donsimple.input fix bug 7217
+20120227 tpd src/input/dmp.input fix bug 7217
+20120227 tpd src/input/divisor.input fix bug 7217
+20120227 tpd src/input/distexpr.input fix bug 7217
+20120227 tpd src/input/dhtri.input fix bug 7217
+20120227 tpd src/input/dhmatrix.input fix bug 7217
+20120227 tpd src/input/dfloat.input fix bug 7217
+20120227 tpd src/input/derivefail.input fix bug 7217
+20120227 tpd src/input/derham.input fix bug 7217
+20120227 tpd src/input/defintrf.input fix bug 7217
+20120227 tpd src/input/defintef.input fix bug 7217
+20120227 tpd src/input/decimal.input fix bug 7217
+20120227 tpd src/input/davis.input fix bug 7217
+20120227 tpd src/input/davenport.input fix bug 7217
+20120227 tpd src/input/danzwill2.input fix bug 7217
+20120227 tpd src/input/danzwill.input fix bug 7217
+20120227 tpd src/input/cyfactor.input fix bug 7217
+20120227 tpd src/input/cycles1.input fix bug 7217
+20120227 tpd src/input/cycles.input fix bug 7217
+20120227 tpd src/input/curry.input fix bug 7217
+20120227 tpd src/input/curl.input fix bug 7217
+20120227 tpd src/input/contfrc.input fix bug 7217
+20120227 tpd src/input/contfrac.input fix bug 7217
+20120227 tpd src/input/conformal.input fix bug 7217
+20120227 tpd src/input/complexfactor.input fix bug 7217
+20120227 tpd src/input/complex.input fix bug 7217
+20120227 tpd src/input/collect.input fix bug 7217
+20120227 tpd src/input/coercels.input fix bug 7217
+20120227 tpd src/input/clifford.input fix bug 7217
+20120227 tpd src/input/clif.input fix bug 7217
+20120227 tpd src/input/classtalk.input fix bug 7217
+20120227 tpd src/input/chtheorem.input fix bug 7217
+20120227 tpd src/input/char.input fix bug 7217
+20120227 tpd src/input/ch.input fix bug 7217
+20120227 tpd src/input/carten.input fix bug 7217
+20120227 tpd src/input/cardinal.input fix bug 7217
+20120227 tpd src/input/card.input fix bug 7217
+20120227 tpd src/input/calculus2.input fix bug 7217
+20120227 tpd src/input/calculus.input fix bug 7217
+20120227 tpd src/input/calcprob.input fix bug 7217
+20120227 tpd src/input/bugs.input fix bug 7217
+20120227 tpd src/input/bug9057.input fix bug 7217
+20120227 tpd src/input/bug6357.input fix bug 7217
+20120227 tpd src/input/bug10312.input fix bug 7217
+20120227 tpd src/input/bug103.input fix bug 7217
+20120227 tpd src/input/bug101.input fix bug 7217
+20120227 tpd src/input/bug100.input fix bug 7217
+20120227 tpd src/input/bstree.input fix bug 7217
+20120227 tpd src/input/branchcut.input fix bug 7217
+20120227 tpd src/input/bop.input fix bug 7217
+20120227 tpd src/input/biquat.input fix bug 7217
+20120227 tpd src/input/binary.input fix bug 7217
+20120227 tpd src/input/besselk.input fix bug 7217
+20120227 tpd src/input/bbtree.input fix bug 7217
+20120227 tpd src/input/atansqrt.input fix bug 7217
+20120227 tpd src/input/asinhatanh.input fix bug 7217
+20120227 tpd src/input/asinatan.input fix bug 7217
+20120227 tpd src/input/array2.input fix bug 7217
+20120227 tpd src/input/array1.input fix bug 7217
+20120227 tpd src/input/arith.input fix bug 7217
+20120227 tpd src/input/antoine.input fix bug 7217
+20120227 tpd src/input/allfact.input fix bug 7217
+20120227 tpd src/input/algfacob.input fix bug 7217
+20120227 tpd src/input/algaggr.input fix bug 7217
+20120227 tpd src/input/ackermann.input fix bug 7217
+20120227 tpd buglist fix bug 7217
+20120227 tpd books/bookvol5 fix bug 7217
+20120227 tpd books/bookvol10.4 fix bug 7217
+20120227 tpd books/bookvol10.3 fix bug 7217
 20120224 tpd src/axiom-website/patches.html 20120224.01.tpd.patch
 20120224 tpd books/ps/v81icosahedron.eps Icosahedron
 20120224 tpd books/ps/v81equation103.eps remove duplicate
diff --git a/src/axiom-website/patches.html b/src/axiom-website/patches.html
index bc7470c..f8a4946 100644
--- a/src/axiom-website/patches.html
+++ b/src/axiom-website/patches.html
@@ -3826,5 +3826,7 @@ buglist 7225: Lasagna Larga Doppia Riccia does not plot 0.0<br/>
 books/bookvol8.1 add Klein bagel example<br/>
 <a href="patches/20120224.01.tpd.patch">20120224.01.tpd.patch</a>
 books/bookvol8.1 add Icosahedron, remove v18equation103<br/>
+<a href="patches/20120227.01.tpd.patch">20120227.01.tpd.patch</a>
+buglist fix bug 7217<br/>
  </body>
 </html>
diff --git a/src/input/ackermann.input.pamphlet b/src/input/ackermann.input.pamphlet
index 4251b11..9d90ad3 100644
--- a/src/input/ackermann.input.pamphlet
+++ b/src/input/ackermann.input.pamphlet
@@ -46,7 +46,7 @@ cache:Table(List Integer,Integer):=empty()
 --R 
 --R
 --R   (3)  table()
---R                                            Type: Table(List Integer,Integer)
+--R                                           Type: Table(List(Integer),Integer)
 --I                                                   Time: 0.01 (OT) = 0.01 sec
 --E 3
 
@@ -87,7 +87,7 @@ ackermann(0,0)
 --R 
 --R
 --R   (6)  [5,13,29,61,125,253,509,1021,2045,4093,8189]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --I                                       Time: 7.03 (EV) + 0.28 (GC) = 7.31 sec
 --E 6
 
@@ -96,7 +96,7 @@ ackermann(0,0)
 --R 
 --R
 --R   (7)  [5,13,29,61,125,253,509,1021,2045,4093,8189]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --I                                       Time: 7.03 (EV) + 0.21 (GC) = 7.24 sec
 --E 7
 
@@ -105,7 +105,7 @@ ackermann(0,0)
 --R 
 --R
 --R   (8)  [5,13,29,61,125,253,509,1021,2045,4093,8189]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --I                         Time: 0.11 (IN) + 15.32 (EV) + 0.03 (GC) = 15.46 sec
 --E 8
 
@@ -114,7 +114,7 @@ ackermann(0,0)
 --R 
 --R
 --R   (9)  [5,13,29,61,125,253,509,1021,2045,4093,8189]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --I                                                   Time: 0.02 (EV) = 0.02 sec
 --E 9
 
@@ -228,7 +228,7 @@ ackerslow(3,10)
 --R 
 --R
 --R   (21)  [5,13,29,61,125,253,509,1021,2045,4093,8189]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --I                                       Time: 7.01 (EV) + 0.26 (GC) = 7.27 sec
 --E 22
 
@@ -237,7 +237,7 @@ ackerslow(3,10)
 --R 
 --R
 --R   (22)  [5,13,29,61,125,253,509,1021,2045,4093,8189]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --I                                       Time: 7.00 (EV) + 0.27 (GC) = 7.27 sec
 --E 23
 
diff --git a/src/input/algaggr.input.pamphlet b/src/input/algaggr.input.pamphlet
index 7068d9e..dba6249 100644
--- a/src/input/algaggr.input.pamphlet
+++ b/src/input/algaggr.input.pamphlet
@@ -26,7 +26,7 @@ l := [1,4,2,-6,0,3,5,4,2,3]
 --R 
 --R
 --R   (1)  [1,4,2,- 6,0,3,5,4,2,3]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 1
 
 --S 2 of 28
@@ -34,7 +34,7 @@ m := list 555555
 --R 
 --R
 --R   (2)  [555555]
---R                                                   Type: List PositiveInteger
+--R                                                  Type: List(PositiveInteger)
 --E 2
 
 --S 3 of 28
@@ -42,7 +42,7 @@ concat(5,l)
 --R 
 --R
 --R   (3)  [5,1,4,2,- 6,0,3,5,4,2,3]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 3
 
 --S 4 of 28
@@ -50,7 +50,7 @@ concat(m,l)
 --R 
 --R
 --R   (4)  [555555,1,4,2,- 6,0,3,5,4,2,3]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 4
 
 --S 5 of 28
@@ -58,7 +58,7 @@ removeDuplicates l
 --R 
 --R
 --R   (5)  [1,4,2,- 6,0,3,5]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 5
 
 --S 6 of 28
@@ -74,7 +74,7 @@ rest l
 --R 
 --R
 --R   (7)  [4,2,- 6,0,3,5,4,2,3]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 7
 
 --S 8 of 28
@@ -98,7 +98,7 @@ l
 --R 
 --R
 --R   (10)  [1,4,2,- 6,0,3,5,4,2,3]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 10
 
 --S 11 of 28
@@ -106,7 +106,7 @@ first(l,3)
 --R 
 --R
 --R   (11)  [1,4,2]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 11
 
 --S 12 of 28
@@ -114,7 +114,7 @@ rest(l,3)
 --R 
 --R
 --R   (12)  [- 6,0,3,5,4,2,3]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 12
 
 --S 13 of 28
@@ -154,7 +154,7 @@ l
 --R 
 --R
 --R   (17)  [1000000000,4,2,- 6,0,3,5,4,2,3]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 17
 
 --S 18 of 28
@@ -162,7 +162,7 @@ insert(10,l,4)
 --R 
 --R
 --R   (18)  [1000000000,4,2,10,- 6,0,3,5,4,2,3]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 18
 
 --S 19 of 28
@@ -170,7 +170,7 @@ insert(2,l,1)
 --R 
 --R
 --R   (19)  [2,1000000000,4,2,- 6,0,3,5,4,2,3]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 19
 
 --S 20 of 28
@@ -186,7 +186,7 @@ reverse l
 --R 
 --R
 --R   (21)  [3,2,4,5,3,0,- 6,2,4,1000000000]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 21
 
 --S 22 of 28
@@ -194,7 +194,7 @@ l
 --R 
 --R
 --R   (22)  [1000000000,4,2,- 6,0,3,5,4,2,3]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 22
 
 --S 23 of 28
@@ -202,7 +202,7 @@ m := [4,2,3,6,5,7,-9,1,2,3,2]
 --R 
 --R
 --R   (23)  [4,2,3,6,5,7,- 9,1,2,3,2]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 23
 
 --S 24 of 28
@@ -210,7 +210,7 @@ sl:SET(INT) := brace l
 --R 
 --R
 --R   (24)  {- 6,0,2,3,4,5,1000000000}
---R                                                            Type: Set Integer
+--R                                                           Type: Set(Integer)
 --E 24
 
 --S 25 of 28
@@ -218,7 +218,7 @@ sm:SET(INT) := brace m
 --R 
 --R
 --R   (25)  {- 9,1,2,3,4,5,6,7}
---R                                                            Type: Set Integer
+--R                                                           Type: Set(Integer)
 --E 25
 
 --S 26 of 28
@@ -226,7 +226,7 @@ difference(sl, sm)
 --R 
 --R
 --R   (26)  {- 6,0,1000000000}
---R                                                            Type: Set Integer
+--R                                                           Type: Set(Integer)
 --E 26
 
 --S 27 of 28
@@ -234,7 +234,7 @@ intersect(sl,sm)
 --R 
 --R
 --R   (27)  {2,3,4,5}
---R                                                            Type: Set Integer
+--R                                                           Type: Set(Integer)
 --E 27
 
 --S 28 of 28
@@ -242,7 +242,7 @@ union(sl,sm)
 --R 
 --R
 --R   (28)  {- 9,- 6,0,1,2,3,4,5,6,7,1000000000}
---R                                                            Type: Set Integer
+--R                                                           Type: Set(Integer)
 --E 28
 )spool 
 )lisp (bye)
diff --git a/src/input/algfacob.input.pamphlet b/src/input/algfacob.input.pamphlet
index 19da787..1428a8c 100644
--- a/src/input/algfacob.input.pamphlet
+++ b/src/input/algfacob.input.pamphlet
@@ -33,7 +33,7 @@ x := 2**8 * 78**7 * 111**3 * 74534
 --R
 --R         16 10  7  3
 --R   (2)  2  3  13 37 83 449
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 2
 
 --S 3 of 37
@@ -42,7 +42,7 @@ y := nilFactor(2,10) * nilFactor(3,20) * nilFactor(5,30)
 --R
 --R         10 20 30
 --R   (3)  2  3  5
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 3
 
 --S 4 of 37
@@ -51,7 +51,7 @@ x*y
 --R
 --R         26 30 30  7  3
 --R   (4)  2  3  5  13 37 83 449
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 4
 
 --S 5 of 37
@@ -60,7 +60,7 @@ w := x+y
 --R
 --R         10 10
 --R   (5)  2  3  13535311 4062978256593778783
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 5
 
 --S 6 of 37
@@ -80,7 +80,7 @@ f := x/y
 --R   (7)  --------------
 --R             10 30
 --R            3  5
---R                                              Type: Fraction Factored Integer
+--R                                            Type: Fraction(Factored(Integer))
 --E 7
 
 --S 8 of 37
@@ -92,7 +92,7 @@ g := (x**9)/y
 --R   (8)  ----------------------
 --R                   30
 --R                  5
---R                                              Type: Fraction Factored Integer
+--R                                            Type: Fraction(Factored(Integer))
 --E 8
 
 --S 9 of 37
@@ -104,7 +104,7 @@ f*g
 --R   (9)  ------------------------
 --R                    60
 --R                   5
---R                                              Type: Fraction Factored Integer
+--R                                            Type: Fraction(Factored(Integer))
 --E 9
 
 --S 10 of 37
@@ -116,7 +116,7 @@ h := (f*g)/(g*nilFactor(2,200))
 --R   (10)  ------------
 --R           194 10 30
 --R          2   3  5
---R                                              Type: Fraction Factored Integer
+--R                                            Type: Fraction(Factored(Integer))
 --E 10
 
 )clear all
@@ -133,7 +133,7 @@ u := factor (x**4 - y**4)
 --R
 --R                          2    2
 --R   (2)  - (y - x)(y + x)(y  + x )
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 12
 
 --S 13 of 37
@@ -142,7 +142,7 @@ v := nilFactor(x-y,2) * nilFactor(x+y,2) * nilFactor(x**2 + y**2,1)
 --R
 --R               2       2  2    2
 --R   (3)  (y - x) (y + x) (y  + x )
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 13
 
 --S 14 of 37
@@ -151,7 +151,7 @@ w := factor(x**2 + 2*x*y + 2*x + 2*y + y**2 + 1) * nilFactor(x-y,2)
 --R
 --R               2           2
 --R   (4)  (y - x) (y + x + 1)
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 14
 
 --S 15 of 37
@@ -159,7 +159,7 @@ nthFactor(u,1)
 --R 
 --R
 --R   (5)  y - x
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 15
 
 --S 16 of 37
@@ -167,7 +167,7 @@ nthFactor(u,2)
 --R 
 --R
 --R   (6)  y + x
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 16
 
 --S 17 of 37
@@ -176,7 +176,7 @@ nthFactor(u,3)
 --R
 --R         2    2
 --R   (7)  y  + x
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 17
 
 --S 18 of 37
@@ -184,7 +184,7 @@ nthFactor(u,4)
 --R 
 --R
 --R   (8)  1
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 18
 
 --S 19 of 37
@@ -193,7 +193,7 @@ gcd(u,v)
 --R
 --R                        2    2
 --R   (9)  (y - x)(y + x)(y  + x )
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 19
 
 --S 20 of 37
@@ -202,7 +202,7 @@ u + v
 --R
 --R                         2    2       2    2
 --R   (10)  (y - x)(y + x)(y  - x  - 1)(y  + x )
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 20
 
 --S 21 of 37
@@ -211,7 +211,7 @@ lcm(u,v)
 --R
 --R                  2       2  2    2
 --R   (11)  - (y - x) (y + x) (y  + x )
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 21
 
 --S 22 of 37
@@ -220,7 +220,7 @@ u * v * w
 --R
 --R                  5       3           2  2    2 2
 --R   (12)  - (y - x) (y + x) (y + x + 1) (y  + x )
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 22
 
 --S 23 of 37
@@ -239,7 +239,7 @@ expand %
 --R   + 
 --R          12     11      14     13    12
 --R     (- 2x   - 2x  )y + x   + 2x   + x
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 23
 
 --S 24 of 37
@@ -251,7 +251,7 @@ u/w
 --R   (14)  - -------------------
 --R                             2
 --R           (y - x)(y + x + 1)
---R                                   Type: Fraction Factored Polynomial Integer
+--R                                Type: Fraction(Factored(Polynomial(Integer)))
 --E 24
 
 --S 25 of 37
@@ -263,7 +263,7 @@ w/(u*v)
 --R   (15)  - -------------------------
 --R                         3  2    2 2
 --R           (y - x)(y + x) (y  + x )
---R                                   Type: Fraction Factored Polynomial Integer
+--R                                Type: Fraction(Factored(Polynomial(Integer)))
 --E 25
 
 --S 26 of 37
@@ -274,7 +274,7 @@ w/(u*v)
 --R   (16)  -------------------------
 --R                2       2  2    2
 --R         (y - x) (y + x) (y  + x )
---R                                   Type: Fraction Factored Polynomial Integer
+--R                                Type: Fraction(Factored(Polynomial(Integer)))
 --E 26
 
 --S 27 of 37
@@ -286,7 +286,7 @@ w/(u*v)
 --R   (17)  - ----------------------------------
 --R                      2       3  2    2 2
 --R               (y - x) (y + x) (y  + x )
---R                                   Type: Fraction Factored Polynomial Integer
+--R                                Type: Fraction(Factored(Polynomial(Integer)))
 --E 27
 
 )clear all
@@ -297,7 +297,7 @@ f : FR INT := 144000
 --R
 --R         7 2 3
 --R   (1)  2 3 5
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 28
 
 --S 29 of 37
@@ -346,7 +346,7 @@ factors f
 --R
 --R   (7)
 --R   [[factor= 2,exponent= 7],[factor= 3,exponent= 2],[factor= 5,exponent= 3]]
---R                         Type: List Record(factor: Integer,exponent: Integer)
+--R                        Type: List(Record(factor: Integer,exponent: Integer))
 --E 34
 
 --S 35 of 37
@@ -363,7 +363,7 @@ f
 --R
 --R         7 2 3
 --R   (9)  2 3 5
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 36
 
 --S 37 of 37
@@ -371,7 +371,7 @@ reduce(*,[nthFactor(f,i) :: (FR INT) for i in 1..numberOfFactors(f)])
 --R 
 --R
 --R   (10)  2 3 5
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 37
 )spool
 )lisp (bye)
diff --git a/src/input/allfact.input.pamphlet b/src/input/allfact.input.pamphlet
index cc75047..8b86206 100644
--- a/src/input/allfact.input.pamphlet
+++ b/src/input/allfact.input.pamphlet
@@ -34,7 +34,7 @@ factor n
 --R 
 --R
 --R   (2)  13 19 269 8387 81173
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 2
 
 -- factorization of gaussian integers
@@ -43,7 +43,7 @@ m:(Complex Integer) := 1324567+%i*53523582
 --R 
 --R
 --R   (3)  1324567 + 53523582%i
---R                                                        Type: Complex Integer
+--R                                                       Type: Complex(Integer)
 --E 3
 
 --S 4 of 21
@@ -51,7 +51,7 @@ factor m
 --R 
 --R
 --R   (4)  (2 + 7%i)(7119136 + 1844815%i)
---R                                               Type: Factored Complex Integer
+--R                                             Type: Factored(Complex(Integer))
 --E 4
 
 -- factorization of polynomials over finite fields
@@ -61,7 +61,7 @@ u:UP(x,PF(19)) :=3*x**4+2*x**2+15*x+18
 --R
 --R          4     2
 --R   (5)  3x  + 2x  + 15x + 18
---R                                  Type: UnivariatePolynomial(x,PrimeField 19)
+--R                                 Type: UnivariatePolynomial(x,PrimeField(19))
 --E 5
 
 --S 6 of 21
@@ -70,7 +70,7 @@ factor u
 --R
 --R                   3    2
 --R   (6)  3(x + 18)(x  + x  + 8x + 13)
---R                         Type: Factored UnivariatePolynomial(x,PrimeField 19)
+--R                       Type: Factored(UnivariatePolynomial(x,PrimeField(19)))
 --E 6
 
 -- factorization of polynomials over the integers
@@ -89,7 +89,7 @@ factor v
 --R
 --R           3     2         5    3
 --R   (8)  (4x  + 2x  + 1)(12x  - x  + 12)
---R                               Type: Factored UnivariatePolynomial(x,Integer)
+--R                              Type: Factored(UnivariatePolynomial(x,Integer))
 --E 8
 
 -- factorization of multivariate polynomial over the integers
@@ -108,7 +108,7 @@ factor w
 --R
 --R                   2    2    2   2    2    2
 --R   (10)  z(y + 3)(x  - y  - z )(x  + y  + z )
---R                       Type: Factored MultivariatePolynomial([x,y,z],Integer)
+--R                      Type: Factored(MultivariatePolynomial([x,y,z],Integer))
 --E 10
 
 -- factorization of univariate and multivariate over the rational numbers
@@ -119,7 +119,7 @@ f:MPOLY([x,y,z],FRAC INT) :=(4/9*x**2-1/16)*(x**3/27+125)
 --R          4   5    1   3   500  2   125
 --R   (11)  --- x  - --- x  + --- x  - ---
 --R         243      432       9        16
---R                       Type: MultivariatePolynomial([x,y,z],Fraction Integer)
+--R                      Type: MultivariatePolynomial([x,y,z],Fraction(Integer))
 --E 11
 
 --S 12 of 21
@@ -129,7 +129,7 @@ factor f
 --R          4       3      3           2
 --R   (12)  --- (x - -)(x + -)(x + 15)(x  - 15x + 225)
 --R         243      8      8
---R              Type: Factored MultivariatePolynomial([x,y,z],Fraction Integer)
+--R            Type: Factored(MultivariatePolynomial([x,y,z],Fraction(Integer)))
 --E 12
 
 -- factorization over rational functions
@@ -142,7 +142,7 @@ g:DMP([x,y],FRAC POLY INT):=a**2*x**2/b**2 -c**2*y**2/d**2
 --R   (13)  -- x  - -- y
 --R          2       2
 --R         b       d
---R   Type: DistributedMultivariatePolynomial([x,y],Fraction Polynomial Integer)
+--R Type: DistributedMultivariatePolynomial([x,y],Fraction(Polynomial(Integer)))
 --E 13
 
 --S 14 of 21
@@ -168,7 +168,7 @@ r:FRAC POLY INT:= (a**3/b**3-c**3/(b+1)**3)*(a*d+a/c)
 --R   -----------------------------------------------------------------------------
 --R                                 6     5     4    3
 --R                               (b  + 3b  + 3b  + b )c
---R                                            Type: Fraction Polynomial Integer
+--R                                          Type: Fraction(Polynomial(Integer))
 --E 15
 
 --S 16 of 21
@@ -180,7 +180,7 @@ factorFraction r
 --R   (16)  - ------------------------------------------------------------------
 --R                                        3       3
 --R                                       b (b + 1) c
---R                                   Type: Fraction Factored Polynomial Integer
+--R                                Type: Fraction(Factored(Polynomial(Integer)))
 --E 16
 
 -- factorization over simple algebraic extensions
@@ -235,7 +235,7 @@ factor(x**2+x+1,[a])
 --R              - a + 1      a + 1
 --R   (21)  (x + -------)(x + -----)
 --R                 2           2
---R                                    Type: Factored Polynomial AlgebraicNumber
+--R                                  Type: Factored(Polynomial(AlgebraicNumber))
 --E 21
 )spool
 )lisp (bye)
diff --git a/src/input/antoine.input.pamphlet b/src/input/antoine.input.pamphlet
index 29d01c7..660154a 100644
--- a/src/input/antoine.input.pamphlet
+++ b/src/input/antoine.input.pamphlet
@@ -44,8 +44,8 @@ tri2tri(t1: List Point DoubleFloat, t2: List Point DoubleFloat): _
   n2 := triangleNormal(t2)
   tet2tet(concat(t1, n1), concat(t2, n2))
 --R 
---R   Function declaration tri2tri : (List Point DoubleFloat,List Point 
---R      DoubleFloat) -> DenavitHartenbergMatrix DoubleFloat has been 
+--R   Function declaration tri2tri : (List(Point(DoubleFloat)),List(Point(
+--R      DoubleFloat))) -> DenavitHartenbergMatrix(DoubleFloat) has been 
 --R      added to workspace.
 --R                                                                   Type: Void
 --E 2
@@ -61,8 +61,8 @@ tet2tet(t1: List Point DoubleFloat, t2: List Point DoubleFloat): _
   m2 := makeColumnMatrix t2
   m2 * inverse(m1)
 --R 
---R   Function declaration tet2tet : (List Point DoubleFloat,List Point 
---R      DoubleFloat) -> DenavitHartenbergMatrix DoubleFloat has been 
+--R   Function declaration tet2tet : (List(Point(DoubleFloat)),List(Point(
+--R      DoubleFloat))) -> DenavitHartenbergMatrix(DoubleFloat) has been 
 --R      added to workspace.
 --R                                                                   Type: Void
 --E 3
diff --git a/src/input/arith.input.pamphlet b/src/input/arith.input.pamphlet
index e35af47..72c1feb 100644
--- a/src/input/arith.input.pamphlet
+++ b/src/input/arith.input.pamphlet
@@ -55,7 +55,7 @@ factor %
 --R
 --R         108 216  108
 --R   (4)  2   3   13
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 4
 
 --S 5 of 25
@@ -65,7 +65,7 @@ z := 1/2
 --R        1
 --R   (5)  -
 --R        2
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 5
 
 --S 6 of 25
@@ -75,7 +75,7 @@ v := (z + 1) ** 10
 --R        59049
 --R   (6)  -----
 --R         1024
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 6
 
 --S 7 of 25
@@ -83,7 +83,7 @@ v := (z + 1) ** 10
 --R 
 --R
 --R   (7)  59049
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 7
 
 --S 8 of 25
@@ -92,7 +92,7 @@ u := (x+1)**6
 --R
 --R         6     5      4      3      2
 --R   (8)  x  + 6x  + 15x  + 20x  + 15x  + 6x + 1
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 8
 
 --S 9 of 25
@@ -101,7 +101,7 @@ differentiate(u,x)
 --R
 --R          5      4      3      2
 --R   (9)  6x  + 30x  + 60x  + 60x  + 30x + 6
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 9
 
 -- factor %
@@ -168,14 +168,14 @@ leg(n | n > 1)  == ((2*n-1)*x*leg(n-1)-(n-1)*leg(n-2))/n
 --S 18 of 25
 leg 3
 --R 
---R   Compiling function leg with type Integer -> Polynomial Fraction 
---R      Integer 
+--R   Compiling function leg with type Integer -> Polynomial(Fraction(
+--R      Integer)) 
 --R   Compiling function leg as a recurrence relation.
 --R
 --R        5  3   3
 --R   (4)  - x  - - x
 --R        2      2
---R                                            Type: Polynomial Fraction Integer
+--R                                          Type: Polynomial(Fraction(Integer))
 --E 18
 
 --S 19 of 25
@@ -190,7 +190,7 @@ leg 14
 --R       765765  4   45045  2    429
 --R     - ------ x  + ----- x  - ----
 --R        2048        2048      2048
---R                                            Type: Polynomial Fraction Integer
+--R                                          Type: Polynomial(Fraction(Integer))
 --E 19
 
 -- look at it as a polynomial with rational number coefficients
diff --git a/src/input/array1.input.pamphlet b/src/input/array1.input.pamphlet
index 23aad75..b65d175 100644
--- a/src/input/array1.input.pamphlet
+++ b/src/input/array1.input.pamphlet
@@ -26,7 +26,7 @@ oneDimensionalArray [i**2 for i in 1..10]
 --R 
 --R
 --R   (1)  [1,4,9,16,25,36,49,64,81,100]
---R                                    Type: OneDimensionalArray PositiveInteger
+--R                                   Type: OneDimensionalArray(PositiveInteger)
 --E 1
 
 --S 2 of 9
@@ -34,7 +34,7 @@ a : ARRAY1 INT := new(10,0)
 --R 
 --R
 --R   (2)  [0,0,0,0,0,0,0,0,0,0]
---R                                            Type: OneDimensionalArray Integer
+--R                                           Type: OneDimensionalArray(Integer)
 --E 2
 
 --S 3 of 9
@@ -42,7 +42,7 @@ for i in 1..10 repeat a.i := i; a
 --R 
 --R
 --R   (3)  [1,2,3,4,5,6,7,8,9,10]
---R                                            Type: OneDimensionalArray Integer
+--R                                           Type: OneDimensionalArray(Integer)
 --E 3
 
 --S 4 of 9
@@ -50,7 +50,7 @@ map!(i +-> i ** 2,a); a
 --R 
 --R
 --R   (4)  [1,4,9,16,25,36,49,64,81,100]
---R                                            Type: OneDimensionalArray Integer
+--R                                           Type: OneDimensionalArray(Integer)
 --E 4
 
 --S 5 of 9
@@ -58,7 +58,7 @@ reverse! a
 --R 
 --R
 --R   (5)  [100,81,64,49,36,25,16,9,4,1]
---R                                            Type: OneDimensionalArray Integer
+--R                                           Type: OneDimensionalArray(Integer)
 --E 5
 
 --S 6 of 9
@@ -66,7 +66,7 @@ swap!(a,4,5); a
 --R 
 --R
 --R   (6)  [100,81,64,36,49,25,16,9,4,1]
---R                                            Type: OneDimensionalArray Integer
+--R                                           Type: OneDimensionalArray(Integer)
 --E 6
 
 --S 7 of 9
@@ -74,7 +74,7 @@ sort! a
 --R 
 --R
 --R   (7)  [1,4,9,16,25,36,49,64,81,100]
---R                                            Type: OneDimensionalArray Integer
+--R                                           Type: OneDimensionalArray(Integer)
 --E 7
 
 --S 8 of 9
@@ -82,7 +82,7 @@ b := a(6..10)
 --R 
 --R
 --R   (8)  [36,49,64,81,100]
---R                                            Type: OneDimensionalArray Integer
+--R                                           Type: OneDimensionalArray(Integer)
 --E 8
 
 --S 9 of 9
@@ -90,7 +90,7 @@ copyInto!(a,b,1)
 --R 
 --R
 --R   (9)  [36,49,64,81,100,36,49,64,81,100]
---R                                            Type: OneDimensionalArray Integer
+--R                                           Type: OneDimensionalArray(Integer)
 --E 9
 )spool
 )lisp (bye)
diff --git a/src/input/array2.input.pamphlet b/src/input/array2.input.pamphlet
index f502313..071060a 100644
--- a/src/input/array2.input.pamphlet
+++ b/src/input/array2.input.pamphlet
@@ -34,7 +34,7 @@ arr : ARRAY2 INT := new(5,4,0)
 --R        |0  0  0  0|
 --R        |          |
 --R        +0  0  0  0+
---R                                            Type: TwoDimensionalArray Integer
+--R                                           Type: TwoDimensionalArray(Integer)
 --E 1
 
 --S 2 of 20
@@ -58,7 +58,7 @@ arr
 --R        |0   0  0  0|
 --R        |           |
 --R        +0   0  0  0+
---R                                            Type: TwoDimensionalArray Integer
+--R                                           Type: TwoDimensionalArray(Integer)
 --E 3
 
 --S 4 of 20
@@ -90,7 +90,7 @@ row(arr,1)
 --R 
 --R
 --R   (7)  [17,0,0,0]
---R                                            Type: OneDimensionalArray Integer
+--R                                           Type: OneDimensionalArray(Integer)
 --E 7
 
 --S 8 of 20
@@ -98,7 +98,7 @@ column(arr,1)
 --R 
 --R
 --R   (8)  [17,0,0,0,0]
---R                                            Type: OneDimensionalArray Integer
+--R                                           Type: OneDimensionalArray(Integer)
 --E 8
 
 --S 9 of 20
@@ -130,7 +130,7 @@ map(-,arr)
 --R         | 0     0    0  0|
 --R         |                |
 --R         + 0     0    0  0+
---R                                            Type: TwoDimensionalArray Integer
+--R                                           Type: TwoDimensionalArray(Integer)
 --E 11
 
 --S 12 of 20
@@ -146,7 +146,7 @@ map((x +-> x + x),arr)
 --R         |0   0   0  0|
 --R         |            |
 --R         +0   0   0  0+
---R                                            Type: TwoDimensionalArray Integer
+--R                                           Type: TwoDimensionalArray(Integer)
 --E 12
 
 --S 13 of 20
@@ -162,7 +162,7 @@ arrc := copy(arr)
 --R         |0   0   0  0|
 --R         |            |
 --R         +0   0   0  0+
---R                                            Type: TwoDimensionalArray Integer
+--R                                           Type: TwoDimensionalArray(Integer)
 --E 13
 
 --S 14 of 20
@@ -178,7 +178,7 @@ map!(-,arrc)
 --R         | 0     0    0  0|
 --R         |                |
 --R         + 0     0    0  0+
---R                                            Type: TwoDimensionalArray Integer
+--R                                           Type: TwoDimensionalArray(Integer)
 --E 14
 
 --S 15 of 20
@@ -194,7 +194,7 @@ arrc
 --R         | 0     0    0  0|
 --R         |                |
 --R         + 0     0    0  0+
---R                                            Type: TwoDimensionalArray Integer
+--R                                           Type: TwoDimensionalArray(Integer)
 --E 15
 
 --S 16 of 20
@@ -210,7 +210,7 @@ arr
 --R         |0   0   0  0|
 --R         |            |
 --R         +0   0   0  0+
---R                                            Type: TwoDimensionalArray Integer
+--R                                           Type: TwoDimensionalArray(Integer)
 --E 16
 
 --S 17 of 20
diff --git a/src/input/asinatan.input.pamphlet b/src/input/asinatan.input.pamphlet
index fcbd653..74a975d 100644
--- a/src/input/asinatan.input.pamphlet
+++ b/src/input/asinatan.input.pamphlet
@@ -228,7 +228,7 @@ Dover Publications, Inc. New York 1965. pp203-212
 --R    [0.98,1.3704614844 72,1.3704614844 717770265,- 0.2229735 E -12],
 --R    [0.99,1.4292568534 7,1.4292568534 704694005,0.4694005 E -12],
 --R    [1.0,1.5707963267 95,1.5707963267 948966192,- 0.103381 E -12]]
---R                                                        Type: List List Float
+--R                                                      Type: List(List(Float))
 --E 1
 \end{chunk}
 In the following table there are 4 columns. The first column
@@ -442,7 +442,7 @@ Dover Publications, Inc. New York 1965. pp203-212
 --R    [0.98,0.7752974968 12,0.7752974968 1212640304,0.126403 E -12],
 --R    [0.99,0.7803730800 67,0.7803730800 666358989,- 0.3641011 E -12],
 --R    [1.0,0.7853981633 97,0.7853981633 9744830961,0.4483096 E -12]]
---R                                                        Type: List List Float
+--R                                                      Type: List(List(Float))
 --E 2
 
 )spool 
diff --git a/src/input/asinhatanh.input.pamphlet b/src/input/asinhatanh.input.pamphlet
index cc26f46..d7735cc 100644
--- a/src/input/asinhatanh.input.pamphlet
+++ b/src/input/asinhatanh.input.pamphlet
@@ -230,7 +230,7 @@ Dover Publications, Inc. New York 1965. pp221
 --R    [0.98,0.867160507,0.8671605068 2966515846,- 0.1703348415 E -9],
 --R    [0.99,0.874284812,0.8742848121 8729492676,0.1872949268 E -9],
 --R    [1.0,0.881373587,0.8813735870 1954302523,0.195430252 E -10]]
---R                                                        Type: List List Float
+--R                                                      Type: List(List(Float))
 --E 1
 \end{chunk}
 In the following table there are 4 columns. The first column
@@ -444,7 +444,7 @@ Dover Publications, Inc. New York 1965. pp221
 --R    [0.97,2.09229572,2.0922957200 349394077,0.349394077 E -10],
 --R    [0.98,2.297559925,2.2975599250 672949634,0.672949634 E -10],
 --R    [0.99,2.646652412,2.6466524123 622461976,0.3622461976 E -9]]
---R                                                        Type: List List Float
+--R                                                      Type: List(List(Float))
 --E 2
 
 )spool 
diff --git a/src/input/atansqrt.input.pamphlet b/src/input/atansqrt.input.pamphlet
index e164208..552def3 100644
--- a/src/input/atansqrt.input.pamphlet
+++ b/src/input/atansqrt.input.pamphlet
@@ -32,7 +32,7 @@ z:=atan sqrt ((1-cos x)/(1+cos x))
 --R              |- cos(x) + 1
 --R   (1)  atan( |------------ )
 --R             \| cos(x) + 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 1
 \end{chunk}
 this should generate x/2
@@ -44,7 +44,7 @@ integrate(differentiate(z,x),x)
 --R        x
 --R   (2)  -
 --R        2
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 2
 \end{chunk}
 so should this be x/2
@@ -56,7 +56,7 @@ rootSimp(normalize(z))
 --R        x
 --R   (3)  -
 --R        2
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 3
 )spool
 )lisp (bye)
diff --git a/src/input/bbtree.input.pamphlet b/src/input/bbtree.input.pamphlet
index 601781a..1d20add 100644
--- a/src/input/bbtree.input.pamphlet
+++ b/src/input/bbtree.input.pamphlet
@@ -26,7 +26,7 @@ lm := [3,5,7,11]
 --R 
 --R
 --R   (1)  [3,5,7,11]
---R                                                   Type: List PositiveInteger
+--R                                                  Type: List(PositiveInteger)
 --E 1
 
 --S 2 of 10
@@ -34,7 +34,7 @@ modTree(12,lm)
 --R 
 --R
 --R   (2)  [0,2,5,1]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 2
 
 --S 3 of 10
@@ -42,7 +42,7 @@ t := balancedBinaryTree(#lm, 0)
 --R 
 --R
 --R   (3)  [[0,0,0],0,[0,0,0]]
---R                                  Type: BalancedBinaryTree NonNegativeInteger
+--R                                 Type: BalancedBinaryTree(NonNegativeInteger)
 --E 3
 
 --S 4 of 10
@@ -50,7 +50,7 @@ setleaves!(t,lm)
 --R 
 --R
 --R   (4)  [[3,0,5],0,[7,0,11]]
---R                                  Type: BalancedBinaryTree NonNegativeInteger
+--R                                 Type: BalancedBinaryTree(NonNegativeInteger)
 --E 4
 
 --S 5 of 10
@@ -66,7 +66,7 @@ t
 --R 
 --R
 --R   (6)  [[3,15,5],1155,[7,77,11]]
---R                                  Type: BalancedBinaryTree NonNegativeInteger
+--R                                 Type: BalancedBinaryTree(NonNegativeInteger)
 --E 6
 
 --S 7 of 10
@@ -74,7 +74,7 @@ mapDown!(t,12,_rem)
 --R 
 --R
 --R   (7)  [[0,12,2],12,[5,12,1]]
---R                                  Type: BalancedBinaryTree NonNegativeInteger
+--R                                 Type: BalancedBinaryTree(NonNegativeInteger)
 --E 7
 
 --S 8 of 10
@@ -82,7 +82,7 @@ leaves %
 --R 
 --R
 --R   (8)  [0,2,5,1]
---R                                                Type: List NonNegativeInteger
+--R                                               Type: List(NonNegativeInteger)
 --E 8
 
 --S 9 of 10
@@ -90,7 +90,7 @@ squares := [x**2 rem m for x in % for m in lm]
 --R 
 --R
 --R   (9)  [0,4,4,1]
---R                                                Type: List NonNegativeInteger
+--R                                               Type: List(NonNegativeInteger)
 --E 9
 
 --S 10 of 10
diff --git a/src/input/besselk.input.pamphlet b/src/input/besselk.input.pamphlet
index 2617e57..21a0c08 100644
--- a/src/input/besselk.input.pamphlet
+++ b/src/input/besselk.input.pamphlet
@@ -28,7 +28,7 @@ D(besselK(a,x),x)
 --R        - besselK(a + 1,x) - besselK(a - 1,x)
 --R   (1)  -------------------------------------
 --R                          2
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 1
 
 --S 2 of 6
@@ -36,14 +36,14 @@ D(besselK(a,x),a)
 --R
 --R   (2)  besselK  (a,x)
 --R               ,1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 2
 
 --S 3 of 6
 integrate(D(besselK(a,x),a),a)
 --R
 --R   (3)  besselK(a,x)
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 3
 
 --S 4 of 6
diff --git a/src/input/binary.input.pamphlet b/src/input/binary.input.pamphlet
index 0fa7dde..7ce04fd 100644
--- a/src/input/binary.input.pamphlet
+++ b/src/input/binary.input.pamphlet
@@ -49,7 +49,7 @@ r + binary(6/7)
 --R    0.000000100111011, 0.000000100111,
 --R       ____________________________________________________
 --R    0.00000010011010100100001110011111011001010110111100011]
---R                                                   Type: List BinaryExpansion
+--R                                                  Type: List(BinaryExpansion)
 --E 3
 
 --S 4 of 7
@@ -75,7 +75,7 @@ p := binary(1/4)*x**2 + binary(2/3)*x + binary(4/9)
 --R
 --R             2     __      ______
 --R   (5)  0.01x  + 0.10x + 0.011100
---R                                             Type: Polynomial BinaryExpansion
+--R                                            Type: Polynomial(BinaryExpansion)
 --E 5
 
 --S 6 of 7
@@ -84,7 +84,7 @@ q := D(p, x)
 --R
 --R                 __
 --R   (6)  0.1x + 0.10
---R                                             Type: Polynomial BinaryExpansion
+--R                                            Type: Polynomial(BinaryExpansion)
 --E 6
 
 --S 7 of 7
@@ -93,7 +93,7 @@ g := gcd(p, q)
 --R
 --R              __
 --R   (7)  x + 1.01
---R                                             Type: Polynomial BinaryExpansion
+--R                                            Type: Polynomial(BinaryExpansion)
 --E 7
 )spool
 )lisp (bye)
diff --git a/src/input/biquat.input.pamphlet b/src/input/biquat.input.pamphlet
index baa3ee4..07299a8 100644
--- a/src/input/biquat.input.pamphlet
+++ b/src/input/biquat.input.pamphlet
@@ -28,7 +28,7 @@ Clifford biquaternions which are an entirely different object)
 C:=Complex Expression Integer
 --R 
 --R
---R   (1)  Complex Expression Integer
+--R   (1)  Complex(Expression(Integer))
 --R                                                                 Type: Domain
 --E 1
 
@@ -36,7 +36,7 @@ C:=Complex Expression Integer
 Q:=Quaternion C
 --R 
 --R
---R   (2)  Quaternion Complex Expression Integer
+--R   (2)  Quaternion(Complex(Expression(Integer)))
 --R                                                                 Type: Domain
 --E 2
 
@@ -45,7 +45,7 @@ q:Q:=quatern(q0,q1,q2,q3)
 --R 
 --R
 --R   (3)  q0 + q1 i + q2 j + q3 k
---R                                  Type: Quaternion Complex Expression Integer
+--R                               Type: Quaternion(Complex(Expression(Integer)))
 --E 3
 
 \end{chunk}
@@ -56,8 +56,8 @@ quaternion
 --S 4 of 43
 qlist(l:List C):Q==quatern(1.1,1.2,1.3,1.4)
 --R 
---R   Function declaration qlist : List Complex Expression Integer -> 
---R      Quaternion Complex Expression Integer has been added to 
+--R   Function declaration qlist : List(Complex(Expression(Integer))) -> 
+--R      Quaternion(Complex(Expression(Integer))) has been added to 
 --R      workspace.
 --R                                                                   Type: Void
 --E 4
@@ -69,8 +69,9 @@ Define a function that takes a quaternion into a list
 --S 5 of 43
 listq(x:Q):List C == [real x, imagI x, imagJ x, imagK x]
 --R 
---R   Function declaration listq : Quaternion Complex Expression Integer
---R       -> List Complex Expression Integer has been added to workspace.
+--R   Function declaration listq : Quaternion(Complex(Expression(Integer))
+--R      ) -> List(Complex(Expression(Integer))) has been added to 
+--R      workspace.
 --R                                                                   Type: Void
 --E 5
 
@@ -83,8 +84,8 @@ matrixq(x:Q):Matrix C == matrix _
              [[real x + %i*imagI(x), imagJ x + %i*imagK(x)],_
              [-imagJ(x) + %i*imagK(x), real x - %i*imagI(x)]]
 --R 
---R   Function declaration matrixq : Quaternion Complex Expression Integer
---R       -> Matrix Complex Expression Integer has been added to 
+--R   Function declaration matrixq : Quaternion(Complex(Expression(Integer
+--R      ))) -> Matrix(Complex(Expression(Integer))) has been added to 
 --R      workspace.
 --R                                                                   Type: Void
 --E 6
@@ -109,7 +110,7 @@ sig0:=quatern(1,0,0,0)::Q
 --R 
 --R
 --R   (7)  1
---R                                  Type: Quaternion Complex Expression Integer
+--R                               Type: Quaternion(Complex(Expression(Integer)))
 --E 7
 
 --S 8 of 43
@@ -117,7 +118,7 @@ sig1:=%i*quatern(0,0,0,1)::Q
 --R 
 --R
 --R   (8)  %i k
---R                                  Type: Quaternion Complex Expression Integer
+--R                               Type: Quaternion(Complex(Expression(Integer)))
 --E 8
 
 --S 9 of 43
@@ -125,7 +126,7 @@ sig2:=%i*quatern(0,0,1,0)::Q
 --R 
 --R
 --R   (9)  %i j
---R                                  Type: Quaternion Complex Expression Integer
+--R                               Type: Quaternion(Complex(Expression(Integer)))
 --E 9
 
 --S 10 of 43
@@ -133,7 +134,7 @@ sig3:=-%i*quatern(0,1,0,0)::Q
 --R 
 --R
 --R   (10)  - %i i
---R                                  Type: Quaternion Complex Expression Integer
+--R                               Type: Quaternion(Complex(Expression(Integer)))
 --E 10
 
 \end{chunk}
@@ -165,8 +166,9 @@ biquaternion.
 --S 11 of 43
 siglist(x:Q):List C == [real x, -imagK(x)*%i, -imagJ(x)*%i, %i*imagI(x)]
 --R 
---R   Function declaration siglist : Quaternion Complex Expression Integer
---R       -> List Complex Expression Integer has been added to workspace.
+--R   Function declaration siglist : Quaternion(Complex(Expression(Integer
+--R      ))) -> List(Complex(Expression(Integer))) has been added to 
+--R      workspace.
 --R                                                                   Type: Void
 --E 11
 
@@ -179,8 +181,8 @@ Define the quaternion derivative (Morgan, 2001, Eq. 2)
 --S 12 of 43
 D(q:Q,x:Symbol,y:Symbol,z:Symbol):Q==sig1*D(q,x)+sig2*D(q,y)+sig3*D(q,z)
 --R 
---R   Function declaration D : (Quaternion Complex Expression Integer,
---R      Symbol,Symbol,Symbol) -> Quaternion Complex Expression Integer 
+--R   Function declaration D : (Quaternion(Complex(Expression(Integer))),
+--R      Symbol,Symbol,Symbol) -> Quaternion(Complex(Expression(Integer)))
 --R      has been added to workspace.
 --R                                                                   Type: Void
 --E 12
@@ -230,7 +232,7 @@ F:Q:=Ft(x,y,z)*sig0+Fx(x,y,z)*sig1+Fy(x,y,z)*sig2+Fz(x,y,z)*sig3
 --R 
 --R
 --R   (17)  Ft(x,y,z) - Fz(x,y,z)%i i + Fy(x,y,z)%i j + Fx(x,y,z)%i k
---R                                  Type: Quaternion Complex Expression Integer
+--R                               Type: Quaternion(Complex(Expression(Integer)))
 --E 17
 
 \end{chunk}
@@ -244,11 +246,11 @@ In the Pauli basis the derivative of this biquat should produce
 --S 18 of 43
 siglist(D(F,x,y,z))
 --R 
---R   Compiling function D with type (Quaternion Complex Expression 
---R      Integer,Symbol,Symbol,Symbol) -> Quaternion Complex Expression 
---R      Integer 
---R   Compiling function siglist with type Quaternion Complex Expression 
---R      Integer -> List Complex Expression Integer 
+--R   Compiling function D with type (Quaternion(Complex(Expression(
+--R      Integer))),Symbol,Symbol,Symbol) -> Quaternion(Complex(Expression
+--R      (Integer))) 
+--R   Compiling function siglist with type Quaternion(Complex(Expression(
+--R      Integer))) -> List(Complex(Expression(Integer))) 
 --R
 --R   (18)
 --R   [Fz  (x,y,z) + Fy  (x,y,z) + Fx  (x,y,z),
@@ -259,7 +261,7 @@ siglist(D(F,x,y,z))
 --R      ,2               ,1            ,3
 --R    Ft  (x,y,z) + (Fy  (x,y,z) - Fx  (x,y,z))%i]
 --R      ,3             ,1            ,2
---R                                        Type: List Complex Expression Integer
+--R                                     Type: List(Complex(Expression(Integer)))
 --E 18
 
 \end{chunk}
@@ -301,9 +303,9 @@ rotation of $\theta$ radians about the axis defined by the unit $q$ biquat
 --S 19 of 43
 rot(theta:Expression Integer,q:Q):Q==cos(theta/2)-%i::Q*q*sin(theta/2)
 --R 
---R   Function declaration rot : (Expression Integer,Quaternion Complex 
---R      Expression Integer) -> Quaternion Complex Expression Integer has 
---R      been added to workspace.
+--R   Function declaration rot : (Expression(Integer),Quaternion(Complex(
+--R      Expression(Integer)))) -> Quaternion(Complex(Expression(Integer))
+--R      ) has been added to workspace.
 --R                                                                   Type: Void
 --E 19
 
@@ -319,17 +321,17 @@ the name to avoid this confusion.
 --S 20 of 43
 ((x:Q)/(y:Q)):Q == x*inv(y)
 --R 
---R   Function declaration ?/? : (Quaternion Complex Expression Integer,
---R      Quaternion Complex Expression Integer) -> Quaternion Complex 
---R      Expression Integer has been added to workspace.
+--R   Function declaration ?/? : (Quaternion(Complex(Expression(Integer)))
+--R      ,Quaternion(Complex(Expression(Integer)))) -> Quaternion(Complex(
+--R      Expression(Integer))) has been added to workspace.
 --R                                                                   Type: Void
 --E 20
 
 --S 21 of 43
 abs(q:Q):C == sqrt((q*conjugate(q))::C)
 --R 
---R   Function declaration abs : Quaternion Complex Expression Integer -> 
---R      Complex Expression Integer has been added to workspace.
+--R   Function declaration abs : Quaternion(Complex(Expression(Integer)))
+--R       -> Complex(Expression(Integer)) has been added to workspace.
 --R                                                                   Type: Void
 --E 21
 
@@ -339,8 +341,8 @@ exp(q:Q):Q == (_
   exp( (q+conjugate(q))::C/2)$C * (sig0*cos(abs(q)) +_
   (q-conjugate(q))/abs(q-conjugate(q))*sin(abs(q))) )
 --R 
---R   Function declaration exp : Quaternion Complex Expression Integer -> 
---R      Quaternion Complex Expression Integer has been added to 
+--R   Function declaration exp : Quaternion(Complex(Expression(Integer)))
+--R       -> Quaternion(Complex(Expression(Integer))) has been added to 
 --R      workspace.
 --R                                                                   Type: Void
 --E 22
@@ -356,15 +358,15 @@ qx:=sig1
 --R 
 --R
 --R   (23)  %i k
---R                                  Type: Quaternion Complex Expression Integer
+--R                               Type: Quaternion(Complex(Expression(Integer)))
 --E 23
 
 --S 24 of 43
 mm:=siglist(rot(2,qx))
 --R 
---R   Compiling function / with type (Quaternion Complex Expression 
---R      Integer,Quaternion Complex Expression Integer) -> Quaternion 
---R      Complex Expression Integer 
+--R   Compiling function / with type (Quaternion(Complex(Expression(
+--R      Integer))),Quaternion(Complex(Expression(Integer)))) -> 
+--R      Quaternion(Complex(Expression(Integer))) 
 --R   There are 2 exposed and 6 unexposed library operations named cos 
 --R      having 1 argument(s) but none was determined to be applicable. 
 --R      Use HyperDoc Browse, or issue
@@ -374,14 +376,14 @@ mm:=siglist(rot(2,qx))
 --R      will allow you to apply the operation.
 --R   Cannot find a definition or applicable library operation named cos 
 --R      with argument type(s) 
---R                    Quaternion Complex Expression Integer
+--R                  Quaternion(Complex(Expression(Integer)))
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
 --R      or "$" to specify which version of the function you need.
 --R   AXIOM will attempt to step through and interpret the code.
---R   Compiling function rot with type (Expression Integer,Quaternion 
---R      Complex Expression Integer) -> Quaternion Complex Expression 
---R      Integer 
+--R   Compiling function rot with type (Expression(Integer),Quaternion(
+--R      Complex(Expression(Integer)))) -> Quaternion(Complex(Expression(
+--R      Integer))) 
 --R
 --R   (24)
 --R                2         3                  3          2
@@ -395,7 +397,7 @@ mm:=siglist(rot(2,qx))
 --R                   2          2                        2          2
 --R            2sin(1)  + 2cos(1)                  2sin(1)  + 2cos(1)
 --R    0, 0]
---R                                        Type: List Complex Expression Integer
+--R                                     Type: List(Complex(Expression(Integer)))
 --E 24
 
 --S 25 of 43
@@ -410,15 +412,15 @@ nn:=siglist(exp(-%i::Q*qx))
 --R      will allow you to apply the operation.
 --R   Cannot find a definition or applicable library operation named exp 
 --R      with argument type(s) 
---R                    Quaternion Complex Expression Integer
+--R                  Quaternion(Complex(Expression(Integer)))
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
 --R      or "$" to specify which version of the function you need.
 --R   AXIOM will attempt to step through and interpret the code.
---R   Compiling function exp with type Quaternion Complex Expression 
---R      Integer -> Quaternion Complex Expression Integer 
---R   Compiling function abs with type Quaternion Complex Expression 
---R      Integer -> Complex Expression Integer 
+--R   Compiling function exp with type Quaternion(Complex(Expression(
+--R      Integer))) -> Quaternion(Complex(Expression(Integer))) 
+--R   Compiling function abs with type Quaternion(Complex(Expression(
+--R      Integer))) -> Complex(Expression(Integer)) 
 --R
 --R   (25)
 --R                2         3                  3          2
@@ -432,7 +434,7 @@ nn:=siglist(exp(-%i::Q*qx))
 --R                   2          2                        2          2
 --R            2sin(1)  + 2cos(1)                  2sin(1)  + 2cos(1)
 --R    0, 0]
---R                                        Type: List Complex Expression Integer
+--R                                     Type: List(Complex(Expression(Integer)))
 --E 25
 
 --S 26 of 43
@@ -464,7 +466,7 @@ qnv:=q1*sig1+q2*sig2+sqrt(1-q1^2-q2^2)*sig3
 --R            +---------------+
 --R            |    2     2
 --R   (27)  - \|- q2  - q1  + 1 %i i + q2 %i j + q1 %i k
---R                                  Type: Quaternion Complex Expression Integer
+--R                               Type: Quaternion(Complex(Expression(Integer)))
 --E 27
 
 \end{chunk}
@@ -492,7 +494,7 @@ theta:=_\theta
 --R 
 --R
 --R   (28)  \theta
---R                                                        Type: Variable \theta
+--R                                                       Type: Variable(\theta)
 --E 28
 
 --S 29 of 43
@@ -534,7 +536,7 @@ testqeq:=map(simplify,siglist(rot(theta,qnv)-exp((-theta/2)*%i*qnv)))_
 --R    /
 --R       \theta
 --R     ]
---R                                        Type: List Expression Complex Integer
+--R                                     Type: List(Expression(Complex(Integer)))
 --E 29
 
 \end{chunk}
@@ -567,7 +569,7 @@ posthetaRule:=rule sqrt(theta^2)==theta
 --R          +------+
 --R          |     2
 --R   (30)  \|theta   == theta
---R                        Type: RewriteRule(Integer,Integer,Expression Integer)
+--R                       Type: RewriteRule(Integer,Integer,Expression(Integer))
 --E 30
 
 \end{chunk}
@@ -584,7 +586,7 @@ map(x+->posthetaRule(x), [0,sqrt(theta^2),0,sqrt(theta^2)])
 --R 
 --R
 --R   (31)  [0,\theta,0,\theta]
---R                                                Type: List Expression Integer
+--R                                              Type: List(Expression(Integer))
 --E 31
 
 \end{chunk}
@@ -604,7 +606,7 @@ posthetaRule testqeq.1
 --RDaly Bug
 --R   Cannot find a definition or applicable library operation named 
 --R      posthetaRule with argument type(s) 
---R                         Expression Complex Integer
+--R                        Expression(Complex(Integer))
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
 --R      or "$" to specify which version of the function you need.
@@ -621,7 +623,7 @@ we are testing I can successfully get one answer.
 --R 
 --R
 --R   (32)  [0]
---R                                                Type: List Expression Integer
+--R                                              Type: List(Expression(Integer))
 --E 33
 
 \end{chunk}
@@ -633,8 +635,8 @@ But this doesn't extend to the remainder of the list.
 --R 
 --R 
 --RDaly Bug
---R   Cannot convert from type Expression Complex Integer to Expression 
---R      Integer for value
+--R   Cannot convert from type Expression(Complex(Integer)) to Expression(
+--R      Integer) for value
 --R                       +-------+
 --R         +-------+     |      2
 --R         |      2     \|\theta                       \theta
@@ -664,16 +666,16 @@ So let's find out more about this domain:
 --R Issue )edit bookvol10.3.pamphlet to see algebra source code for RULE 
 --R
 --R------------------------------- Operations --------------------------------
---R ?=? : (%,%) -> Boolean                coerce : Equation F -> %
+--R ?=? : (%,%) -> Boolean                coerce : Equation(F) -> %
 --R coerce : % -> OutputForm              elt : (%,F,PositiveInteger) -> F
 --R ?.? : (%,F) -> F                      hash : % -> SingleInteger
 --R latex : % -> String                   lhs : % -> F
---R pattern : % -> Pattern Base           retract : % -> Equation F
---R rhs : % -> F                          rule : (F,F,List Symbol) -> %
+--R pattern : % -> Pattern(Base)          retract : % -> Equation(F)
+--R rhs : % -> F                          rule : (F,F,List(Symbol)) -> %
 --R rule : (F,F) -> %                     ?~=? : (%,%) -> Boolean
---R quotedOperators : % -> List Symbol
---R retractIfCan : % -> Union(Equation F,"failed")
---R suchThat : (%,List Symbol,(List F -> Boolean)) -> %
+--R quotedOperators : % -> List(Symbol)
+--R retractIfCan : % -> Union(Equation(F),"failed")
+--R suchThat : (%,List(Symbol),(List(F) -> Boolean)) -> %
 --R
 --E 35
 
@@ -717,7 +719,7 @@ posxRule:=(rule sqrt('theta^2)==theta)$RewriteRule(Integer,Complex Integer,_
 --R          +------+
 --R          |     2
 --R   (36)  \|theta   == theta
---R        Type: RewriteRule(Integer,Complex Integer,Expression Complex Integer)
+--R     Type: RewriteRule(Integer,Complex(Integer),Expression(Complex(Integer)))
 --E 39
 
 --S 40 of 43
@@ -725,7 +727,7 @@ map(x+->posxRule x, testqeq)
 --R 
 --R
 --R   (37)  [0,0,0,0]
---R                                        Type: List Expression Complex Integer
+--R                                     Type: List(Expression(Complex(Integer)))
 --E 40
 
 \end{chunk}
@@ -777,7 +779,7 @@ eval(eval(testqeq,theta=sqrt(beta)),sqrt(beta)=theta)
 --R 
 --R
 --R   (40)  [0,0,0,0]
---R                                        Type: List Expression Complex Integer
+--R                                     Type: List(Expression(Complex(Integer)))
 --E 43
 
 )spool 
diff --git a/src/input/bop.input.pamphlet b/src/input/bop.input.pamphlet
index c86a602..0e4aed2 100644
--- a/src/input/bop.input.pamphlet
+++ b/src/input/bop.input.pamphlet
@@ -36,7 +36,7 @@ deq := D(y x, x, 2) + D(y x, x) + y x = 0
 --R         ,,       ,
 --R   (2)  y  (x) + y (x) + y(x)= 0
 --R
---R                                            Type: Equation Expression Integer
+--R                                          Type: Equation(Expression(Integer))
 --E 2
 
 --S 3 of 17
diff --git a/src/input/branchcut.input.pamphlet b/src/input/branchcut.input.pamphlet
index 31c8ac0..50cb95d 100644
--- a/src/input/branchcut.input.pamphlet
+++ b/src/input/branchcut.input.pamphlet
@@ -51,7 +51,7 @@ t1:=integrate(a/(a*x+b),x=0..1,"noPole")
 --R        log(b  + 2a b + a ) - log(b )
 --R   (1)  -----------------------------
 --R                      2
---R                    Type: Union(f1: OrderedCompletion Expression Integer,...)
+--R                  Type: Union(f1: OrderedCompletion(Expression(Integer)),...)
 --E 1
 
 --S 2 of 5
@@ -63,7 +63,7 @@ t2:=(1/a)*log((a+b)/b)
 --R              b
 --R   (2)  ----------
 --R             a
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 2
 
 --S 3 of 5
@@ -75,7 +75,7 @@ complexNormalize t1-t2
 --R                                                   b
 --R   (3)  -----------------------------------------------
 --R                               2a
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 3
 
 --S 4 of 5
@@ -85,7 +85,7 @@ t3:=log(a+b)/a-log(b)/a
 --R        log(b + a) - log(b)
 --R   (4)  -------------------
 --R                 a
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 4
 
 --S 5 of 5
@@ -96,7 +96,7 @@ complexNormalize t1-t3
 --R        a log(b  + 2a b + a ) - a log(b ) - 2log(b + a) + 2log(b)
 --R   (5)  ---------------------------------------------------------
 --R                                    2a
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 5
 
 )spool 
diff --git a/src/input/bstree.input.pamphlet b/src/input/bstree.input.pamphlet
index fa10cbe..df39544 100644
--- a/src/input/bstree.input.pamphlet
+++ b/src/input/bstree.input.pamphlet
@@ -26,7 +26,7 @@ lv := [8,3,5,4,6,2,1,5,7]
 --R 
 --R
 --R   (1)  [8,3,5,4,6,2,1,5,7]
---R                                                   Type: List PositiveInteger
+--R                                                  Type: List(PositiveInteger)
 --E 1
 
 --S 2 of 12
@@ -34,7 +34,7 @@ t := binarySearchTree lv
 --R 
 --R
 --R   (2)  [[[1,2,.],3,[4,5,[5,6,7]]],8,.]
---R                                       Type: BinarySearchTree PositiveInteger
+--R                                      Type: BinarySearchTree(PositiveInteger)
 --E 2
 
 --S 3 of 12
@@ -42,7 +42,7 @@ emptybst := empty()$BSTREE(INT)
 --R 
 --R
 --R   (3)  []
---R                                               Type: BinarySearchTree Integer
+--R                                              Type: BinarySearchTree(Integer)
 --E 3
 
 --S 4 of 12
@@ -50,7 +50,7 @@ t1 := insert!(8,emptybst)
 --R 
 --R
 --R   (4)  8
---R                                               Type: BinarySearchTree Integer
+--R                                              Type: BinarySearchTree(Integer)
 --E 4
 
 --S 5 of 12
@@ -58,7 +58,7 @@ insert!(3,t1)
 --R 
 --R
 --R   (5)  [3,8,.]
---R                                               Type: BinarySearchTree Integer
+--R                                              Type: BinarySearchTree(Integer)
 --E 5
 
 --S 6 of 12
@@ -66,7 +66,7 @@ leaves t
 --R 
 --R
 --R   (6)  [1,4,5,7]
---R                                                   Type: List PositiveInteger
+--R                                                  Type: List(PositiveInteger)
 --E 6
 
 --S 7 of 12
@@ -100,13 +100,13 @@ buildFromRoot ls == reduce(insertRoot,ls,emptybst)
 --S 11 of 12
 rt := buildFromRoot reverse lv
 --R 
---R   Compiling function buildFromRoot with type List PositiveInteger -> 
---R      BinarySearchTree Integer 
---R   Compiling function insertRoot with type (Integer,BinarySearchTree 
---R      Integer) -> BinarySearchTree Integer 
+--R   Compiling function buildFromRoot with type List(PositiveInteger) -> 
+--R      BinarySearchTree(Integer) 
+--R   Compiling function insertRoot with type (Integer,BinarySearchTree(
+--R      Integer)) -> BinarySearchTree(Integer) 
 --R
 --R   (11)  [[[1,2,.],3,[4,5,[5,6,7]]],8,.]
---R                                               Type: BinarySearchTree Integer
+--R                                              Type: BinarySearchTree(Integer)
 --E 11
 
 --S 12 of 12
diff --git a/src/input/bug100.input.pamphlet b/src/input/bug100.input.pamphlet
index c6fc0d6..4c01fb6 100644
--- a/src/input/bug100.input.pamphlet
+++ b/src/input/bug100.input.pamphlet
@@ -58,7 +58,7 @@ integrate((z^a+1)^b,z)
 --R         ++     a     b
 --R   (1)   |   (%I  + 1) d%I
 --R        ++
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 1
 \end{chunk}
 If we substitute z for %I we get:
diff --git a/src/input/bug101.input.pamphlet b/src/input/bug101.input.pamphlet
index 10f97a9..d7210bb 100644
--- a/src/input/bug101.input.pamphlet
+++ b/src/input/bug101.input.pamphlet
@@ -37,7 +37,7 @@ A more reasonable return value, not supported by Axiom, would be:
 laplace(log(z),z,w)
 --R
 --R   (1)  laplace(log(z),z,w)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 1
 
 --S 2 of 2
@@ -46,7 +46,7 @@ laplace(log(z),w,z)
 --R        log(z)
 --R   (2)  ------
 --R           z
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 2
 \end{chunk}
 \begin{chunk}{*}
diff --git a/src/input/bug103.input.pamphlet b/src/input/bug103.input.pamphlet
index 6479735..8f0e298 100644
--- a/src/input/bug103.input.pamphlet
+++ b/src/input/bug103.input.pamphlet
@@ -60,7 +60,7 @@ solve(z=z,z)
 --R 
 --R
 --R   (1)  [0= 0]
---R                              Type: List Equation Fraction Polynomial Integer
+--R                          Type: List(Equation(Fraction(Polynomial(Integer))))
 --E 1
 \end{chunk}
 If we substitute z for %I we get:
diff --git a/src/input/bug10312.input.pamphlet b/src/input/bug10312.input.pamphlet
index 886463c..a0b642b 100644
--- a/src/input/bug10312.input.pamphlet
+++ b/src/input/bug10312.input.pamphlet
@@ -28,7 +28,7 @@ p:=(1/2+n)::UTS(FRAC INT, 'n, 0)
 --R        1
 --R   (1)  - + n
 --R        2
---R                           Type: UnivariateTaylorSeries(Fraction Integer,n,0)
+--R                          Type: UnivariateTaylorSeries(Fraction(Integer),n,0)
 --E 1
 
 --S 2 of 2
@@ -42,7 +42,7 @@ p:=(1/2+n)::UTS(FRAC INT, 'n, 0)
 --R   + 
 --R          10      11
 --R     2048n   + O(n  )
---R                           Type: UnivariateTaylorSeries(Fraction Integer,n,0)
+--R                          Type: UnivariateTaylorSeries(Fraction(Integer),n,0)
 --E 2
 )spool
 )lisp (bye)
diff --git a/src/input/bug6357.input.pamphlet b/src/input/bug6357.input.pamphlet
index 8850d8d..7705a02 100644
--- a/src/input/bug6357.input.pamphlet
+++ b/src/input/bug6357.input.pamphlet
@@ -47,7 +47,7 @@ sqrt(-1/abs(x))-1/sqrt(-abs(x))
 --R   (2)  --------------------------
 --R                 +--------+
 --R                \|- abs(x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 2
 )spool
 )lisp (bye)
diff --git a/src/input/bug9057.input.pamphlet b/src/input/bug9057.input.pamphlet
index 6d2707d..de033b2 100644
--- a/src/input/bug9057.input.pamphlet
+++ b/src/input/bug9057.input.pamphlet
@@ -38,11 +38,11 @@ f==n+->sum(g(j),j=1..n)
 --S 3 of 9
 f(1)
 --R 
---R   Compiling function f with type PositiveInteger -> Expression Integer
---R      
+--R   Compiling function f with type PositiveInteger -> Expression(Integer
+--R      ) 
 --R
 --R   (3)  g(1)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 3
 
 --S 4 of 9
@@ -56,11 +56,11 @@ f==n+->product(sum(1/i,i=1..j),j=1..n)
 --S 5 of 9
 f(1)
 --R 
---R   Compiling function f with type PositiveInteger -> Expression Integer
---R      
+--R   Compiling function f with type PositiveInteger -> Expression(Integer
+--R      ) 
 --R
 --R   (5)  1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 5
 
 --S 6 of 9
@@ -74,11 +74,11 @@ f==n+->product(product(1/i,i=1..j),j=1..n)
 --S 7 of 9
 f(1)
 --R 
---R   Compiling function f with type PositiveInteger -> Expression Integer
---R      
+--R   Compiling function f with type PositiveInteger -> Expression(Integer
+--R      ) 
 --R
 --R   (7)  1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 7
 
 --S 8 of 9
@@ -101,15 +101,15 @@ f(1)
 --R      will allow you to apply the operation.
 --R   Cannot find a definition or applicable library operation named sum 
 --R      with argument type(s) 
---R            Union(Fraction Polynomial Integer,Expression Integer)
---R                       SegmentBinding PositiveInteger
+--R          Union(Fraction(Polynomial(Integer)),Expression(Integer))
+--R                       SegmentBinding(PositiveInteger)
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
 --R      or "$" to specify which version of the function you need.
 --R   AXIOM will attempt to step through and interpret the code.
 --R
 --R   (9)  1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 9
 )spool
 )lisp (bye)
diff --git a/src/input/bugs.input.pamphlet b/src/input/bugs.input.pamphlet
index 37030c0..68628be 100644
--- a/src/input/bugs.input.pamphlet
+++ b/src/input/bugs.input.pamphlet
@@ -34,7 +34,7 @@ eq1:= A*x**2 + B*x*y + C*y**2 +D*x + E*y + F
 --R
 --R           2                   2
 --R   (1)  C y  + (B x + E)y + A x  + D x + F
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 1
 
 --S 2 of 44 
@@ -50,7 +50,7 @@ eq2:= eval(eq1,[x= xdot*cos(t) - ydot*sin(t), y=xdot*sin(t) + ydot*cos(t)])
 --R   + 
 --R            2                       2       2
 --R     (C ydot  + B xdot ydot + A xdot )cos(t)  + (E ydot + D xdot)cos(t) + F
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 2
 
 -- UTS coercions.  Fixed by SCM, verified on 10/30/90
@@ -69,7 +69,7 @@ taylor exp x
 --R        1    9      1     10      11
 --R     ------ x  + ------- x   + O(x  )
 --R     362880      3628800
---R                         Type: UnivariateTaylorSeries(Expression Integer,x,0)
+--R                        Type: UnivariateTaylorSeries(Expression(Integer),x,0)
 --E 3
 
 --S 4 of 44 
@@ -84,7 +84,7 @@ s := %
 --R        1    9      1     10      11
 --R     ------ x  + ------- x   + O(x  )
 --R     362880      3628800
---R                         Type: UnivariateTaylorSeries(Expression Integer,x,0)
+--R                        Type: UnivariateTaylorSeries(Expression(Integer),x,0)
 --E 4
 
 --S 5 of 44 
@@ -106,7 +106,7 @@ s::(UTS(EXPR FLOAT, x, 0))
 --R   + 
 --R                                   10      11
 --R     0.2755731922 3985890653 E -6 x   + O(x  )
---R                         Type: UnivariateTaylorSeries(Expression Float,x,0.0)
+--R                        Type: UnivariateTaylorSeries(Expression(Float),x,0.0)
 --E 5
 
 --S 6 of 44 
@@ -138,7 +138,7 @@ eval(s,1)
 --R             5 8 65 163 1957 685 109601 98641
 --R   (5)  [1,2,-,-,--,---,----,---,------,-----,...]
 --R             2 3 24  60  720 252  40320 36288
---R                                              Type: Stream Expression Integer
+--R                                            Type: Stream(Expression(Integer))
 --E 7
 
 --S 8 of 44 
@@ -149,7 +149,7 @@ eval(s,1)
 --R   [1.0, 2.0, 2.5, 2.6666666666 666666667, 2.7083333333 333333333,
 --R    2.7166666666 666666667, 2.7180555555 555555556, 2.7182539682 53968254,
 --R    2.7182787698 412698413, 2.7182815255 731922399, ...]
---R                                                           Type: Stream Float
+--R                                                          Type: Stream(Float)
 --E 8
 
 -- overloading interpreter maps on arity
@@ -199,11 +199,11 @@ f(5)
 --S 14 of 44 
 f(1,x)
 --R 
---R   Compiling function f with type (PositiveInteger,Variable x) -> 
---R      Polynomial Integer 
+--R   Compiling function f with type (PositiveInteger,Variable(x)) -> 
+--R      Polynomial(Integer) 
 --R
 --R   (6)  x + 1
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 14
 
 -- targetted function requiring a coercion
@@ -219,7 +219,7 @@ series(n +-> bernoulli(n)/factorial(n), t=0)
 --R       1      1  2    1   4     1    6      1     8       1     10      11
 --R   1 - - t + -- t  - --- t  + ----- t  - ------- t  + -------- t   + O(t  )
 --R       2     12      720      30240      1209600      47900160
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,t,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),t,0)
 --E 15
 
 -- in-homogeneous list mapping
@@ -232,7 +232,7 @@ l := [1,2,-1]
 --R 
 --R
 --R   (1)  [1,2,- 1]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 16
 
 --S 17 of 44 
@@ -250,10 +250,10 @@ f x == x
 --S 19 of 44 
 map(f, l)
 --R 
---R   Compiling function f with type Integer -> Fraction Integer 
+--R   Compiling function f with type Integer -> Fraction(Integer) 
 --R
 --R   (4)  [1,2,- 1]
---R                                                  Type: List Fraction Integer
+--R                                                Type: List(Fraction(Integer))
 --E 19
 
 -- Function args to interpreter functions
@@ -300,7 +300,7 @@ groebner [x**2 - y, y**3+1]
 --R
 --R              2  6
 --R   (1)  [y - x ,x  + 1]
---R                                                Type: List Polynomial Integer
+--R                                              Type: List(Polynomial(Integer))
 --E 24
 
 -- operations requiring polynomials, passed variables
@@ -313,7 +313,7 @@ factor x
 --R 
 --R
 --R   (1)  x
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 25
 
 -- bracket parsing and empty-set types
@@ -326,7 +326,7 @@ factor x
 --R 
 --R 
 --RDaly Bug
---R   The function SEQ is not implemented in List Integer .
+--R   The function SEQ is not implemented in List(Integer) .
 --E 26
 
 --S 27 of 44 
@@ -347,7 +347,7 @@ map(variable, [x,y])
 --R 
 --R
 --R   (1)  [x,y]
---R                         Type: List Union(OrderedVariableList [x,y],"failed")
+--R                       Type: List(Union(OrderedVariableList([x,y]),"failed"))
 --E 28
 
 -- Recursive map type analysis bug
@@ -371,17 +371,17 @@ pp(n,x) == if n=0 then 1 else if n<0 then (-1)**n/p(-n,1-x) else p(n,x)
 --S 31 of 44 
 pp(-1,x) -- should be 1/(x-1)
 --R 
---R   Compiling function p with type (Integer,Polynomial Integer) -> 
---R      Polynomial Integer 
---R   Compiling function p with type (Integer,Variable x) -> Polynomial 
---R      Integer 
---R   Compiling function pp with type (Integer,Variable x) -> Fraction 
---R      Polynomial Fraction Integer 
+--R   Compiling function p with type (Integer,Polynomial(Integer)) -> 
+--R      Polynomial(Integer) 
+--R   Compiling function p with type (Integer,Variable(x)) -> Polynomial(
+--R      Integer) 
+--R   Compiling function pp with type (Integer,Variable(x)) -> Fraction(
+--R      Polynomial(Fraction(Integer))) 
 --R
 --R          1
 --R   (3)  -----
 --R        x - 1
---R                                   Type: Fraction Polynomial Fraction Integer
+--R                                Type: Fraction(Polynomial(Fraction(Integer)))
 --E 31
 
 -- interpret-code mode for iterators is broken
@@ -473,23 +473,23 @@ mp(x,l) ==
 --S 37 of 44 
 mp(x, [1,3,4, 2])
 --R 
---R   Compiling function mp with type (Variable x,List PositiveInteger)
---R       -> Polynomial Integer 
+--R   Compiling function mp with type (Variable(x),List(PositiveInteger))
+--R       -> Polynomial(Integer) 
 --R
 --R         3     2
 --R   (2)  x  + 3x  + 4x + 2
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 37
 
 --S 38 of 44 
 mp(x, [1,2,-3, 4])
 --R 
---R   Compiling function mp with type (Variable x,List Integer) -> 
---R      Polynomial Integer 
+--R   Compiling function mp with type (Variable(x),List(Integer)) -> 
+--R      Polynomial(Integer) 
 --R
 --R         3     2
 --R   (3)  x  + 2x  - 3x + 4
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 38
 
 -- Tests compilation of recursive functions
@@ -547,7 +547,7 @@ f5 n == if n=0 or n=1 then 1 else f5(n-1)+f5(n-2)
 --R   Compiling function f5 with type Integer -> PositiveInteger 
 --R
 --R   (6)  [3,3,3,3,3]
---R                                                   Type: List PositiveInteger
+--R                                                  Type: List(PositiveInteger)
 --E 44
 )spool
 )lisp (bye)
diff --git a/src/input/calcprob.input.pamphlet b/src/input/calcprob.input.pamphlet
index e5eeaa6..ba6d6d5 100644
--- a/src/input/calcprob.input.pamphlet
+++ b/src/input/calcprob.input.pamphlet
@@ -22,7 +22,7 @@ Cover a range of calculus problems
 solve(3*x-(x-7)=4*x-5,x)
 --R
 --R   (1)  [x= 6]
---R                              Type: List Equation Fraction Polynomial Integer
+--R                          Type: List(Equation(Fraction(Polynomial(Integer))))
 --E 1
 
 --S 2 of 12
@@ -31,7 +31,7 @@ solve(4*x-3*y=9,y)::List Equation Polynomial Fraction Integer
 --R            4
 --R   (2)  [y= - x - 3]
 --R            3
---R                              Type: List Equation Polynomial Fraction Integer
+--R                          Type: List(Equation(Polynomial(Fraction(Integer))))
 --E 2
 
 --S 3 of 12
@@ -40,7 +40,7 @@ solve(A*x+B*y=C,y)
 --R            - A x + C
 --R   (3)  [y= ---------]
 --R                B
---R                              Type: List Equation Fraction Polynomial Integer
+--R                          Type: List(Equation(Fraction(Polynomial(Integer))))
 --E 3
 
 --S 4 of 12
@@ -49,7 +49,7 @@ m:=3*x-4*(x-(2/3)*y)=(4/5)*x-(7*y+3)
 --R        8               4
 --R   (4)  - y - x= - 7y + - x - 3
 --R        3               5
---R                                   Type: Equation Polynomial Fraction Integer
+--R                                Type: Equation(Polynomial(Fraction(Integer)))
 --E 4
 
 --S 5 of 12
@@ -58,14 +58,14 @@ n:=solve(m*15,y)
 --R            27x - 45
 --R   (5)  [y= --------]
 --R               145
---R                              Type: List Equation Fraction Polynomial Integer
+--R                          Type: List(Equation(Fraction(Polynomial(Integer))))
 --E 5
 
 --S 6 of 12
 p:=n.1*145-27*x
 --R
 --R   (6)  145y - 27x= - 45
---R                                   Type: Equation Fraction Polynomial Integer
+--R                                Type: Equation(Fraction(Polynomial(Integer)))
 --E 6
 
 --S 7 of 12
@@ -88,14 +88,14 @@ m:=(y2-y1)/(x2-x1)
 --R          10
 --R   (9)  - --
 --R           3
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 9
 
 --S 10 of 12
 solve(y1=m*x1+b,b)
 --R
 --R   (10)  [b= - 18]
---R                              Type: List Equation Fraction Polynomial Integer
+--R                          Type: List(Equation(Fraction(Polynomial(Integer))))
 --E 10
 
 --S 11 of 12
@@ -111,7 +111,7 @@ y=m*x+b
 --R              10
 --R   (12)  y= - -- x - 18
 --R               3
---R                                   Type: Equation Polynomial Fraction Integer
+--R                                Type: Equation(Polynomial(Fraction(Integer)))
 --E 12
 )spool 
 )lisp (bye)
diff --git a/src/input/calculus.input.pamphlet b/src/input/calculus.input.pamphlet
index 50b5237..13cf593 100644
--- a/src/input/calculus.input.pamphlet
+++ b/src/input/calculus.input.pamphlet
@@ -28,7 +28,7 @@ differentiate(f, x)
 --R 
 --R
 --R   (1)  0
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 1
 
 --S 2 of 24
@@ -61,7 +61,7 @@ a := f(x z, y z, z**2) + x y(z+1)
 --R
 --R                                   2
 --R   (5)  x(y(z + 1)) + f(x(z),y(z),z )
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 5
 
 --S 6 of 24
@@ -76,7 +76,7 @@ dadz := differentiate(a, z)
 --R      ,           ,
 --R     x (y(z + 1))y (z + 1)
 --R
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 6
 
 --S 7 of 24
@@ -93,7 +93,7 @@ eval(eval(dadz, 'x, z +-> exp z), 'y, z +-> log(z+1))
 --R                  ,1
 --R  /
 --R     z + 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 7
 
 --S 8 of 24
@@ -102,7 +102,7 @@ eval(eval(a, 'x, z +-> exp z), 'y, z +-> log(z+1))
 --R
 --R            z             2
 --R   (8)  f(%e ,log(z + 1),z ) + z + 2
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 8
 
 --S 9 of 24
@@ -119,7 +119,7 @@ differentiate(%, z)
 --R                  ,1
 --R  /
 --R     z + 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 9
 
 -- Input for page LaplacePage
@@ -130,7 +130,7 @@ sin(a*t) * cosh(a*t) - cos(a*t) * sinh(a*t)
 --R 
 --R
 --R   (1)  - cos(a t)sinh(a t) + cosh(a t)sin(a t)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 10
 
 --S 11 of 24
@@ -142,7 +142,7 @@ laplace(%, t, s)
 --R   (2)  --------
 --R         4     4
 --R        s  + 4a
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 11
 
 --S 12 of 24
@@ -150,7 +150,7 @@ laplace((exp(a*t) - exp(b*t))/t, t, s)
 --R 
 --R
 --R   (3)  - log(s - a) + log(s - b)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 12
 
 --S 13 of 24
@@ -159,7 +159,7 @@ laplace(2/t * (1 - cos(a*t)), t, s)
 --R
 --R             2    2
 --R   (4)  log(s  + a ) - 2log(s)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 13
 
 --S 14 of 24
@@ -170,7 +170,7 @@ laplace(exp(-a*t) * sin(b*t) / b**2, t, s)
 --R   (5)  ------------------------
 --R           2             3    2
 --R        b s  + 2a b s + b  + a b
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 14
 
 --S 15 of 24
@@ -181,7 +181,7 @@ laplace((cos(a*t) - cos(b*t))/t, t, s)
 --R        log(s  + b ) - log(s  + a )
 --R   (6)  ---------------------------
 --R                     2
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 15
 
 --S 16 of 24
@@ -193,7 +193,7 @@ laplace(exp(a*t+b)*Ei(c*t), t, s)
 --R                   c
 --R   (7)  -----------------
 --R              s - a
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 16
 
 --S 17 of 24
@@ -207,7 +207,7 @@ laplace(a*Ci(b*t) + c*Si(d*t), t, s)
 --R                 b
 --R   (8)  ---------------------------
 --R                     2s
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 17
 
 --S 18 of 24
@@ -220,7 +220,7 @@ laplace(sin(a*t) - a*t*cos(a*t) + exp(t**2), t, s)
 --R   (9)  ----------------------------------------
 --R                      4     2 2    4
 --R                     s  + 2a s  + a
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 18
 
 -- Input for page DerivativePage
@@ -233,7 +233,7 @@ f := exp exp x
 --R            x
 --R          %e
 --R   (1)  %e
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 19
 
 --S 20 of 24
@@ -243,7 +243,7 @@ differentiate(f, x)
 --R               x
 --R          x  %e
 --R   (2)  %e %e
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 20
 
 --S 21 of 24
@@ -253,7 +253,7 @@ differentiate(f, x, 4)
 --R                                              x
 --R            x 4       x 3       x 2     x   %e
 --R   (3)  ((%e )  + 6(%e )  + 7(%e )  + %e )%e
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 21
 
 --S 22 of 24
@@ -262,7 +262,7 @@ g := sin(x**2 + y)
 --R
 --R                 2
 --R   (4)  sin(y + x )
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 22
 
 --S 23 of 24
@@ -271,7 +271,7 @@ differentiate(g, y)
 --R
 --R                 2
 --R   (5)  cos(y + x )
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 23
 
 --S 24 of 24
@@ -280,7 +280,7 @@ differentiate(g, [y, y, x, x])
 --R
 --R          2         2              2
 --R   (6)  4x sin(y + x ) - 2cos(y + x )
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 24
  
 )spool
diff --git a/src/input/calculus2.input.pamphlet b/src/input/calculus2.input.pamphlet
index 9a522be..bc5d87d 100644
--- a/src/input/calculus2.input.pamphlet
+++ b/src/input/calculus2.input.pamphlet
@@ -28,7 +28,7 @@ differentiate(f, x)
 --R 
 --R
 --R   (1)  0
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 1
 
 --S 2 of 112
@@ -61,7 +61,7 @@ a := f(x z, y z, z**2) + x y(z+1)
 --R
 --R                                   2
 --R   (5)  x(y(z + 1)) + f(x(z),y(z),z )
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 5
 
 --S 6 of 112
@@ -76,7 +76,7 @@ dadz := differentiate(a, z)
 --R      ,           ,
 --R     x (y(z + 1))y (z + 1)
 --R
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 6
 
 --S 7 of 112
@@ -93,7 +93,7 @@ eval(eval(dadz, 'x, z +-> exp z), 'y, z +-> log(z+1))
 --R                  ,1
 --R  /
 --R     z + 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 7
 
 --S 8 of 112
@@ -102,7 +102,7 @@ eval(eval(a, 'x, z +-> exp z), 'y, z +-> log(z+1))
 --R
 --R            z             2
 --R   (8)  f(%e ,log(z + 1),z ) + z + 2
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 8
 
 --S 9 of 112
@@ -119,7 +119,7 @@ differentiate(%, z)
 --R                  ,1
 --R  /
 --R     z + 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 9
 
 -- Input for page SeriesArithmeticPage
@@ -130,7 +130,7 @@ x := series x
 --R 
 --R
 --R   (1)  x
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 10
 
 --S 11 of 112
@@ -138,7 +138,7 @@ num := 3 + x
 --R 
 --R
 --R   (2)  3 + x
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 11
 
 --S 12 of 112
@@ -146,7 +146,7 @@ den := 1 + 7 * x
 --R 
 --R
 --R   (3)  1 + 7x
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 12
 
 --S 13 of 112
@@ -159,7 +159,7 @@ num / den
 --R   + 
 --R              8             9             10      11
 --R     16470860x  - 115296020x  + 807072140x   + O(x  )
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 13
 
 --S 14 of 112
@@ -168,7 +168,7 @@ base := 1 / (1 - x)
 --R
 --R                 2    3    4    5    6    7    8    9    10      11
 --R   (5)  1 + x + x  + x  + x  + x  + x  + x  + x  + x  + x   + O(x  )
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 14
 
 --S 15 of 112
@@ -177,7 +177,7 @@ expon := x * base
 --R
 --R             2    3    4    5    6    7    8    9    10    11      12
 --R   (6)  x + x  + x  + x  + x  + x  + x  + x  + x  + x   + x   + O(x  )
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 15
 
 --S 16 of 112
@@ -192,7 +192,7 @@ base ** expon
 --R     245339  10      11
 --R     ------ x   + O(x  )
 --R      10080
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 16
 
 -- Input for page SeriesConversionPage
@@ -203,7 +203,7 @@ f := sin(a*x)
 --R 
 --R
 --R   (1)  sin(a x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 17
 
 --S 18 of 112
@@ -214,7 +214,7 @@ series(f,x = 0)
 --R              a   3    a   5    a    7     a     9      a      11      12
 --R   (2)  a x - -- x  + --- x  - ---- x  + ------ x  - -------- x   + O(x  )
 --R               6      120      5040      362880      39916800
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 18
 
 --S 19 of 112
@@ -225,7 +225,7 @@ g := y / (exp(y) - 1)
 --R   (3)  -------
 --R          y
 --R        %e  - 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 19
 
 --S 20 of 112
@@ -236,7 +236,7 @@ series(g)
 --R       1      1  2    1   4     1    6      1     8       1     10      11
 --R   1 - - y + -- y  - --- y  + ----- y  - ------- y  + -------- y   + O(y  )
 --R       2     12      720      30240      1209600      47900160
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,y,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),y,0)
 --E 20
 
 --S 21 of 112
@@ -244,7 +244,7 @@ h := sin(3*x)
 --R 
 --R
 --R   (5)  sin(3x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 21
 
 --S 22 of 112
@@ -267,7 +267,7 @@ series(h,x,x = %pi/12)
 --R                 %pi 11          %pi 12
 --R     sin(33)(x - ---)   + O((x - ---)  )
 --R                  12              12
---R                    Type: UnivariatePuiseuxSeries(Expression Integer,x,pi/12)
+--R                  Type: UnivariatePuiseuxSeries(Expression(Integer),x,%pi/12)
 --E 22
 
 --S 23 of 112
@@ -279,7 +279,7 @@ series(sqrt(tan(a*x)),x = 0)
 --R         +-+ 2   a \|a   2   19a \|a   2      6
 --R   (7)  \|a x  + ------ x  + -------- x  + O(x )
 --R                    6           360
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 23
 
 --S 24 of 112
@@ -294,7 +294,7 @@ series(sec(x) ** 2,x = %pi/2)
 --R       2        %pi 8          %pi 9
 --R     ----- (x - ---)  + O((x - ---) )
 --R     10395       2              2
---R                     Type: UnivariatePuiseuxSeries(Expression Integer,x,pi/2)
+--R                   Type: UnivariatePuiseuxSeries(Expression(Integer),x,%pi/2)
 --E 24
 
 --S 25 of 112
@@ -306,7 +306,7 @@ bern := t * exp(t*x) / (exp(t) - 1)
 --R   (9)  -------
 --R          t
 --R        %e  - 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 25
 
 --S 26 of 112
@@ -343,7 +343,7 @@ series(bern,t = 0)
 --R     66x   - 330x  + 495x  - 462x  + 330x  - 99x  + 5  10      11
 --R     ------------------------------------------------ t   + O(t  )
 --R                         239500800
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,t,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),t,0)
 --E 26
 
 -- Input for page SeriesDifferentialEquationPage
@@ -367,15 +367,15 @@ eq := differentiate(y(x), x, 3) - sin(differentiate(y(x), x, 2))_
 --R         ,,,        y(x)     ,,
 --R   (2)  y   (x) - %e    sin(y  (x))= cos(x)
 --R
---R                                            Type: Equation Expression Integer
+--R                                          Type: Equation(Expression(Integer))
 --E 28
 
 --S 29 of 112
 seriesSolve(eq, y, x = 0, [1, 0, 0])
 --R 
---I   Compiling function %B with type List UnivariateTaylorSeries(
---R      Expression Integer,x,0) -> UnivariateTaylorSeries(Expression 
---R      Integer,x,0) 
+--I   Compiling function %B with type List(UnivariateTaylorSeries(
+--R      Expression(Integer),x,0)) -> UnivariateTaylorSeries(Expression(
+--R      Integer),x,0) 
 --R
 --R   (3)
 --R                          2            3              4      2
@@ -385,7 +385,7 @@ seriesSolve(eq, y, x = 0, [1, 0, 0])
 --R   + 
 --R        8
 --R     O(x )
---R                         Type: UnivariateTaylorSeries(Expression Integer,x,0)
+--R                        Type: UnivariateTaylorSeries(Expression(Integer),x,0)
 --E 29
 
 --S 30 of 112
@@ -404,7 +404,7 @@ eq1 := differentiate(x(t), t) = 1 + x(t)**2
 --R         ,         2
 --R   (5)  x (t)= x(t)  + 1
 --R
---R                                            Type: Equation Expression Integer
+--R                                          Type: Equation(Expression(Integer))
 --E 31
 
 --S 32 of 112
@@ -414,23 +414,23 @@ eq2 := differentiate(y(t), t) = x(t) * y(t)
 --R         ,
 --R   (6)  y (t)= x(t)y(t)
 --R
---R                                            Type: Equation Expression Integer
+--R                                          Type: Equation(Expression(Integer))
 --E 32
 
 --S 33 of 112
 seriesSolve([eq2, eq1], [x, y], t = 0, [y(0) = 1, x(0) = 0])
 --R 
---I   Compiling function %D with type List UnivariateTaylorSeries(
---R      Expression Integer,t,0) -> UnivariateTaylorSeries(Expression 
---R      Integer,t,0) 
---I   Compiling function %E with type List UnivariateTaylorSeries(
---R      Expression Integer,t,0) -> UnivariateTaylorSeries(Expression 
---R      Integer,t,0) 
+--I   Compiling function %D with type List(UnivariateTaylorSeries(
+--R      Expression(Integer),t,0)) -> UnivariateTaylorSeries(Expression(
+--R      Integer),t,0) 
+--I   Compiling function %E with type List(UnivariateTaylorSeries(
+--R      Expression(Integer),t,0)) -> UnivariateTaylorSeries(Expression(
+--R      Integer),t,0) 
 --R
 --R             1  3    2  5    17  7      8      1  2    5  4    61  6      8
 --R   (7)  [t + - t  + -- t  + --- t  + O(t ),1 + - t  + -- t  + --- t  + O(t )]
 --R             3      15      315                2      24      720
---R                    Type: List UnivariateTaylorSeries(Expression Integer,t,0)
+--R                  Type: List(UnivariateTaylorSeries(Expression(Integer),t,0))
 --E 33
 
 -- Input for page LaplacePage
@@ -441,7 +441,7 @@ sin(a*t) * cosh(a*t) - cos(a*t) * sinh(a*t)
 --R 
 --R
 --R   (1)  - cos(a t)sinh(a t) + cosh(a t)sin(a t)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 34
 
 --S 35 of 112
@@ -453,7 +453,7 @@ laplace(%, t, s)
 --R   (2)  --------
 --R         4     4
 --R        s  + 4a
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 35
 
 --S 36 of 112
@@ -461,7 +461,7 @@ laplace((exp(a*t) - exp(b*t))/t, t, s)
 --R 
 --R
 --R   (3)  - log(s - a) + log(s - b)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 36
 
 --S 37 of 112
@@ -470,7 +470,7 @@ laplace(2/t * (1 - cos(a*t)), t, s)
 --R
 --R             2    2
 --R   (4)  log(s  + a ) - 2log(s)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 37
 
 --S 38 of 112
@@ -481,7 +481,7 @@ laplace(exp(-a*t) * sin(b*t) / b**2, t, s)
 --R   (5)  ------------------------
 --R           2             3    2
 --R        b s  + 2a b s + b  + a b
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 38
 
 --S 39 of 112
@@ -492,7 +492,7 @@ laplace((cos(a*t) - cos(b*t))/t, t, s)
 --R        log(s  + b ) - log(s  + a )
 --R   (6)  ---------------------------
 --R                     2
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 39
 
 --S 40 of 112
@@ -503,7 +503,7 @@ laplace(exp(a*t+b)*Ei(c*t), t, s)
 --R                   c
 --R   (7)  -----------------
 --R              s - a
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 40
 
 --S 41 of 112
@@ -516,7 +516,7 @@ laplace(a*Ci(b*t) + c*Si(d*t), t, s)
 --R                 b
 --R   (8)  ---------------------------
 --R                     2s
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 41
 
 --S 42 of 112
@@ -529,7 +529,7 @@ laplace(sin(a*t) - a*t*cos(a*t) + exp(t**2), t, s)
 --R   (9)  ----------------------------------------
 --R                      4     2 2    4
 --R                     s  + 2a s  + a
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 42
 
 -- Input for page SeriesCoefficientPage
@@ -540,7 +540,7 @@ x := series(x)
 --R 
 --R
 --R   (1)  x
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 43
 
 --S 44 of 112
@@ -550,7 +550,7 @@ y := exp(x) * sin(x)
 --R             2   1  3    1  5    1  6    1   7      9
 --R   (2)  x + x  + - x  - -- x  - -- x  - --- x  + O(x )
 --R                 3      30      90      630
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 44
 
 --S 45 of 112
@@ -560,7 +560,7 @@ coefficient(y,6)
 --R           1
 --R   (3)  - --
 --R          90
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 45
 
 --S 46 of 112
@@ -570,7 +570,7 @@ coefficient(y,15)
 --R               1
 --R   (4)  - -----------
 --R          10216206000
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 46
 
 --S 47 of 112
@@ -585,7 +585,7 @@ y
 --R        1     11       1     13       1      14        1       15      16
 --R     ------- x   - -------- x   - --------- x   - ----------- x   + O(x  )
 --R     1247400       97297200       681080400       10216206000
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 47
 
 -- Input for page SymbolicIntegrationPage
@@ -600,7 +600,7 @@ f := (x**2+2*x+1) / (x**6+6*x**5+15*x**4+20*x**3+15*x**2+6*x+2)
 --R   (1)  --------------------------------------
 --R         6     5      4      3      2
 --R        x  + 6x  + 15x  + 20x  + 15x  + 6x + 2
---R                                            Type: Fraction Polynomial Integer
+--R                                          Type: Fraction(Polynomial(Integer))
 --E 48
 
 --S 49 of 112
@@ -611,7 +611,7 @@ integrate(f, x)
 --R        atan(x  + 3x  + 3x + 1)
 --R   (2)  -----------------------
 --R                   3
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 49
 
 --S 50 of 112
@@ -622,7 +622,7 @@ g := log(1 + sqrt(a * x + b)) / x
 --R        log(\|a x + b  + 1)
 --R   (3)  -------------------
 --R                 x
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 50
 
 --S 51 of 112
@@ -633,7 +633,7 @@ integrate(g, x)
 --I         ++  log(\|b + %G a  + 1)
 --I   (4)   |   -------------------- d%G
 --I        ++            %G
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 51
 
 --S 52 of 112
@@ -648,7 +648,7 @@ integrate(1/(x**2 - 2),x)
 --R   (5)  ----------------------
 --R                   +-+
 --R                 2\|2
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 52
 
 --S 53 of 112
@@ -662,7 +662,7 @@ integrate(1/(x**2 + 2),x)
 --R   (6)  -----------
 --R             +-+
 --R            \|2
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 53
 
 --S 54 of 112
@@ -674,7 +674,7 @@ h := x**2 / (x**4 - a**2)
 --R   (7)  -------
 --R         4    2
 --R        x  - a
---R                                            Type: Fraction Polynomial Integer
+--R                                          Type: Fraction(Polynomial(Integer))
 --E 54
 
 --S 55 of 112
@@ -698,7 +698,7 @@ integrate(h, x)
 --R    -------------------------------------------]
 --R                        +---+
 --R                      4\|- a
---R                                     Type: Union(List Expression Integer,...)
+--R                                   Type: Union(List(Expression(Integer)),...)
 --E 55
 
 --S 56 of 112
@@ -717,7 +717,7 @@ complexIntegrate(h, x)
 --R         \|  4a         \|  4a         \|4a         \|4a
 --R  /
 --R     2
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 56
 
 --S 57 of 112
@@ -741,7 +741,7 @@ expandLog %
 --R                 \|  4a
 --R  /
 --R     2
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 57
 
 --S 58 of 112
@@ -763,7 +763,7 @@ rootSimp %
 --R  /
 --R       +---+ +-+
 --R     4\|- a \|a
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 58
 
 --S 59 of 112
@@ -778,7 +778,7 @@ ratForm %
 --RDaly Bug
 --R   Cannot find a definition or applicable library operation named 
 --R      ratForm with argument type(s) 
---R                             Expression Integer
+--R                             Expression(Integer)
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
 --R      or "$" to specify which version of the function you need.
@@ -794,7 +794,7 @@ f := exp exp x
 --R            x
 --R          %e
 --R   (1)  %e
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 60
 
 --S 61 of 112
@@ -804,7 +804,7 @@ differentiate(f, x)
 --R               x
 --R          x  %e
 --R   (2)  %e %e
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 61
 
 --S 62 of 112
@@ -814,7 +814,7 @@ differentiate(f, x, 4)
 --R                                              x
 --R            x 4       x 3       x 2     x   %e
 --R   (3)  ((%e )  + 6(%e )  + 7(%e )  + %e )%e
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 62
 
 --S 63 of 112
@@ -823,7 +823,7 @@ g := sin(x**2 + y)
 --R
 --R                 2
 --R   (4)  sin(y + x )
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 63
 
 --S 64 of 112
@@ -832,7 +832,7 @@ differentiate(g, y)
 --R
 --R                 2
 --R   (5)  cos(y + x )
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 64
 
 --S 65 of 112
@@ -841,7 +841,7 @@ differentiate(g, [y, y, x, x])
 --R
 --R          2         2              2
 --R   (6)  4x sin(y + x ) - 2cos(y + x )
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 65
 
 -- Input for page SeriesFormulaPage
@@ -854,7 +854,7 @@ taylor(n +-> 1/factorial(n),x = 0)
 --R                1  2   1  3    1  4    1   5    1   6     1   7      8
 --R   (1)  1 + x + - x  + - x  + -- x  + --- x  + --- x  + ---- x  + O(x )
 --R                2      6      24      120      720      5040
---R                         Type: UnivariateTaylorSeries(Expression Integer,x,0)
+--R                        Type: UnivariateTaylorSeries(Expression(Integer),x,0)
 --E 66
 
 --S 67 of 112
@@ -869,7 +869,7 @@ taylor(n +-> (-1)**(n-1)/n,x = 1,1..)
 --R     1        7            8
 --R     - (x - 1)  + O((x - 1) )
 --R     7
---R                         Type: UnivariateTaylorSeries(Expression Integer,x,1)
+--R                        Type: UnivariateTaylorSeries(Expression(Integer),x,1)
 --E 67
 
 --S 68 of 112
@@ -884,7 +884,7 @@ taylor(n +-> (-1)**(n-1)/n,x = 1,1..7)
 --R     1        7
 --R     - (x - 1)
 --R     7
---R                         Type: UnivariateTaylorSeries(Expression Integer,x,1)
+--R                        Type: UnivariateTaylorSeries(Expression(Integer),x,1)
 --E 68
 
 --S 69 of 112
@@ -899,7 +899,7 @@ laurent(n +-> (-1)**(n-1)/(n + 2),x = 1,-1..)
 --R     1        5   1        6            7
 --R     - (x - 1)  - - (x - 1)  + O((x - 1) )
 --R     7            8
---R                        Type: UnivariateLaurentSeries(Expression Integer,x,1)
+--R                       Type: UnivariateLaurentSeries(Expression(Integer),x,1)
 --E 69
 
 --S 70 of 112
@@ -909,7 +909,7 @@ puiseux(i +-> (-1)**((i-1)/2)/factorial(i),x = 0,1..,2)
 --R            1  3    1   5     1   7      9
 --R   (5)  x - - x  + --- x  - ---- x  + O(x )
 --R            6      120      5040
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 70
 
 --S 71 of 112
@@ -921,7 +921,7 @@ puiseux(j +-> j**2,x = 8,-4/3..,1/2)
 --R        16          3   25          6   1          3            0
 --R   (6)  -- (x - 8)    + -- (x - 8)    + - (x - 8)    + O((x - 8) )
 --R         9              36              9
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,8)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,8)
 --E 71
 
 --S 72 of 112
@@ -931,7 +931,7 @@ series(n +-> 1/factorial(n),x = 0)
 --R                1  2   1  3    1  4    1   5    1   6     1   7      8
 --R   (7)  1 + x + - x  + - x  + -- x  + --- x  + --- x  + ---- x  + O(x )
 --R                2      6      24      120      720      5040
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 72
 
 --S 73 of 112
@@ -946,7 +946,7 @@ series(n +-> (-1)**(n - 1)/(n + 2),x = 1,-1..)
 --R     1        5   1        6            7
 --R     - (x - 1)  - - (x - 1)  + O((x - 1) )
 --R     7            8
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,1)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,1)
 --E 73
 
 --S 74 of 112
@@ -956,7 +956,7 @@ series(i +-> (-1)**((i - 1)/2)/factorial(i),x = 0,1..,2)
 --R            1  3    1   5     1   7      9
 --R   (9)  x - - x  + --- x  - ---- x  + O(x )
 --R            6      120      5040
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 74
 
 -- Input for page SeriesCreationPage
@@ -967,7 +967,7 @@ x := series x
 --R 
 --R
 --R   (1)  x
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 75
 
 --S 76 of 112
@@ -976,7 +976,7 @@ x := series x
 --R
 --R                  2     3     4     5      6      7      8
 --R   (2)  1 + x + 2x  + 3x  + 5x  + 8x  + 13x  + 21x  + O(x )
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 76
 
 --S 77 of 112
@@ -986,7 +986,7 @@ sin(x)
 --R            1  3    1   5     1   7      9
 --R   (3)  x - - x  + --- x  - ---- x  + O(x )
 --R            6      120      5040
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 77
 
 --S 78 of 112
@@ -1001,7 +1001,7 @@ sin(1 + x)
 --R       sin(1)  6   cos(1)  7      8
 --R     - ------ x  - ------ x  + O(x )
 --R         720        5040
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 78
 
 --S 79 of 112
@@ -1012,7 +1012,7 @@ sin(a * x)
 --R              a   3    a   5    a    7      9
 --R   (5)  a x - -- x  + --- x  - ---- x  + O(x )
 --R               6      120      5040
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 79
 
 --S 80 of 112
@@ -1027,7 +1027,7 @@ series(1/log(y),y = 1)
 --R        863         5    275         6            7
 --R     - ----- (y - 1)  + ----- (y - 1)  + O((y - 1) )
 --R       60480            24192
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,y,1)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),y,1)
 --E 80
 
 --S 81 of 112
@@ -1053,7 +1053,7 @@ series(1/factorial(n),n,w = 0)
 --R                1  2   1  3    1  4    1   5    1   6     1   7      8
 --R   (8)  1 + w + - w  + - w  + -- w  + --- w  + --- w  + ---- w  + O(w )
 --R                2      6      24      120      720      5040
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,w,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),w,0)
 --E 82
 
 -- Input for page SeriesFunctionPage
@@ -1064,7 +1064,7 @@ x := series x
 --R 
 --R
 --R   (1)  x
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 83
 
 --S 84 of 112
@@ -1074,7 +1074,7 @@ rat := x**2 / (1 - 6*x + x**2)
 --R   (2)
 --R    2     3      4       5        6        7         8          9      10
 --R   x  + 6x  + 35x  + 204x  + 1189x  + 6930x  + 40391x  + 235416x  + O(x  )
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 84
 
 --S 85 of 112
@@ -1085,7 +1085,7 @@ sin(rat)
 --R    2     3      4       5   7133  6        7   80711  8          9      10
 --R   x  + 6x  + 35x  + 204x  + ---- x  + 6927x  + ----- x  + 235068x  + O(x  )
 --R                               6                  2
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 85
 
 --S 86 of 112
@@ -1093,7 +1093,7 @@ y : UTS(FRAC INT,y,0) := y
 --R 
 --R
 --R   (4)  y
---R                           Type: UnivariateTaylorSeries(Fraction Integer,y,0)
+--R                          Type: UnivariateTaylorSeries(Fraction(Integer),y,0)
 --E 86
 
 --S 87 of 112
@@ -1103,7 +1103,7 @@ exp(y)
 --R                1  2   1  3    1  4    1   5    1   6     1   7      8
 --R   (5)  1 + y + - y  + - y  + -- y  + --- y  + --- y  + ---- y  + O(y )
 --R                2      6      24      120      720      5040
---R                           Type: UnivariateTaylorSeries(Fraction Integer,y,0)
+--R                          Type: UnivariateTaylorSeries(Fraction(Integer),y,0)
 --E 87
 
 --S 88 of 112
@@ -1113,7 +1113,7 @@ tan(y**2)
 --R         2   1  6      8
 --R   (6)  y  + - y  + O(y )
 --R             3
---R                           Type: UnivariateTaylorSeries(Fraction Integer,y,0)
+--R                          Type: UnivariateTaylorSeries(Fraction(Integer),y,0)
 --E 88
 
 --S 89 of 112
@@ -1123,7 +1123,7 @@ cos(y + y**5)
 --R            1  2    1  4   721  6      8
 --R   (7)  1 - - y  + -- y  - --- y  + O(y )
 --R            2      24      720
---R                           Type: UnivariateTaylorSeries(Fraction Integer,y,0)
+--R                          Type: UnivariateTaylorSeries(Fraction(Integer),y,0)
 --E 89
 
 --S 90 of 112
@@ -1133,7 +1133,7 @@ log(1 + sin(y))
 --R            1  2   1  3    1  4    1  5    1  6    61   7      8
 --R   (8)  y - - y  + - y  - -- y  + -- y  - -- y  + ---- y  + O(y )
 --R            2      6      12      24      45      5040
---R                           Type: UnivariateTaylorSeries(Fraction Integer,y,0)
+--R                          Type: UnivariateTaylorSeries(Fraction(Integer),y,0)
 --E 90
 
 --S 91 of 112
@@ -1141,7 +1141,7 @@ z : UTS(EXPR INT,z,0) := z
 --R 
 --R
 --R   (9)  z
---R                         Type: UnivariateTaylorSeries(Expression Integer,z,0)
+--R                        Type: UnivariateTaylorSeries(Expression(Integer),z,0)
 --E 91
 
 --S 92 of 112
@@ -1156,7 +1156,7 @@ exp(2 + tan(z))
 --R   + 
 --R        8
 --R     O(z )
---R                         Type: UnivariateTaylorSeries(Expression Integer,z,0)
+--R                        Type: UnivariateTaylorSeries(Expression(Integer),z,0)
 --E 92
 
 --S 93 of 112
@@ -1164,7 +1164,7 @@ w := taylor w
 --R 
 --R
 --R   (11)  w
---R                         Type: UnivariateTaylorSeries(Expression Integer,w,0)
+--R                        Type: UnivariateTaylorSeries(Expression(Integer),w,0)
 --E 93
 
 --S 94 of 112
@@ -1179,7 +1179,7 @@ exp(2 + tan(w))
 --R   + 
 --R        8
 --R     O(w )
---R                         Type: UnivariateTaylorSeries(Expression Integer,w,0)
+--R                        Type: UnivariateTaylorSeries(Expression(Integer),w,0)
 --E 94
 
 -- Input for page LimitPage
@@ -1192,7 +1192,7 @@ f := sin(a*x) / tan(b*x)
 --R        sin(a x)
 --R   (1)  --------
 --R        tan(b x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 95
 
 --S 96 of 112
@@ -1202,7 +1202,7 @@ limit(f,x=0)
 --R        a
 --R   (2)  -
 --R        b
---R                        Type: Union(OrderedCompletion Expression Integer,...)
+--R                      Type: Union(OrderedCompletion(Expression(Integer)),...)
 --E 96
 
 --S 97 of 112
@@ -1212,7 +1212,7 @@ g := csc(a*x) / csch(b*x)
 --R         csc(a x)
 --R   (3)  ---------
 --R        csch(b x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 97
 
 --S 98 of 112
@@ -1222,7 +1222,7 @@ limit(g,x=0)
 --R        b
 --R   (4)  -
 --R        a
---R                        Type: Union(OrderedCompletion Expression Integer,...)
+--R                      Type: Union(OrderedCompletion(Expression(Integer)),...)
 --E 98
 
 --S 99 of 112
@@ -1232,7 +1232,7 @@ h := (1 + k/x)**x
 --R         x + k x
 --R   (5)  (-----)
 --R           x
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 99
 
 --S 100 of 112
@@ -1241,7 +1241,7 @@ limit(h,x=%plusInfinity)
 --R
 --R          k
 --R   (6)  %e
---R                        Type: Union(OrderedCompletion Expression Integer,...)
+--R                      Type: Union(OrderedCompletion(Expression(Integer)),...)
 --E 100
 
 -- Input for page SeriesBernoulliPage
@@ -1263,7 +1263,7 @@ sum4 := sum(m**4, m = 1..k)
 --R        6k  + 15k  + 10k  - k
 --R   (2)  ---------------------
 --R                  30
---R                                            Type: Fraction Polynomial Integer
+--R                                          Type: Fraction(Polynomial(Integer))
 --E 102
 
 --S 103 of 112
@@ -1271,7 +1271,7 @@ eval(sum4, k = 10)
 --R 
 --R
 --R   (3)  25333
---R                                            Type: Fraction Polynomial Integer
+--R                                          Type: Fraction(Polynomial(Integer))
 --E 103
 
 --S 104 of 112
@@ -1283,7 +1283,7 @@ f := t*exp(x*t) / (exp(t) - 1)
 --R   (4)  -------
 --R          t
 --R        %e  - 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 104
 
 )set streams calculate 5
@@ -1302,7 +1302,7 @@ ff := taylor(f,t = 0)
 --R     30x  - 60x  + 30x  - 1  4   6x  - 15x  + 10x  - x  5      6
 --R     ---------------------- t  + --------------------- t  + O(t )
 --R               720                        720
---R                         Type: UnivariateTaylorSeries(Expression Integer,t,0)
+--R                        Type: UnivariateTaylorSeries(Expression(Integer),t,0)
 --E 105
 
 --S 106 of 112
@@ -1313,7 +1313,7 @@ factorial(6) * coefficient(ff,6)
 --R        42x  - 126x  + 105x  - 21x  + 1
 --R   (6)  -------------------------------
 --R                       42
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 106
 
 --S 107 of 112
@@ -1325,7 +1325,7 @@ g := eval(f, x = x + 1) - f
 --R   (7)  ---------------------
 --R                 t
 --R               %e  - 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 107
 
 --S 108 of 112
@@ -1334,7 +1334,7 @@ normalize(g)
 --R
 --R            t x
 --R   (8)  t %e
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 108
 
 --S 109 of 112
@@ -1345,7 +1345,7 @@ taylor(g,t = 0)
 --R               2   x   3   x   4   x   5      6
 --R   (9)  t + x t  + -- t  + -- t  + -- t  + O(t )
 --R                    2       6      24
---R                         Type: UnivariateTaylorSeries(Expression Integer,t,0)
+--R                        Type: UnivariateTaylorSeries(Expression(Integer),t,0)
 --E 109
 
 --S 110 of 112
@@ -1356,7 +1356,7 @@ B5 := factorial(5) * coefficient(ff,5)
 --R         6x  - 15x  + 10x  - x
 --R   (10)  ---------------------
 --R                   6
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 110
 
 --S 111 of 112
@@ -1367,7 +1367,7 @@ B5 := factorial(5) * coefficient(ff,5)
 --R         6k  + 15k  + 10k  - k
 --R   (11)  ---------------------
 --R                   30
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 111
 
 --S 112 of 112
@@ -1378,7 +1378,7 @@ sum4
 --R         6k  + 15k  + 10k  - k
 --R   (12)  ---------------------
 --R                   30
---R                                            Type: Fraction Polynomial Integer
+--R                                          Type: Fraction(Polynomial(Integer))
 --E 112
 )spool
 )lisp (bye)
diff --git a/src/input/card.input.pamphlet b/src/input/card.input.pamphlet
index f1ce1e4..3818678 100644
--- a/src/input/card.input.pamphlet
+++ b/src/input/card.input.pamphlet
@@ -114,7 +114,7 @@ countable? A1
 --R 
 --R
 --R   (12)  [4,Aleph(1)]
---R                                                    Type: List CardinalNumber
+--R                                                   Type: List(CardinalNumber)
 --E 12
 
 --S 13 of 20
@@ -122,7 +122,7 @@ countable? A1
 --R 
 --R
 --R   (13)  [0,2,4,0,Aleph(1),Aleph(1),Aleph(1)]
---R                                                    Type: List CardinalNumber
+--R                                                   Type: List(CardinalNumber)
 --E 13
 
 --S 14 of 20
@@ -130,7 +130,7 @@ countable? A1
 --R 
 --R
 --R   (14)  [1,2,4,1,Aleph(1),Aleph(1)]
---R                                                    Type: List CardinalNumber
+--R                                                   Type: List(CardinalNumber)
 --E 14
 
 --S 15 of 20
@@ -138,7 +138,7 @@ countable? A1
 --R 
 --R
 --R   (15)  [1,0,"failed",Aleph(1),Aleph(1),"failed"]
---R                                    Type: List Union(CardinalNumber,"failed")
+--R                                   Type: List(Union(CardinalNumber,"failed"))
 --E 15
 
 --S 16 of 20
@@ -154,7 +154,7 @@ generalizedContinuumHypothesisAssumed true
 --R 
 --R
 --R   (17)  [0,1,Aleph(1),Aleph(1),Aleph(2),Aleph(1),Aleph(2)]
---R                                                    Type: List CardinalNumber
+--R                                                   Type: List(CardinalNumber)
 --E 17
 
 --S 18 of 20
diff --git a/src/input/cardinal.input.pamphlet b/src/input/cardinal.input.pamphlet
index ba3e9ab..011e6e4 100644
--- a/src/input/cardinal.input.pamphlet
+++ b/src/input/cardinal.input.pamphlet
@@ -80,7 +80,7 @@ A1 := Aleph 1
 --R 
 --R
 --R   (8)  [true,false]
---R                                                           Type: List Boolean
+--R                                                          Type: List(Boolean)
 --E 8
 
 --S 9 of 16
@@ -88,7 +88,7 @@ A1 := Aleph 1
 --R 
 --R
 --R   (9)  [true,false]
---R                                                           Type: List Boolean
+--R                                                          Type: List(Boolean)
 --E 9
 
 --S 10 of 16
@@ -96,7 +96,7 @@ A1 := Aleph 1
 --R 
 --R
 --R   (10)  [true,true,false]
---R                                                           Type: List Boolean
+--R                                                          Type: List(Boolean)
 --E 10
 
 --S 11 of 16
@@ -104,7 +104,7 @@ A1 := Aleph 1
 --R 
 --R
 --R   (11)  [4,Aleph(1)]
---R                                                    Type: List CardinalNumber
+--R                                                   Type: List(CardinalNumber)
 --E 11
 
 --S 12 of 16
@@ -112,7 +112,7 @@ A1 := Aleph 1
 --R 
 --R
 --R   (12)  [1,0,"failed",Aleph(1),Aleph(1),"failed"]
---R                                    Type: List Union(CardinalNumber,"failed")
+--R                                   Type: List(Union(CardinalNumber,"failed"))
 --E 12
 
 --S 13 of 16
@@ -120,7 +120,7 @@ A1 := Aleph 1
 --R 
 --R
 --R   (13)  [0,2,4,0,Aleph(1),Aleph(1),Aleph(1)]
---R                                                    Type: List CardinalNumber
+--R                                                   Type: List(CardinalNumber)
 --E 13
 
 --S 14 of 16
@@ -128,7 +128,7 @@ A1 := Aleph 1
 --R 
 --R
 --R   (14)  [1,2,4,1,Aleph(1),Aleph(1)]
---R                                                    Type: List CardinalNumber
+--R                                                   Type: List(CardinalNumber)
 --E 14
 
 --S 15 of 16
@@ -144,7 +144,7 @@ generalizedContinuumHypothesisAssumed true
 --R 
 --R
 --R   (16)  [0,1,Aleph(1),Aleph(1),Aleph(2),Aleph(1),Aleph(2)]
---R                                                    Type: List CardinalNumber
+--R                                                   Type: List(CardinalNumber)
 --E 16
 )spool
 )lisp (bye)
diff --git a/src/input/carten.input.pamphlet b/src/input/carten.input.pamphlet
index 3049c21..b56deb8 100644
--- a/src/input/carten.input.pamphlet
+++ b/src/input/carten.input.pamphlet
@@ -196,7 +196,7 @@ Tmv = m * v
 --R 
 --R
 --R   (19)  [11,32]= [11,32]
---R                                  Type: Equation CartesianTensor(1,2,Integer)
+--R                                 Type: Equation(CartesianTensor(1,2,Integer))
 --E 19
 
 --S 20 of 48
@@ -306,7 +306,7 @@ contract(Tmn,1,2) = trace(m) * n
 --R         +12  18+  +12  18+
 --R   (32)  |      |= |      |
 --R         +0   6 +  +0   6 +
---R                                  Type: Equation CartesianTensor(1,2,Integer)
+--R                                 Type: Equation(CartesianTensor(1,2,Integer))
 --E 32
 
 --S 33 of 48
@@ -316,7 +316,7 @@ contract(Tmn,1,3) = transpose(m) * n
 --R         +2  7 +  +2  7 +
 --R   (33)  |     |= |     |
 --R         +4  11+  +4  11+
---R                                  Type: Equation CartesianTensor(1,2,Integer)
+--R                                 Type: Equation(CartesianTensor(1,2,Integer))
 --E 33
 
 --S 34 of 48
@@ -326,7 +326,7 @@ contract(Tmn,1,4) = transpose(m) * transpose(n)
 --R         +14  4+  +14  4+
 --R   (34)  |     |= |     |
 --R         +19  5+  +19  5+
---R                                  Type: Equation CartesianTensor(1,2,Integer)
+--R                                 Type: Equation(CartesianTensor(1,2,Integer))
 --E 34
 
 --S 35 of 48
@@ -336,7 +336,7 @@ contract(Tmn,2,3) = m * n
 --R         +2  5 +  +2  5 +
 --R   (35)  |     |= |     |
 --R         +8  17+  +8  17+
---R                                  Type: Equation CartesianTensor(1,2,Integer)
+--R                                 Type: Equation(CartesianTensor(1,2,Integer))
 --E 35
 
 --S 36 of 48
@@ -346,7 +346,7 @@ contract(Tmn,2,4) = m * transpose(n)
 --R         +8   2+  +8   2+
 --R   (36)  |     |= |     |
 --R         +23  5+  +23  5+
---R                                  Type: Equation CartesianTensor(1,2,Integer)
+--R                                 Type: Equation(CartesianTensor(1,2,Integer))
 --E 36
 
 --S 37 of 48
@@ -356,7 +356,7 @@ contract(Tmn,3,4) = trace(n) * m
 --R         +3   6 +  +3   6 +
 --R   (37)  |      |= |      |
 --R         +12  15+  +12  15+
---R                                  Type: Equation CartesianTensor(1,2,Integer)
+--R                                 Type: Equation(CartesianTensor(1,2,Integer))
 --E 37
 
 --S 38 of 48
@@ -394,7 +394,7 @@ transpose Tm = transpose m
 --R         +1  4+  +1  4+
 --R   (40)  |    |= |    |
 --R         +2  5+  +2  5+
---R                                  Type: Equation CartesianTensor(1,2,Integer)
+--R                                 Type: Equation(CartesianTensor(1,2,Integer))
 --E 40
 
 --S 41 of 48
@@ -464,7 +464,7 @@ contract(Tmn, 2, delta, 1) = reindex(Tmn, [1,3,4,2])
 --R         |+8   10+  +0  0+|  |+8   10+  +0  0+|
 --R         ||      |  |    ||  ||      |  |    ||
 --R         ++12  15+  +4  5++  ++12  15+  +4  5++
---R                                  Type: Equation CartesianTensor(1,2,Integer)
+--R                                 Type: Equation(CartesianTensor(1,2,Integer))
 --E 46
 
 --S 47 of 48
@@ -482,7 +482,7 @@ contract(epsilon*Tm*epsilon, 1,2) = 2 * determinant m
 --R 
 --R
 --R   (48)  - 6= - 6
---R                                  Type: Equation CartesianTensor(1,2,Integer)
+--R                                 Type: Equation(CartesianTensor(1,2,Integer))
 --E 48
 )spool
 )lisp (bye)
diff --git a/src/input/ch.input.pamphlet b/src/input/ch.input.pamphlet
index 102631e..b923ccc 100644
--- a/src/input/ch.input.pamphlet
+++ b/src/input/ch.input.pamphlet
@@ -50,7 +50,7 @@ mfzn : SQMATRIX(6,DMP([x,y,z],Fraction INT)) :=_
 --R        |   8     8      |
 --R        |1  -  y  -  1  0|
 --R        +   3     3      +
---RType: SquareMatrix(6,DistributedMultivariatePolynomial([x,y,z],Fraction Integer))
+--RType: SquareMatrix(6,DistributedMultivariatePolynomial([x,y,z],Fraction(Integer)))
 --E 1
 
 --S 2 of 7
@@ -61,7 +61,7 @@ fzn := determinant mfzn
 --R      2 2   22  2    25  2   22    2   388       250     25  2   250     14575
 --R   - x y  + -- x y - -- x  + -- x y  - --- x y - --- x - -- y  - --- y + -----
 --R             3        9       3         9         27      9       27       81
---R            Type: DistributedMultivariatePolynomial([x,y,z],Fraction Integer)
+--R           Type: DistributedMultivariatePolynomial([x,y,z],Fraction(Integer))
 --E 2
 
 --S 3 of 7
@@ -91,7 +91,7 @@ mfxn : SQMATRIX(6,DMP([x,y,z],Fraction Integer)) :=_
 --R        |   8     8      |
 --R        |1  -  z  -  1  0|
 --R        +   3     3      +
---RType: SquareMatrix(6,DistributedMultivariatePolynomial([x,y,z],Fraction Integer))
+--RType: SquareMatrix(6,DistributedMultivariatePolynomial([x,y,z],Fraction(Integer)))
 --E 3
 
 --S 4 of 7
@@ -102,7 +102,7 @@ fxn := determinant mfxn
 --R      2 2   22  2    25  2   22    2   388       250     25  2   250     14575
 --R   - y z  + -- y z - -- y  + -- y z  - --- y z - --- y - -- z  - --- z + -----
 --R             3        9       3         9         27      9       27       81
---R            Type: DistributedMultivariatePolynomial([x,y,z],Fraction Integer)
+--R           Type: DistributedMultivariatePolynomial([x,y,z],Fraction(Integer))
 --E 4
 
 --S 5 of 7
@@ -132,7 +132,7 @@ mfyn : SQMATRIX(6,DMP([x,y,z],Fraction Integer)) :=_
 --R        |   8     8      |
 --R        |1  -  x  -  1  0|
 --R        +   3     3      +
---RType: SquareMatrix(6,DistributedMultivariatePolynomial([x,y,z],Fraction Integer))
+--RType: SquareMatrix(6,DistributedMultivariatePolynomial([x,y,z],Fraction(Integer)))
 --E 5
 
 --S 6 of 7
@@ -143,7 +143,7 @@ fyn := determinant mfyn
 --R      2 2   22  2    25  2   22    2   388       250     25  2   250     14575
 --R   - x z  + -- x z - -- x  + -- x z  - --- x z - --- x - -- z  - --- z + -----
 --R             3        9       3         9         27      9       27       81
---R            Type: DistributedMultivariatePolynomial([x,y,z],Fraction Integer)
+--R           Type: DistributedMultivariatePolynomial([x,y,z],Fraction(Integer))
 --E 6
 
 --S 7 of 7
@@ -174,7 +174,7 @@ gb := groebnerFactorize [fxn,fyn,fzn]
 --R         19     5     5
 --R    [x - --,y + -,z + -]]
 --R          3     3     3
---R  Type: List List DistributedMultivariatePolynomial([x,y,z],Fraction Integer)
+--RType: List(List(DistributedMultivariatePolynomial([x,y,z],Fraction(Integer))))
 --E 7
 )spool
 )lisp (bye)
diff --git a/src/input/char.input.pamphlet b/src/input/char.input.pamphlet
index 0d395e4..8818de0 100644
--- a/src/input/char.input.pamphlet
+++ b/src/input/char.input.pamphlet
@@ -28,7 +28,7 @@ chars := [char "a", char "A", char "X", char "8", char "+"]
 --R 
 --R
 --R   (1)  [a,A,X,8,+]
---R                                                         Type: List Character
+--R                                                        Type: List(Character)
 --E 1
 
 --S 2 of 13
@@ -60,7 +60,7 @@ escape()
 --R 
 --R
 --R   (5)  [97,65,88,56,43]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 5
 
 --S 6 of 13
@@ -68,7 +68,7 @@ escape()
 --R 
 --R
 --R   (6)  [A,A,X,8,+]
---R                                                         Type: List Character
+--R                                                        Type: List(Character)
 --E 6
 
 --S 7 of 13
@@ -76,7 +76,7 @@ escape()
 --R 
 --R
 --R   (7)  [a,a,x,8,+]
---R                                                         Type: List Character
+--R                                                        Type: List(Character)
 --E 7
 
 --S 8 of 13
@@ -84,7 +84,7 @@ escape()
 --R 
 --R
 --R   (8)  [true,true,true,false,false]
---R                                                           Type: List Boolean
+--R                                                          Type: List(Boolean)
 --E 8
 
 --S 9 of 13
@@ -92,7 +92,7 @@ escape()
 --R 
 --R
 --R   (9)  [false,true,true,false,false]
---R                                                           Type: List Boolean
+--R                                                          Type: List(Boolean)
 --E 9
 
 --S 10 of 13
@@ -100,7 +100,7 @@ escape()
 --R 
 --R
 --R   (10)  [true,false,false,false,false]
---R                                                           Type: List Boolean
+--R                                                          Type: List(Boolean)
 --E 10
 
 --S 11 of 13
@@ -108,7 +108,7 @@ escape()
 --R 
 --R
 --R   (11)  [false,false,false,true,false]
---R                                                           Type: List Boolean
+--R                                                          Type: List(Boolean)
 --E 11
 
 --S 12 of 13
@@ -116,7 +116,7 @@ escape()
 --R 
 --R
 --R   (12)  [true,true,false,true,false]
---R                                                           Type: List Boolean
+--R                                                          Type: List(Boolean)
 --E 12
 
 --S 13 of 13
@@ -124,7 +124,7 @@ escape()
 --R 
 --R
 --R   (13)  [true,true,true,true,false]
---R                                                           Type: List Boolean
+--R                                                          Type: List(Boolean)
 --E 13
 )spool
 )lisp (bye)
diff --git a/src/input/chtheorem.input.pamphlet b/src/input/chtheorem.input.pamphlet
index 46e09cb..0292fb0 100644
--- a/src/input/chtheorem.input.pamphlet
+++ b/src/input/chtheorem.input.pamphlet
@@ -71,7 +71,7 @@ $$A^4=145A+54I_2$$
 D:=FFP(PF 2,x^4+x+1)
 --R 
 --R
---R   (1)  FiniteFieldExtensionByPolynomial(PrimeField 2,?**4+?+1)
+--R   (1)  FiniteFieldExtensionByPolynomial(PrimeField(2),?^4+?+1)
 --R                                                                 Type: Domain
 --E 1
 
@@ -90,7 +90,7 @@ M:=matrix([[random()$D for i in 1..4] for j in 1..4])
 --R        |                                                               |
 --R        |                      3     2             2             3     2|
 --I        +        0           %A  + %A  + %A + 1  %A  + %A + 1  %A  + %A +
---R         Type: Matrix FiniteFieldExtensionByPolynomial(PrimeField 2,?**4+?+1)
+--R        Type: Matrix(FiniteFieldExtensionByPolynomial(PrimeField(2),?^4+?+1))
 --E 2
 
 --S 3 of 28 random input -- failure ok
@@ -99,7 +99,7 @@ p:=characteristicPolynomial(M,y)
 --R
 --R         4      2       3      2           2            3     2
 --I   (3)  y  + (%A  + %A)y  + (%A  + %A + 1)y  + %A y + %A  + %A  + %A
---R     Type: Polynomial FiniteFieldExtensionByPolynomial(PrimeField 2,?**4+?+1)
+--R    Type: Polynomial(FiniteFieldExtensionByPolynomial(PrimeField(2),?^4+?+1))
 --E 3
 
 --S 4 of 28
@@ -107,7 +107,7 @@ SM:=SquareMatrix(4,D)
 --R 
 --R
 --R   (4)
---R   SquareMatrix(4,FiniteFieldExtensionByPolynomial(PrimeField 2,?**4+?+1))
+--R   SquareMatrix(4,FiniteFieldExtensionByPolynomial(PrimeField(2),?^4+?+1))
 --R                                                                 Type: Domain
 --E 4
 
@@ -159,7 +159,7 @@ sp:=map(z+->(squareMatrix$SM)diagonalMatrix([z,z,z,z]),p)
 --R     |                                                              |
 --R     |                                                  3     2     |
 --I     +      0               0               0         %A  + %A  + %A+
---IType: Polynomial SquareMatrix(4,FiniteFieldExtensionByPolynomial(...
+--RType: Polynomial(SquareMatrix(4,FiniteFieldExtensionByPolynomial(PrimeField(2),?^4+?+1)))
 --E 5
 
 --S 6 of 28 random input -- failure ok
@@ -177,7 +177,7 @@ sm:=squareMatrix(M)$SM
 --R        |                                                               |
 --R        |                      3     2             2             3     2|
 --I        +        0           %A  + %A  + %A + 1  %A  + %A + 1  %A  + %A +
---RType: SquareMatrix(4,FiniteFieldExtensionByPolynomial(PrimeField 2,?**4+?+1))
+--RType: SquareMatrix(4,FiniteFieldExtensionByPolynomial(PrimeField(2),?^4+?+1))
 --E 6
 
 --S 7 of 28
@@ -191,7 +191,7 @@ eval(sp,y=sm)
 --R        |0  0  0  0|
 --R        |          |
 --R        +0  0  0  0+
---IType: Polynomial SquareMatrix(4,FiniteFieldExtensionByPolynomial(...
+--RType: Polynomial(SquareMatrix(4,FiniteFieldExtensionByPolynomial(PrimeField(2),?^4+?+1)))
 --E 7
 
 )clear all
@@ -215,7 +215,7 @@ M:=matrix([[random()$D for i in 1..4] for j in 1..4])
 --R        |24115163  48682825  18166895  38340141|
 --R        |                                      |
 --R        +63446755  11508337  5309495   33821973+
---R                                                         Type: Matrix Integer
+--R                                                        Type: Matrix(Integer)
 --E 9
 
 --S 10 of 28 random input -- failure ok
@@ -227,7 +227,7 @@ p:=characteristicPolynomial(M,y)
 --R     y  - 78666608y  - 2034871330953280y  - 37379714246895929917440y
 --R   + 
 --R     - 43330011013671754134127116288
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 10
 
 --S 11 of 28
@@ -266,7 +266,7 @@ sp:=map(z+->(squareMatrix$SM)diagonalMatrix([z,z,z,z]),p)
 --R    [0,- 43330011013671754134127116288,0,0],
 --R    [0,0,- 43330011013671754134127116288,0],
 --R    [0,0,0,- 43330011013671754134127116288]]
---R                                     Type: Polynomial SquareMatrix(4,Integer)
+--R                                    Type: Polynomial(SquareMatrix(4,Integer))
 --E 12
 
 --S 13 of 28 random input -- failure ok
@@ -294,7 +294,7 @@ eval(sp,y=sm)
 --R        |0  0  0  0|
 --R        |          |
 --R        +0  0  0  0+
---R                                     Type: Polynomial SquareMatrix(4,Integer)
+--R                                    Type: Polynomial(SquareMatrix(4,Integer))
 --E 14
 
 )clear all
@@ -303,7 +303,7 @@ eval(sp,y=sm)
 D:=PF 7
 --R 
 --R
---R   (1)  PrimeField 7
+--R   (1)  PrimeField(7)
 --R                                                                 Type: Domain
 --E 15
 
@@ -318,7 +318,7 @@ M:=matrix([[random()$D for i in 1..4] for j in 1..4])
 --R        |1  5  4  1|
 --R        |          |
 --R        +1  1  2  0+
---R                                                    Type: Matrix PrimeField 7
+--R                                                  Type: Matrix(PrimeField(7))
 --E 16
 
 --S 17 of 28 random input -- failure ok
@@ -327,14 +327,14 @@ p:=characteristicPolynomial(M,y)
 --R
 --R         4     3     2
 --R   (3)  y  + 2y  + 4y  + 4y + 1
---R                                                Type: Polynomial PrimeField 7
+--R                                              Type: Polynomial(PrimeField(7))
 --E 17
 
 --S 18 of 28
 SM:=SquareMatrix(4,D)
 --R 
 --R
---R   (4)  SquareMatrix(4,PrimeField 7)
+--R   (4)  SquareMatrix(4,PrimeField(7))
 --R                                                                 Type: Domain
 --E 18
 
@@ -349,7 +349,7 @@ sp:=map(z+->(squareMatrix$SM)diagonalMatrix([z,z,z,z]),p)
 --R             |0  0  2  0|     |0  0  4  0|     |0  0  4  0|    |0  0  1  0|
 --R             |          |     |          |     |          |    |          |
 --R             +0  0  0  2+     +0  0  0  4+     +0  0  0  4+    +0  0  0  1+
---R                                Type: Polynomial SquareMatrix(4,PrimeField 7)
+--R                              Type: Polynomial(SquareMatrix(4,PrimeField(7)))
 --E 19
 
 --S 20 of 28 random input -- failure ok
@@ -363,7 +363,7 @@ sm:=squareMatrix(M)$SM
 --R        |1  5  4  1|
 --R        |          |
 --R        +1  1  2  0+
---R                                           Type: SquareMatrix(4,PrimeField 7)
+--R                                          Type: SquareMatrix(4,PrimeField(7))
 --E 20
 
 --S 21 of 28
@@ -377,7 +377,7 @@ eval(sp,y=sm)
 --R        |0  0  0  0|
 --R        |          |
 --R        +0  0  0  0+
---R                                Type: Polynomial SquareMatrix(4,PrimeField 7)
+--R                              Type: Polynomial(SquareMatrix(4,PrimeField(7)))
 --E 21
 
 )clear all
@@ -405,7 +405,7 @@ M:=matrix([[random()$D for i in 1..4] for j in 1..4])
 --R        |                                                           |
 --R        |     3                 2           2         3     2       |
 --I        +   %A  + %A + 1      %A  + 1     %A        %A  + %A  + %A  +
---R                                                Type: Matrix FiniteField(2,4)
+--R                                               Type: Matrix(FiniteField(2,4))
 --E 23
 
 --S 24 of 28 random input -- failure ok
@@ -414,7 +414,7 @@ p:=characteristicPolynomial(M,y)
 --R
 --R         4      3       3      3       2         3
 --I   (3)  y  + (%A  + %A)y  + (%A  + %A)y  + y + %A  + 1
---R                                            Type: Polynomial FiniteField(2,4)
+--R                                           Type: Polynomial(FiniteField(2,4))
 --E 24
 
 --S 25 of 28
@@ -465,7 +465,7 @@ sp:=map(z+->(squareMatrix$SM)diagonalMatrix([z,z,z,z]),p)
 --R     |                                  |
 --R     |                             3    |
 --I     +   0        0        0     %A  + 1+
---R                            Type: Polynomial SquareMatrix(4,FiniteField(2,4))
+--R                           Type: Polynomial(SquareMatrix(4,FiniteField(2,4)))
 --E 26
 
 --S 27 of 28 random input -- failure ok
@@ -497,7 +497,7 @@ eval(sp,y=sm)
 --R        |0  0  0  0|
 --R        |          |
 --R        +0  0  0  0+
---R                            Type: Polynomial SquareMatrix(4,FiniteField(2,4))
+--R                           Type: Polynomial(SquareMatrix(4,FiniteField(2,4)))
 --E 28
 
 )spool 
diff --git a/src/input/classtalk.input.pamphlet b/src/input/classtalk.input.pamphlet
index a38875b..5898951 100644
--- a/src/input/classtalk.input.pamphlet
+++ b/src/input/classtalk.input.pamphlet
@@ -34,14 +34,14 @@ These are examples from the talk ``Axiom in an Educational Setting''.
 --R        1
 --R   (2)  -
 --R        2
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 2
 
 --S 3 of 72
 3+4*%i
 --R
 --R   (3)  3 + 4%i
---R                                                        Type: Complex Integer
+--R                                                       Type: Complex(Integer)
 --E 3
 
 --S 4 of 72
@@ -70,35 +70,35 @@ factor(60)
 --R
 --R         2
 --R   (7)  2 3 5
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 7
 
 --S 8 of 72
 q:=(y-1)*x*(z+5)
 --R
 --R   (8)  (x y - x)z + 5x y - 5x
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 8
 
 --S 9 of 72
 factor q
 --R
 --R   (9)  x(y - 1)(z + 5)
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 9
 
 --S 10 of 72
 eval(q,[x=5,y=6,z=7])
 --R
 --R   (10)  300
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 10
 
 --S 11 of 72
 eval(q,[x=5,y=6])
 --R
 --R   (11)  25z + 125
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 11
 
 \end{chunk}
@@ -109,14 +109,14 @@ b:=[log a, exp a, asin a, acos a, atan a, acot a, sinh a]
 --R
 --R                   a
 --R   (12)  [log(a),%e ,asin(a),acos(a),atan(a),acot(a),sinh(a)]
---R                                                Type: List Expression Integer
+--R                                              Type: List(Expression(Integer))
 --E 12
 
 --S 13 of 72
 [exp b.1, log b.2, sin b.3, cos b.4, tan b.5, cot b.6, asinh b.7]
 --R
 --R   (13)  [a,a,a,a,a,a,a]
---R                                                Type: List Expression Integer
+--R                                              Type: List(Expression(Integer))
 --E 13
 
 --S 14 of 72
@@ -133,21 +133,21 @@ b:=[log a, exp a, asin a, acos a, atan a, acot a, sinh a]
 --R   [- 0.3566749439 3873237891, 2.0137527074 704765216, 0.7753974966 1075306374,
 --R    0.7953988301 8414355549, 0.6107259643 8920861654, 0.9600703624 0568800269,
 --R    0.7585837018 3953350346]
---R                                                             Type: List Float
+--R                                                            Type: List(Float)
 --E 15
 
 --S 16 of 72
 [exp b.1, log b.2, sin b.3, cos b.4, tan b.5, cot b.6, asinh b.7]
 --R
 --R   (16)  [0.7,0.7,0.7,0.7,0.7,0.7,0.7]
---R                                                             Type: List Float
+--R                                                            Type: List(Float)
 --E 16
 
 --S 17 of 72
 simplify(sin(x)**2+cos(x)**2)
 --R
 --R   (17)  1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 17
 
 \end{chunk}
@@ -159,21 +159,21 @@ eq1:=A*x^2 + B*x*y + C*y^2 + D*x + E*y + F
 --R
 --R           2                   2
 --R   (1)  C y  + (B x + E)y + A x  + D x + F
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 18
 
 --S 19 of 72
 rotatex:=x'*cos(t)-y'*sin(t)
 --R
 --R   (2)  - y' sin(t) + x' cos(t)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 19
 
 --S 20 of 72
 rotatey:=x'*sin(t)+y'*cos(t)
 --R
 --R   (3)  x' sin(t) + y' cos(t)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 20
 
 --S 21 of 72
@@ -188,7 +188,7 @@ eval(eq1,[x=rotatex, y=rotatey])
 --R   + 
 --R          2                 2       2
 --R     (C y'  + B x' y' + A x' )cos(t)  + (E y' + D x')cos(t) + F
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 21
 
 \end{chunk}
@@ -207,14 +207,14 @@ factor(x^2+3)
 --R
 --R         2
 --R   (2)  x  + 3
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 23
 
 --S 24 of 72
 factor(x^2+3,[a])
 --R
 --R   (3)  (x - 2a - 1)(x + 2a + 1)
---R                                    Type: Factored Polynomial AlgebraicNumber
+--R                                  Type: Factored(Polynomial(AlgebraicNumber))
 --E 24
 
 --S 25 of 72
@@ -232,7 +232,7 @@ zerosOf(b^2+b+1,b)
 --R         \|- 3  - 1 - \|- 3  - 1
 --R   (5)  [----------,------------]
 --R              2           2
---R                                                Type: List Expression Integer
+--R                                              Type: List(Expression(Integer))
 --E 26
 
 \end{chunk}
@@ -242,14 +242,14 @@ zerosOf(b^2+b+1,b)
 differentiate(sin(x),x)
 --R
 --R   (6)  cos(x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 27
 
 --S 28 of 72
 differentiate(sin(x),x,2)
 --R
 --R   (7)  - sin(x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 28
 
 --S 29 of 72
@@ -260,7 +260,7 @@ differentiate(cos(z)/(x^2+y^3),[x,y,z],[1,2,3])
 --R   (8)  --------------------------------
 --R         12     2 9     4 6     6 3    8
 --R        y   + 4x y  + 6x y  + 4x y  + x
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 29
 
 --S 30 of 72
@@ -277,7 +277,7 @@ deqx:=D(y(x),x,2)+D(y(x),x)+y(x)
 --R          ,,       ,
 --R   (10)  y  (x) + y (x) + y(x)
 --R
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 31
 
 --S 32 of 72
@@ -288,7 +288,7 @@ solve(deqx,y,x)
 --R                                    x\|3      2     2    x\|3
 --R   (11)  [particular= 0,basis= [cos(-----)%e   ,%e   sin(-----)]]
 --R                                      2                    2
---IType: Union(Record(particular: Expression Integer,basis: ...
+--RType: Union(Record(particular: Expression(Integer),basis: List(Expression(Integer))),...)
 --E 32
 
 \end{chunk}
@@ -301,14 +301,14 @@ limit((x^2-3*x+2)/(x^2-1),x=1)
 --R          1
 --R   (1)  - -
 --R          2
---R               Type: Union(OrderedCompletion Fraction Polynomial Integer,...)
+--R            Type: Union(OrderedCompletion(Fraction(Polynomial(Integer))),...)
 --E 33
 
 --S 34 of 72
 limit(x*log(x),x=0)
 --R
 --R   (2)  [leftHandLimit= "failed",rightHandLimit= 0]
---IType: Union(Record(leftHandLimit: Union(OrderedCompletion ...
+--RType: Union(Record(leftHandLimit: Union(OrderedCompletion(Expression(Integer)),"failed"),rightHandLimit: Union(OrderedCompletion(Expression(Integer)),"failed")),...)
 --E 34
 
 --S 35 of 72
@@ -317,7 +317,7 @@ limit(sinh(a*x)/tan(b*x),x=0)
 --R        a
 --R   (3)  -
 --R        b
---R                        Type: Union(OrderedCompletion Expression Integer,...)
+--R                      Type: Union(OrderedCompletion(Expression(Integer)),...)
 --E 35
 
 --S 36 of 72
@@ -327,14 +327,14 @@ limit(sqrt(3*x^2+1)/(5*x),x=%plusInfinity)
 --R        \|3
 --R   (4)  ----
 --R          5
---R                        Type: Union(OrderedCompletion Expression Integer,...)
+--R                      Type: Union(OrderedCompletion(Expression(Integer)),...)
 --E 36
 
 --S 37 of 72
 complexLimit((2+z)/(1-z),z=%infinity)
 --R
 --R   (5)  - 1
---R                         Type: OnePointCompletion Fraction Polynomial Integer
+--R                      Type: OnePointCompletion(Fraction(Polynomial(Integer)))
 --E 37
 
 \end{chunk}
@@ -346,14 +346,14 @@ integrate(1+sqrt(x)/x,x)
 --R
 --R          +-+
 --R   (1)  2\|x  + x
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 38
 
 --S 39 of 72
 integrate(sin(x)/x,x)
 --R
 --R   (2)  Si(x)
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 39
 
 \end{chunk}
@@ -367,7 +367,7 @@ integrate(exp(-a*x^2),x)
 --R         ++    - %Q a
 --R   (3)   |   %e      d%Q
 --R        ++
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 40
 
 --S 41 of 72
@@ -378,7 +378,7 @@ integrate(sin(x)/x^2,x)
 --R   (4)   |   ------- d%Q
 --R        ++       2
 --R               %Q
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 41
 
 \end{chunk}
@@ -391,7 +391,7 @@ integrate(exp(-x)/sqrt(x),x=0..%plusInfinity)
 --R         _ 1
 --R   (1)  | (-)
 --R           2
---R                    Type: Union(f1: OrderedCompletion Expression Integer,...)
+--R                  Type: Union(f1: OrderedCompletion(Expression(Integer)),...)
 --E 42
 
 --S 43 of 72
@@ -418,7 +418,7 @@ integrate(sin(x)^3/(sin(x)^3+cos(x)^3),x=0..%pi/2,"noPole")
 --R        2log(16) - 4log(4) + 3%pi
 --R   (1)  -------------------------
 --R                    12
---R                    Type: Union(f1: OrderedCompletion Expression Integer,...)
+--R                  Type: Union(f1: OrderedCompletion(Expression(Integer)),...)
 --E 44
 
 --S 45 of 72
@@ -429,7 +429,7 @@ integrate(exp(-x^2)*log(x)^2,x=0..%plusInfinity)
 --R           2             2       2         2
 --R   (2)  --------------------------------------
 --R                           8
---R                    Type: Union(f1: OrderedCompletion Expression Integer,...)
+--R                  Type: Union(f1: OrderedCompletion(Expression(Integer)),...)
 --E 45
 
 \end{chunk}
@@ -445,7 +445,7 @@ laplace(sin(a*t)*cosh(a*t)-cos(a*t)*sinh(a*t),t,s)
 --R   (1)  --------
 --R         4     4
 --R        s  + 4a
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 46
 
 --S 47 of 72
@@ -453,14 +453,14 @@ laplace(2/t * (1-cos(a*t)),t,s)
 --R
 --R             2    2
 --R   (2)  log(s  + a ) - 2log(s)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 47
 
 --S 48 of 72
 laplace((exp(a*t)-exp(b*t))/t,t,s)
 --R
 --R   (3)  - log(s - a) + log(s - b)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 48
 
 --S 49 of 72
@@ -471,7 +471,7 @@ laplace(exp(a*t+b)*Ei(c*t),t,s)
 --R                   c
 --R   (4)  -----------------
 --R              s - a
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 49
 
 \end{chunk}
@@ -483,7 +483,7 @@ over $K$, given a quadratic form $Q$ on $K^n$ (e.q. quaternions).
 --S 50 of 72
 K:=Fraction Polynomial Integer
 --R
---R   (1)  Fraction Polynomial Integer
+--R   (1)  Fraction(Polynomial(Integer))
 --R                                                                 Type: Domain
 --E 50
 
@@ -493,7 +493,7 @@ qf:QFORM(2,K):=quadraticForm matrix([[-1,0],[0,-1]])$(SQMATRIX(2,K))
 --R        +- 1   0 +
 --R   (2)  |        |
 --R        + 0   - 1+
---R                           Type: QuadraticForm(2,Fraction Polynomial Integer)
+--R                         Type: QuadraticForm(2,Fraction(Polynomial(Integer)))
 --E 51
 
 --S 52 of 72
@@ -501,7 +501,7 @@ i:=e(1)$CLIF(2,K,qf)
 --R
 --R   (3)  e
 --R         1
---R                  Type: CliffordAlgebra(2,Fraction Polynomial Integer,MATRIX)
+--R       Type: CliffordAlgebra(2,Fraction(Polynomial(Integer)),[[-1,0],[0,-1]])
 --E 52
 
 --S 53 of 72
@@ -509,7 +509,7 @@ j:=e(2)$CLIF(2,K,qf)
 --R
 --R   (4)  e
 --R         2
---R                  Type: CliffordAlgebra(2,Fraction Polynomial Integer,MATRIX)
+--R       Type: CliffordAlgebra(2,Fraction(Polynomial(Integer)),[[-1,0],[0,-1]])
 --E 53
 
 --S 54 of 72
@@ -517,7 +517,7 @@ k:=i*j
 --R
 --R   (5)  e e
 --R         1 2
---R                  Type: CliffordAlgebra(2,Fraction Polynomial Integer,MATRIX)
+--R       Type: CliffordAlgebra(2,Fraction(Polynomial(Integer)),[[-1,0],[0,-1]])
 --E 54
 
 --S 55 of 72
@@ -525,7 +525,7 @@ x:=a+b*i+c*j+d*k
 --R
 --R   (6)  a + b e  + c e  + d e e
 --R               1      2      1 2
---R                  Type: CliffordAlgebra(2,Fraction Polynomial Integer,MATRIX)
+--R       Type: CliffordAlgebra(2,Fraction(Polynomial(Integer)),[[-1,0],[0,-1]])
 --E 55
 
 --S 56 of 72
@@ -533,7 +533,7 @@ y:=m+f*i+g*j+h*k
 --R
 --R   (7)  m + f e  + g e  + h e e
 --R               1      2      1 2
---R                  Type: CliffordAlgebra(2,Fraction Polynomial Integer,MATRIX)
+--R       Type: CliffordAlgebra(2,Fraction(Polynomial(Integer)),[[-1,0],[0,-1]])
 --E 56
 
 --S 57 of 72
@@ -541,7 +541,7 @@ x+y
 --R
 --R   (8)  m + a + (f + b)e  + (g + c)e  + (h + d)e e
 --R                        1           2           1 2
---R                  Type: CliffordAlgebra(2,Fraction Polynomial Integer,MATRIX)
+--R       Type: CliffordAlgebra(2,Fraction(Polynomial(Integer)),[[-1,0],[0,-1]])
 --E 57
 
 --S 58 of 72
@@ -553,7 +553,7 @@ x*y
 --R   + 
 --R     (c m - b h + a g + d f)e  + (d m + a h + b g - c f)e e
 --R                             2                           1 2
---R                  Type: CliffordAlgebra(2,Fraction Polynomial Integer,MATRIX)
+--R       Type: CliffordAlgebra(2,Fraction(Polynomial(Integer)),[[-1,0],[0,-1]])
 --E 58
 
 \end{chunk}
@@ -566,7 +566,7 @@ taylor(sin(x),x=0)
 --R            1  3    1   5     1   7      1    9      11
 --R   (1)  x - - x  + --- x  - ---- x  + ------ x  + O(x  )
 --R            6      120      5040      362880
---R                         Type: UnivariateTaylorSeries(Expression Integer,x,0)
+--R                        Type: UnivariateTaylorSeries(Expression(Integer),x,0)
 --E 59
 
 \end{chunk}
@@ -587,7 +587,7 @@ laurent(x/log(x),x=1)
 --R       530113         9            10
 --R     --------- (x - 1)  + O((x - 1)  )
 --R     479001600
---R                        Type: UnivariateLaurentSeries(Expression Integer,x,1)
+--R                       Type: UnivariateLaurentSeries(Expression(Integer),x,1)
 --E 60
 
 \end{chunk}
@@ -602,7 +602,7 @@ puiseux(sqrt(sec(x)),x=3*%pi/2)
 --R             3%pi   2    1      3%pi 2    1       3%pi 2          3%pi 5
 --R   (3)  (x - ----)    + -- (x - ----)  + --- (x - ----)  + O((x - ----) )
 --R               2        12        2      160        2               2
---R                 Type: UnivariatePuiseuxSeries(Expression Integer,x,(3*pi)/2)
+--R               Type: UnivariatePuiseuxSeries(Expression(Integer),x,(3*%pi)/2)
 --E 61
 
 \end{chunk}
@@ -621,7 +621,7 @@ series(x^x,x=0)
 --R     log(x)   6   log(x)   7   log(x)   8   log(x)   9   log(x)    10      11
 --R     ------- x  + ------- x  + ------- x  + ------- x  + -------- x   + O(x  )
 --R       720          5040        40320        362880       3628800
---R                   Type: GeneralUnivariatePowerSeries(Expression Integer,x,0)
+--R                  Type: GeneralUnivariatePowerSeries(Expression(Integer),x,0)
 --E 62
 
 \end{chunk}
@@ -634,7 +634,7 @@ m:=matrix [[1,2],[3,4]]
 --R        +1  2+
 --R   (1)  |    |
 --R        +3  4+
---R                                                         Type: Matrix Integer
+--R                                                        Type: Matrix(Integer)
 --E 63
 
 --S 64 of 72
@@ -643,7 +643,7 @@ m:=matrix [[1,2],[3,4]]
 --R        +- 20  - 40+
 --R   (2)  |          |
 --R        +- 60  - 80+
---R                                                         Type: Matrix Integer
+--R                                                        Type: Matrix(Integer)
 --E 64
 
 --S 65 of 72
@@ -652,7 +652,7 @@ n:=matrix [[1,0,-2],[-3,5,1]]
 --R        + 1   0  - 2+
 --R   (3)  |           |
 --R        +- 3  5   1 +
---R                                                         Type: Matrix Integer
+--R                                                        Type: Matrix(Integer)
 --E 65
 
 --S 66 of 72
@@ -661,7 +661,7 @@ m*n
 --R        +- 5  10   0 +
 --R   (4)  |            |
 --R        +- 9  20  - 2+
---R                                                         Type: Matrix Integer
+--R                                                        Type: Matrix(Integer)
 --E 66
 
 --S 67 of 72
@@ -678,7 +678,7 @@ hilb:=matrix([[1/(i+j) for i in 1..3] for j in 1..3])
 --R        |1  1  1|
 --R        |-  -  -|
 --R        +4  5  6+
---R                                                Type: Matrix Fraction Integer
+--R                                              Type: Matrix(Fraction(Integer))
 --E 67
 
 --S 68 of 72
@@ -689,7 +689,7 @@ inverse(hilb)
 --R   (6)  |- 240   900   - 720|
 --R        |                   |
 --R        + 180   - 720   600 +
---R                                     Type: Union(Matrix Fraction Integer,...)
+--R                                   Type: Union(Matrix(Fraction(Integer)),...)
 --E 68
 
 \end{chunk}
@@ -700,28 +700,28 @@ inverse(hilb)
 solve([x+y+z=8,3*x-2*y+z=0,x+2*y+2*z=17],[x,y,z])
 --R
 --R   (1)  [[x= - 1,y= 2,z= 7]]
---R                         Type: List List Equation Fraction Polynomial Integer
+--R                    Type: List(List(Equation(Fraction(Polynomial(Integer)))))
 --E 69
 
 --S 70 of 72
 solve([x+2*y+3*z=2,2*x+3*y+4*z=2,3*x+4*y+5*z=2],[x,y,z])
 --R
 --I   (2)  [[x= %W - 2,y= - 2%W + 2,z= %W]]
---R                         Type: List List Equation Fraction Polynomial Integer
+--R                    Type: List(List(Equation(Fraction(Polynomial(Integer)))))
 --E 70
 
 --S 71 of 72
 solve([[1,1,1],[3,-2,1],[1,2,2]],[8,0,17])
 --R
 --R   (3)  [particular= [- 1,2,7],basis= [[0,0,0]]]
---IType: Record(particular: Union(Vector Fraction Integer,"failed"),basis:...
+--RType: Record(particular: Union(Vector(Fraction(Integer)),"failed"),basis: List(Vector(Fraction(Integer))))
 --E 71
 
 --S 72 of 72
 solve([[1,2,3],[2,3,4],[3,4,5]],[2,2,2])
 --R
 --R   (4)  [particular= [- 2,2,0],basis= [[1,- 2,1]]]
---IType: Record(particular: Union(Vector Fraction Integer,"failed"),basis: ...
+--RType: Record(particular: Union(Vector(Fraction(Integer)),"failed"),basis: List(Vector(Fraction(Integer))))
 --E 72
 )spool 
 )lisp (bye)
diff --git a/src/input/clif.input.pamphlet b/src/input/clif.input.pamphlet
index 163c266..833608d 100644
--- a/src/input/clif.input.pamphlet
+++ b/src/input/clif.input.pamphlet
@@ -26,7 +26,7 @@
 K := Fraction Polynomial Integer
 --R 
 --R
---R   (1)  Fraction Polynomial Integer
+--R   (1)  Fraction(Polynomial(Integer))
 --R                                                                 Type: Domain
 --E 1
 
@@ -35,14 +35,14 @@ m := matrix [[-1]]
 --R 
 --R
 --R   (2)  [- 1]
---R                                                         Type: Matrix Integer
+--R                                                        Type: Matrix(Integer)
 --E 2
 
 --S 3 of 36
 C := CliffordAlgebra(1, K, quadraticForm m)
 --R 
 --R
---R   (3)  CliffordAlgebra(1,Fraction Polynomial Integer,MATRIX)
+--R   (3)  CliffordAlgebra(1,Fraction(Polynomial(Integer)),[[-1]])
 --R                                                                 Type: Domain
 --E 3
 
@@ -52,7 +52,7 @@ i: C := e(1)
 --R
 --R   (4)  e
 --R         1
---R                  Type: CliffordAlgebra(1,Fraction Polynomial Integer,MATRIX)
+--R                Type: CliffordAlgebra(1,Fraction(Polynomial(Integer)),[[-1]])
 --E 4
 
 --S 5 of 36
@@ -61,7 +61,7 @@ x := a + b * i
 --R
 --R   (5)  a + b e
 --R               1
---R                  Type: CliffordAlgebra(1,Fraction Polynomial Integer,MATRIX)
+--R                Type: CliffordAlgebra(1,Fraction(Polynomial(Integer)),[[-1]])
 --E 5
 
 --S 6 of 36
@@ -70,7 +70,7 @@ y := c + d * i
 --R
 --R   (6)  c + d e
 --R               1
---R                  Type: CliffordAlgebra(1,Fraction Polynomial Integer,MATRIX)
+--R                Type: CliffordAlgebra(1,Fraction(Polynomial(Integer)),[[-1]])
 --E 6
 
 --S 7 of 36
@@ -79,7 +79,7 @@ x * y
 --R
 --R   (7)  - b d + a c + (a d + b c)e
 --R                                  1
---R                  Type: CliffordAlgebra(1,Fraction Polynomial Integer,MATRIX)
+--R                Type: CliffordAlgebra(1,Fraction(Polynomial(Integer)),[[-1]])
 --E 7
 
 -- Input generated from ugxCliffordQuaternPage
@@ -90,7 +90,7 @@ x * y
 K := Fraction Polynomial Integer
 --R 
 --R
---R   (1)  Fraction Polynomial Integer
+--R   (1)  Fraction(Polynomial(Integer))
 --R                                                                 Type: Domain
 --E 8
 
@@ -101,14 +101,14 @@ m := matrix [[-1,0],[0,-1]]
 --R        +- 1   0 +
 --R   (2)  |        |
 --R        + 0   - 1+
---R                                                         Type: Matrix Integer
+--R                                                        Type: Matrix(Integer)
 --E 9
 
 --S 10 of 36
 H  := CliffordAlgebra(2, K, quadraticForm m)
 --R 
 --R
---R   (3)  CliffordAlgebra(2,Fraction Polynomial Integer,MATRIX)
+--R   (3)  CliffordAlgebra(2,Fraction(Polynomial(Integer)),[[-1,0],[0,-1]])
 --R                                                                 Type: Domain
 --E 10
 
@@ -118,7 +118,7 @@ i: H  := e(1)
 --R
 --R   (4)  e
 --R         1
---R                  Type: CliffordAlgebra(2,Fraction Polynomial Integer,MATRIX)
+--R       Type: CliffordAlgebra(2,Fraction(Polynomial(Integer)),[[-1,0],[0,-1]])
 --E 11
 
 --S 12 of 36
@@ -127,7 +127,7 @@ j: H  := e(2)
 --R
 --R   (5)  e
 --R         2
---R                  Type: CliffordAlgebra(2,Fraction Polynomial Integer,MATRIX)
+--R       Type: CliffordAlgebra(2,Fraction(Polynomial(Integer)),[[-1,0],[0,-1]])
 --E 12
 
 --S 13 of 36
@@ -136,7 +136,7 @@ k: H  := i * j
 --R
 --R   (6)  e e
 --R         1 2
---R                  Type: CliffordAlgebra(2,Fraction Polynomial Integer,MATRIX)
+--R       Type: CliffordAlgebra(2,Fraction(Polynomial(Integer)),[[-1,0],[0,-1]])
 --E 13
 
 --S 14 of 36
@@ -145,7 +145,7 @@ x := a + b * i + c * j + d * k
 --R
 --R   (7)  a + b e  + c e  + d e e
 --R               1      2      1 2
---R                  Type: CliffordAlgebra(2,Fraction Polynomial Integer,MATRIX)
+--R       Type: CliffordAlgebra(2,Fraction(Polynomial(Integer)),[[-1,0],[0,-1]])
 --E 14
 
 --S 15 of 36
@@ -154,7 +154,7 @@ y := e + f * i + g * j + h * k
 --R
 --R   (8)  e + f e  + g e  + h e e
 --R               1      2      1 2
---R                  Type: CliffordAlgebra(2,Fraction Polynomial Integer,MATRIX)
+--R       Type: CliffordAlgebra(2,Fraction(Polynomial(Integer)),[[-1,0],[0,-1]])
 --E 15
 
 --S 16 of 36
@@ -163,7 +163,7 @@ x + y
 --R
 --R   (9)  e + a + (f + b)e  + (g + c)e  + (h + d)e e
 --R                        1           2           1 2
---R                  Type: CliffordAlgebra(2,Fraction Polynomial Integer,MATRIX)
+--R       Type: CliffordAlgebra(2,Fraction(Polynomial(Integer)),[[-1,0],[0,-1]])
 --E 16
 
 --S 17 of 36
@@ -176,7 +176,7 @@ x * y
 --R   + 
 --R     (- b h + a g + d f + c e)e  + (a h + b g - c f + d e)e e
 --R                               2                           1 2
---R                  Type: CliffordAlgebra(2,Fraction Polynomial Integer,MATRIX)
+--R       Type: CliffordAlgebra(2,Fraction(Polynomial(Integer)),[[-1,0],[0,-1]])
 --E 17
 
 --S 18 of 36
@@ -189,7 +189,7 @@ y * x
 --R   + 
 --R     (b h + a g - d f + c e)e  + (a h - b g + c f + d e)e e
 --R                             2                           1 2
---R                  Type: CliffordAlgebra(2,Fraction Polynomial Integer,MATRIX)
+--R       Type: CliffordAlgebra(2,Fraction(Polynomial(Integer)),[[-1,0],[0,-1]])
 --E 18
 
 -- Input generated from ugxCliffordExteriorPage
@@ -199,7 +199,7 @@ y * x
 K := Fraction Polynomial Integer
 --R 
 --R
---R   (1)  Fraction Polynomial Integer
+--R   (1)  Fraction(Polynomial(Integer))
 --R                                                                 Type: Domain
 --E 19
 
@@ -207,7 +207,8 @@ K := Fraction Polynomial Integer
 Ext := CliffordAlgebra(3, K, quadraticForm 0)
 --R 
 --R
---R   (2)  CliffordAlgebra(3,Fraction Polynomial Integer,MATRIX)
+--R   (2)
+--R   CliffordAlgebra(3,Fraction(Polynomial(Integer)),[[0,0,0],[0,0,0],[0,0,0]])
 --R                                                                 Type: Domain
 --E 20
 
@@ -217,7 +218,7 @@ i: Ext := e(1)
 --R
 --R   (3)  e
 --R         1
---R                  Type: CliffordAlgebra(3,Fraction Polynomial Integer,MATRIX)
+--RType: CliffordAlgebra(3,Fraction(Polynomial(Integer)),[[0,0,0],[0,0,0],[0,0,0]])
 --E 21
 
 --S 22 of 36
@@ -226,7 +227,7 @@ j: Ext := e(2)
 --R
 --R   (4)  e
 --R         2
---R                  Type: CliffordAlgebra(3,Fraction Polynomial Integer,MATRIX)
+--RType: CliffordAlgebra(3,Fraction(Polynomial(Integer)),[[0,0,0],[0,0,0],[0,0,0]])
 --E 22
 
 --S 23 of 36
@@ -235,7 +236,7 @@ k: Ext := e(3)
 --R
 --R   (5)  e
 --R         3
---R                  Type: CliffordAlgebra(3,Fraction Polynomial Integer,MATRIX)
+--RType: CliffordAlgebra(3,Fraction(Polynomial(Integer)),[[0,0,0],[0,0,0],[0,0,0]])
 --E 23
 
 --S 24 of 36
@@ -244,7 +245,7 @@ x := x1*i + x2*j + x3*k
 --R
 --R   (6)  x1 e  + x2 e  + x3 e
 --R            1       2       3
---R                  Type: CliffordAlgebra(3,Fraction Polynomial Integer,MATRIX)
+--RType: CliffordAlgebra(3,Fraction(Polynomial(Integer)),[[0,0,0],[0,0,0],[0,0,0]])
 --E 24
 
 --S 25 of 36
@@ -253,7 +254,7 @@ y := y1*i + y2*j + y3*k
 --R
 --R   (7)  y1 e  + y2 e  + y3 e
 --R            1       2       3
---R                  Type: CliffordAlgebra(3,Fraction Polynomial Integer,MATRIX)
+--RType: CliffordAlgebra(3,Fraction(Polynomial(Integer)),[[0,0,0],[0,0,0],[0,0,0]])
 --E 25
 
 --S 26 of 36
@@ -262,7 +263,7 @@ x + y
 --R
 --R   (8)  (y1 + x1)e  + (y2 + x2)e  + (y3 + x3)e
 --R                  1             2             3
---R                  Type: CliffordAlgebra(3,Fraction Polynomial Integer,MATRIX)
+--RType: CliffordAlgebra(3,Fraction(Polynomial(Integer)),[[0,0,0],[0,0,0],[0,0,0]])
 --E 26
 
 --S 27 of 36
@@ -270,7 +271,7 @@ x * y + y * x
 --R 
 --R
 --R   (9)  0
---R                  Type: CliffordAlgebra(3,Fraction Polynomial Integer,MATRIX)
+--RType: CliffordAlgebra(3,Fraction(Polynomial(Integer)),[[0,0,0],[0,0,0],[0,0,0]])
 --E 27
 
 --S 28 of 36
@@ -283,13 +284,14 @@ dual2 a == coefficient(a,[2,3]) * i + coefficient(a,[3,1]) * j + _
 --S 29 of 36
 dual2(x*y)
 --R 
---R   Compiling function dual2 with type CliffordAlgebra(3,Fraction 
---R      Polynomial Integer,MATRIX) -> CliffordAlgebra(3,Fraction 
---R      Polynomial Integer,MATRIX) 
+--R   Compiling function dual2 with type CliffordAlgebra(3,Fraction(
+--R      Polynomial(Integer)),[[0,0,0],[0,0,0],[0,0,0]]) -> 
+--R      CliffordAlgebra(3,Fraction(Polynomial(Integer)),[[0,0,0],[0,0,0],
+--R      [0,0,0]]) 
 --R
 --R   (11)  (x2 y3 - x3 y2)e  + (- x1 y3 + x3 y1)e  + (x1 y2 - x2 y1)e
 --R                         1                     2                   3
---R                  Type: CliffordAlgebra(3,Fraction Polynomial Integer,MATRIX)
+--RType: CliffordAlgebra(3,Fraction(Polynomial(Integer)),[[0,0,0],[0,0,0],[0,0,0]])
 --E 29
 
 -- Input generated from ugxCliffordDiracPage
@@ -299,7 +301,7 @@ dual2(x*y)
 K := Fraction Integer
 --R 
 --R
---R   (1)  Fraction Integer
+--R   (1)  Fraction(Integer)
 --R                                                                 Type: Domain
 --E 30
 
@@ -314,14 +316,16 @@ g := matrix [[1,0,0,0], [0,-1,0,0], [0,0,-1,0], [0,0,0,-1]]
 --R        |0   0   - 1   0 |
 --R        |                |
 --R        +0   0    0   - 1+
---R                                                         Type: Matrix Integer
+--R                                                        Type: Matrix(Integer)
 --E 31
 
 --S 32 of 36
 D := CliffordAlgebra(4,K, quadraticForm g)
 --R 
 --R
---R   (3)  CliffordAlgebra(4,Fraction Integer,MATRIX)
+--R   (3)
+--R  CliffordAlgebra(4,Fraction(Integer),[[1,0,0,0],[0,-1,0,0],[0,0,-1,0],[0,0,0,-
+--R  1]])
 --R                                                                 Type: Domain
 --E 32
 
@@ -331,7 +335,7 @@ gam := [e(i)$D for i in 1..4]
 --R
 --R   (4)  [e ,e ,e ,e ]
 --R          1  2  3  4
---R                        Type: List CliffordAlgebra(4,Fraction Integer,MATRIX)
+--RType: List(CliffordAlgebra(4,Fraction(Integer),[[1,0,0,0],[0,-1,0,0],[0,0,-1,0],[0,0,0,-1]]))
 --E 33
 
 --S 34 of 36
@@ -350,7 +354,7 @@ lhs := reduce(+, _
 --R
 --R   (6)  - 4e e e e
 --R            1 2 3 4
---R                             Type: CliffordAlgebra(4,Fraction Integer,MATRIX)
+--RType: CliffordAlgebra(4,Fraction(Integer),[[1,0,0,0],[0,-1,0,0],[0,0,-1,0],[0,0,0,-1]])
 --E 35
 
 --S 36 of 36
@@ -359,7 +363,7 @@ rhs := 2*(gam s * gam m*gam n*gam r + gam r*gam n*gam m*gam s)
 --R
 --R   (7)  - 4e e e e
 --R            1 2 3 4
---R                             Type: CliffordAlgebra(4,Fraction Integer,MATRIX)
+--RType: CliffordAlgebra(4,Fraction(Integer),[[1,0,0,0],[0,-1,0,0],[0,0,-1,0],[0,0,0,-1]])
 --E 36
 )spool
 )lisp (bye)
diff --git a/src/input/clifford.input.pamphlet b/src/input/clifford.input.pamphlet
index 50486b7..c749cc8 100644
--- a/src/input/clifford.input.pamphlet
+++ b/src/input/clifford.input.pamphlet
@@ -42,7 +42,7 @@ Choose rational functions as the ground field.
 K := FRAC POLY INT
 --R 
 --R
---R   (1)  Fraction Polynomial Integer
+--R   (1)  Fraction(Polynomial(Integer))
 --R                                                                 Type: Domain
 --E 1
 
@@ -54,14 +54,14 @@ qf: QFORM(1, K) := quadraticForm(matrix([[-1]])$(SQMATRIX(1,K)))
 --R 
 --R
 --R   (2)  [- 1]
---R                           Type: QuadraticForm(1,Fraction Polynomial Integer)
+--R                         Type: QuadraticForm(1,Fraction(Polynomial(Integer)))
 --E 2
 
 --S 3 of 39
 C := CLIF(1, K, qf)
 --R 
 --R
---R   (3)  CliffordAlgebra(1,Fraction Polynomial Integer,MATRIX)
+--R   (3)  CliffordAlgebra(1,Fraction(Polynomial(Integer)),[[-1]])
 --R                                                                 Type: Domain
 --E 3
 
@@ -71,7 +71,7 @@ i := e(1)$C
 --R
 --R   (4)  e
 --R         1
---R                  Type: CliffordAlgebra(1,Fraction Polynomial Integer,MATRIX)
+--R                Type: CliffordAlgebra(1,Fraction(Polynomial(Integer)),[[-1]])
 --E 4
 
 --S 5 of 39
@@ -80,7 +80,7 @@ x := a + b * i
 --R
 --R   (5)  a + b e
 --R               1
---R                  Type: CliffordAlgebra(1,Fraction Polynomial Integer,MATRIX)
+--R                Type: CliffordAlgebra(1,Fraction(Polynomial(Integer)),[[-1]])
 --E 5
 
 --S 6 of 39
@@ -89,7 +89,7 @@ y := c + d * i
 --R
 --R   (6)  c + d e
 --R               1
---R                  Type: CliffordAlgebra(1,Fraction Polynomial Integer,MATRIX)
+--R                Type: CliffordAlgebra(1,Fraction(Polynomial(Integer)),[[-1]])
 --E 6
 
 --S 7 of 39
@@ -98,7 +98,7 @@ x * y
 --R
 --R   (7)  - b d + a c + (a d + b c)e
 --R                                  1
---R                  Type: CliffordAlgebra(1,Fraction Polynomial Integer,MATRIX)
+--R                Type: CliffordAlgebra(1,Fraction(Polynomial(Integer)),[[-1]])
 --E 7
 
 --S 8 of 39
@@ -109,7 +109,7 @@ recip %
 --R   (8)  ------------------------- + ------------------------- e
 --R          2    2  2     2    2  2     2    2  2     2    2  2  1
 --R        (b  + a )d  + (b  + a )c    (b  + a )d  + (b  + a )c
---R       Type: Union(CliffordAlgebra(1,Fraction Polynomial Integer,MATRIX),...)
+--R     Type: Union(CliffordAlgebra(1,Fraction(Polynomial(Integer)),[[-1]]),...)
 --E 8
 
 --S 9 of 39
@@ -120,7 +120,7 @@ x*%
 --R   (9)  ------- - ------- e
 --R         2    2    2    2  1
 --R        d  + c    d  + c
---R                  Type: CliffordAlgebra(1,Fraction Polynomial Integer,MATRIX)
+--R                Type: CliffordAlgebra(1,Fraction(Polynomial(Integer)),[[-1]])
 --E 9
 
 --S 10 of 39
@@ -128,7 +128,7 @@ x*%
 --R 
 --R
 --R   (10)  1
---R                  Type: CliffordAlgebra(1,Fraction Polynomial Integer,MATRIX)
+--R                Type: CliffordAlgebra(1,Fraction(Polynomial(Integer)),[[-1]])
 --E 10
  
 --% The quaternions as a Clifford Algebra
@@ -141,14 +141,14 @@ qf:QFORM(2, K) :=quadraticForm matrix([[-1, 0], [0, -1]])$(SQMATRIX(2,K))
 --R         +- 1   0 +
 --R   (11)  |        |
 --R         + 0   - 1+
---R                           Type: QuadraticForm(2,Fraction Polynomial Integer)
+--R                         Type: QuadraticForm(2,Fraction(Polynomial(Integer)))
 --E 11
 
 --S 12 of 39
 H  := CLIF(2, K, qf)
 --R 
 --R
---R   (12)  CliffordAlgebra(2,Fraction Polynomial Integer,MATRIX)
+--R   (12)  CliffordAlgebra(2,Fraction(Polynomial(Integer)),[[-1,0],[0,-1]])
 --R                                                                 Type: Domain
 --E 12
 
@@ -158,7 +158,7 @@ i  := e(1)$H
 --R
 --R   (13)  e
 --R          1
---R                  Type: CliffordAlgebra(2,Fraction Polynomial Integer,MATRIX)
+--R       Type: CliffordAlgebra(2,Fraction(Polynomial(Integer)),[[-1,0],[0,-1]])
 --E 13
 
 --S 14 of 39
@@ -167,7 +167,7 @@ j  := e(2)$H
 --R
 --R   (14)  e
 --R          2
---R                  Type: CliffordAlgebra(2,Fraction Polynomial Integer,MATRIX)
+--R       Type: CliffordAlgebra(2,Fraction(Polynomial(Integer)),[[-1,0],[0,-1]])
 --E 14
 
 --S 15 of 39
@@ -176,7 +176,7 @@ k  := i * j
 --R
 --R   (15)  e e
 --R          1 2
---R                  Type: CliffordAlgebra(2,Fraction Polynomial Integer,MATRIX)
+--R       Type: CliffordAlgebra(2,Fraction(Polynomial(Integer)),[[-1,0],[0,-1]])
 --E 15
 
 --S 16 of 39
@@ -185,7 +185,7 @@ x := a + b * i + c * j + d * k
 --R
 --R   (16)  a + b e  + c e  + d e e
 --R                1      2      1 2
---R                  Type: CliffordAlgebra(2,Fraction Polynomial Integer,MATRIX)
+--R       Type: CliffordAlgebra(2,Fraction(Polynomial(Integer)),[[-1,0],[0,-1]])
 --E 16
 
 --S 17 of 39
@@ -194,7 +194,7 @@ y := e + f * i + g * j + h * k
 --R
 --R   (17)  e + f e  + g e  + h e e
 --R                1      2      1 2
---R                  Type: CliffordAlgebra(2,Fraction Polynomial Integer,MATRIX)
+--R       Type: CliffordAlgebra(2,Fraction(Polynomial(Integer)),[[-1,0],[0,-1]])
 --E 17
 
 --S 18 of 39
@@ -203,7 +203,7 @@ x + y
 --R
 --R   (18)  e + a + (f + b)e  + (g + c)e  + (h + d)e e
 --R                         1           2           1 2
---R                  Type: CliffordAlgebra(2,Fraction Polynomial Integer,MATRIX)
+--R       Type: CliffordAlgebra(2,Fraction(Polynomial(Integer)),[[-1,0],[0,-1]])
 --E 18
 
 --S 19 of 39
@@ -216,7 +216,7 @@ x * y
 --R   + 
 --R     (- b h + a g + d f + c e)e  + (a h + b g - c f + d e)e e
 --R                               2                           1 2
---R                  Type: CliffordAlgebra(2,Fraction Polynomial Integer,MATRIX)
+--R       Type: CliffordAlgebra(2,Fraction(Polynomial(Integer)),[[-1,0],[0,-1]])
 --E 19
 
 --S 20 of 39
@@ -229,7 +229,7 @@ y * x
 --R   + 
 --R     (b h + a g - d f + c e)e  + (a h - b g + c f + d e)e e
 --R                             2                           1 2
---R                  Type: CliffordAlgebra(2,Fraction Polynomial Integer,MATRIX)
+--R       Type: CliffordAlgebra(2,Fraction(Polynomial(Integer)),[[-1,0],[0,-1]])
 --E 20
  
 --% The exterior algebra on a 3 space.
@@ -244,14 +244,15 @@ qf: QFORM(3, K) := quadraticForm(0::SQMATRIX(3,K))
 --R   (21)  |0  0  0|
 --R         |       |
 --R         +0  0  0+
---R                           Type: QuadraticForm(3,Fraction Polynomial Integer)
+--R                         Type: QuadraticForm(3,Fraction(Polynomial(Integer)))
 --E 21
 
 --S 22 of 39
 Ext := CLIF(3,K,qf)
 --R 
 --R
---R   (22)  CliffordAlgebra(3,Fraction Polynomial Integer,MATRIX)
+--R   (22)
+--R   CliffordAlgebra(3,Fraction(Polynomial(Integer)),[[0,0,0],[0,0,0],[0,0,0]])
 --R                                                                 Type: Domain
 --E 22
 
@@ -261,7 +262,7 @@ i := e(1)$Ext
 --R
 --R   (23)  e
 --R          1
---R                  Type: CliffordAlgebra(3,Fraction Polynomial Integer,MATRIX)
+--RType: CliffordAlgebra(3,Fraction(Polynomial(Integer)),[[0,0,0],[0,0,0],[0,0,0]])
 --E 23
 
 --S 24 of 39
@@ -270,7 +271,7 @@ j := e(2)$Ext
 --R
 --R   (24)  e
 --R          2
---R                  Type: CliffordAlgebra(3,Fraction Polynomial Integer,MATRIX)
+--RType: CliffordAlgebra(3,Fraction(Polynomial(Integer)),[[0,0,0],[0,0,0],[0,0,0]])
 --E 24
 
 --S 25 of 39
@@ -279,7 +280,7 @@ k := e(3)$Ext
 --R
 --R   (25)  e
 --R          3
---R                  Type: CliffordAlgebra(3,Fraction Polynomial Integer,MATRIX)
+--RType: CliffordAlgebra(3,Fraction(Polynomial(Integer)),[[0,0,0],[0,0,0],[0,0,0]])
 --E 25
 
 --S 26 of 39
@@ -288,7 +289,7 @@ x := x1*i + x2*j + x3*k
 --R
 --R   (26)  x1 e  + x2 e  + x3 e
 --R             1       2       3
---R                  Type: CliffordAlgebra(3,Fraction Polynomial Integer,MATRIX)
+--RType: CliffordAlgebra(3,Fraction(Polynomial(Integer)),[[0,0,0],[0,0,0],[0,0,0]])
 --E 26
 
 --S 27 of 39
@@ -297,7 +298,7 @@ y := y1*i + y2*j + y3*k
 --R
 --R   (27)  y1 e  + y2 e  + y3 e
 --R             1       2       3
---R                  Type: CliffordAlgebra(3,Fraction Polynomial Integer,MATRIX)
+--RType: CliffordAlgebra(3,Fraction(Polynomial(Integer)),[[0,0,0],[0,0,0],[0,0,0]])
 --E 27
 
 --S 28 of 39
@@ -306,7 +307,7 @@ x + y
 --R
 --R   (28)  (y1 + x1)e  + (y2 + x2)e  + (y3 + x3)e
 --R                   1             2             3
---R                  Type: CliffordAlgebra(3,Fraction Polynomial Integer,MATRIX)
+--RType: CliffordAlgebra(3,Fraction(Polynomial(Integer)),[[0,0,0],[0,0,0],[0,0,0]])
 --E 28
 
 --S 29 of 39
@@ -314,7 +315,7 @@ x * y + y * x
 --R 
 --R
 --R   (29)  0
---R                  Type: CliffordAlgebra(3,Fraction Polynomial Integer,MATRIX)
+--RType: CliffordAlgebra(3,Fraction(Polynomial(Integer)),[[0,0,0],[0,0,0],[0,0,0]])
 --E 29
 
 \end{chunk}
@@ -339,13 +340,14 @@ The vector cross product is then given by
 --S 31 of 39
 dual2(x*y)
 --R 
---R   Compiling function dual2 with type CliffordAlgebra(3,Fraction 
---R      Polynomial Integer,MATRIX) -> CliffordAlgebra(3,Fraction 
---R      Polynomial Integer,MATRIX) 
+--R   Compiling function dual2 with type CliffordAlgebra(3,Fraction(
+--R      Polynomial(Integer)),[[0,0,0],[0,0,0],[0,0,0]]) -> 
+--R      CliffordAlgebra(3,Fraction(Polynomial(Integer)),[[0,0,0],[0,0,0],
+--R      [0,0,0]]) 
 --R
 --R   (31)  (x2 y3 - x3 y2)e  + (- x1 y3 + x3 y1)e  + (x1 y2 - x2 y1)e
 --R                         1                     2                   3
---R                  Type: CliffordAlgebra(3,Fraction Polynomial Integer,MATRIX)
+--RType: CliffordAlgebra(3,Fraction(Polynomial(Integer)),[[0,0,0],[0,0,0],[0,0,0]])
 --E 31
 
 \end{chunk} 
@@ -357,7 +359,7 @@ The Dirac Algebra used in Quantum Field Theory.
 K := FRAC INT
 --R 
 --R
---R   (32)  Fraction Integer
+--R   (32)  Fraction(Integer)
 --R                                                                 Type: Domain
 --E 32
 
@@ -372,7 +374,7 @@ g: SQMATRIX(4, K) := [[1,0,0,0],[0,-1,0,0],[0,0,-1,0],[0,0,0,-1]]
 --R         |0   0   - 1   0 |
 --R         |                |
 --R         +0   0    0   - 1+
---R                                       Type: SquareMatrix(4,Fraction Integer)
+--R                                      Type: SquareMatrix(4,Fraction(Integer))
 --E 33
 
 --S 34 of 39
@@ -386,14 +388,16 @@ qf: QFORM(4, K) := quadraticForm g
 --R         |0   0   - 1   0 |
 --R         |                |
 --R         +0   0    0   - 1+
---R                                      Type: QuadraticForm(4,Fraction Integer)
+--R                                     Type: QuadraticForm(4,Fraction(Integer))
 --E 34
 
 --S 35 of 39
 D := CLIF(4,K,qf)
 --R 
 --R
---R   (35)  CliffordAlgebra(4,Fraction Integer,MATRIX)
+--R   (35)
+--R  CliffordAlgebra(4,Fraction(Integer),[[1,0,0,0],[0,-1,0,0],[0,0,-1,0],[0,0,0,-
+--R  1]])
 --R                                                                 Type: Domain
 --E 35
 
@@ -406,7 +410,7 @@ gam := [e(i)$D for i in 1..4]
 --R
 --R   (36)  [e ,e ,e ,e ]
 --R           1  2  3  4
---R                        Type: List CliffordAlgebra(4,Fraction Integer,MATRIX)
+--RType: List(CliffordAlgebra(4,Fraction(Integer),[[1,0,0,0],[0,-1,0,0],[0,0,-1,0],[0,0,0,-1]]))
 --E 36
  
 \end{chunk}
@@ -433,7 +437,7 @@ lhs := reduce(+,[reduce(+,[g(l,t)*gam(l)*gam(m)*gam(n)*gam(r)*gam(s)*gam(t)
 --R
 --R   (38)  - 4e e e e
 --R             1 2 3 4
---R                             Type: CliffordAlgebra(4,Fraction Integer,MATRIX)
+--RType: CliffordAlgebra(4,Fraction(Integer),[[1,0,0,0],[0,-1,0,0],[0,0,-1,0],[0,0,0,-1]])
 --E 38
 
 --S 39 of 39
@@ -442,7 +446,7 @@ rhs := 2*(gam s * gam m*gam n*gam r + gam r*gam n*gam m*gam s)
 --R
 --R   (39)  - 4e e e e
 --R             1 2 3 4
---R                             Type: CliffordAlgebra(4,Fraction Integer,MATRIX)
+--RType: CliffordAlgebra(4,Fraction(Integer),[[1,0,0,0],[0,-1,0,0],[0,0,-1,0],[0,0,0,-1]])
 --E 39
 )spool
 )lisp (bye)
diff --git a/src/input/coercels.input.pamphlet b/src/input/coercels.input.pamphlet
index 493ddc8..b565ae1 100644
--- a/src/input/coercels.input.pamphlet
+++ b/src/input/coercels.input.pamphlet
@@ -26,7 +26,7 @@ alternatingGroup 4
 --R 
 --R
 --R   (1)  <(1 2)(3 4),(1 2 3)>
---R                                               Type: PermutationGroup Integer
+--R                                              Type: PermutationGroup(Integer)
 --E 1
 
 --S 2 of 8
@@ -34,7 +34,7 @@ alternatingGroup 4
 --R 
 --R
 --R   (2)  [(1 2)(3 4),(1 2 3)]
---R                                               Type: List Permutation Integer
+--R                                             Type: List(Permutation(Integer))
 --E 2
 
 --S 3 of 8
@@ -42,14 +42,14 @@ li := %
 --R 
 --R
 --R   (3)  [(1 2)(3 4),(1 2 3)]
---R                                               Type: List Permutation Integer
+--R                                             Type: List(Permutation(Integer))
 --E 3
 
 --S 4 of 8
 pgr := MonoidRing(Polynomial PrimeField 5, Permutation Integer)
 --R 
 --R
---R   (4)  MonoidRing(Polynomial PrimeField 5,Permutation Integer)
+--R   (4)  MonoidRing(Polynomial(PrimeField(5)),Permutation(Integer))
 --R                                                                 Type: Domain
 --E 4
 
@@ -58,7 +58,7 @@ p : pgr := first  li
 --R 
 --R
 --R   (5)  (1 2)(3 4)
---R                Type: MonoidRing(Polynomial PrimeField 5,Permutation Integer)
+--R             Type: MonoidRing(Polynomial(PrimeField(5)),Permutation(Integer))
 --E 5
 
 --S 6 of 8
@@ -66,7 +66,7 @@ q : pgr := first  li
 --R 
 --R
 --R   (6)  (1 2)(3 4)
---R                Type: MonoidRing(Polynomial PrimeField 5,Permutation Integer)
+--R             Type: MonoidRing(Polynomial(PrimeField(5)),Permutation(Integer))
 --E 6
 
 --S 7 of 8
@@ -76,7 +76,7 @@ basis  := [p,q,p*p,p*q, q*p,q*q, p*q*q, p*q*p, q*p*q,q*q*p,q*p*q*q,q*q*p*q]
 --R   (7)
 --R   [(1 2)(3 4), (1 2)(3 4), 1, 1, 1, 1, (1 2)(3 4), (1 2)(3 4), (1 2)(3 4),
 --R    (1 2)(3 4), 1, 1]
---R           Type: List MonoidRing(Polynomial PrimeField 5,Permutation Integer)
+--R       Type: List(MonoidRing(Polynomial(PrimeField(5)),Permutation(Integer)))
 --E 7
 
 --S 8 of 8
@@ -84,7 +84,7 @@ basis  := [p,q,p*p,p*q, q*p,q*q, p*q*q, p*q*p, q*p*q,q*q*p,q*p*q*q,q*q*p*q]
 --R 
 --R
 --R   (8)  {(1 2)(3 4),1}
---R            Type: Set MonoidRing(Polynomial PrimeField 5,Permutation Integer)
+--R        Type: Set(MonoidRing(Polynomial(PrimeField(5)),Permutation(Integer)))
 --E 8
 )spool
 )lisp (bye)
diff --git a/src/input/collect.input.pamphlet b/src/input/collect.input.pamphlet
index dc2b3e0..dd89198 100644
--- a/src/input/collect.input.pamphlet
+++ b/src/input/collect.input.pamphlet
@@ -26,7 +26,7 @@ a := [i**3 for i in 0..10]
 --R 
 --R
 --R   (1)  [0,1,8,27,64,125,216,343,512,729,1000]
---R                                                Type: List NonNegativeInteger
+--R                                               Type: List(NonNegativeInteger)
 --E 1
 
 --S 2 of 55
@@ -34,7 +34,7 @@ b := expand [0..10]
 --R 
 --R
 --R   (2)  [0,1,2,3,4,5,6,7,8,9,10]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 2
 
 --S 3 of 55
@@ -42,7 +42,7 @@ c := [x**3 for x in b]
 --R 
 --R
 --R   (3)  [0,1,8,27,64,125,216,343,512,729,1000]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 3
 
 --S 4 of 55
@@ -50,7 +50,7 @@ d := [i**3 for i in 0..10 | even? i]
 --R 
 --R
 --R   (4)  [0,8,64,216,512,1000]
---R                                                Type: List NonNegativeInteger
+--R                                               Type: List(NonNegativeInteger)
 --E 4
 
 --S 5 of 55
@@ -58,7 +58,7 @@ d := [x**3 for x in b | even? x]
 --R 
 --R
 --R   (5)  [0,8,64,216,512,1000]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 5
 
 --S 6 of 55
@@ -66,7 +66,7 @@ d := [x for x in c | even? x]
 --R 
 --R
 --R   (6)  [0,8,64,216,512,1000]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 6
 
 --S 7 of 55
@@ -74,7 +74,7 @@ d := [i**3 for i in 0..10 by 2 | even? i]
 --R 
 --R
 --R   (7)  [0,8,64,216,512,1000]
---R                                                Type: List NonNegativeInteger
+--R                                               Type: List(NonNegativeInteger)
 --E 7
 
 --S 8 of 55
@@ -82,7 +82,7 @@ e := reverse [i**3 for i in 10..0 by -2 | even? i]
 --R 
 --R
 --R   (8)  [0,8,64,216,512,1000]
---R                                                Type: List NonNegativeInteger
+--R                                               Type: List(NonNegativeInteger)
 --E 8
 
 --S 9 of 55
@@ -90,42 +90,42 @@ e := reverse [i**3 for i in 10..0 by -2 | even? i]
 --R 
 --R
 --R   (9)  [0,0,0,0,0,0]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 9
 
 --S 10 of 55
 [x**3 - y for x in b | even? x for y in e]
 --R
 --R   (10)  [0,- 56,- 448]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 10
 
 --S 11 of 55
 f := [i**3 for i in 0..]
 --R
 --R   (11)  [0,1,8,27,64,125,216,343,512,729,...]
---R                                              Type: Stream NonNegativeInteger
+--R                                             Type: Stream(NonNegativeInteger)
 --E 11
 
 --S 12 of 55
 [i**3 for i in 0..10]
 --R
 --R   (12)  [0,1,8,27,64,125,216,343,512,729,1000]
---R                                                Type: List NonNegativeInteger
+--R                                               Type: List(NonNegativeInteger)
 --E 12
 
 --S 13 of 55
 [i**3 for i in 0.. while i < 11]
 --R
 --R   (13)  [0,1,8,27,64,125,216,343,512,729,...]
---R                                              Type: Stream NonNegativeInteger
+--R                                             Type: Stream(NonNegativeInteger)
 --E 13
 
 --S 14 of 55
 [i**3 for i in 0.. for x in 0..10]
 --R
 --R   (14)  [0,1,8,27,64,125,216,343,512,729,...]
---R                                              Type: Stream NonNegativeInteger
+--R                                             Type: Stream(NonNegativeInteger)
 --E 14
 
 --S 15 of 55
@@ -134,7 +134,7 @@ f := [i**3 for i in 0..]
 --R   (15)
 --R   [[1,0,0,0], [1,1,1,1], [1,2,4,8], [1,3,9,27], [1,4,16,64], [1,5,25,125],
 --R    [1,6,36,216], [1,7,49,343], [1,8,64,512], [1,9,81,729], ...]
---R                                         Type: Stream List NonNegativeInteger
+--R                                       Type: Stream(List(NonNegativeInteger))
 --E 15
 
 --S 16 of 55
@@ -144,14 +144,14 @@ f := [i**3 for i in 0..]
 --R   [[1,0,0,0,0,0,0,0,0,0,...], [1,1,1,1,1,1,1,1,1,1,...],
 --R    [1,2,4,8,16,32,64,128,256,512,...],
 --R    [1,3,9,27,81,243,729,2187,6561,19683,...]]
---R                                           Type: List Stream Fraction Integer
+--R                                        Type: List(Stream(Fraction(Integer)))
 --E 16
 
 --S 17 of 55
 brace [i**3 for i in 10..0 by -2]
 --R
 --R   (17)  {0,8,64,216,512,1000}
---R                                                 Type: Set NonNegativeInteger
+--R                                                Type: Set(NonNegativeInteger)
 --E 17
 
 -- Input generated from ContinuedFractionXmpPage
@@ -164,7 +164,7 @@ c := continuedFraction(314159/100000)
 --R              1 |     1  |     1 |     1  |     1 |     1 |     1 |
 --R   (1)  3 + +---+ + +----+ + +---+ + +----+ + +---+ + +---+ + +---+
 --R            | 7     | 15     | 1     | 25     | 1     | 7     | 4
---R                                              Type: ContinuedFraction Integer
+--R                                             Type: ContinuedFraction(Integer)
 --E 18
 
 --S 19 of 55
@@ -172,7 +172,7 @@ partialQuotients c
 --R 
 --R
 --R   (2)  [3,7,15,1,25,1,7,4]
---R                                                         Type: Stream Integer
+--R                                                        Type: Stream(Integer)
 --E 19
 
 --S 20 of 55
@@ -182,7 +182,7 @@ convergents c
 --R           22 333 355 9208 9563 76149 314159
 --R   (3)  [3,--,---,---,----,----,-----,------]
 --R            7 106 113 2931 3044 24239 100000
---R                                                Type: Stream Fraction Integer
+--R                                              Type: Stream(Fraction(Integer))
 --E 20
 
 --S 21 of 55
@@ -193,7 +193,7 @@ approximants c
 --R           22 333 355 9208 9563 76149 314159
 --R   (4)  [3,--,---,---,----,----,-----,------]
 --R            7 106 113 2931 3044 24239 100000
---R                                                Type: Stream Fraction Integer
+--R                                              Type: Stream(Fraction(Integer))
 --E 21
 
 --S 22 of 55
@@ -201,7 +201,7 @@ pq := partialQuotients(1/c)
 --R 
 --R
 --R   (5)  [0,3,7,15,1,25,1,7,4]
---R                                                         Type: Stream Integer
+--R                                                        Type: Stream(Integer)
 --E 22
 
 --S 23 of 55
@@ -211,7 +211,7 @@ continuedFraction(first pq,repeating [1],rest pq)
 --R          1 |     1 |     1  |     1 |     1  |     1 |     1 |     1 |
 --R   (6)  +---+ + +---+ + +----+ + +---+ + +----+ + +---+ + +---+ + +---+
 --R        | 3     | 7     | 15     | 1     | 25     | 1     | 7     | 4
---R                                              Type: ContinuedFraction Integer
+--R                                             Type: ContinuedFraction(Integer)
 --E 23
 
 --S 24 of 55
@@ -226,7 +226,7 @@ z:=continuedFraction(3,repeating [1],repeating [3,6])
 --R       1 |
 --R     +---+ + ...
 --R     | 6
---R                                              Type: ContinuedFraction Integer
+--R                                             Type: ContinuedFraction(Integer)
 --E 24
 
 --S 25 of 55
@@ -234,7 +234,7 @@ dens:Stream Integer := cons(1,generate((x+->x+4),6))
 --R 
 --R
 --R   (8)  [1,6,10,14,18,22,26,30,34,38,...]
---R                                                         Type: Stream Integer
+--R                                                        Type: Stream(Integer)
 --E 25
 
 --S 26 of 55
@@ -249,7 +249,7 @@ cf := continuedFraction(0,repeating [1],dens)
 --R       1  |     1  |
 --R     +----+ + +----+ + ...
 --R     | 34     | 38
---R                                              Type: ContinuedFraction Integer
+--R                                             Type: ContinuedFraction(Integer)
 --E 26
 
 --S 27 of 55
@@ -259,7 +259,7 @@ ccf := convergents cf
 --R              6 61  860 15541 342762  8927353 268163352  9126481321
 --R   (10)  [0,1,-,--,----,-----,------,--------,---------,-----------,...]
 --R              7 71 1001 18089 398959 10391023 312129649 10622799089
---R                                                Type: Stream Fraction Integer
+--R                                              Type: Stream(Fraction(Integer))
 --E 27
 
 --S 28 of 55
@@ -269,7 +269,7 @@ eConvergents := [2*e + 1 for e in ccf]
 --R              19 193 2721 49171 1084483 28245729 848456353 28875761731
 --R   (11)  [1,3,--,---,----,-----,-------,--------,---------,-----------,...]
 --R               7  71 1001 18089  398959 10391023 312129649 10622799089
---R                                                Type: Stream Fraction Integer
+--R                                              Type: Stream(Fraction(Integer))
 --E 28
 
 --S 29 of 55
@@ -281,7 +281,7 @@ eConvergents :: Stream Float
 --R    2.7182817182 817182817, 2.7182818287 356957267, 2.7182818284 585634113,
 --R    2.7182818284 590458514, 2.7182818284 590452348, 2.7182818284 590452354,
 --R    ...]
---R                                                           Type: Stream Float
+--R                                                          Type: Stream(Float)
 --E 29
 
 --S 30 of 55
@@ -304,7 +304,7 @@ cf := continuedFraction(1,[(2*i+1)**2 for i in 0..],repeating [2])
 --R       289 |     361 |
 --R     +-----+ + +-----+ + ...
 --R     |  2      |  2
---R                                              Type: ContinuedFraction Integer
+--R                                             Type: ContinuedFraction(Integer)
 --E 31
 
 --S 32 of 55
@@ -314,7 +314,7 @@ ccf := convergents cf
 --R            3 15 105 315 3465 45045 45045 765765 14549535
 --R   (15)  [1,-,--,---,---,----,-----,-----,------,--------,...]
 --R            2 13  76 263 2578 36979 33976 622637 11064338
---R                                                Type: Stream Fraction Integer
+--R                                              Type: Stream(Fraction(Integer))
 --E 32
 
 --S 33 of 55
@@ -324,7 +324,7 @@ piConvergents := [4/p for p in ccf]
 --R            8 52 304 1052 10312 147916 135904 2490548 44257352
 --R   (16)  [4,-,--,---,----,-----,------,------,-------,--------,...]
 --R            3 15 105  315  3465  45045  45045  765765 14549535
---R                                                Type: Stream Fraction Integer
+--R                                              Type: Stream(Fraction(Integer))
 --E 33
 
 --S 34 of 55
@@ -336,7 +336,7 @@ piConvergents :: Stream Float
 --R    2.8952380952 380952381, 3.3396825396 825396825, 2.9760461760 461760462,
 --R    3.2837384837 384837385, 3.0170718170 718170718, 3.2523659347 188758953,
 --R    3.0418396189 294022111, ...]
---R                                                           Type: Stream Float
+--R                                                          Type: Stream(Float)
 --E 34
 
 --S 35 of 55
@@ -346,7 +346,7 @@ continuedFraction((- 122 + 597*%i)/(4 - 4*%i))
 --R                            1    |         1     |
 --R   (18)  - 90 + 59%i + +---------+ + +-----------+
 --R                       | 1 - 2%i     | - 1 + 2%i
---R                                      Type: ContinuedFraction Complex Integer
+--R                                    Type: ContinuedFraction(Complex(Integer))
 --E 35
 
 --S 36 of 55
@@ -364,7 +364,7 @@ r := ((x - 1) * (x - 2)) / ((x-3) * (x-4))
 --R   (20)  ------------
 --R          2
 --R         x  - 7x + 12
---R                      Type: Fraction UnivariatePolynomial(x,Fraction Integer)
+--R                    Type: Fraction(UnivariatePolynomial(x,Fraction(Integer)))
 --E 37
 
 --S 38 of 55
@@ -376,7 +376,7 @@ continuedFraction r
 --R             | 1     9     | 16     40
 --R             | - x - -     | -- x - --
 --R             | 4     8     |  3      3
---R             Type: ContinuedFraction UnivariatePolynomial(x,Fraction Integer)
+--R           Type: ContinuedFraction(UnivariatePolynomial(x,Fraction(Integer)))
 --E 38
 
 --S 39 of 55
@@ -388,7 +388,7 @@ continuedFraction r
 --R    10.9999860763 98799786, 11.0000006979 29731039, 10.9999999650 15834446,
 --R    11.0000000017 53603304, 10.9999999999 12099531, 11.0000000000 04406066,
 --R    ...]
---R                                                           Type: Stream Float
+--R                                                          Type: Stream(Float)
 --E 39
 
 -- Input for page ForCollectionDetailPage
@@ -399,7 +399,7 @@ u := [i**3 for i in 1..10]
 --R 
 --R
 --R   (1)  [1,8,27,64,125,216,343,512,729,1000]
---R                                                   Type: List PositiveInteger
+--R                                                  Type: List(PositiveInteger)
 --E 40
 
 --S 41 of 55
@@ -416,7 +416,7 @@ u(4)
 --R
 --R           3   3   3   3   3
 --R   (3)  [8i ,8i ,8i ,8i ,8i ]
---R                                                Type: List Polynomial Integer
+--R                                              Type: List(Polynomial(Integer))
 --E 42
 
 --S 43 of 55
@@ -424,7 +424,7 @@ u(4)
 --R 
 --R
 --R   (4)  [8,64,216,512,1000]
---R                                                   Type: List PositiveInteger
+--R                                                  Type: List(PositiveInteger)
 --E 43
 
 --S 44 of 55
@@ -432,7 +432,7 @@ u(4)
 --R 
 --R
 --R   (5)  [8,64,216,512,1000]
---R                                                   Type: List PositiveInteger
+--R                                                  Type: List(PositiveInteger)
 --E 44
 
 --S 45 of 55
@@ -440,7 +440,7 @@ u(4)
 --R 
 --R
 --R   (6)  [8,64,216,512,1000]
---R                                                   Type: List PositiveInteger
+--R                                                  Type: List(PositiveInteger)
 --E 45
 
 -- Input for page ForStreamDetailPage
@@ -451,7 +451,7 @@ u := [i**3 for i in 1..]
 --R 
 --R
 --R   (1)  [1,8,27,64,125,216,343,512,729,1000,...]
---R                                                 Type: Stream PositiveInteger
+--R                                                Type: Stream(PositiveInteger)
 --E 46
 
 --S 47 of 55
@@ -467,7 +467,7 @@ u
 --R 
 --R
 --R   (3)  [1,8,27,64,125,216,343,512,729,1000,...]
---R                                                 Type: Stream PositiveInteger
+--R                                                Type: Stream(PositiveInteger)
 --E 48
 
 --S 49 of 55
@@ -483,7 +483,7 @@ u(16)
 --R 
 --R
 --R   (5)  [0,8,64,216,512,1000,1728,2744,4096,5832,...]
---R                                              Type: Stream NonNegativeInteger
+--R                                             Type: Stream(NonNegativeInteger)
 --E 50
 
 --S 51 of 55
@@ -491,7 +491,7 @@ u(16)
 --R 
 --R
 --R   (6)  [0,8,64,216,512,1000,1728,2744,4096,5832,...]
---R                                              Type: Stream NonNegativeInteger
+--R                                             Type: Stream(NonNegativeInteger)
 --E 51
 
 --S 52 of 55
@@ -499,7 +499,7 @@ u(16)
 --R 
 --R
 --R   (7)  [0,8,64,216,512,1000,1728,2744,4096,5832,...]
---R                                              Type: Stream NonNegativeInteger
+--R                                             Type: Stream(NonNegativeInteger)
 --E 52
 
 --S 53 of 55
@@ -507,7 +507,7 @@ u(16)
 --R 
 --R
 --R   (8)  [8,64,216,512,1000,1728,2744,4096,5832,8000,...]
---R                                                 Type: Stream PositiveInteger
+--R                                                Type: Stream(PositiveInteger)
 --E 53
 
 --S 54 of 55
@@ -515,7 +515,7 @@ u(16)
 --R 
 --R
 --R   (9)  [8,64,216,512,1000,1728,2744,4096,5832,8000,...]
---R                                                 Type: Stream PositiveInteger
+--R                                                Type: Stream(PositiveInteger)
 --E 54
 
 --S 55 of 55
@@ -523,7 +523,7 @@ u(16)
 --R 
 --R
 --R   (10)  [8,64,216,512,1000,1728,2744,4096,5832,8000,...]
---R                                                 Type: Stream PositiveInteger
+--R                                                Type: Stream(PositiveInteger)
 --E 55
 )spool
 )lisp (bye)
diff --git a/src/input/complex.input.pamphlet b/src/input/complex.input.pamphlet
index 11ed873..1d677af 100644
--- a/src/input/complex.input.pamphlet
+++ b/src/input/complex.input.pamphlet
@@ -30,7 +30,7 @@ a := complex(4/3,5/2)
 --R        4   5
 --R   (1)  - + - %i
 --R        3   2
---R                                               Type: Complex Fraction Integer
+--R                                             Type: Complex(Fraction(Integer))
 --E 1
 
 --S 2 of 16
@@ -40,7 +40,7 @@ b := complex(4/3,-5/2)
 --R        4   5
 --R   (2)  - - - %i
 --R        3   2
---R                                               Type: Complex Fraction Integer
+--R                                             Type: Complex(Fraction(Integer))
 --E 2
 
 --S 3 of 16
@@ -50,7 +50,7 @@ a + b
 --R        8
 --R   (3)  -
 --R        3
---R                                               Type: Complex Fraction Integer
+--R                                             Type: Complex(Fraction(Integer))
 --E 3
 
 --S 4 of 16
@@ -58,7 +58,7 @@ a - b
 --R 
 --R
 --R   (4)  5%i
---R                                               Type: Complex Fraction Integer
+--R                                             Type: Complex(Fraction(Integer))
 --E 4
 
 --S 5 of 16
@@ -68,7 +68,7 @@ a * b
 --R        289
 --R   (5)  ---
 --R         36
---R                                               Type: Complex Fraction Integer
+--R                                             Type: Complex(Fraction(Integer))
 --E 5
 
 --S 6 of 16
@@ -78,7 +78,7 @@ a / b
 --R          161   240
 --R   (6)  - --- + --- %i
 --R          289   289
---R                                               Type: Complex Fraction Integer
+--R                                             Type: Complex(Fraction(Integer))
 --E 6
 
 --S 7 of 16
@@ -88,7 +88,7 @@ a / b
 --R        - 15 + 8%i
 --R   (7)  ----------
 --R         15 + 8%i
---R                                               Type: Fraction Complex Integer
+--R                                             Type: Fraction(Complex(Integer))
 --E 7
 
 --S 8 of 16
@@ -96,7 +96,7 @@ a / b
 --R 
 --R
 --R   (8)  3.4 + 6.7 %i
---R                                                          Type: Complex Float
+--R                                                         Type: Complex(Float)
 --E 8
 
 --S 9 of 16
@@ -106,7 +106,7 @@ conjugate a
 --R        4   5
 --R   (9)  - - - %i
 --R        3   2
---R                                               Type: Complex Fraction Integer
+--R                                             Type: Complex(Fraction(Integer))
 --E 9
 
 --S 10 of 16
@@ -116,7 +116,7 @@ norm a
 --R         289
 --R   (10)  ---
 --R          36
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 10
 
 --S 11 of 16
@@ -126,7 +126,7 @@ real a
 --R         4
 --R   (11)  -
 --R         3
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 11
 
 --S 12 of 16
@@ -136,7 +136,7 @@ imag a
 --R         5
 --R   (12)  -
 --R         2
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 12
 
 --S 13 of 16
@@ -144,7 +144,7 @@ gcd(13 - 13*%i,31 + 27*%i)
 --R 
 --R
 --R   (13)  5 + %i
---R                                                        Type: Complex Integer
+--R                                                       Type: Complex(Integer)
 --E 13
 
 --S 14 of 16
@@ -152,7 +152,7 @@ lcm(13 - 13*%i,31 + 27*%i)
 --R 
 --R
 --R   (14)  143 - 39%i
---R                                                        Type: Complex Integer
+--R                                                       Type: Complex(Integer)
 --E 14
 
 --S 15 of 16
@@ -160,7 +160,7 @@ factor(13 - 13*%i)
 --R 
 --R
 --R   (15)  - (1 + %i)(2 + 3%i)(3 + 2%i)
---R                                               Type: Factored Complex Integer
+--R                                             Type: Factored(Complex(Integer))
 --E 15
 
 --S 16 of 16
@@ -169,7 +169,7 @@ factor complex(2,0)
 --R
 --R                      2
 --R   (16)  - %i (1 + %i)
---R                                               Type: Factored Complex Integer
+--R                                             Type: Factored(Complex(Integer))
 --E 16
 )spool
 )lisp (bye)
diff --git a/src/input/complexfactor.input.pamphlet b/src/input/complexfactor.input.pamphlet
index 9c6f531..283a3a6 100644
--- a/src/input/complexfactor.input.pamphlet
+++ b/src/input/complexfactor.input.pamphlet
@@ -20,192 +20,192 @@ along with an example of modemap searching.
 )set message auto off
 )clear all
 )set message bottomup on
- 
+
 --S 1 of 4
 t1:=-7*x^6 + 10*x^4 + 24*x^3 - 14*x^2 - 27*x - 42 + _
      %i*(3*x^6 - 9*x^5 + 30*x^4 + 15*x^3 + 17*x*2 - 33*x -7)
 --R 
 --R
 --R Function Selection for ^
---R      Arguments: (VARIABLE x,PI) 
---R      Default target type: Polynomial Integer 
---R   -> no appropriate ** found in Variable x 
+--R      Arguments: (VARIABLE(x),PI) 
+--R      Default target type: Polynomial(Integer) 
+--R   -> no appropriate ** found in Variable(x) 
 --R   -> no appropriate ** found in PositiveInteger 
 --R   -> no appropriate ** found in Symbol 
 --R   -> no appropriate ** found in Integer 
---R   -> no appropriate ** found in Polynomial Integer 
---R   -> no appropriate ** found in Variable x 
+--R   -> no appropriate ** found in Polynomial(Integer) 
+--R   -> no appropriate ** found in Variable(x) 
 --R   -> no appropriate ** found in PositiveInteger 
 --R   -> no appropriate ** found in Symbol 
 --R   -> no appropriate ** found in Integer 
---Rcost=50000 for **: (Polynomial Integer,NonNegativeInteger) -> Polynomial Integer
---Rcost=50000 for **: (Polynomial Integer,PositiveInteger) -> Polynomial Integer
---R   -> no appropriate ^ found in Variable x 
+--Rcost=50000 for **: (Polynomial(Integer),NonNegativeInteger) -> Polynomial(Integer)
+--Rcost=50000 for **: (Polynomial(Integer),PositiveInteger) -> Polynomial(Integer)
+--R   -> no appropriate ^ found in Variable(x) 
 --R   -> no appropriate ^ found in PositiveInteger 
 --R   -> no appropriate ^ found in Symbol 
 --R   -> no appropriate ^ found in Integer 
---R   -> no appropriate ^ found in Polynomial Integer 
---R   -> no appropriate ^ found in Variable x 
+--R   -> no appropriate ^ found in Polynomial(Integer) 
+--R   -> no appropriate ^ found in Variable(x) 
 --R   -> no appropriate ^ found in PositiveInteger 
 --R   -> no appropriate ^ found in Symbol 
 --R   -> no appropriate ^ found in Integer 
---Rcost=50000 for ^: (Polynomial Integer,NonNegativeInteger) -> Polynomial Integer
---Rcost=50000 for ^: (Polynomial Integer,PositiveInteger) -> Polynomial Integer
+--Rcost=50000 for ^: (Polynomial(Integer),NonNegativeInteger) -> Polynomial(Integer)
+--Rcost=50000 for ^: (Polynomial(Integer),PositiveInteger) -> Polynomial(Integer)
 --R 
---R [1]  signature:   (POLY INT,NNI) -> POLY INT
---R      implemented: slot $$(NonNegativeInteger) from POLY INT
---R [2]  signature:   (POLY INT,PI) -> POLY INT
---R      implemented: slot $$(PositiveInteger) from POLY INT
---R [3]  signature:   (POLY INT,NNI) -> POLY INT
---R      implemented: slot $$(NonNegativeInteger) from POLY INT
---R [4]  signature:   (POLY INT,PI) -> POLY INT
---R      implemented: slot $$(PositiveInteger) from POLY INT
+--R [1]  signature:   (POLY(INT),NNI) -> POLY(INT)
+--R      implemented: slot $$(NonNegativeInteger) from POLY(INT)
+--R [2]  signature:   (POLY(INT),PI) -> POLY(INT)
+--R      implemented: slot $$(PositiveInteger) from POLY(INT)
+--R [3]  signature:   (POLY(INT),NNI) -> POLY(INT)
+--R      implemented: slot $$(NonNegativeInteger) from POLY(INT)
+--R [4]  signature:   (POLY(INT),PI) -> POLY(INT)
+--R      implemented: slot $$(PositiveInteger) from POLY(INT)
 --R 
 --R
 --R Function Selection for *
---R      Arguments: (POLY INT,POLY INT) 
+--R      Arguments: (POLY(INT),POLY(INT)) 
 --R 
---R [1]  signature:   (POLY INT,POLY INT) -> POLY INT
---R      implemented: slot $$$ from POLY INT
+--R [1]  signature:   (POLY(INT),POLY(INT)) -> POLY(INT)
+--R      implemented: slot $$$ from POLY(INT)
 --R 
 --R
 --R Function Selection for -
---R      Arguments: POLY INT 
+--R      Arguments: POLY(INT) 
 --R 
---R [1]  signature:   POLY INT -> POLY INT
---R      implemented: slot $$ from POLY INT
+--R [1]  signature:   POLY(INT) -> POLY(INT)
+--R      implemented: slot $$ from POLY(INT)
 --R 
 --R
 --R Function Selection for ^
---R      Arguments: (VARIABLE x,PI) 
---R      Default target type: Polynomial Integer 
+--R      Arguments: (VARIABLE(x),PI) 
+--R      Default target type: Polynomial(Integer) 
 --R 
---R [1]  signature:   (POLY INT,NNI) -> POLY INT
---R      implemented: slot $$(NonNegativeInteger) from POLY INT
---R [2]  signature:   (POLY INT,PI) -> POLY INT
---R      implemented: slot $$(PositiveInteger) from POLY INT
---R [3]  signature:   (POLY INT,NNI) -> POLY INT
---R      implemented: slot $$(NonNegativeInteger) from POLY INT
---R [4]  signature:   (POLY INT,PI) -> POLY INT
---R      implemented: slot $$(PositiveInteger) from POLY INT
+--R [1]  signature:   (POLY(INT),NNI) -> POLY(INT)
+--R      implemented: slot $$(NonNegativeInteger) from POLY(INT)
+--R [2]  signature:   (POLY(INT),PI) -> POLY(INT)
+--R      implemented: slot $$(PositiveInteger) from POLY(INT)
+--R [3]  signature:   (POLY(INT),NNI) -> POLY(INT)
+--R      implemented: slot $$(NonNegativeInteger) from POLY(INT)
+--R [4]  signature:   (POLY(INT),PI) -> POLY(INT)
+--R      implemented: slot $$(PositiveInteger) from POLY(INT)
 --R 
 --R
 --R Function Selection for *
---R      Arguments: (POLY INT,POLY INT) 
+--R      Arguments: (POLY(INT),POLY(INT)) 
 --R 
---R [1]  signature:   (POLY INT,POLY INT) -> POLY INT
---R      implemented: slot $$$ from POLY INT
+--R [1]  signature:   (POLY(INT),POLY(INT)) -> POLY(INT)
+--R      implemented: slot $$$ from POLY(INT)
 --R 
 --R
 --R Function Selection for +
---R      Arguments: (POLY INT,POLY INT) 
+--R      Arguments: (POLY(INT),POLY(INT)) 
 --R 
---R [1]  signature:   (POLY INT,POLY INT) -> POLY INT
---R      implemented: slot $$$ from POLY INT
+--R [1]  signature:   (POLY(INT),POLY(INT)) -> POLY(INT)
+--R      implemented: slot $$$ from POLY(INT)
 --R 
 --R
 --R Function Selection for ^
---R      Arguments: (VARIABLE x,PI) 
---R      Default target type: Polynomial Integer 
+--R      Arguments: (VARIABLE(x),PI) 
+--R      Default target type: Polynomial(Integer) 
 --R 
---R [1]  signature:   (POLY INT,NNI) -> POLY INT
---R      implemented: slot $$(NonNegativeInteger) from POLY INT
---R [2]  signature:   (POLY INT,PI) -> POLY INT
---R      implemented: slot $$(PositiveInteger) from POLY INT
---R [3]  signature:   (POLY INT,NNI) -> POLY INT
---R      implemented: slot $$(NonNegativeInteger) from POLY INT
---R [4]  signature:   (POLY INT,PI) -> POLY INT
---R      implemented: slot $$(PositiveInteger) from POLY INT
+--R [1]  signature:   (POLY(INT),NNI) -> POLY(INT)
+--R      implemented: slot $$(NonNegativeInteger) from POLY(INT)
+--R [2]  signature:   (POLY(INT),PI) -> POLY(INT)
+--R      implemented: slot $$(PositiveInteger) from POLY(INT)
+--R [3]  signature:   (POLY(INT),NNI) -> POLY(INT)
+--R      implemented: slot $$(NonNegativeInteger) from POLY(INT)
+--R [4]  signature:   (POLY(INT),PI) -> POLY(INT)
+--R      implemented: slot $$(PositiveInteger) from POLY(INT)
 --R 
 --R
 --R Function Selection for *
---R      Arguments: (POLY INT,POLY INT) 
+--R      Arguments: (POLY(INT),POLY(INT)) 
 --R 
---R [1]  signature:   (POLY INT,POLY INT) -> POLY INT
---R      implemented: slot $$$ from POLY INT
+--R [1]  signature:   (POLY(INT),POLY(INT)) -> POLY(INT)
+--R      implemented: slot $$$ from POLY(INT)
 --R 
 --R
 --R Function Selection for +
---R      Arguments: (POLY INT,POLY INT) 
+--R      Arguments: (POLY(INT),POLY(INT)) 
 --R 
---R [1]  signature:   (POLY INT,POLY INT) -> POLY INT
---R      implemented: slot $$$ from POLY INT
+--R [1]  signature:   (POLY(INT),POLY(INT)) -> POLY(INT)
+--R      implemented: slot $$$ from POLY(INT)
 --R 
 --R
 --R Function Selection for ^
---R      Arguments: (VARIABLE x,PI) 
---R      Default target type: Polynomial Integer 
+--R      Arguments: (VARIABLE(x),PI) 
+--R      Default target type: Polynomial(Integer) 
 --R 
---R [1]  signature:   (POLY INT,NNI) -> POLY INT
---R      implemented: slot $$(NonNegativeInteger) from POLY INT
---R [2]  signature:   (POLY INT,PI) -> POLY INT
---R      implemented: slot $$(PositiveInteger) from POLY INT
---R [3]  signature:   (POLY INT,NNI) -> POLY INT
---R      implemented: slot $$(NonNegativeInteger) from POLY INT
---R [4]  signature:   (POLY INT,PI) -> POLY INT
---R      implemented: slot $$(PositiveInteger) from POLY INT
+--R [1]  signature:   (POLY(INT),NNI) -> POLY(INT)
+--R      implemented: slot $$(NonNegativeInteger) from POLY(INT)
+--R [2]  signature:   (POLY(INT),PI) -> POLY(INT)
+--R      implemented: slot $$(PositiveInteger) from POLY(INT)
+--R [3]  signature:   (POLY(INT),NNI) -> POLY(INT)
+--R      implemented: slot $$(NonNegativeInteger) from POLY(INT)
+--R [4]  signature:   (POLY(INT),PI) -> POLY(INT)
+--R      implemented: slot $$(PositiveInteger) from POLY(INT)
 --R 
 --R
 --R Function Selection for *
---R      Arguments: (POLY INT,POLY INT) 
+--R      Arguments: (POLY(INT),POLY(INT)) 
 --R 
---R [1]  signature:   (POLY INT,POLY INT) -> POLY INT
---R      implemented: slot $$$ from POLY INT
+--R [1]  signature:   (POLY(INT),POLY(INT)) -> POLY(INT)
+--R      implemented: slot $$$ from POLY(INT)
 --R 
 --R
 --R Function Selection for -
---R      Arguments: (POLY INT,POLY INT) 
+--R      Arguments: (POLY(INT),POLY(INT)) 
 --R 
---R [1]  signature:   (POLY INT,POLY INT) -> POLY INT
---R      implemented: slot $$$ from POLY INT
+--R [1]  signature:   (POLY(INT),POLY(INT)) -> POLY(INT)
+--R      implemented: slot $$$ from POLY(INT)
 --R 
 --R
 --R Function Selection for *
---R      Arguments: (PI,VARIABLE x) 
+--R      Arguments: (PI,VARIABLE(x)) 
 --R   -> no appropriate * found in PositiveInteger 
---R   -> no appropriate * found in Variable x 
+--R   -> no appropriate * found in Variable(x) 
 --R   -> no appropriate * found in Integer 
 --R   -> no appropriate * found in Symbol 
---R   -> no appropriate * found in Polynomial Integer 
+--R   -> no appropriate * found in Polynomial(Integer) 
 --R   -> no appropriate * found in PositiveInteger 
---R   -> no appropriate * found in Variable x 
+--R   -> no appropriate * found in Variable(x) 
 --R   -> no appropriate * found in Integer 
 --R   -> no appropriate * found in Symbol 
---Rcost=52300 for *: (Integer,Polynomial Integer) -> Polynomial Integer
---Rcost=52300 for *: (Integer,Polynomial Integer) -> Polynomial Integer
---Rcost=52300 for *: (NonNegativeInteger,Polynomial Integer) -> Polynomial Integer
---Rcost=92300 for *: (Polynomial Integer,Polynomial Integer) -> Polynomial Integer
---Rcost=52300 for *: (PositiveInteger,Polynomial Integer) -> Polynomial Integer
---R 
---R [1]  signature:   (INT,POLY INT) -> POLY INT
---R      implemented: slot $(Integer)$ from POLY INT
---R [2]  signature:   (INT,POLY INT) -> POLY INT
---R      implemented: slot $(Integer)$ from POLY INT
---R [3]  signature:   (NNI,POLY INT) -> POLY INT
---R      implemented: slot $(NonNegativeInteger)$ from POLY INT
---R [4]  signature:   (PI,POLY INT) -> POLY INT
---R      implemented: slot $(PositiveInteger)$ from POLY INT
---R [5]  signature:   (POLY INT,POLY INT) -> POLY INT
---R      implemented: slot $$$ from POLY INT
+--Rcost=52300 for *: (Integer,Polynomial(Integer)) -> Polynomial(Integer)
+--Rcost=52300 for *: (Integer,Polynomial(Integer)) -> Polynomial(Integer)
+--Rcost=52300 for *: (NonNegativeInteger,Polynomial(Integer)) -> Polynomial(Integer)
+--Rcost=92300 for *: (Polynomial(Integer),Polynomial(Integer)) -> Polynomial(Integer)
+--Rcost=52300 for *: (PositiveInteger,Polynomial(Integer)) -> Polynomial(Integer)
+--R 
+--R [1]  signature:   (INT,POLY(INT)) -> POLY(INT)
+--R      implemented: slot $(Integer)$ from POLY(INT)
+--R [2]  signature:   (INT,POLY(INT)) -> POLY(INT)
+--R      implemented: slot $(Integer)$ from POLY(INT)
+--R [3]  signature:   (NNI,POLY(INT)) -> POLY(INT)
+--R      implemented: slot $(NonNegativeInteger)$ from POLY(INT)
+--R [4]  signature:   (PI,POLY(INT)) -> POLY(INT)
+--R      implemented: slot $(PositiveInteger)$ from POLY(INT)
+--R [5]  signature:   (POLY(INT),POLY(INT)) -> POLY(INT)
+--R      implemented: slot $$$ from POLY(INT)
 --R 
 --R
 --R Function Selection for -
---R      Arguments: (POLY INT,POLY INT) 
+--R      Arguments: (POLY(INT),POLY(INT)) 
 --R 
---R [1]  signature:   (POLY INT,POLY INT) -> POLY INT
---R      implemented: slot $$$ from POLY INT
+--R [1]  signature:   (POLY(INT),POLY(INT)) -> POLY(INT)
+--R      implemented: slot $$$ from POLY(INT)
 --R 
 --R
 --R Function Selection for -
---R      Arguments: (POLY INT,PI) 
---R   -> no appropriate - found in Polynomial Integer 
+--R      Arguments: (POLY(INT),PI) 
+--R   -> no appropriate - found in Polynomial(Integer) 
 --R   -> no appropriate - found in PositiveInteger 
 --R   -> no appropriate - found in Integer 
 --R   -> no appropriate - found in PositiveInteger 
 --R   -> no appropriate - found in Integer 
 --R 
---R [1]  signature:   (POLY INT,POLY INT) -> POLY INT
---R      implemented: slot $$$ from POLY INT
+--R [1]  signature:   (POLY(INT),POLY(INT)) -> POLY(INT)
+--R      implemented: slot $$$ from POLY(INT)
 --R 
 --R
 --R Function Selection for complex
@@ -221,238 +221,238 @@ t1:=-7*x^6 + 10*x^4 + 24*x^3 - 14*x^2 - 27*x - 42 + _
 --R   no modemaps
 --R
 --R Remaining General Modemaps 
---R   [1] (D1,D1) -> D from D if D has COMPCAT D1 and D1 has COMRING
+--R   [1] (D1,D1) -> D from D if D has COMPCAT(D1) and D1 has COMRING
 --R 
---R [1]  signature:   (INT,INT) -> COMPLEX INT
---R      implemented: slot $(Integer)(Integer) from COMPLEX INT
+--R [1]  signature:   (INT,INT) -> COMPLEX(INT)
+--R      implemented: slot $(Integer)(Integer) from COMPLEX(INT)
 --R 
 --R
 --R Function Selection for ^
---R      Arguments: (VARIABLE x,PI) 
---R      Default target type: Polynomial Integer 
+--R      Arguments: (VARIABLE(x),PI) 
+--R      Default target type: Polynomial(Integer) 
 --R 
---R [1]  signature:   (POLY INT,NNI) -> POLY INT
---R      implemented: slot $$(NonNegativeInteger) from POLY INT
---R [2]  signature:   (POLY INT,PI) -> POLY INT
---R      implemented: slot $$(PositiveInteger) from POLY INT
---R [3]  signature:   (POLY INT,NNI) -> POLY INT
---R      implemented: slot $$(NonNegativeInteger) from POLY INT
---R [4]  signature:   (POLY INT,PI) -> POLY INT
---R      implemented: slot $$(PositiveInteger) from POLY INT
+--R [1]  signature:   (POLY(INT),NNI) -> POLY(INT)
+--R      implemented: slot $$(NonNegativeInteger) from POLY(INT)
+--R [2]  signature:   (POLY(INT),PI) -> POLY(INT)
+--R      implemented: slot $$(PositiveInteger) from POLY(INT)
+--R [3]  signature:   (POLY(INT),NNI) -> POLY(INT)
+--R      implemented: slot $$(NonNegativeInteger) from POLY(INT)
+--R [4]  signature:   (POLY(INT),PI) -> POLY(INT)
+--R      implemented: slot $$(PositiveInteger) from POLY(INT)
 --R 
 --R
 --R Function Selection for *
---R      Arguments: (POLY INT,POLY INT) 
+--R      Arguments: (POLY(INT),POLY(INT)) 
 --R 
---R [1]  signature:   (POLY INT,POLY INT) -> POLY INT
---R      implemented: slot $$$ from POLY INT
+--R [1]  signature:   (POLY(INT),POLY(INT)) -> POLY(INT)
+--R      implemented: slot $$$ from POLY(INT)
 --R 
 --R
 --R Function Selection for ^
---R      Arguments: (VARIABLE x,PI) 
---R      Default target type: Polynomial Integer 
+--R      Arguments: (VARIABLE(x),PI) 
+--R      Default target type: Polynomial(Integer) 
 --R 
---R [1]  signature:   (POLY INT,NNI) -> POLY INT
---R      implemented: slot $$(NonNegativeInteger) from POLY INT
---R [2]  signature:   (POLY INT,PI) -> POLY INT
---R      implemented: slot $$(PositiveInteger) from POLY INT
---R [3]  signature:   (POLY INT,NNI) -> POLY INT
---R      implemented: slot $$(NonNegativeInteger) from POLY INT
---R [4]  signature:   (POLY INT,PI) -> POLY INT
---R      implemented: slot $$(PositiveInteger) from POLY INT
+--R [1]  signature:   (POLY(INT),NNI) -> POLY(INT)
+--R      implemented: slot $$(NonNegativeInteger) from POLY(INT)
+--R [2]  signature:   (POLY(INT),PI) -> POLY(INT)
+--R      implemented: slot $$(PositiveInteger) from POLY(INT)
+--R [3]  signature:   (POLY(INT),NNI) -> POLY(INT)
+--R      implemented: slot $$(NonNegativeInteger) from POLY(INT)
+--R [4]  signature:   (POLY(INT),PI) -> POLY(INT)
+--R      implemented: slot $$(PositiveInteger) from POLY(INT)
 --R 
 --R
 --R Function Selection for *
---R      Arguments: (POLY INT,POLY INT) 
+--R      Arguments: (POLY(INT),POLY(INT)) 
 --R 
---R [1]  signature:   (POLY INT,POLY INT) -> POLY INT
---R      implemented: slot $$$ from POLY INT
+--R [1]  signature:   (POLY(INT),POLY(INT)) -> POLY(INT)
+--R      implemented: slot $$$ from POLY(INT)
 --R 
 --R
 --R Function Selection for -
---R      Arguments: (POLY INT,POLY INT) 
+--R      Arguments: (POLY(INT),POLY(INT)) 
 --R 
---R [1]  signature:   (POLY INT,POLY INT) -> POLY INT
---R      implemented: slot $$$ from POLY INT
+--R [1]  signature:   (POLY(INT),POLY(INT)) -> POLY(INT)
+--R      implemented: slot $$$ from POLY(INT)
 --R 
 --R
 --R Function Selection for ^
---R      Arguments: (VARIABLE x,PI) 
---R      Default target type: Polynomial Integer 
+--R      Arguments: (VARIABLE(x),PI) 
+--R      Default target type: Polynomial(Integer) 
 --R 
---R [1]  signature:   (POLY INT,NNI) -> POLY INT
---R      implemented: slot $$(NonNegativeInteger) from POLY INT
---R [2]  signature:   (POLY INT,PI) -> POLY INT
---R      implemented: slot $$(PositiveInteger) from POLY INT
---R [3]  signature:   (POLY INT,NNI) -> POLY INT
---R      implemented: slot $$(NonNegativeInteger) from POLY INT
---R [4]  signature:   (POLY INT,PI) -> POLY INT
---R      implemented: slot $$(PositiveInteger) from POLY INT
+--R [1]  signature:   (POLY(INT),NNI) -> POLY(INT)
+--R      implemented: slot $$(NonNegativeInteger) from POLY(INT)
+--R [2]  signature:   (POLY(INT),PI) -> POLY(INT)
+--R      implemented: slot $$(PositiveInteger) from POLY(INT)
+--R [3]  signature:   (POLY(INT),NNI) -> POLY(INT)
+--R      implemented: slot $$(NonNegativeInteger) from POLY(INT)
+--R [4]  signature:   (POLY(INT),PI) -> POLY(INT)
+--R      implemented: slot $$(PositiveInteger) from POLY(INT)
 --R 
 --R
 --R Function Selection for *
---R      Arguments: (POLY INT,POLY INT) 
+--R      Arguments: (POLY(INT),POLY(INT)) 
 --R 
---R [1]  signature:   (POLY INT,POLY INT) -> POLY INT
---R      implemented: slot $$$ from POLY INT
+--R [1]  signature:   (POLY(INT),POLY(INT)) -> POLY(INT)
+--R      implemented: slot $$$ from POLY(INT)
 --R 
 --R
 --R Function Selection for +
---R      Arguments: (POLY INT,POLY INT) 
+--R      Arguments: (POLY(INT),POLY(INT)) 
 --R 
---R [1]  signature:   (POLY INT,POLY INT) -> POLY INT
---R      implemented: slot $$$ from POLY INT
+--R [1]  signature:   (POLY(INT),POLY(INT)) -> POLY(INT)
+--R      implemented: slot $$$ from POLY(INT)
 --R 
 --R
 --R Function Selection for ^
---R      Arguments: (VARIABLE x,PI) 
---R      Default target type: Polynomial Integer 
+--R      Arguments: (VARIABLE(x),PI) 
+--R      Default target type: Polynomial(Integer) 
 --R 
---R [1]  signature:   (POLY INT,NNI) -> POLY INT
---R      implemented: slot $$(NonNegativeInteger) from POLY INT
---R [2]  signature:   (POLY INT,PI) -> POLY INT
---R      implemented: slot $$(PositiveInteger) from POLY INT
---R [3]  signature:   (POLY INT,NNI) -> POLY INT
---R      implemented: slot $$(NonNegativeInteger) from POLY INT
---R [4]  signature:   (POLY INT,PI) -> POLY INT
---R      implemented: slot $$(PositiveInteger) from POLY INT
+--R [1]  signature:   (POLY(INT),NNI) -> POLY(INT)
+--R      implemented: slot $$(NonNegativeInteger) from POLY(INT)
+--R [2]  signature:   (POLY(INT),PI) -> POLY(INT)
+--R      implemented: slot $$(PositiveInteger) from POLY(INT)
+--R [3]  signature:   (POLY(INT),NNI) -> POLY(INT)
+--R      implemented: slot $$(NonNegativeInteger) from POLY(INT)
+--R [4]  signature:   (POLY(INT),PI) -> POLY(INT)
+--R      implemented: slot $$(PositiveInteger) from POLY(INT)
 --R 
 --R
 --R Function Selection for *
---R      Arguments: (POLY INT,POLY INT) 
+--R      Arguments: (POLY(INT),POLY(INT)) 
 --R 
---R [1]  signature:   (POLY INT,POLY INT) -> POLY INT
---R      implemented: slot $$$ from POLY INT
+--R [1]  signature:   (POLY(INT),POLY(INT)) -> POLY(INT)
+--R      implemented: slot $$$ from POLY(INT)
 --R 
 --R
 --R Function Selection for +
---R      Arguments: (POLY INT,POLY INT) 
+--R      Arguments: (POLY(INT),POLY(INT)) 
 --R 
---R [1]  signature:   (POLY INT,POLY INT) -> POLY INT
---R      implemented: slot $$$ from POLY INT
+--R [1]  signature:   (POLY(INT),POLY(INT)) -> POLY(INT)
+--R      implemented: slot $$$ from POLY(INT)
 --R 
 --R
 --R Function Selection for *
---R      Arguments: (PI,VARIABLE x) 
+--R      Arguments: (PI,VARIABLE(x)) 
 --R 
---R [1]  signature:   (INT,POLY INT) -> POLY INT
---R      implemented: slot $(Integer)$ from POLY INT
---R [2]  signature:   (INT,POLY INT) -> POLY INT
---R      implemented: slot $(Integer)$ from POLY INT
---R [3]  signature:   (NNI,POLY INT) -> POLY INT
---R      implemented: slot $(NonNegativeInteger)$ from POLY INT
---R [4]  signature:   (PI,POLY INT) -> POLY INT
---R      implemented: slot $(PositiveInteger)$ from POLY INT
---R [5]  signature:   (POLY INT,POLY INT) -> POLY INT
---R      implemented: slot $$$ from POLY INT
+--R [1]  signature:   (INT,POLY(INT)) -> POLY(INT)
+--R      implemented: slot $(Integer)$ from POLY(INT)
+--R [2]  signature:   (INT,POLY(INT)) -> POLY(INT)
+--R      implemented: slot $(Integer)$ from POLY(INT)
+--R [3]  signature:   (NNI,POLY(INT)) -> POLY(INT)
+--R      implemented: slot $(NonNegativeInteger)$ from POLY(INT)
+--R [4]  signature:   (PI,POLY(INT)) -> POLY(INT)
+--R      implemented: slot $(PositiveInteger)$ from POLY(INT)
+--R [5]  signature:   (POLY(INT),POLY(INT)) -> POLY(INT)
+--R      implemented: slot $$$ from POLY(INT)
 --R 
 --R
 --R Function Selection for *
---R      Arguments: (POLY INT,POLY INT) 
+--R      Arguments: (POLY(INT),POLY(INT)) 
 --R 
---R [1]  signature:   (POLY INT,POLY INT) -> POLY INT
---R      implemented: slot $$$ from POLY INT
+--R [1]  signature:   (POLY(INT),POLY(INT)) -> POLY(INT)
+--R      implemented: slot $$$ from POLY(INT)
 --R 
 --R
 --R Function Selection for +
---R      Arguments: (POLY INT,POLY INT) 
+--R      Arguments: (POLY(INT),POLY(INT)) 
 --R 
---R [1]  signature:   (POLY INT,POLY INT) -> POLY INT
---R      implemented: slot $$$ from POLY INT
+--R [1]  signature:   (POLY(INT),POLY(INT)) -> POLY(INT)
+--R      implemented: slot $$$ from POLY(INT)
 --R 
 --R
 --R Function Selection for *
---R      Arguments: (PI,VARIABLE x) 
+--R      Arguments: (PI,VARIABLE(x)) 
 --R 
---R [1]  signature:   (INT,POLY INT) -> POLY INT
---R      implemented: slot $(Integer)$ from POLY INT
---R [2]  signature:   (INT,POLY INT) -> POLY INT
---R      implemented: slot $(Integer)$ from POLY INT
---R [3]  signature:   (NNI,POLY INT) -> POLY INT
---R      implemented: slot $(NonNegativeInteger)$ from POLY INT
---R [4]  signature:   (PI,POLY INT) -> POLY INT
---R      implemented: slot $(PositiveInteger)$ from POLY INT
---R [5]  signature:   (POLY INT,POLY INT) -> POLY INT
---R      implemented: slot $$$ from POLY INT
+--R [1]  signature:   (INT,POLY(INT)) -> POLY(INT)
+--R      implemented: slot $(Integer)$ from POLY(INT)
+--R [2]  signature:   (INT,POLY(INT)) -> POLY(INT)
+--R      implemented: slot $(Integer)$ from POLY(INT)
+--R [3]  signature:   (NNI,POLY(INT)) -> POLY(INT)
+--R      implemented: slot $(NonNegativeInteger)$ from POLY(INT)
+--R [4]  signature:   (PI,POLY(INT)) -> POLY(INT)
+--R      implemented: slot $(PositiveInteger)$ from POLY(INT)
+--R [5]  signature:   (POLY(INT),POLY(INT)) -> POLY(INT)
+--R      implemented: slot $$$ from POLY(INT)
 --R 
 --R
 --R Function Selection for -
---R      Arguments: (POLY INT,POLY INT) 
+--R      Arguments: (POLY(INT),POLY(INT)) 
 --R 
---R [1]  signature:   (POLY INT,POLY INT) -> POLY INT
---R      implemented: slot $$$ from POLY INT
+--R [1]  signature:   (POLY(INT),POLY(INT)) -> POLY(INT)
+--R      implemented: slot $$$ from POLY(INT)
 --R 
 --R
 --R Function Selection for -
---R      Arguments: (POLY INT,PI) 
+--R      Arguments: (POLY(INT),PI) 
 --R 
---R [1]  signature:   (POLY INT,POLY INT) -> POLY INT
---R      implemented: slot $$$ from POLY INT
+--R [1]  signature:   (POLY(INT),POLY(INT)) -> POLY(INT)
+--R      implemented: slot $$$ from POLY(INT)
 --R 
 --R
 --R Function Selection for *
---R      Arguments: (COMPLEX INT,POLY INT) 
---R   -> no appropriate * found in Complex Integer 
---R   -> no appropriate * found in Polynomial Integer 
---R   -> no appropriate * found in Polynomial Complex Integer 
---R   -> no appropriate * found in Complex Integer 
---R   -> no appropriate * found in Polynomial Integer 
---Icost=43300 for *: (Complex Integer,Polynomial Complex Integer) -> ...
---Icost=83300 for *: (Polynomial Complex Integer,Polynomial Complex ...
+--R      Arguments: (COMPLEX(INT),POLY(INT)) 
+--R   -> no appropriate * found in Complex(Integer) 
+--R   -> no appropriate * found in Polynomial(Integer) 
+--R   -> no appropriate * found in Polynomial(Complex(Integer)) 
+--R   -> no appropriate * found in Complex(Integer) 
+--R   -> no appropriate * found in Polynomial(Integer) 
+--Rcost=43300 for *: (Complex(Integer),Polynomial(Complex(Integer))) -> Polynomial(Complex(Integer))
+--Rcost=83300 for *: (Polynomial(Complex(Integer)),Polynomial(Complex(Integer))) -> Polynomial(Complex(Integer))
 --R 
---R [1]  signature:   (COMPLEX INT,POLY COMPLEX INT) -> POLY COMPLEX INT
---R      implemented: slot $(Complex (Integer))$ from POLY COMPLEX INT
---R [2]  signature:   (POLY COMPLEX INT,POLY COMPLEX INT) -> POLY COMPLEX INT
---R      implemented: slot $$$ from POLY COMPLEX INT
+--R [1]  signature:   (COMPLEX(INT),POLY(COMPLEX(INT))) -> POLY(COMPLEX(INT))
+--R      implemented: slot $(Complex (Integer))$ from POLY(COMPLEX(INT))
+--R [2]  signature:   (POLY(COMPLEX(INT)),POLY(COMPLEX(INT))) -> POLY(COMPLEX(INT))
+--R      implemented: slot $$$ from POLY(COMPLEX(INT))
 --R 
 --R
 --R Function Selection for map by coercion facility (map) 
---R      Arguments: ((INT -> COMPLEX INT),POLY INT) 
---R      Target type: POLY COMPLEX INT 
---R   -> no appropriate map found in Polynomial Integer 
---R   -> no appropriate map found in Polynomial Complex Integer 
---R   -> no appropriate map found in Complex Integer 
+--R      Arguments: ((INT -> COMPLEX(INT)),POLY(INT)) 
+--R      Target type: POLY(COMPLEX(INT)) 
+--R   -> no appropriate map found in Polynomial(Integer) 
+--R   -> no appropriate map found in Polynomial(Complex(Integer)) 
+--R   -> no appropriate map found in Complex(Integer) 
 --R   -> no appropriate map found in Integer 
---R   -> no appropriate map found in Complex Integer 
+--R   -> no appropriate map found in Complex(Integer) 
 --R
 --R Modemaps from Associated Packages 
 --R   [1] ((D4 -> D5),D3) -> D1
 --R            from UnivariatePolynomialCategoryFunctions2(D4,D3,D5,D1)
---R            if D4 has RING and D5 has RING and D1 has UPOLYC D5 and D3 
---R            has UPOLYC D4
+--R            if D4 has RING and D5 has RING and D1 has UPOLYC(D5) and D3
+--R            has UPOLYC(D4)
 --R   [2] ((D5 -> D7),UnivariatePolynomial(D4,D5)) -> UnivariatePolynomial
 --R            (D6,D7)
 --R            from UnivariatePolynomialFunctions2(D4,D5,D6,D7)
 --R            if D4: SYMBOL and D5 has RING and D7 has RING and D6: 
 --R            SYMBOL
---R   [3] ((D4 -> D5),SparseUnivariatePolynomial D4) -> 
---R            SparseUnivariatePolynomial D5
+--R   [3] ((D4 -> D5),SparseUnivariatePolynomial(D4)) -> 
+--R            SparseUnivariatePolynomial(D5)
 --R            from SparseUnivariatePolynomialFunctions2(D4,D5)
 --R            if D4 has RING and D5 has RING
---R   [4] ((D4 -> D5),Polynomial D4) -> Polynomial D5
+--R   [4] ((D4 -> D5),Polynomial(D4)) -> Polynomial(D5)
 --R            from PolynomialFunctions2(D4,D5) if D4 has RING and D5 has 
 --R            RING
 --R 
---R [1]  signature:   ((INT -> COMPLEX INT),POLY INT) -> POLY COMPLEX INT
---I      implemented: slot (Polynomial (Complex (Integer)))...
+--R [1]  signature:   ((INT -> COMPLEX(INT)),POLY(INT)) -> POLY(COMPLEX(INT))
+--R      implemented: slot (Polynomial (Complex (Integer)))(Mapping (Complex (Integer)) (Integer))(Polynomial (Integer)) from POLY2(INT,COMPLEX(INT))
 --R 
 --R
 --R Function Selection for +
---R      Arguments: (POLY INT,POLY COMPLEX INT) 
---R   -> no appropriate + found in Polynomial Integer 
---R   -> no appropriate + found in Polynomial Complex Integer 
---R   -> no appropriate + found in Polynomial Integer 
+--R      Arguments: (POLY(INT),POLY(COMPLEX(INT))) 
+--R   -> no appropriate + found in Polynomial(Integer) 
+--R   -> no appropriate + found in Polynomial(Complex(Integer)) 
+--R   -> no appropriate + found in Polynomial(Integer) 
 --R 
---R [1]  signature:   (POLY COMPLEX INT,POLY COMPLEX INT) -> POLY COMPLEX INT
---R      implemented: slot $$$ from POLY COMPLEX INT
+--R [1]  signature:   (POLY(COMPLEX(INT)),POLY(COMPLEX(INT))) -> POLY(COMPLEX(INT))
+--R      implemented: slot $$$ from POLY(COMPLEX(INT))
 --R 
 --R
 --R Function Selection for map by coercion facility (map) 
---R      Arguments: ((INT -> COMPLEX INT),POLY INT) 
---R      Target type: POLY COMPLEX INT 
+--R      Arguments: ((INT -> COMPLEX(INT)),POLY(INT)) 
+--R      Target type: POLY(COMPLEX(INT)) 
 --R 
---R [1]  signature:   ((INT -> COMPLEX INT),POLY INT) -> POLY COMPLEX INT
---I      implemented: slot (Polynomial (Complex (Integer)))...
+--R [1]  signature:   ((INT -> COMPLEX(INT)),POLY(INT)) -> POLY(COMPLEX(INT))
+--R      implemented: slot (Polynomial (Complex (Integer)))(Mapping (Complex (Integer)) (Integer))(Polynomial (Integer)) from POLY2(INT,COMPLEX(INT))
 --R 
 --R
 --R   (1)
@@ -460,7 +460,7 @@ t1:=-7*x^6 + 10*x^4 + 24*x^3 - 14*x^2 - 27*x - 42 + _
 --R     (- 7 + 3%i)x  - 9%i x  + (10 + 30%i)x  + (24 + 15%i)x  - 14x
 --R   + 
 --R     (- 27 + %i)x - 42 - 7%i
---R                                             Type: Polynomial Complex Integer
+--R                                           Type: Polynomial(Complex(Integer))
 --E 1
 
 --S 2 of 4
@@ -468,81 +468,81 @@ t2:=factor t1
 --R 
 --R
 --R Function Selection for factor
---R      Arguments: POLY COMPLEX INT 
---R   -> no appropriate factor found in Polynomial Complex Integer 
---R   -> no appropriate factor found in Polynomial Complex Integer 
+--R      Arguments: POLY(COMPLEX(INT)) 
+--R   -> no appropriate factor found in Polynomial(Complex(Integer)) 
+--R   -> no appropriate factor found in Polynomial(Complex(Integer)) 
 --R
 --R Modemaps from Associated Packages 
 --R   no modemaps
 --R
 --R Remaining General Modemaps 
---R   [1] D -> Factored D from D if D has UFD
---R   [2] D2 -> Factored D2 from SAERationalFunctionAlgFactor(D3,D4,D2)
---R            if D3 has UPOLYC FRAC POLY INT and D4 has Join(Field,
---R            CharacteristicZero,MonogenicAlgebra(Fraction Polynomial 
---R            Integer,D3)) and D2 has UPOLYC D4
---R   [3] D2 -> Factored D2 from SimpleAlgebraicExtensionAlgFactor(D3,D4,
+--R   [1] D -> Factored(D) from D if D has UFD
+--R   [2] D2 -> Factored(D2) from SAERationalFunctionAlgFactor(D3,D4,D2)
+--R            if D3 has UPOLYC(FRAC(POLY(INT))) and D4 has Join(Field,
+--R            CharacteristicZero,MonogenicAlgebra(Fraction(Polynomial(
+--R            Integer)),D3)) and D2 has UPOLYC(D4)
+--R   [3] D2 -> Factored(D2) from SimpleAlgebraicExtensionAlgFactor(D3,D4,
 --R            D2)
---R            if D3 has UPOLYC FRAC INT and D4 has Join(Field,
---R            CharacteristicZero,MonogenicAlgebra(Fraction Integer,D3)) 
---R            and D2 has UPOLYC D4
---R   [4] D2 -> Factored D2 from RationalFunctionFactor D2
---R            if D2 has UPOLYC FRAC POLY INT
---R   [5] SparseUnivariatePolynomial D6 -> Factored 
---R            SparseUnivariatePolynomial D6
+--R            if D3 has UPOLYC(FRAC(INT)) and D4 has Join(Field,
+--R            CharacteristicZero,MonogenicAlgebra(Fraction(Integer),D3)) 
+--R            and D2 has UPOLYC(D4)
+--R   [4] D2 -> Factored(D2) from RationalFunctionFactor(D2)
+--R            if D2 has UPOLYC(FRAC(POLY(INT)))
+--R   [5] SparseUnivariatePolynomial(D6) -> Factored(
+--R            SparseUnivariatePolynomial(D6))
 --R            from MultivariateFactorize(D3,D4,D5,D6)
 --R            if D3 has ORDSET and D4 has OAMONS and D5 has Join(
 --R            EuclideanDomain,CharacteristicZero) and D6 has POLYCAT(D5,
 --R            D4,D3)
---R   [6] D2 -> Factored D2 from MultivariateFactorize(D3,D4,D5,D2)
+--R   [6] D2 -> Factored(D2) from MultivariateFactorize(D3,D4,D5,D2)
 --R            if D3 has ORDSET and D4 has OAMONS and D5 has Join(
 --R            EuclideanDomain,CharacteristicZero) and D2 has POLYCAT(D5,
 --R            D4,D3)
---R   [7] D2 -> Factored D2 from MPolyCatRationalFunctionFactorizer(D3,D4,
---R            D5,D2)
+--R   [7] D2 -> Factored(D2) from MPolyCatRationalFunctionFactorizer(D3,D4
+--R            ,D5,D2)
 --R            if D3 has OAMONS and D4 has OrderedSet with 
 --R               convert : % -> Symboland D5 has INTDOM and D2 has 
---R            POLYCAT(FRAC POLY D5,D3,D4)
---R   [8] SparseUnivariatePolynomial D6 -> Factored 
---R            SparseUnivariatePolynomial D6
+--R            POLYCAT(FRAC(POLY(D5)),D3,D4)
+--R   [8] SparseUnivariatePolynomial(D6) -> Factored(
+--R            SparseUnivariatePolynomial(D6))
 --R            from MultFiniteFactorize(D3,D4,D5,D6)
 --R            if D3 has ORDSET and D4 has OAMONS and D5 has FFIELDC and 
 --R            D6 has POLYCAT(D5,D4,D3)
---R   [9] D2 -> Factored D2 from MultFiniteFactorize(D3,D4,D5,D2)
+--R   [9] D2 -> Factored(D2) from MultFiniteFactorize(D3,D4,D5,D2)
 --R            if D3 has ORDSET and D4 has OAMONS and D5 has FFIELDC and 
 --R            D2 has POLYCAT(D5,D4,D3)
---R   [10] Complex Integer -> Factored Complex Integer
+--R   [10] Complex(Integer) -> Factored(Complex(Integer))
 --R            from GaussianFactorizationPackage
---R   [11] D2 -> Factored D2
+--R   [11] D2 -> Factored(D2)
 --R            from FiniteFieldFactorizationWithSizeParseBySideEffect(D3,
 --R            D2)
---R            if D3 has FFIELDC and D2 has UPOLYC D3
---R   [12] D2 -> Factored D2 from DistinctDegreeFactorize(D3,D2)
---R            if D3 has FFIELDC and D2 has UPOLYC D3
---R   [13] D2 -> Factored D2 from ComplexFactorization(D3,D2)
---R            if D3 has EUCDOM and D2 has UPOLYC COMPLEX D3
---R   [14] D2 -> Factored D2 from AlgFactor D2 if D2 has UPOLYC AN
---R   -> no appropriate map found in Complex Integer 
+--R            if D3 has FFIELDC and D2 has UPOLYC(D3)
+--R   [12] D2 -> Factored(D2) from DistinctDegreeFactorize(D3,D2)
+--R            if D3 has FFIELDC and D2 has UPOLYC(D3)
+--R   [13] D2 -> Factored(D2) from ComplexFactorization(D3,D2)
+--R            if D3 has EUCDOM and D2 has UPOLYC(COMPLEX(D3))
+--R   [14] D2 -> Factored(D2) from AlgFactor(D2) if D2 has UPOLYC(AN)
+--R   -> no appropriate map found in Complex(Integer) 
 --R   -> no appropriate map found in Integer 
---R   -> no appropriate map found in Complex Polynomial Integer 
---R   -> no appropriate map found in Polynomial Integer 
+--R   -> no appropriate map found in Complex(Polynomial(Integer)) 
+--R   -> no appropriate map found in Polynomial(Integer) 
 --R   -> no appropriate map found in Integer 
---R   -> no appropriate map found in Polynomial Integer 
+--R   -> no appropriate map found in Polynomial(Integer) 
 --R
 --R Modemaps from Associated Packages 
---R   [1] ((D4 -> D5),Complex D4) -> Complex D5 from ComplexFunctions2(D4,
---R            D5)
+--R   [1] ((D4 -> D5),Complex(D4)) -> Complex(D5) from ComplexFunctions2(
+--R            D4,D5)
 --R            if D4 has COMRING and D5 has COMRING
---Icost=54500 for factor: Expression Complex Integer -> ...
---Icost=14500 for factor: Polynomial Complex Integer -> ...
---Icost=55500 for factor: SparseUnivariatePolynomial Polynomial ...
+--Rcost=54500 for factor: Expression(Complex(Integer)) -> Factored(Expression(Complex(Integer)))
+--Rcost=14500 for factor: Polynomial(Complex(Integer)) -> Factored(Polynomial(Complex(Integer)))
+--Rcost=55500 for factor: SparseUnivariatePolynomial(Polynomial(Complex(Integer))) -> Factored(SparseUnivariatePolynomial(Polynomial(Complex(Integer))))
 --R 
---R [1]  signature:   POLY COMPLEX INT -> FR POLY COMPLEX INT
---I      implemented: slot (Factored (Polynomial (Complex (Integer))))...
---R [2]  signature:   EXPR COMPLEX INT -> FR EXPR COMPLEX INT
---R      implemented: slot (Factored $)$ from EXPR COMPLEX INT
---R [3]  signature:   SUP POLY COMPLEX INT -> FR SUP POLY COMPLEX INT
---I      implemented: slot (Factored (SparseUnivariatePolynomial ...
+--R [1]  signature:   POLY(COMPLEX(INT)) -> FR(POLY(COMPLEX(INT)))
+--R      implemented: slot (Factored (Polynomial (Complex (Integer))))(Polynomial (Complex (Integer))) from MULTFACT(SYMBOL,INDE(SYMBOL),COMPLEX(INT),POLY(COMPLEX(INT)))
+--R [2]  signature:   EXPR(COMPLEX(INT)) -> FR(EXPR(COMPLEX(INT)))
+--R      implemented: slot (Factored $)$ from EXPR(COMPLEX(INT))
+--R [3]  signature:   SUP(POLY(COMPLEX(INT))) -> FR(SUP(POLY(COMPLEX(INT))))
+--R      implemented: slot (Factored (SparseUnivariatePolynomial (Polynomial (Complex (Integer)))))(SparseUnivariatePolynomial (Polynomial (Complex (Integer)))) from MULTFACT(SYMBOL,INDE(SYMBOL),COMPLEX(INT),POLY(COMPLEX(INT)))
 --R 
 --R
 --R   (2)
@@ -552,7 +552,7 @@ t2:=factor t1
 --R       (3 + 7%i)x  - 9x  + (30 - 10%i)x  + (15 - 24%i)x  + 14%i x  + (1 + 27%i)x
 --R     + 
 --R       - 7 + 42%i
---R                                    Type: Factored Polynomial Complex Integer
+--R                                 Type: Factored(Polynomial(Complex(Integer)))
 --E 2
 
 --S 3 of 4
@@ -560,10 +560,10 @@ t3:=factors t2
 --R 
 --R
 --R Function Selection for factors
---R      Arguments: FR POLY COMPLEX INT 
+--R      Arguments: FR(POLY(COMPLEX(INT))) 
 --R 
---I [1]  signature:   FR POLY COMPLEX INT -> LIST Record(...
---I      implemented: slot (List (Record (: factor (Polynomial ...
+--R [1]  signature:   FR(POLY(COMPLEX(INT))) -> LIST(Record(factor: POLY(COMPLEX(INT)),exponent: INT))
+--R      implemented: slot (List (Record (: factor (Polynomial (Complex (Integer)))) (: exponent (Integer))))$ from FR(POLY(COMPLEX(INT)))
 --R 
 --R
 --R   (3)
@@ -577,7 +577,7 @@ t3:=factors t2
 --R       ,
 --R      exponent= 1]
 --R     ]
---R      Type: List Record(factor: Polynomial Complex Integer,exponent: Integer)
+--R   Type: List(Record(factor: Polynomial(Complex(Integer)),exponent: Integer))
 --E 3
 
 --S 4 of 4
@@ -585,14 +585,14 @@ t4:=unit t2
 --R 
 --R
 --R Function Selection for unit
---R      Arguments: FR POLY COMPLEX INT 
+--R      Arguments: FR(POLY(COMPLEX(INT))) 
 --R 
---R [1]  signature:   FR POLY COMPLEX INT -> POLY COMPLEX INT
---I      implemented: slot (Polynomial (Complex (Integer)))$ ...
+--R [1]  signature:   FR(POLY(COMPLEX(INT))) -> POLY(COMPLEX(INT))
+--R      implemented: slot (Polynomial (Complex (Integer)))$ from FR(POLY(COMPLEX(INT)))
 --R 
 --R
 --R   (4)  %i
---R                                             Type: Polynomial Complex Integer
+--R                                           Type: Polynomial(Complex(Integer))
 --E 4
 
 )spool
diff --git a/src/input/conformal.input.pamphlet b/src/input/conformal.input.pamphlet
index ac71ea6..617a73f 100644
--- a/src/input/conformal.input.pamphlet
+++ b/src/input/conformal.input.pamphlet
@@ -32,7 +32,7 @@ Compile, don't interpret functions.
 C := Complex DoubleFloat                -- Complex Numbers
 --R 
 --R
---R   (1)  Complex DoubleFloat
+--R   (1)  Complex(DoubleFloat)
 --R                                                                 Type: Domain
 --E 1
 
@@ -40,7 +40,7 @@ C := Complex DoubleFloat                -- Complex Numbers
 S := Segment DoubleFloat                -- Draw ranges
 --R 
 --R
---R   (2)  Segment DoubleFloat
+--R   (2)  Segment(DoubleFloat)
 --R                                                                 Type: Domain
 --E 2
 
@@ -48,7 +48,7 @@ S := Segment DoubleFloat                -- Draw ranges
 R3 := POINT DoubleFloat                         -- points in 3-space
 --R 
 --R
---R   (3)  Point DoubleFloat
+--R   (3)  Point(DoubleFloat)
 --R                                                                 Type: Domain
 --E 3
 \end{chunk}
@@ -170,7 +170,7 @@ convert cartesian coordinates to cartesian form complex
 cartesian2Complex(r:DoubleFloat, i:DoubleFloat):C == complex(r, i)
 --R 
 --R   Function declaration cartesian2Complex : (DoubleFloat,DoubleFloat)
---R       -> Complex DoubleFloat has been added to workspace.
+--R       -> Complex(DoubleFloat) has been added to workspace.
 --R                                                                   Type: Void
 --E 10
 \end{chunk}
@@ -180,7 +180,7 @@ convert polar coordinates to cartesian form complex
 polar2Complex(r:DoubleFloat, th:DoubleFloat):C == complex(r*cos(th), r*sin(th))
 --R 
 --R   Function declaration polar2Complex : (DoubleFloat,DoubleFloat) -> 
---R      Complex DoubleFloat has been added to workspace.
+--R      Complex(DoubleFloat) has been added to workspace.
 --R                                                                   Type: Void
 --E 11
 \end{chunk}
diff --git a/src/input/contfrac.input.pamphlet b/src/input/contfrac.input.pamphlet
index 94a6a77..134effe 100644
--- a/src/input/contfrac.input.pamphlet
+++ b/src/input/contfrac.input.pamphlet
@@ -28,7 +28,7 @@ r1 := 3/4
 --R        3
 --R   (1)  -
 --R        4
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 1
 
 --S 2 of 40
@@ -38,7 +38,7 @@ r2 := 314159/100000
 --R        314159
 --R   (2)  ------
 --R        100000
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 2
 
 --S 3 of 40
@@ -48,7 +48,7 @@ c1 := r1 :: ContinuedFraction Integer
 --R          1 |     1 |
 --R   (3)  +---+ + +---+
 --R        | 1     | 3
---R                                              Type: ContinuedFraction Integer
+--R                                             Type: ContinuedFraction(Integer)
 --E 3
 
 --S 4 of 40
@@ -58,7 +58,7 @@ c2 := r2 :: ContinuedFraction Integer
 --R              1 |     1  |     1 |     1  |     1 |     1 |     1 |
 --R   (4)  3 + +---+ + +----+ + +---+ + +----+ + +---+ + +---+ + +---+
 --R            | 7     | 15     | 1     | 25     | 1     | 7     | 4
---R                                              Type: ContinuedFraction Integer
+--R                                             Type: ContinuedFraction(Integer)
 --E 4
 
 -- We can view these in the list notation
@@ -67,7 +67,7 @@ partialQuotients c1
 --R 
 --R
 --R   (5)  [0,1,3]
---R                                                         Type: Stream Integer
+--R                                                        Type: Stream(Integer)
 --E 5
 
 --S 6 of 40
@@ -75,7 +75,7 @@ partialQuotients c2
 --R 
 --R
 --R   (6)  [3,7,15,1,25,1,7,4]
---R                                                         Type: Stream Integer
+--R                                                        Type: Stream(Integer)
 --E 6
  
 -- These are algebraic objects, so we can manipulate them accordingly
@@ -87,7 +87,7 @@ c1 + c2
 --R         1 |     1 |     1 |     1 |     1 |     1 |     1 |     1  |     1 |
 --R   3 + +---+ + +---+ + +---+ + +---+ + +---+ + +---+ + +---+ + +----+ + +---+
 --R       | 1     | 8     | 4     | 2     | 5     | 1     | 2     | 32     | 2
---R                                              Type: ContinuedFraction Integer
+--R                                             Type: ContinuedFraction(Integer)
 --E 7
 
 --S 8 of 40
@@ -102,7 +102,7 @@ c1 * c2
 --R       1 |
 --R     +---+ + ...
 --R     | 1
---R                                              Type: ContinuedFraction Integer
+--R                                             Type: ContinuedFraction(Integer)
 --E 8
 
 --S 9 of 40
@@ -112,7 +112,7 @@ c1 * c2
 --R          1 |     1 |     1  |     1 |     1  |     1 |     1 |     1 |
 --R   (9)  +---+ + +---+ + +----+ + +---+ + +----+ + +---+ + +---+ + +---+
 --R        | 3     | 7     | 15     | 1     | 25     | 1     | 7     | 4
---R                                              Type: ContinuedFraction Integer
+--R                                             Type: ContinuedFraction(Integer)
 --E 9
 
 --S 10 of 40
@@ -123,7 +123,7 @@ c1 - c2
 --R           1 |     1 |     1 |     1 |     1 |     1 |     1 |     1 |      1  |
 --R   - 3 + +---+ + +---+ + +---+ + +---+ + +---+ + +---+ + +---+ + +---+ + +-----+
 --R         | 1     | 1     | 1     | 1     | 4     | 6     | 2     | 2     | 131
---R                                              Type: ContinuedFraction Integer
+--R                                             Type: ContinuedFraction(Integer)
 --E 10
 
 --S 11 of 40
@@ -133,7 +133,7 @@ c2 - c1
 --R               1 |     1 |     1 |     1 |     1 |     1 |     1 |      1  |
 --R   (11)  2 + +---+ + +---+ + +---+ + +---+ + +---+ + +---+ + +---+ + +-----+
 --R             | 2     | 1     | 1     | 4     | 6     | 2     | 2     | 131
---R                                              Type: ContinuedFraction Integer
+--R                                             Type: ContinuedFraction(Integer)
 --E 11
  
 -- and can convert them back to rational numbers.
@@ -145,7 +145,7 @@ convergents %
 --R            5 7 12 55 342 739 1820 239159
 --R   (12)  [2,-,-,--,--,---,---,----,------]
 --R            2 3  5 23 143 309  761 100000
---R                                                Type: Stream Fraction Integer
+--R                                              Type: Stream(Fraction(Integer))
 --E 12 
  
 )clear all
@@ -158,7 +158,7 @@ a0 := ((-122 + 597* %i)/(4 - 4*%i))
 --R          719   475
 --R   (1)  - --- + --- %i
 --R           8     8
---R                                               Type: Complex Fraction Integer
+--R                                             Type: Complex(Fraction(Integer))
 --E 13
 
 --S 14 of 40
@@ -168,7 +168,7 @@ b0 := ((-595 - %i)/(3 - 4*%i))
 --R          1781   2383
 --R   (2)  - ---- - ---- %i
 --R           25     25
---R                                               Type: Complex Fraction Integer
+--R                                             Type: Complex(Fraction(Integer))
 --E 14
 
 --S 15 of 40
@@ -178,7 +178,7 @@ a  := continuedFraction(a0)
 --R                           1    |         1     |
 --R   (3)  - 90 + 59%i + +---------+ + +-----------+
 --R                      | 1 - 2%i     | - 1 + 2%i
---R                                      Type: ContinuedFraction Complex Integer
+--R                                    Type: ContinuedFraction(Complex(Integer))
 --E 15
 
 --S 16 of 40
@@ -188,7 +188,7 @@ b  := continuedFraction(b0)
 --R                            1     |      1  |
 --R   (4)  - 71 - 95%i + +-----------+ + +-----+
 --R                      | - 1 + 2%i     | - 2
---R                                      Type: ContinuedFraction Complex Integer
+--R                                    Type: ContinuedFraction(Complex(Integer))
 --E 16
 
 --S 17 of 40
@@ -198,7 +198,7 @@ a + b
 --R                             1     |      1  |        1     |
 --R   (5)  - 161 - 36%i + +-----------+ + +-----+ + +----------+
 --R                       | - 7 - 3%i     | 2%i     | - 1 - %i
---R                                      Type: ContinuedFraction Complex Integer
+--R                                    Type: ContinuedFraction(Complex(Integer))
 --E 17
 
 --S 18 of 40
@@ -208,7 +208,7 @@ convergents %
 --R                      - 1020 - 735%i - 2004 - 1631%i 362 - 4655%i
 --R   (6)  [- 161 - 36%i,--------------,---------------,------------]
 --R                          7 + 3%i        14 + 7%i      4 + 28%i
---R                                        Type: Stream Fraction Complex Integer
+--R                                     Type: Stream(Fraction(Complex(Integer)))
 --E 18
 
 --S 19 of 40
@@ -216,7 +216,7 @@ last % - (a0 + b0)
 --R 
 --R
 --R   (7)  0
---R                                               Type: Complex Fraction Integer
+--R                                             Type: Complex(Fraction(Integer))
 --E 19
 
 --S 20 of 40
@@ -231,7 +231,7 @@ a / b
 --R          1    |
 --R     +---------+
 --R     | 2 + 4%i
---R                                      Type: ContinuedFraction Complex Integer
+--R                                    Type: ContinuedFraction(Complex(Integer))
 --E 20
 
 --S 21 of 40
@@ -242,7 +242,7 @@ convergents %
 --R         4 - 7%i 13 - 21%i 69 - 64%i  215 - 80%i 709 - 171%i 2279 - 2022%i
 --R   [- %i,-------,---------,---------,-----------,-----------,-------------]
 --R         8 + 4%i 24 + 13%i 75 + 72%i 102 + 232%i 234 + 771%i 2376 + 2384%i
---R                                        Type: Stream Fraction Complex Integer
+--R                                     Type: Stream(Fraction(Complex(Integer)))
 --E 21
 
 --S 22 of 40
@@ -250,7 +250,7 @@ last % - (a0/b0)
 --R 
 --R
 --R   (10)  0
---R                                               Type: Complex Fraction Integer
+--R                                             Type: Complex(Fraction(Integer))
 --E 22
 
 --S 23 of 40
@@ -273,7 +273,7 @@ c := continuedFraction(3 + 4*%i, repeating [1 + %i], repeating [5 - %i])
 --R       1 + %i |     1 + %i |     1 + %i |     1 + %i |     1 + %i |
 --R     +--------+ + +--------+ + +--------+ + +--------+ + +--------+ + ...
 --R     | 5 - %i     | 5 - %i     | 5 - %i     | 5 - %i     | 5 - %i
---R                                      Type: ContinuedFraction Complex Integer
+--R                                    Type: ContinuedFraction(Complex(Integer))
 --E 24
 
 --S 25 of 40
@@ -290,7 +290,7 @@ a/c
 --R     | 1 + 2%i     | 2%i     | 8 - 2%i     | - 2     | - 1 + 8%i     | 3 - 3%i
 --R   + 
 --R     ...
---R                                      Type: ContinuedFraction Complex Integer
+--R                                    Type: ContinuedFraction(Complex(Integer))
 --E 25
 
 -- (a = c)::Boolean -- should give error
@@ -303,7 +303,7 @@ d := complete continuedFraction(3+4*%i, repeating [1+%i],[i-%i for i in 1..5])
 --R               1 + %i |     1 + %i |     1 + %i |     1 + %i |     1 + %i |
 --R   3 + 4%i + +--------+ + +--------+ + +--------+ + +--------+ + +--------+
 --R             | 1 - %i     | 2 - %i     | 3 - %i     | 4 - %i     | 5 - %i
---R                                      Type: ContinuedFraction Complex Integer
+--R                                    Type: ContinuedFraction(Complex(Integer))
 --E 26
 
 --S 27 of 40
@@ -331,7 +331,7 @@ q := (2*x**2 - x + 1) / (3*x**3 - x + 8)
 --R           3   1     8
 --R          x  - - x + -
 --R               3     3
---R                      Type: Fraction UnivariatePolynomial(x,Fraction Integer)
+--R                    Type: Fraction(UnivariatePolynomial(x,Fraction(Integer)))
 --E 29
 
 --S 30  of 40
@@ -343,7 +343,7 @@ c := continuedFraction q
 --R         | 3     3     |   8     204     |    343     1421
 --R         | - x + -     | - - x - ---     | - ---- x + ----
 --R         | 2     4     |   7      49     |   6112     6112
---R             Type: ContinuedFraction UnivariatePolynomial(x,Fraction Integer)
+--R           Type: ContinuedFraction(UnivariatePolynomial(x,Fraction(Integer)))
 --E 30
 
 --S 31 of 40
@@ -368,7 +368,7 @@ d := continuedFraction differentiate q
 --R     |   39359803441398779644674048     9259889268740766802477056
 --R     | - -------------------------- x + -------------------------
 --R     |    1979914602262093317951025     1979914602262093317951025
---R             Type: ContinuedFraction UnivariatePolynomial(x,Fraction Integer)
+--R           Type: ContinuedFraction(UnivariatePolynomial(x,Fraction(Integer)))
 --E 31
 
 --S 32 of 40
@@ -393,7 +393,7 @@ c/d
 --R     |    7309785441053183312      1206863637270224864
 --R     | - -------------------- x + --------------------
 --R     |   30383172810229285385     30383172810229285385
---R             Type: ContinuedFraction UnivariatePolynomial(x,Fraction Integer)
+--R           Type: ContinuedFraction(UnivariatePolynomial(x,Fraction(Integer)))
 --E 32
 
 --S 33 of 40
@@ -422,7 +422,7 @@ convergents %
 --R          4    3   11  2   16     7
 --R         x  - x  + -- x  - -- x + -
 --R                    6       3     6
---R               Type: Stream Fraction UnivariatePolynomial(x,Fraction Integer)
+--R            Type: Stream(Fraction(UnivariatePolynomial(x,Fraction(Integer))))
 --E 33
 
 --S 34 of 40
@@ -436,7 +436,7 @@ q/differentiate q
 --R               4    3   11  2   16     7
 --R              x  - x  + -- x  - -- x + -
 --R                         6       3     6
---R                      Type: Fraction UnivariatePolynomial(x,Fraction Integer)
+--R                    Type: Fraction(UnivariatePolynomial(x,Fraction(Integer)))
 --E 34
 
 )clear all
@@ -460,7 +460,7 @@ s := continuedFraction(0, expand [1..], expand [1..])
 --R          1 |     2 |     3 |     4 |     5 |     6 |     7 |
 --R   (1)  +---+ + +---+ + +---+ + +---+ + +---+ + +---+ + +---+ + ...
 --R        | 1     | 2     | 3     | 4     | 5     | 6     | 7
---R                                              Type: ContinuedFraction Integer
+--R                                             Type: ContinuedFraction(Integer)
 --E 35
 
 \end{chunk}
@@ -473,7 +473,7 @@ t := reducedContinuedFraction(0, [4*i-2 for i in 1..])
 --R          1 |     1 |     1  |     1  |     1  |     1  |     1  |
 --R   (2)  +---+ + +---+ + +----+ + +----+ + +----+ + +----+ + +----+ + ...
 --R        | 2     | 6     | 10     | 14     | 18     | 22     | 26
---R                                              Type: ContinuedFraction Integer
+--R                                             Type: ContinuedFraction(Integer)
 --E 36
 
 \end{chunk}
@@ -488,7 +488,7 @@ e := 1/(s*t) - 1
 --R              1 |     1 |     1 |     1 |     1 |     1 |     1 |
 --R   (3)  2 + +---+ + +---+ + +---+ + +---+ + +---+ + +---+ + +---+ + ...
 --R            | 1     | 2     | 1     | 1     | 4     | 1     | 1
---R                                              Type: ContinuedFraction Integer
+--R                                             Type: ContinuedFraction(Integer)
 --E 37
 
 --S 38 of 40
@@ -498,7 +498,7 @@ c := convergents e
 --R             8 11 19 87 106
 --R   (4)  [2,3,-,--,--,--,---,...]
 --R             3  4  7 32  39
---R                                                Type: Stream Fraction Integer
+--R                                              Type: Stream(Fraction(Integer))
 --E 38
 
 --S 39 of 40
diff --git a/src/input/contfrc.input.pamphlet b/src/input/contfrc.input.pamphlet
index 8edbf93..2901711 100644
--- a/src/input/contfrc.input.pamphlet
+++ b/src/input/contfrc.input.pamphlet
@@ -30,7 +30,7 @@ c := continuedFraction(314159/100000)
 --R              1 |     1  |     1 |     1  |     1 |     1 |     1 |
 --R   (1)  3 + +---+ + +----+ + +---+ + +----+ + +---+ + +---+ + +---+
 --R            | 7     | 15     | 1     | 25     | 1     | 7     | 4
---R                                              Type: ContinuedFraction Integer
+--R                                             Type: ContinuedFraction(Integer)
 --E 1
 
 --S 2 of 22
@@ -38,7 +38,7 @@ partialQuotients c
 --R 
 --R
 --R   (2)  [3,7,15,1,25,1,7,4]
---R                                                         Type: Stream Integer
+--R                                                        Type: Stream(Integer)
 --E 2
 
 --S 3 of 22
@@ -48,7 +48,7 @@ convergents c
 --R           22 333 355 9208 9563 76149 314159
 --R   (3)  [3,--,---,---,----,----,-----,------]
 --R            7 106 113 2931 3044 24239 100000
---R                                                Type: Stream Fraction Integer
+--R                                              Type: Stream(Fraction(Integer))
 --E 3
 
 --S 4 of 22
@@ -59,7 +59,7 @@ approximants c
 --R           22 333 355 9208 9563 76149 314159
 --R   (4)  [3,--,---,---,----,----,-----,------]
 --R            7 106 113 2931 3044 24239 100000
---R                                                Type: Stream Fraction Integer
+--R                                              Type: Stream(Fraction(Integer))
 --E 4
 
 --S 5 of 22
@@ -67,7 +67,7 @@ pq := partialQuotients(1/c)
 --R 
 --R
 --R   (5)  [0,3,7,15,1,25,1,7,4]
---R                                                         Type: Stream Integer
+--R                                                        Type: Stream(Integer)
 --E 5
 
 --S 6 of 22
@@ -77,7 +77,7 @@ continuedFraction(first pq,repeating [1],rest pq)
 --R          1 |     1 |     1  |     1 |     1  |     1 |     1 |     1 |
 --R   (6)  +---+ + +---+ + +----+ + +---+ + +----+ + +---+ + +---+ + +---+
 --R        | 3     | 7     | 15     | 1     | 25     | 1     | 7     | 4
---R                                              Type: ContinuedFraction Integer
+--R                                             Type: ContinuedFraction(Integer)
 --E 6
 
 --S 7 of 22
@@ -92,7 +92,7 @@ z:=continuedFraction(3,repeating [1],repeating [3,6])
 --R       1 |
 --R     +---+ + ...
 --R     | 6
---R                                              Type: ContinuedFraction Integer
+--R                                             Type: ContinuedFraction(Integer)
 --E 7
 
 --S 8 of 22
@@ -100,7 +100,7 @@ dens:Stream Integer := cons(1,generate((x+->x+4),6))
 --R 
 --R
 --R   (8)  [1,6,10,14,18,22,26,30,34,38,...]
---R                                                         Type: Stream Integer
+--R                                                        Type: Stream(Integer)
 --E 8
 
 --S 9 of 22
@@ -115,7 +115,7 @@ cf := continuedFraction(0,repeating [1],dens)
 --R       1  |     1  |
 --R     +----+ + +----+ + ...
 --R     | 34     | 38
---R                                              Type: ContinuedFraction Integer
+--R                                             Type: ContinuedFraction(Integer)
 --E 9
 
 --S 10 of 22
@@ -125,7 +125,7 @@ ccf := convergents cf
 --R              6 61  860 15541 342762  8927353 268163352  9126481321
 --R   (10)  [0,1,-,--,----,-----,------,--------,---------,-----------,...]
 --R              7 71 1001 18089 398959 10391023 312129649 10622799089
---R                                                Type: Stream Fraction Integer
+--R                                              Type: Stream(Fraction(Integer))
 --E 10
 
 --S 11 of 22
@@ -135,7 +135,7 @@ eConvergents := [2*e + 1 for e in ccf]
 --R              19 193 2721 49171 1084483 28245729 848456353 28875761731
 --R   (11)  [1,3,--,---,----,-----,-------,--------,---------,-----------,...]
 --R               7  71 1001 18089  398959 10391023 312129649 10622799089
---R                                                Type: Stream Fraction Integer
+--R                                              Type: Stream(Fraction(Integer))
 --E 11
 
 --S 12 of 22
@@ -147,7 +147,7 @@ eConvergents :: Stream Float
 --R    2.7182817182 817182817, 2.7182818287 356957267, 2.7182818284 585634113,
 --R    2.7182818284 590458514, 2.7182818284 590452348, 2.7182818284 590452354,
 --R    ...]
---R                                                           Type: Stream Float
+--R                                                          Type: Stream(Float)
 --E 12
 
 --S 13 of 22
@@ -170,7 +170,7 @@ cf := continuedFraction(1,[(2*i+1)**2 for i in 0..],repeating [2])
 --R       289 |     361 |
 --R     +-----+ + +-----+ + ...
 --R     |  2      |  2
---R                                              Type: ContinuedFraction Integer
+--R                                             Type: ContinuedFraction(Integer)
 --E 14
 
 --S 15 of 22
@@ -180,7 +180,7 @@ ccf := convergents cf
 --R            3 15 105 315 3465 45045 45045 765765 14549535
 --R   (15)  [1,-,--,---,---,----,-----,-----,------,--------,...]
 --R            2 13  76 263 2578 36979 33976 622637 11064338
---R                                                Type: Stream Fraction Integer
+--R                                              Type: Stream(Fraction(Integer))
 --E 15
 
 --S 16 of 22
@@ -190,7 +190,7 @@ piConvergents := [4/p for p in ccf]
 --R            8 52 304 1052 10312 147916 135904 2490548 44257352
 --R   (16)  [4,-,--,---,----,-----,------,------,-------,--------,...]
 --R            3 15 105  315  3465  45045  45045  765765 14549535
---R                                                Type: Stream Fraction Integer
+--R                                              Type: Stream(Fraction(Integer))
 --E 16
 
 --S 17 of 22
@@ -202,7 +202,7 @@ piConvergents :: Stream Float
 --R    2.8952380952 380952381, 3.3396825396 825396825, 2.9760461760 461760462,
 --R    3.2837384837 384837385, 3.0170718170 718170718, 3.2523659347 188758953,
 --R    3.0418396189 294022111, ...]
---R                                                           Type: Stream Float
+--R                                                          Type: Stream(Float)
 --E 17
 
 --S 18 of 22
@@ -212,7 +212,7 @@ continuedFraction((- 122 + 597*%i)/(4 - 4*%i))
 --R                            1    |         1     |
 --R   (18)  - 90 + 59%i + +---------+ + +-----------+
 --R                       | 1 - 2%i     | - 1 + 2%i
---R                                      Type: ContinuedFraction Complex Integer
+--R                                    Type: ContinuedFraction(Complex(Integer))
 --E 18
 
 --S 19 of 22
@@ -230,7 +230,7 @@ r := ((x - 1) * (x - 2)) / ((x-3) * (x-4))
 --R   (20)  ------------
 --R          2
 --R         x  - 7x + 12
---R                      Type: Fraction UnivariatePolynomial(x,Fraction Integer)
+--R                    Type: Fraction(UnivariatePolynomial(x,Fraction(Integer)))
 --E 20
 
 --S 21 of 22
@@ -242,7 +242,7 @@ continuedFraction r
 --R             | 1     9     | 16     40
 --R             | - x - -     | -- x - --
 --R             | 4     8     |  3      3
---R             Type: ContinuedFraction UnivariatePolynomial(x,Fraction Integer)
+--R           Type: ContinuedFraction(UnivariatePolynomial(x,Fraction(Integer)))
 --E 21
 
 --S 22 of 22
@@ -254,7 +254,7 @@ continuedFraction r
 --R    10.9999860763 98799786, 11.0000006979 29731039, 10.9999999650 15834446,
 --R    11.0000000017 53603304, 10.9999999999 12099531, 11.0000000000 04406066,
 --R    ...]
---R                                                           Type: Stream Float
+--R                                                          Type: Stream(Float)
 --E 22
 )spool
 )lisp (bye)
diff --git a/src/input/curl.input.pamphlet b/src/input/curl.input.pamphlet
index 8e5e16c..19b5f69 100644
--- a/src/input/curl.input.pamphlet
+++ b/src/input/curl.input.pamphlet
@@ -29,7 +29,7 @@ draw(curve(sin(t)*sin(2*t)*sin(3*t),sin(4*t)*sin(5*t)*sin(6*t)),t = 0..2*%pi)
 --R   Graph data being transmitted to the viewport manager...
 --R   AXIOM2D data being transmitted to the viewport manager...
 --R
---R   (1)  TwoDimensionalViewport: "DSIN(t)*DSIN(2*t)*DSIN(3*t)"
+--R   (1)  TwoDimensionalViewport: "sin(t)*sin(2*t)*sin(3*t)"
 --R                                                 Type: TwoDimensionalViewport
 --E 1
 )spool
diff --git a/src/input/curry.input.pamphlet b/src/input/curry.input.pamphlet
index fc3d85c..808ad54 100644
--- a/src/input/curry.input.pamphlet
+++ b/src/input/curry.input.pamphlet
@@ -57,7 +57,7 @@ curried(6)
 --R 
 --R
 --R   (3)  1
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 3
 
 \end{chunk}
diff --git a/src/input/cycles.input.pamphlet b/src/input/cycles.input.pamphlet
index 2fb869d..33603f2 100644
--- a/src/input/cycles.input.pamphlet
+++ b/src/input/cycles.input.pamphlet
@@ -58,7 +58,7 @@ complete 1
 --R 
 --R
 --R   (1)  (1)
---R                                   Type: SymmetricPolynomial Fraction Integer
+--R                                 Type: SymmetricPolynomial(Fraction(Integer))
 --E 1
 
 --S 2 of 46
@@ -68,7 +68,7 @@ complete 2
 --R        1       1   2
 --R   (2)  - (2) + - (1 )
 --R        2       2
---R                                   Type: SymmetricPolynomial Fraction Integer
+--R                                 Type: SymmetricPolynomial(Fraction(Integer))
 --E 2
 
 --S 3 of 46
@@ -78,7 +78,7 @@ complete 3
 --R        1       1         1   3
 --R   (3)  - (3) + - (2 1) + - (1 )
 --R        3       2         6
---R                                   Type: SymmetricPolynomial Fraction Integer
+--R                                 Type: SymmetricPolynomial(Fraction(Integer))
 --E 3
 
 --S 4 of 46
@@ -97,7 +97,7 @@ complete 7
 --R      1      5      1    7
 --R     --- (2 1 ) + ---- (1 )
 --R     240          5040
---R                                   Type: SymmetricPolynomial Fraction Integer
+--R                                 Type: SymmetricPolynomial(Fraction(Integer))
 --E 4
 
 \end{chunk}
@@ -119,7 +119,7 @@ elementary 7
 --R        1      5      1    7
 --R     - --- (2 1 ) + ---- (1 )
 --R       240          5040
---R                                   Type: SymmetricPolynomial Fraction Integer
+--R                                 Type: SymmetricPolynomial(Fraction(Integer))
 --E 5
 
 \end{chunk}
@@ -138,7 +138,7 @@ alternating 7
 --R       1    7
 --R     ---- (1 )
 --R     2520
---R                                   Type: SymmetricPolynomial Fraction Integer
+--R                                 Type: SymmetricPolynomial(Fraction(Integer))
 --E 6
 
 \end{chunk}
@@ -151,7 +151,7 @@ cyclic 7
 --R        6       1   7
 --R   (7)  - (7) + - (1 )
 --R        7       7
---R                                   Type: SymmetricPolynomial Fraction Integer
+--R                                 Type: SymmetricPolynomial(Fraction(Integer))
 --E 7
 
 \end{chunk}
@@ -164,7 +164,7 @@ dihedral 7
 --R        3       1   3      1   7
 --R   (8)  - (7) + - (2 1) + -- (1 )
 --R        7       2         14
---R                                   Type: SymmetricPolynomial Fraction Integer
+--R                                 Type: SymmetricPolynomial(Fraction(Integer))
 --E 8
 
 \end{chunk}
@@ -180,7 +180,7 @@ graphs 5
 --R   1           1   2    1   2     1   3     1   4 2     1   3 4     1    10
 --R   - (6 3 1) + - (5 ) + - (4 2) + - (3 1) + - (2 1 ) + -- (2 1 ) + --- (1  )
 --R   6           5        4         6         8          12          120
---R                                   Type: SymmetricPolynomial Fraction Integer
+--R                                 Type: SymmetricPolynomial(Fraction(Integer))
 --E 9
 
 \end{chunk}
@@ -211,7 +211,7 @@ cap(complete 2**2,complete 2*complete 1**2)
 --R 
 --R
 --R   (10)  4
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 10
 
 \end{chunk}
@@ -227,7 +227,7 @@ cap(elementary 2**2,complete 2*complete 1**2)
 --R 
 --R
 --R   (11)  2
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 11
 
 \end{chunk}
@@ -241,7 +241,7 @@ cap(complete 3*complete 2*complete 1,complete 2**2*complete 1**2)
 --R 
 --R
 --R   (12)  24
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 12
 
 \end{chunk}
@@ -252,7 +252,7 @@ cap(elementary 3*elementary 2*elementary 1,complete 2**2*complete 1**2)
 --R 
 --R
 --R   (13)  8
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 13
 
 --S 14 of 46
@@ -260,7 +260,7 @@ cap(complete 3*complete 2*complete 1,elementary 2**2*elementary 1**2)
 --R 
 --R
 --R   (14)  8
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 14
 
 \end{chunk}
@@ -273,7 +273,7 @@ eval(cup(complete 3*complete 2*complete 1, _
 --R 
 --R
 --R   (15)  1500
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 15
 
 \end{chunk}
@@ -286,7 +286,7 @@ square:=dihedral 4
 --R         1       3   2    1     2    1   4
 --R   (16)  - (4) + - (2 ) + - (2 1 ) + - (1 )
 --R         4       8        4          8
---R                                   Type: SymmetricPolynomial Fraction Integer
+--R                                 Type: SymmetricPolynomial(Fraction(Integer))
 --E 16
 
 \end{chunk}
@@ -297,7 +297,7 @@ cap(complete 2**2,square)
 --R 
 --R
 --R   (17)  2
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 17
 
 \end{chunk}
@@ -308,7 +308,7 @@ cap(complete 3*complete 2**2,dihedral 7)
 --R 
 --R
 --R   (18)  18
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 18
 
 \end{chunk}
@@ -319,7 +319,7 @@ cap(graphs 5,complete 7*complete 3)
 --R 
 --R
 --R   (19)  4
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 19
 
 \end{chunk}
@@ -338,7 +338,7 @@ cube:=(1/24)*(s 1**8+9*s 2**4 + 8*s 3**2*s 1**2+6*s 4**2)
 --R         1   2    1   2 2    3   4     1   8
 --R   (21)  - (4 ) + - (3 1 ) + - (2 ) + -- (1 )
 --R         4        3          8        24
---R                                   Type: SymmetricPolynomial Fraction Integer
+--R                                 Type: SymmetricPolynomial(Fraction(Integer))
 --E 21
 
 \end{chunk}
@@ -349,7 +349,7 @@ cap(complete 4**2,cube)
 --R 
 --R
 --R   (22)  7
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 22
 
 \end{chunk}
@@ -361,7 +361,7 @@ cap(complete 2**3*complete 1**2,wreath(elementary 4,elementary 2))
 --R 
 --R
 --R   (23)  7
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 23
 
 \end{chunk}
@@ -372,7 +372,7 @@ cap(complete 2**3*complete 1**2,wreath(elementary 4,complete 2))
 --R 
 --R
 --R   (24)  17
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 24
 
 \end{chunk}
@@ -383,7 +383,7 @@ cap(complete 2**3*complete 1**2,wreath(complete 4,elementary 2))
 --R 
 --R
 --R   (25)  10
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 25
 
 \end{chunk}
@@ -394,7 +394,7 @@ cap(complete 2**3*complete 1**2,wreath(complete 4,complete 2))
 --R 
 --R
 --R   (26)  23
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 26
 
 \end{chunk}
@@ -409,7 +409,7 @@ x:ULS(FRAC INT,'x,0):=x
 --R 
 --R
 --R   (27)  x
---R                          Type: UnivariateLaurentSeries(Fraction Integer,x,0)
+--R                         Type: UnivariateLaurentSeries(Fraction(Integer),x,0)
 --E 27
 
 --S 28 of 46
@@ -437,11 +437,11 @@ ZeroOrOne n == 1+x**n
 ZeroOrOne 5
 --R 
 --R   Compiling function ZeroOrOne with type Integer -> 
---R      UnivariateLaurentSeries(Fraction Integer,x,0) 
+--R      UnivariateLaurentSeries(Fraction(Integer),x,0) 
 --R
 --R              5
 --R   (31)  1 + x
---R                          Type: UnivariateLaurentSeries(Fraction Integer,x,0)
+--R                         Type: UnivariateLaurentSeries(Fraction(Integer),x,0)
 --E 31
 
 \end{chunk}
@@ -457,11 +457,11 @@ Integers n == 1/(1-x**n)
 Integers 5
 --R 
 --R   Compiling function Integers with type Integer -> 
---R      UnivariateLaurentSeries(Fraction Integer,x,0) 
+--R      UnivariateLaurentSeries(Fraction(Integer),x,0) 
 --R
 --R              5    10      11
 --R   (33)  1 + x  + x   + O(x  )
---R                          Type: UnivariateLaurentSeries(Fraction Integer,x,0)
+--R                         Type: UnivariateLaurentSeries(Fraction(Integer),x,0)
 --E 33
 
 \end{chunk}
@@ -474,7 +474,7 @@ eval(ZeroOrOne,graphs 5)
 --R
 --R                   2     3     4     5     6     7     8    9    10      11
 --R   (34)  1 + x + 2x  + 4x  + 6x  + 6x  + 6x  + 4x  + 2x  + x  + x   + O(x  )
---R                          Type: UnivariateLaurentSeries(Fraction Integer,x,0)
+--R                         Type: UnivariateLaurentSeries(Fraction(Integer),x,0)
 --E 34
 
 \end{chunk}
@@ -487,7 +487,7 @@ eval(ZeroOrOne,dihedral 8)
 --R
 --R                   2     3     4     5     6    7    8
 --R   (35)  1 + x + 4x  + 5x  + 8x  + 5x  + 4x  + x  + x
---R                          Type: UnivariateLaurentSeries(Fraction Integer,x,0)
+--R                         Type: UnivariateLaurentSeries(Fraction(Integer),x,0)
 --E 35
 
 \end{chunk}
@@ -501,7 +501,7 @@ eval(Integers,complete 4)
 --R   (36)
 --R             2     3     4     5     6      7      8      9      10      11
 --R   1 + x + 2x  + 3x  + 5x  + 6x  + 9x  + 11x  + 15x  + 18x  + 23x   + O(x  )
---R                          Type: UnivariateLaurentSeries(Fraction Integer,x,0)
+--R                         Type: UnivariateLaurentSeries(Fraction(Integer),x,0)
 --E 36
 
 \end{chunk}
@@ -518,7 +518,7 @@ eval(Integers,elementary 4)
 --R   + 
 --R        17
 --R     O(x  )
---R                          Type: UnivariateLaurentSeries(Fraction Integer,x,0)
+--R                         Type: UnivariateLaurentSeries(Fraction(Integer),x,0)
 --E 37
 
 \end{chunk}
@@ -534,7 +534,7 @@ eval(ZeroOrOne,cube)
 --R
 --R                   2     3     4     5     6    7    8
 --R   (38)  1 + x + 3x  + 3x  + 7x  + 3x  + 3x  + x  + x
---R                          Type: UnivariateLaurentSeries(Fraction Integer,x,0)
+--R                         Type: UnivariateLaurentSeries(Fraction(Integer),x,0)
 --E 38
 
 \end{chunk}
@@ -551,7 +551,7 @@ eval(Integers,cube)
 --R   + 
 --R        11
 --R     O(x  )
---R                          Type: UnivariateLaurentSeries(Fraction Integer,x,0)
+--R                         Type: UnivariateLaurentSeries(Fraction(Integer),x,0)
 --E 39
 
 \end{chunk}
@@ -570,7 +570,7 @@ eval(Integers,graphs 5)
 --R   + 
 --R        11
 --R     O(x  )
---R                          Type: UnivariateLaurentSeries(Fraction Integer,x,0)
+--R                         Type: UnivariateLaurentSeries(Fraction(Integer),x,0)
 --E 40
 
 \end{chunk}
@@ -586,7 +586,7 @@ eval(ZeroOrOne ,graphs 15)
 --R   + 
 --R        11
 --R     O(x  )
---R                          Type: UnivariateLaurentSeries(Fraction Integer,x,0)
+--R                         Type: UnivariateLaurentSeries(Fraction(Integer),x,0)
 --E 41
 
 \end{chunk}
@@ -598,7 +598,7 @@ cap(dihedral 30,complete 7*complete 8*complete 5*complete 10)
 --R 
 --R
 --R   (42)  49958972383320
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 42
 
 \end{chunk}
@@ -622,7 +622,7 @@ sf3221:= SFunction [3,2,2,1]
 --R      1   2 4     1      6     1    8
 --R     -- (2 1 ) - --- (2 1 ) + --- (1 )
 --R     96          144          576
---R                                   Type: SymmetricPolynomial Fraction Integer
+--R                                 Type: SymmetricPolynomial(Fraction(Integer))
 --E 43
 
 \end{chunk}
@@ -638,7 +638,7 @@ cap(sf3221,complete 2**4)
 --R 
 --R
 --R   (44)  3
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 44
 
 \end{chunk}
@@ -656,7 +656,7 @@ cap(sf3221,powerSum 1**8)
 --R 
 --R
 --R   (45)  70
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 45
 
 \end{chunk}
@@ -680,7 +680,7 @@ eval(Integers,sf3221)
 --R   + 
 --R         19      20
 --R     432x   + O(x  )
---R                          Type: UnivariateLaurentSeries(Fraction Integer,x,0)
+--R                         Type: UnivariateLaurentSeries(Fraction(Integer),x,0)
 --E 46
 )spool
 )lisp (bye)
diff --git a/src/input/cycles1.input.pamphlet b/src/input/cycles1.input.pamphlet
index 0fdd9ea..9cac561 100644
--- a/src/input/cycles1.input.pamphlet
+++ b/src/input/cycles1.input.pamphlet
@@ -30,7 +30,7 @@ complete 1
 --R 
 --R
 --R   (1)  (1)
---R                                   Type: SymmetricPolynomial Fraction Integer
+--R                                 Type: SymmetricPolynomial(Fraction(Integer))
 --E 1
 
 --S 2 of 46
@@ -40,7 +40,7 @@ complete 2
 --R        1       1   2
 --R   (2)  - (2) + - (1 )
 --R        2       2
---R                                   Type: SymmetricPolynomial Fraction Integer
+--R                                 Type: SymmetricPolynomial(Fraction(Integer))
 --E 2
 
 --S 3 of 46
@@ -50,7 +50,7 @@ complete 3
 --R        1       1         1   3
 --R   (3)  - (3) + - (2 1) + - (1 )
 --R        3       2         6
---R                                   Type: SymmetricPolynomial Fraction Integer
+--R                                 Type: SymmetricPolynomial(Fraction(Integer))
 --E 3
 
 --S 4 of 46
@@ -69,7 +69,7 @@ complete 7
 --R      1      5      1    7
 --R     --- (2 1 ) + ---- (1 )
 --R     240          5040
---R                                   Type: SymmetricPolynomial Fraction Integer
+--R                                 Type: SymmetricPolynomial(Fraction(Integer))
 --E 4
 
 --S 5 of 46
@@ -88,7 +88,7 @@ elementary 7
 --R        1      5      1    7
 --R     - --- (2 1 ) + ---- (1 )
 --R       240          5040
---R                                   Type: SymmetricPolynomial Fraction Integer
+--R                                 Type: SymmetricPolynomial(Fraction(Integer))
 --E 5
 
 --S 6 of 46
@@ -103,7 +103,7 @@ alternating 7
 --R       1    7
 --R     ---- (1 )
 --R     2520
---R                                   Type: SymmetricPolynomial Fraction Integer
+--R                                 Type: SymmetricPolynomial(Fraction(Integer))
 --E 6
 
 --S 7 of 46
@@ -113,7 +113,7 @@ cyclic 7
 --R        6       1   7
 --R   (7)  - (7) + - (1 )
 --R        7       7
---R                                   Type: SymmetricPolynomial Fraction Integer
+--R                                 Type: SymmetricPolynomial(Fraction(Integer))
 --E 7
 
 --S 8 of 46
@@ -123,7 +123,7 @@ dihedral 7
 --R        3       1   3      1   7
 --R   (8)  - (7) + - (2 1) + -- (1 )
 --R        7       2         14
---R                                   Type: SymmetricPolynomial Fraction Integer
+--R                                 Type: SymmetricPolynomial(Fraction(Integer))
 --E 8
 
 --S 9 of 46
@@ -134,7 +134,7 @@ graphs 5
 --R   1           1   2    1   2     1   3     1   4 2     1   3 4     1    10
 --R   - (6 3 1) + - (5 ) + - (4 2) + - (3 1) + - (2 1 ) + -- (2 1 ) + --- (1  )
 --R   6           5        4         6         8          12          120
---R                                   Type: SymmetricPolynomial Fraction Integer
+--R                                 Type: SymmetricPolynomial(Fraction(Integer))
 --E 9
 
 --S 10 of 46
@@ -142,7 +142,7 @@ cap(complete 2**2, complete 2*complete 1**2)
 --R 
 --R
 --R   (10)  4
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 10
 
 --S 11 of 46
@@ -150,7 +150,7 @@ cap(elementary 2**2, complete 2*complete 1**2)
 --R 
 --R
 --R   (11)  2
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 11
 
 --S 12 of 46
@@ -158,7 +158,7 @@ cap(complete 3*complete 2*complete 1,complete 2**2*complete 1**2)
 --R 
 --R
 --R   (12)  24
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 12
 
 --S 13 of 46
@@ -166,7 +166,7 @@ cap(elementary 3*elementary 2*elementary 1,complete 2**2*complete 1**2)
 --R 
 --R
 --R   (13)  8
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 13
 
 --S 14 of 46
@@ -174,7 +174,7 @@ cap(complete 3*complete 2*complete 1,elementary 2**2*elementary 1**2)
 --R 
 --R
 --R   (14)  8
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 14
 
 --S 15 of 46
@@ -183,7 +183,7 @@ eval(cup(complete 3*complete 2*complete 1, _
 --R 
 --R
 --R   (15)  1500
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 15
 
 --S 16 of 46
@@ -193,7 +193,7 @@ square:=dihedral 4
 --R         1       3   2    1     2    1   4
 --R   (16)  - (4) + - (2 ) + - (2 1 ) + - (1 )
 --R         4       8        4          8
---R                                   Type: SymmetricPolynomial Fraction Integer
+--R                                 Type: SymmetricPolynomial(Fraction(Integer))
 --E 16
 
 --S 17 of 46
@@ -201,7 +201,7 @@ cap(complete 2**2,square)
 --R 
 --R
 --R   (17)  2
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 17
 
 --S 18 of 46
@@ -209,7 +209,7 @@ cap(complete 3*complete 2**2,dihedral 7)
 --R 
 --R
 --R   (18)  18
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 18
 
 --S 19 of 46
@@ -217,7 +217,7 @@ cap(graphs 5,complete 7*complete 3)
 --R 
 --R
 --R   (19)  4
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 19
 
 --S 20 of 46
@@ -230,12 +230,12 @@ s(x) == powerSum(x)
 cube:=(1/24)*(s 1**8+9*s 2**4 + 8*s 3**2*s 1**2+6*s 4**2)
 --R 
 --R   Compiling function s with type PositiveInteger -> 
---R      SymmetricPolynomial Fraction Integer 
+--R      SymmetricPolynomial(Fraction(Integer)) 
 --R
 --R         1   2    1   2 2    3   4     1   8
 --R   (21)  - (4 ) + - (3 1 ) + - (2 ) + -- (1 )
 --R         4        3          8        24
---R                                   Type: SymmetricPolynomial Fraction Integer
+--R                                 Type: SymmetricPolynomial(Fraction(Integer))
 --E 21
 
 --S 22 of 46
@@ -243,7 +243,7 @@ cap(complete 4**2,cube)
 --R 
 --R
 --R   (22)  7
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 22
 
 --S 23 of 46
@@ -251,7 +251,7 @@ cap(complete 2**3*complete 1**2,wreath(elementary 4,elementary 2))
 --R 
 --R
 --R   (23)  7
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 23
 
 --S 24 of 46
@@ -259,7 +259,7 @@ cap(complete 2**3*complete 1**2,wreath(elementary 4,complete 2))
 --R 
 --R
 --R   (24)  17
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 24
 
 --S 25 of 46
@@ -267,7 +267,7 @@ cap(complete 2**3*complete 1**2,wreath(complete 4,elementary 2))
 --R 
 --R
 --R   (25)  10
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 25
 
 --S 26 of 46
@@ -275,7 +275,7 @@ cap(complete 2**3*complete 1**2,wreath(complete 4,complete 2))
 --R 
 --R
 --R   (26)  23
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 26
 
 --S 27 of 46
@@ -283,7 +283,7 @@ x: ULS(FRAC INT,'x,0) := 'x
 --R 
 --R
 --R   (27)  x
---R                          Type: UnivariateLaurentSeries(Fraction Integer,x,0)
+--R                         Type: UnivariateLaurentSeries(Fraction(Integer),x,0)
 --E 27
 
 --S 28 of 46
@@ -308,11 +308,11 @@ ZeroOrOne n == 1+x**n
 ZeroOrOne 5
 --R 
 --R   Compiling function ZeroOrOne with type Integer -> 
---R      UnivariateLaurentSeries(Fraction Integer,x,0) 
+--R      UnivariateLaurentSeries(Fraction(Integer),x,0) 
 --R
 --R              5
 --R   (31)  1 + x
---R                          Type: UnivariateLaurentSeries(Fraction Integer,x,0)
+--R                         Type: UnivariateLaurentSeries(Fraction(Integer),x,0)
 --E 31
 
 --S 32 of 46
@@ -325,11 +325,11 @@ Integers n == 1/(1-x**n)
 Integers 5
 --R 
 --R   Compiling function Integers with type Integer -> 
---R      UnivariateLaurentSeries(Fraction Integer,x,0) 
+--R      UnivariateLaurentSeries(Fraction(Integer),x,0) 
 --R
 --R              5    10      11
 --R   (33)  1 + x  + x   + O(x  )
---R                          Type: UnivariateLaurentSeries(Fraction Integer,x,0)
+--R                         Type: UnivariateLaurentSeries(Fraction(Integer),x,0)
 --E 33
 
 --S 34 of 46
@@ -338,7 +338,7 @@ eval(ZeroOrOne, graphs 5)
 --R
 --R                   2     3     4     5     6     7     8    9    10      11
 --R   (34)  1 + x + 2x  + 4x  + 6x  + 6x  + 6x  + 4x  + 2x  + x  + x   + O(x  )
---R                          Type: UnivariateLaurentSeries(Fraction Integer,x,0)
+--R                         Type: UnivariateLaurentSeries(Fraction(Integer),x,0)
 --E 34
 
 --S 35 of 46
@@ -347,7 +347,7 @@ eval(ZeroOrOne,dihedral 8)
 --R
 --R                   2     3     4     5     6    7    8
 --R   (35)  1 + x + 4x  + 5x  + 8x  + 5x  + 4x  + x  + x
---R                          Type: UnivariateLaurentSeries(Fraction Integer,x,0)
+--R                         Type: UnivariateLaurentSeries(Fraction(Integer),x,0)
 --E 35
 
 --S 36 of 46
@@ -357,7 +357,7 @@ eval(Integers,complete 4)
 --R   (36)
 --R             2     3     4     5     6      7      8      9      10      11
 --R   1 + x + 2x  + 3x  + 5x  + 6x  + 9x  + 11x  + 15x  + 18x  + 23x   + O(x  )
---R                          Type: UnivariateLaurentSeries(Fraction Integer,x,0)
+--R                         Type: UnivariateLaurentSeries(Fraction(Integer),x,0)
 --E 36
 
 --S 37 of 46
@@ -370,7 +370,7 @@ eval(Integers,elementary 4)
 --R   + 
 --R        17
 --R     O(x  )
---R                          Type: UnivariateLaurentSeries(Fraction Integer,x,0)
+--R                         Type: UnivariateLaurentSeries(Fraction(Integer),x,0)
 --E 37
 
 --S 38 of 46
@@ -379,7 +379,7 @@ eval(ZeroOrOne,cube)
 --R
 --R                   2     3     4     5     6    7    8
 --R   (38)  1 + x + 3x  + 3x  + 7x  + 3x  + 3x  + x  + x
---R                          Type: UnivariateLaurentSeries(Fraction Integer,x,0)
+--R                         Type: UnivariateLaurentSeries(Fraction(Integer),x,0)
 --E 38
 
 --S 39 of 46
@@ -392,7 +392,7 @@ eval(Integers,cube)
 --R   + 
 --R        11
 --R     O(x  )
---R                          Type: UnivariateLaurentSeries(Fraction Integer,x,0)
+--R                         Type: UnivariateLaurentSeries(Fraction(Integer),x,0)
 --E 39
 
 --S 40 of 46
@@ -405,7 +405,7 @@ eval(Integers,graphs 5)
 --R   + 
 --R        11
 --R     O(x  )
---R                          Type: UnivariateLaurentSeries(Fraction Integer,x,0)
+--R                         Type: UnivariateLaurentSeries(Fraction(Integer),x,0)
 --E 40
 
 --S 41 of 46
@@ -418,7 +418,7 @@ eval(ZeroOrOne ,graphs 15)
 --R   + 
 --R        11
 --R     O(x  )
---R                          Type: UnivariateLaurentSeries(Fraction Integer,x,0)
+--R                         Type: UnivariateLaurentSeries(Fraction(Integer),x,0)
 --E 41
 
 --S 42 of 46
@@ -426,7 +426,7 @@ cap(dihedral 30,complete 7*complete 8*complete 5*complete 10)
 --R 
 --R
 --R   (42)  49958972383320
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 42
 
 --S 43 of 46
@@ -445,7 +445,7 @@ sf3221:= SFunction [3,2,2,1]
 --R      1   2 4     1      6     1    8
 --R     -- (2 1 ) - --- (2 1 ) + --- (1 )
 --R     96          144          576
---R                                   Type: SymmetricPolynomial Fraction Integer
+--R                                 Type: SymmetricPolynomial(Fraction(Integer))
 --E 43
 
 --S 44 of 46
@@ -453,7 +453,7 @@ cap(sf3221,complete 2**4)
 --R 
 --R
 --R   (44)  3
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 44
 
 --S 45 of 46
@@ -461,7 +461,7 @@ cap(sf3221, powerSum 1**8)
 --R 
 --R
 --R   (45)  70
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 45
 
 --S 46 of 46
@@ -474,7 +474,7 @@ eval(Integers, sf3221)
 --R   + 
 --R         19      20
 --R     432x   + O(x  )
---R                          Type: UnivariateLaurentSeries(Fraction Integer,x,0)
+--R                         Type: UnivariateLaurentSeries(Fraction(Integer),x,0)
 --E 46
 )spool
 )lisp (bye)
diff --git a/src/input/cyfactor.input.pamphlet b/src/input/cyfactor.input.pamphlet
index 3ca99db..392ff8b 100644
--- a/src/input/cyfactor.input.pamphlet
+++ b/src/input/cyfactor.input.pamphlet
@@ -47,7 +47,7 @@ factor(x**84 - 1)
 --R  *
 --R       24    22    18    16    12    8    6    2
 --R     (x   + x   - x   - x   + x   - x  - x  + x  + 1)
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 1
 
 --S 2 of 10
@@ -76,7 +76,7 @@ factor(-(x**68 -1))
 --R        + 
 --R           8    6    4    2
 --R          x  - x  + x  - x  + 1
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 2
 
 \end{chunk}
@@ -103,7 +103,7 @@ factor(x**99 + 1)
 --R     + 
 --R          9    3
 --R       - x  + x  + 1
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 3
 
 --S 4 of 10
@@ -126,7 +126,7 @@ factor(-(x**77 +1))
 --R        + 
 --R           15    14    12    11    8    7
 --R          x   + x   - x   - x   - x  - x  + x + 1
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 4
 
 \end{chunk}
@@ -146,7 +146,7 @@ factor(x**ind + 1)
 --R
 --R         64
 --R   (6)  x   + 1
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 6
 
 --S 7 of 10
@@ -163,7 +163,7 @@ factor(-(x**ind + 1))
 --R
 --R            128
 --R   (8)  - (x    + 1)
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 8
 
 \end{chunk}
@@ -180,7 +180,7 @@ factor(x**84 + 1)
 --R  *
 --R       48    44    36    32    24    16    12    4
 --R     (x   + x   - x   - x   + x   - x   - x   + x  + 1)
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 9
 
 --S 10 of 10
@@ -188,7 +188,7 @@ D
 --R 
 --R
 --R   (10)  D
---R                                                             Type: Variable D
+--R                                                            Type: Variable(D)
 --E 10
 )spool
 )lisp (bye)
diff --git a/src/input/danzwill.input.pamphlet b/src/input/danzwill.input.pamphlet
index a1df989..39bcc49 100644
--- a/src/input/danzwill.input.pamphlet
+++ b/src/input/danzwill.input.pamphlet
@@ -47,7 +47,7 @@ i1 := integrate( sin(x), x)
 --R 
 --R
 --R   (1)  - cos(x)
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 1
 
 --i2 := integrate( sqrt(tan(x)), x)
@@ -63,7 +63,7 @@ i3 := integrate( x/(x**3-1),x)
 --R   (2)  -------------------------------------------------------------
 --R                                      +-+
 --R                                    6\|3
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 2
 
 --S 3 of 17
@@ -75,7 +75,7 @@ i4 := integrate( x/sin(x)**2, x)
 --R                  cos(x) + 1              cos(x) + 1
 --R   (3)  --------------------------------------------------------
 --R                                 sin(x)
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 3
 
 --S 4 of 17
@@ -84,7 +84,7 @@ i5 := integrate( log(x)/sqrt(x+1), x)
 --R
 --R              +-----+              +-----+                      +-----+
 --R   (4)  2log(\|x + 1  + 1) - 2log(\|x + 1  - 1) + (2log(x) - 4)\|x + 1
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 4
 
 --S 5 of 17
@@ -95,7 +95,7 @@ i6 := integrate( exp(-a*x**2), x)
 --R         ++    - %N a
 --R   (5)   |   %e      d%N
 --R        ++
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 5
 
 --S 6 of 17
@@ -107,7 +107,7 @@ i7 := integrate( x/(log(x))**3, x)
 --R   (6)  ------------------------------------
 --R                             2
 --R                      2log(x)
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 6
 
 --S 7 of 17
@@ -118,7 +118,7 @@ i8 := integrate( x/(sqrt(1+x)+sqrt(1-x)),x)
 --R        (x + 1)\|x + 1  + (- x + 1)\|- x + 1
 --R   (7)  -------------------------------------
 --R                          3
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 7
 
 --S 8 of 17
@@ -132,7 +132,7 @@ i9 := integrate( 1/(2+cos(x)),x)
 --R   (8)  ------------------
 --R                +-+
 --R               \|3
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 8
 
 --S 9 of 17
@@ -144,7 +144,7 @@ i10:= integrate( sin(x)/x**2, x)
 --R   (9)   |   ------- d%N
 --R        ++       2
 --R               %N
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 9
 
 --S 10 of 17
@@ -174,7 +174,7 @@ d3:= integrate( x**2/(1+x**3),x=0..%plusInfinity)
 --R 
 --R
 --R   (11)   + infinity
---R                    Type: Union(f1: OrderedCompletion Expression Integer,...)
+--R                  Type: Union(f1: OrderedCompletion(Expression(Integer)),...)
 --E 12
 
 --S 13 of 17
@@ -184,7 +184,7 @@ d4:= integrate( exp(-x)/sqrt(x),x=0..%plusInfinity)
 --R          _ 1
 --R   (12)  | (-)
 --R            2
---R                    Type: Union(f1: OrderedCompletion Expression Integer,...)
+--R                  Type: Union(f1: OrderedCompletion(Expression(Integer)),...)
 --E 13
 
 --S 14 of 17
@@ -196,7 +196,7 @@ d5:= integrate( exp(-x**2)*log(x)**2,x=0..%plusInfinity)
 --R            2             2       2         2
 --R   (13)  --------------------------------------
 --R                            8
---R                    Type: Union(f1: OrderedCompletion Expression Integer,...)
+--R                  Type: Union(f1: OrderedCompletion(Expression(Integer)),...)
 --E 14
 
 --S 15 of 17
diff --git a/src/input/danzwill2.input.pamphlet b/src/input/danzwill2.input.pamphlet
index 2ef5f65..83b0bfd 100644
--- a/src/input/danzwill2.input.pamphlet
+++ b/src/input/danzwill2.input.pamphlet
@@ -26,7 +26,7 @@ i1:= integrate(e^(1991*x),x)
 --R        %e
 --R   (1)  --------------
 --R          1991log(e)
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 1
 
 --S 2 of 50
@@ -35,7 +35,7 @@ i2:= integrate((sin(x)-cos(x))^2,x)
 --R
 --R              2
 --R   (2)  cos(x)  + x
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 2
 
 --S 3 of 50
@@ -43,7 +43,7 @@ i3:= integrate(log(x),x)
 --R 
 --R
 --R   (3)  x log(x) - x
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 3
 
 --S 4 of 50
@@ -53,7 +53,7 @@ i4:= integrate(1/(%pi*x),x)
 --R        log(x)
 --R   (4)  ------
 --R          %pi
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 4
 
 --S 5 of 50
@@ -61,7 +61,7 @@ i5:= integrate(%e^(sin(x)^2)*%e^(cos(x)^2),x)
 --R 
 --R
 --R   (5)  x %e
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 5
 
 --S 6 of 50
@@ -69,7 +69,7 @@ i6:= integrate(1/(x*log(x)),x)
 --R 
 --R
 --R   (6)  log(log(x))
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 6
 
 --S 7 of 50
@@ -80,7 +80,7 @@ i7:= integrate(x/(x^4+1),x)
 --R        atan(x )
 --R   (7)  --------
 --R            2
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 7
 
 --S 8 of 50
@@ -92,7 +92,7 @@ i8:= integrate((x+1)/(x^2+2*x+2)^(1/3),x)
 --R        3\|x  + 2x + 2
 --R   (8)  ----------------
 --R                4
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 8
 
 --S 9 of 50
@@ -103,7 +103,7 @@ i9:= integrate(x*%e^x*sin(x),x)
 --R        x %e sin(x) + (- x + 1)cos(x)%e
 --R   (9)  --------------------------------
 --R                        2
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 9
 
 --S 10 of 50
@@ -116,7 +116,7 @@ i10:= integrate(%e^(%e^x+x),x)
 --R   (10)  ---------
 --R              x
 --R            %e
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 10
 
 --S 11 of 50
@@ -127,7 +127,7 @@ i11:= integrate(1/(sec(x)+tan(x)*sin(x)),x)
 --R   (11)  atan(---------------------) - atan(-----------)
 --R                    2                       2cos(x) + 2
 --R              cos(x)  + 2cos(x) + 1
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 11
 
 --S 12 of 50
@@ -138,7 +138,7 @@ i12:= integrate((%e^(5*x)+%e^(7*x))/(%e^x+%e^(-x)),x)
 --R         (%e )
 --R   (12)  ------
 --R            6
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 12
 
 --S 13 of 50
@@ -151,7 +151,7 @@ i13:= integrate(sqrt(-1+2/(1+3*x)),x)
 --R                 \| 3x + 1              \| 3x + 1
 --R   (13)  ------------------------------------------
 --R                              3
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 13
 
 --S 14 of 50
@@ -161,7 +161,7 @@ i14:= integrate(sinh(x)-cosh(x),x)
 --R                 1
 --R   (14)  -----------------
 --R         sinh(x) + cosh(x)
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 14
 
 --S 15 of 50
@@ -172,7 +172,7 @@ i15:= integrate((sin(x)*%e^sec(x))/cos(x)^2,x)
 --R           ------
 --R           cos(x)
 --R   (15)  %e
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 15
 
 --S 16 of 50
@@ -181,7 +181,7 @@ i16:= integrate((x^2+1)/(x^4-x^2+1),x)
 --R
 --R               3
 --R   (16)  atan(x ) + atan(x)
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 16
 
 --S 17 of 50
@@ -194,7 +194,7 @@ i17:= integrate(1/(%pi*x^2+atan(x)+x^2*atan(x)+%pi),x)
 --R                  x  - 1               x  - 1
 --R   (17)  ----------------------------------------------
 --R                                2
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 17
 
 --S 18 of 50
@@ -208,7 +208,7 @@ i18:= integrate(sec(x)^3,x)
 --R   --------------------------------------------------------------------------
 --R                                           2
 --R                                    2cos(x)
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 18
  
 --S 19 of 50
@@ -216,7 +216,7 @@ i19:= integrate(1/(x^2-10*x+26),x)
 --R 
 --R
 --R   (19)  atan(x - 5)
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 19 
 
 --S 20 of 50
@@ -226,7 +226,7 @@ i20:= integrate(1/(x^2-11*x-26),x)
 --R         - log(x + 2) + log(x - 13)
 --R   (20)  --------------------------
 --R                     15
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 20 
 
 --S 21 of 50
@@ -238,7 +238,7 @@ i21:= integrate(1/(12+13*cos(x)),x)
 --R                  cos(x) + 1                  cos(x) + 1
 --R   (21)  -----------------------------------------------------
 --R                                   5
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 21 
 
 --S 22 of 50
@@ -249,7 +249,7 @@ i22:= integrate((x^3+1)/(x+1),x)
 --R         2x  - 3x  + 6x
 --R   (22)  --------------
 --R                6
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 22 
 
 --S 23 of 50
@@ -262,7 +262,7 @@ i23:= integrate((1-4*x^4)^(-1/2)/(4*x)^(-1),x)
 --R   (23)  - 2atan(----------------)
 --R                          2
 --R                        2x
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 23 
 
 --S 24 of 50
@@ -271,7 +271,7 @@ i24:= integrate(%e^(1991),x)
 --R
 --R             1991
 --R   (24)  x %e
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 24 
 
 --S 25 of 50
@@ -280,7 +280,7 @@ i25:= integrate((log(x)+1)*x^x,x)
 --R
 --R           x log(x)
 --R   (25)  %e
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 25 
 
 --S 26 of 50
@@ -291,7 +291,7 @@ i26:= integrate(cos(2*x)*sin(6*x),x)
 --R         - 2cos(2x)  + cos(2x)
 --R   (26)  ----------------------
 --R                    4
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 26 
 
 --S 27 of 50
@@ -300,7 +300,7 @@ i27:= integrate(1/(sqrt(x)*(1+sqrt(x))),x)
 --R
 --R               +-+
 --R   (27)  2log(\|x  + 1)
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 27 
 
 --S 28 of 50
@@ -314,7 +314,7 @@ i28:= integrate(e^(1/x)*x^(-3),x)
 --R   (28)  ----------------------
 --R                        2
 --R                x log(e)
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 28 
 
 --S 29 of 50
@@ -326,7 +326,7 @@ i29:= integrate(sqrt(csc(x)-sin(x)),x)
 --R   (29)  (- cos(x) - 1)  |--------------------------------
 --R                        4|      3          2
 --R                        \|cos(x)  + 3cos(x)  + 3cos(x) + 1
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 29 
 
 --S 30 of 50
@@ -335,7 +335,7 @@ i30:= integrate((x^2+1)/(x^3-x),x)
 --R
 --R              2
 --R   (30)  log(x  - 1) - log(x)
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 30 
 
 --S 31 of 50
@@ -346,7 +346,7 @@ i31:= integrate(42^x,x)
 --R         %e
 --R   (31)  -----------
 --R           log(42)
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 31 
 
 --S 32 of 50
@@ -355,7 +355,7 @@ i32:= integrate(x^5*%e^x,x)
 --R
 --R           5     4      3      2                x
 --R   (32)  (x  - 5x  + 20x  - 60x  + 120x - 120)%e
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 32 
 
 --S 33 of 50
@@ -367,7 +367,7 @@ i33:= integrate(x*%e^(x^2),x)
 --R         %e
 --R   (33)  ----
 --R           2
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 33 
 
 --S 34 of 50
@@ -379,7 +379,7 @@ i34:= integrate(1/(x^2+1)^2,x)
 --R   (34)  -------------------
 --R                 2
 --R               2x  + 2
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 34 
 
 --S 35 of 50
@@ -388,7 +388,7 @@ i35:= integrate(1/(%e^x+%e^(-x)),x)
 --R
 --R                x
 --R   (35)  atan(%e )
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 35 
 
 --S 36 of 50
@@ -402,7 +402,7 @@ i36:= integrate(tan(x)*log(abs(sec(x))),x)
 --R             \|cos(x)
 --R   (36)  ----------------
 --R                 2
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 36 
 
 --S 37 of 50
@@ -410,7 +410,7 @@ i37:= integrate(cos(sin(x))*cos(x),x)
 --R 
 --R
 --R   (37)  sin(sin(x))
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 37 
 
 --S 38 of 50
@@ -420,7 +420,7 @@ i38:= integrate(1/(x^2-9),x)
 --R         - log(x + 3) + log(x - 3)
 --R   (38)  -------------------------
 --R                     6
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 38 
 
 --S 39 of 50
@@ -432,7 +432,7 @@ i39:= integrate(%pi/sqrt(16-%e^2),x)
 --R          +----------+
 --R          |    2
 --R         \|- %e  + 16
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 39 
 
 --S 40 of 50
@@ -483,7 +483,7 @@ i40:= integrate(sqrt(tan(x)),x)
 --R                          \|cos(x)
 --R  /
 --R     4
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 40 
 
 --S 41 of 50
@@ -493,7 +493,7 @@ i41:= integrate(sin(x)^(-1),x)
 --R               sin(x)
 --R   (41)  log(----------)
 --R             cos(x) + 1
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 41 
 
 --S 42 of 50
@@ -502,7 +502,7 @@ i42:= integrate((x^2-2*x+2)/(x^2+1),x)
 --R
 --R                2
 --R   (42)  - log(x  + 1) + atan(x) + x
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 42 
 
 --S 43 of 50
@@ -512,7 +512,7 @@ i43:= integrate((sin(x)^2*cos(x)^2)/(1+cos(2*x)),x)
 --R         - cos(x)sin(x) + x
 --R   (43)  ------------------
 --R                  4
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 43 
 
 --S 44 of 50
@@ -524,7 +524,7 @@ i44:= integrate(sqrt(x+x^2*sqrt(x)),x)
 --R         (4\|x  + 4x )\|x \|x  + x
 --R   (44)  --------------------------
 --R                     9x
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 44 
 
 --S 45 of 50
@@ -535,7 +535,7 @@ i45:= integrate(cos(4*x)*cos(2*x),x)
 --R         (2cos(2x)  + 1)sin(2x)
 --R   (45)  ----------------------
 --R                    6
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 45 
 
 --S 46 of 50
@@ -547,7 +547,7 @@ i46:= integrate(sqrt(x^3-1)/x,x)
 --R         - 2atan(\|x  - 1 ) + 2\|x  - 1
 --R   (46)  -------------------------------
 --R                        3
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 46 
 
 --S 47 of 50
@@ -559,7 +559,7 @@ i47:= integrate((%e^x*(x-2))/x^3,x)
 --R   (47)  ---
 --R           2
 --R          x
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 47 
 
 --S 48 of 50
@@ -567,7 +567,7 @@ i48:= integrate(cot(x)/log(sin(x)),x)
 --R 
 --R
 --R   (48)  log(log(sin(x)))
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 48 
 
 --S 49 of 50
@@ -579,7 +579,7 @@ i49:= integrate(x*sec(x)^2,x)
 --R                     cos(x) + 1                cos(x) + 1
 --R   (49)  ------------------------------------------------------------
 --R                                    cos(x)
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 49 
 
 --S 50 of 50
@@ -590,7 +590,7 @@ i50:= integrate(x*sec(x)*(x*tan(x)+2),x)
 --R           x
 --R   (50)  ------
 --R         cos(x)
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 50 
 )spool
 )lisp (bye)
diff --git a/src/input/davenport.input.pamphlet b/src/input/davenport.input.pamphlet
index d257516..4fa3849 100644
--- a/src/input/davenport.input.pamphlet
+++ b/src/input/davenport.input.pamphlet
@@ -23,7 +23,7 @@
 t1:=UP(x,FRAC INT)
 --R 
 --R
---R   (1)  UnivariatePolynomial(x,Fraction Integer)
+--R   (1)  UnivariatePolynomial(x,Fraction(Integer))
 --R                                                                 Type: Domain
 --E 1
 
@@ -41,10 +41,10 @@ quotient(p1:t1,p2:t1,n:NNI):Union("failed",t1) ==
     quot:=quot+mon
   quot
 --R 
---R   Function declaration quotient : (UnivariatePolynomial(x,Fraction 
---R      Integer),UnivariatePolynomial(x,Fraction Integer),
+--R   Function declaration quotient : (UnivariatePolynomial(x,Fraction(
+--R      Integer)),UnivariatePolynomial(x,Fraction(Integer)),
 --R      NonNegativeInteger) -> Union("failed",UnivariatePolynomial(x,
---R      Fraction Integer)) has been added to workspace.
+--R      Fraction(Integer))) has been added to workspace.
 --R                                                                   Type: Void
 --E 2
 
@@ -61,14 +61,14 @@ quotient(1,1+x,8)
 --R      into your expression for - .
 --R   AXIOM will attempt to step through and interpret the code.
 --R   Compiling function quotient with type (UnivariatePolynomial(x,
---R      Fraction Integer),UnivariatePolynomial(x,Fraction Integer),
+--R      Fraction(Integer)),UnivariatePolynomial(x,Fraction(Integer)),
 --R      NonNegativeInteger) -> Union("failed",UnivariatePolynomial(x,
---R      Fraction Integer)) 
+--R      Fraction(Integer))) 
 --I   Compiling function G1504 with type Integer -> Boolean 
 --R
 --R         8    7    6    5    4    3    2
 --R   (3)  x  - x  + x  - x  + x  - x  + x  - x + 1
---R                    Type: Union(UnivariatePolynomial(x,Fraction Integer),...)
+--R                   Type: Union(UnivariatePolynomial(x,Fraction(Integer)),...)
 --E 3
 
 --S 4 of 12
@@ -83,7 +83,7 @@ quotient(x**2-x+1,x**3-x-6/7,8)
 --R       889  2   91     7
 --R     - --- x  + -- x - -
 --R       216      36     6
---R                    Type: Union(UnivariatePolynomial(x,Fraction Integer),...)
+--R                   Type: Union(UnivariatePolynomial(x,Fraction(Integer)),...)
 --E 4
 
 --S 5 of 12
@@ -91,8 +91,8 @@ ext1:=SAE(FRAC INT,UP(a,FRAC INT),a**2+a+1)
 --R 
 --R
 --R   (5)
---R  SimpleAlgebraicExtension(Fraction Integer,UnivariatePolynomial(a,Fraction Int
---R  eger),a*a+a+1)
+--R  SimpleAlgebraicExtension(Fraction(Integer),UnivariatePolynomial(a,Fraction(In
+--R  teger)),a^2+a+1)
 --R                                                                 Type: Domain
 --E 5
 
diff --git a/src/input/davis.input.pamphlet b/src/input/davis.input.pamphlet
index 4bdf6b0..b8bcd88 100644
--- a/src/input/davis.input.pamphlet
+++ b/src/input/davis.input.pamphlet
@@ -28,7 +28,7 @@ f2:=1/(1+t^4)
 --R   (1)  ------
 --R         4
 --R        t  + 1
---R                                            Type: Fraction Polynomial Integer
+--R                                          Type: Fraction(Polynomial(Integer))
 --E 1
 
 --S 2 of 101
@@ -45,7 +45,7 @@ i2:=integrate(f2,t)
 --R                   t\|2  - 1              t\|2  + 1
 --R  /
 --R     8
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 2
 
 --S 3 of 101
@@ -62,9 +62,9 @@ d2:=integrate(f2,x=0,t)
 --RDaly Bug
 --R   Cannot find a definition or applicable library operation named 
 --R      integrate with argument type(s) 
---R                         Fraction Polynomial Integer
---R                         Equation Polynomial Integer
---R                                 Variable t
+--R                        Fraction(Polynomial(Integer))
+--R                        Equation(Polynomial(Integer))
+--R                                 Variable(t)
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
 --R      or "$" to specify which version of the function you need.
@@ -82,7 +82,7 @@ a2:=1/(4*sqrt(2))*log((x^2+x*sqrt(2)+1)/(x^2-x*sqrt(2)+1))+_
 --R                 x\|2  - x  - 1               \|2  - x              \|2  + x
 --R   (3)  ---------------------------------------------------------------------
 --R                                          8
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 4
 
 --S 5 of 101
@@ -98,7 +98,7 @@ f56:=sin(%pi*x)
 --R 
 --R
 --R   (5)  sin(%pi x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 6
 
 --S 7 of 101
@@ -108,7 +108,7 @@ i56:=integrate(f56,x)
 --R          cos(%pi x)
 --R   (6)  - ----------
 --R              %pi
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 7
 
 --S 8 of 101
@@ -116,7 +116,7 @@ d56:=integrate(f65,x=0..1)
 --R 
 --R
 --R   (7)  f65
---R                    Type: Union(f1: OrderedCompletion Expression Integer,...)
+--R                  Type: Union(f1: OrderedCompletion(Expression(Integer)),...)
 --E 8
 
 --S 9 of 101
@@ -148,7 +148,7 @@ f57:=f(x)
 --RDaly Bug
 --R   Cannot find a definition or applicable library operation named f 
 --R      with argument type(s) 
---R                                 Variable x
+--R                                 Variable(x)
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
 --R      or "$" to specify which version of the function you need.
@@ -159,7 +159,7 @@ i57:=integrate(f57,x)
 --R 
 --R
 --R   (10)  f57 x
---R                                            Type: Polynomial Fraction Integer
+--R                                          Type: Polynomial(Fraction(Integer))
 --E 12
 
 --S 13 of 101
@@ -176,8 +176,8 @@ d57:=integrate(f57,a..b)
 --RDaly Bug
 --R   Cannot find a definition or applicable library operation named 
 --R      integrate with argument type(s) 
---R                                Variable f57
---R                               Segment Symbol
+--R                                Variable(f57)
+--R                               Segment(Symbol)
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
 --R      or "$" to specify which version of the function you need.
@@ -194,7 +194,7 @@ a57:=((b-a)/6)*(f(a)+4*f((a+b)/2)+f(b))
 --RDaly Bug
 --R   Cannot find a definition or applicable library operation named f 
 --R      with argument type(s) 
---R                                 Variable a
+--R                                 Variable(a)
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
 --R      or "$" to specify which version of the function you need.
@@ -215,7 +215,7 @@ f148:=exp(x^2)*cos(n*x)
 --R                    2
 --R                   x
 --R   (12)  cos(n x)%e
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 16
 
 --S 17 of 101
@@ -226,7 +226,7 @@ i148:=integrate(f148,x)
 --R          ++             %K
 --R   (13)   |   cos(%K n)%e   d%K
 --R         ++
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 17
 
 --S 18 of 101
@@ -247,7 +247,7 @@ a148:=((-1)^n/n^2)*2*%pi*exp(%pi^2)
 --R   (15)  -----------------
 --R                  2
 --R                 n
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 19
 
 --S 20 of 101
@@ -263,7 +263,7 @@ f153:=x*cos(x)*sin(n*x)
 --R 
 --R
 --R   (17)  x cos(x)sin(n x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 21
 
 --S 22 of 101
@@ -279,7 +279,7 @@ i153:=integrate(f153,x)
 --R  /
 --R      4     2
 --R     n  - 2n  + 1
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 22
 
 --S 23 of 101
@@ -291,7 +291,7 @@ d153:=integrate(f153,x=0..2*%pi)
 --R   (19)  -------------------------------------------------
 --R                             4     2
 --R                            n  - 2n  + 1
---R                    Type: Union(f1: OrderedCompletion Expression Integer,...)
+--R                  Type: Union(f1: OrderedCompletion(Expression(Integer)),...)
 --E 23
 
 --S 24 of 101
@@ -320,7 +320,7 @@ a153b:=-2*n*%pi/(n^2-1)
 --R   (22)  - ------
 --R            2
 --R           n  - 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 26
 
 --S 27 of 101
@@ -336,7 +336,7 @@ fa154:=x*cos(50*x)*sin(n*x)
 --R 
 --R
 --R   (24)  x cos(50x)sin(n x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 28
 
 --S 29 of 101
@@ -352,7 +352,7 @@ ia154:=integrate(fa154,x)
 --R  /
 --R      4        2
 --R     n  - 5000n  + 6250000
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 29
 
 --S 30 of 101
@@ -364,7 +364,7 @@ da154:=integrate(fa154,x=0..2*%pi)
 --R   (26)  -------------------------------------------------------
 --R                           4        2
 --R                          n  - 5000n  + 6250000
---R                    Type: Union(f1: OrderedCompletion Expression Integer,...)
+--R                  Type: Union(f1: OrderedCompletion(Expression(Integer)),...)
 --E 30
 
 --S 31 of 101
@@ -375,7 +375,7 @@ aa154:=2*n*%pi/(2500-n^2)
 --R   (27)  - ---------
 --R            2
 --R           n  - 2500
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 31
 
 --S 32 of 101
@@ -398,7 +398,7 @@ fb154:=x*sin(n*x)/sqrt(1-(x^2)/(4*%pi^2))
 --R          |------------
 --R          |        2
 --R         \|    4%pi
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 33
 
 --S 34 of 101
@@ -414,7 +414,7 @@ ib154:=integrate(fb154,x)
 --R               |-----------
 --R               |       2
 --R              \|   4%pi
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 34
 
 --S 35 of 101
@@ -447,7 +447,7 @@ ab154:=2*%pi^3*J(1,2*%pi*n) -- J(n,m) is the Bessel function
 --R   Cannot find a definition or applicable library operation named J 
 --R      with argument type(s) 
 --R                               PositiveInteger
---R                             Expression Integer
+--R                             Expression(Integer)
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
 --R      or "$" to specify which version of the function you need.
@@ -466,7 +466,7 @@ f155:=log(x)*sin(n*x)
 --R 
 --R
 --R   (33)  log(x)sin(n x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 38
 
 --S 39 of 101
@@ -477,7 +477,7 @@ i155:=integrate(f155,x)
 --R          ++
 --R   (34)   |   log(%K)sin(%K n)d%K
 --R         ++
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 39
 
 --S 40 of 101
@@ -495,7 +495,7 @@ a155:=(-1/n)*(y+log(2*n*%pi)-Ci(2*n*%pi)) -- y ~ .577215665 Ci is cosine int.
 --R         - log(2n %pi) + Ci(2n %pi) - y
 --R   (36)  ------------------------------
 --R                        n
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 41
 
 --S 42 of 101
@@ -513,7 +513,7 @@ f210:=exp(-x^2)
 --R              2
 --R           - x
 --R   (38)  %e
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 43
 
 --S 44 of 101
@@ -524,7 +524,7 @@ i210:=integrate(f210,x)
 --R         erf(x)\|%pi
 --R   (39)  ------------
 --R               2
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 44
 
 --S 45 of 101
@@ -535,7 +535,7 @@ d210:=integrate(f210,x=0..%plusInfinity)
 --R         \|%pi
 --R   (40)  ------
 --R            2
---R                    Type: Union(f1: OrderedCompletion Expression Integer,...)
+--R                  Type: Union(f1: OrderedCompletion(Expression(Integer)),...)
 --E 45
 
 --S 46 of 101
@@ -546,7 +546,7 @@ a210:=sqrt(%pi)/2
 --R         \|%pi
 --R   (41)  ------
 --R            2
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 46
 
 --S 47 of 101
@@ -563,7 +563,7 @@ f212:=sech(x)^2
 --R
 --R                2
 --R   (43)  sech(x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 48
 
 --S 49 of 101
@@ -574,7 +574,7 @@ i212:=integrate(f212,x)
 --R   (44)  - -----------------------------------------
 --R                  2                            2
 --R           sinh(x)  + 2cosh(x)sinh(x) + cosh(x)  + 1
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 49
 
 --S 50 of 101
@@ -607,7 +607,7 @@ fa238:=exp(-x)*sin(w*x)
 --R
 --R           - x
 --R   (48)  %e   sin(w x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 53
 
 --S 54 of 101
@@ -619,7 +619,7 @@ ia238:=integrate(fa238,x)
 --R   (49)  ---------------------------------
 --R                        2
 --R                       w  + 1
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 54
 
 --S 55 of 101
@@ -630,7 +630,7 @@ da238:=integrate(fa238,x=0..%plusInfinity)
 --R   (50)  ------
 --R          2
 --R         w  + 1
---R                    Type: Union(f1: OrderedCompletion Expression Integer,...)
+--R                  Type: Union(f1: OrderedCompletion(Expression(Integer)),...)
 --E 55
 
 --S 56 of 101
@@ -641,7 +641,7 @@ aa238:=w/(1+w^2)
 --R   (51)  ------
 --R          2
 --R         w  + 1
---R                                            Type: Fraction Polynomial Integer
+--R                                          Type: Fraction(Polynomial(Integer))
 --E 56
 
 --S 57 of 101
@@ -660,7 +660,7 @@ fb238:=(x/(1+x^2))*sin(w*x)
 --R   (53)  ----------
 --R            2
 --R           x  + 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 58
 
 --S 59 of 101
@@ -672,7 +672,7 @@ ib238:=integrate(fb238,x)
 --R   (54)   |   ------------ d%K
 --R         ++        2
 --R                 %K  + 1
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 59
 
 --S 60 of 101
@@ -691,7 +691,7 @@ ab238:=%pi*exp(-w)/2
 --R         %pi %e
 --R   (56)  ---------
 --R             2
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 61
 
 --S 62 of 101
@@ -711,7 +711,7 @@ f239:=sin(x/2)^2*sin(w*x)/x
 --R             2
 --R   (58)  ---------------
 --R                x
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 63
 
 --S 64 of 101
@@ -723,7 +723,7 @@ i239:=integrate(f239,x)
 --R          ++       2
 --R   (59)   |   ----------------- d%K
 --R         ++           %K
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 64
 
 --S 65 of 101
@@ -791,7 +791,7 @@ f385:=x
 --R 
 --R
 --R   (67)  x
---R                                                             Type: Variable x
+--R                                                            Type: Variable(x)
 --E 72
 
 --S 73 of 101
@@ -801,7 +801,7 @@ i385:=integrate(f385,x)
 --R         1  2
 --R   (68)  - x
 --R         2
---R                                            Type: Polynomial Fraction Integer
+--R                                          Type: Polynomial(Fraction(Integer))
 --E 73
 
 --S 74 of 101
@@ -811,7 +811,7 @@ d385:=integrate(f385,x=0..1)
 --R         1
 --R   (69)  -
 --R         2
---R                    Type: Union(f1: OrderedCompletion Expression Integer,...)
+--R                  Type: Union(f1: OrderedCompletion(Expression(Integer)),...)
 --E 74
 
 --S 75 of 101
@@ -821,7 +821,7 @@ a385:=1/2
 --R         1
 --R   (70)  -
 --R         2
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 75
 
 --S 76 of 101
@@ -838,7 +838,7 @@ f388:=x^2
 --R
 --R          2
 --R   (72)  x
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 77
 
 --S 78 of 101
@@ -848,7 +848,7 @@ i388:=integrate(f388,x)
 --R         1  3
 --R   (73)  - x
 --R         3
---R                                            Type: Polynomial Fraction Integer
+--R                                          Type: Polynomial(Fraction(Integer))
 --E 78
 
 --S 79 of 101
@@ -858,7 +858,7 @@ d388:=integrate(f388,x=0..1)
 --R         1
 --R   (74)  -
 --R         3
---R                    Type: Union(f1: OrderedCompletion Expression Integer,...)
+--R                  Type: Union(f1: OrderedCompletion(Expression(Integer)),...)
 --E 79
 
 --S 80 of 101
@@ -868,7 +868,7 @@ a388:=1/3
 --R         1
 --R   (75)  -
 --R         3
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 80
 
 --S 81 of 101
@@ -885,7 +885,7 @@ fa453:=abs(x^2+y^2-0.25)
 --R
 --R              2    2
 --R   (77)  abs(y  + x  - 0.25)
---R                                                       Type: Expression Float
+--R                                                      Type: Expression(Float)
 --E 82
 
 --S 83 of 101
@@ -902,8 +902,8 @@ ia453:=integrate(integrate(fa453,x),y)
 --RDaly Bug
 --R   Cannot find a definition or applicable library operation named 
 --R      integrate with argument type(s) 
---R                              Expression Float
---R                                 Variable x
+--R                              Expression(Float)
+--R                                 Variable(x)
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
 --R      or "$" to specify which version of the function you need.
@@ -923,8 +923,8 @@ da453:=integrate(integrate(fa453,x=-1..1),y=-1..1)
 --RDaly Bug
 --R   Cannot find a definition or applicable library operation named 
 --R      integrate with argument type(s) 
---R                              Expression Float
---R                           SegmentBinding Integer
+--R                              Expression(Float)
+--R                           SegmentBinding(Integer)
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
 --R      or "$" to specify which version of the function you need.
@@ -955,7 +955,7 @@ fb453:=1/(1-x*y)
 --R              1
 --R   (80)  - -------
 --R           x y - 1
---R                                            Type: Fraction Polynomial Integer
+--R                                          Type: Fraction(Polynomial(Integer))
 --E 87
 
 --S 88 of 101
@@ -966,7 +966,7 @@ ib453:=integrate(integrate(fb453,x),y)
 --R          ++    log(%K x - 1)
 --R   (81)   |   - ------------- d%K
 --R         ++           %K
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 88
 
 --S 89 of 101
@@ -983,8 +983,8 @@ db453:=integrate(integrate(fb453,x=0..1),y=0..1)
 --RDaly Bug
 --R   Cannot find a definition or applicable library operation named 
 --R      integrate with argument type(s) 
---RUnion(f1: OrderedCompletion Expression Integer,f2: List OrderedCompletion Expression Integer,fail: failed,pole: potentialPole)
---R                      SegmentBinding NonNegativeInteger
+--IUnion(f1: OrderedCompletion(Expression(Integer)),f2: ...
+--R                     SegmentBinding(NonNegativeInteger)
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
 --R      or "$" to specify which version of the function you need.
@@ -1015,7 +1015,7 @@ fc453:=sqrt(abs(x-y))
 --R
 --R          +----------+
 --R   (84)  \|abs(y - x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 92
 
 --S 93 of 101
@@ -1044,8 +1044,8 @@ dc453:=integrate(integrate(fc453,x=0..1),y=0..1)
 --RDaly Bug
 --R   Cannot find a definition or applicable library operation named 
 --R      integrate with argument type(s) 
---RUnion(f1: OrderedCompletion Expression Integer,f2: List OrderedCompletion Expression Integer,fail: failed,pole: potentialPole)
---R                      SegmentBinding NonNegativeInteger
+--IUnion(f1: OrderedCompletion(Expression(Integer)),f2: ...
+--R                     SegmentBinding(NonNegativeInteger)
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
 --R      or "$" to specify which version of the function you need.
@@ -1058,7 +1058,7 @@ ac453:=8/15
 --R          8
 --R   (85)  --
 --R         15
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 95
 
 --S 96 of 101
@@ -1075,7 +1075,7 @@ f455:=abs(x^2+y^2+z^2-.125)
 --R
 --R              2    2    2
 --R   (87)  abs(z  + y  + x  - 0.125)
---R                                                       Type: Expression Float
+--R                                                      Type: Expression(Float)
 --E 97
 
 --S 98 of 101
@@ -1092,8 +1092,8 @@ i455:=integrate(integrate(integrate(f455,x),y),z)
 --RDaly Bug
 --R   Cannot find a definition or applicable library operation named 
 --R      integrate with argument type(s) 
---R                              Expression Float
---R                                 Variable x
+--R                              Expression(Float)
+--R                                 Variable(x)
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
 --R      or "$" to specify which version of the function you need.
@@ -1113,8 +1113,8 @@ d455:=integrate(integrate(integrate(f455,x=-1..1),y=-1..1),z=-1..1)
 --RDaly Bug
 --R   Cannot find a definition or applicable library operation named 
 --R      integrate with argument type(s) 
---R                              Expression Float
---R                           SegmentBinding Integer
+--R                              Expression(Float)
+--R                           SegmentBinding(Integer)
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
 --R      or "$" to specify which version of the function you need.
diff --git a/src/input/decimal.input.pamphlet b/src/input/decimal.input.pamphlet
index 49fd6f9..cff1dcd 100644
--- a/src/input/decimal.input.pamphlet
+++ b/src/input/decimal.input.pamphlet
@@ -49,7 +49,7 @@ r + decimal(6/7)
 --R   [0.00285714, 0.002849, 0.0028409, 0.00283286118980169971671388101983,
 --R       __________________________________________________________
 --R    0.00282485875706214689265536723163841807909604519774011299435]
---R                                                  Type: List DecimalExpansion
+--R                                                 Type: List(DecimalExpansion)
 --E 3
 
 --S 4 of 7
@@ -73,7 +73,7 @@ p := decimal(1/4)*x**2 + decimal(2/3)*x + decimal(4/9)
 --R
 --R             2     _      _
 --R   (5)  0.25x  + 0.6x + 0.4
---R                                            Type: Polynomial DecimalExpansion
+--R                                           Type: Polynomial(DecimalExpansion)
 --E 5
 
 --S 6 of 7
@@ -82,7 +82,7 @@ q := differentiate(p, x)
 --R
 --R                 _
 --R   (6)  0.5x + 0.6
---R                                            Type: Polynomial DecimalExpansion
+--R                                           Type: Polynomial(DecimalExpansion)
 --E 6
 
 --S 7 of 7
@@ -91,7 +91,7 @@ g := gcd(p, q)
 --R
 --R              _
 --R   (7)  x + 1.3
---R                                            Type: Polynomial DecimalExpansion
+--R                                           Type: Polynomial(DecimalExpansion)
 --E 7
 )spool
 )lisp (bye)
diff --git a/src/input/defintef.input.pamphlet b/src/input/defintef.input.pamphlet
index ecd4f06..db06ce5 100644
--- a/src/input/defintef.input.pamphlet
+++ b/src/input/defintef.input.pamphlet
@@ -39,7 +39,7 @@ sin(x)**3/(sin(x)**3+cos(x)**3)
 --R   (1)  -----------------
 --R              3         3
 --R        sin(x)  + cos(x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 1
 
 --S 2 of 8
@@ -49,7 +49,7 @@ integrate(%, x = 0..%pi/2, "noPole")
 --R        2log(16) - 4log(4) + 3%pi
 --R   (2)  -------------------------
 --R                    12
---R                    Type: Union(f1: OrderedCompletion Expression Integer,...)
+--R                  Type: Union(f1: OrderedCompletion(Expression(Integer)),...)
 --E 2
 
 --S 3 of 8
@@ -61,7 +61,7 @@ x**2/(1+x**3)
 --R   (3)  ------
 --R         3
 --R        x  + 1
---R                                            Type: Fraction Polynomial Integer
+--R                                          Type: Fraction(Polynomial(Integer))
 --E 3
 
 --S 4 of 8
@@ -69,7 +69,7 @@ integrate(%, x=0..%plusInfinity)
 --R 
 --R
 --R   (4)   + infinity
---R                    Type: Union(f1: OrderedCompletion Expression Integer,...)
+--R                  Type: Union(f1: OrderedCompletion(Expression(Integer)),...)
 --E 4
 
 --S 5 of 8
@@ -79,7 +79,7 @@ exp(-x**2)*log(x)**2
 --R             2
 --R          - x       2
 --R   (5)  %e    log(x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 5
 
 --S 6 of 8
@@ -91,7 +91,7 @@ integrate(%, x=0..%plusInfinity)
 --R           2             2       2         2
 --R   (6)  --------------------------------------
 --R                           8
---R                    Type: Union(f1: OrderedCompletion Expression Integer,...)
+--R                  Type: Union(f1: OrderedCompletion(Expression(Integer)),...)
 --E 6
 
 --S 7 of 8
@@ -101,7 +101,7 @@ x * asin(x/(x+1))
 --R                 x
 --R   (7)  x asin(-----)
 --R               x + 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 7
 
 --S 8 of 8
@@ -112,7 +112,7 @@ integrate(%, x=0..1)
 --R        3\|3  - 4
 --R   (8)  ---------
 --R            6
---R                    Type: Union(f1: OrderedCompletion Expression Integer,...)
+--R                  Type: Union(f1: OrderedCompletion(Expression(Integer)),...)
 --E 8
 )spool
 )lisp (bye)
diff --git a/src/input/defintrf.input.pamphlet b/src/input/defintrf.input.pamphlet
index 335afcb..ddb71f1 100644
--- a/src/input/defintrf.input.pamphlet
+++ b/src/input/defintrf.input.pamphlet
@@ -35,7 +35,7 @@ f := (x**4 - 3*x**2 + 6)/(x**6-5*x**4+5*x**2+4)
 --R   (1)  ------------------
 --R         6     4     2
 --R        x  - 5x  + 5x  + 4
---R                                            Type: Fraction Polynomial Integer
+--R                                          Type: Fraction(Polynomial(Integer))
 --E 1
 
 --S 2 of 3
@@ -47,7 +47,7 @@ integrate(f, x = 1..2)
 --R                                               2
 --R   (2)  -----------------------------------------------
 --R                               2
---R                    Type: Union(f1: OrderedCompletion Expression Integer,...)
+--R                  Type: Union(f1: OrderedCompletion(Expression(Integer)),...)
 --E 2
 
 --S 3 of 3
diff --git a/src/input/derham.input.pamphlet b/src/input/derham.input.pamphlet
index 77f76a2..652d3b0 100644
--- a/src/input/derham.input.pamphlet
+++ b/src/input/derham.input.pamphlet
@@ -34,7 +34,7 @@ lv : List Symbol := [x,y,z]
 --R 
 --R
 --R   (2)  [x,y,z]
---R                                                            Type: List Symbol
+--R                                                           Type: List(Symbol)
 --E 2
 
 --S 3 of 33
@@ -49,7 +49,7 @@ der := DERHAM(coefRing,lv)
 R := Expression coefRing
 --R 
 --R
---R   (4)  Expression Integer
+--R   (4)  Expression(Integer)
 --R                                                                 Type: Domain
 --E 4
 
@@ -59,7 +59,7 @@ f : R := x**2*y*z-5*x**3*y**2*z**5
 --R
 --R            3 2 5    2
 --R   (5)  - 5x y z  + x y z
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 5
 
 --S 6 of 33
@@ -68,7 +68,7 @@ g : R := z**2*y*cos(z)-7*sin(x**3*y**2)*z**2
 --R
 --R            2     3 2       2
 --R   (6)  - 7z sin(x y ) + y z cos(z)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 6
 
 --S 7 of 33
@@ -77,7 +77,7 @@ h : R :=x*y*z-2*x**3*y*z**2
 --R
 --R            3   2
 --R   (7)  - 2x y z  + x y z
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 7
 
 --S 8 of 33
@@ -109,7 +109,7 @@ dz : der := generator(3)
 --R 
 --R
 --R   (11)  [dx,dy,dz]
---R                                    Type: List DeRhamComplex(Integer,[x,y,z])
+--R                                   Type: List(DeRhamComplex(Integer,[x,y,z]))
 --E 11
 
 --S 12 of 33
@@ -301,7 +301,7 @@ coefficient(gamma, dx*dy)
 --R
 --R            2     3 2       2                                   4 2 5    3
 --R   (31)  (7z sin(x y ) - y z cos(z))cos(tan(x y z) + x y z) - 5x y z  + x y z
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 31
 
 --S 32 of 33
@@ -309,7 +309,7 @@ coefficient(gamma, one)
 --R 
 --R
 --R   (32)  0
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 32
 
 --S 33 of 33
@@ -317,7 +317,7 @@ coefficient(g1,one)
 --R 
 --R
 --R   (33)  a(x,t,y,u,v,z,e)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 33
 )spool
 )lisp (bye)
diff --git a/src/input/derivefail.input.pamphlet b/src/input/derivefail.input.pamphlet
index 9588af8..f4e6f32 100644
--- a/src/input/derivefail.input.pamphlet
+++ b/src/input/derivefail.input.pamphlet
@@ -33,7 +33,7 @@ t1:=1/(sqrt(x^2+1)+2*x)^2
 --R           +------+
 --R           | 2          2
 --R        4x\|x  + 1  + 5x  + 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 1
 
 --S 2 of 18
@@ -72,7 +72,7 @@ integrate(t1,x)
 --R                      +------+
 --R         3        +-+ | 2              4     2      +-+
 --R     (36x  - 12x)\|3 \|x  + 1  + (- 36x  - 6x  + 6)\|3
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 2
 
 --S 3 of 18
@@ -84,7 +84,7 @@ t2:=1/(sqrt(x^2-1)*(3*x^2-4)^2)
 --R                          +------+
 --R           4      2       | 2
 --R        (9x  - 24x  + 16)\|x  - 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 3
 
 --S 4 of 18
@@ -107,7 +107,7 @@ integrate(t2,x)
 --R                    +------+
 --R          3         | 2            4       2
 --R     (192x  - 256x)\|x  - 1  - 192x  + 352x  - 128
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 4
 
 --S 5 of 18
@@ -118,7 +118,7 @@ t3:=1/(2*sqrt(x)+sqrt(x+1))^2
 --R   (5)  ----------------------
 --R          +-+ +-----+
 --R        4\|x \|x + 1  + 5x + 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 5
 
 --S 6 of 18
@@ -135,7 +135,7 @@ t4:=sqrt(x^2-1)/(x-%i)^2
 --R   (6)  --------------
 --R         2
 --R        x  - 2%i x - 1
---R                                             Type: Expression Complex Integer
+--R                                           Type: Expression(Complex(Integer))
 --E 7
 
 --S 8 of 18
@@ -166,7 +166,7 @@ integrate(t4,x)
 --R                +------+
 --R                | 2          2
 --R     (2x - 2%i)\|x  - 1  - 2x  + 2%i x
---R                                  Type: Union(Expression Complex Integer,...)
+--R                                Type: Union(Expression(Complex(Integer)),...)
 --E 8
 
 --S 9 of 18
@@ -178,7 +178,7 @@ t5:=1/(sqrt(x^2-1)*(x^2+1)^2)
 --R                       +------+
 --R          4     2      | 2
 --R        (x  + 2x  + 1)\|x  - 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 9
 
 --S 10 of 18
@@ -205,7 +205,7 @@ integrate(t5,x)
 --R                      +------+
 --R         3        +-+ | 2              4     2      +-+
 --R     (16x  + 16x)\|2 \|x  - 1  + (- 16x  - 8x  + 8)\|2
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 10
 
 --S 11 of 18
@@ -216,7 +216,7 @@ t6:=1/(sqrt(x-1)*(sqrt(x-1)+2*sqrt(x))^2)
 --R   (10)  -------------------------------
 --R                  +-+            +-----+
 --R         (4x - 4)\|x  + (5x - 1)\|x - 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 11
 
 --S 12 of 18
@@ -232,7 +232,7 @@ t7:=1/(sqrt(x^2-1)*(sqrt(x^2-1)+sqrt(x))^2)
 --R                      +------+
 --R           2          | 2           2      +-+
 --R         (x  + x - 1)\|x  - 1  + (2x  - 2)\|x
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 13
 
 --S 14 of 18
@@ -251,7 +251,7 @@ t8:=sqrt(sqrt(x^4+1)+x^2)/((x+1)^2*sqrt(x^4+1))
 --R                       +------+
 --R           2           | 4
 --R         (x  + 2x + 1)\|x  + 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 15
 
 --S 16 of 18
@@ -267,7 +267,7 @@ t9:=((x-1)^(3/2)+(x+1)^(3/2))/((x+1)^(3/2)*(x-1)^(3/2))
 --R   (13)  ---------------------------------
 --R                2      +-----+ +-----+
 --R              (x  - 1)\|x - 1 \|x + 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 17
 
 --S 18 of 18 two possible answers, both are ok
@@ -279,7 +279,7 @@ integrate(t9,x)
 --R   (14)  ---------------------------------------
 --R                           2
 --R                          x  - 1
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 18
 
 )spool
diff --git a/src/input/dfloat.input.pamphlet b/src/input/dfloat.input.pamphlet
index 59b3cca..ec858de 100644
--- a/src/input/dfloat.input.pamphlet
+++ b/src/input/dfloat.input.pamphlet
@@ -28,7 +28,7 @@ machineFraction(2.71828)
 --R        382563899846521
 --R   (1)  ---------------
 --R        140737488355328
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 1
 
 --S 2 of 10
@@ -38,7 +38,7 @@ machineFraction(2.71828@DoubleFloat)
 --R        382563899846521
 --R   (2)  ---------------
 --R        140737488355328
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 2
 
 --S 3 of 10
@@ -48,7 +48,7 @@ machineFraction(2.71828 :: DoubleFloat)
 --R        382563899846521
 --R   (3)  ---------------
 --R        140737488355328
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 3
 
 --S 4 of 10
@@ -58,7 +58,7 @@ machineFraction(eApprox : DoubleFloat := 2.71828)
 --R        382563899846521
 --R   (4)  ---------------
 --R        140737488355328
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 4
 
 --S 5 of 10
@@ -78,7 +78,7 @@ avg l ==
 --S 7 of 10
 avg []
 --R 
---R   Compiling function avg with type List DoubleFloat -> DoubleFloat 
+--R   Compiling function avg with type List(DoubleFloat) -> DoubleFloat 
 --R
 --R   (7)  0.
 --R                                                            Type: DoubleFloat
@@ -91,7 +91,7 @@ machineFraction(avg [3.4,9.7,-6.8])
 --R        1182194902184755
 --R   (8)  ----------------
 --R         562949953421312
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 8
 
 --S 9 of 10
@@ -101,7 +101,7 @@ machineFraction(cos(3.1415926)$DoubleFloat)
 --R          9007199254740979
 --R   (9)  - ----------------
 --R          9007199254740992
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 9
 
 --S 10 of 10
@@ -111,7 +111,7 @@ machineFraction(cos(3.1415926 :: DoubleFloat))
 --R           9007199254740979
 --R   (10)  - ----------------
 --R           9007199254740992
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 10
 
 )spool
diff --git a/src/input/dhmatrix.input.pamphlet b/src/input/dhmatrix.input.pamphlet
index 8daf799..c2833d3 100644
--- a/src/input/dhmatrix.input.pamphlet
+++ b/src/input/dhmatrix.input.pamphlet
@@ -40,7 +40,7 @@ t2:=identity()$t1
 --R        |0.  0.  1.  0.|
 --R        |              |
 --R        +0.  0.  0.  1.+
---R                                    Type: DenavitHartenbergMatrix DoubleFloat
+--R                                   Type: DenavitHartenbergMatrix(DoubleFloat)
 --E 2
 
 \end{chunk}
@@ -62,7 +62,7 @@ t3:=rotatex(30)
 --R        |    2      2    |
 --R        |                |
 --R        +0   0     0    1+
---R                             Type: DenavitHartenbergMatrix Expression Integer
+--R                           Type: DenavitHartenbergMatrix(Expression(Integer))
 --E 3
 
 \end{chunk}
@@ -84,7 +84,7 @@ t4:=rotatey(30)
 --R        |  2        2    |
 --R        |                |
 --R        + 0    0   0    1+
---R                             Type: DenavitHartenbergMatrix Expression Integer
+--R                           Type: DenavitHartenbergMatrix(Expression(Integer))
 --E 4
 
 \end{chunk}
@@ -106,7 +106,7 @@ t5:=rotatez(30)
 --R        | 0     0    1  0|
 --R        |                |
 --R        + 0     0    0  1+
---R                             Type: DenavitHartenbergMatrix Expression Integer
+--R                           Type: DenavitHartenbergMatrix(Expression(Integer))
 --E 5
 
 \end{chunk}
@@ -122,7 +122,7 @@ t6:=scale(0.5,0.5,0.5)
 --R        |0.0  0.0  0.5  0.0|
 --R        |                  |
 --R        +0.0  0.0  0.0  1.0+
---R                                          Type: DenavitHartenbergMatrix Float
+--R                                         Type: DenavitHartenbergMatrix(Float)
 --E 6
 
 \end{chunk}
@@ -138,7 +138,7 @@ t7:=translate(2.0,2.0,2.0)
 --R        |0.0  0.0  1.0  2.0|
 --R        |                  |
 --R        +0.0  0.0  0.0  1.0+
---R                                          Type: DenavitHartenbergMatrix Float
+--R                                         Type: DenavitHartenbergMatrix(Float)
 --E 7
 
 \end{chunk}
@@ -148,7 +148,7 @@ This is a point on the X axis  can move around the plane
 t8:Point(DoubleFloat):=[4.0,0.0,0.0]$List(DoubleFloat)
 --R
 --R   (8)  [4.,0.,0.]
---R                                                      Type: Point DoubleFloat
+--R                                                     Type: Point(DoubleFloat)
 --E 8
 
 \end{chunk}
@@ -164,7 +164,7 @@ t9:=translate(4.0,0.0,0.0)
 --R        |0.0  0.0  1.0  0.0|
 --R        |                  |
 --R        +0.0  0.0  0.0  1.0+
---R                                          Type: DenavitHartenbergMatrix Float
+--R                                         Type: DenavitHartenbergMatrix(Float)
 --E 9
 
 \end{chunk}
@@ -174,7 +174,7 @@ and we apply the transformation so t8 is now moved
 t10:=t9*t8
 --R
 --R   (10)  [8.,0.,0.]
---R                                                      Type: Point DoubleFloat
+--R                                                     Type: Point(DoubleFloat)
 --E 10
 
 \end{chunk}
@@ -185,7 +185,7 @@ which will move the point from the X axis to the Y axis.
 t11:=rotatez(90)*t10
 --R
 --R   (11)  [0.,8.,0.]
---R                                           Type: Point Expression DoubleFloat
+--R                                         Type: Point(Expression(DoubleFloat))
 --E 11
 
 \end{chunk}
@@ -195,7 +195,7 @@ and we can scale the point by 1/2 to shorten along the Y axis
 t12:=scale(0.0,0.5,0.0)*t11
 --R
 --R   (12)  [0.,4.,0.]
---R                                           Type: Point Expression DoubleFloat
+--R                                         Type: Point(Expression(DoubleFloat))
 --E 12
 
 \end{chunk}
@@ -206,7 +206,7 @@ which will move the point from the Y axis to the Z axis.
 t13:=rotatex(90)*t12
 --R
 --R   (13)  [0.,0.,4.]
---R                                           Type: Point Expression DoubleFloat
+--R                                         Type: Point(Expression(DoubleFloat))
 --E 13
 
 \end{chunk}
@@ -218,7 +218,7 @@ We are now back to the original point
 t14:=rotatey(90)*t13
 --R
 --R   (14)  [4.,0.,0.]
---R                                           Type: Point Expression DoubleFloat
+--R                                         Type: Point(Expression(DoubleFloat))
 --E 14
 
 \end{chunk}
@@ -236,7 +236,7 @@ t15:=rotatey(90)*rotatex(90)*scale(0.0,0.5,0.0)*_
 --R         |0.0  0.0  0.0  0.0|
 --R         |                  |
 --R         +0.0  0.0  0.0  1.0+
---R                               Type: DenavitHartenbergMatrix Expression Float
+--R                             Type: DenavitHartenbergMatrix(Expression(Float))
 --E 15
 
 \end{chunk}
@@ -248,7 +248,7 @@ original point is moved around the space back to its original point.
 t16:=t15*t8
 --R
 --R   (16)  [4.,0.,0.]
---R                                           Type: Point Expression DoubleFloat
+--R                                         Type: Point(Expression(DoubleFloat))
 --E 16
 
 )spool 
diff --git a/src/input/dhtri.input.pamphlet b/src/input/dhtri.input.pamphlet
index ec11df1..cec10af 100644
--- a/src/input/dhtri.input.pamphlet
+++ b/src/input/dhtri.input.pamphlet
@@ -36,8 +36,8 @@ tri2tri(t1: List Point DoubleFloat, t2: List Point DoubleFloat): _
   n2 := triangleNormal(t2)
   tet2tet(concat(t1, n1), concat(t2, n2))
 --R 
---R   Function declaration tri2tri : (List Point DoubleFloat,List Point 
---R      DoubleFloat) -> DenavitHartenbergMatrix DoubleFloat has been 
+--R   Function declaration tri2tri : (List(Point(DoubleFloat)),List(Point(
+--R      DoubleFloat))) -> DenavitHartenbergMatrix(DoubleFloat) has been 
 --R      added to workspace.
 --R                                                                   Type: Void
 --E 1
@@ -54,8 +54,8 @@ tet2tet(t1: List Point DoubleFloat, t2: List Point DoubleFloat): _
   m2 := makeColumnMatrix t2
   m2 * inverse(m1)
 --R 
---R   Function declaration tet2tet : (List Point DoubleFloat,List Point 
---R      DoubleFloat) -> DenavitHartenbergMatrix DoubleFloat has been 
+--R   Function declaration tet2tet : (List(Point(DoubleFloat)),List(Point(
+--R      DoubleFloat))) -> DenavitHartenbergMatrix(DoubleFloat) has been 
 --R      added to workspace.
 --R                                                                   Type: Void
 --E 2
diff --git a/src/input/distexpr.input.pamphlet b/src/input/distexpr.input.pamphlet
index 014bd1a..44901af 100644
--- a/src/input/distexpr.input.pamphlet
+++ b/src/input/distexpr.input.pamphlet
@@ -86,7 +86,7 @@ ex1:=(2*log(x)+3*exp(y))*(4*sin(z)+2*log(x))
 --R
 --R                       y                 2      y
 --R   (1)  (8log(x) + 12%e )sin(z) + 4log(x)  + 6%e log(x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 1
 
 --S 2 of 6
@@ -95,7 +95,7 @@ ex2:=8*log(x)*sin(z)+4*log(x)^2+12*exp(y)*sin(z)+6*exp(y)*log(x)
 --R
 --R                       y                 2      y
 --R   (2)  (8log(x) + 12%e )sin(z) + 4log(x)  + 6%e log(x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 2
 
 --S 3 of 6
@@ -113,7 +113,7 @@ ex1::DistributedExpression(Integer)
 --R
 --R           y             y                2
 --R   (4)  6%e log(x) + 12%e sin(z) + 4log(x)  + 8log(x)sin(z)
---R                                          Type: DistributedExpression Integer
+--R                                         Type: DistributedExpression(Integer)
 --E 4
 
 --S 5 of 6
@@ -121,7 +121,7 @@ ex1::DistributedExpression(Integer)
 --R 
 --R
 --R   (5)  8a c + 10a d + 12b c + 15b d + 4c + 5d
---R                                          Type: DistributedExpression Integer
+--R                                         Type: DistributedExpression(Integer)
 --E 5
 
 --S 6 of 6
@@ -129,7 +129,7 @@ ex1::DistributedExpression(Integer)
 --R 
 --R
 --R   (6)  (15b + 10a + 5)d + (12b + 8a + 4)c
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 6
 
 )spool 
diff --git a/src/input/divisor.input.pamphlet b/src/input/divisor.input.pamphlet
index 3194f0b..83b0254 100644
--- a/src/input/divisor.input.pamphlet
+++ b/src/input/divisor.input.pamphlet
@@ -25,7 +25,7 @@
 P0 := UP(x, FRAC INT)
 --R 
 --R
---R   (1)  UnivariatePolynomial(x,Fraction Integer)
+--R   (1)  UnivariatePolynomial(x,Fraction(Integer))
 --R                                                                 Type: Domain
 --E 1
 
@@ -34,7 +34,7 @@ P1 := UP(y, FRAC P0)
 --R 
 --R
 --R   (2)
---R   UnivariatePolynomial(y,Fraction UnivariatePolynomial(x,Fraction Integer))
+--R   UnivariatePolynomial(y,Fraction(UnivariatePolynomial(x,Fraction(Integer))))
 --R                                                                 Type: Domain
 --E 2
 
@@ -46,9 +46,9 @@ R := RADFF(FRAC INT, P0, P1, 1 + x**8, 2)
 --R 
 --R
 --R   (3)
---R  RadicalFunctionField(Fraction Integer,UnivariatePolynomial(x,Fraction Integer
---R  ),UnivariatePolynomial(y,Fraction UnivariatePolynomial(x,Fraction Integer)),x
---R  **8+1,2)
+--R  RadicalFunctionField(Fraction(Integer),UnivariatePolynomial(x,Fraction(Intege
+--R  r)),UnivariatePolynomial(y,Fraction(UnivariatePolynomial(x,Fraction(Integer))
+--R  )),x^8+1,2)
 --R                                                                 Type: Domain
 --E 3
 
@@ -65,11 +65,11 @@ fd := FDIV(FRAC INT, P0, P1, R)
 --R 
 --R
 --R   (5)
---R  FiniteDivisor(Fraction Integer,UnivariatePolynomial(x,Fraction Integer),Univa
---R  riatePolynomial(y,Fraction UnivariatePolynomial(x,Fraction Integer)),RadicalF
---R  unctionField(Fraction Integer,UnivariatePolynomial(x,Fraction Integer),Univar
---R  iatePolynomial(y,Fraction UnivariatePolynomial(x,Fraction Integer)),x**8+1,2)
---R  )
+--R  FiniteDivisor(Fraction(Integer),UnivariatePolynomial(x,Fraction(Integer)),Uni
+--R  variatePolynomial(y,Fraction(UnivariatePolynomial(x,Fraction(Integer)))),Radi
+--R  calFunctionField(Fraction(Integer),UnivariatePolynomial(x,Fraction(Integer)),
+--R  UnivariatePolynomial(y,Fraction(UnivariatePolynomial(x,Fraction(Integer)))),x
+--R  ^8+1,2))
 --R                                                                 Type: Domain
 --E 5
 
diff --git a/src/input/dmp.input.pamphlet b/src/input/dmp.input.pamphlet
index 8d13b8a..f05f7bc 100644
--- a/src/input/dmp.input.pamphlet
+++ b/src/input/dmp.input.pamphlet
@@ -35,7 +35,7 @@ d1 := -4*z + 4*y**2*x + 16*x**2 + 1
 --R
 --R                 2       2
 --R   (2)  - 4z + 4y x + 16x  + 1
---R            Type: DistributedMultivariatePolynomial([z,y,x],Fraction Integer)
+--R           Type: DistributedMultivariatePolynomial([z,y,x],Fraction(Integer))
 --E 2
 
 --S 3 of 8
@@ -44,7 +44,7 @@ d2 := 2*z*y**2 + 4*x + 1
 --R
 --R            2
 --R   (3)  2z y  + 4x + 1
---R            Type: DistributedMultivariatePolynomial([z,y,x],Fraction Integer)
+--R           Type: DistributedMultivariatePolynomial([z,y,x],Fraction(Integer))
 --E 3
 
 --S 4 of 8
@@ -53,7 +53,7 @@ d3 := 2*z*x**2 - 2*y**2 - x
 --R
 --R            2     2
 --R   (4)  2z x  - 2y  - x
---R            Type: DistributedMultivariatePolynomial([z,y,x],Fraction Integer)
+--R           Type: DistributedMultivariatePolynomial([z,y,x],Fraction(Integer))
 --E 4
 
 --S 5 of 8
@@ -70,7 +70,7 @@ groebner [d1,d2,d3]
 --R     7   29  6   17  4   11  3    1  2   15     1
 --R    x  + -- x  - -- x  - -- x  + -- x  + -- x + -]
 --R          4      16       8      32      16     4
---R       Type: List DistributedMultivariatePolynomial([z,y,x],Fraction Integer)
+--R     Type: List(DistributedMultivariatePolynomial([z,y,x],Fraction(Integer)))
 --E 5
 
 --S 6 of 8
@@ -85,7 +85,7 @@ groebner [d1,d2,d3]
 --R
 --R            2     2
 --R   (7)  2z x  - 2y  - x
---R Type: HomogeneousDistributedMultivariatePolynomial([z,y,x],Fraction Integer)
+--RType: HomogeneousDistributedMultivariatePolynomial([z,y,x],Fraction(Integer))
 --E 7
 
 --S 8 of 8
@@ -102,7 +102,7 @@ groebner [n1,n2,n3]
 --R     2     2     2   1     3
 --R    z  - 4y  + 2x  - - z - - x]
 --R                     4     2
---RType: List HomogeneousDistributedMultivariatePolynomial([z,y,x],Fraction Integer)
+--RType: List(HomogeneousDistributedMultivariatePolynomial([z,y,x],Fraction(Integer)))
 --E 8
 )spool
 )lisp (bye)
diff --git a/src/input/donsimple.input.pamphlet b/src/input/donsimple.input.pamphlet
index 9d0dab6..f145ac7 100644
--- a/src/input/donsimple.input.pamphlet
+++ b/src/input/donsimple.input.pamphlet
@@ -60,7 +60,7 @@ donSimple(): Exports == Implementation where
 simple(1/x,x=2..3)
 --R
 --R   (1)  - 0.1666666666 666666667
---R                                                       Type: Expression Float
+--R                                                      Type: Expression(Float)
 --E 1
 
 --S 2 of 2
diff --git a/src/input/dop.input.pamphlet b/src/input/dop.input.pamphlet
index e82d394..c2c5444 100644
--- a/src/input/dop.input.pamphlet
+++ b/src/input/dop.input.pamphlet
@@ -26,10 +26,9 @@
 --R 
 --R
 --RThere are 2 exposed functions called binaryTree :
---R   [1] (BinaryTree D1,D1,BinaryTree D1) -> BinaryTree D1 from 
---R            BinaryTree D1
---R            if D1 has SETCAT
---R   [2] D1 -> BinaryTree D1 from BinaryTree D1 if D1 has SETCAT
+--R   [1] (BinaryTree(D1),D1,BinaryTree(D1)) -> BinaryTree(D1)
+--R            from BinaryTree(D1) if D1 has SETCAT
+--R   [2] D1 -> BinaryTree(D1) from BinaryTree(D1) if D1 has SETCAT
 --R
 --RExamples of binaryTree from BinaryTree
 --R
@@ -47,13 +46,13 @@
 --R
 --RThere is one exposed function called rationalPoint? :
 --R   [1] (D2,D2) -> Boolean from D
---R            if D has FFCAT(D2,D3,D4) and D2 has UFD and D3 has UPOLYC 
---R            D2 and D4 has UPOLYC FRAC D3
+--R            if D has FFCAT(D2,D3,D4) and D2 has UFD and D3 has UPOLYC(
+--R            D2) and D4 has UPOLYC(FRAC(D3))
 --R
 --RThere is one unexposed function called rationalPoint? :
 --R   [1] (D2,D2) -> Boolean from FunctionFieldCategory&(D3,D2,D4,D5)
---R            if D2 has UFD and D4 has UPOLYC D2 and D5 has UPOLYC FRAC 
---R            D4 and D3 has FFCAT(D2,D4,D5)
+--R            if D2 has UFD and D4 has UPOLYC(D2) and D5 has UPOLYC(FRAC(
+--R            D4)) and D3 has FFCAT(D2,D4,D5)
 --R
 --RExamples of rationalPoint? from FunctionFieldCategory&
 --R
@@ -84,18 +83,18 @@
 --R   [1] (D,Integer) -> D1 from D
 --R            if D has FAMONC(D1,D3) and D3 has CABMON and D1 has SETCAT
 --R            
---R   [2] (Factored D1,Integer) -> D1 from Factored D1 if D1 has INTDOM
---R         
+--R   [2] (Factored(D1),Integer) -> D1 from Factored(D1) if D1 has INTDOM
+--R            
 --R
 --RThere are 4 unexposed functions called nthFactor :
---R   [1] (FreeGroup D1,Integer) -> D1 from FreeGroup D1 if D1 has SETCAT
---R            
---R   [2] (FreeMonoid D1,Integer) -> D1 from FreeMonoid D1 if D1 has 
+--R   [1] (FreeGroup(D1),Integer) -> D1 from FreeGroup(D1) if D1 has 
+--R            SETCAT
+--R   [2] (FreeMonoid(D1),Integer) -> D1 from FreeMonoid(D1) if D1 has 
 --R            SETCAT
 --R   [3] (ListMonoidOps(D1,D3,D4),Integer) -> D1 from ListMonoidOps(D1,D3
 --R            ,D4)
 --R            if D1 has SETCAT and D3 has ABELMON and D4: D3
---R   [4] (OrderedFreeMonoid D1,Integer) -> D1 from OrderedFreeMonoid D1
+--R   [4] (OrderedFreeMonoid(D1),Integer) -> D1 from OrderedFreeMonoid(D1)
 --R            if D1 has ORDSET
 --R
 --RExamples of nthFactor from FreeAbelianMonoidCategory
@@ -130,7 +129,7 @@
 --RThere are 2 exposed functions called qsetelt! :
 --R   [1] (D,Integer,Integer,D1) -> D1 from D
 --R            if D has ARR2CAT(D1,D3,D4) and D1 has TYPE and D3 has FLAGG
---R            D1 and D4 has FLAGG D1
+--R            (D1) and D4 has FLAGG(D1)
 --R   [2] (D,D2,D1) -> D1 from D
 --R            if D has shallowlyMutable and D has ELTAGG(D2,D1) and D2 
 --R            has SETCAT and D1 has TYPE
@@ -151,7 +150,7 @@
 --R
 --RThere is one unexposed function called cycleElt :
 --R   [1] D1 -> Union(D1,"failed") from CyclicStreamTools(D2,D1)
---R            if D2 has TYPE and D1 has LZSTAGG D2
+--R            if D2 has TYPE and D1 has LZSTAGG(D2)
 --R
 --RExamples of cycleElt from CyclicStreamTools
 --R
@@ -168,7 +167,7 @@
 --R 
 --R
 --RThere is one exposed function called cyclicEntries :
---R   [1] Tree D2 -> List Tree D2 from Tree D2 if D2 has SETCAT
+--R   [1] Tree(D2) -> List(Tree(D2)) from Tree(D2) if D2 has SETCAT
 --R
 --RExamples of cyclicEntries from Tree
 --R
@@ -182,9 +181,9 @@
 --R 
 --R
 --RThere are 2 exposed functions called oneDimensionalArray :
---R   [1] (NonNegativeInteger,D2) -> OneDimensionalArray D2
---R            from OneDimensionalArray D2 if D2 has TYPE
---R   [2] List D2 -> OneDimensionalArray D2 from OneDimensionalArray D2
+--R   [1] (NonNegativeInteger,D2) -> OneDimensionalArray(D2)
+--R            from OneDimensionalArray(D2) if D2 has TYPE
+--R   [2] List(D2) -> OneDimensionalArray(D2) from OneDimensionalArray(D2)
 --R            if D2 has TYPE
 --R
 --RExamples of oneDimensionalArray from OneDimensionalArray
@@ -228,8 +227,8 @@
 --R 
 --R
 --RThere is one exposed function called sqfrFactor :
---R   [1] (D1,Integer) -> Factored D1 from Factored D1 if D1 has INTDOM
---R         
+--R   [1] (D1,Integer) -> Factored(D1) from Factored(D1) if D1 has INTDOM
+--R            
 --R
 --RExamples of sqfrFactor from Factored
 --R
@@ -243,9 +242,9 @@
 --R 
 --R
 --RThere is one exposed function called integralMatrix :
---R   [1]  -> Matrix Fraction D3 from D
---R            if D has FFCAT(D2,D3,D4) and D2 has UFD and D3 has UPOLYC 
---R            D2 and D4 has UPOLYC FRAC D3
+--R   [1]  -> Matrix(Fraction(D3)) from D
+--R            if D has FFCAT(D2,D3,D4) and D2 has UFD and D3 has UPOLYC(
+--R            D2) and D4 has UPOLYC(FRAC(D3))
 --R
 --RExamples of integralMatrix from FunctionFieldCategory
 --R
@@ -261,10 +260,9 @@
 --R 
 --R
 --RThere are 2 exposed functions called ptree :
---R   [1] (PendantTree D1,PendantTree D1) -> PendantTree D1 from 
---R            PendantTree D1
---R            if D1 has SETCAT
---R   [2] D1 -> PendantTree D1 from PendantTree D1 if D1 has SETCAT
+--R   [1] (PendantTree(D1),PendantTree(D1)) -> PendantTree(D1)
+--R            from PendantTree(D1) if D1 has SETCAT
+--R   [2] D1 -> PendantTree(D1) from PendantTree(D1) if D1 has SETCAT
 --R
 --RExamples of ptree from PendantTree
 --R
@@ -280,27 +278,28 @@
 --R 
 --R
 --RThere are 13 exposed functions called insert! :
---R   [1] (D1,ArrayStack D1) -> ArrayStack D1 from ArrayStack D1 if D1 has
+--R   [1] (D1,ArrayStack(D1)) -> ArrayStack(D1) from ArrayStack(D1)
+--R            if D1 has SETCAT
+--R   [2] (D1,D) -> D from D if D has BGAGG(D1) and D1 has TYPE
+--R   [3] (D1,BinarySearchTree(D1)) -> BinarySearchTree(D1)
+--R            from BinarySearchTree(D1) if D1 has ORDSET
+--R   [4] (D1,BinaryTournament(D1)) -> BinaryTournament(D1)
+--R            from BinaryTournament(D1) if D1 has ORDSET
+--R   [5] (D1,Dequeue(D1)) -> Dequeue(D1) from Dequeue(D1) if D1 has 
 --R            SETCAT
---R   [2] (D1,D) -> D from D if D has BGAGG D1 and D1 has TYPE
---R   [3] (D1,BinarySearchTree D1) -> BinarySearchTree D1
---R            from BinarySearchTree D1 if D1 has ORDSET
---R   [4] (D1,BinaryTournament D1) -> BinaryTournament D1
---R            from BinaryTournament D1 if D1 has ORDSET
---R   [5] (D1,Dequeue D1) -> Dequeue D1 from Dequeue D1 if D1 has SETCAT
+--R   [6] (D,D,Integer) -> D from D if D has ELAGG(D2) and D2 has TYPE
+--R   [7] (D1,D,Integer) -> D from D if D has ELAGG(D1) and D1 has TYPE
 --R         
---R   [6] (D,D,Integer) -> D from D if D has ELAGG D2 and D2 has TYPE
---R   [7] (D1,D,Integer) -> D from D if D has ELAGG D1 and D1 has TYPE
---R   [8] (D1,Heap D1) -> Heap D1 from Heap D1 if D1 has ORDSET
---R   [9] Record(key: Record(var: Symbol,fn: Expression DoubleFloat,range
---R            : Segment OrderedCompletion DoubleFloat,abserr: DoubleFloat,
+--R   [8] (D1,Heap(D1)) -> Heap(D1) from Heap(D1) if D1 has ORDSET
+--R   [9] Record(key: Record(var: Symbol,fn: Expression(DoubleFloat),range
+--R            : Segment(OrderedCompletion(DoubleFloat)),abserr: DoubleFloat,
 --R            relerr: DoubleFloat),entry: Record(endPointContinuity: Union(
 --R            continuous: Continuous at the end points,lowerSingular: 
 --R            There is a singularity at the lower end point,upperSingular: 
 --R            There is a singularity at the upper end point,bothSingular: 
 --R            There are singularities at both end points,notEvaluated: 
 --R            End point continuity not yet evaluated),singularitiesStream: 
---R            Union(str: Stream DoubleFloat,notEvaluated: 
+--R            Union(str: Stream(DoubleFloat),notEvaluated: 
 --R            Internal singularities not yet evaluated),range: Union(finite: 
 --R            The range is finite,lowerInfinite: 
 --R            The bottom of range is infinite,upperInfinite: 
@@ -309,16 +308,16 @@
 --R            Range not yet evaluated))) -> IntegrationFunctionsTable
 --R            from IntegrationFunctionsTable
 --R   [10] (D1,D,NonNegativeInteger) -> D from D
---R            if D has MDAGG D1 and D1 has SETCAT
+--R            if D has MDAGG(D1) and D1 has SETCAT
 --R   [11] Record(key: Record(xinit: DoubleFloat,xend: DoubleFloat,fn: 
---R            Vector Expression DoubleFloat,yinit: List DoubleFloat,intvals: 
---R            List DoubleFloat,g: Expression DoubleFloat,abserr: DoubleFloat,
---R            relerr: DoubleFloat),entry: Record(stiffness: Float,stability: 
---R            Float,expense: Float,accuracy: Float,intermediateResults: Float))
---R             -> ODEIntensityFunctionsTable
+--R            Vector(Expression(DoubleFloat)),yinit: List(DoubleFloat),intvals
+--R            : List(DoubleFloat),g: Expression(DoubleFloat),abserr: 
+--R            DoubleFloat,relerr: DoubleFloat),entry: Record(stiffness: Float,
+--R            stability: Float,expense: Float,accuracy: Float,
+--R            intermediateResults: Float)) -> ODEIntensityFunctionsTable
 --R            from ODEIntensityFunctionsTable
---R   [12] (D1,Queue D1) -> Queue D1 from Queue D1 if D1 has SETCAT
---R   [13] (D1,Stack D1) -> Stack D1 from Stack D1 if D1 has SETCAT
+--R   [12] (D1,Queue(D1)) -> Queue(D1) from Queue(D1) if D1 has SETCAT
+--R   [13] (D1,Stack(D1)) -> Stack(D1) from Stack(D1) if D1 has SETCAT
 --R
 --RThere is one unexposed function called insert! :
 --R   [1] (D2,D3) -> Void from TabulatedComputationPackage(D2,D3)
@@ -393,42 +392,33 @@
 
 --S 14 of 127
 )d op genus
---R 
 --R
---RThere are 5 exposed functions called genus :
+--RThere are 3 exposed functions called genus :
 --R   [1] D6 -> NonNegativeInteger
 --R            from DesingTreePackage(D7,D8,D6,D9,D10,D11,D12,D1,D2,D3,D4)
---R            if D7 has FIELD and D8: LIST SYMBOL and D6 has POLYCAT(D7,
---R            D9,OVAR D8) and D9 has DIRPCAT(# D8,NNI) and D10 has 
---R            PRSPCAT D7 and D11 has LOCPOWC D7 and D12 has PLACESC(D7,
---R            D11) and D1 has DIVCAT D12 and D2 has INFCLCT(D7,D8,D6,D9,
---R            D10,D11,D12,D1,D4) and D4 has BLMETCT and D3 has DSTRCAT D2
---R            
+--R            if D7 has FIELD and D8: LIST(SYMBOL) and D6 has POLYCAT(D7,
+--R            D9,OVAR(D8)) and D9 has DIRPCAT(#(D8),NNI) and D10 has 
+--R            PRSPCAT(D7) and D11 has LOCPOWC(D7) and D12 has PLACESC(D7,
+--R            D11) and D1 has DIVCAT(D12) and D2 has INFCLCT(D7,D8,D6,D9,
+--R            D10,D11,D12,D1,D4) and D4 has BLMETCT and D3 has DSTRCAT(D2
+--R            )
 --R   [2]  -> NonNegativeInteger from D
---R            if D has FFCAT(D2,D3,D4) and D2 has UFD and D3 has UPOLYC 
---R            D2 and D4 has UPOLYC FRAC D3
+--R            if D has FFCAT(D2,D3,D4) and D2 has UFD and D3 has UPOLYC(
+--R            D2) and D4 has UPOLYC(FRAC(D3))
 --R   [3]  -> NonNegativeInteger
 --R            from GeneralPackageForAlgebraicFunctionField(D6,D7,D8,D9,
 --R            D10,D11,D12,D1,D2,D3,D4)
---R            if D6 has FIELD and D7: LIST SYMBOL and D8 has POLYCAT(D6,
---R            D9,OVAR D7) and D9 has DIRPCAT(# D7,NNI) and D10 has 
---R            PRSPCAT D6 and D11 has LOCPOWC D6 and D12 has PLACESC(D6,
---R            D11) and D1 has DIVCAT D12 and D2 has INFCLCT(D6,D7,D8,D9,
---R            D10,D11,D12,D1,D4) and D4 has BLMETCT and D3 has DSTRCAT D2
---R            
---R   [4]  -> NonNegativeInteger
---R            from PackageForAlgebraicFunctionFieldOverFiniteField(D2,D3,
---R            D4)
---R            if D2 has FFIELDC and D3: LIST SYMBOL and D4 has BLMETCT
---R         
---R   [5]  -> NonNegativeInteger from PackageForAlgebraicFunctionField(D2,
---R            D3,D4)
---R            if D2 has FIELD and D3: LIST SYMBOL and D4 has BLMETCT
+--R            if D6 has FIELD and D7: LIST(SYMBOL) and D8 has POLYCAT(D6,
+--R            D9,OVAR(D7)) and D9 has DIRPCAT(#(D7),NNI) and D10 has 
+--R            PRSPCAT(D6) and D11 has LOCPOWC(D6) and D12 has PLACESC(D6,
+--R            D11) and D1 has DIVCAT(D12) and D2 has INFCLCT(D6,D7,D8,D9,
+--R            D10,D11,D12,D1,D4) and D4 has BLMETCT and D3 has DSTRCAT(D2
+--R            )
 --R
 --RThere is one unexposed function called genus :
 --R   [1]  -> NonNegativeInteger from FunctionFieldCategory&(D2,D3,D4,D5)
---R            if D3 has UFD and D4 has UPOLYC D3 and D5 has UPOLYC FRAC 
---R            D4 and D2 has FFCAT(D3,D4,D5)
+--R            if D3 has UFD and D4 has UPOLYC(D3) and D5 has UPOLYC(FRAC(
+--R            D4)) and D2 has FFCAT(D3,D4,D5)
 --R
 --RExamples of genus from DesingTreePackage
 --R
@@ -451,12 +441,6 @@
 --R
 --RExamples of genus from GeneralPackageForAlgebraicFunctionField
 --R
---R
---RExamples of genus from PackageForAlgebraicFunctionFieldOverFiniteField
---R
---R
---RExamples of genus from PackageForAlgebraicFunctionField
---R
 --E 14
 
 --S 15 of 127
@@ -479,7 +463,7 @@
 --R
 --RThere is one unexposed function called computeCycleLength :
 --R   [1] D2 -> NonNegativeInteger from CyclicStreamTools(D3,D2)
---R            if D3 has TYPE and D2 has LZSTAGG D3
+--R            if D3 has TYPE and D2 has LZSTAGG(D3)
 --R
 --RExamples of computeCycleLength from CyclicStreamTools
 --R
@@ -494,9 +478,9 @@
 --R 
 --R
 --RThere is one exposed function called findCycle :
---R   [1] (NonNegativeInteger,Stream D3) -> Record(cycle?: Boolean,prefix
+--R   [1] (NonNegativeInteger,Stream(D3)) -> Record(cycle?: Boolean,prefix
 --R            : NonNegativeInteger,period: NonNegativeInteger)
---R            from Stream D3 if D3 has TYPE
+--R            from Stream(D3) if D3 has TYPE
 --R
 --RExamples of findCycle from Stream
 --R
@@ -512,108 +496,109 @@
 --R 
 --R
 --RThere are 31 exposed functions called draw :
---R   [1] ((DoubleFloat -> DoubleFloat),Segment Float,List DrawOption) -> 
---R            TwoDimensionalViewport
+--R   [1] ((DoubleFloat -> DoubleFloat),Segment(Float),List(DrawOption))
+--R             -> TwoDimensionalViewport
 --R            from TopLevelDrawFunctionsForCompiledFunctions
---R   [2] ((DoubleFloat -> DoubleFloat),Segment Float) -> 
+--R   [2] ((DoubleFloat -> DoubleFloat),Segment(Float)) -> 
 --R            TwoDimensionalViewport
 --R            from TopLevelDrawFunctionsForCompiledFunctions
---R   [3] (ParametricPlaneCurve (DoubleFloat -> DoubleFloat),Segment Float
---R            ,List DrawOption) -> TwoDimensionalViewport
+--R   [3] (ParametricPlaneCurve((DoubleFloat -> DoubleFloat)),Segment(
+--R            Float),List(DrawOption)) -> TwoDimensionalViewport
 --R            from TopLevelDrawFunctionsForCompiledFunctions
---R   [4] (ParametricPlaneCurve (DoubleFloat -> DoubleFloat),Segment Float
---R            ) -> TwoDimensionalViewport
+--R   [4] (ParametricPlaneCurve((DoubleFloat -> DoubleFloat)),Segment(
+--R            Float)) -> TwoDimensionalViewport
 --R            from TopLevelDrawFunctionsForCompiledFunctions
---R   [5] (ParametricSpaceCurve (DoubleFloat -> DoubleFloat),Segment Float
---R            ,List DrawOption) -> ThreeDimensionalViewport
+--R   [5] (ParametricSpaceCurve((DoubleFloat -> DoubleFloat)),Segment(
+--R            Float),List(DrawOption)) -> ThreeDimensionalViewport
 --R            from TopLevelDrawFunctionsForCompiledFunctions
---R   [6] (ParametricSpaceCurve (DoubleFloat -> DoubleFloat),Segment Float
---R            ) -> ThreeDimensionalViewport
+--R   [6] (ParametricSpaceCurve((DoubleFloat -> DoubleFloat)),Segment(
+--R            Float)) -> ThreeDimensionalViewport
 --R            from TopLevelDrawFunctionsForCompiledFunctions
---R   [7] ((DoubleFloat -> Point DoubleFloat),Segment Float,List 
---R            DrawOption) -> ThreeDimensionalViewport
+--R   [7] ((DoubleFloat -> Point(DoubleFloat)),Segment(Float),List(
+--R            DrawOption)) -> ThreeDimensionalViewport
 --R            from TopLevelDrawFunctionsForCompiledFunctions
---R   [8] ((DoubleFloat -> Point DoubleFloat),Segment Float) -> 
+--R   [8] ((DoubleFloat -> Point(DoubleFloat)),Segment(Float)) -> 
 --R            ThreeDimensionalViewport
 --R            from TopLevelDrawFunctionsForCompiledFunctions
---R   [9] (((DoubleFloat,DoubleFloat) -> DoubleFloat),Segment Float,
---R            Segment Float,List DrawOption) -> ThreeDimensionalViewport
+--R   [9] (((DoubleFloat,DoubleFloat) -> DoubleFloat),Segment(Float),
+--R            Segment(Float),List(DrawOption)) -> ThreeDimensionalViewport
 --R            from TopLevelDrawFunctionsForCompiledFunctions
---R   [10] (((DoubleFloat,DoubleFloat) -> DoubleFloat),Segment Float,
---R            Segment Float) -> ThreeDimensionalViewport
+--R   [10] (((DoubleFloat,DoubleFloat) -> DoubleFloat),Segment(Float),
+--R            Segment(Float)) -> ThreeDimensionalViewport
 --R            from TopLevelDrawFunctionsForCompiledFunctions
---R   [11] (((DoubleFloat,DoubleFloat) -> Point DoubleFloat),Segment Float
---R            ,Segment Float,List DrawOption) -> ThreeDimensionalViewport
+--R   [11] (((DoubleFloat,DoubleFloat) -> Point(DoubleFloat)),Segment(
+--R            Float),Segment(Float),List(DrawOption)) -> 
+--R            ThreeDimensionalViewport
 --R            from TopLevelDrawFunctionsForCompiledFunctions
---R   [12] (((DoubleFloat,DoubleFloat) -> Point DoubleFloat),Segment Float
---R            ,Segment Float) -> ThreeDimensionalViewport
+--R   [12] (((DoubleFloat,DoubleFloat) -> Point(DoubleFloat)),Segment(
+--R            Float),Segment(Float)) -> ThreeDimensionalViewport
 --R            from TopLevelDrawFunctionsForCompiledFunctions
---R   [13] (ParametricSurface ((DoubleFloat,DoubleFloat) -> DoubleFloat),
---R            Segment Float,Segment Float,List DrawOption) -> 
+--R   [13] (ParametricSurface(((DoubleFloat,DoubleFloat) -> DoubleFloat)),
+--R            Segment(Float),Segment(Float),List(DrawOption)) -> 
 --R            ThreeDimensionalViewport
 --R            from TopLevelDrawFunctionsForCompiledFunctions
---R   [14] (ParametricSurface ((DoubleFloat,DoubleFloat) -> DoubleFloat),
---R            Segment Float,Segment Float) -> ThreeDimensionalViewport
+--R   [14] (ParametricSurface(((DoubleFloat,DoubleFloat) -> DoubleFloat)),
+--R            Segment(Float),Segment(Float)) -> ThreeDimensionalViewport
 --R            from TopLevelDrawFunctionsForCompiledFunctions
---R   [15] (Equation D6,Symbol,Symbol,List DrawOption) -> 
+--R   [15] (Equation(D6),Symbol,Symbol,List(DrawOption)) -> 
 --R            TwoDimensionalViewport
 --R            from TopLevelDrawFunctionsForAlgebraicCurves(D5,D6)
---R            if D6 has FS D5 and D5 has Join(IntegralDomain,OrderedSet,
---R            RetractableTo Integer)
---R   [16] (D2,SegmentBinding Float,List DrawOption) -> 
+--R            if D6 has FS(D5) and D5 has Join(IntegralDomain,OrderedSet,
+--R            RetractableTo(Integer))
+--R   [16] (D2,SegmentBinding(Float),List(DrawOption)) -> 
 --R            TwoDimensionalViewport
---R            from TopLevelDrawFunctions D2
---R            if D2 has Join(ConvertibleTo InputForm,SetCategory)
---R   [17] (D2,SegmentBinding Float) -> TwoDimensionalViewport
---R            from TopLevelDrawFunctions D2
---R            if D2 has Join(ConvertibleTo InputForm,SetCategory)
---R   [18] (ParametricPlaneCurve D5,SegmentBinding Float,List DrawOption)
---R             -> TwoDimensionalViewport
---R            from TopLevelDrawFunctions D5
---R            if D5 has Join(ConvertibleTo InputForm,SetCategory)
---R   [19] (ParametricPlaneCurve D4,SegmentBinding Float) -> 
+--R            from TopLevelDrawFunctions(D2)
+--R            if D2 has Join(ConvertibleTo(InputForm),SetCategory)
+--R   [17] (D2,SegmentBinding(Float)) -> TwoDimensionalViewport
+--R            from TopLevelDrawFunctions(D2)
+--R            if D2 has Join(ConvertibleTo(InputForm),SetCategory)
+--R   [18] (ParametricPlaneCurve(D5),SegmentBinding(Float),List(DrawOption
+--R            )) -> TwoDimensionalViewport
+--R            from TopLevelDrawFunctions(D5)
+--R            if D5 has Join(ConvertibleTo(InputForm),SetCategory)
+--R   [19] (ParametricPlaneCurve(D4),SegmentBinding(Float)) -> 
 --R            TwoDimensionalViewport
---R            from TopLevelDrawFunctions D4
---R            if D4 has Join(ConvertibleTo InputForm,SetCategory)
---R   [20] (ParametricSpaceCurve D5,SegmentBinding Float,List DrawOption)
---R             -> ThreeDimensionalViewport
---R            from TopLevelDrawFunctions D5
---R            if D5 has Join(ConvertibleTo InputForm,SetCategory)
---R   [21] (ParametricSpaceCurve D4,SegmentBinding Float) -> 
+--R            from TopLevelDrawFunctions(D4)
+--R            if D4 has Join(ConvertibleTo(InputForm),SetCategory)
+--R   [20] (ParametricSpaceCurve(D5),SegmentBinding(Float),List(DrawOption
+--R            )) -> ThreeDimensionalViewport
+--R            from TopLevelDrawFunctions(D5)
+--R            if D5 has Join(ConvertibleTo(InputForm),SetCategory)
+--R   [21] (ParametricSpaceCurve(D4),SegmentBinding(Float)) -> 
 --R            ThreeDimensionalViewport
---R            from TopLevelDrawFunctions D4
---R            if D4 has Join(ConvertibleTo InputForm,SetCategory)
---R   [22] (D2,SegmentBinding Float,SegmentBinding Float,List DrawOption)
---R             -> ThreeDimensionalViewport
---R            from TopLevelDrawFunctions D2
---R            if D2 has Join(ConvertibleTo InputForm,SetCategory)
---R   [23] (D2,SegmentBinding Float,SegmentBinding Float) -> 
+--R            from TopLevelDrawFunctions(D4)
+--R            if D4 has Join(ConvertibleTo(InputForm),SetCategory)
+--R   [22] (D2,SegmentBinding(Float),SegmentBinding(Float),List(DrawOption
+--R            )) -> ThreeDimensionalViewport
+--R            from TopLevelDrawFunctions(D2)
+--R            if D2 has Join(ConvertibleTo(InputForm),SetCategory)
+--R   [23] (D2,SegmentBinding(Float),SegmentBinding(Float)) -> 
 --R            ThreeDimensionalViewport
---R            from TopLevelDrawFunctions D2
---R            if D2 has Join(ConvertibleTo InputForm,SetCategory)
---R   [24] (ParametricSurface D5,SegmentBinding Float,SegmentBinding Float
---R            ,List DrawOption) -> ThreeDimensionalViewport
---R            from TopLevelDrawFunctions D5
---R            if D5 has Join(ConvertibleTo InputForm,SetCategory)
---R   [25] (ParametricSurface D4,SegmentBinding Float,SegmentBinding Float
---R            ) -> ThreeDimensionalViewport
---R            from TopLevelDrawFunctions D4
---R            if D4 has Join(ConvertibleTo InputForm,SetCategory)
---R   [26] (List DoubleFloat,List DoubleFloat) -> TwoDimensionalViewport
+--R            from TopLevelDrawFunctions(D2)
+--R            if D2 has Join(ConvertibleTo(InputForm),SetCategory)
+--R   [24] (ParametricSurface(D5),SegmentBinding(Float),SegmentBinding(
+--R            Float),List(DrawOption)) -> ThreeDimensionalViewport
+--R            from TopLevelDrawFunctions(D5)
+--R            if D5 has Join(ConvertibleTo(InputForm),SetCategory)
+--R   [25] (ParametricSurface(D4),SegmentBinding(Float),SegmentBinding(
+--R            Float)) -> ThreeDimensionalViewport
+--R            from TopLevelDrawFunctions(D4)
+--R            if D4 has Join(ConvertibleTo(InputForm),SetCategory)
+--R   [26] (List(DoubleFloat),List(DoubleFloat)) -> TwoDimensionalViewport
 --R            from TopLevelDrawFunctionsForPoints
---R   [27] (List DoubleFloat,List DoubleFloat,List DrawOption) -> 
+--R   [27] (List(DoubleFloat),List(DoubleFloat),List(DrawOption)) -> 
 --R            TwoDimensionalViewport
 --R            from TopLevelDrawFunctionsForPoints
---R   [28] List Point DoubleFloat -> TwoDimensionalViewport
+--R   [28] List(Point(DoubleFloat)) -> TwoDimensionalViewport
 --R            from TopLevelDrawFunctionsForPoints
---R   [29] (List Point DoubleFloat,List DrawOption) -> 
+--R   [29] (List(Point(DoubleFloat)),List(DrawOption)) -> 
 --R            TwoDimensionalViewport
 --R            from TopLevelDrawFunctionsForPoints
---R   [30] (List DoubleFloat,List DoubleFloat,List DoubleFloat) -> 
+--R   [30] (List(DoubleFloat),List(DoubleFloat),List(DoubleFloat)) -> 
 --R            ThreeDimensionalViewport
 --R            from TopLevelDrawFunctionsForPoints
---R   [31] (List DoubleFloat,List DoubleFloat,List DoubleFloat,List 
---R            DrawOption) -> ThreeDimensionalViewport
+--R   [31] (List(DoubleFloat),List(DoubleFloat),List(DoubleFloat),List(
+--R            DrawOption)) -> ThreeDimensionalViewport
 --R            from TopLevelDrawFunctionsForPoints
 --R
 --RExamples of draw from TopLevelDrawFunctionsForCompiledFunctions
@@ -634,7 +619,7 @@
 --R 
 --R
 --RThere is one exposed function called repeating :
---R   [1] List D2 -> Stream D2 from Stream D2 if D2 has TYPE
+--R   [1] List(D2) -> Stream(D2) from Stream(D2) if D2 has TYPE
 --R
 --RExamples of repeating from Stream
 --R
@@ -647,8 +632,8 @@
 --R 
 --R
 --RThere are 2 exposed functions called cons :
---R   [1] (D1,List D1) -> List D1 from List D1 if D1 has TYPE
---R   [2] (D1,Stream D1) -> Stream D1 from Stream D1 if D1 has TYPE
+--R   [1] (D1,List(D1)) -> List(D1) from List(D1) if D1 has TYPE
+--R   [2] (D1,Stream(D1)) -> Stream(D1) from Stream(D1) if D1 has TYPE
 --R
 --RExamples of cons from List
 --R
@@ -670,44 +655,45 @@
 --R            if D has AMR(D2,D3) and D2 has RING and D3 has OAMON
 --R   [2] (((D2,D2) -> D2),D,D,D2) -> D from D
 --R            if D has ARR2CAT(D2,D3,D4) and D2 has TYPE and D3 has FLAGG
---R            D2 and D4 has FLAGG D2
+--R            (D2) and D4 has FLAGG(D2)
 --R   [3] (((D2,D2) -> D2),D,D) -> D from D
 --R            if D has ARR2CAT(D2,D3,D4) and D2 has TYPE and D3 has FLAGG
---R            D2 and D4 has FLAGG D2
+--R            (D2) and D4 has FLAGG(D2)
 --R   [4] ((D2 -> D2),D) -> D from D
 --R            if D has ARR2CAT(D2,D3,D4) and D2 has TYPE and D3 has FLAGG
---R            D2 and D4 has FLAGG D2
---R   [5] ((D4 -> D5),OneDimensionalArray D4) -> OneDimensionalArray D5
+--R            (D2) and D4 has FLAGG(D2)
+--R   [5] ((D4 -> D5),OneDimensionalArray(D4)) -> OneDimensionalArray(D5)
 --R            from OneDimensionalArrayFunctions2(D4,D5)
 --R            if D4 has TYPE and D5 has TYPE
---R   [6] ((D2 -> D2),ArrayStack D2) -> ArrayStack D2 from ArrayStack D2
+--R   [6] ((D2 -> D2),ArrayStack(D2)) -> ArrayStack(D2) from ArrayStack(D2
+--R            )
 --R            if D2 has SETCAT
 --R   [7] ((D6 -> D7),CartesianTensor(D4,D5,D6)) -> CartesianTensor(D4,D5,
 --R            D7)
 --R            from CartesianTensorFunctions2(D4,D5,D6,D7)
 --R            if D4: INT and D5: NNI and D6 has COMRING and D7 has 
 --R            COMRING
---R   [8] ((D4 -> D5),Complex D4) -> Complex D5 from ComplexFunctions2(D4,
---R            D5)
+--R   [8] ((D4 -> D5),Complex(D4)) -> Complex(D5) from ComplexFunctions2(
+--R            D4,D5)
 --R            if D4 has COMRING and D5 has COMRING
---R   [9] ((D2 -> D2),Dequeue D2) -> Dequeue D2 from Dequeue D2 if D2 has 
---R            SETCAT
+--R   [9] ((D2 -> D2),Dequeue(D2)) -> Dequeue(D2) from Dequeue(D2)
+--R            if D2 has SETCAT
 --R   [10] ((D5 -> D6),DirectProduct(D4,D5)) -> DirectProduct(D4,D6)
 --R            from DirectProductFunctions2(D4,D5,D6)
 --R            if D4: NNI and D5 has TYPE and D6 has TYPE
---R   [11] ((D4 -> D5),Equation D4) -> Equation D5 from EquationFunctions2
---R            (D4,D5)
---R            if D4 has TYPE and D5 has TYPE
---R   [12] ((D2 -> D2),Equation D2) -> Equation D2 from Equation D2 if D2 
---R            has TYPE
---R   [13] ((D4 -> D1),Kernel D4) -> D1 from ExpressionSpaceFunctions2(D4,
---R            D1)
+--R   [11] ((D4 -> D5),Equation(D4)) -> Equation(D5)
+--R            from EquationFunctions2(D4,D5) if D4 has TYPE and D5 has 
+--R            TYPE
+--R   [12] ((D2 -> D2),Equation(D2)) -> Equation(D2) from Equation(D2)
+--R            if D2 has TYPE
+--R   [13] ((D4 -> D1),Kernel(D4)) -> D1 from ExpressionSpaceFunctions2(D4
+--R            ,D1)
 --R            if D4 has ES and D1 has ES
---R   [14] ((D -> D),Kernel D) -> D from D if D has ES
---R   [15] ((D4 -> D5),Matrix D4) -> Matrix D5
+--R   [14] ((D -> D),Kernel(D)) -> D from D if D has ES
+--R   [15] ((D4 -> D5),Matrix(D4)) -> Matrix(D5)
 --R            from ExpertSystemToolsPackage2(D4,D5)
 --R            if D4 has RING and D5 has RING
---R   [16] ((D4 -> D5),Expression D4) -> Expression D5
+--R   [16] ((D4 -> D5),Expression(D4)) -> Expression(D5)
 --R            from ExpressionFunctions2(D4,D5)
 --R            if D4 has ORDSET and D5 has ORDSET
 --R   [17] ((D5 -> D6),D3) -> D1
@@ -717,59 +703,60 @@
 --R   [18] ((D7 -> D11),FiniteDivisor(D7,D8,D9,D10)) -> FiniteDivisor(D11,
 --R            D1,D2,D3)
 --R            from FiniteDivisorFunctions2(D7,D8,D9,D10,D11,D1,D2,D3)
---R            if D7 has FIELD and D8 has UPOLYC D7 and D9 has UPOLYC FRAC
---R            D8 and D10 has FFCAT(D7,D8,D9) and D11 has FIELD and D1 has
---R            UPOLYC D11 and D2 has UPOLYC FRAC D1 and D3 has FFCAT(D11,
---R            D1,D2)
---R   [19] ((D2 -> D2),D) -> D from D if D has FEVALAB D2 and D2 has 
+--R            if D7 has FIELD and D8 has UPOLYC(D7) and D9 has UPOLYC(
+--R            FRAC(D8)) and D10 has FFCAT(D7,D8,D9) and D11 has FIELD and
+--R            D1 has UPOLYC(D11) and D2 has UPOLYC(FRAC(D1)) and D3 has 
+--R            FFCAT(D11,D1,D2)
+--R   [19] ((D2 -> D2),D) -> D from D if D has FEVALAB(D2) and D2 has 
 --R            SETCAT
 --R   [20] ((D5 -> D8),D4) -> D2
 --R            from FunctionFieldCategoryFunctions2(D5,D6,D7,D4,D8,D9,D1,
 --R            D2)
---R            if D5 has UFD and D8 has UFD and D6 has UPOLYC D5 and D7 
---R            has UPOLYC FRAC D6 and D9 has UPOLYC D8 and D2 has FFCAT(D8
---R            ,D9,D1) and D4 has FFCAT(D5,D6,D7) and D1 has UPOLYC FRAC 
---R            D9
+--R            if D5 has UFD and D8 has UFD and D6 has UPOLYC(D5) and D7 
+--R            has UPOLYC(FRAC(D6)) and D9 has UPOLYC(D8) and D2 has FFCAT
+--R            (D8,D9,D1) and D4 has FFCAT(D5,D6,D7) and D1 has UPOLYC(
+--R            FRAC(D9))
 --R   [21] ((D4 -> D5),D3) -> D1 from FiniteLinearAggregateFunctions2(D4,
 --R            D3,D5,D1)
---R            if D4 has TYPE and D5 has TYPE and D1 has FLAGG D5 and D3 
---R            has FLAGG D4
+--R            if D4 has TYPE and D5 has TYPE and D1 has FLAGG(D5) and D3 
+--R            has FLAGG(D4)
 --R   [22] ((D2 -> D2),D) -> D from D
 --R            if D has FMCAT(D2,D3) and D2 has RING and D3 has SETCAT
---R   [23] ((D4 -> D5),Factored D4) -> Factored D5 from FactoredFunctions2
---R            (D4,D5)
+--R   [23] ((D4 -> D5),Factored(D4)) -> Factored(D5)
+--R            from FactoredFunctions2(D4,D5)
 --R            if D4 has INTDOM and D5 has INTDOM
---R   [24] ((D4 -> D5),Fraction D4) -> Fraction D5 from FractionFunctions2
---R            (D4,D5)
+--R   [24] ((D4 -> D5),Fraction(D4)) -> Fraction(D5)
+--R            from FractionFunctions2(D4,D5)
 --R            if D4 has INTDOM and D5 has INTDOM
 --R   [25] ((D7 -> D11),FractionalIdeal(D7,D8,D9,D10)) -> FractionalIdeal(
 --R            D11,D1,D2,D3)
 --R            from FractionalIdealFunctions2(D7,D8,D9,D10,D11,D1,D2,D3)
---R            if D7 has EUCDOM and D8 has QFCAT D7 and D9 has UPOLYC D8 
---R            and D10 has Join(FramedAlgebra(D8,D9),RetractableTo D8) and
---R            D11 has EUCDOM and D1 has QFCAT D11 and D2 has UPOLYC D1 
---R            and D3 has Join(FramedAlgebra(D1,D2),RetractableTo D1)
+--R            if D7 has EUCDOM and D8 has QFCAT(D7) and D9 has UPOLYC(D8)
+--R            and D10 has Join(FramedAlgebra(D8,D9),RetractableTo(D8)) 
+--R            and D11 has EUCDOM and D1 has QFCAT(D11) and D2 has UPOLYC(
+--R            D1) and D3 has Join(FramedAlgebra(D1,D2),RetractableTo(D1))
+--R            
 --R   [26] ((D4 -> D5),D3) -> D1
 --R            from FramedNonAssociativeAlgebraFunctions2(D3,D4,D1,D5)
---R            if D4 has COMRING and D5 has COMRING and D1 has FRNAALG D5 
---R            and D3 has FRNAALG D4
---R   [27] ((D2 -> D2),Factored D2) -> Factored D2 from Factored D2
+--R            if D4 has COMRING and D5 has COMRING and D1 has FRNAALG(D5)
+--R            and D3 has FRNAALG(D4)
+--R   [27] ((D2 -> D2),Factored(D2)) -> Factored(D2) from Factored(D2)
 --R            if D2 has INTDOM
 --R   [28] ((D4 -> D5),D3) -> D1 from FunctionSpaceFunctions2(D4,D3,D5,D1)
 --R            if D4 has Join(Ring,OrderedSet) and D5 has Join(Ring,
---R            OrderedSet) and D1 has FS D5 and D3 has FS D4
+--R            OrderedSet) and D1 has FS(D5) and D3 has FS(D4)
 --R   [29] ((D4 -> D5),D3) -> D1 from FiniteSetAggregateFunctions2(D4,D3,
 --R            D5,D1)
---R            if D4 has SETCAT and D5 has SETCAT and D1 has FSAGG D5 and 
---R            D3 has FSAGG D4
---R   [30] ((D2 -> D2),Heap D2) -> Heap D2 from Heap D2 if D2 has ORDSET
---R         
---R   [31] ((D2 -> D2),D) -> D from D if D has HOAGG D2 and D2 has TYPE
+--R            if D4 has SETCAT and D5 has SETCAT and D1 has FSAGG(D5) and
+--R            D3 has FSAGG(D4)
+--R   [30] ((D2 -> D2),Heap(D2)) -> Heap(D2) from Heap(D2) if D2 has 
+--R            ORDSET
+--R   [31] ((D2 -> D2),D) -> D from D if D has HOAGG(D2) and D2 has TYPE
 --R         
 --R   [32] ((D2 -> D2),D) -> D from D
 --R            if D has IDPC(D2,D3) and D2 has SETCAT and D3 has ORDSET
 --R         
---R   [33] ((D4 -> D5),IntegrationResult D4) -> IntegrationResult D5
+--R   [33] ((D4 -> D5),IntegrationResult(D4)) -> IntegrationResult(D5)
 --R            from IntegrationResultFunctions2(D4,D5)
 --R            if D4 has FIELD and D5 has FIELD
 --R   [34] ((D4 -> D5),Union(Record(ratpart: D4,coeff: D4),"failed")) -> 
@@ -779,44 +766,43 @@
 --R   [35] ((D4 -> D1),Union(D4,"failed")) -> Union(D1,"failed")
 --R            from IntegrationResultFunctions2(D4,D1)
 --R            if D4 has FIELD and D1 has FIELD
---R   [36] ((D4 -> D5),Union(Record(mainpart: D4,limitedlogs: List Record(
---R            coeff: D4,logand: D4)),"failed")) -> Union(Record(mainpart: D5,
---R            limitedlogs: List Record(coeff: D5,logand: D5)),"failed")
+--R   [36] ((D4 -> D5),Union(Record(mainpart: D4,limitedlogs: List(Record(
+--R            coeff: D4,logand: D4))),"failed")) -> Union(Record(mainpart: D5,
+--R            limitedlogs: List(Record(coeff: D5,logand: D5))),"failed")
 --R            from IntegrationResultFunctions2(D4,D5)
 --R            if D4 has FIELD and D5 has FIELD
---R   [37] ((D4 -> D5),InfiniteTuple D4) -> InfiniteTuple D5
+--R   [37] ((D4 -> D5),InfiniteTuple(D4)) -> InfiniteTuple(D5)
 --R            from InfiniteTupleFunctions2(D4,D5)
 --R            if D4 has TYPE and D5 has TYPE
---R   [38] (((D5,D6) -> D7),InfiniteTuple D5,InfiniteTuple D6) -> 
---R            InfiniteTuple D7
+--R   [38] (((D5,D6) -> D7),InfiniteTuple(D5),InfiniteTuple(D6)) -> 
+--R            InfiniteTuple(D7)
 --R            from InfiniteTupleFunctions3(D5,D6,D7)
 --R            if D5 has TYPE and D6 has TYPE and D7 has TYPE
---R   [39] (((D5,D6) -> D7),Stream D5,InfiniteTuple D6) -> Stream D7
+--R   [39] (((D5,D6) -> D7),Stream(D5),InfiniteTuple(D6)) -> Stream(D7)
 --R            from InfiniteTupleFunctions3(D5,D6,D7)
 --R            if D5 has TYPE and D6 has TYPE and D7 has TYPE
---R   [40] (((D5,D6) -> D7),InfiniteTuple D5,Stream D6) -> Stream D7
+--R   [40] (((D5,D6) -> D7),InfiniteTuple(D5),Stream(D6)) -> Stream(D7)
 --R            from InfiniteTupleFunctions3(D5,D6,D7)
 --R            if D5 has TYPE and D6 has TYPE and D7 has TYPE
---R   [41] ((D2 -> D2),InfiniteTuple D2) -> InfiniteTuple D2 from 
---R            InfiniteTuple D2
---R            if D2 has TYPE
---R   [42] ((D4 -> D5),List D4) -> List D5 from ListFunctions2(D4,D5)
+--R   [41] ((D2 -> D2),InfiniteTuple(D2)) -> InfiniteTuple(D2)
+--R            from InfiniteTuple(D2) if D2 has TYPE
+--R   [42] ((D4 -> D5),List(D4)) -> List(D5) from ListFunctions2(D4,D5)
 --R            if D4 has TYPE and D5 has TYPE
---R   [43] (((D5,D6) -> D7),List D5,List D6) -> List D7
+--R   [43] (((D5,D6) -> D7),List(D5),List(D6)) -> List(D7)
 --R            from ListFunctions3(D5,D6,D7)
 --R            if D5 has TYPE and D6 has TYPE and D7 has TYPE
---R   [44] (((D2,D2) -> D2),D,D) -> D from D if D has LNAGG D2 and D2 has 
+--R   [44] (((D2,D2) -> D2),D,D) -> D from D if D has LNAGG(D2) and D2 has
 --R            TYPE
 --R   [45] ((D5 -> D8),D4) -> D2
 --R            from MatrixCategoryFunctions2(D5,D6,D7,D4,D8,D9,D1,D2)
---R            if D5 has RING and D8 has RING and D6 has FLAGG D5 and D7 
---R            has FLAGG D5 and D2 has MATCAT(D8,D9,D1) and D4 has MATCAT(
---R            D5,D6,D7) and D9 has FLAGG D8 and D1 has FLAGG D8
+--R            if D5 has RING and D8 has RING and D6 has FLAGG(D5) and D7 
+--R            has FLAGG(D5) and D2 has MATCAT(D8,D9,D1) and D4 has MATCAT
+--R            (D5,D6,D7) and D9 has FLAGG(D8) and D1 has FLAGG(D8)
 --R   [46] ((D5 -> Union(D8,"failed")),D4) -> Union(D2,"failed")
 --R            from MatrixCategoryFunctions2(D5,D6,D7,D4,D8,D9,D1,D2)
---R            if D5 has RING and D8 has RING and D6 has FLAGG D5 and D7 
---R            has FLAGG D5 and D2 has MATCAT(D8,D9,D1) and D4 has MATCAT(
---R            D5,D6,D7) and D9 has FLAGG D8 and D1 has FLAGG D8
+--R            if D5 has RING and D8 has RING and D6 has FLAGG(D5) and D7 
+--R            has FLAGG(D5) and D2 has MATCAT(D8,D9,D1) and D4 has MATCAT
+--R            (D5,D6,D7) and D9 has FLAGG(D8) and D1 has FLAGG(D8)
 --R   [47] ((D7 -> D8),D3) -> D1 from MPolyCatFunctions2(D4,D5,D6,D7,D8,D3
 --R            ,D1)
 --R            if D7 has RING and D8 has RING and D4 has ORDSET and D5 has
@@ -827,55 +813,57 @@
 --R            if D4 has RING and D5 has RING and D6 has MONOID
 --R   [49] ((D4 -> D5),D3) -> D1 from OctonionCategoryFunctions2(D3,D4,D1,
 --R            D5)
---R            if D4 has COMRING and D5 has COMRING and D1 has OC D5 and 
---R            D3 has OC D4
---R   [50] ((D4 -> D5),OnePointCompletion D4) -> OnePointCompletion D5
+--R            if D4 has COMRING and D5 has COMRING and D1 has OC(D5) and 
+--R            D3 has OC(D4)
+--R   [50] ((D4 -> D5),OnePointCompletion(D4)) -> OnePointCompletion(D5)
 --R            from OnePointCompletionFunctions2(D4,D5)
 --R            if D4 has SETCAT and D5 has SETCAT
---R   [51] ((D4 -> D5),OnePointCompletion D4,OnePointCompletion D5) -> 
---R            OnePointCompletion D5
+--R   [51] ((D4 -> D5),OnePointCompletion(D4),OnePointCompletion(D5)) -> 
+--R            OnePointCompletion(D5)
 --R            from OnePointCompletionFunctions2(D4,D5)
 --R            if D4 has SETCAT and D5 has SETCAT
---R   [52] ((D4 -> D5),OrderedCompletion D4) -> OrderedCompletion D5
+--R   [52] ((D4 -> D5),OrderedCompletion(D4)) -> OrderedCompletion(D5)
 --R            from OrderedCompletionFunctions2(D4,D5)
 --R            if D4 has SETCAT and D5 has SETCAT
---R   [53] ((D4 -> D5),OrderedCompletion D4,OrderedCompletion D5,
---R            OrderedCompletion D5) -> OrderedCompletion D5
+--R   [53] ((D4 -> D5),OrderedCompletion(D4),OrderedCompletion(D5),
+--R            OrderedCompletion(D5)) -> OrderedCompletion(D5)
 --R            from OrderedCompletionFunctions2(D4,D5)
 --R            if D4 has SETCAT and D5 has SETCAT
---R   [54] ((D4 -> D5),ParametricPlaneCurve D4) -> ParametricPlaneCurve D5
+--R   [54] ((D4 -> D5),ParametricPlaneCurve(D4)) -> ParametricPlaneCurve(
+--R            D5)
 --R            from ParametricPlaneCurveFunctions2(D4,D5)
 --R            if D4 has TYPE and D5 has TYPE
---R   [55] ((D4 -> D5),ParametricSpaceCurve D4) -> ParametricSpaceCurve D5
+--R   [55] ((D4 -> D5),ParametricSpaceCurve(D4)) -> ParametricSpaceCurve(
+--R            D5)
 --R            from ParametricSpaceCurveFunctions2(D4,D5)
 --R            if D4 has TYPE and D5 has TYPE
---R   [56] ((D4 -> D5),ParametricSurface D4) -> ParametricSurface D5
+--R   [56] ((D4 -> D5),ParametricSurface(D4)) -> ParametricSurface(D5)
 --R            from ParametricSurfaceFunctions2(D4,D5)
 --R            if D4 has TYPE and D5 has TYPE
 --R   [57] ((D5 -> D6),PatternMatchResult(D4,D5)) -> PatternMatchResult(D4
 --R            ,D6)
 --R            from PatternMatchResultFunctions2(D4,D5,D6)
 --R            if D4 has SETCAT and D5 has SETCAT and D6 has SETCAT
---R   [58] ((D4 -> D5),Pattern D4) -> Pattern D5 from PatternFunctions2(D4
---R            ,D5)
+--R   [58] ((D4 -> D5),Pattern(D4)) -> Pattern(D5) from PatternFunctions2(
+--R            D4,D5)
 --R            if D4 has SETCAT and D5 has SETCAT
---R   [59] ((D4 -> D5),Polynomial D4) -> Polynomial D5
+--R   [59] ((D4 -> D5),Polynomial(D4)) -> Polynomial(D5)
 --R            from PolynomialFunctions2(D4,D5) if D4 has RING and D5 has 
 --R            RING
---R   [60] ((D4 -> D5),PrimitiveArray D4) -> PrimitiveArray D5
+--R   [60] ((D4 -> D5),PrimitiveArray(D4)) -> PrimitiveArray(D5)
 --R            from PrimitiveArrayFunctions2(D4,D5)
 --R            if D4 has TYPE and D5 has TYPE
---R   [61] ((D4 -> D5),Point D4) -> Point D5 from PointFunctions2(D4,D5)
+--R   [61] ((D4 -> D5),Point(D4)) -> Point(D5) from PointFunctions2(D4,D5)
 --R            if D4 has RING and D5 has RING
 --R   [62] ((D4 -> D5),D3) -> D1 from QuotientFieldCategoryFunctions2(D4,
 --R            D5,D3,D1)
---R            if D4 has INTDOM and D5 has INTDOM and D1 has QFCAT D5 and 
---R            D3 has QFCAT D4
+--R            if D4 has INTDOM and D5 has INTDOM and D1 has QFCAT(D5) and
+--R            D3 has QFCAT(D4)
 --R   [63] ((D4 -> D5),D3) -> D1 from QuaternionCategoryFunctions2(D3,D4,
 --R            D1,D5)
---R            if D4 has COMRING and D5 has COMRING and D1 has QUATCAT D5 
---R            and D3 has QUATCAT D4
---R   [64] ((D2 -> D2),Queue D2) -> Queue D2 from Queue D2 if D2 has 
+--R            if D4 has COMRING and D5 has COMRING and D1 has QUATCAT(D5)
+--R            and D3 has QUATCAT(D4)
+--R   [64] ((D2 -> D2),Queue(D2)) -> Queue(D2) from Queue(D2) if D2 has 
 --R            SETCAT
 --R   [65] (((D4,D4) -> D4),D,D) -> D from D
 --R            if D has RMATCAT(D2,D3,D4,D5,D6) and D4 has RING and D5 has
@@ -891,28 +879,28 @@
 --R            has RMATCAT(D7,D8,D1,D2,D3) and D6 has RMATCAT(D7,D8,D9,D10
 --R            ,D11) and D2 has DIRPCAT(D8,D1) and D3 has DIRPCAT(D7,D1)
 --R         
---R   [68] ((D4 -> D5),Segment D4) -> Segment D5 from SegmentFunctions2(D4
---R            ,D5)
+--R   [68] ((D4 -> D5),Segment(D4)) -> Segment(D5) from SegmentFunctions2(
+--R            D4,D5)
 --R            if D4 has TYPE and D5 has TYPE
---R   [69] ((D4 -> D5),Segment D4) -> List D5 from SegmentFunctions2(D4,D5
---R            )
+--R   [69] ((D4 -> D5),Segment(D4)) -> List(D5) from SegmentFunctions2(D4,
+--R            D5)
 --R            if D4 has ORDRING and D4 has TYPE and D5 has TYPE
---R   [70] ((D4 -> D5),SegmentBinding D4) -> SegmentBinding D5
+--R   [70] ((D4 -> D5),SegmentBinding(D4)) -> SegmentBinding(D5)
 --R            from SegmentBindingFunctions2(D4,D5)
 --R            if D4 has TYPE and D5 has TYPE
 --R   [71] ((D3 -> D3),D) -> D1 from D
 --R            if D has SEGXCAT(D3,D1) and D3 has ORDRING and D1 has STAGG
---R            D3
---R   [72] ((D2 -> D2),Stack D2) -> Stack D2 from Stack D2 if D2 has 
+--R            (D3)
+--R   [72] ((D2 -> D2),Stack(D2)) -> Stack(D2) from Stack(D2) if D2 has 
 --R            SETCAT
---R   [73] ((D4 -> D5),Stream D4) -> Stream D5 from StreamFunctions2(D4,D5
---R            )
+--R   [73] ((D4 -> D5),Stream(D4)) -> Stream(D5) from StreamFunctions2(D4,
+--R            D5)
 --R            if D4 has TYPE and D5 has TYPE
---R   [74] (((D5,D6) -> D7),Stream D5,Stream D6) -> Stream D7
+--R   [74] (((D5,D6) -> D7),Stream(D5),Stream(D6)) -> Stream(D7)
 --R            from StreamFunctions3(D5,D6,D7)
 --R            if D5 has TYPE and D6 has TYPE and D7 has TYPE
---R   [75] ((D4 -> D5),SparseUnivariatePolynomial D4) -> 
---R            SparseUnivariatePolynomial D5
+--R   [75] ((D4 -> D5),SparseUnivariatePolynomial(D4)) -> 
+--R            SparseUnivariatePolynomial(D5)
 --R            from SparseUnivariatePolynomialFunctions2(D4,D5)
 --R            if D4 has RING and D5 has RING
 --R   [76] (((D3,D3) -> D3),D,D) -> D from D
@@ -923,10 +911,10 @@
 --R            from UnivariateLaurentSeriesFunctions2(D5,D6,D7,D8,D9,D1)
 --R            if D5 has RING and D6 has RING and D7: SYMBOL and D9: D5 
 --R            and D1: D6 and D8: SYMBOL
---R   [78] ((D4 -> D5),UniversalSegment D4) -> UniversalSegment D5
+--R   [78] ((D4 -> D5),UniversalSegment(D4)) -> UniversalSegment(D5)
 --R            from UniversalSegmentFunctions2(D4,D5)
 --R            if D4 has TYPE and D5 has TYPE
---R   [79] ((D4 -> D5),UniversalSegment D4) -> Stream D5
+--R   [79] ((D4 -> D5),UniversalSegment(D4)) -> Stream(D5)
 --R            from UniversalSegmentFunctions2(D4,D5)
 --R            if D4 has ORDRING and D4 has TYPE and D5 has TYPE
 --R   [80] ((D5 -> D7),UnivariatePolynomial(D4,D5)) -> 
@@ -936,8 +924,8 @@
 --R            SYMBOL
 --R   [81] ((D4 -> D5),D3) -> D1
 --R            from UnivariatePolynomialCategoryFunctions2(D4,D3,D5,D1)
---R            if D4 has RING and D5 has RING and D1 has UPOLYC D5 and D3 
---R            has UPOLYC D4
+--R            if D4 has RING and D5 has RING and D1 has UPOLYC(D5) and D3
+--R            has UPOLYC(D4)
 --R   [82] ((D5 -> D6),UnivariatePuiseuxSeries(D5,D7,D9)) -> 
 --R            UnivariatePuiseuxSeries(D6,D8,D1)
 --R            from UnivariatePuiseuxSeriesFunctions2(D5,D6,D7,D8,D9,D1)
@@ -945,12 +933,12 @@
 --R            and D1: D6 and D8: SYMBOL
 --R   [83] ((D4 -> D5),D3) -> D1
 --R            from UnivariateTaylorSeriesFunctions2(D4,D5,D3,D1)
---R            if D4 has RING and D5 has RING and D1 has UTSCAT D5 and D3 
---R            has UTSCAT D4
---R   [84] ((D4 -> D5),Vector D4) -> Vector D5 from VectorFunctions2(D4,D5
---R            )
+--R            if D4 has RING and D5 has RING and D1 has UTSCAT(D5) and D3
+--R            has UTSCAT(D4)
+--R   [84] ((D4 -> D5),Vector(D4)) -> Vector(D5) from VectorFunctions2(D4,
+--R            D5)
 --R            if D4 has TYPE and D5 has TYPE
---R   [85] ((D4 -> Union(D5,"failed")),Vector D4) -> Union(Vector D5,
+--R   [85] ((D4 -> Union(D5,"failed")),Vector(D4)) -> Union(Vector(D5),
 --R            "failed")
 --R            from VectorFunctions2(D4,D5) if D4 has TYPE and D5 has TYPE
 --R            
@@ -960,18 +948,18 @@
 --RThere are 10 unexposed functions called map :
 --R   [1] ((D2 -> D2),AntiSymm(D2,D3)) -> AntiSymm(D2,D3) from AntiSymm(D2
 --R            ,D3)
---R            if D2 has RING and D3: LIST SYMBOL
---R   [2] ((Expression D2 -> Expression D2),DeRhamComplex(D2,D3)) -> 
+--R            if D2 has RING and D3: LIST(SYMBOL)
+--R   [2] ((Expression(D2) -> Expression(D2)),DeRhamComplex(D2,D3)) -> 
 --R            DeRhamComplex(D2,D3)
 --R            from DeRhamComplex(D2,D3)
---R            if D2 has Join(Ring,OrderedSet) and D3: LIST SYMBOL
---R   [3] ((D5 -> D1),String,Kernel D5) -> D1
+--R            if D2 has Join(Ring,OrderedSet) and D3: LIST(SYMBOL)
+--R   [3] ((D5 -> D1),String,Kernel(D5)) -> D1
 --R            from ExpressionSpaceFunctions1(D5,D1)
 --R            if D5 has ES and D1 has TYPE
 --R   [4] ((D4 -> D6),D3) -> D1 from MultipleMap(D4,D5,D3,D6,D7,D1)
---R            if D4 has INTDOM and D6 has INTDOM and D5 has UPOLYC D4 and
---R            D1 has UPOLYC FRAC D7 and D3 has UPOLYC FRAC D5 and D7 has 
---R            UPOLYC D6
+--R            if D4 has INTDOM and D6 has INTDOM and D5 has UPOLYC(D4) 
+--R            and D1 has UPOLYC(FRAC(D7)) and D3 has UPOLYC(FRAC(D5)) and
+--R            D7 has UPOLYC(D6)
 --R   [5] ((D4 -> D5),D3) -> D1 from MPolyCatFunctions3(D4,D5,D6,D7,D8,D3,
 --R            D1)
 --R            if D4 has ORDSET and D5 has ORDSET and D6 has OAMONS and D8
@@ -979,8 +967,8 @@
 --R            D3 has POLYCAT(D8,D6,D4)
 --R   [6] ((D2 -> D2),MonoidRing(D2,D3)) -> MonoidRing(D2,D3)
 --R            from MonoidRing(D2,D3) if D2 has RING and D3 has MONOID
---R   [7] ((D4 -> D5),NewSparseUnivariatePolynomial D4) -> 
---R            NewSparseUnivariatePolynomial D5
+--R   [7] ((D4 -> D5),NewSparseUnivariatePolynomial(D4)) -> 
+--R            NewSparseUnivariatePolynomial(D5)
 --R            from NewSparseUnivariatePolynomialFunctions2(D4,D5)
 --R            if D4 has RING and D5 has RING
 --R   [8] ((D7 -> D2),(D8 -> D2),D5) -> D2
@@ -991,9 +979,10 @@
 --R               ?*? : (%,%) -> %
 --R               D : (%,NonNegativeInteger) -> %and D5 has POLYCAT(D8
 --R            ,D6,D7)
---R   [9] ((Polynomial D3 -> D1),D1) -> D1 from PushVariables(D3,D4,D5,D1)
---R            if D3 has RING and D1 has POLYCAT(POLY D3,D4,D5) and D4 has
---R            OAMONS and D5 has OrderedSet with 
+--R   [9] ((Polynomial(D3) -> D1),D1) -> D1 from PushVariables(D3,D4,D5,D1
+--R            )
+--R            if D3 has RING and D1 has POLYCAT(POLY(D3),D4,D5) and D4 
+--R            has OAMONS and D5 has OrderedSet with 
 --R               convert : % -> Symbol
 --R               variable : Symbol -> Union(%,"failed")
 --R   [10] ((D2 -> D2),XPolynomialRing(D2,D3)) -> XPolynomialRing(D2,D3)
@@ -1310,13 +1299,12 @@
 --R 
 --R
 --RThere are 5 exposed functions called complete :
---R   [1] ContinuedFraction D1 -> ContinuedFraction D1 from 
---R            ContinuedFraction D1
---R            if D1 has EUCDOM
---R   [2] Integer -> SymmetricPolynomial Fraction Integer from 
+--R   [1] ContinuedFraction(D1) -> ContinuedFraction(D1)
+--R            from ContinuedFraction(D1) if D1 has EUCDOM
+--R   [2] Integer -> SymmetricPolynomial(Fraction(Integer)) from 
 --R            CycleIndicators
---R   [3] D -> D from D if D has LZSTAGG D1 and D1 has TYPE
---R   [4] D -> D from D if D has PADICCT D1
+--R   [3] D -> D from D if D has LZSTAGG(D1) and D1 has TYPE
+--R   [4] D -> D from D if D has PADICCT(D1)
 --R   [5] D -> D from D
 --R            if D has PSCAT(D1,D2,D3) and D1 has RING and D2 has OAMON 
 --R            and D3 has ORDSET
@@ -1348,7 +1336,8 @@
 --R 
 --R
 --RThere is one exposed function called cyclicEqual? :
---R   [1] (Tree D2,Tree D2) -> Boolean from Tree D2 if D2 has SETCAT
+--R   [1] (Tree(D2),Tree(D2)) -> Boolean from Tree(D2) if D2 has SETCAT
+--R         
 --R
 --RExamples of cyclicEqual? from Tree
 --R
@@ -1365,7 +1354,7 @@
 --RThere are 2 exposed functions called ncols :
 --R   [1] D -> NonNegativeInteger from D
 --R            if D has ARR2CAT(D2,D3,D4) and D2 has TYPE and D3 has FLAGG
---R            D2 and D4 has FLAGG D2
+--R            (D2) and D4 has FLAGG(D2)
 --R   [2] D -> NonNegativeInteger from D
 --R            if D has RMATCAT(D2,D3,D4,D5,D6) and D4 has RING and D5 has
 --R            DIRPCAT(D3,D4) and D6 has DIRPCAT(D2,D4)
@@ -1385,9 +1374,9 @@
 --R 
 --R
 --RThere is one exposed function called inverseIntegralMatrixAtInfinity :
---R   [1]  -> Matrix Fraction D3 from D
---R            if D has FFCAT(D2,D3,D4) and D2 has UFD and D3 has UPOLYC 
---R            D2 and D4 has UPOLYC FRAC D3
+--R   [1]  -> Matrix(Fraction(D3)) from D
+--R            if D has FFCAT(D2,D3,D4) and D2 has UFD and D3 has UPOLYC(
+--R            D2) and D4 has UPOLYC(FRAC(D3))
 --R
 --RExamples of inverseIntegralMatrixAtInfinity from FunctionFieldCategory
 --R
@@ -1419,8 +1408,8 @@
 --R 
 --R
 --RThere are 2 exposed functions called cyclic? :
---R   [1] D -> Boolean from D if D has RCAGG D2 and D2 has TYPE
---R   [2] Tree D2 -> Boolean from Tree D2 if D2 has SETCAT
+--R   [1] D -> Boolean from D if D has RCAGG(D2) and D2 has TYPE
+--R   [2] Tree(D2) -> Boolean from Tree(D2) if D2 has SETCAT
 --R
 --RExamples of cyclic? from RecursiveAggregate
 --R
@@ -1437,8 +1426,8 @@
 --R 
 --R
 --RThere is one exposed function called nilFactor :
---R   [1] (D1,Integer) -> Factored D1 from Factored D1 if D1 has INTDOM
---R         
+--R   [1] (D1,Integer) -> Factored(D1) from Factored(D1) if D1 has INTDOM
+--R            
 --R
 --RExamples of nilFactor from Factored
 --R
@@ -1471,8 +1460,8 @@
 --R 
 --R
 --RThere is one exposed function called balancedBinaryTree :
---R   [1] (NonNegativeInteger,D2) -> BalancedBinaryTree D2
---R            from BalancedBinaryTree D2 if D2 has SETCAT
+--R   [1] (NonNegativeInteger,D2) -> BalancedBinaryTree(D2)
+--R            from BalancedBinaryTree(D2) if D2 has SETCAT
 --R
 --RExamples of balancedBinaryTree from BalancedBinaryTree
 --R
@@ -1485,9 +1474,9 @@
 --R 
 --R
 --RThere is one exposed function called integralBasisAtInfinity :
---R   [1]  -> Vector D from D
---R            if D2 has UFD and D3 has UPOLYC D2 and D4 has UPOLYC FRAC 
---R            D3 and D has FFCAT(D2,D3,D4)
+--R   [1]  -> Vector(D) from D
+--R            if D2 has UFD and D3 has UPOLYC(D2) and D4 has UPOLYC(FRAC(
+--R            D3)) and D has FFCAT(D2,D3,D4)
 --R
 --RExamples of integralBasisAtInfinity from FunctionFieldCategory
 --R
@@ -1504,8 +1493,8 @@
 --R
 --RThere is one exposed function called branchPointAtInfinity? :
 --R   [1]  -> Boolean from D
---R            if D has FFCAT(D2,D3,D4) and D2 has UFD and D3 has UPOLYC 
---R            D2 and D4 has UPOLYC FRAC D3
+--R            if D has FFCAT(D2,D3,D4) and D2 has UFD and D3 has UPOLYC(
+--R            D2) and D4 has UPOLYC(FRAC(D3))
 --R
 --RExamples of branchPointAtInfinity? from FunctionFieldCategory
 --R
@@ -1531,11 +1520,11 @@
 --R            from CartesianTensor(D1,D2,D3)
 --R            if D1: INT and D2: NNI and D3 has COMRING
 --R   [3] D -> D from D
---R            if D has MATCAT(D1,D2,D3) and D1 has RING and D2 has FLAGG 
---R            D1 and D3 has FLAGG D1
+--R            if D has MATCAT(D1,D2,D3) and D1 has RING and D2 has FLAGG(
+--R            D1) and D3 has FLAGG(D1)
 --R   [4] D1 -> D from D
---R            if D2 has RING and D has MATCAT(D2,D1,D3) and D1 has FLAGG 
---R            D2 and D3 has FLAGG D2
+--R            if D2 has RING and D has MATCAT(D2,D1,D3) and D1 has FLAGG(
+--R            D2) and D3 has FLAGG(D2)
 --R
 --RThere is one unexposed function called transpose :
 --R   [1] SquareMatrix(D1,D2) -> SquareMatrix(D1,D2) from SquareMatrix(D1,
@@ -1571,10 +1560,10 @@
 --R 
 --R
 --RThere are 2 exposed functions called setrest! :
---R   [1] (Stream D2,Integer,Stream D2) -> Stream D2 from Stream D2 if D2 
---R            has TYPE
+--R   [1] (Stream(D2),Integer,Stream(D2)) -> Stream(D2) from Stream(D2)
+--R            if D2 has TYPE
 --R   [2] (D,D) -> D from D
---R            if D has shallowlyMutable and D has URAGG D1 and D1 has 
+--R            if D has shallowlyMutable and D has URAGG(D1) and D1 has 
 --R            TYPE
 --R
 --RExamples of setrest! from Stream
@@ -1591,7 +1580,6 @@
 
 --S 35 of 127
 )d op **
---R 
 --R
 --RThere are 21 exposed functions called ** :
 --R   [1] (CardinalNumber,CardinalNumber) -> CardinalNumber from 
@@ -1601,7 +1589,7 @@
 --R   [4] (D,D) -> D from D if D has ELEMFUN
 --R   [5] (Float,Float) -> Float from Float
 --R   [6] (D,NonNegativeInteger) -> D from D
---R            if D has FS D2 and D2 has ORDSET and D2 has SGROUP
+--R            if D has FS(D2) and D2 has ORDSET and D2 has SGROUP
 --R   [7] (D,Integer) -> D from D if D has GROUP
 --R   [8] (PolynomialIdeals(D2,D3,D4,D5),NonNegativeInteger) -> 
 --R            PolynomialIdeals(D2,D3,D4,D5)
@@ -1609,82 +1597,83 @@
 --R            if D2 has FIELD and D3 has OAMONS and D4 has ORDSET and D5 
 --R            has POLYCAT(D2,D3,D4)
 --R   [9] ((D3 -> D3),NonNegativeInteger) -> (D3 -> D3) from 
---R            MappingPackage1 D3
+--R            MappingPackage1(D3)
 --R            if D3 has SETCAT
 --R   [10] (D,Integer) -> D from D
---R            if D has MATCAT(D2,D3,D4) and D2 has RING and D3 has FLAGG 
---R            D2 and D4 has FLAGG D2 and D2 has FIELD
+--R            if D has MATCAT(D2,D3,D4) and D2 has RING and D3 has FLAGG(
+--R            D2) and D4 has FLAGG(D2) and D2 has FIELD
 --R   [11] (D,NonNegativeInteger) -> D from D
---R            if D has MATCAT(D2,D3,D4) and D2 has RING and D3 has FLAGG 
---R            D2 and D4 has FLAGG D2
+--R            if D has MATCAT(D2,D3,D4) and D2 has RING and D3 has FLAGG(
+--R            D2) and D4 has FLAGG(D2)
 --R   [12] (ModuleOperator(D2,D3),Integer) -> ModuleOperator(D2,D3)
 --R            from ModuleOperator(D2,D3) if D2 has RING and D3 has 
---R            LMODULE D2
+--R            LMODULE(D2)
 --R   [13] (BasicOperator,Integer) -> ModuleOperator(D3,D4)
 --R            from ModuleOperator(D3,D4) if D3 has RING and D4 has 
---R            LMODULE D3
+--R            LMODULE(D3)
 --R   [14] (D,PositiveInteger) -> D from D if D has MONAD
 --R   [15] (D,NonNegativeInteger) -> D from D if D has MONADWU
 --R   [16] (D,NonNegativeInteger) -> D from D if D has MONOID
---R   [17] (MyExpression(D1,D2),MyExpression(D1,D2)) -> MyExpression(D1,D2
---R            )
---R            from MyExpression(D1,D2)
---R            if D1: SYMBOL and D2 has Join(Ring,OrderedSet,
---R            IntegralDomain)
---R   [18] (D,Fraction Integer) -> D from D if D has RADCAT
+--R   [17] (D,Fraction(Integer)) -> D from D if D has RADCAT
+--R   [18] (StochasticDifferential(D2),PositiveInteger) -> 
+--R            StochasticDifferential(D2)
+--R            from StochasticDifferential(D2)
+--R            if D2 has Join(OrderedSet,IntegralDomain)
 --R   [19] (D,PositiveInteger) -> D from D if D has SGROUP
 --R   [20] (D,Integer) -> D from D
 --R            if D has SMATCAT(D2,D3,D4,D5) and D3 has RING and D4 has 
 --R            DIRPCAT(D2,D3) and D5 has DIRPCAT(D2,D3) and D3 has FIELD
 --R         
 --R   [21] (D,D1) -> D from D
---R            if D has UTSCAT D1 and D1 has RING and D1 has FIELD
+--R            if D has UTSCAT(D1) and D1 has RING and D1 has FIELD
 --R
 --RThere are 18 unexposed functions called ** :
---R   [1] (D1,Fraction Integer) -> D1 from AlgebraicFunction(D3,D1)
---R            if D3 has RETRACT INT and D3 has Join(OrderedSet,
---R            IntegralDomain) and D1 has FS D3
+--R   [1] (D1,Fraction(Integer)) -> D1 from AlgebraicFunction(D3,D1)
+--R            if D3 has RETRACT(INT) and D3 has Join(OrderedSet,
+--R            IntegralDomain) and D1 has FS(D3)
 --R   [2] (D1,D1) -> D1 from CombinatorialFunction(D2,D1)
---R            if D2 has Join(OrderedSet,IntegralDomain) and D1 has FS D2
+--R            if D2 has Join(OrderedSet,IntegralDomain) and D1 has FS(D2)
 --R            
---R   [3] (D1,Fraction Integer) -> D1
+--R   [3] (D1,Fraction(Integer)) -> D1
 --R            from ElementaryFunctionsUnivariateLaurentSeries(D3,D4,D1)
---R            if D3 has FIELD and D3 has ALGEBRA FRAC INT and D4 has 
---R            UTSCAT D3 and D1 has ULSCCAT(D3,D4)
---R   [4] (D1,Fraction Integer) -> D1
+--R            if D3 has FIELD and D3 has ALGEBRA(FRAC(INT)) and D4 has 
+--R            UTSCAT(D3) and D1 has ULSCCAT(D3,D4)
+--R   [4] (D1,Fraction(Integer)) -> D1
 --R            from ElementaryFunctionsUnivariatePuiseuxSeries(D3,D4,D1,D5
 --R            )
---R            if D3 has FIELD and D3 has ALGEBRA FRAC INT and D4 has 
---R            ULSCAT D3 and D1 has UPXSCCA(D3,D4) and D5 has PTRANFN D4
---R         
---R   [5] (D1,Integer) -> FreeGroup D1 from FreeGroup D1 if D1 has SETCAT
+--R            if D3 has FIELD and D3 has ALGEBRA(FRAC(INT)) and D4 has 
+--R            ULSCAT(D3) and D1 has UPXSCCA(D3,D4) and D5 has PTRANFN(D4)
 --R            
---R   [6] (D1,NonNegativeInteger) -> FreeMonoid D1 from FreeMonoid D1
+--R   [5] (D1,Integer) -> FreeGroup(D1) from FreeGroup(D1) if D1 has 
+--R            SETCAT
+--R   [6] (D1,NonNegativeInteger) -> FreeMonoid(D1) from FreeMonoid(D1)
 --R            if D1 has SETCAT
---R   [7] (Vector D3,Integer) -> Vector D3 from 
---R            InnerNormalBasisFieldFunctions D3
---R            if D3 has FFIELDC
+--R   [7] (Vector(D3),Integer) -> Vector(D3)
+--R            from InnerNormalBasisFieldFunctions(D3) if D3 has FFIELDC
+--R         
 --R   [8] (InputForm,Integer) -> InputForm from InputForm
 --R   [9] (InputForm,NonNegativeInteger) -> InputForm from InputForm
---R   [10] (Matrix D3,NonNegativeInteger) -> Matrix D3
---R            from StorageEfficientMatrixOperations D3 if D3 has RING
---R   [11] (D1,NonNegativeInteger) -> OrderedFreeMonoid D1
---R            from OrderedFreeMonoid D1 if D1 has ORDSET
---R   [12] (Operator D2,Integer) -> Operator D2 from Operator D2 if D2 has
---R            RING
---R   [13] (BasicOperator,Integer) -> Operator D3 from Operator D3 if D3 
+--R   [10] (Matrix(D3),NonNegativeInteger) -> Matrix(D3)
+--R            from StorageEfficientMatrixOperations(D3) if D3 has RING
+--R         
+--R   [11] (D1,NonNegativeInteger) -> OrderedFreeMonoid(D1)
+--R            from OrderedFreeMonoid(D1) if D1 has ORDSET
+--R   [12] (Operator(D2),Integer) -> Operator(D2) from Operator(D2) if D2 
+--R            has RING
+--R   [13] (BasicOperator,Integer) -> Operator(D3) from Operator(D3) if D3
 --R            has RING
 --R   [14] (OutputForm,OutputForm) -> OutputForm from OutputForm
---R   [15] (Pattern D1,Pattern D1) -> Pattern D1 from Pattern D1 if D1 has
---R            SETCAT
---R   [16] (Pattern D2,NonNegativeInteger) -> Pattern D2 from Pattern D2
+--R   [15] (Pattern(D1),Pattern(D1)) -> Pattern(D1) from Pattern(D1)
+--R            if D1 has SETCAT
+--R   [16] (Pattern(D2),NonNegativeInteger) -> Pattern(D2) from Pattern(D2
+--R            )
 --R            if D2 has SETCAT
---R   [17] (Stream D2,Stream D2) -> Stream D2
---R            from StreamTranscendentalFunctionsNonCommutative D2
---R            if D2 has ALGEBRA FRAC INT
---R   [18] (Stream D2,Stream D2) -> Stream D2
---R            from StreamTranscendentalFunctions D2 if D2 has ALGEBRA 
---R            FRAC INT
+--R   [17] (Stream(D2),Stream(D2)) -> Stream(D2)
+--R            from StreamTranscendentalFunctionsNonCommutative(D2)
+--R            if D2 has ALGEBRA(FRAC(INT))
+--R   [18] (Stream(D2),Stream(D2)) -> Stream(D2)
+--R            from StreamTranscendentalFunctions(D2)
+--R            if D2 has ALGEBRA(FRAC(INT))
 --R
 --RExamples of ** from AlgebraicFunction
 --R
@@ -1767,9 +1756,6 @@
 --RExamples of ** from Monoid
 --R
 --R
---RExamples of ** from MyExpression
---R
---R
 --RExamples of ** from OrderedFreeMonoid
 --R
 --Rm1:=(y**3)$OFMONOID(Symbol)
@@ -1787,6 +1773,9 @@
 --RExamples of ** from RadicalCategory
 --R
 --R
+--RExamples of ** from StochasticDifferential
+--R
+--R
 --RExamples of ** from SemiGroup
 --R
 --R
@@ -1808,39 +1797,40 @@
 --R 
 --R
 --RThere are 12 unexposed functions called plot :
---R   [1] (D2,Symbol,Segment DoubleFloat) -> Plot from PlotFunctions1 D2
---R            if D2 has KONVERT INFORM
---R   [2] (D2,D2,Symbol,Segment DoubleFloat) -> Plot from PlotFunctions1 
---R            D2
---R            if D2 has KONVERT INFORM
---R   [3] (Plot3D,Segment DoubleFloat) -> Plot3D from Plot3D
+--R   [1] (D2,Symbol,Segment(DoubleFloat)) -> Plot from PlotFunctions1(D2)
+--R            if D2 has KONVERT(INFORM)
+--R   [2] (D2,D2,Symbol,Segment(DoubleFloat)) -> Plot from PlotFunctions1(
+--R            D2)
+--R            if D2 has KONVERT(INFORM)
+--R   [3] (Plot3D,Segment(DoubleFloat)) -> Plot3D from Plot3D
 --R   [4] ((DoubleFloat -> DoubleFloat),(DoubleFloat -> DoubleFloat),(
---R            DoubleFloat -> DoubleFloat),(DoubleFloat -> DoubleFloat),Segment 
---R            DoubleFloat,Segment DoubleFloat,Segment DoubleFloat,Segment 
---R            DoubleFloat) -> Plot3D
+--R            DoubleFloat -> DoubleFloat),(DoubleFloat -> DoubleFloat),Segment(
+--R            DoubleFloat),Segment(DoubleFloat),Segment(DoubleFloat),Segment(
+--R            DoubleFloat)) -> Plot3D
 --R            from Plot3D
 --R   [5] ((DoubleFloat -> DoubleFloat),(DoubleFloat -> DoubleFloat),(
---R            DoubleFloat -> DoubleFloat),(DoubleFloat -> DoubleFloat),Segment 
---R            DoubleFloat) -> Plot3D
+--R            DoubleFloat -> DoubleFloat),(DoubleFloat -> DoubleFloat),Segment(
+--R            DoubleFloat)) -> Plot3D
 --R            from Plot3D
---R   [6] (Plot,Segment DoubleFloat) -> Plot from Plot
+--R   [6] (Plot,Segment(DoubleFloat)) -> Plot from Plot
 --R   [7] ((DoubleFloat -> DoubleFloat),(DoubleFloat -> DoubleFloat),
---R            Segment DoubleFloat,Segment DoubleFloat,Segment DoubleFloat) -> 
---R            Plot
+--R            Segment(DoubleFloat),Segment(DoubleFloat),Segment(DoubleFloat))
+--R             -> Plot
 --R            from Plot
 --R   [8] ((DoubleFloat -> DoubleFloat),(DoubleFloat -> DoubleFloat),
---R            Segment DoubleFloat) -> Plot
+--R            Segment(DoubleFloat)) -> Plot
 --R            from Plot
---R   [9] (List (DoubleFloat -> DoubleFloat),Segment DoubleFloat,Segment 
---R            DoubleFloat) -> Plot
+--R   [9] (List((DoubleFloat -> DoubleFloat)),Segment(DoubleFloat),Segment
+--R            (DoubleFloat)) -> Plot
 --R            from Plot
---R   [10] (List (DoubleFloat -> DoubleFloat),Segment DoubleFloat) -> Plot
+--R   [10] (List((DoubleFloat -> DoubleFloat)),Segment(DoubleFloat)) -> 
+--R            Plot
 --R            from Plot
---R   [11] ((DoubleFloat -> DoubleFloat),Segment DoubleFloat,Segment 
---R            DoubleFloat) -> Plot
+--R   [11] ((DoubleFloat -> DoubleFloat),Segment(DoubleFloat),Segment(
+--R            DoubleFloat)) -> Plot
+--R            from Plot
+--R   [12] ((DoubleFloat -> DoubleFloat),Segment(DoubleFloat)) -> Plot 
 --R            from Plot
---R   [12] ((DoubleFloat -> DoubleFloat),Segment DoubleFloat) -> Plot from
---R            Plot
 --R
 --RExamples of plot from PlotFunctions1
 --R
@@ -1860,16 +1850,16 @@
 --R 
 --R
 --RThere is one exposed function called factorList :
---R   [1] Factored D2 -> List Record(flg: Union("nil","sqfr","irred",
---R            "prime"),fctr: D2,xpnt: Integer)
---R            from Factored D2 if D2 has INTDOM
+--R   [1] Factored(D2) -> List(Record(flg: Union("nil","sqfr","irred",
+--R            "prime"),fctr: D2,xpnt: Integer))
+--R            from Factored(D2) if D2 has INTDOM
 --R
 --RThere is one unexposed function called factorList :
 --R   [1] (D2,NonNegativeInteger,NonNegativeInteger,NonNegativeInteger)
---R             -> List SparseUnivariatePolynomial D2
+--R             -> List(SparseUnivariatePolynomial(D2))
 --R            from ChineseRemainderToolsForIntegralBases(D2,D4,D5)
---R            if D2 has FFIELDC and D4 has UPOLYC D2 and D5 has UPOLYC D4
---R            
+--R            if D2 has FFIELDC and D4 has UPOLYC(D2) and D5 has UPOLYC(
+--R            D4)
 --R
 --RExamples of factorList from Factored
 --R
@@ -1886,7 +1876,7 @@
 --R 
 --R
 --RThere is one exposed function called physicalLength :
---R   [1] FlexibleArray D2 -> NonNegativeInteger from FlexibleArray D2
+--R   [1] FlexibleArray(D2) -> NonNegativeInteger from FlexibleArray(D2)
 --R            if D2 has TYPE
 --R
 --RThere is one unexposed function called physicalLength :
@@ -1911,13 +1901,13 @@
 --R
 --RThere is one exposed function called absolutelyIrreducible? :
 --R   [1]  -> Boolean from D
---R            if D has FFCAT(D2,D3,D4) and D2 has UFD and D3 has UPOLYC 
---R            D2 and D4 has UPOLYC FRAC D3
+--R            if D has FFCAT(D2,D3,D4) and D2 has UFD and D3 has UPOLYC(
+--R            D2) and D4 has UPOLYC(FRAC(D3))
 --R
 --RThere is one unexposed function called absolutelyIrreducible? :
 --R   [1]  -> Boolean from FunctionFieldCategory&(D2,D3,D4,D5)
---R            if D3 has UFD and D4 has UPOLYC D3 and D5 has UPOLYC FRAC 
---R            D4 and D2 has FFCAT(D3,D4,D5)
+--R            if D3 has UFD and D4 has UPOLYC(D3) and D5 has UPOLYC(FRAC(
+--R            D4)) and D2 has FFCAT(D3,D4,D5)
 --R
 --RExamples of absolutelyIrreducible? from FunctionFieldCategory&
 --R
@@ -1941,7 +1931,7 @@
 --R 
 --R
 --RThere is one exposed function called repeating? :
---R   [1] (List D3,Stream D3) -> Boolean from Stream D3
+--R   [1] (List(D3),Stream(D3)) -> Boolean from Stream(D3)
 --R            if D3 has SETCAT and D3 has TYPE
 --R
 --RExamples of repeating? from Stream
@@ -1957,7 +1947,7 @@
 --R 
 --R
 --RThere is one exposed function called lazy? :
---R   [1] D -> Boolean from D if D has LZSTAGG D2 and D2 has TYPE
+--R   [1] D -> Boolean from D if D has LZSTAGG(D2) and D2 has TYPE
 --R
 --RExamples of lazy? from LazyStreamAggregate
 --R
@@ -1987,7 +1977,7 @@
 --RThere is one exposed function called setColumn! :
 --R   [1] (D,Integer,D2) -> D from D
 --R            if D has ARR2CAT(D3,D4,D2) and D3 has TYPE and D4 has FLAGG
---R            D3 and D2 has FLAGG D3
+--R            (D3) and D2 has FLAGG(D3)
 --R
 --RExamples of setColumn! from TwoDimensionalArrayCategory
 --R
@@ -2018,8 +2008,8 @@
 --R 
 --R
 --RThere is one exposed function called physicalLength! :
---R   [1] (FlexibleArray D2,Integer) -> FlexibleArray D2 from 
---R            FlexibleArray D2
+--R   [1] (FlexibleArray(D2),Integer) -> FlexibleArray(D2) from 
+--R            FlexibleArray(D2)
 --R            if D2 has TYPE
 --R
 --RThere is one unexposed function called physicalLength! :
@@ -2062,24 +2052,24 @@
 --R 
 --R
 --RThere are 11 exposed functions called extend :
---R   [1] (ContinuedFraction D2,Integer) -> ContinuedFraction D2
---R            from ContinuedFraction D2 if D2 has EUCDOM
---R   [2] (D,Integer) -> D from D if D has LZSTAGG D2 and D2 has TYPE
+--R   [1] (ContinuedFraction(D2),Integer) -> ContinuedFraction(D2)
+--R            from ContinuedFraction(D2) if D2 has EUCDOM
+--R   [2] (D,Integer) -> D from D if D has LZSTAGG(D2) and D2 has TYPE
 --R   [3] (D,NonNegativeInteger) -> D from D
 --R            if D has MTSCAT(D2,D3) and D2 has RING and D3 has ORDSET
 --R         
---R   [4] (D,Integer) -> D from D if D has PADICCT D2
---R   [5] (D,List D2) -> D from D if D has PTCAT D2 and D2 has RING
---R   [6] (List D6,List D) -> List D from D
+--R   [4] (D,Integer) -> D from D if D has PADICCT(D2)
+--R   [5] (D,List(D2)) -> D from D if D has PTCAT(D2) and D2 has RING
+--R   [6] (List(D6),List(D)) -> List(D) from D
 --R            if D has RSETCAT(D3,D4,D5,D6) and D3 has GCDDOM and D4 has 
 --R            OAMONS and D5 has ORDSET and D6 has RPOLCAT(D3,D4,D5)
---R   [7] (List D6,D) -> List D from D
+--R   [7] (List(D6),D) -> List(D) from D
 --R            if D6 has RPOLCAT(D3,D4,D5) and D3 has GCDDOM and D4 has 
 --R            OAMONS and D5 has ORDSET and D has RSETCAT(D3,D4,D5,D6)
---R   [8] (D2,List D) -> List D from D
+--R   [8] (D2,List(D)) -> List(D) from D
 --R            if D has RSETCAT(D3,D4,D5,D2) and D3 has GCDDOM and D4 has 
 --R            OAMONS and D5 has ORDSET and D2 has RPOLCAT(D3,D4,D5)
---R   [9] (D2,D) -> List D from D
+--R   [9] (D2,D) -> List(D) from D
 --R            if D3 has GCDDOM and D4 has OAMONS and D5 has ORDSET and D2
 --R            has RPOLCAT(D3,D4,D5) and D has RSETCAT(D3,D4,D5,D2)
 --R   [10] (D,D1) -> D from D
@@ -2123,32 +2113,33 @@
 --R 
 --R
 --RThere are 5 exposed functions called length :
---R   [1] Dequeue D2 -> NonNegativeInteger from Dequeue D2 if D2 has 
+--R   [1] Dequeue(D2) -> NonNegativeInteger from Dequeue(D2) if D2 has 
 --R            SETCAT
 --R   [2] D -> D from D if D has INS
---R   [3] D -> NonNegativeInteger from D if D has QUAGG D2 and D2 has TYPE
+--R   [3] D -> NonNegativeInteger from D if D has QUAGG(D2) and D2 has 
+--R            TYPE
+--R   [4] Queue(D2) -> NonNegativeInteger from Queue(D2) if D2 has SETCAT
 --R            
---R   [4] Queue D2 -> NonNegativeInteger from Queue D2 if D2 has SETCAT
---R         
 --R   [5] D -> D1 from D
---R            if D has VECTCAT D1 and D1 has TYPE and D1 has RADCAT and 
+--R            if D has VECTCAT(D1) and D1 has TYPE and D1 has RADCAT and 
 --R            D1 has RING
 --R
 --RThere are 6 unexposed functions called length :
 --R   [1] D2 -> D1 from GaloisGroupFactorizationUtilities(D3,D2,D1)
 --R            if D3 has RING and D1 has Join(FloatingPointSystem,
---R            RetractableTo D3,Field,TranscendentalFunctionCategory,
---R            ElementaryFunctionCategory) and D2 has UPOLYC D3
---R   [2] LyndonWord D2 -> PositiveInteger from LyndonWord D2 if D2 has 
+--R            RetractableTo(D3),Field,TranscendentalFunctionCategory,
+--R            ElementaryFunctionCategory) and D2 has UPOLYC(D3)
+--R   [2] LyndonWord(D2) -> PositiveInteger from LyndonWord(D2) if D2 has 
 --R            ORDSET
---R   [3] Magma D2 -> PositiveInteger from Magma D2 if D2 has ORDSET
---R   [4] OrderedFreeMonoid D2 -> NonNegativeInteger from 
---R            OrderedFreeMonoid D2
+--R   [3] Magma(D2) -> PositiveInteger from Magma(D2) if D2 has ORDSET
+--R   [4] OrderedFreeMonoid(D2) -> NonNegativeInteger from 
+--R            OrderedFreeMonoid(D2)
 --R            if D2 has ORDSET
---R   [5] PoincareBirkhoffWittLyndonBasis D2 -> NonNegativeInteger
---R            from PoincareBirkhoffWittLyndonBasis D2 if D2 has ORDSET
+--R   [5] PoincareBirkhoffWittLyndonBasis(D2) -> NonNegativeInteger
+--R            from PoincareBirkhoffWittLyndonBasis(D2) if D2 has ORDSET
+--R         
+--R   [6] Tuple(D2) -> NonNegativeInteger from Tuple(D2) if D2 has TYPE
 --R         
---R   [6] Tuple D2 -> NonNegativeInteger from Tuple D2 if D2 has TYPE
 --R
 --RExamples of length from Dequeue
 --R
@@ -2202,18 +2193,12 @@
 --R 
 --R
 --RThere are 2 exposed functions called viewPosDefault :
---R   [1]  -> List NonNegativeInteger from ViewDefaultsPackage
---R   [2] List NonNegativeInteger -> List NonNegativeInteger
+--R   [1]  -> List(NonNegativeInteger) from ViewDefaultsPackage
+--R   [2] List(NonNegativeInteger) -> List(NonNegativeInteger)
 --R            from ViewDefaultsPackage
 --R
 --RExamples of viewPosDefault from ViewDefaultsPackage
 --R
---Iand Y position of a viewport window unless overriden explicityly, ...
---Rand Y coordinates x, y.
---R
---Iand Y position of a viewport window unless overriden explicityly, ...
---Rand Y coordinate.
---R
 --E 49
 
 --S 50 of 127
@@ -2221,33 +2206,34 @@
 --R 
 --R
 --RThere are 5 exposed functions called groebner :
---R   [1] List D5 -> List D5 from GroebnerPackage(D2,D3,D4,D5)
+--R   [1] List(D5) -> List(D5) from GroebnerPackage(D2,D3,D4,D5)
 --R            if D5 has POLYCAT(D2,D3,D4) and D2 has GCDDOM and D3 has 
 --R            OAMONS and D4 has ORDSET
---R   [2] (List D6,String) -> List D6 from GroebnerPackage(D3,D4,D5,D6)
+--R   [2] (List(D6),String) -> List(D6) from GroebnerPackage(D3,D4,D5,D6)
 --R            if D6 has POLYCAT(D3,D4,D5) and D3 has GCDDOM and D4 has 
 --R            OAMONS and D5 has ORDSET
---R   [3] (List D6,String,String) -> List D6 from GroebnerPackage(D3,D4,D5
---R            ,D6)
+--R   [3] (List(D6),String,String) -> List(D6) from GroebnerPackage(D3,D4,
+--R            D5,D6)
 --R            if D6 has POLYCAT(D3,D4,D5) and D3 has GCDDOM and D4 has 
 --R            OAMONS and D5 has ORDSET
 --R   [4] PolynomialIdeals(D1,D2,D3,D4) -> PolynomialIdeals(D1,D2,D3,D4)
 --R            from PolynomialIdeals(D1,D2,D3,D4)
 --R            if D1 has FIELD and D2 has OAMONS and D3 has ORDSET and D4 
 --R            has POLYCAT(D1,D2,D3)
---R   [5] List D6 -> List D6 from InterfaceGroebnerPackage(D2,D3,D4,D5,D6)
+--R   [5] List(D6) -> List(D6) from InterfaceGroebnerPackage(D2,D3,D4,D5,
+--R            D6)
 --R            if D6 has POLYCAT(D2,D4,D5) and D2 has FIELD and D4 has 
---R            OAMONS and D5 has ORDSET and D3: LIST SYMBOL
+--R            OAMONS and D5 has ORDSET and D3: LIST(SYMBOL)
 --R
 --RThere are 2 unexposed functions called groebner :
---R   [1] List Polynomial D2 -> List Polynomial D2 from FGLMIfCanPackage(
---R            D2,D3)
---R            if D2 has GCDDOM and D3: LIST SYMBOL
---R   [2] List NewSparseMultivariatePolynomial(D2,OrderedVariableList D3)
---R             -> List NewSparseMultivariatePolynomial(D2,OrderedVariableList 
---R            D3)
+--R   [1] List(Polynomial(D2)) -> List(Polynomial(D2))
+--R            from FGLMIfCanPackage(D2,D3) if D2 has GCDDOM and D3: LIST(
+--R            SYMBOL)
+--R   [2] List(NewSparseMultivariatePolynomial(D2,OrderedVariableList(D3))
+--R            ) -> List(NewSparseMultivariatePolynomial(D2,OrderedVariableList(
+--R            D3)))
 --R            from LexTriangularPackage(D2,D3)
---R            if D2 has GCDDOM and D3: LIST SYMBOL
+--R            if D2 has GCDDOM and D3: LIST(SYMBOL)
 --R
 --RExamples of groebner from FGLMIfCanPackage
 --R
@@ -2301,8 +2287,8 @@
 --R 
 --R
 --RThere is one exposed function called primeFactor :
---R   [1] (D1,Integer) -> Factored D1 from Factored D1 if D1 has INTDOM
---R         
+--R   [1] (D1,Integer) -> Factored(D1) from Factored(D1) if D1 has INTDOM
+--R            
 --R
 --RExamples of primeFactor from Factored
 --R
@@ -2318,19 +2304,20 @@
 --RThere are 7 exposed functions called map! :
 --R   [1] ((D2 -> D2),D) -> D from D
 --R            if D has ARR2CAT(D2,D3,D4) and D2 has TYPE and D3 has FLAGG
---R            D2 and D4 has FLAGG D2
---R   [2] ((D2 -> D2),ArrayStack D2) -> ArrayStack D2 from ArrayStack D2
+--R            (D2) and D4 has FLAGG(D2)
+--R   [2] ((D2 -> D2),ArrayStack(D2)) -> ArrayStack(D2) from ArrayStack(D2
+--R            )
 --R            if $ has shallowlyMutable and D2 has SETCAT
---R   [3] ((D2 -> D2),Dequeue D2) -> Dequeue D2 from Dequeue D2
+--R   [3] ((D2 -> D2),Dequeue(D2)) -> Dequeue(D2) from Dequeue(D2)
 --R            if $ has shallowlyMutable and D2 has SETCAT
---R   [4] ((D2 -> D2),Heap D2) -> Heap D2 from Heap D2
+--R   [4] ((D2 -> D2),Heap(D2)) -> Heap(D2) from Heap(D2)
 --R            if $ has shallowlyMutable and D2 has ORDSET
 --R   [5] ((D2 -> D2),D) -> D from D
---R            if D has shallowlyMutable and D has HOAGG D2 and D2 has 
+--R            if D has shallowlyMutable and D has HOAGG(D2) and D2 has 
 --R            TYPE
---R   [6] ((D2 -> D2),Queue D2) -> Queue D2 from Queue D2
+--R   [6] ((D2 -> D2),Queue(D2)) -> Queue(D2) from Queue(D2)
 --R            if $ has shallowlyMutable and D2 has SETCAT
---R   [7] ((D2 -> D2),Stack D2) -> Stack D2 from Stack D2
+--R   [7] ((D2 -> D2),Stack(D2)) -> Stack(D2) from Stack(D2)
 --R            if $ has shallowlyMutable and D2 has SETCAT
 --R
 --RExamples of map! from TwoDimensionalArrayCategory
@@ -2383,8 +2370,8 @@
 --R 
 --R
 --RThere is one exposed function called setleaves! :
---R   [1] (BalancedBinaryTree D2,List D2) -> BalancedBinaryTree D2
---R            from BalancedBinaryTree D2 if D2 has SETCAT
+--R   [1] (BalancedBinaryTree(D2),List(D2)) -> BalancedBinaryTree(D2)
+--R            from BalancedBinaryTree(D2) if D2 has SETCAT
 --R
 --RExamples of setleaves! from BalancedBinaryTree
 --R
@@ -2398,8 +2385,8 @@
 --R 
 --R
 --RThere are 8 exposed functions called scan :
---R   [1] (((D5,D4) -> D4),OneDimensionalArray D5,D4) -> 
---R            OneDimensionalArray D4
+--R   [1] (((D5,D4) -> D4),OneDimensionalArray(D5),D4) -> 
+--R            OneDimensionalArray(D4)
 --R            from OneDimensionalArrayFunctions2(D5,D4)
 --R            if D5 has TYPE and D4 has TYPE
 --R   [2] (((D6,D4) -> D4),DirectProduct(D5,D6),D4) -> DirectProduct(D5,D4
@@ -2408,22 +2395,22 @@
 --R            if D5: NNI and D6 has TYPE and D4 has TYPE
 --R   [3] (((D5,D4) -> D4),D3,D4) -> D1
 --R            from FiniteLinearAggregateFunctions2(D5,D3,D4,D1)
---R            if D5 has TYPE and D4 has TYPE and D1 has FLAGG D4 and D3 
---R            has FLAGG D5
+--R            if D5 has TYPE and D4 has TYPE and D1 has FLAGG(D4) and D3 
+--R            has FLAGG(D5)
 --R   [4] (((D5,D4) -> D4),D3,D4) -> D1
 --R            from FiniteSetAggregateFunctions2(D5,D3,D4,D1)
---R            if D5 has SETCAT and D4 has SETCAT and D1 has FSAGG D4 and 
---R            D3 has FSAGG D5
---R   [5] (((D5,D4) -> D4),List D5,D4) -> List D4 from ListFunctions2(D5,
---R            D4)
+--R            if D5 has SETCAT and D4 has SETCAT and D1 has FSAGG(D4) and
+--R            D3 has FSAGG(D5)
+--R   [5] (((D5,D4) -> D4),List(D5),D4) -> List(D4) from ListFunctions2(D5
+--R            ,D4)
 --R            if D5 has TYPE and D4 has TYPE
---R   [6] (((D5,D4) -> D4),PrimitiveArray D5,D4) -> PrimitiveArray D4
+--R   [6] (((D5,D4) -> D4),PrimitiveArray(D5),D4) -> PrimitiveArray(D4)
 --R            from PrimitiveArrayFunctions2(D5,D4)
 --R            if D5 has TYPE and D4 has TYPE
---R   [7] (D2,((D5,D2) -> D2),Stream D5) -> Stream D2
+--R   [7] (D2,((D5,D2) -> D2),Stream(D5)) -> Stream(D2)
 --R            from StreamFunctions2(D5,D2) if D5 has TYPE and D2 has TYPE
 --R            
---R   [8] (((D5,D4) -> D4),Vector D5,D4) -> Vector D4
+--R   [8] (((D5,D4) -> D4),Vector(D5),D4) -> Vector(D4)
 --R            from VectorFunctions2(D5,D4) if D5 has TYPE and D4 has TYPE
 --R            
 --R
@@ -2485,14 +2472,14 @@
 --RThere are 15 exposed functions called + :
 --R   [1] (D,D) -> D from D if D has ABELSG
 --R   [2] (Color,Color) -> Color from Color
---R   [3] (Database D1,Database D1) -> Database D1 from Database D1
+--R   [3] (Database(D1),Database(D1)) -> Database(D1) from Database(D1)
 --R            if D1 has OrderedSet with 
 --R               ?.? : (%,Symbol) -> String
 --R               display : % -> Void
 --R               fullDisplay : % -> Void
---R   [4] (Equation D1,D1) -> Equation D1 from Equation D1
+--R   [4] (Equation(D1),D1) -> Equation(D1) from Equation(D1)
 --R            if D1 has ABELSG and D1 has TYPE
---R   [5] (D1,Equation D1) -> Equation D1 from Equation D1
+--R   [5] (D1,Equation(D1)) -> Equation(D1) from Equation(D1)
 --R            if D1 has ABELSG and D1 has TYPE
 --R   [6] (D1,D) -> D from D
 --R            if D has FAMONC(D1,D2) and D1 has SETCAT and D2 has CABMON
@@ -2500,8 +2487,8 @@
 --R   [7] (D1,FullPartialFractionExpansion(D2,D1)) -> 
 --R            FullPartialFractionExpansion(D2,D1)
 --R            from FullPartialFractionExpansion(D2,D1)
---R            if D2 has Join(Field,CharacteristicZero) and D1 has UPOLYC 
---R            D2
+--R            if D2 has Join(Field,CharacteristicZero) and D1 has UPOLYC(
+--R            D2)
 --R   [8] (D,D) -> D from D
 --R            if D has GRMOD(D1,D2) and D1 has COMRING and D2 has ABELMON
 --R            
@@ -2514,29 +2501,28 @@
 --R            D3)
 --R            if D2 has SETCAT and D3 has RING
 --R   [11] (D,D) -> D from D
---R            if D has MATCAT(D1,D2,D3) and D1 has RING and D2 has FLAGG 
---R            D1 and D3 has FLAGG D1
---R   [12] (D,Divisor D) -> Divisor D from D
+--R            if D has MATCAT(D1,D2,D3) and D1 has RING and D2 has FLAGG(
+--R            D1) and D3 has FLAGG(D1)
+--R   [12] (D,Divisor(D)) -> Divisor(D) from D
 --R            if D has PLACESC(D2,D3) and D2 has FIELD and D3 has LOCPOWC
---R            D2
---R   [13] (Divisor D,D) -> Divisor D from D
+--R            (D2)
+--R   [13] (Divisor(D),D) -> Divisor(D) from D
 --R            if D has PLACESC(D2,D3) and D2 has FIELD and D3 has LOCPOWC
---R            D2
---R   [14] (D,D) -> Divisor D from D
---R            if D2 has FIELD and D3 has LOCPOWC D2 and D has PLACESC(D2,
---R            D3)
+--R            (D2)
+--R   [14] (D,D) -> Divisor(D) from D
+--R            if D2 has FIELD and D3 has LOCPOWC(D2) and D has PLACESC(D2
+--R            ,D3)
 --R   [15] (D,D) -> D from D
---R            if D has VECTCAT D1 and D1 has TYPE and D1 has ABELSG
+--R            if D has VECTCAT(D1) and D1 has TYPE and D1 has ABELSG
 --R
 --RThere are 5 unexposed functions called + :
 --R   [1] (InputForm,InputForm) -> InputForm from InputForm
 --R   [2] (OutputForm,OutputForm) -> OutputForm from OutputForm
---R   [3] (Pattern D1,Pattern D1) -> Pattern D1 from Pattern D1 if D1 has 
---R            SETCAT
---R   [4] (Stream D2,Stream D2) -> Stream D2 from 
---R            StreamTaylorSeriesOperations D2
---R            if D2 has RING
---R   [5] (Point DoubleFloat,Point DoubleFloat) -> Point DoubleFloat
+--R   [3] (Pattern(D1),Pattern(D1)) -> Pattern(D1) from Pattern(D1)
+--R            if D1 has SETCAT
+--R   [4] (Stream(D2),Stream(D2)) -> Stream(D2)
+--R            from StreamTaylorSeriesOperations(D2) if D2 has RING
+--R   [5] (Point(DoubleFloat),Point(DoubleFloat)) -> Point(DoubleFloat)
 --R            from TubePlotTools
 --R
 --RExamples of + from AbelianSemiGroup
@@ -2608,14 +2594,14 @@
 --R   [3] (CardinalNumber,CardinalNumber) -> Union(CardinalNumber,"failed"
 --R            )
 --R            from CardinalNumber
---R   [4] (Database D1,Database D1) -> Database D1 from Database D1
+--R   [4] (Database(D1),Database(D1)) -> Database(D1) from Database(D1)
 --R            if D1 has OrderedSet with 
 --R               ?.? : (%,Symbol) -> String
 --R               display : % -> Void
 --R               fullDisplay : % -> Void
---R   [5] (Equation D1,D1) -> Equation D1 from Equation D1
+--R   [5] (Equation(D1),D1) -> Equation(D1) from Equation(D1)
 --R            if D1 has ABELGRP and D1 has TYPE
---R   [6] (D1,Equation D1) -> Equation D1 from Equation D1
+--R   [6] (D1,Equation(D1)) -> Equation(D1) from Equation(D1)
 --R            if D1 has ABELGRP and D1 has TYPE
 --R   [7] (D,D) -> D from D
 --R            if D has GRMOD(D1,D2) and D1 has COMRING and D2 has ABELMON
@@ -2627,37 +2613,36 @@
 --R            )
 --R            if D2 has SETCAT and D3 has RING
 --R   [10] D -> D from D
---R            if D has MATCAT(D1,D2,D3) and D1 has RING and D2 has FLAGG 
---R            D1 and D3 has FLAGG D1
+--R            if D has MATCAT(D1,D2,D3) and D1 has RING and D2 has FLAGG(
+--R            D1) and D3 has FLAGG(D1)
 --R   [11] (D,D) -> D from D
---R            if D has MATCAT(D1,D2,D3) and D1 has RING and D2 has FLAGG 
---R            D1 and D3 has FLAGG D1
---R   [12] D -> Divisor D from D
---R            if D2 has FIELD and D3 has LOCPOWC D2 and D has PLACESC(D2,
---R            D3)
---R   [13] (D,Divisor D) -> Divisor D from D
+--R            if D has MATCAT(D1,D2,D3) and D1 has RING and D2 has FLAGG(
+--R            D1) and D3 has FLAGG(D1)
+--R   [12] D -> Divisor(D) from D
+--R            if D2 has FIELD and D3 has LOCPOWC(D2) and D has PLACESC(D2
+--R            ,D3)
+--R   [13] (D,Divisor(D)) -> Divisor(D) from D
 --R            if D has PLACESC(D2,D3) and D2 has FIELD and D3 has LOCPOWC
---R            D2
---R   [14] (Divisor D,D) -> Divisor D from D
+--R            (D2)
+--R   [14] (Divisor(D),D) -> Divisor(D) from D
 --R            if D has PLACESC(D2,D3) and D2 has FIELD and D3 has LOCPOWC
---R            D2
---R   [15] (D,D) -> Divisor D from D
---R            if D2 has FIELD and D3 has LOCPOWC D2 and D has PLACESC(D2,
---R            D3)
+--R            (D2)
+--R   [15] (D,D) -> Divisor(D) from D
+--R            if D2 has FIELD and D3 has LOCPOWC(D2) and D has PLACESC(D2
+--R            ,D3)
 --R   [16] (D,D) -> D from D
---R            if D has VECTCAT D1 and D1 has TYPE and D1 has ABELGRP
---R   [17] D -> D from D if D has VECTCAT D1 and D1 has TYPE and D1 has 
---R            ABELGRP
+--R            if D has VECTCAT(D1) and D1 has TYPE and D1 has ABELGRP
+--R   [17] D -> D from D
+--R            if D has VECTCAT(D1) and D1 has TYPE and D1 has ABELGRP
 --R
 --RThere are 5 unexposed functions called - :
 --R   [1] OutputForm -> OutputForm from OutputForm
 --R   [2] (OutputForm,OutputForm) -> OutputForm from OutputForm
---R   [3] (Stream D2,Stream D2) -> Stream D2 from 
---R            StreamTaylorSeriesOperations D2
+--R   [3] (Stream(D2),Stream(D2)) -> Stream(D2)
+--R            from StreamTaylorSeriesOperations(D2) if D2 has RING
+--R   [4] Stream(D2) -> Stream(D2) from StreamTaylorSeriesOperations(D2)
 --R            if D2 has RING
---R   [4] Stream D2 -> Stream D2 from StreamTaylorSeriesOperations D2
---R            if D2 has RING
---R   [5] (Point DoubleFloat,Point DoubleFloat) -> Point DoubleFloat
+--R   [5] (Point(DoubleFloat),Point(DoubleFloat)) -> Point(DoubleFloat)
 --R            from TubePlotTools
 --R
 --RExamples of - from AbelianGroup
@@ -2714,7 +2699,6 @@
 
 --S 58 of 127
 )d op /
---R 
 --R
 --RThere are 14 exposed functions called / :
 --R   [1] (D,D1) -> D from D
@@ -2722,74 +2706,72 @@
 --R            has FIELD
 --R   [2] (DoubleFloat,Integer) -> DoubleFloat from DoubleFloat
 --R   [3] (D,D) -> D from D
---R            if D = EQ D1 and D1 has FIELD and D1 has TYPE or D = EQ D1 
---R            and D1 has GROUP and D1 has TYPE
+--R            if D = EQ(D1) and D1 has FIELD and D1 has TYPE or D = EQ(D1
+--R            ) and D1 has GROUP and D1 has TYPE
 --R   [4] (D,D) -> D from D if D has FIELD
 --R   [5] (Float,Integer) -> Float from Float
---R   [6] (SparseMultivariatePolynomial(D2,Kernel D),
---R            SparseMultivariatePolynomial(D2,Kernel D)) -> D
---R            from D if D2 has INTDOM and D2 has ORDSET and D has FS D2
---R         
+--R   [6] (SparseMultivariatePolynomial(D2,Kernel(D)),
+--R            SparseMultivariatePolynomial(D2,Kernel(D))) -> D
+--R            from D if D2 has INTDOM and D2 has ORDSET and D has FS(D2)
+--R            
 --R   [7] (D,D) -> D from D if D has GROUP
 --R   [8] (D,D1) -> D from D
---R            if D has LIECAT D1 and D1 has COMRING and D1 has FIELD
---R   [9] ((D2 -> Expression Integer),(D2 -> Expression Integer)) -> (D2
---R             -> Expression Integer)
+--R            if D has LIECAT(D1) and D1 has COMRING and D1 has FIELD
+--R   [9] ((D2 -> Expression(Integer)),(D2 -> Expression(Integer))) -> (D2
+--R             -> Expression(Integer))
 --R            from MappingPackage4(D2,D3) if D2 has SETCAT and D3 has 
 --R            RING
 --R   [10] (D,D1) -> D from D
---R            if D has MATCAT(D1,D2,D3) and D1 has RING and D2 has FLAGG 
---R            D1 and D3 has FLAGG D1 and D1 has FIELD
---R   [11] (MyExpression(D1,D2),MyExpression(D1,D2)) -> MyExpression(D1,D2
---R            )
---R            from MyExpression(D1,D2)
---R            if D1: SYMBOL and D2 has Join(Ring,OrderedSet,
---R            IntegralDomain)
---R   [12] (D1,D1) -> D from D if D has QFCAT D1 and D1 has INTDOM
---R   [13] (D,D1) -> D from D
+--R            if D has MATCAT(D1,D2,D3) and D1 has RING and D2 has FLAGG(
+--R            D1) and D3 has FLAGG(D1) and D1 has FIELD
+--R   [11] (D1,D1) -> D from D if D has QFCAT(D1) and D1 has INTDOM
+--R   [12] (D,D1) -> D from D
 --R            if D has RMATCAT(D2,D3,D1,D4,D5) and D1 has RING and D4 has
 --R            DIRPCAT(D3,D1) and D5 has DIRPCAT(D2,D1) and D1 has FIELD
 --R         
---R   [14] (D,D1) -> D from D if D has VSPACE D1 and D1 has FIELD
+--R   [13] (StochasticDifferential(D2),Expression(D2)) -> 
+--R            StochasticDifferential(D2)
+--R            from StochasticDifferential(D2)
+--R            if D2 has Join(OrderedSet,IntegralDomain)
+--R   [14] (D,D1) -> D from D if D has VSPACE(D1) and D1 has FIELD
 --R
 --RThere are 12 unexposed functions called / :
---R   [1] (Vector D2,Vector D2) -> Vector D2
---R            from InnerNormalBasisFieldFunctions D2 if D2 has FFIELDC
+--R   [1] (Vector(D2),Vector(D2)) -> Vector(D2)
+--R            from InnerNormalBasisFieldFunctions(D2) if D2 has FFIELDC
 --R         
 --R   [2] (InputForm,InputForm) -> InputForm from InputForm
 --R   [3] (D1,D2) -> LocalAlgebra(D1,D3,D2) from LocalAlgebra(D1,D3,D2)
---R            if D3 has COMRING and D1 has ALGEBRA D3 and D2 has 
+--R            if D3 has COMRING and D1 has ALGEBRA(D3) and D2 has 
 --R            SubsetCategory(Monoid,D3)
 --R   [4] (LocalAlgebra(D2,D3,D1),D1) -> LocalAlgebra(D2,D3,D1)
 --R            from LocalAlgebra(D2,D3,D1)
---R            if D3 has COMRING and D2 has ALGEBRA D3 and D1 has 
+--R            if D3 has COMRING and D2 has ALGEBRA(D3) and D1 has 
 --R            SubsetCategory(Monoid,D3)
 --R   [5] (D1,D2) -> Localize(D1,D3,D2) from Localize(D1,D3,D2)
---R            if D3 has COMRING and D1 has MODULE D3 and D2 has 
+--R            if D3 has COMRING and D1 has MODULE(D3) and D2 has 
 --R            SubsetCategory(Monoid,D3)
 --R   [6] (Localize(D2,D3,D1),D1) -> Localize(D2,D3,D1) from Localize(D2,
 --R            D3,D1)
---R            if D3 has COMRING and D2 has MODULE D3 and D1 has 
+--R            if D3 has COMRING and D2 has MODULE(D3) and D1 has 
 --R            SubsetCategory(Monoid,D3)
 --R   [7] (OutputForm,OutputForm) -> OutputForm from OutputForm
 --R   [8] (OrdinaryWeightedPolynomials(D1,D2,D3,D4),
 --R            OrdinaryWeightedPolynomials(D1,D2,D3,D4)) -> Union(
 --R            OrdinaryWeightedPolynomials(D1,D2,D3,D4),"failed")
 --R            from OrdinaryWeightedPolynomials(D1,D2,D3,D4)
---R            if D1 has FIELD and D1 has RING and D2: LIST SYMBOL and D3
---R            : LIST NNI and D4: NNI
---R   [9] (Pattern D1,Pattern D1) -> Pattern D1 from Pattern D1 if D1 has 
---R            SETCAT
---R   [10] (Stream D2,Stream D2) -> Stream D2 from 
---R            StreamTaylorSeriesOperations D2
---R            if D2 has RING
+--R            if D1 has FIELD and D1 has RING and D2: LIST(SYMBOL) and D3
+--R            : LIST(NNI) and D4: NNI
+--R   [9] (Pattern(D1),Pattern(D1)) -> Pattern(D1) from Pattern(D1)
+--R            if D1 has SETCAT
+--R   [10] (Stream(D2),Stream(D2)) -> Stream(D2)
+--R            from StreamTaylorSeriesOperations(D2) if D2 has RING
 --R   [11] (WeightedPolynomials(D1,D2,D3,D4,D5,D6,D7),WeightedPolynomials(
 --R            D1,D2,D3,D4,D5,D6,D7)) -> Union(WeightedPolynomials(D1,D2,D3,D4,
 --R            D5,D6,D7),"failed")
 --R            from WeightedPolynomials(D1,D2,D3,D4,D5,D6,D7)
 --R            if D1 has FIELD and D1 has RING and D2 has ORDSET and D3 
---R            has OAMONS and D5: LIST D2 and D4 has POLYCAT(D1,D3,D2) and
---R            D6: LIST NNI and D7: NNI
+--R            has OAMONS and D5: LIST(D2) and D4 has POLYCAT(D1,D3,D2) 
+--R            and D6: LIST(NNI) and D7: NNI
 --R   [12] (XPolynomialRing(D1,D2),D1) -> XPolynomialRing(D1,D2)
 --R            from XPolynomialRing(D1,D2)
 --R            if D1 has FIELD and D1 has RING and D2 has ORDMON
@@ -2844,9 +2826,6 @@
 --Rm/4
 --R
 --R
---RExamples of / from MyExpression
---R
---R
 --RExamples of / from OutputForm
 --R
 --R
@@ -2862,6 +2841,9 @@
 --RExamples of / from RectangularMatrixCategory
 --R
 --R
+--RExamples of / from StochasticDifferential
+--R
+--R
 --RExamples of / from StreamTaylorSeriesOperations
 --R
 --R
@@ -2880,28 +2862,28 @@
 --R 
 --R
 --RThere is one exposed function called integralBasis :
---R   [1]  -> Vector D from D
---R            if D2 has UFD and D3 has UPOLYC D2 and D4 has UPOLYC FRAC 
---R            D3 and D has FFCAT(D2,D3,D4)
+--R   [1]  -> Vector(D) from D
+--R            if D2 has UFD and D3 has UPOLYC(D2) and D4 has UPOLYC(FRAC(
+--R            D3)) and D has FFCAT(D2,D3,D4)
 --R
 --RThere are 4 unexposed functions called integralBasis :
---R   [1]  -> Record(basis: Matrix D2,basisDen: D2,basisInv: Matrix D2)
+--R   [1]  -> Record(basis: Matrix(D2),basisDen: D2,basisInv: Matrix(D2))
 --R            from FunctionFieldIntegralBasis(D2,D3,D4)
 --R            if D2 has EuclideanDomain with 
---R               squareFree : % -> Factored %and D3 has UPOLYC D2 and
---R            D4 has FRAMALG(D2,D3)
---R   [2]  -> Record(basis: Matrix Integer,basisDen: Integer,basisInv: 
---R            Matrix Integer)
+--R               squareFree : % -> Factored(%)and D3 has UPOLYC(D2) 
+--R            and D4 has FRAMALG(D2,D3)
+--R   [2]  -> Record(basis: Matrix(Integer),basisDen: Integer,basisInv: 
+--R            Matrix(Integer))
 --R            from NumberFieldIntegralBasis(D2,D3)
---R            if D2 has UPOLYC INT and D3 has FRAMALG(INT,D2)
---R   [3]  -> Record(basis: Matrix D3,basisDen: D3,basisInv: Matrix D3)
+--R            if D2 has UPOLYC(INT) and D3 has FRAMALG(INT,D2)
+--R   [3]  -> Record(basis: Matrix(D3),basisDen: D3,basisInv: Matrix(D3))
 --R            from PAdicWildFunctionFieldIntegralBasis(D2,D3,D4,D5)
---R            if D2 has FFIELDC and D3 has UPOLYC D2 and D4 has UPOLYC D3
---R            and D5 has MONOGEN(D3,D4)
---R   [4]  -> Record(basis: Matrix D3,basisDen: D3,basisInv: Matrix D3)
+--R            if D2 has FFIELDC and D3 has UPOLYC(D2) and D4 has UPOLYC(
+--R            D3) and D5 has MONOGEN(D3,D4)
+--R   [4]  -> Record(basis: Matrix(D3),basisDen: D3,basisInv: Matrix(D3))
 --R            from WildFunctionFieldIntegralBasis(D2,D3,D4,D5)
---R            if D2 has FFIELDC and D3 has UPOLYC D2 and D4 has UPOLYC D3
---R            and D5 has FRAMALG(D3,D4)
+--R            if D2 has FFIELDC and D3 has UPOLYC(D2) and D4 has UPOLYC(
+--R            D3) and D5 has FRAMALG(D3,D4)
 --R
 --RExamples of integralBasis from FunctionFieldCategory
 --R
@@ -2929,35 +2911,35 @@
 --R 
 --R
 --RThere are 9 exposed functions called split :
---R   [1] D2 -> Factored D2 from AlgFactor D2 if D2 has UPOLYC AN
---R   [2] (D2,BinarySearchTree D2) -> Record(less: BinarySearchTree D2,
---R            greater: BinarySearchTree D2)
---R            from BinarySearchTree D2 if D2 has ORDSET
---R   [3] D -> List D from D if D2 has SETCAT and D has DIVCAT D2
---R   [4] IntegrationResult D3 -> IntegrationResult D3
+--R   [1] D2 -> Factored(D2) from AlgFactor(D2) if D2 has UPOLYC(AN)
+--R   [2] (D2,BinarySearchTree(D2)) -> Record(less: BinarySearchTree(D2),
+--R            greater: BinarySearchTree(D2))
+--R            from BinarySearchTree(D2) if D2 has ORDSET
+--R   [3] D -> List(D) from D if D2 has SETCAT and D has DIVCAT(D2)
+--R   [4] IntegrationResult(D3) -> IntegrationResult(D3)
 --R            from IntegrationResultToFunction(D2,D3)
---R            if D3 has Join(AlgebraicallyClosedFunctionSpace D2,
+--R            if D3 has Join(AlgebraicallyClosedFunctionSpace(D2),
 --R            TranscendentalFunctionCategory) and D2 has Join(GcdDomain,
---R            RetractableTo Integer,OrderedSet,LinearlyExplicitRingOver 
---R            Integer)
---R   [5] IntegrationResult Fraction Polynomial D2 -> IntegrationResult 
---R            Fraction Polynomial D2
---R            from IntegrationResultRFToFunction D2
---R            if D2 has Join(GcdDomain,RetractableTo Integer,OrderedSet,
---R            LinearlyExplicitRingOver Integer)
---R   [6] (List Matrix D4,Vector D4) -> List List Matrix D4
---R            from RepresentationPackage2 D4 if D4 has FIELD and D4 has 
+--R            RetractableTo(Integer),OrderedSet,LinearlyExplicitRingOver(
+--R            Integer))
+--R   [5] IntegrationResult(Fraction(Polynomial(D2))) -> IntegrationResult
+--R            (Fraction(Polynomial(D2)))
+--R            from IntegrationResultRFToFunction(D2)
+--R            if D2 has Join(GcdDomain,RetractableTo(Integer),OrderedSet,
+--R            LinearlyExplicitRingOver(Integer))
+--R   [6] (List(Matrix(D4)),Vector(D4)) -> List(List(Matrix(D4)))
+--R            from RepresentationPackage2(D4) if D4 has FIELD and D4 has 
 --R            RING
---R   [7] (List Matrix D4,Vector Vector D4) -> List List Matrix D4
---R            from RepresentationPackage2 D4 if D4 has FIELD and D4 has 
+--R   [7] (List(Matrix(D4)),Vector(Vector(D4))) -> List(List(Matrix(D4)))
+--R            from RepresentationPackage2(D4) if D4 has FIELD and D4 has 
 --R            RING
---R   [8] (D,CharacterClass) -> List D from D if D has SRAGG
---R   [9] (D,Character) -> List D from D if D has SRAGG
+--R   [8] (D,CharacterClass) -> List(D) from D if D has SRAGG
+--R   [9] (D,Character) -> List(D) from D if D has SRAGG
 --R
 --RThere is one unexposed function called split :
 --R   [1] (D2,(D2 -> D2)) -> Record(normal: D2,special: D2)
 --R            from MonomialExtensionTools(D4,D2)
---R            if D2 has UPOLYC D4 and D4 has FIELD
+--R            if D2 has UPOLYC(D4) and D4 has FIELD
 --R
 --RExamples of split from AlgFactor
 --R
@@ -2993,8 +2975,8 @@
 --R
 --RThere are 3 exposed functions called qelt :
 --R   [1] (D,Integer,Integer) -> D1 from D
---R            if D has ARR2CAT(D1,D3,D4) and D3 has FLAGG D1 and D4 has 
---R            FLAGG D1 and D1 has TYPE
+--R            if D has ARR2CAT(D1,D3,D4) and D3 has FLAGG(D1) and D4 has 
+--R            FLAGG(D1) and D1 has TYPE
 --R   [2] (D,D2) -> D1 from D
 --R            if D has ELTAGG(D2,D1) and D2 has SETCAT and D1 has TYPE
 --R         
@@ -3020,11 +3002,11 @@
 --R 
 --R
 --RThere are 2 exposed functions called mapUp! :
---R   [1] (BalancedBinaryTree D2,BalancedBinaryTree D2,((D2,D2,D2,D2) -> 
---R            D2)) -> BalancedBinaryTree D2
---R            from BalancedBinaryTree D2 if D2 has SETCAT
---R   [2] (BalancedBinaryTree D1,((D1,D1) -> D1)) -> D1
---R            from BalancedBinaryTree D1 if D1 has SETCAT
+--R   [1] (BalancedBinaryTree(D2),BalancedBinaryTree(D2),((D2,D2,D2,D2)
+--R             -> D2)) -> BalancedBinaryTree(D2)
+--R            from BalancedBinaryTree(D2) if D2 has SETCAT
+--R   [2] (BalancedBinaryTree(D1),((D1,D1) -> D1)) -> D1
+--R            from BalancedBinaryTree(D1) if D1 has SETCAT
 --R
 --RExamples of mapUp! from BalancedBinaryTree
 --R
@@ -3049,7 +3031,7 @@
 --R 
 --R
 --RThere is one exposed function called reindex :
---R   [1] (CartesianTensor(D2,D3,D4),List Integer) -> CartesianTensor(D2,
+--R   [1] (CartesianTensor(D2,D3,D4),List(Integer)) -> CartesianTensor(D2,
 --R            D3,D4)
 --R            from CartesianTensor(D2,D3,D4)
 --R            if D2: INT and D3: NNI and D4 has COMRING
@@ -3068,12 +3050,12 @@
 --R 
 --R
 --RThere are 2 exposed functions called mapDown! :
---R   [1] (BalancedBinaryTree D1,D1,((D1,D1,D1) -> List D1)) -> 
---R            BalancedBinaryTree D1
---R            from BalancedBinaryTree D1 if D1 has SETCAT
---R   [2] (BalancedBinaryTree D1,D1,((D1,D1) -> D1)) -> BalancedBinaryTree
---R            D1
---R            from BalancedBinaryTree D1 if D1 has SETCAT
+--R   [1] (BalancedBinaryTree(D1),D1,((D1,D1,D1) -> List(D1))) -> 
+--R            BalancedBinaryTree(D1)
+--R            from BalancedBinaryTree(D1) if D1 has SETCAT
+--R   [2] (BalancedBinaryTree(D1),D1,((D1,D1) -> D1)) -> 
+--R            BalancedBinaryTree(D1)
+--R            from BalancedBinaryTree(D1) if D1 has SETCAT
 --R
 --RExamples of mapDown! from BalancedBinaryTree
 --R
@@ -3100,7 +3082,7 @@
 --RThere are 2 exposed functions called nrows :
 --R   [1] D -> NonNegativeInteger from D
 --R            if D has ARR2CAT(D2,D3,D4) and D2 has TYPE and D3 has FLAGG
---R            D2 and D4 has FLAGG D2
+--R            (D2) and D4 has FLAGG(D2)
 --R   [2] D -> NonNegativeInteger from D
 --R            if D has RMATCAT(D2,D3,D4,D5,D6) and D4 has RING and D5 has
 --R            DIRPCAT(D3,D4) and D6 has DIRPCAT(D2,D4)
@@ -3122,7 +3104,7 @@
 --RThere are 2 exposed functions called row :
 --R   [1] (D,Integer) -> D1 from D
 --R            if D has ARR2CAT(D3,D1,D4) and D3 has TYPE and D4 has FLAGG
---R            D3 and D1 has FLAGG D3
+--R            (D3) and D1 has FLAGG(D3)
 --R   [2] (D,Integer) -> D1 from D
 --R            if D has RMATCAT(D3,D4,D5,D1,D6) and D5 has RING and D6 has
 --R            DIRPCAT(D3,D5) and D1 has DIRPCAT(D4,D5)
@@ -3142,8 +3124,8 @@
 --R 
 --R
 --RThere is one exposed function called ravel :
---R   [1] CartesianTensor(D2,D3,D4) -> List D4 from CartesianTensor(D2,D3,
---R            D4)
+--R   [1] CartesianTensor(D2,D3,D4) -> List(D4) from CartesianTensor(D2,D3
+--R            ,D4)
 --R            if D2: INT and D3: NNI and D4 has COMRING
 --R
 --RExamples of ravel from CartesianTensor
@@ -3159,9 +3141,9 @@
 --R 
 --R
 --RThere is one exposed function called inverseIntegralMatrix :
---R   [1]  -> Matrix Fraction D3 from D
---R            if D has FFCAT(D2,D3,D4) and D2 has UFD and D3 has UPOLYC 
---R            D2 and D4 has UPOLYC FRAC D3
+--R   [1]  -> Matrix(Fraction(D3)) from D
+--R            if D has FFCAT(D2,D3,D4) and D2 has UFD and D3 has UPOLYC(
+--R            D2) and D4 has UPOLYC(FRAC(D3))
 --R
 --RExamples of inverseIntegralMatrix from FunctionFieldCategory
 --R
@@ -4312,14 +4294,14 @@
 --R            Integer) -> CartesianTensor(D2,D3,D4)
 --R            from CartesianTensor(D2,D3,D4)
 --R            if D2: INT and D3: NNI and D4 has COMRING
---R   [3] (PolynomialIdeals(Fraction Integer,DirectProduct(D4,
---R            NonNegativeInteger),OrderedVariableList D3,
---R            DistributedMultivariatePolynomial(D3,Fraction Integer)),List 
---R            OrderedVariableList D3) -> PolynomialIdeals(Fraction Integer,
---R            DirectProduct(D4,NonNegativeInteger),OrderedVariableList D3,
---R            DistributedMultivariatePolynomial(D3,Fraction Integer))
---R            from IdealDecompositionPackage(D3,D4) if D3: LIST SYMBOL 
---R            and D4: NNI
+--R   [3] (PolynomialIdeals(Fraction(Integer),DirectProduct(D4,
+--R            NonNegativeInteger),OrderedVariableList(D3),
+--R            DistributedMultivariatePolynomial(D3,Fraction(Integer))),List(
+--R            OrderedVariableList(D3))) -> PolynomialIdeals(Fraction(Integer),
+--R            DirectProduct(D4,NonNegativeInteger),OrderedVariableList(D3),
+--R            DistributedMultivariatePolynomial(D3,Fraction(Integer)))
+--R            from IdealDecompositionPackage(D3,D4)
+--R            if D3: LIST(SYMBOL) and D4: NNI
 --R
 --RExamples of contract from CartesianTensor
 --R
@@ -4345,8 +4327,8 @@
 --R 
 --R
 --RThere is one exposed function called irreducibleFactor :
---R   [1] (D1,Integer) -> Factored D1 from Factored D1 if D1 has INTDOM
---R         
+--R   [1] (D1,Integer) -> Factored(D1) from Factored(D1) if D1 has INTDOM
+--R            
 --R
 --RExamples of irreducibleFactor from Factored
 --R
@@ -4360,19 +4342,19 @@
 --R 
 --R
 --RThere are 11 exposed functions called concat :
---R   [1] (D,D) -> D from D if D has DIVCAT D1 and D1 has SETCAT
+--R   [1] (D,D) -> D from D if D has DIVCAT(D1) and D1 has SETCAT
 --R   [2] (Result,Result) -> Result from ExpertSystemToolsPackage
---R   [3] List Result -> Result from ExpertSystemToolsPackage
---R   [4] List D -> D from D if D has LNAGG D2 and D2 has TYPE
---R   [5] (D,D) -> D from D if D has LNAGG D1 and D1 has TYPE
---R   [6] (D1,D) -> D from D if D has LNAGG D1 and D1 has TYPE
---R   [7] (D,D1) -> D from D if D has LNAGG D1 and D1 has TYPE
+--R   [3] List(Result) -> Result from ExpertSystemToolsPackage
+--R   [4] List(D) -> D from D if D has LNAGG(D2) and D2 has TYPE
+--R   [5] (D,D) -> D from D if D has LNAGG(D1) and D1 has TYPE
+--R   [6] (D1,D) -> D from D if D has LNAGG(D1) and D1 has TYPE
+--R   [7] (D,D1) -> D from D if D has LNAGG(D1) and D1 has TYPE
 --R   [8] (RoutinesTable,RoutinesTable) -> RoutinesTable from 
 --R            RoutinesTable
---R   [9] Stream Stream D3 -> Stream D3 from StreamFunctions1 D3 if D3 has
---R            TYPE
---R   [10] (D1,D) -> D from D if D has URAGG D1 and D1 has TYPE
---R   [11] (D,D) -> D from D if D has URAGG D1 and D1 has TYPE
+--R   [9] Stream(Stream(D3)) -> Stream(D3) from StreamFunctions1(D3)
+--R            if D3 has TYPE
+--R   [10] (D1,D) -> D from D if D has URAGG(D1) and D1 has TYPE
+--R   [11] (D,D) -> D from D if D has URAGG(D1) and D1 has TYPE
 --R
 --RExamples of concat from DivisorCategory
 --R
@@ -4403,8 +4385,8 @@
 --R 
 --R
 --RThere is one exposed function called binaryTournament :
---R   [1] List D2 -> BinaryTournament D2 from BinaryTournament D2 if D2 
---R            has ORDSET
+--R   [1] List(D2) -> BinaryTournament(D2) from BinaryTournament(D2)
+--R            if D2 has ORDSET
 --R
 --RExamples of binaryTournament from BinaryTournament
 --R
@@ -4440,7 +4422,7 @@
 --R
 --RThere are 3 exposed functions called exponent :
 --R   [1] D -> Integer from D if D has FPS
---R   [2] Factored D2 -> Integer from Factored D2 if D2 has INTDOM
+--R   [2] Factored(D2) -> Integer from Factored(D2) if D2 has INTDOM
 --R   [3] MachineFloat -> Integer from MachineFloat
 --R
 --RThere are 2 unexposed functions called exponent :
@@ -4480,7 +4462,7 @@
 --RThere is one exposed function called setRow! :
 --R   [1] (D,Integer,D2) -> D from D
 --R            if D has ARR2CAT(D3,D2,D4) and D3 has TYPE and D2 has FLAGG
---R            D3 and D4 has FLAGG D3
+--R            (D3) and D4 has FLAGG(D3)
 --R
 --RExamples of setRow! from TwoDimensionalArrayCategory
 --R
@@ -4497,12 +4479,12 @@
 --R 
 --R
 --RThere are 4 exposed functions called generate :
---R   [1] (NonNegativeInteger,NonNegativeInteger) -> Vector List Integer
+--R   [1] (NonNegativeInteger,NonNegativeInteger) -> Vector(List(Integer))
 --R            from HallBasis
---R   [2] ((D2 -> D2),D2) -> InfiniteTuple D2 from InfiniteTuple D2 if D2 
---R            has TYPE
---R   [3] ((D2 -> D2),D2) -> Stream D2 from Stream D2 if D2 has TYPE
---R   [4] (() -> D2) -> Stream D2 from Stream D2 if D2 has TYPE
+--R   [2] ((D2 -> D2),D2) -> InfiniteTuple(D2) from InfiniteTuple(D2)
+--R            if D2 has TYPE
+--R   [3] ((D2 -> D2),D2) -> Stream(D2) from Stream(D2) if D2 has TYPE
+--R   [4] (() -> D2) -> Stream(D2) from Stream(D2) if D2 has TYPE
 --R
 --RExamples of generate from HallBasis
 --R
@@ -4525,10 +4507,10 @@
 --R 
 --R
 --RThere are 6 exposed functions called gcd :
---R   [1] List D -> D from D if D has GCDDOM
+--R   [1] List(D) -> D from D if D has GCDDOM
 --R   [2] (D,D) -> D from D if D has GCDDOM
---R   [3] (D1,D1,Integer) -> D1 from ModularDistinctDegreeFactorizer D1
---R            if D1 has UPOLYC INT
+--R   [3] (D1,D1,Integer) -> D1 from ModularDistinctDegreeFactorizer(D1)
+--R            if D1 has UPOLYC(INT)
 --R   [4] (NonNegativeInteger,NonNegativeInteger) -> NonNegativeInteger
 --R            from NonNegativeInteger
 --R   [5] (PositiveInteger,PositiveInteger) -> PositiveInteger
@@ -4538,25 +4520,26 @@
 --R            OAMONS and D3 has ORDSET and D1 has GCDDOM
 --R
 --RThere are 6 unexposed functions called gcd :
---R   [1] List D1 -> D1 from HeuGcd D1 if D1 has UPOLYC INT
+--R   [1] List(D1) -> D1 from HeuGcd(D1) if D1 has UPOLYC(INT)
 --R   [2] (D1,D1) -> D1 from PolynomialGcdPackage(D2,D3,D4,D1)
 --R            if D2 has OAMONS and D3 has ORDSET and D4 has EUCDOM and D1
 --R            has POLYCAT(D4,D2,D3)
---R   [3] List D1 -> D1 from PolynomialGcdPackage(D3,D4,D5,D1)
+--R   [3] List(D1) -> D1 from PolynomialGcdPackage(D3,D4,D5,D1)
 --R            if D1 has POLYCAT(D5,D3,D4) and D3 has OAMONS and D4 has 
 --R            ORDSET and D5 has EUCDOM
---R   [4] (SparseUnivariatePolynomial D5,SparseUnivariatePolynomial D5)
---R             -> SparseUnivariatePolynomial D5
+--R   [4] (SparseUnivariatePolynomial(D5),SparseUnivariatePolynomial(D5))
+--R             -> SparseUnivariatePolynomial(D5)
 --R            from PolynomialGcdPackage(D2,D3,D4,D5)
 --R            if D5 has POLYCAT(D4,D2,D3) and D2 has OAMONS and D3 has 
 --R            ORDSET and D4 has EUCDOM
---R   [5] List SparseUnivariatePolynomial D6 -> SparseUnivariatePolynomial
---R            D6
+--R   [5] List(SparseUnivariatePolynomial(D6)) -> 
+--R            SparseUnivariatePolynomial(D6)
 --R            from PolynomialGcdPackage(D3,D4,D5,D6)
 --R            if D3 has OAMONS and D4 has ORDSET and D5 has EUCDOM and D6
 --R            has POLYCAT(D5,D3,D4)
 --R   [6] (D1,D1) -> D1 from PseudoRemainderSequence(D2,D1)
---R            if D2 has GCDDOM and D2 has INTDOM and D1 has UPOLYC D2
+--R            if D2 has GCDDOM and D2 has INTDOM and D1 has UPOLYC(D2)
+--R         
 --R
 --RExamples of gcd from GcdDomain
 --R
@@ -4591,10 +4574,10 @@
 --R 
 --R
 --RThere is one exposed function called binary :
---R   [1] Fraction Integer -> BinaryExpansion from BinaryExpansion
+--R   [1] Fraction(Integer) -> BinaryExpansion from BinaryExpansion
 --R
 --RThere is one unexposed function called binary :
---R   [1] (InputForm,List InputForm) -> InputForm from InputForm
+--R   [1] (InputForm,List(InputForm)) -> InputForm from InputForm
 --R
 --RExamples of binary from BinaryExpansion
 --R
@@ -4613,35 +4596,35 @@
 --R 
 --R
 --RThere are 6 exposed functions called expand :
---R   [1] Factored D1 -> D1 from Factored D1 if D1 has INTDOM
---R   [2] IntegrationResult D4 -> List D4 from IntegrationResultToFunction
---R            (D3,D4)
---R            if D4 has Join(AlgebraicallyClosedFunctionSpace D3,
+--R   [1] Factored(D1) -> D1 from Factored(D1) if D1 has INTDOM
+--R   [2] IntegrationResult(D4) -> List(D4)
+--R            from IntegrationResultToFunction(D3,D4)
+--R            if D4 has Join(AlgebraicallyClosedFunctionSpace(D3),
 --R            TranscendentalFunctionCategory) and D3 has Join(GcdDomain,
---R            RetractableTo Integer,OrderedSet,LinearlyExplicitRingOver 
---R            Integer)
---R   [3] IntegrationResult Fraction Polynomial D3 -> List Expression D3
---R            from IntegrationResultRFToFunction D3
---R            if D3 has Join(GcdDomain,RetractableTo Integer,OrderedSet,
---R            LinearlyExplicitRingOver Integer)
+--R            RetractableTo(Integer),OrderedSet,LinearlyExplicitRingOver(
+--R            Integer))
+--R   [3] IntegrationResult(Fraction(Polynomial(D3))) -> List(Expression(
+--R            D3))
+--R            from IntegrationResultRFToFunction(D3)
+--R            if D3 has Join(GcdDomain,RetractableTo(Integer),OrderedSet,
+--R            LinearlyExplicitRingOver(Integer))
 --R   [4] D -> D1 from D
 --R            if D has SEGXCAT(D2,D1) and D2 has ORDRING and D1 has STAGG
---R            D2
---R   [5] List D -> D1 from D
+--R            (D2)
+--R   [5] List(D) -> D1 from D
 --R            if D has SEGXCAT(D3,D1) and D3 has ORDRING and D1 has STAGG
---R            D3
+--R            (D3)
 --R   [6] D1 -> D1 from TranscendentalManipulations(D2,D1)
 --R            if D2 has Join(OrderedSet,GcdDomain) and D1 has Join(
---R            FunctionSpace D2,TranscendentalFunctionCategory)
+--R            FunctionSpace(D2),TranscendentalFunctionCategory)
 --R
 --RThere are 3 unexposed functions called expand :
---R   [1] (Expression D5,PositiveInteger) -> List Expression D5
+--R   [1] (Expression(D5),PositiveInteger) -> List(Expression(D5))
 --R            from DegreeReductionPackage(D4,D5)
 --R            if D5 has Join(IntegralDomain,OrderedSet) and D4 has RING
 --R         
---R   [2] XPolynomial D2 -> XDistributedPolynomial(Symbol,D2) from 
---R            XPolynomial D2
---R            if D2 has RING
+--R   [2] XPolynomial(D2) -> XDistributedPolynomial(Symbol,D2)
+--R            from XPolynomial(D2) if D2 has RING
 --R   [3] XRecursivePolynomial(D2,D3) -> XDistributedPolynomial(D2,D3)
 --R            from XRecursivePolynomial(D2,D3)
 --R            if D2 has ORDSET and D3 has RING
@@ -4679,10 +4662,10 @@
 --R 
 --R
 --RThere are 2 exposed functions called filterWhile :
---R   [1] ((D2 -> Boolean),InfiniteTuple D2) -> InfiniteTuple D2
---R            from InfiniteTuple D2 if D2 has TYPE
---R   [2] ((D2 -> Boolean),Stream D2) -> Stream D2 from Stream D2 if D2 
---R            has TYPE
+--R   [1] ((D2 -> Boolean),InfiniteTuple(D2)) -> InfiniteTuple(D2)
+--R            from InfiniteTuple(D2) if D2 has TYPE
+--R   [2] ((D2 -> Boolean),Stream(D2)) -> Stream(D2) from Stream(D2)
+--R            if D2 has TYPE
 --R
 --RExamples of filterWhile from InfiniteTuple
 --R
@@ -4700,10 +4683,10 @@
 --R 
 --R
 --RThere are 2 exposed functions called filterUntil :
---R   [1] ((D2 -> Boolean),InfiniteTuple D2) -> InfiniteTuple D2
---R            from InfiniteTuple D2 if D2 has TYPE
---R   [2] ((D2 -> Boolean),Stream D2) -> Stream D2 from Stream D2 if D2 
---R            has TYPE
+--R   [1] ((D2 -> Boolean),InfiniteTuple(D2)) -> InfiniteTuple(D2)
+--R            from InfiniteTuple(D2) if D2 has TYPE
+--R   [2] ((D2 -> Boolean),Stream(D2)) -> Stream(D2) from Stream(D2)
+--R            if D2 has TYPE
 --R
 --RExamples of filterUntil from InfiniteTuple
 --R
@@ -4718,23 +4701,22 @@
 
 --S 83 of 127
 )d op select
---R 
 --R
 --RThere are 4 exposed functions called select :
 --R   [1] ((D2 -> Boolean),D) -> D from D
---R            if D has finiteAggregate and D has CLAGG D2 and D2 has TYPE
---R            
---R   [2] ((D2 -> Boolean),InfiniteTuple D2) -> InfiniteTuple D2
---R            from InfiniteTuple D2 if D2 has TYPE
---R   [3] ((D2 -> Boolean),D) -> D from D if D has LZSTAGG D2 and D2 has 
+--R            if D has finiteAggregate and D has CLAGG(D2) and D2 has 
+--R            TYPE
+--R   [2] ((D2 -> Boolean),InfiniteTuple(D2)) -> InfiniteTuple(D2)
+--R            from InfiniteTuple(D2) if D2 has TYPE
+--R   [3] ((D2 -> Boolean),D) -> D from D if D has LZSTAGG(D2) and D2 has 
 --R            TYPE
 --R   [4] (D,D2) -> Union(D1,"failed") from D
 --R            if D has TSETCAT(D3,D4,D2,D1) and D3 has INTDOM and D4 has 
 --R            OAMONS and D2 has ORDSET and D1 has RPOLCAT(D3,D4,D2)
 --R
 --RThere is one unexposed function called select :
---R   [1] (Tuple D1,NonNegativeInteger) -> D1 from Tuple D1 if D1 has TYPE
---R            
+--R   [1] (Tuple(D1),NonNegativeInteger) -> D1 from Tuple(D1) if D1 has 
+--R            TYPE
 --R
 --RExamples of select from Collection
 --R
@@ -4764,8 +4746,8 @@
 --R 
 --R
 --RThere is one exposed function called nthFlag :
---R   [1] (Factored D3,Integer) -> Union("nil","sqfr","irred","prime")
---R            from Factored D3 if D3 has INTDOM
+--R   [1] (Factored(D3),Integer) -> Union("nil","sqfr","irred","prime")
+--R            from Factored(D3) if D3 has INTDOM
 --R
 --RExamples of nthFlag from Factored
 --R
@@ -4779,14 +4761,14 @@
 --R 
 --R
 --RThere is one exposed function called makeFR :
---R   [1] (D1,List Record(flg: Union("nil","sqfr","irred","prime"),fctr: 
---R            D1,xpnt: Integer)) -> Factored D1
---R            from Factored D1 if D1 has INTDOM
+--R   [1] (D1,List(Record(flg: Union("nil","sqfr","irred","prime"),fctr: 
+--R            D1,xpnt: Integer))) -> Factored(D1)
+--R            from Factored(D1) if D1 has INTDOM
 --R
 --RThere is one unexposed function called makeFR :
---R   [1] Record(contp: Integer,factors: List Record(irr: D3,pow: Integer)
---R            ) -> Factored D3
---R            from GaloisGroupFactorizer D3 if D3 has UPOLYC INT
+--R   [1] Record(contp: Integer,factors: List(Record(irr: D3,pow: Integer)
+--R            )) -> Factored(D3)
+--R            from GaloisGroupFactorizer(D3) if D3 has UPOLYC(INT)
 --R
 --RExamples of makeFR from Factored
 --R
@@ -4803,7 +4785,7 @@
 )d op *
 --R 
 --R
---RThere are 35 exposed functions called * :
+--RThere are 34 exposed functions called * :
 --R   [1] (Integer,D) -> D from D if D has ABELGRP
 --R   [2] (NonNegativeInteger,D) -> D from D if D has ABELMON
 --R   [3] (PositiveInteger,D) -> D from D if D has ABELSG
@@ -4813,12 +4795,12 @@
 --R            if D1: INT and D2: NNI and D3 has COMRING
 --R   [5] (DoubleFloat,Color) -> Color from Color
 --R   [6] (PositiveInteger,Color) -> Color from Color
---R   [7] (DenavitHartenbergMatrix D2,Point D2) -> Point D2
---R            from DenavitHartenbergMatrix D2
+--R   [7] (DenavitHartenbergMatrix(D2),Point(D2)) -> Point(D2)
+--R            from DenavitHartenbergMatrix(D2)
 --R            if D2 has Join(Field,TranscendentalFunctionCategory)
---R   [8] (D1,Equation D1) -> Equation D1 from Equation D1
+--R   [8] (D1,Equation(D1)) -> Equation(D1) from Equation(D1)
 --R            if D1 has SGROUP and D1 has TYPE
---R   [9] (Equation D1,D1) -> Equation D1 from Equation D1
+--R   [9] (Equation(D1),D1) -> Equation(D1) from Equation(D1)
 --R            if D1 has SGROUP and D1 has TYPE
 --R   [10] (D1,D2) -> D from D
 --R            if D has FAMONC(D2,D1) and D2 has SETCAT and D1 has CABMON
@@ -4836,7 +4818,7 @@
 --R            from PolynomialIdeals(D1,D2,D3,D4)
 --R            if D1 has FIELD and D2 has OAMONS and D3 has ORDSET and D4 
 --R            has POLYCAT(D1,D2,D3)
---R   [15] (D1,D) -> D from D if D has LMODULE D1 and D1 has RNG
+--R   [15] (D1,D) -> D from D if D has LMODULE(D1) and D1 has RNG
 --R   [16] ((D5 -> D6),(D4 -> D5)) -> (D4 -> D6) from MappingPackage3(D4,
 --R            D5,D6)
 --R            if D4 has SETCAT and D5 has SETCAT and D6 has SETCAT
@@ -4844,106 +4826,101 @@
 --R            D3)
 --R            if D2 has SETCAT and D3 has RING
 --R   [18] (D1,D) -> D1 from D
---R            if D has MATCAT(D2,D1,D3) and D2 has RING and D1 has FLAGG 
---R            D2 and D3 has FLAGG D2
+--R            if D has MATCAT(D2,D1,D3) and D2 has RING and D1 has FLAGG(
+--R            D2) and D3 has FLAGG(D2)
 --R   [19] (D,D1) -> D1 from D
---R            if D has MATCAT(D2,D3,D1) and D2 has RING and D3 has FLAGG 
---R            D2 and D1 has FLAGG D2
+--R            if D has MATCAT(D2,D3,D1) and D2 has RING and D3 has FLAGG(
+--R            D2) and D1 has FLAGG(D2)
 --R   [20] (Integer,D) -> D from D
---R            if D has MATCAT(D2,D3,D4) and D2 has RING and D3 has FLAGG 
---R            D2 and D4 has FLAGG D2
+--R            if D has MATCAT(D2,D3,D4) and D2 has RING and D3 has FLAGG(
+--R            D2) and D4 has FLAGG(D2)
 --R   [21] (D,D1) -> D from D
---R            if D has MATCAT(D1,D2,D3) and D1 has RING and D2 has FLAGG 
---R            D1 and D3 has FLAGG D1
+--R            if D has MATCAT(D1,D2,D3) and D1 has RING and D2 has FLAGG(
+--R            D1) and D3 has FLAGG(D1)
 --R   [22] (D1,D) -> D from D
---R            if D has MATCAT(D1,D2,D3) and D1 has RING and D2 has FLAGG 
---R            D1 and D3 has FLAGG D1
+--R            if D has MATCAT(D1,D2,D3) and D1 has RING and D2 has FLAGG(
+--R            D1) and D3 has FLAGG(D1)
 --R   [23] (D,D) -> D from D
---R            if D has MATCAT(D1,D2,D3) and D1 has RING and D2 has FLAGG 
---R            D1 and D3 has FLAGG D1
+--R            if D has MATCAT(D1,D2,D3) and D1 has RING and D2 has FLAGG(
+--R            D1) and D3 has FLAGG(D1)
 --R   [24] (D,D) -> D from D if D has MONAD
---R   [25] (MyExpression(D1,D2),MyExpression(D1,D2)) -> MyExpression(D1,D2
---R            )
---R            from MyExpression(D1,D2)
---R            if D1: SYMBOL and D2 has Join(Ring,OrderedSet,
---R            IntegralDomain)
---R   [26] (Integer,D) -> Divisor D from D
---R            if D3 has FIELD and D4 has LOCPOWC D3 and D has PLACESC(D3,
---R            D4)
---R   [27] (D,D1) -> D from D if D has RMODULE D1 and D1 has RNG
---R   [28] (D,D) -> D from D if D has SGROUP
---R   [29] (D1,D) -> D1 from D
+--R   [25] (Integer,D) -> Divisor(D) from D
+--R            if D3 has FIELD and D4 has LOCPOWC(D3) and D has PLACESC(D3
+--R            ,D4)
+--R   [26] (D,D1) -> D from D if D has RMODULE(D1) and D1 has RNG
+--R   [27] (D,D) -> D from D if D has SGROUP
+--R   [28] (D1,D) -> D1 from D
 --R            if D has SMATCAT(D2,D3,D1,D4) and D3 has RING and D1 has 
 --R            DIRPCAT(D2,D3) and D4 has DIRPCAT(D2,D3)
---R   [30] (D,D1) -> D1 from D
+--R   [29] (D,D1) -> D1 from D
 --R            if D has SMATCAT(D2,D3,D4,D1) and D3 has RING and D4 has 
 --R            DIRPCAT(D2,D3) and D1 has DIRPCAT(D2,D3)
---R   [31] (D,D1) -> D from D
---R            if D has VECTCAT D1 and D1 has TYPE and D1 has MONOID
---R   [32] (D1,D) -> D from D
---R            if D has VECTCAT D1 and D1 has TYPE and D1 has MONOID
---R   [33] (Integer,D) -> D from D
---R            if D has VECTCAT D2 and D2 has TYPE and D2 has ABELGRP
---R   [34] (D1,D) -> D from D
+--R   [30] (D,D1) -> D from D
+--R            if D has VECTCAT(D1) and D1 has TYPE and D1 has MONOID
+--R   [31] (D1,D) -> D from D
+--R            if D has VECTCAT(D1) and D1 has TYPE and D1 has MONOID
+--R   [32] (Integer,D) -> D from D
+--R            if D has VECTCAT(D2) and D2 has TYPE and D2 has ABELGRP
+--R   [33] (D1,D) -> D from D
 --R            if D has XFALG(D1,D2) and D1 has ORDSET and D2 has RING
---R   [35] (D,D1) -> D from D
+--R   [34] (D,D1) -> D from D
 --R            if D has XFALG(D2,D1) and D2 has ORDSET and D1 has RING
 --R
 --RThere are 23 unexposed functions called * :
---R   [1] (FreeGroup D1,D1) -> FreeGroup D1 from FreeGroup D1 if D1 has 
+--R   [1] (FreeGroup(D1),D1) -> FreeGroup(D1) from FreeGroup(D1) if D1 has
 --R            SETCAT
---R   [2] (D1,FreeGroup D1) -> FreeGroup D1 from FreeGroup D1 if D1 has 
+--R   [2] (D1,FreeGroup(D1)) -> FreeGroup(D1) from FreeGroup(D1) if D1 has
 --R            SETCAT
 --R   [3] (D1,D2) -> FreeModule1(D2,D1) from FreeModule1(D2,D1)
 --R            if D2 has RING and D1 has ORDSET
---R   [4] (FreeMonoid D1,D1) -> FreeMonoid D1 from FreeMonoid D1 if D1 has
---R            SETCAT
---R   [5] (D1,FreeMonoid D1) -> FreeMonoid D1 from FreeMonoid D1 if D1 has
---R            SETCAT
+--R   [4] (FreeMonoid(D1),D1) -> FreeMonoid(D1) from FreeMonoid(D1)
+--R            if D1 has SETCAT
+--R   [5] (D1,FreeMonoid(D1)) -> FreeMonoid(D1) from FreeMonoid(D1)
+--R            if D1 has SETCAT
 --R   [6] (D1,GeneralModulePolynomial(D2,D3,D4,D5,D6,D1)) -> 
 --R            GeneralModulePolynomial(D2,D3,D4,D5,D6,D1)
 --R            from GeneralModulePolynomial(D2,D3,D4,D5,D6,D1)
---R            if D2: LIST SYMBOL and D3 has COMRING and D5 has DIRPCAT(# 
---R            D2,NNI) and D6: ((Record(index: D4,exponent: D5),Record(
+--R            if D2: LIST(SYMBOL) and D3 has COMRING and D5 has DIRPCAT(#
+--R            (D2),NNI) and D6: ((Record(index: D4,exponent: D5),Record(
 --R            index: D4,exponent: D5)) -> Boolean) and D4 has ORDSET and 
---R            D1 has POLYCAT(D3,D5,OVAR D2)
---R   [7] (Vector D2,Vector D2) -> Vector D2
---R            from InnerNormalBasisFieldFunctions D2 if D2 has FFIELDC
+--R            D1 has POLYCAT(D3,D5,OVAR(D2))
+--R   [7] (Vector(D2),Vector(D2)) -> Vector(D2)
+--R            from InnerNormalBasisFieldFunctions(D2) if D2 has FFIELDC
 --R         
 --R   [8] (InputForm,InputForm) -> InputForm from InputForm
---R   [9] (InnerTaylorSeries D2,Integer) -> InnerTaylorSeries D2
---R            from InnerTaylorSeries D2 if D2 has RING
---R   [10] (InnerTaylorSeries D1,D1) -> InnerTaylorSeries D1
---R            from InnerTaylorSeries D1 if D1 has RING
---R   [11] (D1,InnerTaylorSeries D1) -> InnerTaylorSeries D1
---R            from InnerTaylorSeries D1 if D1 has RING
---R   [12] (Magma D1,Magma D1) -> Magma D1 from Magma D1 if D1 has ORDSET
---R            
---R   [13] (OrderedFreeMonoid D1,D1) -> OrderedFreeMonoid D1
---R            from OrderedFreeMonoid D1 if D1 has ORDSET
---R   [14] (D1,OrderedFreeMonoid D1) -> OrderedFreeMonoid D1
---R            from OrderedFreeMonoid D1 if D1 has ORDSET
+--R   [9] (InnerTaylorSeries(D2),Integer) -> InnerTaylorSeries(D2)
+--R            from InnerTaylorSeries(D2) if D2 has RING
+--R   [10] (InnerTaylorSeries(D1),D1) -> InnerTaylorSeries(D1)
+--R            from InnerTaylorSeries(D1) if D1 has RING
+--R   [11] (D1,InnerTaylorSeries(D1)) -> InnerTaylorSeries(D1)
+--R            from InnerTaylorSeries(D1) if D1 has RING
+--R   [12] (Magma(D1),Magma(D1)) -> Magma(D1) from Magma(D1) if D1 has 
+--R            ORDSET
+--R   [13] (OrderedFreeMonoid(D1),D1) -> OrderedFreeMonoid(D1)
+--R            from OrderedFreeMonoid(D1) if D1 has ORDSET
+--R   [14] (D1,OrderedFreeMonoid(D1)) -> OrderedFreeMonoid(D1)
+--R            from OrderedFreeMonoid(D1) if D1 has ORDSET
 --R   [15] (OutputForm,OutputForm) -> OutputForm from OutputForm
---R   [16] (Pattern D1,Pattern D1) -> Pattern D1 from Pattern D1 if D1 has
---R            SETCAT
---R   [17] (D2,Vector D3) -> Vector D3 from PseudoRemainderSequence(D2,D3)
---R            if D3 has UPOLYC D2 and D2 has INTDOM
+--R   [16] (Pattern(D1),Pattern(D1)) -> Pattern(D1) from Pattern(D1)
+--R            if D1 has SETCAT
+--R   [17] (D2,Vector(D3)) -> Vector(D3) from PseudoRemainderSequence(D2,
+--R            D3)
+--R            if D3 has UPOLYC(D2) and D2 has INTDOM
 --R   [18] (D1,SparseMultivariateTaylorSeries(D2,D3,D1)) -> 
 --R            SparseMultivariateTaylorSeries(D2,D3,D1)
 --R            from SparseMultivariateTaylorSeries(D2,D3,D1)
 --R            if D2 has RING and D3 has ORDSET and D1 has POLYCAT(D2,INDE
---R            D3,D3)
---R   [19] (Stream D2,Stream D2) -> Stream D2 from 
---R            StreamTaylorSeriesOperations D2
+--R            (D3),D3)
+--R   [19] (Stream(D2),Stream(D2)) -> Stream(D2)
+--R            from StreamTaylorSeriesOperations(D2) if D2 has RING
+--R   [20] (D2,Stream(D2)) -> Stream(D2) from StreamTaylorSeriesOperations
+--R            (D2)
 --R            if D2 has RING
---R   [20] (D2,Stream D2) -> Stream D2 from StreamTaylorSeriesOperations 
---R            D2
+--R   [21] (Stream(D2),D2) -> Stream(D2) from StreamTaylorSeriesOperations
+--R            (D2)
 --R            if D2 has RING
---R   [21] (Stream D2,D2) -> Stream D2 from StreamTaylorSeriesOperations 
---R            D2
---R            if D2 has RING
---R   [22] (DoubleFloat,Point DoubleFloat) -> Point DoubleFloat from 
---R            TubePlotTools
+--R   [22] (DoubleFloat,Point(DoubleFloat)) -> Point(DoubleFloat)
+--R            from TubePlotTools
 --R   [23] (XPolynomialRing(D1,D2),D1) -> XPolynomialRing(D1,D2)
 --R            from XPolynomialRing(D1,D2) if D1 has RING and D2 has 
 --R            ORDMON
@@ -5050,9 +5027,6 @@
 --RExamples of * from Monad
 --R
 --R
---RExamples of * from MyExpression
---R
---R
 --RExamples of * from OrderedFreeMonoid
 --R
 --Rm1:=(y**3)$OFMONOID(Symbol) 
@@ -5108,15 +5082,15 @@
 --R
 --RThere are 2 exposed functions called numberOfComponents :
 --R   [1]  -> NonNegativeInteger from D
---R            if D has FFCAT(D2,D3,D4) and D2 has UFD and D3 has UPOLYC 
---R            D2 and D4 has UPOLYC FRAC D3
---R   [2] D -> NonNegativeInteger from D if D has SPACEC D2 and D2 has 
+--R            if D has FFCAT(D2,D3,D4) and D2 has UFD and D3 has UPOLYC(
+--R            D2) and D4 has UPOLYC(FRAC(D3))
+--R   [2] D -> NonNegativeInteger from D if D has SPACEC(D2) and D2 has 
 --R            RING
 --R
 --RThere is one unexposed function called numberOfComponents :
 --R   [1]  -> NonNegativeInteger from FunctionFieldCategory&(D2,D3,D4,D5)
---R            if D3 has UFD and D4 has UPOLYC D3 and D5 has UPOLYC FRAC 
---R            D4 and D2 has FFCAT(D3,D4,D5)
+--R            if D3 has UFD and D4 has UPOLYC(D3) and D5 has UPOLYC(FRAC(
+--R            D4)) and D2 has FFCAT(D3,D4,D5)
 --R
 --RExamples of numberOfComponents from FunctionFieldCategory&
 --R
@@ -5143,13 +5117,14 @@
 --R 
 --R
 --RThere are 6 exposed functions called tree :
---R   [1] List D2 -> D from D if D2 has SETCAT and D has DSTRCAT D2
---R   [2] D1 -> D from D if D has DSTRCAT D1 and D1 has SETCAT
---R   [3] (D1,List D) -> D from D if D has DSTRCAT D1 and D1 has SETCAT
+--R   [1] List(D2) -> D from D if D2 has SETCAT and D has DSTRCAT(D2)
+--R   [2] D1 -> D from D if D has DSTRCAT(D1) and D1 has SETCAT
+--R   [3] (D1,List(D)) -> D from D if D has DSTRCAT(D1) and D1 has SETCAT
+--R            
+--R   [4] D1 -> Tree(D1) from Tree(D1) if D1 has SETCAT
+--R   [5] List(D2) -> Tree(D2) from Tree(D2) if D2 has SETCAT
+--R   [6] (D1,List(Tree(D1))) -> Tree(D1) from Tree(D1) if D1 has SETCAT
 --R         
---R   [4] D1 -> Tree D1 from Tree D1 if D1 has SETCAT
---R   [5] List D2 -> Tree D2 from Tree D2 if D2 has SETCAT
---R   [6] (D1,List Tree D1) -> Tree D1 from Tree D1 if D1 has SETCAT
 --R
 --RExamples of tree from DesingTreeCategory
 --R
@@ -5183,11 +5158,11 @@
 --R 
 --R
 --RThere are 3 exposed functions called unit :
---R   [1] List Float -> DrawOption from DrawOption
+--R   [1] List(Float) -> DrawOption from DrawOption
 --R   [2]  -> Union(D,"failed") from D
---R            if D has FINAALG D1 and D1 has INTDOM and D1 has COMRING
+--R            if D has FINAALG(D1) and D1 has INTDOM and D1 has COMRING
 --R         
---R   [3] Factored D1 -> D1 from Factored D1 if D1 has INTDOM
+--R   [3] Factored(D1) -> D1 from Factored(D1) if D1 has INTDOM
 --R
 --RExamples of unit from DrawOption
 --R
@@ -5209,7 +5184,7 @@
 --R 
 --R
 --RThere is one exposed function called frst :
---R   [1] D -> D1 from D if D has LZSTAGG D1 and D1 has TYPE
+--R   [1] D -> D1 from D if D has LZSTAGG(D1) and D1 has TYPE
 --R
 --RExamples of frst from LazyStreamAggregate
 --R
@@ -5227,7 +5202,7 @@
 --R            CartesianTensor(D1,D2,D3)
 --R            from CartesianTensor(D1,D2,D3)
 --R            if D1: INT and D2: NNI and D3 has COMRING
---R   [2] (D,SegmentBinding D) -> D from D if D has COMBOPC
+--R   [2] (D,SegmentBinding(D)) -> D from D if D has COMBOPC
 --R   [3] (D,Symbol) -> D from D if D has COMBOPC
 --R   [4] (D,D) -> D from D
 --R            if D has GRALG(D1,D2) and D1 has COMRING and D2 has ABELMON
@@ -5235,10 +5210,10 @@
 --R
 --RThere are 3 unexposed functions called product :
 --R   [1] (D1,Symbol) -> D1 from CombinatorialFunction(D3,D1)
---R            if D3 has Join(OrderedSet,IntegralDomain) and D1 has FS D3
+--R            if D3 has Join(OrderedSet,IntegralDomain) and D1 has FS(D3)
 --R            
---R   [2] (D1,SegmentBinding D1) -> D1 from CombinatorialFunction(D3,D1)
---R            if D1 has FS D3 and D3 has Join(OrderedSet,IntegralDomain)
+--R   [2] (D1,SegmentBinding(D1)) -> D1 from CombinatorialFunction(D3,D1)
+--R            if D1 has FS(D3) and D3 has Join(OrderedSet,IntegralDomain)
 --R            
 --R   [3] (XPBWPolynomial(D2,D3),XPBWPolynomial(D2,D3),NonNegativeInteger)
 --R             -> XPBWPolynomial(D2,D3)
@@ -5274,7 +5249,7 @@
 --RThere are 2 exposed functions called fill! :
 --R   [1] (D,D1) -> D from D
 --R            if D has ARR2CAT(D1,D2,D3) and D1 has TYPE and D2 has FLAGG
---R            D1 and D3 has FLAGG D1
+--R            (D1) and D3 has FLAGG(D1)
 --R   [2] (D,D1) -> D from D
 --R            if D has shallowlyMutable and D has IXAGG(D2,D1) and D2 has
 --R            SETCAT and D1 has TYPE
@@ -5308,9 +5283,9 @@
 --R 
 --R
 --RThere is one exposed function called integralMatrixAtInfinity :
---R   [1]  -> Matrix Fraction D3 from D
---R            if D has FFCAT(D2,D3,D4) and D2 has UFD and D3 has UPOLYC 
---R            D2 and D4 has UPOLYC FRAC D3
+--R   [1]  -> Matrix(Fraction(D3)) from D
+--R            if D has FFCAT(D2,D3,D4) and D2 has UFD and D3 has UPOLYC(
+--R            D2) and D4 has UPOLYC(FRAC(D3))
 --R
 --RExamples of integralMatrixAtInfinity from FunctionFieldCategory
 --R
@@ -5327,9 +5302,9 @@
 --R
 --RThere are 3 exposed functions called finite? :
 --R   [1] CardinalNumber -> Boolean from CardinalNumber
---R   [2] OnePointCompletion D2 -> Boolean from OnePointCompletion D2
+--R   [2] OnePointCompletion(D2) -> Boolean from OnePointCompletion(D2)
 --R            if D2 has SETCAT
---R   [3] OrderedCompletion D2 -> Boolean from OrderedCompletion D2
+--R   [3] OrderedCompletion(D2) -> Boolean from OrderedCompletion(D2)
 --R            if D2 has SETCAT
 --R
 --RExamples of finite? from CardinalNumber
@@ -5355,26 +5330,26 @@
 --R   [1] CartesianTensor(D2,D3,D4) -> NonNegativeInteger
 --R            from CartesianTensor(D2,D3,D4)
 --R            if D2: INT and D3: NNI and D4 has COMRING
---R   [2]  -> PositiveInteger from D if D has FINAALG D2 and D2 has 
+--R   [2]  -> PositiveInteger from D if D has FINAALG(D2) and D2 has 
 --R            COMRING
 --R   [3]  -> PositiveInteger from D
 --R            if D has FINRALG(D2,D3) and D2 has COMRING and D3 has 
---R            UPOLYC D2
---R   [4] (Matrix D4,Vector D4) -> NonNegativeInteger
---R            from LinearSystemMatrixPackage1 D4 if D4 has FIELD
+--R            UPOLYC(D2)
+--R   [4] (Matrix(D4),Vector(D4)) -> NonNegativeInteger
+--R            from LinearSystemMatrixPackage1(D4) if D4 has FIELD
 --R   [5] (D2,D3) -> NonNegativeInteger
 --R            from LinearSystemMatrixPackage(D4,D5,D3,D2)
---R            if D4 has FIELD and D5 has FiniteLinearAggregate D4 with 
---R                 shallowlyMutableand D3 has FiniteLinearAggregate D4 
+--R            if D4 has FIELD and D5 has FiniteLinearAggregate(D4) with 
+--R                 shallowlyMutableand D3 has FiniteLinearAggregate(D4)
 --R            with 
 --R                 shallowlyMutableand D2 has MATCAT(D4,D5,D3)
 --R   [6] D -> NonNegativeInteger from D
---R            if D has MATCAT(D2,D3,D4) and D2 has RING and D3 has FLAGG 
---R            D2 and D4 has FLAGG D2 and D2 has INTDOM
+--R            if D has MATCAT(D2,D3,D4) and D2 has RING and D3 has FLAGG(
+--R            D2) and D4 has FLAGG(D2) and D2 has INTDOM
 --R   [7] D2 -> NonNegativeInteger from MatrixLinearAlgebraFunctions(D3,D4
 --R            ,D5,D2)
---R            if D3 has INTDOM and D3 has COMRING and D4 has FLAGG D3 and
---R            D5 has FLAGG D3 and D2 has MATCAT(D3,D4,D5)
+--R            if D3 has INTDOM and D3 has COMRING and D4 has FLAGG(D3) 
+--R            and D5 has FLAGG(D3) and D2 has MATCAT(D3,D4,D5)
 --R   [8] D -> NonNegativeInteger from D
 --R            if D has RMATCAT(D2,D3,D4,D5,D6) and D4 has RING and D5 has
 --R            DIRPCAT(D3,D4) and D6 has DIRPCAT(D2,D4) and D4 has INTDOM
@@ -5382,11 +5357,11 @@
 --R
 --RThere are 2 unexposed functions called rank :
 --R   [1]  -> PositiveInteger from ComplexCategory&(D2,D3)
---R            if D3 has COMRING and D2 has COMPCAT D3
+--R            if D3 has COMRING and D2 has COMPCAT(D3)
 --R   [2] D2 -> NonNegativeInteger
 --R            from InnerMatrixLinearAlgebraFunctions(D3,D4,D5,D2)
---R            if D3 has FIELD and D4 has FLAGG D3 and D5 has FLAGG D3 and
---R            D2 has MATCAT(D3,D4,D5)
+--R            if D3 has FIELD and D4 has FLAGG(D3) and D5 has FLAGG(D3) 
+--R            and D2 has MATCAT(D3,D4,D5)
 --R
 --RExamples of rank from CartesianTensor
 --R
@@ -5430,7 +5405,7 @@
 --R 
 --R
 --RThere is one exposed function called numberOfComputedEntries :
---R   [1] D -> NonNegativeInteger from D if D has LZSTAGG D2 and D2 has 
+--R   [1] D -> NonNegativeInteger from D if D has LZSTAGG(D2) and D2 has 
 --R            TYPE
 --R
 --RExamples of numberOfComputedEntries from LazyStreamAggregate
@@ -5445,22 +5420,22 @@
 --R 
 --R
 --RThere are 4 exposed functions called groebnerFactorize :
---R   [1] (List D6,List D6) -> List List D6
+--R   [1] (List(D6),List(D6)) -> List(List(D6))
 --R            from GroebnerFactorizationPackage(D3,D4,D5,D6)
 --R            if D3 has Join(EuclideanDomain,CharacteristicZero) and D4 
 --R            has OAMONS and D5 has ORDSET and D6 has POLYCAT(D3,D4,D5)
 --R         
---R   [2] (List D7,List D7,Boolean) -> List List D7
+--R   [2] (List(D7),List(D7),Boolean) -> List(List(D7))
 --R            from GroebnerFactorizationPackage(D4,D5,D6,D7)
 --R            if D4 has Join(EuclideanDomain,CharacteristicZero) and D5 
 --R            has OAMONS and D6 has ORDSET and D7 has POLYCAT(D4,D5,D6)
 --R         
---R   [3] List D6 -> List List D6 from GroebnerFactorizationPackage(D3,D4,
---R            D5,D6)
+--R   [3] List(D6) -> List(List(D6))
+--R            from GroebnerFactorizationPackage(D3,D4,D5,D6)
 --R            if D3 has Join(EuclideanDomain,CharacteristicZero) and D4 
 --R            has OAMONS and D5 has ORDSET and D6 has POLYCAT(D3,D4,D5)
 --R         
---R   [4] (List D7,Boolean) -> List List D7
+--R   [4] (List(D7),Boolean) -> List(List(D7))
 --R            from GroebnerFactorizationPackage(D4,D5,D6,D7)
 --R            if D4 has Join(EuclideanDomain,CharacteristicZero) and D5 
 --R            has OAMONS and D6 has ORDSET and D7 has POLYCAT(D4,D5,D6)
@@ -5501,7 +5476,7 @@
 --R 
 --R
 --RThere is one exposed function called showAllElements :
---R   [1] Stream D2 -> OutputForm from Stream D2
+--R   [1] Stream(D2) -> OutputForm from Stream(D2)
 --R            if D2 has SETCAT and D2 has TYPE
 --R
 --RExamples of showAllElements from Stream
@@ -5519,7 +5494,7 @@
 --RThere are 2 exposed functions called maxColIndex :
 --R   [1] D -> Integer from D
 --R            if D has ARR2CAT(D2,D3,D4) and D2 has TYPE and D3 has FLAGG
---R            D2 and D4 has FLAGG D2
+--R            (D2) and D4 has FLAGG(D2)
 --R   [2] D -> Integer from D
 --R            if D has RMATCAT(D2,D3,D4,D5,D6) and D4 has RING and D5 has
 --R            DIRPCAT(D3,D4) and D6 has DIRPCAT(D2,D4)
@@ -5541,7 +5516,7 @@
 --RThere are 2 exposed functions called minRowIndex :
 --R   [1] D -> Integer from D
 --R            if D has ARR2CAT(D2,D3,D4) and D2 has TYPE and D3 has FLAGG
---R            D2 and D4 has FLAGG D2
+--R            (D2) and D4 has FLAGG(D2)
 --R   [2] D -> Integer from D
 --R            if D has RMATCAT(D2,D3,D4,D5,D6) and D4 has RING and D5 has
 --R            DIRPCAT(D3,D4) and D6 has DIRPCAT(D2,D4)
@@ -5562,10 +5537,10 @@
 --R
 --RThere are 2 exposed functions called space :
 --R   [1]  -> Character from Character
---R   [2] ThreeSpace DoubleFloat -> DrawOption from DrawOption
+--R   [2] ThreeSpace(DoubleFloat) -> DrawOption from DrawOption
 --R
 --RThere is one unexposed function called space :
---R   [1] List DrawOption -> ThreeSpace DoubleFloat from 
+--R   [1] List(DrawOption) -> ThreeSpace(DoubleFloat) from 
 --R            DrawOptionFunctions0
 --R
 --RExamples of space from Character
@@ -5586,17 +5561,16 @@
 --R
 --RThere are 5 exposed functions called remove :
 --R   [1] (D1,D) -> D from D
---R            if D has finiteAggregate and D has CLAGG D1 and D1 has TYPE
---R            and D1 has SETCAT
+--R            if D has finiteAggregate and D has CLAGG(D1) and D1 has 
+--R            TYPE and D1 has SETCAT
 --R   [2] ((D2 -> Boolean),D) -> D from D
---R            if D has finiteAggregate and D has CLAGG D2 and D2 has TYPE
---R            
---R   [3] ((D2 -> Boolean),D) -> D from D if D has LZSTAGG D2 and D2 has 
+--R            if D has finiteAggregate and D has CLAGG(D2) and D2 has 
 --R            TYPE
---R   [4] ((D3 -> Boolean),Multiset D3,Integer) -> Multiset D3 from 
---R            Multiset D3
---R            if D3 has SETCAT
---R   [5] (D1,Multiset D1,Integer) -> Multiset D1 from Multiset D1
+--R   [3] ((D2 -> Boolean),D) -> D from D if D has LZSTAGG(D2) and D2 has 
+--R            TYPE
+--R   [4] ((D3 -> Boolean),Multiset(D3),Integer) -> Multiset(D3)
+--R            from Multiset(D3) if D3 has SETCAT
+--R   [5] (D1,Multiset(D1),Integer) -> Multiset(D1) from Multiset(D1)
 --R            if D1 has SETCAT
 --R
 --RThere is one unexposed function called remove :
@@ -5628,18 +5602,18 @@
 --R 
 --R
 --RThere is one exposed function called factors :
---R   [1] Factored D2 -> List Record(factor: D2,exponent: Integer)
---R            from Factored D2 if D2 has INTDOM
+--R   [1] Factored(D2) -> List(Record(factor: D2,exponent: Integer))
+--R            from Factored(D2) if D2 has INTDOM
 --R
 --RThere are 3 unexposed functions called factors :
---R   [1] FreeGroup D2 -> List Record(gen: D2,exp: Integer) from FreeGroup
---R            D2
+--R   [1] FreeGroup(D2) -> List(Record(gen: D2,exp: Integer)) from 
+--R            FreeGroup(D2)
 --R            if D2 has SETCAT
---R   [2] FreeMonoid D2 -> List Record(gen: D2,exp: NonNegativeInteger)
---R            from FreeMonoid D2 if D2 has SETCAT
---R   [3] OrderedFreeMonoid D2 -> List Record(gen: D2,exp: 
---R            NonNegativeInteger)
---R            from OrderedFreeMonoid D2 if D2 has ORDSET
+--R   [2] FreeMonoid(D2) -> List(Record(gen: D2,exp: NonNegativeInteger))
+--R            from FreeMonoid(D2) if D2 has SETCAT
+--R   [3] OrderedFreeMonoid(D2) -> List(Record(gen: D2,exp: 
+--R            NonNegativeInteger))
+--R            from OrderedFreeMonoid(D2) if D2 has ORDSET
 --R
 --RExamples of factors from FreeGroup
 --R
@@ -5670,7 +5644,7 @@
 --R   [1] String -> Void from OutputPackage
 --R   [2] OutputForm -> Void from OutputPackage
 --R   [3] (String,OutputForm) -> Void from OutputPackage
---R   [4] (Integer,Stream D3) -> Void from Stream D3
+--R   [4] (Integer,Stream(D3)) -> Void from Stream(D3)
 --R            if D3 has SETCAT and D3 has TYPE
 --R
 --RExamples of output from OutputPackage
@@ -5689,8 +5663,8 @@
 --R 
 --R
 --RThere is one exposed function called binarySearchTree :
---R   [1] List D2 -> BinarySearchTree D2 from BinarySearchTree D2 if D2 
---R            has ORDSET
+--R   [1] List(D2) -> BinarySearchTree(D2) from BinarySearchTree(D2)
+--R            if D2 has ORDSET
 --R
 --RExamples of binarySearchTree from BinarySearchTree
 --R
@@ -5719,7 +5693,7 @@
 --R 
 --R
 --RThere is one exposed function called shrinkable :
---R   [1] Boolean -> Boolean from FlexibleArray D2 if D2 has TYPE
+--R   [1] Boolean -> Boolean from FlexibleArray(D2) if D2 has TYPE
 --R
 --RThere is one unexposed function called shrinkable :
 --R   [1] Boolean -> Boolean from IndexedFlexibleArray(D2,D3)
@@ -5740,7 +5714,7 @@
 --R 
 --R
 --RThere is one exposed function called rst :
---R   [1] D -> D from D if D has LZSTAGG D1 and D1 has TYPE
+--R   [1] D -> D from D if D has LZSTAGG(D1) and D1 has TYPE
 --R
 --RExamples of rst from LazyStreamAggregate
 --R
@@ -5754,13 +5728,13 @@
 --R 
 --R
 --RThere is one exposed function called flexibleArray :
---R   [1] List D2 -> FlexibleArray D2 from FlexibleArray D2 if D2 has TYPE
---R            
+--R   [1] List(D2) -> FlexibleArray(D2) from FlexibleArray(D2) if D2 has 
+--R            TYPE
 --R
 --RThere is one unexposed function called flexibleArray :
---R   [1] List D2 -> IndexedFlexibleArray(D2,D3) from IndexedFlexibleArray
---R            (D2,D3)
---R            if D2 has TYPE and D3: INT
+--R   [1] List(D2) -> IndexedFlexibleArray(D2,D3)
+--R            from IndexedFlexibleArray(D2,D3) if D2 has TYPE and D3: INT
+--R            
 --R
 --RExamples of flexibleArray from FlexibleArray
 --R
@@ -5777,47 +5751,47 @@
 --R 
 --R
 --RThere are 14 exposed functions called setelt :
---R   [1] (D,Integer,D1) -> D1 from D if D has AFSPCAT D1 and D1 has FIELD
---R            
+--R   [1] (D,Integer,D1) -> D1 from D if D has AFSPCAT(D1) and D1 has 
+--R            FIELD
 --R   [2] (D,Integer,Integer,D1) -> D1 from D
 --R            if D has ARR2CAT(D1,D3,D4) and D1 has TYPE and D3 has FLAGG
---R            D1 and D4 has FLAGG D1
+--R            (D1) and D4 has FLAGG(D1)
 --R   [3] (D,right,D) -> D from D
---R            if D has shallowlyMutable and D has BRAGG D2 and D2 has 
+--R            if D has shallowlyMutable and D has BRAGG(D2) and D2 has 
 --R            TYPE
 --R   [4] (D,left,D) -> D from D
---R            if D has shallowlyMutable and D has BRAGG D2 and D2 has 
+--R            if D has shallowlyMutable and D has BRAGG(D2) and D2 has 
 --R            TYPE
 --R   [5] (D,D2,D1) -> D1 from D
 --R            if D has shallowlyMutable and D has ELTAGG(D2,D1) and D2 
 --R            has SETCAT and D1 has TYPE
 --R   [6] (Library,Symbol,Any) -> Any from Library
---R   [7] (D,UniversalSegment Integer,D1) -> D1 from D
---R            if D has shallowlyMutable and D has LNAGG D1 and D1 has 
+--R   [7] (D,UniversalSegment(Integer),D1) -> D1 from D
+--R            if D has shallowlyMutable and D has LNAGG(D1) and D1 has 
 --R            TYPE
---R   [8] (D,List Integer,List Integer,D) -> D from D
---R            if D has MATCAT(D2,D3,D4) and D2 has RING and D3 has FLAGG 
---R            D2 and D4 has FLAGG D2
---R   [9] (D,Integer,D1) -> D1 from D if D has PRSPCAT D1 and D1 has FIELD
---R            
+--R   [8] (D,List(Integer),List(Integer),D) -> D from D
+--R            if D has MATCAT(D2,D3,D4) and D2 has RING and D3 has FLAGG(
+--R            D2) and D4 has FLAGG(D2)
+--R   [9] (D,Integer,D1) -> D1 from D if D has PRSPCAT(D1) and D1 has 
+--R            FIELD
 --R   [10] (D,value,D1) -> D1 from D
---R            if D has shallowlyMutable and D has RCAGG D1 and D1 has 
+--R            if D has shallowlyMutable and D has RCAGG(D1) and D1 has 
 --R            TYPE
 --R   [11] (D,D2,D1) -> D1 from D
 --R            if D has TBAGG(D2,D1) and D2 has SETCAT and D1 has SETCAT
 --R         
 --R   [12] (D,last,D1) -> D1 from D
---R            if D has shallowlyMutable and D has URAGG D1 and D1 has 
+--R            if D has shallowlyMutable and D has URAGG(D1) and D1 has 
 --R            TYPE
 --R   [13] (D,rest,D) -> D from D
---R            if D has shallowlyMutable and D has URAGG D2 and D2 has 
+--R            if D has shallowlyMutable and D has URAGG(D2) and D2 has 
 --R            TYPE
 --R   [14] (D,first,D1) -> D1 from D
---R            if D has shallowlyMutable and D has URAGG D1 and D1 has 
+--R            if D has shallowlyMutable and D has URAGG(D1) and D1 has 
 --R            TYPE
 --R
 --RThere is one unexposed function called setelt :
---R   [1] (Reference D1,D1) -> D1 from Reference D1 if D1 has TYPE
+--R   [1] (Reference(D1),D1) -> D1 from Reference(D1) if D1 has TYPE
 --R
 --RExamples of setelt from AffineSpaceCategory
 --R
@@ -5867,7 +5841,7 @@
 --R 
 --R
 --RThere is one exposed function called cyclicParents :
---R   [1] Tree D2 -> List Tree D2 from Tree D2 if D2 has SETCAT
+--R   [1] Tree(D2) -> List(Tree(D2)) from Tree(D2) if D2 has SETCAT
 --R
 --RExamples of cyclicParents from Tree
 --R
@@ -5881,7 +5855,7 @@
 --R 
 --R
 --RThere is one exposed function called explicitEntries? :
---R   [1] D -> Boolean from D if D has LZSTAGG D2 and D2 has TYPE
+--R   [1] D -> Boolean from D if D has LZSTAGG(D2) and D2 has TYPE
 --R
 --RExamples of explicitEntries? from LazyStreamAggregate
 --R
@@ -5897,7 +5871,7 @@
 --RThere are 2 exposed functions called column :
 --R   [1] (D,Integer) -> D1 from D
 --R            if D has ARR2CAT(D3,D4,D1) and D3 has TYPE and D4 has FLAGG
---R            D3 and D1 has FLAGG D3
+--R            (D3) and D1 has FLAGG(D3)
 --R   [2] (D,Integer) -> D1 from D
 --R            if D has RMATCAT(D3,D4,D5,D6,D1) and D5 has RING and D6 has
 --R            DIRPCAT(D4,D5) and D1 has DIRPCAT(D3,D5)
@@ -5918,53 +5892,53 @@
 --R
 --RThere are 21 exposed functions called reduce :
 --R   [1] AlgebraicNumber -> AlgebraicNumber from AlgebraicNumber
---R   [2] (((D4,D1) -> D1),OneDimensionalArray D4,D1) -> D1
+--R   [2] (((D4,D1) -> D1),OneDimensionalArray(D4),D1) -> D1
 --R            from OneDimensionalArrayFunctions2(D4,D1)
 --R            if D4 has TYPE and D1 has TYPE
 --R   [3] (((D1,D1) -> D1),D,D1,D1) -> D1 from D
---R            if D1 has SETCAT and D has finiteAggregate and D has CLAGG 
---R            D1 and D1 has TYPE
+--R            if D1 has SETCAT and D has finiteAggregate and D has CLAGG(
+--R            D1) and D1 has TYPE
 --R   [4] (((D1,D1) -> D1),D,D1) -> D1 from D
---R            if D has finiteAggregate and D has CLAGG D1 and D1 has TYPE
---R            
+--R            if D has finiteAggregate and D has CLAGG(D1) and D1 has 
+--R            TYPE
 --R   [5] (((D1,D1) -> D1),D) -> D1 from D
---R            if D has finiteAggregate and D has CLAGG D1 and D1 has TYPE
---R            
+--R            if D has finiteAggregate and D has CLAGG(D1) and D1 has 
+--R            TYPE
 --R   [6] (((D5,D1) -> D1),DirectProduct(D4,D5),D1) -> D1
 --R            from DirectProductFunctions2(D4,D5,D1)
 --R            if D4: NNI and D5 has TYPE and D1 has TYPE
---R   [7] Expression D1 -> Expression D1 from Expression D1
+--R   [7] Expression(D1) -> Expression(D1) from Expression(D1)
 --R            if D1 has INTDOM and D1 has ORDSET
 --R   [8] D -> D from D
 --R            if D has FDIVCAT(D1,D2,D3,D4) and D1 has FIELD and D2 has 
---R            UPOLYC D1 and D3 has UPOLYC FRAC D2 and D4 has FFCAT(D1,D2,
---R            D3)
+--R            UPOLYC(D1) and D3 has UPOLYC(FRAC(D2)) and D4 has FFCAT(D1,
+--R            D2,D3)
 --R   [9] (((D4,D1) -> D1),D3,D1) -> D1
 --R            from FiniteLinearAggregateFunctions2(D4,D3,D1,D5)
---R            if D4 has TYPE and D1 has TYPE and D3 has FLAGG D4 and D5 
---R            has FLAGG D1
+--R            if D4 has TYPE and D1 has TYPE and D3 has FLAGG(D4) and D5 
+--R            has FLAGG(D1)
 --R   [10] (((D4,D1) -> D1),D3,D1) -> D1
 --R            from FiniteSetAggregateFunctions2(D4,D3,D1,D5)
---R            if D4 has SETCAT and D1 has SETCAT and D3 has FSAGG D4 and 
---R            D5 has FSAGG D1
---R   [11] (((D4,D1) -> D1),List D4,D1) -> D1 from ListFunctions2(D4,D1)
+--R            if D4 has SETCAT and D1 has SETCAT and D3 has FSAGG(D4) and
+--R            D5 has FSAGG(D1)
+--R   [11] (((D4,D1) -> D1),List(D4),D1) -> D1 from ListFunctions2(D4,D1)
 --R            if D4 has TYPE and D1 has TYPE
 --R   [12] (((D5,D2) -> D2),D4,D2) -> D2
 --R            from MatrixCategoryFunctions2(D5,D6,D7,D4,D2,D8,D9,D1)
---R            if D5 has RING and D2 has RING and D6 has FLAGG D5 and D7 
---R            has FLAGG D5 and D8 has FLAGG D2 and D9 has FLAGG D2 and D4
---R            has MATCAT(D5,D6,D7) and D1 has MATCAT(D2,D8,D9)
---R   [13] Fraction D3 -> Union(D,"failed") from D
---R            if D3 has UPOLYC D2 and D2 has FIELD and D2 has COMRING and
---R            D has MONOGEN(D2,D3)
+--R            if D5 has RING and D2 has RING and D6 has FLAGG(D5) and D7 
+--R            has FLAGG(D5) and D8 has FLAGG(D2) and D9 has FLAGG(D2) and
+--R            D4 has MATCAT(D5,D6,D7) and D1 has MATCAT(D2,D8,D9)
+--R   [13] Fraction(D3) -> Union(D,"failed") from D
+--R            if D3 has UPOLYC(D2) and D2 has FIELD and D2 has COMRING 
+--R            and D has MONOGEN(D2,D3)
 --R   [14] D1 -> D from D
 --R            if D2 has COMRING and D has MONOGEN(D2,D1) and D1 has 
---R            UPOLYC D2
---R   [15] SparseUnivariatePolynomial D -> D from D if D has PACPERC
---R   [16] List D -> Divisor D from D
+--R            UPOLYC(D2)
+--R   [15] SparseUnivariatePolynomial(D) -> D from D if D has PACPERC
+--R   [16] List(D) -> Divisor(D) from D
 --R            if D has PLACESC(D3,D4) and D3 has FIELD and D4 has LOCPOWC
---R            D3
---R   [17] (((D4,D1) -> D1),PrimitiveArray D4,D1) -> D1
+--R            (D3)
+--R   [17] (((D4,D1) -> D1),PrimitiveArray(D4),D1) -> D1
 --R            from PrimitiveArrayFunctions2(D4,D1)
 --R            if D4 has TYPE and D1 has TYPE
 --R   [18] (((D9,D4) -> D4),D6,D4) -> D4
@@ -5975,25 +5949,25 @@
 --R            has DIRPCAT(D8,D4) and D2 has DIRPCAT(D7,D4) and D6 has 
 --R            RMATCAT(D7,D8,D9,D10,D11) and D3 has RMATCAT(D7,D8,D4,D1,D2
 --R            )
---R   [19] (D1,((D4,D1) -> D1),Stream D4) -> D1 from StreamFunctions2(D4,
+--R   [19] (D1,((D4,D1) -> D1),Stream(D4)) -> D1 from StreamFunctions2(D4,
 --R            D1)
 --R            if D4 has TYPE and D1 has TYPE
 --R   [20] (D1,D,((D1,D1) -> D1),((D1,D1) -> Boolean)) -> D1 from D
 --R            if D has TSETCAT(D4,D5,D6,D1) and D4 has INTDOM and D5 has 
 --R            OAMONS and D6 has ORDSET and D1 has RPOLCAT(D4,D5,D6)
---R   [21] (((D4,D1) -> D1),Vector D4,D1) -> D1 from VectorFunctions2(D4,
+--R   [21] (((D4,D1) -> D1),Vector(D4),D1) -> D1 from VectorFunctions2(D4,
 --R            D1)
 --R            if D4 has TYPE and D1 has TYPE
 --R
 --RThere are 7 unexposed functions called reduce :
---R   [1] SparseUnivariatePolynomial D3 -> Record(pol: 
---R            SparseUnivariatePolynomial D3,deg: PositiveInteger)
+--R   [1] SparseUnivariatePolynomial(D3) -> Record(pol: 
+--R            SparseUnivariatePolynomial(D3),deg: PositiveInteger)
 --R            from DegreeReductionPackage(D3,D4)
 --R            if D3 has RING and D4 has Join(IntegralDomain,OrderedSet)
 --R         
 --R   [2] (D1,D2) -> EuclideanModularRing(D3,D1,D2,D4,D5,D6)
 --R            from EuclideanModularRing(D3,D1,D2,D4,D5,D6)
---R            if D3 has COMRING and D1 has UPOLYC D3 and D2 has ABELMON 
+--R            if D3 has COMRING and D1 has UPOLYC(D3) and D2 has ABELMON 
 --R            and D4: ((D1,D2) -> D1) and D5: ((D2,D2) -> Union(D2,
 --R            "failed")) and D6: ((D1,D1,D2) -> Union(D1,"failed"))
 --R   [3] InnerAlgebraicNumber -> InnerAlgebraicNumber from 
@@ -6004,7 +5978,7 @@
 --R            ) and D4: ((D2,D2) -> Union(D2,"failed")) and D5: ((D1,D1,
 --R            D2) -> Union(D1,"failed"))
 --R   [5] D1 -> ModMonic(D2,D1) from ModMonic(D2,D1)
---R            if D2 has RING and D1 has UPOLYC D2
+--R            if D2 has RING and D1 has UPOLYC(D2)
 --R   [6] (D1,D2) -> ModularRing(D1,D2,D3,D4,D5) from ModularRing(D1,D2,D3
 --R            ,D4,D5)
 --R            if D1 has COMRING and D2 has ABELMON and D3: ((D1,D2) -> D1
@@ -6013,7 +5987,7 @@
 --R   [7] D1 -> ResidueRing(D2,D3,D4,D1,D5) from ResidueRing(D2,D3,D4,D1,
 --R            D5)
 --R            if D2 has FIELD and D3 has OAMONS and D4 has ORDSET and D1 
---R            has POLYCAT(D2,D3,D4) and D5: LIST D1
+--R            has POLYCAT(D2,D3,D4) and D5: LIST(D1)
 --R
 --RExamples of reduce from AlgebraicNumber
 --R
@@ -6112,11 +6086,11 @@
 --RThere are 7 exposed functions called new :
 --R   [1] (NonNegativeInteger,NonNegativeInteger,D2) -> D from D
 --R            if D2 has TYPE and D has ARR2CAT(D2,D3,D4) and D3 has FLAGG
---R            D2 and D4 has FLAGG D2
+--R            (D2) and D4 has FLAGG(D2)
 --R   [2] (String,String,String) -> D from D if D has FNCAT
 --R   [3]  -> ScriptFormulaFormat from ScriptFormulaFormat
---R   [4] (NonNegativeInteger,D2) -> D from D if D has LNAGG D2 and D2 has
---R            TYPE
+--R   [4] (NonNegativeInteger,D2) -> D from D if D has LNAGG(D2) and D2 
+--R            has TYPE
 --R   [5] Symbol -> Symbol from Symbol
 --R   [6]  -> Symbol from Symbol
 --R   [7]  -> TexFormat from TexFormat
@@ -6125,7 +6099,7 @@
 --R   [1]  -> SubSpaceComponentProperty from SubSpaceComponentProperty
 --R   [2]  -> PatternMatchListResult(D1,D2,D3)
 --R            from PatternMatchListResult(D1,D2,D3)
---R            if D2 has SETCAT and D1 has SETCAT and D3 has LSAGG D2
+--R            if D2 has SETCAT and D1 has SETCAT and D3 has LSAGG(D2)
 --R   [3]  -> PatternMatchResult(D1,D2) from PatternMatchResult(D1,D2)
 --R            if D1 has SETCAT and D2 has SETCAT
 --R   [4]  -> SubSpace(D1,D2) from SubSpace(D1,D2) if D1: PI and D2 has 
@@ -6169,8 +6143,8 @@
 --R 
 --R
 --RThere is one exposed function called insertRoot! :
---R   [1] (D1,BinarySearchTree D1) -> BinarySearchTree D1
---R            from BinarySearchTree D1 if D1 has ORDSET
+--R   [1] (D1,BinarySearchTree(D1)) -> BinarySearchTree(D1)
+--R            from BinarySearchTree(D1) if D1 has ORDSET
 --R
 --RExamples of insertRoot! from BinarySearchTree
 --R
@@ -6186,7 +6160,7 @@
 --RThere are 2 exposed functions called maxRowIndex :
 --R   [1] D -> Integer from D
 --R            if D has ARR2CAT(D2,D3,D4) and D2 has TYPE and D3 has FLAGG
---R            D2 and D4 has FLAGG D2
+--R            (D2) and D4 has FLAGG(D2)
 --R   [2] D -> Integer from D
 --R            if D has RMATCAT(D2,D3,D4,D5,D6) and D4 has RING and D5 has
 --R            DIRPCAT(D3,D4) and D6 has DIRPCAT(D2,D4)
@@ -6219,7 +6193,7 @@
 --R 
 --R
 --RThere is one exposed function called nthExponent :
---R   [1] (Factored D2,Integer) -> Integer from Factored D2 if D2 has 
+--R   [1] (Factored(D2),Integer) -> Integer from Factored(D2) if D2 has 
 --R            INTDOM
 --R
 --RExamples of nthExponent from Factored
@@ -6234,21 +6208,21 @@
 --R 
 --R
 --RThere are 7 exposed functions called parts :
---R   [1] D -> List D2 from D
+--R   [1] D -> List(D2) from D
 --R            if D has ARR2CAT(D2,D3,D4) and D2 has TYPE and D3 has FLAGG
---R            D2 and D4 has FLAGG D2
---R   [2] ArrayStack D2 -> List D2 from ArrayStack D2
+--R            (D2) and D4 has FLAGG(D2)
+--R   [2] ArrayStack(D2) -> List(D2) from ArrayStack(D2)
 --R            if $ has finiteAggregate and D2 has SETCAT
---R   [3] Dequeue D2 -> List D2 from Dequeue D2
+--R   [3] Dequeue(D2) -> List(D2) from Dequeue(D2)
 --R            if $ has finiteAggregate and D2 has SETCAT
---R   [4] Heap D2 -> List D2 from Heap D2
+--R   [4] Heap(D2) -> List(D2) from Heap(D2)
 --R            if $ has finiteAggregate and D2 has ORDSET
---R   [5] D -> List D2 from D
---R            if D has finiteAggregate and D has HOAGG D2 and D2 has TYPE
---R            
---R   [6] Queue D2 -> List D2 from Queue D2
+--R   [5] D -> List(D2) from D
+--R            if D has finiteAggregate and D has HOAGG(D2) and D2 has 
+--R            TYPE
+--R   [6] Queue(D2) -> List(D2) from Queue(D2)
 --R            if $ has finiteAggregate and D2 has SETCAT
---R   [7] Stack D2 -> List D2 from Stack D2
+--R   [7] Stack(D2) -> List(D2) from Stack(D2)
 --R            if $ has finiteAggregate and D2 has SETCAT
 --R
 --RExamples of parts from TwoDimensionalArrayCategory
@@ -6296,17 +6270,17 @@
 --R 
 --R
 --RThere are 50 exposed functions called elt :
---R   [1] (D,Integer) -> D1 from D if D has AFSPCAT D1 and D1 has FIELD
+--R   [1] (D,Integer) -> D1 from D if D has AFSPCAT(D1) and D1 has FIELD
 --R         
 --R   [2] (D,Integer,Integer,D1) -> D1 from D
 --R            if D has ARR2CAT(D1,D3,D4) and D1 has TYPE and D3 has FLAGG
---R            D1 and D4 has FLAGG D1
+--R            (D1) and D4 has FLAGG(D1)
 --R   [3] (D,Integer,Integer) -> D1 from D
---R            if D has ARR2CAT(D1,D3,D4) and D3 has FLAGG D1 and D4 has 
---R            FLAGG D1 and D1 has TYPE
---R   [4] (D,right) -> D from D if D has BRAGG D2 and D2 has TYPE
---R   [5] (D,left) -> D from D if D has BRAGG D2 and D2 has TYPE
---R   [6] (CartesianTensor(D3,D4,D1),List Integer) -> D1
+--R            if D has ARR2CAT(D1,D3,D4) and D3 has FLAGG(D1) and D4 has 
+--R            FLAGG(D1) and D1 has TYPE
+--R   [4] (D,right) -> D from D if D has BRAGG(D2) and D2 has TYPE
+--R   [5] (D,left) -> D from D if D has BRAGG(D2) and D2 has TYPE
+--R   [6] (CartesianTensor(D3,D4,D1),List(Integer)) -> D1
 --R            from CartesianTensor(D3,D4,D1)
 --R            if D1 has COMRING and D3: INT and D4: NNI
 --R   [7] (CartesianTensor(D3,D4,D1),Integer,Integer,Integer,Integer) -> 
@@ -6324,58 +6298,58 @@
 --R            if D1 has COMRING and D3: INT and D4: NNI
 --R   [11] CartesianTensor(D2,D3,D1) -> D1 from CartesianTensor(D2,D3,D1)
 --R            if D1 has COMRING and D2: INT and D3: NNI
---R   [12] (Database D3,Symbol) -> DataList String from Database D3
+--R   [12] (Database(D3),Symbol) -> DataList(String) from Database(D3)
 --R            if D3 has OrderedSet with 
 --R               ?.? : (%,Symbol) -> String
 --R               display : % -> Void
 --R               fullDisplay : % -> Void
---R   [13] (Database D2,QueryEquation) -> Database D2 from Database D2
+--R   [13] (Database(D2),QueryEquation) -> Database(D2) from Database(D2)
 --R            if D2 has OrderedSet with 
 --R               ?.? : (%,Symbol) -> String
 --R               display : % -> Void
 --R               fullDisplay : % -> Void
---R   [14] (DataList D3,count) -> NonNegativeInteger from DataList D3
+--R   [14] (DataList(D3),count) -> NonNegativeInteger from DataList(D3)
 --R            if D3 has ORDSET
---R   [15] (DataList D2,sort) -> DataList D2 from DataList D2 if D2 has 
---R            ORDSET
---R   [16] (DataList D2,unique) -> DataList D2 from DataList D2 if D2 has 
+--R   [15] (DataList(D2),sort) -> DataList(D2) from DataList(D2) if D2 has
 --R            ORDSET
+--R   [16] (DataList(D2),unique) -> DataList(D2) from DataList(D2) if D2 
+--R            has ORDSET
 --R   [17] (D,D2) -> D1 from D
 --R            if D has ELTAB(D2,D1) and D2 has SETCAT and D1 has TYPE
 --R   [18] (D,D2,D1) -> D1 from D
 --R            if D has ELTAGG(D2,D1) and D2 has SETCAT and D1 has TYPE
 --R         
---R   [19] (BasicOperator,List D) -> D from D if D has ES
+--R   [19] (BasicOperator,List(D)) -> D from D if D has ES
 --R   [20] (BasicOperator,D,D,D,D) -> D from D if D has ES
 --R   [21] (BasicOperator,D,D,D) -> D from D if D has ES
 --R   [22] (BasicOperator,D,D) -> D from D if D has ES
 --R   [23] (BasicOperator,D) -> D from D if D has ES
 --R   [24] (D,D1,D1) -> D1 from D
---R            if D has FFCAT(D1,D2,D3) and D1 has UFD and D2 has UPOLYC 
---R            D1 and D3 has UPOLYC FRAC D2
---R   [25] (D,Integer) -> D1 from D if D has FRNAALG D1 and D1 has COMRING
---R            
+--R            if D has FFCAT(D1,D2,D3) and D1 has UFD and D2 has UPOLYC(
+--R            D1) and D3 has UPOLYC(FRAC(D2))
+--R   [25] (D,Integer) -> D1 from D if D has FRNAALG(D1) and D1 has 
+--R            COMRING
 --R   [26] (IndexCard,Symbol) -> String from IndexCard
 --R   [27] (Library,Symbol) -> Any from Library
---R   [28] (D,UniversalSegment Integer) -> D from D
---R            if D has LNAGG D2 and D2 has TYPE
---R   [29] (ThreeDimensionalMatrix D1,NonNegativeInteger,
+--R   [28] (D,UniversalSegment(Integer)) -> D from D
+--R            if D has LNAGG(D2) and D2 has TYPE
+--R   [29] (ThreeDimensionalMatrix(D1),NonNegativeInteger,
 --R            NonNegativeInteger,NonNegativeInteger) -> D1
---R            from ThreeDimensionalMatrix D1 if D1 has SETCAT
---R   [30] (D,List Integer,List Integer) -> D from D
---R            if D has MATCAT(D2,D3,D4) and D2 has RING and D3 has FLAGG 
---R            D2 and D4 has FLAGG D2
---R   [31] (D,D1) -> D1 from D if D has PERMCAT D1 and D1 has SETCAT
---R   [32] (PermutationGroup D3,NonNegativeInteger) -> Permutation D3
---R            from PermutationGroup D3 if D3 has SETCAT
+--R            from ThreeDimensionalMatrix(D1) if D1 has SETCAT
+--R   [30] (D,List(Integer),List(Integer)) -> D from D
+--R            if D has MATCAT(D2,D3,D4) and D2 has RING and D3 has FLAGG(
+--R            D2) and D4 has FLAGG(D2)
+--R   [31] (D,D1) -> D1 from D if D has PERMCAT(D1) and D1 has SETCAT
+--R   [32] (PermutationGroup(D3),NonNegativeInteger) -> Permutation(D3)
+--R            from PermutationGroup(D3) if D3 has SETCAT
 --R   [33] (D,Integer) -> D1 from D
---R            if D has PLACESC(D1,D3) and D3 has LOCPOWC D1 and D1 has 
+--R            if D has PLACESC(D1,D3) and D3 has LOCPOWC(D1) and D1 has 
 --R            FIELD
---R   [34] (D,Integer) -> D1 from D if D has PRSPCAT D1 and D1 has FIELD
---R         
+--R   [34] (D,Integer) -> D1 from D if D has PRSPCAT(D1) and D1 has FIELD
+--R            
 --R   [35] (QuadraticForm(D3,D1),DirectProduct(D3,D1)) -> D1
 --R            from QuadraticForm(D3,D1) if D3: PI and D1 has FIELD
---R   [36] (D,value) -> D1 from D if D has RCAGG D1 and D1 has TYPE
+--R   [36] (D,value) -> D1 from D if D has RCAGG(D1) and D1 has TYPE
 --R   [37] (D,Integer,Integer,D1) -> D1 from D
 --R            if D has RMATCAT(D3,D4,D1,D5,D6) and D1 has RING and D5 has
 --R            DIRPCAT(D4,D1) and D6 has DIRPCAT(D3,D1)
@@ -6384,17 +6358,17 @@
 --R            and D6 has DIRPCAT(D3,D1) and D1 has RING
 --R   [39] (RewriteRule(D3,D4,D1),D1,PositiveInteger) -> D1
 --R            from RewriteRule(D3,D4,D1)
---R            if D3 has SETCAT and D4 has Join(Ring,PatternMatchable D3,
---R            OrderedSet,ConvertibleTo Pattern D3) and D1 has Join(
---R            FunctionSpace D4,PatternMatchable D3,ConvertibleTo Pattern 
---R            D3)
+--R            if D3 has SETCAT and D4 has Join(Ring,PatternMatchable(D3),
+--R            OrderedSet,ConvertibleTo(Pattern(D3))) and D1 has Join(
+--R            FunctionSpace(D4),PatternMatchable(D3),ConvertibleTo(
+--R            Pattern(D3)))
 --R   [40] (Ruleset(D3,D4,D1),D1,PositiveInteger) -> D1 from Ruleset(D3,D4
 --R            ,D1)
---R            if D3 has SETCAT and D4 has Join(Ring,PatternMatchable D3,
---R            OrderedSet,ConvertibleTo Pattern D3) and D1 has Join(
---R            FunctionSpace D4,PatternMatchable D3,ConvertibleTo Pattern 
---R            D3)
---R   [41] (D,List Integer) -> D from D
+--R            if D3 has SETCAT and D4 has Join(Ring,PatternMatchable(D3),
+--R            OrderedSet,ConvertibleTo(Pattern(D3))) and D1 has Join(
+--R            FunctionSpace(D4),PatternMatchable(D3),ConvertibleTo(
+--R            Pattern(D3)))
+--R   [41] (D,List(Integer)) -> D from D
 --R            if D has SEXCAT(D2,D3,D4,D5,D6) and D2 has SETCAT and D3 
 --R            has SETCAT and D4 has SETCAT and D5 has SETCAT and D6 has 
 --R            SETCAT
@@ -6403,27 +6377,28 @@
 --R            has SETCAT and D4 has SETCAT and D5 has SETCAT and D6 has 
 --R            SETCAT
 --R   [43] (D,D) -> D from D if D has SRAGG
---R   [44] (Symbol,List OutputForm) -> Symbol from Symbol
---R   [45] (Fraction D,D1) -> D1 from D
---R            if D has UPOLYC D1 and D1 has RING and D1 has FIELD
---R   [46] (Fraction D,Fraction D) -> Fraction D from D
---R            if D has UPOLYC D2 and D2 has RING and D2 has INTDOM
+--R   [44] (Symbol,List(OutputForm)) -> Symbol from Symbol
+--R   [45] (Fraction(D),D1) -> D1 from D
+--R            if D has UPOLYC(D1) and D1 has RING and D1 has FIELD
+--R   [46] (Fraction(D),Fraction(D)) -> Fraction(D) from D
+--R            if D has UPOLYC(D2) and D2 has RING and D2 has INTDOM
 --R   [47] (D,D2) -> D1 from D
 --R            if D has UPSCAT(D1,D2) and D2 has OAMON and D1 has RING
---R   [48] (D,last) -> D1 from D if D has URAGG D1 and D1 has TYPE
---R   [49] (D,rest) -> D from D if D has URAGG D2 and D2 has TYPE
---R   [50] (D,first) -> D1 from D if D has URAGG D1 and D1 has TYPE
+--R   [48] (D,last) -> D1 from D if D has URAGG(D1) and D1 has TYPE
+--R   [49] (D,rest) -> D from D if D has URAGG(D2) and D2 has TYPE
+--R   [50] (D,first) -> D1 from D if D has URAGG(D1) and D1 has TYPE
 --R
 --RThere are 4 unexposed functions called elt :
 --R   [1] (EuclideanModularRing(D2,D1,D3,D4,D5,D6),D1) -> D1
 --R            from EuclideanModularRing(D2,D1,D3,D4,D5,D6)
---R            if D2 has COMRING and D1 has UPOLYC D2 and D3 has ABELMON 
+--R            if D2 has COMRING and D1 has UPOLYC(D2) and D3 has ABELMON 
 --R            and D4: ((D1,D3) -> D1) and D5: ((D3,D3) -> Union(D3,
 --R            "failed")) and D6: ((D1,D1,D3) -> Union(D1,"failed"))
---R   [2] (OutputForm,List OutputForm) -> OutputForm from OutputForm
---R   [3] (BasicOperator,List Pattern D3) -> Pattern D3 from Pattern D3
+--R   [2] (OutputForm,List(OutputForm)) -> OutputForm from OutputForm
+--R   [3] (BasicOperator,List(Pattern(D3))) -> Pattern(D3) from Pattern(D3
+--R            )
 --R            if D3 has SETCAT
---R   [4] Reference D1 -> D1 from Reference D1 if D1 has TYPE
+--R   [4] Reference(D1) -> D1 from Reference(D1) if D1 has TYPE
 --R
 --RExamples of elt from AffineSpaceCategory
 --R
@@ -6586,7 +6561,7 @@
 --RThere are 2 exposed functions called minColIndex :
 --R   [1] D -> Integer from D
 --R            if D has ARR2CAT(D2,D3,D4) and D2 has TYPE and D3 has FLAGG
---R            D2 and D4 has FLAGG D2
+--R            (D2) and D4 has FLAGG(D2)
 --R   [2] D -> Integer from D
 --R            if D has RMATCAT(D2,D3,D4,D5,D6) and D4 has RING and D5 has
 --R            DIRPCAT(D3,D4) and D6 has DIRPCAT(D2,D4)
@@ -6606,12 +6581,12 @@
 --R 
 --R
 --RThere is one exposed function called numberOfFactors :
---R   [1] Factored D2 -> NonNegativeInteger from Factored D2 if D2 has 
+--R   [1] Factored(D2) -> NonNegativeInteger from Factored(D2) if D2 has 
 --R            INTDOM
 --R
 --RThere is one unexposed function called numberOfFactors :
---R   [1] List Record(factor: D3,degree: Integer) -> NonNegativeInteger
---R            from GaloisGroupFactorizer D3 if D3 has UPOLYC INT
+--R   [1] List(Record(factor: D3,degree: Integer)) -> NonNegativeInteger
+--R            from GaloisGroupFactorizer(D3) if D3 has UPOLYC(INT)
 --R
 --RExamples of numberOfFactors from Factored
 --R
@@ -6628,7 +6603,7 @@
 --R 
 --R
 --RThere is one exposed function called cyclicCopy :
---R   [1] Tree D1 -> Tree D1 from Tree D1 if D1 has SETCAT
+--R   [1] Tree(D1) -> Tree(D1) from Tree(D1) if D1 has SETCAT
 --R
 --RExamples of cyclicCopy from Tree
 --R
diff --git a/src/input/dpol.input.pamphlet b/src/input/dpol.input.pamphlet
index 9dc4123..1f2ef85 100644
--- a/src/input/dpol.input.pamphlet
+++ b/src/input/dpol.input.pamphlet
@@ -25,7 +25,7 @@
 odvar:=ODVAR Symbol
 --R 
 --R
---R   (1)  OrderlyDifferentialVariable Symbol
+--R   (1)  OrderlyDifferentialVariable(Symbol)
 --R                                                                 Type: Domain
 --E 1
 
@@ -39,7 +39,7 @@ the $i$-th derivative of $w$ is printed as $w_5$
 --R
 --R   (2)  [w ,w ,w ,w ,w ,w]
 --R          5  4  3  2  1
---R                                Type: List OrderlyDifferentialVariable Symbol
+--R                              Type: List(OrderlyDifferentialVariable(Symbol))
 --E 2
 
 \end{chunk}
@@ -52,7 +52,7 @@ sort %
 --R
 --R   (3)  [w,w ,w ,w ,w ,w ]
 --R            1  2  3  4  5
---R                                Type: List OrderlyDifferentialVariable Symbol
+--R                              Type: List(OrderlyDifferentialVariable(Symbol))
 --E 3
 
 \end{chunk}
@@ -64,8 +64,8 @@ dpol:=DSMP (FRAC INT, Symbol, odvar)
 --R 
 --R
 --R   (4)
---R  DifferentialSparseMultivariatePolynomial(Fraction Integer,Symbol,OrderlyDiffe
---R  rentialVariable Symbol)
+--R  DifferentialSparseMultivariatePolynomial(Fraction(Integer),Symbol,OrderlyDiff
+--R  erentialVariable(Symbol))
 --R                                                                 Type: Domain
 --E 4
 
@@ -132,7 +132,7 @@ lb:=leader b
 --R
 --R   (10)  z
 --R          2
---R                                     Type: OrderlyDifferentialVariable Symbol
+--R                                    Type: OrderlyDifferentialVariable(Symbol)
 --E 10
 
 \end{chunk}
@@ -172,7 +172,7 @@ lbprime:= leader bprime
 --R
 --R   (13)  z
 --R          3
---R                                     Type: OrderlyDifferentialVariable Symbol
+--R                                    Type: OrderlyDifferentialVariable(Symbol)
 --E 13
 
 \end{chunk}
diff --git a/src/input/e1.input.pamphlet b/src/input/e1.input.pamphlet
index a6cc96a..769286c 100644
--- a/src/input/e1.input.pamphlet
+++ b/src/input/e1.input.pamphlet
@@ -29,7 +29,7 @@ machineFraction (G:DFLOAT:=0.577215664901532860606512)
 --R         649887063340739
 --R   (1)  ----------------
 --R        1125899906842624
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 1
 
 \end{chunk}
@@ -265,7 +265,7 @@ t3:List List Fraction Integer:=[[machineFraction (x::DFLOAT) for x in line]_
 --R     1  999443511248233 1998887022126037        370429
 --R    [-,----------------,----------------,- ----------------]]
 --R     2 1125899906842624 2251799813685248   2251799813685248
---R                                             Type: List List Fraction Integer
+--R                                          Type: List(List(Fraction(Integer)))
 --E 3
 \end{chunk}
 
@@ -1040,7 +1040,7 @@ t4:List List Fraction Integer:=[[machineFraction (x::DFLOAT) for x in line]_
 --R        3523653169885229  440456643606101        21036421
 --R    [2,-----------------,----------------,- -----------------]]
 --R       72057594037927936 9007199254740992   72057594037927936
---R                                             Type: List List Fraction Integer
+--R                                          Type: List(List(Fraction(Integer)))
 --E 4
 
 \end{chunk}
@@ -1603,7 +1603,7 @@ t6:List List Fraction Integer:=[[machineFraction (x::DFLOAT) for x in line]_
 [9.9,0.914907418,g(9.9),g(9.9)-0.914907418],_
 [10.0,0.915633339,g(10.0),g(10.0)-0.915633339]]]
 --R 
---R   Compiling function g with type Float -> Expression DoubleFloat 
+--R   Compiling function g with type Float -> Expression(DoubleFloat) 
 --R
 --R   (6)
 --R       3254558849758993 6509117697504369        2013617
@@ -1849,7 +1849,7 @@ t6:List List Fraction Integer:=[[machineFraction (x::DFLOAT) for x in line]_
 --R        4123645964328403 8247291932240601      3583795
 --R    [10,----------------,----------------,----------------]]
 --R        4503599627370496 9007199254740992 9007199254740992
---R                                             Type: List List Fraction Integer
+--R                                          Type: List(List(Fraction(Integer)))
 --E 6
 
 \end{chunk}
@@ -2107,7 +2107,7 @@ E1(0.0)
 --R 
 --R
 --R   (7)  infinity
---R                                         Type: OnePointCompletion DoubleFloat
+--R                                        Type: OnePointCompletion(DoubleFloat)
 --E 7
 
 )spool 
diff --git a/src/input/easter.input.pamphlet b/src/input/easter.input.pamphlet
index 387d9d7..54d2c86 100644
--- a/src/input/easter.input.pamphlet
+++ b/src/input/easter.input.pamphlet
@@ -43,7 +43,7 @@ factor(%)
 --R
 --R         47 22 12 8  4  3  2  2  2
 --R   (2)  2  3  5  7 11 13 17 19 23 29 31 37 41 43 47
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 2
 
 \end{chunk}
@@ -56,7 +56,7 @@ Infinite precision rational numbers
 --R        4861
 --R   (3)  ----
 --R        2520
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 3
 
 \end{chunk}
@@ -95,7 +95,7 @@ besselJ(2, 1 + %i)
 --R 
 --R
 --R   (7)  4.1579886943962155E-2 + 0.24739764151330637 %i
---R                                                    Type: Complex DoubleFloat
+--R                                                   Type: Complex(DoubleFloat)
 --E 7
 
 \end{chunk}
@@ -120,7 +120,7 @@ continuedFraction(3.1415926535)
 --R              1 |     1  |     1 |      1  |     1 |     1 |     1 |
 --R   (9)  3 + +---+ + +----+ + +---+ + +-----+ + +---+ + +---+ + +---+ + ...
 --R            | 7     | 15     | 1     | 292     | 1     | 1     | 6
---R                                              Type: ContinuedFraction Integer
+--R                                             Type: ContinuedFraction(Integer)
 --E 9
 
 \end{chunk}
@@ -143,7 +143,7 @@ simplify(%)
 --R          +---------+
 --R          |  +-+
 --R   (11)  \|2\|3  + 4
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 11
 
 \end{chunk}
@@ -172,7 +172,7 @@ simplify(%)
 --R          |  |  |     +-----------+
 --R          |  |  |     |    +-+
 --R   (13)  \|3\|2\|- 12\|- 2\|2  + 3  + 5  + 3  + 14
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 13
 
 \end{chunk}
@@ -198,7 +198,7 @@ algebra: rational simplification
 --R         x - 2
 --R   (15)  -----
 --R         x + 2
---R                                            Type: Fraction Polynomial Integer
+--R                                          Type: Fraction(Polynomial(Integer))
 --E 15
 
 \end{chunk}
@@ -215,7 +215,7 @@ This example requires more sophistication
 --R           -
 --R           2
 --R         %e  + 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 16
 
 --S 17 of 200
@@ -226,7 +226,7 @@ normalize(%)
 --R           -
 --R           2
 --R   (17)  %e  - 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 17
 
 \end{chunk}
@@ -245,7 +245,7 @@ Expand and factor polynomials
 --R   + 
 --R           5        4        3       2
 --R     15504x  + 4845x  + 1140x  + 190x  + 20x + 1
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 18
 
 --S 19 of 200
@@ -261,7 +261,7 @@ D(%, x)
 --R   + 
 --R            6          5         4         3        2
 --R     542640x  + 232560x  + 77520x  + 19380x  + 3420x  + 380x + 20
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 19
 
 --S 20 of 200
@@ -270,7 +270,7 @@ factor(%)
 --R
 --R                  19
 --R   (20)  20(x + 1)
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 20
 
 --S 21 of 200
@@ -279,7 +279,7 @@ x**100 - 1
 --R
 --R          100
 --R   (21)  x    - 1
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 21
 
 --S 22 of 200
@@ -295,7 +295,7 @@ factor(%)
 --R  *
 --R       40    30    20    10
 --R     (x   - x   + x   - x   + 1)
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 22
 
 \end{chunk}
@@ -307,7 +307,7 @@ p:= x**4 - 3*x**2 + 1
 --R
 --R          4     2
 --R   (23)  x  - 3x  + 1
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 23
 
 --S 24 of 200
@@ -316,7 +316,7 @@ factor(p)
 --R
 --R           2           2
 --R   (24)  (x  - x - 1)(x  + x - 1)
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 24
 
 --S 25 of 200
@@ -331,7 +331,7 @@ factor(p, [phi])
 --R 
 --R
 --R   (26)  (x - phi)(x - phi + 1)(x + phi - 1)(x + phi)
---R                                    Type: Factored Polynomial AlgebraicNumber
+--R                                  Type: Factored(Polynomial(AlgebraicNumber))
 --E 26
 
 --S 27 of 200
@@ -340,7 +340,7 @@ factor(p :: Polynomial(PrimeField(5)))
 --R
 --R                2       2
 --R   (27)  (x + 2) (x + 3)
---R                                       Type: Factored Polynomial PrimeField 5
+--R                                    Type: Factored(Polynomial(PrimeField(5)))
 --E 27
 
 --S 28 of 200
@@ -349,7 +349,7 @@ expand(%)
 --R
 --R          4     2
 --R   (28)  x  + 2x  + 1
---R                                                Type: Polynomial PrimeField 5
+--R                                              Type: Polynomial(PrimeField(5))
 --E 28
 
 \end{chunk}
@@ -364,7 +364,7 @@ Partial fraction decomposition
 --R   (29)  -----------------
 --R          3     2
 --R         x  + 4x  + 5x + 2
---R                                            Type: Fraction Polynomial Integer
+--R                                          Type: Fraction(Polynomial(Integer))
 --E 29
 
 --S 30 of 200
@@ -378,7 +378,7 @@ padicFraction(
 --R   (30)  - ----- + -------- + -----
 --R           x + 1          2   x + 2
 --R                   (x + 1)
---R               Type: PartialFraction UnivariatePolynomial(x,Fraction Integer)
+--R             Type: PartialFraction(UnivariatePolynomial(x,Fraction(Integer)))
 --E 30
 
 \end{chunk}
@@ -392,7 +392,7 @@ r:= cos(3*x)/cos(x)
 --R         cos(3x)
 --R   (31)  -------
 --R          cos(x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 31
 
 --S 32 of 200
@@ -401,7 +401,7 @@ real(complexNormalize(%))
 --R
 --R                  2          2
 --R   (32)  - 2sin(x)  + 2cos(x)  - 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 32
 
 --S 33 of 200
@@ -409,7 +409,7 @@ real(normalize(simplify(complexNormalize(r))))
 --R 
 --R
 --R   (33)  2cos(2x) - 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 33
 
 \end{chunk}
@@ -426,7 +426,7 @@ sincosAngles:= rule _
 --R   (34)
 --R   {cos(n x) == - sin(x)sin((n - 1)x) + cos(x)cos((n - 1)x),
 --R    sin(n x) == cos(x)sin((n - 1)x) + cos((n - 1)x)sin(x)}
---R                            Type: Ruleset(Integer,Integer,Expression Integer)
+--R                           Type: Ruleset(Integer,Integer,Expression(Integer))
 --E 34
 
 --S 35 of 200
@@ -435,14 +435,14 @@ sincosAngles r
 --R
 --R                  2         2
 --R   (35)  - 3sin(x)  + cos(x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 35
 
 --S 36 of 200
 r:= 'r;
 --R 
 --R
---R                                                             Type: Variable r
+--R                                                            Type: Variable(r)
 --E 36
 
 \end{chunk}
@@ -480,7 +480,7 @@ simplify(%)
 --R
 --R          3+-+3+-+2     3+-+2     3+-+    3+-+
 --R   (40)  3\|2 \|4   + (3\|2   - 6)\|4  - 6\|2
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 40
 
 \end{chunk}
@@ -494,7 +494,7 @@ x**(1/n)*y**(1/n) - (x*y)**(1/n)
 --R                -    - -
 --R                n    n n
 --R   (41)  - (x y)  + x y
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 41
 
 --S 42 of 200
@@ -502,7 +502,7 @@ normalize(%)
 --R 
 --R
 --R   (42)  0
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 42
 
 \end{chunk}
@@ -516,7 +516,7 @@ expr:= log(tan(1/2*x + %pi/4)) - asinh(tan(x))
 --R                 2x + %pi
 --R   (43)  log(tan(--------)) - asinh(tan(x))
 --R                     4
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 43
 
 --S 44 of 200
@@ -568,7 +568,7 @@ complexNormalize(%)
 --R                   ----------------
 --R                           4
 --R                (%e                )  + 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 44
 
 \end{chunk}
@@ -588,7 +588,7 @@ D(expr, x)
 --R                                2x + %pi  |      2
 --R                           2tan(--------)\|tan(x)  + 1
 --R                                    4
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 45
 
 --S 46 of 200
@@ -609,7 +609,7 @@ simplify(real(complexNormalize(expand(simplify(%)))))
 --R         2          2         |      x 8         x 6         x 4        x 2
 --R                             4|16cos(-)  - 32cos(-)  + 24cos(-)  - 8cos(-)  + 1
 --R                             \|      2           2           2          2
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 46
 
 --S 47 of 200
@@ -617,7 +617,7 @@ normalize(eval(expr, x = 0))
 --R 
 --R
 --R   (47)  0
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 47
 
 --S 48 of 200
@@ -630,7 +630,7 @@ log((2*sqrt(r) + 1)/sqrt(4*r + 4*sqrt(r) + 1))
 --R              +--------------+
 --R              |  +-+
 --R             \|4\|r  + 4r + 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 48
 
 --S 49 of 200
@@ -643,7 +643,7 @@ simplify(%)
 --R              +--------------+
 --R              |  +-+
 --R             \|4\|r  + 4r + 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 49
 
 --S 50 of 200
@@ -657,7 +657,7 @@ simplify(%)
 --R                      +-+                      +-+
 --R            +-+     2\|r  + 1   +-+          2\|r  + 1     +-+
 --R   (50)  (2\|r  + 1)         (4\|r  + 4r + 1)          - 2\|r  - 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 50
 
 --S 51 of 200
@@ -665,7 +665,7 @@ normalize(%)
 --R 
 --R
 --R   (51)  0
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 51
 
 \end{chunk}
@@ -681,15 +681,15 @@ rectform(z) == real(z) + %i*imag(z)
 --S 53 of 200
 rectform(log(3 + 4*%i))
 --R 
---R   Compiling function rectform with type Expression Complex Integer -> 
---R      Expression Complex Integer 
+--R   Compiling function rectform with type Expression(Complex(Integer))
+--R       -> Expression(Complex(Integer)) 
 --R
 --R                            4
 --R         log(25) + 2%i atan(-)
 --R                            3
 --R   (53)  ---------------------
 --R                   2
---R                                             Type: Expression Complex Integer
+--R                                           Type: Expression(Complex(Integer))
 --E 53
 
 --S 54 of 200
@@ -701,7 +701,7 @@ simplify(rectform(tan(x + %i*y)))
 --R   (54)  -----------------------------------------------------
 --R                  - 2y                      2        - 2y
 --R         2cos(x)%e    sin(x) + (- 2%i cos(x)  + %i)%e     - %i
---R                                             Type: Expression Complex Integer
+--R                                           Type: Expression(Complex(Integer))
 --E 54
 
 \end{chunk}
@@ -721,7 +721,7 @@ sqrt(x*y*abs(z)**2) / (sqrt(x)*abs(z))
 --R   (55)  --------------
 --R                  +-+
 --R           abs(z)\|x
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 55
 
 \end{chunk}
@@ -738,7 +738,7 @@ sqrt(1/z) - 1/sqrt(z)
 --R   (56)  ------------
 --R              +-+
 --R             \|z
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 56
 
 \end{chunk}
@@ -749,7 +749,7 @@ log(%e**z)
 --R 
 --R
 --R   (57)  z
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 57
 
 --S 58 of 200
@@ -757,7 +757,7 @@ normalize(%)
 --R 
 --R
 --R   (58)  z
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 58
 
 \end{chunk}
@@ -769,7 +769,7 @@ log(%e**(10*%i))
 --R
 --R               10%i
 --R   (59)  log(%e    )
---R                                             Type: Expression Complex Integer
+--R                                           Type: Expression(Complex(Integer))
 --E 59
 
 --S 60 of 200
@@ -778,7 +778,7 @@ normalize(%)
 --R
 --R               10%i
 --R   (60)  log(%e    )
---R                                             Type: Expression Complex Integer
+--R                                           Type: Expression(Complex(Integer))
 --E 60
 
 \end{chunk}
@@ -789,7 +789,7 @@ atan(tan(z))
 --R 
 --R
 --R   (61)  z
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 61
 
 \end{chunk}
@@ -803,7 +803,7 @@ sqrt(%e**z) - %e**(z/2)
 --R          +---+     -
 --R          |  z      2
 --R   (62)  \|%e   - %e
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 62
 
 \end{chunk}
@@ -817,7 +817,7 @@ Manipulate an equation using a natural syntax
 --R         x + 2
 --R   (63)  -----= 1
 --R           2
---R                                   Type: Equation Fraction Polynomial Integer
+--R                                Type: Equation(Fraction(Polynomial(Integer)))
 --E 63
 
 \end{chunk}
@@ -867,14 +867,14 @@ radicalSolve(3*x**3 - 18*x**2 + 33*x - 19 = 0, x)
 --R                    3  |-------------
 --R                      3|      +-+
 --R                      \|    6\|3
---R                                       Type: List Equation Expression Integer
+--R                                    Type: List(Equation(Expression(Integer)))
 --E 64
 
 --S 65 of 200
 map(e +-> lhs(e) = rectform(rhs(e)), %)
 --R 
---R   Compiling function rectform with type Expression Integer -> 
---R      Expression Complex Integer 
+--R   Compiling function rectform with type Expression(Integer) -> 
+--R      Expression(Complex(Integer)) 
 --R
 --R   (65)
 --R   [
@@ -919,7 +919,7 @@ map(e +-> lhs(e) = rectform(rhs(e)), %)
 --R         \|3 sin(---) - %i\|3 cos(---)
 --R                  18               18
 --R     ]
---R                               Type: List Equation Expression Complex Integer
+--R                           Type: List(Equation(Expression(Complex(Integer))))
 --E 65
 
 \end{chunk}
@@ -931,7 +931,7 @@ eqn:= x**4 + x**3 + x**2 + x + 1 = 0
 --R
 --R          4    3    2
 --R   (66)  x  + x  + x  + x + 1= 0
---R                                            Type: Equation Polynomial Integer
+--R                                          Type: Equation(Polynomial(Integer))
 --E 66
 
 --S 67 of 200
@@ -1279,7 +1279,7 @@ radicalSolve(eqn, x)
 --R      /
 --R         4
 --R     ]
---R                                       Type: List Equation Expression Integer
+--R                                    Type: List(Equation(Expression(Integer)))
 --E 67
 
 \end{chunk}
@@ -1371,7 +1371,7 @@ eval(eqn, %.1)
 --R                                  \|       54\|3
 --R     =
 --R     0
---R                                            Type: Equation Expression Integer
+--R                                          Type: Equation(Expression(Integer))
 --E 68
 
 --S 69 of 200
@@ -1380,7 +1380,7 @@ eval(eqn, %.1)
 --R
 --R           2x      x
 --R   (69)  %e   + 2%e  + 1= z
---R                                            Type: Equation Expression Integer
+--R                                          Type: Equation(Expression(Integer))
 --E 69
 
 --S 70 of 200
@@ -1389,7 +1389,7 @@ solve(%, x)
 --R
 --R                  +-+                +-+
 --R   (70)  [x= log(\|z  - 1),x= log(- \|z  - 1)]
---R                                       Type: List Equation Expression Integer
+--R                                    Type: List(Equation(Expression(Integer)))
 --E 70
 
 \end{chunk}
@@ -1401,7 +1401,7 @@ This equation is already factored and so {\sl should} be easy to solve
 --R
 --R                       3      4                  3      2                 3
 --R   (71)  (x + 1)cos(3x) sin(x)  + (2x + 2)cos(3x) sin(x)  + (x + 1)cos(3x) = 0
---R                                            Type: Equation Expression Integer
+--R                                          Type: Equation(Expression(Integer))
 --E 71
 
 --S 72 of 200
@@ -1411,7 +1411,7 @@ solve(%, x)
 --R                   +---+             +---+     %pi
 --R   (72)  [x= asin(\|- 1 ),x= - asin(\|- 1 ),x= ---,x= - 1]
 --R                                                6
---R                                       Type: List Equation Expression Integer
+--R                                    Type: List(Equation(Expression(Integer)))
 --E 72
 
 \end{chunk}
@@ -1423,7 +1423,7 @@ solve(%e**z = 1, z)
 --R 
 --R
 --R   (73)  [z= 0]
---R                                       Type: List Equation Expression Integer
+--R                                    Type: List(Equation(Expression(Integer)))
 --E 73
 
 \end{chunk}
@@ -1436,7 +1436,7 @@ solve(sin(x) = cos(x), x)
 --R             %pi
 --R   (74)  [x= ---]
 --R              4
---R                                       Type: List Equation Expression Integer
+--R                                    Type: List(Equation(Expression(Integer)))
 --E 74
 
 --S 75 of 200
@@ -1446,7 +1446,7 @@ solve(tan(x) = 1, x)
 --R             %pi
 --R   (75)  [x= ---]
 --R              4
---R                                       Type: List Equation Expression Integer
+--R                                    Type: List(Equation(Expression(Integer)))
 --E 75
 
 \end{chunk}
@@ -1457,7 +1457,7 @@ solve(sin(x) = tan(x), x)
 --R 
 --R
 --R   (76)  [x= 0]
---R                                       Type: List Equation Expression Integer
+--R                                    Type: List(Equation(Expression(Integer)))
 --E 76
 
 \end{chunk}
@@ -1468,7 +1468,7 @@ solve(sqrt(x**2 + 1) = x - 2, x)
 --R 
 --R
 --R   (77)  []
---R                                       Type: List Equation Expression Integer
+--R                                    Type: List(Equation(Expression(Integer)))
 --E 77
 
 \end{chunk}
@@ -1479,7 +1479,7 @@ eq1:=   x +   y +   z =  6
 --R 
 --R
 --R   (78)  z + y + x= 6
---R                                            Type: Equation Polynomial Integer
+--R                                          Type: Equation(Polynomial(Integer))
 --E 78
 
 --S 79 of 200
@@ -1487,7 +1487,7 @@ eq2:= 2*x +   y + 2*z = 10
 --R 
 --R
 --R   (79)  2z + y + 2x= 10
---R                                            Type: Equation Polynomial Integer
+--R                                          Type: Equation(Polynomial(Integer))
 --E 79
 
 --S 80 of 200
@@ -1495,7 +1495,7 @@ eq3:=   x + 3*y +   z = 10
 --R 
 --R
 --R   (80)  z + 3y + x= 10
---R                                            Type: Equation Polynomial Integer
+--R                                          Type: Equation(Polynomial(Integer))
 --E 80
 
 \end{chunk}
@@ -1506,7 +1506,7 @@ solve([eq1, eq2, eq3], [x, y, z])
 --R 
 --R
 --I   (81)  [[x= - %BU + 4,y= 2,z= %BU]]
---R                         Type: List List Equation Fraction Polynomial Integer
+--R                    Type: List(List(Equation(Fraction(Polynomial(Integer)))))
 --E 81
 \end{chunk}
 Solve a system of nonlinear equations
@@ -1517,7 +1517,7 @@ eq1:= x**2*y + 3*y*z - 4 = 0
 --R
 --R                 2
 --R   (82)  3y z + x y - 4= 0
---R                                            Type: Equation Polynomial Integer
+--R                                          Type: Equation(Polynomial(Integer))
 --E 82
 
 --S 83 of 200
@@ -1526,7 +1526,7 @@ eq2:= -3*x**2*z + 2*y**2 + 1 = 0
 --R
 --R             2      2
 --R   (83)  - 3x z + 2y  + 1= 0
---R                                            Type: Equation Polynomial Integer
+--R                                          Type: Equation(Polynomial(Integer))
 --E 83
 
 --S 84 of 200
@@ -1535,7 +1535,7 @@ eq3:= 2*y*z**2 - z**2 - 1 = 0
 --R
 --R                  2
 --R   (84)  (2y - 1)z  - 1= 0
---R                                            Type: Equation Polynomial Integer
+--R                                          Type: Equation(Polynomial(Integer))
 --E 84
 
 \end{chunk}
@@ -1557,7 +1557,7 @@ solve([eq1, eq2, eq3], [x, y, z])
 --R        5     4     3     2
 --R      6z  - 6z  - 9z  - 7z  - 3z - 1= 0]
 --R     ]
---R                         Type: List List Equation Fraction Polynomial Integer
+--R                    Type: List(List(Equation(Fraction(Polynomial(Integer)))))
 --E 85
 
 \end{chunk}
@@ -1570,7 +1570,7 @@ m:= matrix([[a, b], [1, a*b]])
 --R         +a   b +
 --R   (86)  |      |
 --R         +1  a b+
---R                                              Type: Matrix Polynomial Integer
+--R                                            Type: Matrix(Polynomial(Integer))
 --E 86
 
 \end{chunk}
@@ -1589,7 +1589,7 @@ minv:= inverse(m)
 --R         |- ---------  ---------|
 --R         |    2          2      |
 --R         +  (a  - 1)b  (a  - 1)b+
---R                          Type: Union(Matrix Fraction Polynomial Integer,...)
+--R                       Type: Union(Matrix(Fraction(Polynomial(Integer))),...)
 --E 87
 
 --S 88 of 200
@@ -1599,7 +1599,7 @@ m * minv
 --R         +1  0+
 --R   (88)  |    |
 --R         +0  1+
---R                                     Type: Matrix Fraction Polynomial Integer
+--R                                  Type: Matrix(Fraction(Polynomial(Integer)))
 --E 88
 
 \end{chunk}
@@ -1621,7 +1621,7 @@ matrix([[1,    1,    1,    1   ], _
 --R         |              |
 --R         | 3   3   3   3|
 --R         +w   x   y   z +
---R                                              Type: Matrix Polynomial Integer
+--R                                            Type: Matrix(Polynomial(Integer))
 --E 89
 
 --S 90 of 200
@@ -1640,7 +1640,7 @@ determinant(%)
 --R   + 
 --R         3    3   2       2 3    3 2
 --R     (w x  - w x)y  + (- w x  + w x )y
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 90
 
 \end{chunk}
@@ -1651,7 +1651,7 @@ factor(%)
 --R 
 --R
 --R   (91)  (x - w)(y - x)(y - w)(z - y)(z - x)(z - w)
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 91
 
 \end{chunk}
@@ -1668,7 +1668,7 @@ m:= matrix([[ 5, -3, -7], _
 --R   (92)  |- 2   1    2 |
 --R         |             |
 --R         + 2   - 3  - 4+
---R                                                         Type: Matrix Integer
+--R                                                        Type: Matrix(Integer)
 --E 92
 
 --S 93 of 200
@@ -1677,7 +1677,7 @@ characteristicPolynomial(m, lambda)
 --R
 --R                 3          2
 --R   (93)  - lambda  + 2lambda  + 5lambda - 6
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 93
 
 --S 94 of 200
@@ -1685,14 +1685,14 @@ solve(% = 0, lambda)
 --R 
 --R
 --R   (94)  [lambda= 3,lambda= 1,lambda= - 2]
---R                              Type: List Equation Fraction Polynomial Integer
+--R                          Type: List(Equation(Fraction(Polynomial(Integer))))
 --E 94
 
 --S 95 of 200
 m:= 'm;
 --R 
 --R
---R                                                             Type: Variable m
+--R                                                            Type: Variable(m)
 --E 95
 
 \end{chunk}
@@ -1708,7 +1708,7 @@ summation(k**3, k = 1..n)
 --R   (96)  >     k
 --R         --+
 --R         k= 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 96
 
 --S 97 of 200
@@ -1719,7 +1719,7 @@ sum(k**3, k = 1..n)
 --R         n  + 2n  + n
 --R   (97)  -------------
 --R               4
---R                                            Type: Fraction Polynomial Integer
+--R                                          Type: Fraction(Polynomial(Integer))
 --E 97
 
 --S 98 of 200
@@ -1741,7 +1741,7 @@ product(k, k = 1..n)
 --R   (99)   | |   k
 --R          | |
 --R         k= 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 99
 
 \end{chunk}
@@ -1753,7 +1753,7 @@ limit((1 + 1/n)**n, n = %plusInfinity)
 --R 
 --R
 --R   (100)  %e
---R                        Type: Union(OrderedCompletion Expression Integer,...)
+--R                      Type: Union(OrderedCompletion(Expression(Integer)),...)
 --E 100
 
 --S 101 of 200
@@ -1763,7 +1763,7 @@ limit((1 - cos(x))/x**2, x = 0)
 --R          1
 --R   (101)  -
 --R          2
---R                        Type: Union(OrderedCompletion Expression Integer,...)
+--R                      Type: Union(OrderedCompletion(Expression(Integer)),...)
 --E 101
 
 \end{chunk}
@@ -1791,7 +1791,7 @@ D(y(x(t)), t, 2)
 --R           ,   2 ,,          ,       ,,
 --R   (104)  x (t) y  (x(t)) + y (x(t))x  (t)
 --R
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 104
 
 )clear properties x y
@@ -1807,7 +1807,7 @@ D(y(x(t)), t, 2)
 --R   (105)  ------
 --R           3
 --R          x  + 2
---R                                            Type: Fraction Polynomial Integer
+--R                                          Type: Fraction(Polynomial(Integer))
 --E 105
 
 \end{chunk}
@@ -1828,7 +1828,7 @@ integrate(%, x)
 --R  /
 --R       +-+3+-+
 --R     6\|3 \|4
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 106
 
 --S 107 of 200
@@ -1839,7 +1839,7 @@ D(%, x)
 --R   (107)  ------
 --R           3
 --R          x  + 2
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 107
 
 \end{chunk}
@@ -1868,7 +1868,7 @@ integrate(1/(a + b*cos(x)), x)
 --R             +---------+
 --R             |   2    2
 --R            \|- b  + a
---R                                     Type: Union(List Expression Integer,...)
+--R                                   Type: Union(List(Expression(Integer)),...)
 --E 108
 
 --S 109 of 200
@@ -1878,7 +1878,7 @@ map(simplify, map(f +-> D(f, x), %))
 --R                 1            1
 --R   (109)  [------------,------------]
 --R           b cos(x) + a b cos(x) + a
---R                                                Type: List Expression Integer
+--R                                              Type: List(Expression(Integer))
 --E 109
 
 \end{chunk}
@@ -1891,7 +1891,7 @@ D(abs(x), x)
 --R          abs(x)
 --R   (110)  ------
 --R             x
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 110
 
 --S 111 of 200
@@ -1902,7 +1902,7 @@ integrate(abs(x), x)
 --R           ++
 --I   (111)   |   abs(%J)d%J
 --R          ++
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 111
 
 \end{chunk}
@@ -1917,10 +1917,10 @@ a(x) == if x < 0 then -x else x
 --S 113 of 200
 D(a(x), x)
 --R 
---R   Compiling function a with type Variable x -> Polynomial Integer 
+--R   Compiling function a with type Variable(x) -> Polynomial(Integer) 
 --R
 --R   (113)  1
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 113
 
 --S 114 of 200
@@ -1930,7 +1930,7 @@ integrate(a(x), x)
 --R          1  2
 --R   (114)  - x
 --R          2
---R                                            Type: Polynomial Fraction Integer
+--R                                          Type: Polynomial(Fraction(Integer))
 --E 114
 
 )clear properties a
@@ -1947,7 +1947,7 @@ integrate(x/(sqrt(1 + x) + sqrt(1 - x)), x)
 --R          (x + 1)\|x + 1  + (- x + 1)\|- x + 1
 --R   (115)  -------------------------------------
 --R                            3
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 115
 
 --S 116 of 200
@@ -1958,7 +1958,7 @@ integrate((sqrt(1 + x) - sqrt(1 - x))/2, x)
 --R          (x + 1)\|x + 1  + (- x + 1)\|- x + 1
 --R   (116)  -------------------------------------
 --R                            3
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 116
 
 \end{chunk}
@@ -2009,7 +2009,7 @@ integrate(sqrt(x + 1/x - 2), x = 0..1, "noPole")
 --R            4
 --R   (118)  - -
 --R            3
---R                    Type: Union(f1: OrderedCompletion Expression Integer,...)
+--R                  Type: Union(f1: OrderedCompletion(Expression(Integer)),...)
 --E 120
 
 --S 121 of 200
@@ -2028,7 +2028,7 @@ integrate(sqrt(x + 1/x - 2), x = 1..2, "noPole")
 --R          - 2\|2  + 4
 --R   (120)  -----------
 --R               3
---R                    Type: Union(f1: OrderedCompletion Expression Integer,...)
+--R                  Type: Union(f1: OrderedCompletion(Expression(Integer)),...)
 --E 122
 
 --S 123 of 200
@@ -2047,7 +2047,7 @@ integrate(sqrt(x + 1/x - 2), x = 0..2, "noPole")
 --R            2\|2
 --R   (122)  - -----
 --R              3
---R                    Type: Union(f1: OrderedCompletion Expression Integer,...)
+--R                  Type: Union(f1: OrderedCompletion(Expression(Integer)),...)
 --E 124
 
 \end{chunk}
@@ -2100,7 +2100,7 @@ integrate(integrate(integrate(1, z = 0..c*(1 - x/a - y/b)), _
 --R          a b c
 --R   (127)  -----
 --R            6
---R                    Type: Union(f1: OrderedCompletion Expression Integer,...)
+--R                  Type: Union(f1: OrderedCompletion(Expression(Integer)),...)
 --E 129
 
 \end{chunk}
@@ -2119,7 +2119,7 @@ Taylor series---this first example comes from special relativity
 --R           |---------
 --R           |     2
 --R          \|    c
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 130
 
 --S 131 of 200
@@ -2130,7 +2130,7 @@ series(%, v = 0)
 --R   (129)  1 + --- v  + --- v  + ---- v  + O(v )
 --R                2        4         6
 --R              2c       8c       16c
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,v,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),v,0)
 --E 131
 
 --S 132 of 200
@@ -2141,7 +2141,7 @@ series(%, v = 0)
 --R   (130)  1 - -- v  + O(v )
 --R               2
 --R              c
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,v,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),v,0)
 --E 132
 
 --S 133 of 200
@@ -2151,7 +2151,7 @@ tsin:= series(sin(x), x = 0)
 --R              1  3    1   5     1   7      9
 --R   (131)  x - - x  + --- x  - ---- x  + O(x )
 --R              6      120      5040
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 133 
 
 --S 134 of 200
@@ -2161,7 +2161,7 @@ tcos:= series(cos(x), x = 0)
 --R              1  2    1  4    1   6      8
 --R   (132)  1 - - x  + -- x  - --- x  + O(x )
 --R              2      24      720
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 134
 
 \end{chunk}
@@ -2174,7 +2174,7 @@ tsin/tcos
 --R              1  3    2  5    17  7      9
 --R   (133)  x + - x  + -- x  + --- x  + O(x )
 --R              3      15      315
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 135
 
 --S 136 of 200
@@ -2184,7 +2184,7 @@ series(tan(x), x = 0)
 --R              1  3    2  5    17  7      9
 --R   (134)  x + - x  + -- x  + --- x  + O(x )
 --R              3      15      315
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 136
 
 \end{chunk}
@@ -2199,7 +2199,7 @@ log(x)**a*exp(-b*x)
 --R
 --R            - b x      a
 --R   (135)  %e     log(x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 137
 
 --S 138 of 200
@@ -2254,7 +2254,7 @@ log(sin(x)/x)
 --R              sin(x)
 --R   (136)  log(------)
 --R                 x
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 141
 
 --S 142 of 200
@@ -2264,7 +2264,7 @@ series(%, x = 0)
 --R            1  2    1   4     1   6     1    8      10
 --R   (137)  - - x  - --- x  - ---- x  - ----- x  + O(x  )
 --R            6      180      2835      37800
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 142
 
 --S 143 of 200
@@ -2273,7 +2273,7 @@ exp(-x)*sin(x)
 --R
 --R            - x
 --R   (138)  %e   sin(x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 143
 
 --S 144 of 200
@@ -2283,7 +2283,7 @@ series(%, x = 0)
 --R               2   1  3    1  5    1  6    1   7      9
 --R   (139)  x - x  + - x  - -- x  + -- x  - --- x  + O(x )
 --R                   3      30      90      630
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 144
 
 \end{chunk}
@@ -2302,7 +2302,7 @@ x = sin(y(x)) + cos(y(x))
 --R 
 --R
 --R   (141)  x= sin(y(x)) + cos(y(x))
---R                                            Type: Equation Expression Integer
+--R                                          Type: Equation(Expression(Integer))
 --E 146
 
 --S 147 of 200
@@ -2329,7 +2329,7 @@ pade(1, 1, taylor(exp(-x), x = 0))
 --R          - x + 2
 --R   (142)  -------
 --R           x + 2
---R         Type: Union(Fraction UnivariatePolynomial(x,Expression Integer),...)
+--R       Type: Union(Fraction(UnivariatePolynomial(x,Expression(Integer))),...)
 --E 148
 
 \end{chunk}
@@ -2344,7 +2344,7 @@ laplace(cos((w - 1)*t), t, s)
 --R   (143)  ----------------
 --R           2         2
 --R          w  - 2w + s  + 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 149
 
 --S 150 of 200
@@ -2354,7 +2354,7 @@ inverseLaplace(%, s, t)
 --R                +-----------+
 --R                | 2
 --R   (144)  cos(t\|w  - 2w + 1 )
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 150
 
 \end{chunk}
@@ -2373,7 +2373,7 @@ r(n + 2) - 2 * r(n + 1) + r(n) = 2
 --R 
 --R
 --R   (146)  r(n + 2) - 2r(n + 1) + r(n)= 2
---R                                            Type: Equation Expression Integer
+--R                                          Type: Equation(Expression(Integer))
 --E 152
 
 --S 153 of 200
@@ -2381,7 +2381,7 @@ r(n + 2) - 2 * r(n + 1) + r(n) = 2
 --R 
 --R
 --R   (147)  [r(n + 2) - 2r(n + 1) + r(n)= 2,r(0)= 1,r(1)= m]
---R                                       Type: List Equation Expression Integer
+--R                                    Type: List(Equation(Expression(Integer)))
 --E 153
 
 )clear properties r
@@ -2404,7 +2404,7 @@ ode:= D(f(t), t, 2) + 4*f(t) = sin(2*t)
 --R           ,,
 --R   (149)  f  (t) + 4f(t)= sin(2t)
 --R
---R                                            Type: Equation Expression Integer
+--R                                          Type: Equation(Expression(Integer))
 --E 155
 
 --S 156 of 200
@@ -2415,7 +2415,7 @@ map(e +-> laplace(e, t, s), %)
 --R   (150)  (s  + 4)laplace(f(t),t,s) - f (0) - f(0)s= ------
 --R                                                      2
 --R                                                     s  + 4
---R                                            Type: Equation Expression Integer
+--R                                          Type: Equation(Expression(Integer))
 --E 156
 
 \end{chunk}
@@ -2428,7 +2428,7 @@ solve(ode, f, t = 0, [0, 0])
 --R          sin(2t) - 2t cos(2t)
 --R   (151)  --------------------
 --R                    8
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 157
 
 \end{chunk}
@@ -2448,7 +2448,7 @@ x**2 * D(y(x), x) + 3*x*y(x) = sin(x)/x
 --R           2 ,               sin(x)
 --R   (153)  x y (x) + 3x y(x)= ------
 --R                                x
---R                                            Type: Equation Expression Integer
+--R                                          Type: Equation(Expression(Integer))
 --E 159
 
 --S 160 of 200
@@ -2459,7 +2459,7 @@ solve(%, y, x)
 --R   (154)  [particular= - ------,basis= [--]]
 --R                            3            3
 --R                           x            x
---IType: Union(Record(particular: Expression Integer,basis: ...
+--RType: Union(Record(particular: Expression(Integer),basis: List(Expression(Integer))),...)
 --E 160
 
 \end{chunk}
@@ -2472,7 +2472,7 @@ D(y(x), x, 2) + y(x)*D(y(x), x)**3 = 0
 --R           ,,           ,   3
 --R   (155)  y  (x) + y(x)y (x) = 0
 --R
---R                                            Type: Equation Expression Integer
+--R                                          Type: Equation(Expression(Integer))
 --E 161
 
 --S 162 of 200
@@ -2496,7 +2496,7 @@ D(y(x, a), x) = a*y(x, a)
 --R
 --R   (156)  y  (x,a)= a y(x,a)
 --R           ,1
---R                                            Type: Equation Expression Integer
+--R                                          Type: Equation(Expression(Integer))
 --E 163
 
 --S 164 of 200
@@ -2521,7 +2521,7 @@ solve(D(y(x), x, 2) + k**2*y(x) = 0, y, x)
 --R 
 --R
 --R   (157)  [particular= 0,basis= [cos(k x),sin(k x)]]
---IType: Union(Record(particular: Expression Integer,basis: ...
+--RType: Union(Record(particular: Expression(Integer),basis: List(Expression(Integer))),...)
 --E 165
 
 -- bc(%, x = 0, y = 0, x = 1, D(y(x), x) = 0)
@@ -2543,7 +2543,7 @@ system:= [D(x(t), t) = x(t) - y(t), D(y(t), t) = x(t) + y(t)]
 --R            ,                    ,
 --R   (159)  [x (t)= - y(t) + x(t),y (t)= y(t) + x(t)]
 --R
---R                                       Type: List Equation Expression Integer
+--R                                    Type: List(Equation(Expression(Integer)))
 --E 167
 
 \end{chunk}
@@ -2557,7 +2557,7 @@ system:= [D(x(t), t) = x(t) * (1 + cos(t)/(2 + sin(t))), _
 --R            ,     x(t)sin(t) + x(t)cos(t) + 2x(t)  ,
 --R   (160)  [x (t)= -------------------------------,y (t)= - y(t) + x(t)]
 --R                             sin(t) + 2
---R                                       Type: List Equation Expression Integer
+--R                                    Type: List(Equation(Expression(Integer)))
 --E 168
 
 \end{chunk}
@@ -2569,7 +2569,7 @@ s:=solve(system.1, x, t)
 --R
 --R                                   t            t
 --R   (161)  [particular= 0,basis= [%e sin(t) + 2%e ]]
---IType: Union(Record(particular: Expression Integer,basis: ...
+--RType: Union(Record(particular: Expression(Integer),basis: List(Expression(Integer))),...)
 --E 169
 
 --S 170 of 200
@@ -2578,7 +2578,7 @@ eq1 := x(t) = C1 * s.basis.1
 --R
 --R                     t               t
 --R   (162)  x(t)= C1 %e sin(t) + 2C1 %e
---R                                            Type: Equation Expression Integer
+--R                                          Type: Equation(Expression(Integer))
 --E 170
 
 --S 171 of 200
@@ -2592,7 +2592,7 @@ s1:=solve(map(e +-> subst(e, eq1), system.2), y, t)
 --R                                           5
 --R              - t
 --R    basis= [%e   ]]
---IType: Union(Record(particular: Expression Integer,basis: ...
+--RType: Union(Record(particular: Expression(Integer),basis: List(Expression(Integer))),...)
 --E 171
 
 --S 172 of 200
@@ -2603,7 +2603,7 @@ eq2 := y(t) = simplify(s1.particular) + C2 * s1.basis.1
 --R                2C1 %e sin(t) + (- C1 cos(t) + 5C1)%e  + 5C2 %e
 --R   (164)  y(t)= --------------------------------------------------
 --R                                         5
---R                                            Type: Equation Expression Integer
+--R                                          Type: Equation(Expression(Integer))
 --E 172
 
 --S 173 of 200
@@ -2611,7 +2611,7 @@ map(e +-> rightZero eval(e, [eq1, D(eq1,t), eq2 , D(eq2,t)]), system)
 --R 
 --R
 --R   (165)  [0= 0,0= 0]
---R                                       Type: List Equation Expression Integer
+--R                                    Type: List(Equation(Expression(Integer)))
 --E 173
 )clear properties x y
  
@@ -2624,7 +2624,7 @@ DD:= operator("D") :: Operator(Expression Integer)
 --R 
 --R
 --R   (166)  D
---R                                            Type: Operator Expression Integer
+--R                                          Type: Operator(Expression(Integer))
 --E 174
 
 --S 175 of 200
@@ -2632,7 +2632,7 @@ evaluate(DD, e +-> D(e, x))$Operator(Expression Integer)
 --R 
 --R
 --R   (167)  D
---R                                            Type: Operator Expression Integer
+--R                                          Type: Operator(Expression(Integer))
 --E 175
 
 --S 176 of 200
@@ -2641,7 +2641,7 @@ L:= (DD - 1) * (DD + 2)
 --R
 --R                 2
 --R   (168)  D 2 + D  - D - 2
---R                                            Type: Operator Expression Integer
+--R                                          Type: Operator(Expression(Integer))
 --E 176
 
 --S 177 of 200
@@ -2659,7 +2659,7 @@ L(f(x))
 --R           ,,       ,
 --R   (170)  f  (x) + f (x) - 2f(x)
 --R
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 178
 
 --S 179 of 200
@@ -2669,7 +2669,7 @@ subst(L(subst(g(y), y = x)), x = y)
 --R           ,,       ,
 --R   (171)  g  (y) + g (y) - 2g(y)
 --R
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 179
 
 --S 180 of 200
@@ -2678,7 +2678,7 @@ subst(L(subst(A * sin(z**2), z = x)), x = z)
 --R
 --R                 2           2                    2
 --R   (172)  (- 4A z  - 2A)sin(z ) + (2A z + 2A)cos(z )
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 180
 
 \end{chunk}
@@ -2714,7 +2714,7 @@ T(f, x, a)
 --R
 --R   (174)  -----------------------------------------------
 --R                                 2
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 182
 
 --S 183 of 200
@@ -2726,7 +2726,7 @@ T(g, y, b)
 --R
 --R   (175)  -----------------------------------------------
 --R                                 2
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 183
 
 --S 184 of 200
@@ -2734,7 +2734,7 @@ Sin:= operator("sin") :: Operator(Expression Integer)
 --R 
 --R
 --R   (176)  sin
---R                                            Type: Operator Expression Integer
+--R                                          Type: Operator(Expression(Integer))
 --E 184
 
 --S 185 of 200
@@ -2742,7 +2742,7 @@ evaluate(Sin, x +-> sin(x))$Operator(Expression Integer)
 --R 
 --R
 --R   (177)  sin
---R                                            Type: Operator Expression Integer
+--R                                          Type: Operator(Expression(Integer))
 --E 185
 
 --S 186 of 200
@@ -2753,7 +2753,7 @@ T(Sin, z, c)
 --R          (- z  + 2c z - c  + 2)sin(c) + (2z - 2c)cos(c)
 --R   (178)  ----------------------------------------------
 --R                                 2
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 186
 
 \end{chunk}
@@ -2772,8 +2772,8 @@ for i in 0..4 _
             output(concat(["p(", string(i), ", x) = "])); _
             output(p(i, x))}
 --R 
---R   Compiling function p with type (NonNegativeInteger,Variable x) -> 
---R      Polynomial Fraction Integer 
+--R   Compiling function p with type (NonNegativeInteger,Variable(x)) -> 
+--R      Polynomial(Fraction(Integer)) 
 --R
 --R   p(0, x) =
 --R   1
@@ -2801,11 +2801,11 @@ for i in 0..4 _
 --S 189 of 200
 eval(p(4, x), x = 1)
 --R 
---R   Compiling function p with type (PositiveInteger,Variable x) -> 
---R      Polynomial Fraction Integer 
+--R   Compiling function p with type (PositiveInteger,Variable(x)) -> 
+--R      Polynomial(Fraction(Integer)) 
 --R
 --R   (181)  1
---R                                            Type: Polynomial Fraction Integer
+--R                                          Type: Polynomial(Fraction(Integer))
 --E 189
 
 \end{chunk}
@@ -2834,8 +2834,8 @@ for i in 0..4 repeat { output(""); _
                        output(concat(["pp(", string(i), ", x) = "])); _
                        output(pp(i, x))}
 --R 
---R   Compiling function pp with type (Integer,Variable x) -> Polynomial 
---R      Fraction Integer 
+--R   Compiling function pp with type (Integer,Variable(x)) -> Polynomial(
+--R      Fraction(Integer)) 
 --R
 --R   pp(0, x) =
 --R   1
@@ -2881,7 +2881,7 @@ sum(a(i)*x**i, i = 1..5)
 --R
 --R               5        4        3        2
 --R   (187)  a(5)x  + a(4)x  + a(3)x  + a(2)x  + a(1)x
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 195
 
 --S 196 of 200
@@ -2890,7 +2890,7 @@ p:= factor(%)
 --R
 --R               5        4        3        2
 --R   (188)  a(5)x  + a(4)x  + a(3)x  + a(2)x  + a(1)x
---R                                            Type: Factored Expression Integer
+--R                                          Type: Factored(Expression(Integer))
 --E 196
 
 \end{chunk}
diff --git a/src/input/efi.input.pamphlet b/src/input/efi.input.pamphlet
index b700c20..5111d93 100644
--- a/src/input/efi.input.pamphlet
+++ b/src/input/efi.input.pamphlet
@@ -25,7 +25,7 @@
 EFI:=Expression Integer
 --R 
 --R
---R   (1)  Expression Integer
+--R   (1)  Expression(Integer)
 --R                                                                 Type: Domain
 --E 1
 
@@ -72,13 +72,13 @@ br(x) ==
 --S 6 of 15
 br([1])
 --R 
---R   Compiling function br with type List Expression Integer -> 
---R      Expression Integer 
+--R   Compiling function br with type List(Expression(Integer)) -> 
+--R      Expression(Integer) 
 --R
 --R           1
 --R   (6)  ------
 --R        %e - 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 6
 
 --S 7 of 15
@@ -86,7 +86,7 @@ br([0])
 --R 
 --R
 --R   (7)  1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 7
 
 --S 8 of 15
@@ -99,7 +99,7 @@ fJ:List FRAC INT -> EFI
 J(i:PI,j:PI):EFI==ber(s(i)-s(j))
 --R 
 --R   Function declaration J : (PositiveInteger,PositiveInteger) -> 
---R      Expression Integer has been added to workspace.
+--R      Expression(Integer) has been added to workspace.
 --R                                                                   Type: Void
 --E 9
 
@@ -107,7 +107,7 @@ J(i:PI,j:PI):EFI==ber(s(i)-s(j))
 function(J(1,2),'fJ,['s])
 --R 
 --R   Compiling function J with type (PositiveInteger,PositiveInteger) -> 
---R      Expression Integer 
+--R      Expression(Integer) 
 --R
 --R   (10)  fJ
 --R                                                                 Type: Symbol
@@ -125,19 +125,19 @@ ss:=[1,2]
 --R 
 --R
 --R   (12)  [1,2]
---R                                                   Type: List PositiveInteger
+--R                                                  Type: List(PositiveInteger)
 --E 12
 
 --S 13 of 15
 fJ(ss)
 --R 
---R   Compiling function fJ with type List Fraction Integer -> Expression 
---R      Integer 
+--R   Compiling function fJ with type List(Fraction(Integer)) -> 
+--R      Expression(Integer) 
 --R
 --R           %e
 --R   (13)  ------
 --R         %e - 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 13
 
 --S 14 of 15
@@ -145,7 +145,7 @@ ss:=[1,1]
 --R 
 --R
 --R   (14)  [1,1]
---R                                                   Type: List PositiveInteger
+--R                                                  Type: List(PositiveInteger)
 --E 14
 
 -- fJ doesn't know about the special definition at the origin
@@ -154,7 +154,7 @@ fJ(ss)
 --R 
 --R
 --R   (15)  1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 15
 )spool
 )lisp (bye)
diff --git a/src/input/ei.input.pamphlet b/src/input/ei.input.pamphlet
index 378b610..54e6910 100644
--- a/src/input/ei.input.pamphlet
+++ b/src/input/ei.input.pamphlet
@@ -173,7 +173,7 @@ aChebyshev:List Fraction Integer:=[machineFraction (x::DFLOAT) for x in _
 --R                    4182085200867523
 --R    -----------------------------------------------]
 --R    11417981541647679048466287755595961091061972992
---R                                                  Type: List Fraction Integer
+--R                                                Type: List(Fraction(Integer))
 --E 2
 
 \end{chunk}
@@ -317,7 +317,7 @@ t1:List List Fraction Integer:= [[machineFraction (x::DFLOAT) for x in line]_
 --R          4123645966120299 8247291932240599         1
 --R    [- 10,----------------,----------------,----------------]]
 --R          4503599627370496 9007199254740992 9007199254740992
---R                                             Type: List List Fraction Integer
+--R                                          Type: List(List(Fraction(Integer)))
 --E 3
 
 \end{chunk}
@@ -523,7 +523,7 @@ bChebyshev:List Fraction Integer:= [machineFraction (x::DFLOAT) for x in _
 --R                     4310880000722449
 --R    - ----------------------------------------------]
 --R      5708990770823839524233143877797980545530986496
---R                                                  Type: List Fraction Integer
+--R                                                Type: List(Fraction(Integer))
 --E 4
 
 \end{chunk}
@@ -677,7 +677,7 @@ t2:List List Fraction Integer:= [[machineFraction (x::DFLOAT) for x in line]_
 --R         3717192768015671 3717192768015671
 --R    [- 4,----------------,----------------,0]]
 --R         4503599627370496 4503599627370496
---R                                             Type: List List Fraction Integer
+--R                                          Type: List(List(Fraction(Integer)))
 --E 5
 
 \end{chunk}
@@ -806,7 +806,7 @@ cChebyshev:List Fraction Integer:= [machineFraction (x::DFLOAT) for x in _
 --R                   2712664091488837
 --R    ----------------------------------------------]
 --R    1427247692705959881058285969449495136382746624
---R                                                  Type: List Fraction Integer
+--R                                                Type: List(Fraction(Integer))
 --E 6
 
 \end{chunk}
@@ -947,7 +947,7 @@ t3:List List Fraction Integer:= [[machineFraction (x::DFLOAT) for x in line]_
 --R       2486460497711683 621615124427921        1
 --R    [4,----------------,---------------,---------------]]
 --R        562949953421312 140737488355328 562949953421312
---R                                             Type: List List Fraction Integer
+--R                                          Type: List(List(Fraction(Integer)))
 --E 7
 
 \end{chunk}
@@ -1135,7 +1135,7 @@ dChebyshev:List Fraction Integer:=[machineFraction (x::DFLOAT) for x in _
 --R                      8793730379918429
 --R    - -----------------------------------------------]
 --R      11417981541647679048466287755595961091061972992
---R                                                  Type: List Fraction Integer
+--R                                                Type: List(Fraction(Integer))
 --E 8
 
 \end{chunk}
@@ -1295,7 +1295,7 @@ t4:List List Fraction Integer:= [[machineFraction (x::DFLOAT) for x in line]_
 --R        2483677874720611 4967355749441223         1
 --R    [12,----------------,----------------,----------------]]
 --R        2251799813685248 4503599627370496 4503599627370496
---R                                             Type: List List Fraction Integer
+--R                                          Type: List(List(Fraction(Integer)))
 --E 9
 
 \end{chunk}
@@ -1477,7 +1477,7 @@ eChebyshev:List Fraction Integer:=[machineFraction (x::DFLOAT) for x in _
 --R                     2788779460539811
 --R    - ----------------------------------------------]
 --R      5708990770823839524233143877797980545530986496
---R                                                  Type: List Fraction Integer
+--R                                                Type: List(Fraction(Integer))
 --E 10
 
 \end{chunk}
@@ -1635,7 +1635,7 @@ t5:List List Fraction Integer:= [[machineFraction (x::DFLOAT) for x in line]_
 --R        4654080942723879 581760117840485         1
 --R    [32,----------------,---------------,----------------]]
 --R        4503599627370496 562949953421312 4503599627370496
---R                                             Type: List List Fraction Integer
+--R                                          Type: List(List(Fraction(Integer)))
 --E 11
 
 \end{chunk}
@@ -1828,7 +1828,7 @@ fChebyshev:List Fraction Integer:=[machineFraction (x::DFLOAT) for x in _
 --R                     3460871645858969
 --R    - ----------------------------------------------]
 --R      5708990770823839524233143877797980545530986496
---R                                                  Type: List Fraction Integer
+--R                                                Type: List(Fraction(Integer))
 --E 12
 
 \end{chunk}
@@ -1980,7 +1980,7 @@ t6:List List Fraction Integer:= [[machineFraction (x::DFLOAT) for x in line]_
 --R         2256215141523035 4512430283046069           1
 --R    [512,----------------,----------------,- ----------------]]
 --R         2251799813685248 4503599627370496   4503599627370496
---R                                             Type: List List Fraction Integer
+--R                                          Type: List(List(Fraction(Integer)))
 --E 13
 
 \end{chunk}
@@ -2307,7 +2307,7 @@ t7:List List Fraction Integer:= [[machineFraction (x::DFLOAT) for x in line]_
 --R     1 2567733724908559 641933431251443       97213
 --R    [-,----------------,---------------,----------------]]
 --R     2 2251799813685248 562949953421312 2251799813685248
---R                                             Type: List List Fraction Integer
+--R                                          Type: List(List(Fraction(Integer)))
 --E 15
 
 \end{chunk}
@@ -3087,7 +3087,7 @@ t8:List List Fraction Integer:= [[machineFraction (x::DFLOAT) for x in line]_
 --R       5577971999896927 2788985999949529       2131
 --R    [2,----------------,----------------,----------------]]
 --R       1125899906842624  562949953421312 1125899906842624
---R                                             Type: List List Fraction Integer
+--R                                          Type: List(List(Fraction(Integer)))
 --E 16
 
 \end{chunk}
@@ -3652,8 +3652,8 @@ t9:List List Fraction Integer:= [[machineFraction (x::DFLOAT) for x in line]_
  [9.9,1.133328746,f(9.9),f(9.9)-1.133328746],_
  [10.0,1.131470205,f(10.0),f(10.0)-1.131470205]]]
 --R 
---R   Compiling function f with type Float -> OnePointCompletion 
---R      DoubleFloat 
+--R   Compiling function f with type Float -> OnePointCompletion(
+--R      DoubleFloat) 
 --R
 --R   (19)
 --R       377448210364295    4848039718580287   830647041331407
@@ -3899,7 +3899,7 @@ t9:List List Fraction Integer:= [[machineFraction (x::DFLOAT) for x in line]_
 --R        2547844396809409 6279593088699023   3911784498538613
 --R    [10,----------------,----------------,- ----------------]]
 --R        2251799813685248 9007199254740992   9007199254740992
---R                                             Type: List List Fraction Integer
+--R                                          Type: List(List(Fraction(Integer)))
 --E 18
 
 \end{chunk}
@@ -4194,8 +4194,8 @@ t10:List List Fraction Integer:= [[machineFraction (x::DFLOAT) for x in line]_
  [0.005,1.00505077,g(0.005),g(0.005)-1.00505077],_
  [0.000,1.00000000,g(0.000),g(0.000)-1.00000000]]]
 --R 
---R   Compiling function g with type Float -> OnePointCompletion 
---R      DoubleFloat 
+--R   Compiling function g with type Float -> OnePointCompletion(
+--R      DoubleFloat) 
 --R
 --R   (21)
 --R      3602879701896397 318480551008551 5095688792421347       23715469
@@ -4259,7 +4259,7 @@ t10:List List Fraction Integer:= [[machineFraction (x::DFLOAT) for x in line]_
 --R    [------------------,----------------,----------------,- ----------------],
 --R     576460752303423488 2251799813685248 1125899906842624   2251799813685248
 --R    [0,1,1,0]]
---R                                             Type: List List Fraction Integer
+--R                                          Type: List(List(Fraction(Integer)))
 --E 20
 
 \end{chunk}
diff --git a/src/input/eigen.input.pamphlet b/src/input/eigen.input.pamphlet
index 81ff7ee..443ce63 100644
--- a/src/input/eigen.input.pamphlet
+++ b/src/input/eigen.input.pamphlet
@@ -34,7 +34,7 @@ m:=matrix([[1,2,1],[2,1,-2],[1,-2,4]])
 --R   (1)  |2   1   - 2|
 --R        |           |
 --R        +1  - 2   4 +
---R                                                         Type: Matrix Integer
+--R                                                        Type: Matrix(Integer)
 --E 1
 
 --S 2 of 36
@@ -43,7 +43,7 @@ characteristicPolynomial m
 --R
 --R            3      2
 --R   (2)  - %A  + 6%A  - 25
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 2
 
 --S 3 of 36
@@ -52,7 +52,7 @@ characteristicPolynomial(m,x)
 --R
 --R           3     2
 --R   (3)  - x  + 6x  - 25
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 3
 
 \end{chunk} 
@@ -70,7 +70,7 @@ p:=matrix([[x+1,2-x*y,x**2+1],[2-x,y+2*x,x**2-2],[y**2,x-2,4-x*y]])
 --R        |                             |
 --R        |   2                         |
 --R        +  y        x - 2    - x y + 4+
---R                                              Type: Matrix Polynomial Integer
+--R                                            Type: Matrix(Polynomial(Integer))
 --E 4
 
 --S 5 of 36
@@ -86,7 +86,7 @@ characteristicPolynomial p
 --R   + 
 --R              3               2       2                   3      2
 --R     (%B + 5)x  + (- 4%B + 7)x  + (3%B  - 18%B + 18)x - %B  + 5%B  + 4%B - 24
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 5
 
 --S 6 of 36
@@ -102,7 +102,7 @@ characteristicPolynomial(p,t)
 --R   + 
 --R                2      2                 3     2
 --R     (- 4t + 7)x  + (3t  - 18t + 18)x - t  + 5t  + 4t - 24
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 6
 
 \end{chunk} 
@@ -117,7 +117,7 @@ n:=matrix([[a,b,c],[d,e,f],[g,h,k]])
 --R   (7)  |d  e  f|
 --R        |       |
 --R        +g  h  k+
---R                                              Type: Matrix Polynomial Integer
+--R                                            Type: Matrix(Polynomial(Integer))
 --E 7
 
 --S 8 of 36
@@ -130,7 +130,7 @@ characteristicPolynomial n
 --R   + 
 --R                                       2                2      3
 --R     (b f - c e + %C c)g + (- %C a + %C )e + %C b d + %C a - %C
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 8
 
 \end{chunk}
@@ -143,7 +143,7 @@ leig := eigenvalues m
 --R
 --R                  2
 --R   (9)  [5,%D | %D  - %D - 5]
---RType: List Union(Fraction Polynomial Integer,SuchThat(Symbol,Polynomial Integer))
+--IType: List(Union(Fraction(Polynomial(Integer)),SuchThat(...
 --E 9
 
 --S 10 of 36
@@ -151,7 +151,7 @@ alpha:=leig.1
 --R 
 --R
 --R   (10)  5
---R                                 Type: Union(Fraction Polynomial Integer,...)
+--R                               Type: Union(Fraction(Polynomial(Integer)),...)
 --E 10
 
 \end{chunk}
@@ -169,7 +169,7 @@ eigenvector(alpha,m)
 --R          |  2|
 --R          |   |
 --R          + 1 +
---R                       Type: List Matrix Fraction Polynomial Fraction Integer
+--R                  Type: List(Matrix(Fraction(Polynomial(Fraction(Integer)))))
 --E 11
 
 --S 12 of 36
@@ -178,7 +178,7 @@ beta:=leig.2
 --R
 --R                2
 --R   (12)  %D | %D  - %D - 5
---R                         Type: Union(SuchThat(Symbol,Polynomial Integer),...)
+--R                        Type: Union(SuchThat(Symbol,Polynomial(Integer)),...)
 --E 12
 
 \end{chunk}
@@ -195,7 +195,7 @@ eigenvector(beta,m)$EP(INT)
 --R   (13)  [|2 |]
 --R          |  |
 --R          +1 +
---R                                Type: List Matrix Fraction Polynomial Integer
+--R                            Type: List(Matrix(Fraction(Polynomial(Integer))))
 --E 13
 
 -- eigenvector(beta,m)  not accepted by the interpreter
@@ -222,7 +222,7 @@ eigenvectors m
 --R    [eigval= (%E | %E  - %E - 5),eigmult= 1,eigvec= [|2 |]]]
 --R                                                     |  |
 --R                                                     +1 +
---IType: List Record(eigval: Union(Fraction Polynomial Integer,...
+--IType: List(Record(eigval: Union(Fraction(Polynomial(Integer)),...
 --E 14
 
 --S 15 of 36
@@ -233,7 +233,7 @@ q:=matrix [[x**2-y**2,(x-y)*(2*x+3*y)],[x+y,2*x+3*y]]
 --R   (15)  |- y  + x   - 3y  + x y + 2x |
 --R         |                            |
 --R         +  y + x         3y + 2x     +
---R                                              Type: Matrix Polynomial Integer
+--R                                            Type: Matrix(Polynomial(Integer))
 --E 15
 
 --S 16 of 36
@@ -249,7 +249,7 @@ eigenvectors(q)
 --R    [eigval= 0,eigmult= 1,eigvec= [|  y + x  |]]]
 --R                                   |         |
 --R                                   +    1    +
---IType: List Record(eigval: Union(Fraction Polynomial Integer,...
+--IType: List(Record(eigval: Union(Fraction(Polynomial(Integer)),...
 --E 16
 
 --S 17 of 36
@@ -263,7 +263,7 @@ p:=matrix([[76,-18,58,-10],[-4,78,2,-2],[-6,15,45,3],[22,-75,7,41]])
 --R         |- 6   15   45   3  |
 --R         |                   |
 --R         +22   - 75  7    41 +
---R                                                         Type: Matrix Integer
+--R                                                        Type: Matrix(Integer)
 --E 17
 
 --S 18 of 36
@@ -291,7 +291,7 @@ ll := eigenvectors p
 --R                                    | 0 |
 --R                                    |   |
 --R                                    + 1 +
---IType: List Record(eigval: Union(Fraction Polynomial Integer,...
+--IType: List(Record(eigval: Union(Fraction(Polynomial(Integer)),...
 --E 18
 
 \end{chunk}
@@ -315,7 +315,7 @@ generalizedEigenvectors p
 --R                            | 1  | +1+                           + 0  + + 1 +
 --R                            |    |
 --R                            + 0  +
---IType: List Record(eigval: Union(Fraction Polynomial Integer,...
+--IType: List(Record(eigval: Union(Fraction(Polynomial(Integer)),...
 --E 19
 
 --S 20 of 36
@@ -333,7 +333,7 @@ generalizedEigenvector(ll.1,p)$EP(INT)
 --R          | 1  | +1+
 --R          |    |
 --R          + 0  +
---R                                Type: List Matrix Fraction Polynomial Integer
+--R                            Type: List(Matrix(Fraction(Polynomial(Integer))))
 --E 20
 
 -- generalizedEigenvector(ll.1,p) the interpreter can not handle this
@@ -357,7 +357,7 @@ m
 --R   (21)  |2   1   - 2|
 --R         |           |
 --R         +1  - 2   4 +
---R                                                         Type: Matrix Integer
+--R                                                        Type: Matrix(Integer)
 --E 21
 
 --S 22 of 36
@@ -369,7 +369,7 @@ mm:=matrix([[30,4,24],[-17,8,-7],[-31,-54,-5]])
 --R   (22)  |- 17   8    - 7|
 --R         |               |
 --R         +- 31  - 54  - 5+
---R                                                         Type: Matrix Integer
+--R                                                        Type: Matrix(Integer)
 --E 22
 
 \end{chunk}
@@ -384,7 +384,7 @@ le1:=radicalEigenvalues m
 --R          - \|21  + 1 \|21  + 1
 --R   (23)  [-----------,---------,5]
 --R               2          2
---R                                                Type: List Expression Integer
+--R                                              Type: List(Expression(Integer))
 --E 23
 
 --S 24 of 36
@@ -393,7 +393,7 @@ le2:=radicalEigenvalues mm
 --R
 --R             +---+      +---+
 --R   (24)  [22\|- 1 ,- 22\|- 1 ,33]
---R                                                Type: List Expression Integer
+--R                                              Type: List(Expression(Integer))
 --E 24
 
 \end{chunk}
@@ -412,7 +412,7 @@ radicalEigenvector(le1.2, m)
 --R          |    2    |
 --R          |         |
 --R          +    1    +
---R                                         Type: List Matrix Expression Integer
+--R                                      Type: List(Matrix(Expression(Integer)))
 --E 25
 
 --S 26 of 36
@@ -432,7 +432,7 @@ radicalEigenvector(le2.2,mm)
 --R          |   38\|- 1  - 8    |
 --R          |                   |
 --R          +         1         +
---R                                         Type: List Matrix Expression Integer
+--R                                      Type: List(Matrix(Expression(Integer)))
 --E 26
 
 \end{chunk}
@@ -468,7 +468,7 @@ radicalEigenvectors m
 --R                                    |  2|
 --R                                    |   |
 --R                                    + 1 +
---IType: List Record(radval: Expression Integer,radmult: Integer,...
+--IType: List(Record(radval: Expression(Integer),radmult: Integer,...
 --E 27
 
 --S 28 of 36
@@ -503,7 +503,7 @@ radicalEigenvectors mm
 --R    [radval= 33,radmult= 1,radvect= [|- 3|]]]
 --R                                     |   |
 --R                                     + 1 +
---IType: List Record(radval: Expression Integer,radmult: Integer,...
+--IType: List(Record(radval: Expression(Integer),radmult: Integer,...
 --E 28
 
 \end{chunk}
@@ -521,7 +521,7 @@ realEigenvalues(m,1/1000000)
 --R            3756603   5853755
 --R   (29)  [- -------,5,-------]
 --R            2097152   2097152
---R                                                  Type: List Fraction Integer
+--R                                                Type: List(Fraction(Integer))
 --E 29
 
 --S 30 of 36
@@ -529,7 +529,7 @@ complexEigenvalues(mm,1/1000000)
 --R 
 --R
 --R   (30)  [- 22%i,22%i,33]
---R                                          Type: List Complex Fraction Integer
+--R                                       Type: List(Complex(Fraction(Integer)))
 --E 30
 
 --S 31 of 36
@@ -558,7 +558,7 @@ realEigenvectors(m,1/1000000)
 --R               2097152                      |    2    |
 --R                                            |         |
 --R                                            +    1    +
---IType: List Record(outval: Fraction Integer,outmult: Integer,...
+--IType: List(Record(outval: Fraction(Integer),outmult: Integer,...
 --E 31
 
 --S 32 of 36
@@ -589,7 +589,7 @@ complexEigenvectors(mm,1/1000000)
 --R                                         | 58   58    |
 --R                                         |            |
 --R                                         +     1      +
---IType: List Record(outval: Complex Fraction Integer,outmult: Integer,...
+--IType: List(Record(outval: Complex(Fraction(Integer)),...
 --E 32
 
 \end{chunk}
@@ -601,7 +601,7 @@ realEigenvalues(m,.000001)
 --R 
 --R
 --R   (33)  [- 1.7912878990 173339844,5.0,2.7912878990 173339844]
---R                                                             Type: List Float
+--R                                                            Type: List(Float)
 --E 33
 
 --S 34 of 36
@@ -630,7 +630,7 @@ realEigenvectors(m,.000001)
 --R                |                        |
 --R                +          1.0           +
 --R     ]
---R Type: List Record(outval: Float,outmult: Integer,outvect: List Matrix Float)
+--RType: List(Record(outval: Float,outmult: Integer,outvect: List(Matrix(Float))))
 --E 34
 
 --S 35 of 36
@@ -638,7 +638,7 @@ complexEigenvalues(mm,.000001)
 --R 
 --R
 --R   (35)  [- 22.0 %i,22.0 %i,33.0]
---R                                                     Type: List Complex Float
+--R                                                   Type: List(Complex(Float))
 --E 35
 
 --S 36 of 36
@@ -667,7 +667,7 @@ complexEigenvectors(mm,.000001)
 --R                |                                                     |
 --R                +                         1.0                         +
 --R     ]
---IType: List Record(outval: Complex Float,outmult: Integer,...
+--IType: List(Record(outval: Complex(Float),outmult: Integer,...
 --E 36
 )spool
 )lisp (bye)
diff --git a/src/input/elemfun.input.pamphlet b/src/input/elemfun.input.pamphlet
index 7428aec..70b63db 100644
--- a/src/input/elemfun.input.pamphlet
+++ b/src/input/elemfun.input.pamphlet
@@ -29,7 +29,7 @@ cos 0
 --R 
 --R
 --R   (1)  1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 1
 
 --S 2 of 28
@@ -37,7 +37,7 @@ sin 0
 --R 
 --R
 --R   (2)  0
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 2
 
 --S 3 of 28
@@ -45,7 +45,7 @@ exp 0
 --R 
 --R
 --R   (3)  1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 3
 
 --S 4 of 28
@@ -53,7 +53,7 @@ log 1
 --R 
 --R
 --R   (4)  0
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 4
 
 --S 5 of 28
@@ -61,7 +61,7 @@ sin(%pi/2)
 --R 
 --R
 --R   (5)  1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 5
 
 --S 6 of 28
@@ -69,7 +69,7 @@ simplify %
 --R 
 --R
 --R   (6)  1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 6
 
 \end{chunk} 
@@ -81,7 +81,7 @@ sin(3)**2 + cos(3)**2
 --R
 --R              2         2
 --R   (7)  sin(3)  + cos(3)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 7
 
 --S 8 of 28
@@ -89,7 +89,7 @@ simplify %
 --R 
 --R
 --R   (8)  1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 8
 
 --S 9  of 28
@@ -99,7 +99,7 @@ a := atan 1
 --R        %pi
 --R   (9)  ---
 --R         4
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 9
 
 --S 10 of 28
@@ -107,7 +107,7 @@ t := cos(a)*sin(a)*tan(a)*sec(a)*csc(a)*cot(a)
 --R 
 --R
 --R   (10)  1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 10
 
 --S 11 of 28
@@ -115,7 +115,7 @@ simplify t
 --R 
 --R
 --R   (11)  1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 11
 
 \end{chunk} 
@@ -126,7 +126,7 @@ cot2tan t
 --R 
 --R
 --R   (12)  1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 12
 
 --S 13 of 28
@@ -134,7 +134,7 @@ cot2trig t
 --R 
 --R
 --R   (13)  1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 13
 
 --S 14 of 28
@@ -142,7 +142,7 @@ tan2cot t
 --R 
 --R
 --R   (14)  1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 14
 
 --S 15 of 28
@@ -150,7 +150,7 @@ tan2trig t
 --R 
 --R
 --R   (15)  1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 15
 
 --S 16 of 28
@@ -158,7 +158,7 @@ cos2sec t
 --R 
 --R
 --R   (16)  1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 16
  
 \end{chunk}
@@ -174,7 +174,7 @@ t := sin(7)**2 - sec(7)/(1 - cot(7) + csc(7)**3)
 --R   (17)  --------------------------------------
 --R                        3
 --R                  csc(7)  - cot(7) + 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 17
 
 --S 18 of 28
@@ -190,7 +190,7 @@ simplify t
 --R  /
 --R            3                         4         2
 --R     (cos(7)  - cos(7))sin(7) - cos(7)  + cos(7)  - cos(7)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 18
 
 --S 19 of 28
@@ -238,7 +238,7 @@ u := exp(sin(x-1)**2 - cos(x-1)/sec(x-1))
 --R           ----------------------------------
 --R                       sec(x - 1)
 --R   (22)  %e
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 22
 
 --S 23 of 28
@@ -248,7 +248,7 @@ eval(u,x=1)
 --R          1
 --R   (23)  --
 --R         %e
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 23
  
 \end{chunk}
@@ -263,32 +263,32 @@ v(x) == exp(sin(x-1)**2 - cos(x-1)/sec(x-1))
 --S 25 of 28
 v x
 --R 
---R   Compiling function v with type Variable x -> Expression Integer 
+--R   Compiling function v with type Variable(x) -> Expression(Integer) 
 --R
 --R                               2
 --R           sec(x - 1)sin(x - 1)  - cos(x - 1)
 --R           ----------------------------------
 --R                       sec(x - 1)
 --R   (25)  %e
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 25
 
 --S 26 of 28
 v 1
 --R 
---R   Compiling function v with type PositiveInteger -> Expression Integer
---R      
+--R   Compiling function v with type PositiveInteger -> Expression(Integer
+--R      ) 
 --R
 --R          1
 --R   (26)  --
 --R         %e
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 26
 
 --S 27 of 28
 v(%pi/3)
 --R 
---R   Compiling function v with type Pi -> Expression Integer 
+--R   Compiling function v with type Pi -> Expression(Integer) 
 --R
 --R               %pi - 3     %pi - 3 2       %pi - 3
 --R           sec(-------)sin(-------)  - cos(-------)
@@ -298,7 +298,7 @@ v(%pi/3)
 --R                         sec(-------)
 --R                                3
 --R   (27)  %e
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 27
 
 --S 28 of 28
diff --git a/src/input/elemnum.input.pamphlet b/src/input/elemnum.input.pamphlet
index 368cdb0..877f1c7 100644
--- a/src/input/elemnum.input.pamphlet
+++ b/src/input/elemnum.input.pamphlet
@@ -37,7 +37,7 @@ x := 0.7::Float
 --R 
 --R
 --R   (2)  [0.7]
---R                                                             Type: List Float
+--R                                                            Type: List(Float)
 --E 2
 
 --S 3 of 50
@@ -45,7 +45,7 @@ x := 0.7::Float
 --R 
 --R
 --R   (3)  [0.7]
---R                                                             Type: List Float
+--R                                                            Type: List(Float)
 --E 3
 
 --S 4 of 50
@@ -53,7 +53,7 @@ x := 0.7::Float
 --R 
 --R
 --R   (4)  [0.7,0.7,0.7,0.7]
---R                                                             Type: List Float
+--R                                                            Type: List(Float)
 --E 4
 
 --S 5 of 50
@@ -61,7 +61,7 @@ x := 0.7::Float
 --R 
 --R
 --R   (5)  [0.7,0.7,0.7,0.7,0.7,0.7]
---R                                                             Type: List Float
+--R                                                            Type: List(Float)
 --E 5
 
 --S 6 of 50
@@ -69,7 +69,7 @@ x := 0.7::Float
 --R 
 --R
 --R   (6)  [0.7,0.7,0.7,0.7]
---R                                                             Type: List Float
+--R                                                            Type: List(Float)
 --E 6
 
 --S 7 of 50
@@ -77,7 +77,7 @@ x := 0.7::Float
 --R 
 --R
 --R   (7)  [0.7,0.7,0.7,0.7,0.7,0.7]
---R                                                             Type: List Float
+--R                                                            Type: List(Float)
 --E 7
 
 --should give errors:
@@ -99,7 +99,7 @@ x := 1.1::Float
 --R 
 --R
 --R   (9)  [1.1]
---R                                                             Type: List Float
+--R                                                            Type: List(Float)
 --E 9
 
 --S 10 of 50
@@ -107,7 +107,7 @@ x := 1.1::Float
 --R 
 --R
 --R   (10)  [1.1]
---R                                                             Type: List Float
+--R                                                            Type: List(Float)
 --E 10
 
 --S 11 of 50
@@ -115,7 +115,7 @@ x := 1.1::Float
 --R 
 --R
 --R   (11)  [1.1,1.1,1.1,1.1]
---R                                                             Type: List Float
+--R                                                            Type: List(Float)
 --E 11
 
 --S 12 of 50
@@ -123,7 +123,7 @@ x := 1.1::Float
 --R 
 --R
 --R   (12)  [1.1,1.1,1.1,1.1,1.1,1.1]
---R                                                             Type: List Float
+--R                                                            Type: List(Float)
 --E 12
 
 --S 13 of 50
@@ -131,7 +131,7 @@ x := 1.1::Float
 --R 
 --R
 --R   (13)  [1.1,1.1,1.1,1.1]
---R                                                             Type: List Float
+--R                                                            Type: List(Float)
 --E 13
 
 --S 14 of 50
@@ -139,7 +139,7 @@ x := 1.1::Float
 --R 
 --R
 --R   (14)  [1.1,1.1,1.1,1.1,1.1,1.1]
---R                                                             Type: List Float
+--R                                                            Type: List(Float)
 --E 14
 
 --should give errors: 
@@ -161,7 +161,7 @@ x := 0.7::DoubleFloat
 --R 
 --R
 --R   (16)  [0.69999999999999996]
---R                                                       Type: List DoubleFloat
+--R                                                      Type: List(DoubleFloat)
 --E 16
 
 --S 17 of 50
@@ -169,7 +169,7 @@ x := 0.7::DoubleFloat
 --R 
 --R
 --R   (17)  [0.70000000000000007]
---R                                                       Type: List DoubleFloat
+--R                                                      Type: List(DoubleFloat)
 --E 17
 
 --S 18 of 50
@@ -179,7 +179,7 @@ x := 0.7::DoubleFloat
 --R   (18)
 --R   [0.69999999999999996, 0.70000000000000007, 0.69999999999999996,
 --R    0.69999999999999996]
---R                                                       Type: List DoubleFloat
+--R                                                      Type: List(DoubleFloat)
 --E 18
 
 --S 19 of 50
@@ -189,7 +189,7 @@ x := 0.7::DoubleFloat
 --R   (19)
 --R   [0.69999999999999996, 0.69999999999999996, 0.69999999999999996,
 --R    0.69999999999999996, 0.69999999999999996, 0.69999999999999996]
---R                                                       Type: List DoubleFloat
+--R                                                      Type: List(DoubleFloat)
 --E 19
 
 --S 20 of 50
@@ -199,7 +199,7 @@ x := 0.7::DoubleFloat
 --R   (20)
 --R   [0.69999999999999996, 0.69999999999999996, 0.69999999999999984,
 --R    0.69999999999999996]
---R                                                       Type: List DoubleFloat
+--R                                                      Type: List(DoubleFloat)
 --E 20
 
 --S 21 of 50
@@ -209,7 +209,7 @@ x := 0.7::DoubleFloat
 --R   (21)
 --R   [0.70000000000000007, 0.70000000000000018, 0.70000000000000029,
 --R    0.70000000000000029, 0.70000000000000007, 0.70000000000000018]
---R                                                       Type: List DoubleFloat
+--R                                                      Type: List(DoubleFloat)
 --E 21
 
 --should give errors: 
@@ -231,7 +231,7 @@ x := 1.1::DoubleFloat
 --R 
 --R
 --R   (23)  [1.1000000000000001]
---R                                                       Type: List DoubleFloat
+--R                                                      Type: List(DoubleFloat)
 --E 23
 
 --S 24 of 50
@@ -239,7 +239,7 @@ x := 1.1::DoubleFloat
 --R 
 --R
 --R   (24)  [1.1000000000000001]
---R                                                       Type: List DoubleFloat
+--R                                                      Type: List(DoubleFloat)
 --E 24
 
 --S 25 of 50
@@ -248,7 +248,7 @@ x := 1.1::DoubleFloat
 --R
 --R   (25)
 --R   [1.1000000000000001,1.0999999999999999,1.1000000000000001,1.1000000000000001]
---R                                                       Type: List DoubleFloat
+--R                                                      Type: List(DoubleFloat)
 --E 25
 
 --S 26 of 50
@@ -258,7 +258,7 @@ x := 1.1::DoubleFloat
 --R   (26)
 --R   [1.1000000000000003, 1.1000000000000001, 1.1000000000000001,
 --R    1.1000000000000001, 1.0999999999999999, 1.1000000000000001]
---R                                                       Type: List DoubleFloat
+--R                                                      Type: List(DoubleFloat)
 --E 26
 
 --S 27 of 50
@@ -267,7 +267,7 @@ x := 1.1::DoubleFloat
 --R
 --R   (27)
 --R   [1.1000000000000001,1.1000000000000001,1.1000000000000001,1.1000000000000001]
---R                                                       Type: List DoubleFloat
+--R                                                      Type: List(DoubleFloat)
 --E 27
 
 --S 28 of 50
@@ -277,7 +277,7 @@ x := 1.1::DoubleFloat
 --R   (28)
 --R   [1.1000000000000001, 1.0999999999999999, 1.1000000000000001,
 --R    1.1000000000000003, 1.1000000000000001, 1.0999999999999999]
---R                                                       Type: List DoubleFloat
+--R                                                      Type: List(DoubleFloat)
 --E 28
 
 --should give errors: 
@@ -349,7 +349,7 @@ bb := 1.1::Float
 qtest(sa, sb, 1)
 --R 
 --R   Compiling function qtest with type (DoubleFloat,DoubleFloat,
---R      PositiveInteger) -> List Complex DoubleFloat 
+--R      PositiveInteger) -> List(Complex(DoubleFloat)) 
 --R
 --R   (35)
 --R   [1.1102230246251565E-16, 2.2204460492503131E-16 - 4.4408920985006262E-16 %i,
@@ -370,13 +370,13 @@ qtest(sa, sb, 1)
 --R    - 5.5511151231257827E-16, - 2.2204460492503131E-16,
 --R    - 1.1102230246251565E-16, 1.1102230246251565E-16, 0.,
 --R    - 1.1102230246251565E-16, - 1.1102230246251565E-16]
---R                                               Type: List Complex DoubleFloat
+--R                                             Type: List(Complex(DoubleFloat))
 --E 35
 
 --S 36 of 50
 qerr %
 --R 
---R   Compiling function qerr with type List Complex DoubleFloat -> 
+--R   Compiling function qerr with type List(Complex(DoubleFloat)) -> 
 --R      DoubleFloat 
 --R
 --R   (36)  1.2373359150401687E-31
@@ -387,7 +387,7 @@ qerr %
 qtest(ba, bb, 1)
 --R 
 --R   Compiling function qtest with type (Float,Float,PositiveInteger) -> 
---R      List Complex Float 
+--R      List(Complex(Float)) 
 --R
 --R   (37)
 --R   [- 0.3 E -20, 0.7 E -20, 0.7 E -20, 0.7 E -20 + 0.7 E -20 %i,
@@ -397,13 +397,13 @@ qtest(ba, bb, 1)
 --R    - 0.7 E -20 - 0.1 E -19 %i, 0.2 E -19, - 0.2 E -19 - 0.7 E -20 %i,
 --R    0.1 E -19 - 0.1 E -19 %i, - 0.7 E -20, - 0.7 E -20 - 0.7 E -20 %i, 0.0,
 --R    - 0.7 E -20, 0.0, - 0.3 E -20]
---R                                                     Type: List Complex Float
+--R                                                   Type: List(Complex(Float))
 --E 37
 
 --S 38 of 50
 qerr %
 --R 
---R   Compiling function qerr with type List Complex Float -> Float 
+--R   Compiling function qerr with type List(Complex(Float)) -> Float 
 --R
 --R   (38)  0.1355456601 9472741322 E -39
 --R                                                                  Type: Float
@@ -432,7 +432,7 @@ qtest(sa, sb, 2)
 --R    0., 8.8817841970012523E-16, 2.2204460492503131E-16, 1.1102230246251565E-16,
 --R    3.3306690738754696E-16, - 1.1102230246251565E-16, 1.1102230246251565E-16,
 --R    2.2204460492503131E-16 - 2.2204460492503131E-16 %i]
---R                                               Type: List Complex DoubleFloat
+--R                                             Type: List(Complex(DoubleFloat))
 --E 39
 
 --S 40 of 50
@@ -455,7 +455,7 @@ qtest(ba, bb, 2)
 --R    - 0.2 E -19, 0.2 E -19 - 0.7 E -20 %i, - 0.1 E -19 - 0.1 E -19 %i,
 --R    0.3 E -20 - 0.7 E -20 %i, 0.7 E -20 - 0.7 E -20 %i, 0.0,
 --R    0.3 E -20 - 0.7 E -20 %i, 0.7 E -20 - 0.7 E -20 %i, - 0.3 E -20]
---R                                                     Type: List Complex Float
+--R                                                   Type: List(Complex(Float))
 --E 41
 
 --S 42 of 50
@@ -486,7 +486,7 @@ qtest(sa, sb, 3)
 --R    8.8817841970012523E-16, 2.2204460492503131E-16, 1.1102230246251565E-16,
 --R    3.3306690738754696E-16, - 1.1102230246251565E-16, 1.1102230246251565E-16,
 --R    2.2204460492503131E-16 + 2.2204460492503131E-16 %i]
---R                                               Type: List Complex DoubleFloat
+--R                                             Type: List(Complex(DoubleFloat))
 --E 43
 
 --S 44 of 50
@@ -510,7 +510,7 @@ qtest(ba, bb, 3)
 --R    0.3 E -20 + 0.7 E -20 %i, 0.1 E -19 %i, 0.3 E -20 + 0.7 E -20 %i,
 --R    0.7 E -20 + 0.7 E -20 %i, 0.0, 0.3 E -20 + 0.7 E -20 %i,
 --R    0.7 E -20 + 0.7 E -20 %i, - 0.3 E -20]
---R                                                     Type: List Complex Float
+--R                                                   Type: List(Complex(Float))
 --E 45
 
 --S 46 of 50
@@ -538,7 +538,7 @@ qtest(sa, sb, 4)
 --R    2.2204460492503131E-16 %i, 0., 0., - 6.6613381477509392E-16,
 --R    - 2.2204460492503131E-16, - 1.1102230246251565E-16, 1.1102230246251565E-16,
 --R    0., - 1.1102230246251565E-16, - 1.1102230246251565E-16]
---R                                               Type: List Complex DoubleFloat
+--R                                             Type: List(Complex(DoubleFloat))
 --E 47
 
 --S 48 of 50
@@ -560,7 +560,7 @@ qtest(ba, bb, 4)
 --R    - 0.3 E -20, 0.3 E -20 + 0.1 E -19 %i, 0.1 E -19 + 0.7 E -20 %i,
 --R    - 0.3 E -20 + 0.7 E -20 %i, - 0.3 E -20 + 0.1 E -19 %i, - 0.7 E -20,
 --R    - 0.7 E -20 + 0.7 E -20 %i, 0.0, - 0.7 E -20, 0.0, - 0.3 E -20]
---R                                                     Type: List Complex Float
+--R                                                   Type: List(Complex(Float))
 --E 49
 
 --S 50 of 50
diff --git a/src/input/elfuts.input.pamphlet b/src/input/elfuts.input.pamphlet
index f8fa47d..de84dcd 100644
--- a/src/input/elfuts.input.pamphlet
+++ b/src/input/elfuts.input.pamphlet
@@ -45,7 +45,7 @@ xx:UTS(RN,'x,0):=x
 --R 
 --R
 --R   (3)  x
---R                           Type: UnivariateTaylorSeries(Fraction Integer,x,0)
+--R                          Type: UnivariateTaylorSeries(Fraction(Integer),x,0)
 --E 3
 
 --S 4 of 40
@@ -55,7 +55,7 @@ sn(xx,1::RN)
 --R            1  3    2  5    17  7    62   9      11
 --R   (4)  x - - x  + -- x  - --- x  + ---- x  + O(x  )
 --R            3      15      315      2835
---R                           Type: UnivariateTaylorSeries(Fraction Integer,x,0)
+--R                          Type: UnivariateTaylorSeries(Fraction(Integer),x,0)
 --E 4
 
 --S 5 of 40
@@ -65,7 +65,7 @@ cn(xx,1::RN)
 --R            1  2    5  4    61  6    277  8    50521   10      11
 --R   (5)  1 - - x  + -- x  - --- x  + ---- x  - ------- x   + O(x  )
 --R            2      24      720      8064      3628800
---R                           Type: UnivariateTaylorSeries(Fraction Integer,x,0)
+--R                          Type: UnivariateTaylorSeries(Fraction(Integer),x,0)
 --E 5
 
 --S 6 of 40
@@ -75,7 +75,7 @@ dn(xx,1::RN)
 --R            1  2    5  4    61  6    277  8    50521   10      11
 --R   (6)  1 - - x  + -- x  - --- x  + ---- x  - ------- x   + O(x  )
 --R            2      24      720      8064      3628800
---R                           Type: UnivariateTaylorSeries(Fraction Integer,x,0)
+--R                          Type: UnivariateTaylorSeries(Fraction(Integer),x,0)
 --E 6
 
 --S 7 of 40
@@ -83,7 +83,7 @@ yy:UTS(FRAC UP(k,RN),'y,0):=y
 --R 
 --R
 --R   (7)  y
---IType: UnivariateTaylorSeries(Fraction UnivariatePolynomial(k,...
+--RType: UnivariateTaylorSeries(Fraction(UnivariatePolynomial(k,Fraction(Integer))),y,0)
 --E 7
 
 --S 8 of 40
@@ -102,7 +102,7 @@ snn:=sn(yy,k::QF UP(k,RN))
 --R         1    8    307   6    913   4    307   2      1    9      11
 --R     (------ k  + ----- k  + ----- k  + ----- k  + ------)y  + O(y  )
 --R      362880      90720      60480      90720      362880
---IType: UnivariateTaylorSeries(Fraction UnivariatePolynomial(k,...
+--RType: UnivariateTaylorSeries(Fraction(UnivariatePolynomial(k,Fraction(Integer))),y,0)
 --E 8
 
 --S 9 of 40
@@ -121,7 +121,7 @@ cnn:=cn(yy,k::QF UP(k,RN))
 --R          1    8    247   6    641   4     461   2      1     10      11
 --R     (- ----- k  - ----- k  - ----- k  - ------ k  - -------)y   + O(y  )
 --R        14175      56700      75600      453600      3628800
---IType: UnivariateTaylorSeries(Fraction UnivariatePolynomial(k,...
+--RType: UnivariateTaylorSeries(Fraction(UnivariatePolynomial(k,Fraction(Integer))),y,0)
 --E 9
 
 --S 10 of 40
@@ -140,7 +140,7 @@ dnn:=dn(yy,k::QF UP(k,RN))
 --R           1     10     461   8    641   6    247   4     1    2  10      11
 --R     (- ------- k   - ------ k  - ----- k  - ----- k  - ----- k )y   + O(y  )
 --R        3628800       453600      75600      56700      14175
---IType: UnivariateTaylorSeries(Fraction UnivariatePolynomial(k,...
+--RType: UnivariateTaylorSeries(Fraction(UnivariatePolynomial(k,Fraction(Integer))),y,0)
 --E 10
 
 --S 11 of 40
@@ -149,7 +149,7 @@ snn**2+cnn**2
 --R
 --R                11
 --R   (11)  1 + O(y  )
---IType: UnivariateTaylorSeries(Fraction UnivariatePolynomial(k,...
+--RType: UnivariateTaylorSeries(Fraction(UnivariatePolynomial(k,Fraction(Integer))),y,0)
 --E 11
 
 --S 12 of 40
@@ -158,7 +158,7 @@ ksquared:=(k::UP(k,RN))**2
 --R
 --R          2
 --R   (12)  k
---R                               Type: UnivariatePolynomial(k,Fraction Integer)
+--R                              Type: UnivariatePolynomial(k,Fraction(Integer))
 --E 12
 
 --S 13 of 40
@@ -167,7 +167,7 @@ dnn**2+ksquared*snn**2
 --R
 --R                11
 --R   (13)  1 + O(y  )
---IType: UnivariateTaylorSeries(Fraction UnivariatePolynomial(k,...
+--RType: UnivariateTaylorSeries(Fraction(UnivariatePolynomial(k,Fraction(Integer))),y,0)
 --E 13
 
 --S 14 of 40
@@ -186,7 +186,7 @@ dnn**2+ksquared*snn**2
 --R        2    10    109  8    6977  6    6977  4    109  2     2    10      11
 --R   (- ----- k   - ---- k  - ----- k  - ----- k  - ---- k  - -----)y   + O(y  )
 --R      14175       2025      14175      14175      2025      14175
---IType: UnivariateTaylorSeries(Fraction UnivariatePolynomial(k,...
+--RType: UnivariateTaylorSeries(Fraction(UnivariatePolynomial(k,Fraction(Integer))),y,0)
 --E 14
 
 --S 15 of 40
@@ -205,7 +205,7 @@ dnn**2+ksquared*snn**2
 --R        2    10    109  8    6977  6    6977  4    109  2     2    10      11
 --R   (- ----- k   - ---- k  - ----- k  - ----- k  - ---- k  - -----)y   + O(y  )
 --R      14175       2025      14175      14175      2025      14175
---IType: UnivariateTaylorSeries(Fraction UnivariatePolynomial(k,...
+--RType: UnivariateTaylorSeries(Fraction(UnivariatePolynomial(k,Fraction(Integer))),y,0)
 --E 15
 
 --S 16 of 40
@@ -224,7 +224,7 @@ dnn**2+ksquared*snn**2
 --R       512   8    6101  6   2242  4    761   2     2    10      11
 --R     (----- k  + ----- k  + ---- k  + ----- k  + -----)y   + O(y  )
 --R      14175      14175      4725      14175      14175
---IType: UnivariateTaylorSeries(Fraction UnivariatePolynomial(k,...
+--RType: UnivariateTaylorSeries(Fraction(UnivariatePolynomial(k,Fraction(Integer))),y,0)
 --E 16
 
 --S 17 of 40
@@ -243,7 +243,7 @@ dnn**2+ksquared*snn**2
 --R       512   8    6101  6   2242  4    761   2     2    10      11
 --R     (----- k  + ----- k  + ---- k  + ----- k  + -----)y   + O(y  )
 --R      14175      14175      4725      14175      14175
---IType: UnivariateTaylorSeries(Fraction UnivariatePolynomial(k,...
+--RType: UnivariateTaylorSeries(Fraction(UnivariatePolynomial(k,Fraction(Integer))),y,0)
 --E 17
 
 --S 18 of 40
@@ -262,7 +262,7 @@ dnn**2+ksquared*snn**2
 --R        2    12    761   10   2242  8    6101  6    512   4  10      11
 --R     (----- k   + ----- k   + ---- k  + ----- k  + ----- k )y   + O(y  )
 --R      14175       14175       4725      14175      14175
---IType: UnivariateTaylorSeries(Fraction UnivariatePolynomial(k,...
+--RType: UnivariateTaylorSeries(Fraction(UnivariatePolynomial(k,Fraction(Integer))),y,0)
 --E 18
 
 --S 19 of 40
@@ -281,7 +281,7 @@ dnn**2+ksquared*snn**2
 --R        2    12    761   10   2242  8    6101  6    512   4  10      11
 --R     (----- k   + ----- k   + ---- k  + ----- k  + ----- k )y   + O(y  )
 --R      14175       14175       4725      14175      14175
---IType: UnivariateTaylorSeries(Fraction UnivariatePolynomial(k,...
+--RType: UnivariateTaylorSeries(Fraction(UnivariatePolynomial(k,Fraction(Integer))),y,0)
 --E 19
 
 --S 20 of 40
@@ -300,7 +300,7 @@ kkk:=integrate(1/((1-yy**2)*(1-ksquared*yy**2))**(1/2))
 --R       35   8    5   6    1  4    5   2    35   9      11
 --R     (---- k  + --- k  + -- k  + --- k  + ----)y  + O(y  )
 --R      1152      288      64      288      1152
---IType: UnivariateTaylorSeries(Fraction UnivariatePolynomial(k,...
+--RType: UnivariateTaylorSeries(Fraction(UnivariatePolynomial(k,Fraction(Integer))),y,0)
 --E 20
 
 --S 21 of 40
@@ -319,7 +319,7 @@ revert kkk
 --R         1    8    307   6    913   4    307   2      1    9      11
 --R     (------ k  + ----- k  + ----- k  + ----- k  + ------)y  + O(y  )
 --R      362880      90720      60480      90720      362880
---IType: UnivariateTaylorSeries(Fraction UnivariatePolynomial(k,...
+--RType: UnivariateTaylorSeries(Fraction(UnivariatePolynomial(k,Fraction(Integer))),y,0)
 --E 21
 
 --S 22 of 40
@@ -352,7 +352,7 @@ snn
 --R   + 
 --R        12
 --R     O(y  )
---IType: UnivariateTaylorSeries(Fraction UnivariatePolynomial(k,...
+--RType: UnivariateTaylorSeries(Fraction(UnivariatePolynomial(k,Fraction(Integer))),y,0)
 --E 22
  
 \end{chunk}
@@ -374,18 +374,18 @@ qq:UTS(RN,'q,0):=q
 --R 
 --R
 --R   (24)  q
---R                           Type: UnivariateTaylorSeries(Fraction Integer,q,0)
+--R                          Type: UnivariateTaylorSeries(Fraction(Integer),q,0)
 --E 24
 
 --S 25 of 40
 q0:=eprod(1-qq)
 --R 
---R   Compiling function eprod with type UnivariateTaylorSeries(Fraction 
---R      Integer,q,0) -> UnivariateTaylorSeries(Fraction Integer,q,0) 
+--R   Compiling function eprod with type UnivariateTaylorSeries(Fraction(
+--R      Integer),q,0) -> UnivariateTaylorSeries(Fraction(Integer),q,0) 
 --R
 --R              2    4    10      11
 --R   (25)  1 - q  - q  + q   + O(q  )
---R                           Type: UnivariateTaylorSeries(Fraction Integer,q,0)
+--R                          Type: UnivariateTaylorSeries(Fraction(Integer),q,0)
 --E 25
 
 --S 26 of 40
@@ -394,7 +394,7 @@ q1:=eprod(1+qq)
 --R
 --R              2    4     6     8     10      11
 --R   (26)  1 + q  + q  + 2q  + 2q  + 3q   + O(q  )
---R                           Type: UnivariateTaylorSeries(Fraction Integer,q,0)
+--R                          Type: UnivariateTaylorSeries(Fraction(Integer),q,0)
 --E 26
 
 --S 27 of 40
@@ -406,12 +406,12 @@ oprod x == exp oddlambert log x
 --S 28 of 40
 q2:=oprod(1+qq)
 --R 
---R   Compiling function oprod with type UnivariateTaylorSeries(Fraction 
---R      Integer,q,0) -> UnivariateTaylorSeries(Fraction Integer,q,0) 
+--R   Compiling function oprod with type UnivariateTaylorSeries(Fraction(
+--R      Integer),q,0) -> UnivariateTaylorSeries(Fraction(Integer),q,0) 
 --R
 --R                  3    4    5    6    7     8     9     10      11
 --R   (28)  1 + q + q  + q  + q  + q  + q  + 2q  + 2q  + 2q   + O(q  )
---R                           Type: UnivariateTaylorSeries(Fraction Integer,q,0)
+--R                          Type: UnivariateTaylorSeries(Fraction(Integer),q,0)
 --E 28
 
 --S 29 of 40
@@ -420,7 +420,7 @@ q3:=oprod(1-qq)
 --R
 --R                  3    4    5    6    7     8     9     10      11
 --R   (29)  1 - q - q  + q  - q  + q  - q  + 2q  - 2q  + 2q   + O(q  )
---R                           Type: UnivariateTaylorSeries(Fraction Integer,q,0)
+--R                          Type: UnivariateTaylorSeries(Fraction(Integer),q,0)
 --E 29
 
 --S 30 of 40
@@ -429,7 +429,7 @@ q1*q2*q3
 --R
 --R                11
 --R   (30)  1 + O(q  )
---R                           Type: UnivariateTaylorSeries(Fraction Integer,q,0)
+--R                          Type: UnivariateTaylorSeries(Fraction(Integer),q,0)
 --E 30
 
 --S 31 of 40
@@ -438,7 +438,7 @@ q2**8-q3**8
 --R
 --R                   3       5        7        9      11
 --R   (31)  16q + 128q  + 576q  + 2048q  + 6304q  + O(q  )
---R                           Type: UnivariateTaylorSeries(Fraction Integer,q,0)
+--R                          Type: UnivariateTaylorSeries(Fraction(Integer),q,0)
 --E 31
 
 --S 32 of 40
@@ -447,7 +447,7 @@ q2**8-q3**8
 --R
 --R                   3       5        7        9      11
 --R   (32)  16q + 128q  + 576q  + 2048q  + 6304q  + O(q  )
---R                           Type: UnivariateTaylorSeries(Fraction Integer,q,0)
+--R                          Type: UnivariateTaylorSeries(Fraction(Integer),q,0)
 --E 32
 
 --(q1**2/q2**2)**2
@@ -459,7 +459,7 @@ q0**3
 --R
 --R               2     6      11
 --R   (33)  1 - 3q  + 5q  + O(q  )
---R                           Type: UnivariateTaylorSeries(Fraction Integer,q,0)
+--R                          Type: UnivariateTaylorSeries(Fraction(Integer),q,0)
 --E 33
 
 --S 34 of 40
@@ -468,7 +468,7 @@ q1**2*q0
 --R
 --R              2    6      11
 --R   (34)  1 + q  + q  + O(q  )
---R                           Type: UnivariateTaylorSeries(Fraction Integer,q,0)
+--R                          Type: UnivariateTaylorSeries(Fraction(Integer),q,0)
 --E 34
 
 --S 35 of 40
@@ -477,7 +477,7 @@ q2**2*q0
 --R
 --R                    4     9      11
 --R   (35)  1 + 2q + 2q  + 2q  + O(q  )
---R                           Type: UnivariateTaylorSeries(Fraction Integer,q,0)
+--R                          Type: UnivariateTaylorSeries(Fraction(Integer),q,0)
 --E 35
 
 --S 36 of 40
@@ -486,7 +486,7 @@ q3**2*q0
 --R
 --R                    4     9      11
 --R   (36)  1 - 2q + 2q  - 2q  + O(q  )
---R                           Type: UnivariateTaylorSeries(Fraction Integer,q,0)
+--R                          Type: UnivariateTaylorSeries(Fraction(Integer),q,0)
 --E 36
 
 --S 37 of 40
@@ -494,7 +494,7 @@ qqq:UTS(FRAC UP(a,RN),'q,0):=q
 --R 
 --R
 --R   (37)  q
---IType: UnivariateTaylorSeries(Fraction UnivariatePolynomial(a,...
+--RType: UnivariateTaylorSeries(Fraction(UnivariatePolynomial(a,Fraction(Integer))),q,0)
 --E 37
 
 --S 38 of 40
@@ -502,7 +502,7 @@ a:=a::FRAC UP(a,RN)
 --R 
 --R
 --R   (38)  a
---R                      Type: Fraction UnivariatePolynomial(a,Fraction Integer)
+--R                    Type: Fraction(UnivariatePolynomial(a,Fraction(Integer)))
 --E 38
 
 \end{chunk} 
@@ -511,21 +511,21 @@ Jacobi's triple product
 --S 39 of 40
 eprod(1-qqq)*oprod(1-a*qqq)*oprod(1-qqq/a)
 --R 
---R   Compiling function eprod with type UnivariateTaylorSeries(Fraction 
---R      UnivariatePolynomial(a,Fraction Integer),q,0) -> 
---R      UnivariateTaylorSeries(Fraction UnivariatePolynomial(a,Fraction 
---R      Integer),q,0) 
---R   Compiling function oprod with type UnivariateTaylorSeries(Fraction 
---R      UnivariatePolynomial(a,Fraction Integer),q,0) -> 
---R      UnivariateTaylorSeries(Fraction UnivariatePolynomial(a,Fraction 
---R      Integer),q,0) 
+--R   Compiling function eprod with type UnivariateTaylorSeries(Fraction(
+--R      UnivariatePolynomial(a,Fraction(Integer))),q,0) -> 
+--R      UnivariateTaylorSeries(Fraction(UnivariatePolynomial(a,Fraction(
+--R      Integer))),q,0) 
+--R   Compiling function oprod with type UnivariateTaylorSeries(Fraction(
+--R      UnivariatePolynomial(a,Fraction(Integer))),q,0) -> 
+--R      UnivariateTaylorSeries(Fraction(UnivariatePolynomial(a,Fraction(
+--R      Integer))),q,0) 
 --R
 --R                2          4             6
 --R             - a  - 1     a  + 1  4   - a  - 1  9      11
 --R   (39)  1 + -------- q + ------ q  + -------- q  + O(q  )
 --R                 a           2            3
 --R                            a            a
---IType: UnivariateTaylorSeries(Fraction UnivariatePolynomial(a,...
+--RType: UnivariateTaylorSeries(Fraction(UnivariatePolynomial(a,Fraction(Integer))),q,0)
 --E 39
 
 --S 40 of 40
@@ -544,7 +544,7 @@ sq:=ksquared*snn**2
 --R        2    10    251   8    292  6    251   4     2    2  10      11
 --R     (----- k   + ----- k  + ---- k  + ----- k  + ----- k )y   + O(y  )
 --R      14175       14175      4725      14175      14175
---IType: UnivariateTaylorSeries(Fraction UnivariatePolynomial(k,...
+--RType: UnivariateTaylorSeries(Fraction(UnivariatePolynomial(k,Fraction(Integer))),y,0)
 --E 40
 )spool 
 )lisp (bye)
diff --git a/src/input/elt.input.pamphlet b/src/input/elt.input.pamphlet
index 3350745..a86777f 100644
--- a/src/input/elt.input.pamphlet
+++ b/src/input/elt.input.pamphlet
@@ -49,7 +49,7 @@ u:Any := [1, 7.2, 3/2, x**2, "wally"]
 --R               3  2
 --R   (1)  [1,7.2,-,x ,"wally"]
 --R               2
---R                                                               Type: List Any
+--R                                                              Type: List(Any)
 --E 3
 
 --S 4 of 4
diff --git a/src/input/en.input.pamphlet b/src/input/en.input.pamphlet
index 603517e..221e977 100644
--- a/src/input/en.input.pamphlet
+++ b/src/input/en.input.pamphlet
@@ -245,7 +245,7 @@ t2:List List Fraction Integer:=[[machineFraction (x::DFLOAT) for x in line]_
 --R     1 3031902082139297 6063803737378113       426900481
 --R    [-,----------------,----------------,- ----------------]]
 --R     2 4503599627370496 9007199254740992   9007199254740992
---R                                             Type: List List Fraction Integer
+--R                                          Type: List(List(Fraction(Integer)))
 --E 2
 
 \end{chunk}
@@ -1019,7 +1019,7 @@ t3:List List Fraction Integer:=[[machineFraction (x::DFLOAT) for x in line]_
 --R        5409262703795597   338078575096777       5502247165
 --R    [2,------------------,----------------,- ------------------]]
 --R       144115188075855872 9007199254740992   144115188075855872
---R                                             Type: List List Fraction Integer
+--R                                          Type: List(List(Fraction(Integer)))
 --E 3
 
 \end{chunk}
@@ -2312,7 +2312,7 @@ t4:List List Fraction Integer:=[[machineFraction (x::DFLOAT) for x in line]_
 --R        4342680608364995   542834712115425        2911441595
 --R    [2,------------------,-----------------,- ------------------]]
 --R       144115188075855872 18014398509481984   144115188075855872
---R                                             Type: List List Fraction Integer
+--R                                          Type: List(List(Fraction(Integer)))
 --E 4
 
 \end{chunk}
@@ -3755,7 +3755,7 @@ t5:List List Fraction Integer:=[[machineFraction (x::DFLOAT) for x in line]_
 --R        1803082764092263  7212342935397909      11879028857
 --R    [2,-----------------,------------------,------------------]]
 --R       72057594037927936 288230376151711744 288230376151711744
---R                                             Type: List List Fraction Integer
+--R                                          Type: List(List(Fraction(Integer)))
 --E 5
 
 \end{chunk}
@@ -5310,7 +5310,7 @@ t6:List List Fraction Integer:=[[machineFraction (x::DFLOAT) for x in line]_
 --R        6970621062928227   6970612494646361        4284140933
 --R    [2,------------------,------------------,- ------------------]]
 --R       576460752303423488 576460752303423488   288230376151711744
---R                                             Type: List List Fraction Integer
+--R                                          Type: List(List(Fraction(Integer)))
 --E 6
 
 \end{chunk}
@@ -7034,9 +7034,12 @@ t7:List List Fraction Integer:=[[machineFraction (x::DFLOAT) for x in line]_
 --R        3697592203499849   1848797789432423      3375364997
 --R    [2,------------------,------------------,------------------]]
 --R       576460752303423488 288230376151711744 576460752303423488
---R                                             Type: List List Fraction Integer
+--R                                          Type: List(List(Fraction(Integer)))
 --E 7
 
+)spool
+)lisp (bye)
+
 \end{chunk}
 
 The actual table values from above are:
diff --git a/src/input/eq.input.pamphlet b/src/input/eq.input.pamphlet
index 76b3cb5..b719659 100644
--- a/src/input/eq.input.pamphlet
+++ b/src/input/eq.input.pamphlet
@@ -29,7 +29,7 @@ eq1 := 3*x + 4*y = 5
 --R 
 --R
 --R   (1)  4y + 3x= 5
---R                                            Type: Equation Polynomial Integer
+--R                                          Type: Equation(Polynomial(Integer))
 --E 1
 
 --S 2 of 12
@@ -37,7 +37,7 @@ eq2 := 2*x + 2*y = 3
 --R 
 --R
 --R   (2)  2y + 2x= 3
---R                                            Type: Equation Polynomial Integer
+--R                                          Type: Equation(Polynomial(Integer))
 --E 2
 
 --S 3 of 12
@@ -45,7 +45,7 @@ lhs eq1
 --R 
 --R
 --R   (3)  4y + 3x
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 3
 
 --S 4 of 12
@@ -53,7 +53,7 @@ rhs eq1
 --R 
 --R
 --R   (4)  5
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 4
 
 --S 5 of 12
@@ -61,7 +61,7 @@ eq1 + eq2
 --R 
 --R
 --R   (5)  6y + 5x= 8
---R                                            Type: Equation Polynomial Integer
+--R                                          Type: Equation(Polynomial(Integer))
 --E 5
 
 --S 6 of 12
@@ -70,7 +70,7 @@ eq1 * eq2
 --R
 --R          2             2
 --R   (6)  8y  + 14x y + 6x = 15
---R                                            Type: Equation Polynomial Integer
+--R                                          Type: Equation(Polynomial(Integer))
 --E 6
 
 --S 7 of 12
@@ -78,7 +78,7 @@ eq1 * eq2
 --R 
 --R
 --R   (7)  x= 1
---R                                            Type: Equation Polynomial Integer
+--R                                          Type: Equation(Polynomial(Integer))
 --E 7
 
 --S 8 of 12
@@ -87,7 +87,7 @@ eq1**2
 --R
 --R           2             2
 --R   (8)  16y  + 24x y + 9x = 25
---R                                            Type: Equation Polynomial Integer
+--R                                          Type: Equation(Polynomial(Integer))
 --E 8
 
 --S 9 of 12
@@ -103,7 +103,7 @@ eqpol := x+1 = y
 --R 
 --R
 --R   (10)  x + 1= y
---R                                            Type: Equation Polynomial Integer
+--R                                          Type: Equation(Polynomial(Integer))
 --E 10
 
 --S 11 of 12
diff --git a/src/input/eqtbl.input.pamphlet b/src/input/eqtbl.input.pamphlet
index 97e3ed0..b81347d 100644
--- a/src/input/eqtbl.input.pamphlet
+++ b/src/input/eqtbl.input.pamphlet
@@ -26,7 +26,7 @@ e: EqTable(List Integer, Integer) := table()
 --R 
 --R
 --R   (1)  table()
---R                                          Type: EqTable(List Integer,Integer)
+--R                                         Type: EqTable(List(Integer),Integer)
 --E 1
 
 --S 2 of 6
@@ -34,7 +34,7 @@ l1 := [1,2,3]
 --R 
 --R
 --R   (2)  [1,2,3]
---R                                                   Type: List PositiveInteger
+--R                                                  Type: List(PositiveInteger)
 --E 2
 
 --S 3 of 6
@@ -42,7 +42,7 @@ l2 := [1,2,3]
 --R 
 --R
 --R   (3)  [1,2,3]
---R                                                   Type: List PositiveInteger
+--R                                                  Type: List(PositiveInteger)
 --E 3
 
 --S 4 of 6
diff --git a/src/input/equation.input.pamphlet b/src/input/equation.input.pamphlet
index 4393111..3f73d54 100644
--- a/src/input/equation.input.pamphlet
+++ b/src/input/equation.input.pamphlet
@@ -55,7 +55,7 @@ eq1 := (-6*x**3+13*x**2+4)=(-x**4+12*x)
 --R
 --R            3      2         4
 --R   (1)  - 6x  + 13x  + 4= - x  + 12x
---R                                            Type: Equation Polynomial Integer
+--R                                          Type: Equation(Polynomial(Integer))
 --E 1
 
 --S 2 of 12
@@ -64,7 +64,7 @@ eq2 := x**4+13*x**2-12*x = 6*x**3-4
 --R
 --R         4      2          3
 --R   (2)  x  + 13x  - 12x= 6x  - 4
---R                                            Type: Equation Polynomial Integer
+--R                                          Type: Equation(Polynomial(Integer))
 --E 2
 
 --S 3 of 12
@@ -73,7 +73,7 @@ eq := eq1*y**2+eq2
 --R
 --R             3      2      2    4      2            4        2     3
 --R   (3)  (- 6x  + 13x  + 4)y  + x  + 13x  - 12x= (- x  + 12x)y  + 6x  - 4
---R                                            Type: Equation Polynomial Integer
+--R                                          Type: Equation(Polynomial(Integer))
 --E 3
 
 --S 4 of 12
@@ -82,7 +82,7 @@ swap %
 --R
 --R            4        2     3           3      2      2    4      2
 --R   (4)  (- x  + 12x)y  + 6x  - 4= (- 6x  + 13x  + 4)y  + x  + 13x  - 12x
---R                                            Type: Equation Polynomial Integer
+--R                                          Type: Equation(Polynomial(Integer))
 --E 4
 
 --S 5 of 12
@@ -91,7 +91,7 @@ swap %
 --R
 --R            4        2     3       3      2      2    4      2
 --R   (5)  (- x  + 12x)y  + 6x = (- 6x  + 13x  + 4)y  + x  + 13x  - 12x + 4
---R                                            Type: Equation Polynomial Integer
+--R                                          Type: Equation(Polynomial(Integer))
 --E 5
 
 --S 6 of 12
@@ -100,7 +100,7 @@ swap %
 --R
 --R            4        2       3      2      2    4     3      2
 --R   (6)  (- x  + 12x)y = (- 6x  + 13x  + 4)y  + x  - 6x  + 13x  - 12x + 4
---R                                            Type: Equation Polynomial Integer
+--R                                          Type: Equation(Polynomial(Integer))
 --E 6
 
 --S 7 of 12
@@ -109,7 +109,7 @@ leftZero %
 --R
 --R             4     3      2            2    4     3      2
 --R   (7)  0= (x  - 6x  + 13x  - 12x + 4)y  + x  - 6x  + 13x  - 12x + 4
---R                                            Type: Equation Polynomial Integer
+--R                                          Type: Equation(Polynomial(Integer))
 --E 7
 
 --S 8 of 12
@@ -118,7 +118,7 @@ swap %
 --R
 --R          4     3      2            2    4     3      2
 --R   (8)  (x  - 6x  + 13x  - 12x + 4)y  + x  - 6x  + 13x  - 12x + 4= 0
---R                                            Type: Equation Polynomial Integer
+--R                                          Type: Equation(Polynomial(Integer))
 --E 8
 
 --S 9 of 12
@@ -127,7 +127,7 @@ factor lhs %
 --R
 --R               2       2  2
 --R   (9)  (x - 2) (x - 1) (y  + 1)
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 9
 
 --S 10 of 12
@@ -136,7 +136,7 @@ factorAndSplit eq
 --R
 --R                             2
 --R   (10)  [x - 2= 0,x - 1= 0,y  + 1= 0]
---R                                       Type: List Equation Polynomial Integer
+--R                                    Type: List(Equation(Polynomial(Integer)))
 --E 10
 
 --S 11 of 12
@@ -147,7 +147,7 @@ inv (eq :: EQ FRAC POLY INT)
 --R   (11)  - ------------------------------------= - ----------------------
 --R              3      2      2    4      2            4        2     3
 --R           (6x  - 13x  - 4)y  - x  - 13x  + 12x    (x  - 12x)y  - 6x  + 4
---R                                   Type: Equation Fraction Polynomial Integer
+--R                                Type: Equation(Fraction(Polynomial(Integer)))
 --E 11
 
 --S 12 of 12
@@ -158,7 +158,7 @@ inv (eq :: EQ FRAC POLY INT)
 --R   (12)  ------------------------------------= ----------------------
 --R            3      2      2    4      2          4        2     3
 --R         (6x  - 13x  - 4)y  - x  - 13x  + 12x  (x  - 12x)y  - 6x  + 4
---R                                   Type: Equation Fraction Polynomial Integer
+--R                                Type: Equation(Fraction(Polynomial(Integer)))
 --E 12
 )spool
 )lisp (bye)
diff --git a/src/input/equation2.input.pamphlet b/src/input/equation2.input.pamphlet
index 0e2b91d..f144282 100644
--- a/src/input/equation2.input.pamphlet
+++ b/src/input/equation2.input.pamphlet
@@ -27,7 +27,7 @@ solve([3*x**3 + y + 1,y - 1],[x,y])
 --R
 --R            3
 --R   (1)  [[3x  + 2= 0,y= 1]]
---R                         Type: List List Equation Fraction Polynomial Integer
+--R                    Type: List(List(Equation(Fraction(Polynomial(Integer)))))
 --E 1
 
 --S 2 of 27
@@ -44,8 +44,8 @@ solve([x**3 + x - y**2 + 4,x*y + 2],[x,y],"sym")
 --RDaly Bug
 --R   Cannot find a definition or applicable library operation named solve
 --R      with argument type(s) 
---R                           List Polynomial Integer
---R                       List OrderedVariableList [x,y]
+--R                          List(Polynomial(Integer))
+--R                      List(OrderedVariableList([x,y]))
 --R                                   String
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
@@ -60,7 +60,7 @@ solve([x = y**2-19,y = z**2+x+3,z = 3*x],[x,y,z])
 --R             z    3z  + z + 9   4     3      2
 --R   (2)  [[x= -,y= -----------,9z  + 6z  + 55z  + 15z - 90= 0]]
 --R             3         3
---R                         Type: List List Equation Fraction Polynomial Integer
+--R                    Type: List(List(Equation(Fraction(Polynomial(Integer)))))
 --E 3
 
 --S 4 of 27
@@ -68,7 +68,7 @@ solve([3*x + 2*y - z,x - 1/2*y + 1/3*z,4/5*x - 2/3*y - z])
 --R 
 --R
 --R   (3)  [[z= 0,y= 0,x= 0]]
---R                         Type: List List Equation Fraction Polynomial Integer
+--R                    Type: List(List(Equation(Fraction(Polynomial(Integer)))))
 --E 4
 
 --S 5 of 27
@@ -85,8 +85,8 @@ solve([x**2*y - 1,x*y**2 - 2],[x,y],.01)
 --RDaly Bug
 --R   Cannot find a definition or applicable library operation named solve
 --R      with argument type(s) 
---R                           List Polynomial Integer
---R                       List OrderedVariableList [x,y]
+--R                          List(Polynomial(Integer))
+--R                      List(OrderedVariableList([x,y]))
 --R                                    Float
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
@@ -107,8 +107,8 @@ solve([x**2/a = 1,a**2 - a*x = 0],[x,a],.001)
 --RDaly Bug
 --R   Cannot find a definition or applicable library operation named solve
 --R      with argument type(s) 
---R                  List Equation Fraction Polynomial Integer
---R                       List OrderedVariableList [x,a]
+--R                List(Equation(Fraction(Polynomial(Integer))))
+--R                      List(OrderedVariableList([x,a]))
 --R                                    Float
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
@@ -122,7 +122,7 @@ solve([x**2/a + a + y**3 - 1,a*y + a + 1],[x,y])
 --R           2 2    4     3     2                - a - 1
 --R   (4)  [[a x  + a  - 2a  - 3a  - 3a - 1= 0,y= -------]]
 --R                                                  a
---R                         Type: List List Equation Fraction Polynomial Integer
+--R                    Type: List(List(Equation(Fraction(Polynomial(Integer)))))
 --E 7
 
 )clear all
@@ -133,7 +133,7 @@ solve(x**3 + 1 = 0,x)
 --R
 --R                 2
 --R   (1)  [x= - 1,x  - x + 1= 0]
---R                              Type: List Equation Fraction Polynomial Integer
+--R                          Type: List(Equation(Fraction(Polynomial(Integer))))
 --E 8
 
 --S 9 of 27
@@ -150,8 +150,8 @@ solve(x**3*y + x*y + 1,x,"sym")
 --RDaly Bug
 --R   Cannot find a definition or applicable library operation named solve
 --R      with argument type(s) 
---R                             Polynomial Integer
---R                                 Variable x
+--R                             Polynomial(Integer)
+--R                                 Variable(x)
 --R                                   String
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
@@ -165,7 +165,7 @@ solve(3*x + 1/4*y = 1,x)
 --R            - y + 4
 --R   (2)  [x= -------]
 --R               12
---R                              Type: List Equation Fraction Polynomial Integer
+--R                          Type: List(Equation(Fraction(Polynomial(Integer))))
 --E 10
 
 --S 11 of 27
@@ -182,9 +182,9 @@ solve(x**4 - 10*x**3 + 35*x**2 - 50*x + 25,x,1/1000)
 --RDaly Bug
 --R   Cannot find a definition or applicable library operation named solve
 --R      with argument type(s) 
---R                             Polynomial Integer
---R                                 Variable x
---R                              Fraction Integer
+--R                             Polynomial(Integer)
+--R                                 Variable(x)
+--R                              Fraction(Integer)
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
 --R      or "$" to specify which version of the function you need.
@@ -204,8 +204,8 @@ solve(x**4 - 10*x**3 + 35*x**2 - 50*x + 25,x,"sym")
 --RDaly Bug
 --R   Cannot find a definition or applicable library operation named solve
 --R      with argument type(s) 
---R                             Polynomial Integer
---R                                 Variable x
+--R                             Polynomial(Integer)
+--R                                 Variable(x)
 --R                                   String
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
@@ -218,7 +218,7 @@ solve(x**3 - sqrt(2))
 --R
 --R          3    +-+
 --R   (3)  [x  - \|2 = 0]
---R                      Type: List Equation Fraction Polynomial AlgebraicNumber
+--R                  Type: List(Equation(Fraction(Polynomial(AlgebraicNumber))))
 --E 13
 
 --S 14 of 27
@@ -227,7 +227,7 @@ solve(x**3/a + x/a + 1,x)
 --R
 --R          3
 --R   (4)  [x  + x + a= 0]
---R                              Type: List Equation Fraction Polynomial Integer
+--R                          Type: List(Equation(Fraction(Polynomial(Integer))))
 --E 14
 
 )clear all
@@ -246,8 +246,8 @@ solve(1/x**3 + 1/x**2 + 1/x = 0,x,"sym")
 --RDaly Bug
 --R   Cannot find a definition or applicable library operation named solve
 --R      with argument type(s) 
---R                    Equation Fraction Polynomial Integer
---R                                 Variable x
+--R                   Equation(Fraction(Polynomial(Integer)))
+--R                                 Variable(x)
 --R                                   String
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
@@ -260,7 +260,7 @@ solve(x**3 + 1 = 0,x)
 --R
 --R                 2
 --R   (1)  [x= - 1,x  - x + 1= 0]
---R                              Type: List Equation Fraction Polynomial Integer
+--R                          Type: List(Equation(Fraction(Polynomial(Integer))))
 --E 16
 
 --S 17 of 27
@@ -277,8 +277,8 @@ solve(x**3*y + x*y + 1,x,"sym")
 --RDaly Bug
 --R   Cannot find a definition or applicable library operation named solve
 --R      with argument type(s) 
---R                             Polynomial Integer
---R                                 Variable x
+--R                             Polynomial(Integer)
+--R                                 Variable(x)
 --R                                   String
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
@@ -292,7 +292,7 @@ solve(3*x + 1/4*y = 1,x)
 --R            - y + 4
 --R   (2)  [x= -------]
 --R               12
---R                              Type: List Equation Fraction Polynomial Integer
+--R                          Type: List(Equation(Fraction(Polynomial(Integer))))
 --E 18
 
 --S 19 of 27
@@ -309,9 +309,9 @@ solve(x**4 - 10*x**3 + 35*x**2 - 50*x + 25,x,1/1000)
 --RDaly Bug
 --R   Cannot find a definition or applicable library operation named solve
 --R      with argument type(s) 
---R                             Polynomial Integer
---R                                 Variable x
---R                              Fraction Integer
+--R                             Polynomial(Integer)
+--R                                 Variable(x)
+--R                              Fraction(Integer)
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
 --R      or "$" to specify which version of the function you need.
@@ -331,8 +331,8 @@ solve(x**4 - 10*x**3 + 35*x**2 - 50*x + 25,x,"sym")
 --RDaly Bug
 --R   Cannot find a definition or applicable library operation named solve
 --R      with argument type(s) 
---R                             Polynomial Integer
---R                                 Variable x
+--R                             Polynomial(Integer)
+--R                                 Variable(x)
 --R                                   String
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
@@ -345,7 +345,7 @@ solve(x**3 - sqrt(2))
 --R
 --R          3    +-+
 --R   (3)  [x  - \|2 = 0]
---R                      Type: List Equation Fraction Polynomial AlgebraicNumber
+--R                  Type: List(Equation(Fraction(Polynomial(AlgebraicNumber))))
 --E 21
 
 --S 22 of 27
@@ -354,7 +354,7 @@ solve(x**3/a + x/a + 1,x)
 --R
 --R          3
 --R   (4)  [x  + x + a= 0]
---R                              Type: List Equation Fraction Polynomial Integer
+--R                          Type: List(Equation(Fraction(Polynomial(Integer))))
 --E 22
 
 --S 23 of 27
@@ -371,8 +371,8 @@ solve(1/x**3 + 1/x**2 + 1/x = 0,x,"sym")
 --RDaly Bug
 --R   Cannot find a definition or applicable library operation named solve
 --R      with argument type(s) 
---R                    Equation Fraction Polynomial Integer
---R                                 Variable x
+--R                   Equation(Fraction(Polynomial(Integer)))
+--R                                 Variable(x)
 --R                                   String
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
@@ -386,7 +386,7 @@ solve([[1,1,1],[3,-2,1],[1,2,2]],[8,0,17])
 --R 
 --R
 --R   (1)  [particular= [- 1,2,7],basis= [[0,0,0]]]
---IType: Record(particular: Union(Vector Fraction Integer,"failed"),basis: ...
+--IType: Record(particular: Union(Vector(Fraction(Integer)),"failed"),...
 --E 24
 
 --S 25 of 27
@@ -394,7 +394,7 @@ solve([[1,2,3],[2,3,4],[3,4,5]],[2,2,2])
 --R 
 --R
 --R   (2)  [particular= [- 2,2,0],basis= [[1,- 2,1]]]
---IType: Record(particular: Union(Vector Fraction Integer,"failed"),basis: ...
+--IType: Record(particular: Union(Vector(Fraction(Integer)),"failed"),...
 --E 25
 
 --S 26 of 27
@@ -402,7 +402,7 @@ solve([[1,2,3],[2,3,4],[3,4,5]],[2,3,2])
 --R 
 --R
 --R   (3)  [particular= "failed",basis= [[1,- 2,1]]]
---IType: Record(particular: Union(Vector Fraction Integer,"failed"),basis: ...
+--IType: Record(particular: Union(Vector(Fraction(Integer)),"failed"),...
 --E 26
 
 --S 27 of 27
diff --git a/src/input/erf.input.pamphlet b/src/input/erf.input.pamphlet
index e607043..6a3adc9 100644
--- a/src/input/erf.input.pamphlet
+++ b/src/input/erf.input.pamphlet
@@ -24,7 +24,7 @@ i:=integrate(exp(-a^2*p^2),p=b..c)
 --R        (erf(a c) - erf(a b))\|%pi
 --R   (1)  ---------------------------
 --R                     2a
---R                    Type: Union(f1: OrderedCompletion Expression Integer,...)
+--R                  Type: Union(f1: OrderedCompletion(Expression(Integer)),...)
 --E 1
 
 --S 2 of 4
@@ -34,7 +34,7 @@ eval(i,[erf(a*c)=1,erf(a*b)=0])
 --R        \|%pi
 --R   (2)  ------
 --R          2a
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 2
 
 --S 3 of 4
@@ -45,7 +45,7 @@ intrule:=rule integral(exp(-a*p^2),p) == sqrt(%pi)/sqrt(a)
 --R   (3)   |   %e      d%I  == ------
 --R        ++                     +-+
 --R                              \|a
---R                        Type: RewriteRule(Integer,Integer,Expression Integer)
+--R                       Type: RewriteRule(Integer,Integer,Expression(Integer))
 --E 3
 
 --S 4 of 4
@@ -56,7 +56,7 @@ intrule integral(exp(-a*p^2),p)
 --R   (4)  ------
 --R          +-+
 --R         \|a
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 4
 
 )spool 
diff --git a/src/input/eval.input.pamphlet b/src/input/eval.input.pamphlet
index 31d6bd8..1aa6127 100644
--- a/src/input/eval.input.pamphlet
+++ b/src/input/eval.input.pamphlet
@@ -43,7 +43,7 @@ a := f(x**2)
 --R
 --R           2
 --R   (2)  f(x )
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 2
 
 --S 3 of 23
@@ -53,7 +53,7 @@ b := differentiate(a,x,2) + f 5
 --R          2 ,,  2      ,  2
 --R   (3)  4x f  (x ) + 2f (x ) + f(5)
 --R
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 3
 
 \end{chunk}
@@ -67,7 +67,7 @@ eval(b, x = x + y)
 --R           2            2  ,,  2           2      ,  2           2
 --R   (4)  (4y  + 8x y + 4x )f  (y  + 2x y + x ) + 2f (y  + 2x y + x ) + f(5)
 --R
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 4
 
 \end{chunk}
@@ -81,7 +81,7 @@ eval(b, f 5 = 1)
 --R          2 ,,  2      ,  2
 --R   (5)  4x f  (x ) + 2f (x ) + 1
 --R
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 5
 
 \end{chunk}
@@ -92,8 +92,8 @@ function for a formal one. ALL the values of f are affected.
 --S 6 of 23
 foo(u:EXPR INT):EXPR INT == exp u
 --R 
---R   Function declaration foo : Expression Integer -> Expression Integer 
---R      has been added to workspace.
+--R   Function declaration foo : Expression(Integer) -> Expression(Integer
+--R      ) has been added to workspace.
 --R                                                                   Type: Void
 --E 6
 
@@ -104,13 +104,13 @@ Notice that the formal derivatives will be computed properly now.
 --S 7 of 23
 c := eval(b, 'f, foo)
 --R 
---R   Compiling function foo with type Expression Integer -> Expression 
---R      Integer 
+--R   Compiling function foo with type Expression(Integer) -> Expression(
+--R      Integer) 
 --R
 --R                    2
 --R           2       x      5
 --R   (7)  (4x  + 2)%e   + %e
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 7
 
 \end{chunk}
@@ -121,20 +121,20 @@ us to replace an actual function by a formal one.
 --S 8 of 23
 oof(u:EXPR INT):EXPR INT == f u
 --R 
---R   Function declaration oof : Expression Integer -> Expression Integer 
---R      has been added to workspace.
+--R   Function declaration oof : Expression(Integer) -> Expression(Integer
+--R      ) has been added to workspace.
 --R                                                                   Type: Void
 --E 8
 
 --S 9 of 23
 eval(c, 'exp, oof)
 --R 
---R   Compiling function oof with type Expression Integer -> Expression 
---R      Integer 
+--R   Compiling function oof with type Expression(Integer) -> Expression(
+--R      Integer) 
 --R
 --R           2        2
 --R   (9)  (4x  + 2)f(x ) + f(5)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 9
 
 \end{chunk}
@@ -144,7 +144,7 @@ a 'concrete' function.
 --S 10 of 23
 f'(u:EXPR INT):EXPR INT == f u
 --R 
---R   Function declaration f' : Expression Integer -> Expression Integer 
+--R   Function declaration f' : Expression(Integer) -> Expression(Integer)
 --R      has been added to workspace.
 --R                                                                   Type: Void
 --E 10
@@ -155,8 +155,8 @@ This will make f differentiate like an exponential:
 --S 11 of 23
 derivative(f,f')
 --R 
---R   Compiling function f' with type Expression Integer -> Expression 
---R      Integer 
+--R   Compiling function f' with type Expression(Integer) -> Expression(
+--R      Integer) 
 --R
 --R   (11)  f
 --R                                                          Type: BasicOperator
@@ -169,7 +169,7 @@ b
 --R           2 ,,  2      ,  2
 --R   (12)  4x f  (x ) + 2f (x ) + f(5)
 --R
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 12
 
 --** The coercion is needed to avoid an interpreter bug.
@@ -181,7 +181,7 @@ eval(b, x = x::(EXPR INT))
 --R           2 ,,  2      ,  2
 --R   (13)  4x f  (x ) + 2f (x ) + f(5)
 --R
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 13
 
 --S 14 of 23
@@ -191,7 +191,7 @@ differentiate(%, x)
 --R           3 ,,,  2        ,,  2
 --R   (14)  8x f   (x ) + 12xf  (x )
 --R
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 14
 
 \end{chunk}
@@ -206,7 +206,7 @@ a3 := a * a * a
 --R
 --R            2 3
 --R   (15)  f(x )
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 15
 
 --S 16 of 23
@@ -214,7 +214,7 @@ foo
 --R 
 --R
 --R   (16)  foo u == exp(u)
---R                                                     Type: FunctionCalled foo
+--R                                                    Type: FunctionCalled(foo)
 --E 16
 
 --S 17 of 23
@@ -224,7 +224,7 @@ eval(a3,'f,2,foo)
 --R                 2
 --R            2   x
 --R   (17)  f(x )%e
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 17
 
 \end{chunk}
@@ -241,8 +241,8 @@ g := operator 'g
 --S 19 of 23
 bar(u:EXPR INT):EXPR INT == sin(u) + cos(2*u)
 --R 
---R   Function declaration bar : Expression Integer -> Expression Integer 
---R      has been added to workspace.
+--R   Function declaration bar : Expression(Integer) -> Expression(Integer
+--R      ) has been added to workspace.
 --R                                                                   Type: Void
 --E 19
 
@@ -252,19 +252,19 @@ a + g a
 --R
 --R              2        2
 --R   (20)  g(f(x )) + f(x )
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 20
 
 --S 21 of 23
 eval(%,['f,'g],[foo,bar])
 --R 
---R   Compiling function bar with type Expression Integer -> Expression 
---R      Integer 
+--R   Compiling function bar with type Expression(Integer) -> Expression(
+--R      Integer) 
 --R
 --R                2            2       2
 --R               x            x       x
 --R   (21)  sin(%e  ) + cos(2%e  ) + %e
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 21
 
 --S 22 of 23
@@ -273,7 +273,7 @@ a3 + g a
 --R
 --R              2        2 3
 --R   (22)  g(f(x )) + f(x )
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 22
 
 \end{chunk}
@@ -286,7 +286,7 @@ eval(%,['f,'g],[2,1],[foo,bar])
 --R                                            2
 --R                2             2        2   x
 --R   (23)  sin(f(x )) + cos(2f(x )) + f(x )%e
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 23
 )spool
 )lisp (bye)
diff --git a/src/input/evalex.input.pamphlet b/src/input/evalex.input.pamphlet
index 28e2d22..62d8690 100644
--- a/src/input/evalex.input.pamphlet
+++ b/src/input/evalex.input.pamphlet
@@ -27,7 +27,7 @@ cos(2)
 --R 
 --R
 --R   (1)  cos(2)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 1
 
 -- Input for page PrefixEval
@@ -38,7 +38,7 @@ cos(2)
 --R 
 --R
 --R   (1)  cos(2)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 2
 
 -- Input for page InfixEval
diff --git a/src/input/exampleagcode.input.pamphlet b/src/input/exampleagcode.input.pamphlet
index a799eee..6239bf4 100644
--- a/src/input/exampleagcode.input.pamphlet
+++ b/src/input/exampleagcode.input.pamphlet
@@ -97,7 +97,7 @@
 K1:= PF(2)
 --R 
 --R
---R   (1)  PrimeField 2
+--R   (1)  PrimeField(2)
 --R                                                                 Type: Domain
 --E 1
 
@@ -105,7 +105,7 @@ K1:= PF(2)
 R1:= DMP([X,Y,Z],K1)
 --R 
 --R
---R   (2)  DistributedMultivariatePolynomial([X,Y,Z],PrimeField 2)
+--R   (2)  DistributedMultivariatePolynomial([X,Y,Z],PrimeField(2))
 --R                                                                 Type: Domain
 --E 2
 
@@ -114,7 +114,7 @@ P1:= PAFFFF(K1,[X,Y,Z],BLQT)
 --R 
 --R
 --R   (3)
---R  PackageForAlgebraicFunctionFieldOverFiniteField(PrimeField 2,[X,Y,Z],BlowUpWi
+--R  PackageForAlgebraicFunctionFieldOverFiniteField(PrimeField(2),[X,Y,Z],BlowUpWi
 --R  thQuadTrans)
 --R                                                                 Type: Domain
 --E 3
@@ -125,7 +125,7 @@ C1:R1:=X**5 + Y**2*Z**3+Y*Z**4
 --R
 --R         5    2 3      4
 --R   (4)  X  + Y Z  + Y Z
---R                Type: DistributedMultivariatePolynomial([X,Y,Z],PrimeField 2)
+--R               Type: DistributedMultivariatePolynomial([X,Y,Z],PrimeField(2))
 --E 4
 
 --S 5 of 19
@@ -134,7 +134,7 @@ setCurve(C1)$P1
 --R
 --R         5    2 3      4
 --R   (5)  X  + Y Z  + Y Z
---R                Type: DistributedMultivariatePolynomial([X,Y,Z],PrimeField 2)
+--R                Type: DistributedMultivariatePolynomial([X,Y,Z],PrimeField(2))
 --E 5
 
 --S 6 of 19
@@ -143,7 +143,7 @@ plc3:= placesOfDegree(3)$P1
 --R
 --R                 2   3         2       3
 --R   (6)  [[%D5:%D5 :1] ,[%D5:%D5  + 1:1] ]
---R        Type: List PlacesOverPseudoAlgebraicClosureOfFiniteField PrimeField 2
+--R        Type: List(PlacesOverPseudoAlgebraicClosureOfFiniteField(PrimeField(2)))
 --E 6
 
 -- %D4 is an elemenent created by the domain PACOFF: it is a root of the 
@@ -160,7 +160,7 @@ a:= elt( first % , 1 )
 --R 
 --R
 --R   (7)  %D5
---R                       Type: PseudoAlgebraicClosureOfFiniteField PrimeField 2
+--R                       Type: PseudoAlgebraicClosureOfFiniteField(PrimeField(2))
 --E 7
 
 --S 8 of 19
@@ -169,7 +169,7 @@ definingPolynomial(a)
 --R
 --R         3    2
 --R   (8)  ?  + ?  + 1
---RType: SparseUnivariatePolynomial PseudoAlgebraicClosureOfFiniteField PrimeField 2
+--RType: SparseUnivariatePolynomial(PseudoAlgebraicClosureOfFiniteField(PrimeField(2)))
 --E 8
 
 --S 9 of 19
@@ -177,7 +177,7 @@ a**3 + a**2 + 1
 --R 
 --R
 --R   (9)  0
---R                       Type: PseudoAlgebraicClosureOfFiniteField PrimeField 2
+--R                       Type: PseudoAlgebraicClosureOfFiniteField(PrimeField(2))
 --E 9
 
 -- As you can see, %D4 is the root of an irreducible poynomial of degree 3.
@@ -192,7 +192,7 @@ D:= 2 * reduce(+,(plc3 :: List DIV PLACESPS PF 2))
 --R
 --R                   2   3             2       3
 --R   (10)  2 [%D5:%D5 :1]  + 2 [%D5:%D5  + 1:1]
---R     Type: Divisor PlacesOverPseudoAlgebraicClosureOfFiniteField PrimeField 2
+--R     Type: Divisor(PlacesOverPseudoAlgebraicClosureOfFiniteField(PrimeField(2)))
 --E 10
 
 -- Now we compute a basis of L(D)
@@ -210,7 +210,7 @@ lB1:= lBasis(D)$P1
 --R   [num= [Z ,Y Z ,Y Z ,X Z ,X Y Z ,X Y Z,X Z ,X Y Z,X Z,X Y,X ],
 --R          4      2         2    4
 --R    den= X  + X Y Z + X Y Z  + Z ]
---IType: Record(num: List DistributedMultivariatePolynomial([X,Y,Z],...
+--IType: Record(num: List(DistributedMultivariatePolynomial([X,Y,Z],...
 --E 11
 
 -- Since we want to construct a code over GF(2^4), we defined the 
@@ -280,7 +280,7 @@ plc1 := placesOfDegree(1)$P4
 --R    [%A  :%A :1] , [%A  :%A :1] , [%A  :%A :1] , [%A  :%A :1] , [%A  :%A :1] ,
 --R           1         1     1
 --R    [0:0:1] , [0:1:1] , %I3 ]
---IType: List PlacesOverPseudoAlgebraicClosureOfFiniteField ...
+--IType: List(PlacesOverPseudoAlgebraicClosureOfFiniteField ...
 --E 17
 
 -- Now, we can construct the matrix of the AG-code, which code-words consist
@@ -380,7 +380,7 @@ mG:= matrix [ [ eval( f, lB1.den, pl )$P4 for pl in plc1 ] for f in lB1.num ]
 --R      %A , %A , %A  , %A  , 1, 1, %A  , %A  , %A  , %A  , %A , %A , %A , %A ,
 --R      0, 0, 0]
 --R     ]
---R                                     Type: Matrix FiniteFieldCyclicGroup(2,4)
+--R                                     Type: Matrix(FiniteFieldCyclicGroup(2,4))
 --E 18
 
 -- The preceding matrix is the generator matrix of a [n,k,d]-code over GF(2^4)
diff --git a/src/input/exdiff.input.pamphlet b/src/input/exdiff.input.pamphlet
index 444636b..52eff66 100644
--- a/src/input/exdiff.input.pamphlet
+++ b/src/input/exdiff.input.pamphlet
@@ -28,7 +28,7 @@ differentiate(sin(x) * exp(x**2),x)
 --R              2                  2
 --R             x                  x
 --R   (1)  2x %e  sin(x) + cos(x)%e
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 1
 
 -- Input for page ExDiffSeveralVariables
@@ -43,7 +43,7 @@ differentiate(sin(x) * tan(y)/(x**2 + y**2),x)
 --R   (1)  -------------------------------------
 --R                    4     2 2    4
 --R                   y  + 2x y  + x
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 2
 
 --S 3 of 10
@@ -55,7 +55,7 @@ differentiate(sin(x) * tan(y)/(x**2 + y**2),y)
 --R   (2)  ----------------------------------------------------------
 --R                               4     2 2    4
 --R                              y  + 2x y  + x
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 3
 
 -- Input for page ExDiffMultipleI
@@ -70,7 +70,7 @@ differentiate(sin(x)/(x**2 + y**2),[x,y])
 --R   (1)  ----------------------------------
 --R               6     2 4     4 2    6
 --R              y  + 3x y  + 3x y  + x
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 4
 
 --S 5 of 10
@@ -82,7 +82,7 @@ differentiate(sin(x)/(x**2 + y**2),[x,y,y])
 --R   (2)  --------------------------------------------------
 --R                   8     2 6     4 4     6 2    8
 --R                  y  + 4x y  + 6x y  + 4x y  + x
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 5
 
 
@@ -98,7 +98,7 @@ differentiate(cos(z)/(x**2 + y**3),[x,y,z],[1,2,3])
 --R   (1)  --------------------------------
 --R         12     2 9     4 6     6 3    8
 --R        y   + 4x y  + 6x y  + 4x y  + x
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 6
 
 -- Input for page ExDiffHigherOrder
@@ -111,7 +111,7 @@ differentiate(exp(x**2),x,4)
 --R                             2
 --R            4      2        x
 --R   (1)  (16x  + 48x  + 12)%e
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 7
 
 -- Input for page ExDiffFormalIntegral
@@ -125,7 +125,7 @@ f := integrate(sqrt(1 + t**3),t)
 --R         ++   |  3
 --R   (1)   |   \|%M  + 1 d%M
 --R        ++
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 8
 
 --S 9 of 10
@@ -135,7 +135,7 @@ differentiate(f,t)
 --R         +------+
 --R         | 3
 --R   (2)  \|t  + 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 9
 
 --S 10 of 10
@@ -146,7 +146,7 @@ differentiate(f * t**2,t)
 --R           ++   |  3             2 | 3
 --R   (3)  2t |   \|%M  + 1 d%M  + t \|t  + 1
 --R          ++
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 10
 )spool
 )lisp (bye)
diff --git a/src/input/exint.input.pamphlet b/src/input/exint.input.pamphlet
index 3864c00..91a20b5 100644
--- a/src/input/exint.input.pamphlet
+++ b/src/input/exint.input.pamphlet
@@ -33,7 +33,7 @@ integrate(1/(x**2 + a),x)
 --R   (1)  [--------------------------,-----------]
 --R                     +---+               +-+
 --R                   2\|- a               \|a
---R                                     Type: Union(List Expression Integer,...)
+--R                                   Type: Union(List(Expression(Integer)),...)
 --E 1
 
 )clear all
@@ -46,7 +46,7 @@ integrate((x**2+2*x+1)/((x+1)**6+1),x)
 --R        atan(x  + 3x  + 3x + 1)
 --R   (1)  -----------------------
 --R                   3
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 2
 
 )clear all
@@ -60,7 +60,7 @@ integrate(tan(atan(x)/3),x)
 --R                     3                     3                   3
 --R   (1)  ------------------------------------------------------------
 --R                                     18
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 3
 
 )clear all
@@ -75,7 +75,7 @@ complexIntegrate(1/(x**2 + a),x)
 --R        \|  a      \|  a         \|  a        \|  a
 --R   (1)  -------------------------------------------------
 --R                                2
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 4
 
 )clear all
@@ -88,7 +88,7 @@ integrate(log(1 + sqrt(a*x + b)) / x,x)
 --R         ++  log(\|b + %P a  + 1)
 --R   (1)   |   -------------------- d%P
 --R        ++            %P
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 5
 
 )clear all
@@ -102,7 +102,7 @@ integrate(x**3 / (a+b*x)**(1/3),x)
 --R   (1)  ---------------------------------------------------
 --R                                   4
 --R                               440b
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 6
 
 --S 7 of 10
@@ -123,7 +123,7 @@ integrate(1 / (x**3 * (a+b*x)**(1/3)),x)
 --R  /
 --R        2 2 +-+3+-+
 --R     18a x \|3 \|a
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 7
 
 )clear all
@@ -136,7 +136,7 @@ integrate((x + 1) / (x * (x + log x)**(3/2)),x)
 --R          2\|log(x) + x
 --R   (1)  - --------------
 --R            log(x) + x
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 8
 
 )clear all
@@ -150,7 +150,7 @@ integrate(exp(-x**2) * erf(x) / (erf(x)**3 - erf(x)**2 - erf(x) + 1),x)
 --R                              erf(x) + 1
 --R   (1)  -------------------------------------------
 --R                        8erf(x) - 8
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 9
 
 )clear all
@@ -164,7 +164,7 @@ integrate((sinh(1+sqrt(x+b))+2*sqrt(x+b))/(sqrt(x+b)*(x+cosh(1+sqrt(x+b)))),x)
 --R   (1)  2log(---------------------------------------) - 2\|x + b
 --R                   +-----+              +-----+
 --R             sinh(\|x + b  + 1) - cosh(\|x + b  + 1)
---R                                          Type: Union(Expression Integer,...)
+--R                                         Type: Union(Expression(Integer),...)
 --E 10
 )spool 
 )lisp (bye)
diff --git a/src/input/exlap.input.pamphlet b/src/input/exlap.input.pamphlet
index 26268f5..9d28435 100644
--- a/src/input/exlap.input.pamphlet
+++ b/src/input/exlap.input.pamphlet
@@ -27,7 +27,7 @@ laplace(2/t * (1 - cos(a*t)), t, s)
 --R
 --R             2    2
 --R   (1)  log(s  + a ) - 2log(s)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 1
 
 --S 2 of 6
@@ -35,7 +35,7 @@ laplace((exp(a*t) - exp(b*t))/t, t, s)
 --R 
 --R
 --R   (2)  - log(s - a) + log(s - b)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 2
 
 --S 3 of 6
@@ -47,7 +47,7 @@ laplace(exp(a*t+b)*Ei(c*t), t, s)
 --R                   c
 --R   (3)  -----------------
 --R              s - a
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 3
 
 )clear all
@@ -63,7 +63,7 @@ laplace(a*Ci(b*t) + c*Si(d*t), t, s)
 --R                 b
 --R   (1)  ---------------------------
 --R                     2s
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 4
 
 )clear all
@@ -77,7 +77,7 @@ laplace(sin(a*t) * cosh(a*t) - cos(a*t) * sinh(a*t), t, s)
 --R   (1)  --------
 --R         4     4
 --R        s  + 4a
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 5
 
 )clear all
@@ -90,7 +90,7 @@ laplace(t**4 * exp(-a*t) / factorial(4), t, s)
 --R   (1)  ----------------------------------------
 --R         5       4      2 3      3 2     4     5
 --R        s  + 5a s  + 10a s  + 10a s  + 5a s + a
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 6
 )spool 
 )lisp (bye)
diff --git a/src/input/exlimit.input.pamphlet b/src/input/exlimit.input.pamphlet
index ee7aaa1..5a9deca 100644
--- a/src/input/exlimit.input.pamphlet
+++ b/src/input/exlimit.input.pamphlet
@@ -28,7 +28,7 @@ limit((x**2 - 3*x + 2)/(x**2 - 1),x = 1)
 --R          1
 --R   (1)  - -
 --R          2
---R               Type: Union(OrderedCompletion Fraction Polynomial Integer,...)
+--R            Type: Union(OrderedCompletion(Fraction(Polynomial(Integer))),...)
 --E 1
 
 )clear all
@@ -38,7 +38,7 @@ complexLimit((2 + z)/(1 - z),z = %infinity)
 --R 
 --R
 --R   (1)  - 1
---R                         Type: OnePointCompletion Fraction Polynomial Integer
+--R                      Type: OnePointCompletion(Fraction(Polynomial(Integer)))
 --E 2
 
 --S 3 of 13
@@ -46,7 +46,7 @@ limit(sin(x)/x,x = %plusInfinity)
 --R 
 --R
 --R   (2)  0
---R                        Type: Union(OrderedCompletion Expression Integer,...)
+--R                      Type: Union(OrderedCompletion(Expression(Integer)),...)
 --E 3
 
 --S 4 of 13
@@ -64,7 +64,7 @@ limit(x * log(x),x = 0,"right")
 --R 
 --R
 --R   (1)  0
---R                        Type: Union(OrderedCompletion Expression Integer,...)
+--R                      Type: Union(OrderedCompletion(Expression(Integer)),...)
 --E 5
 
 --S 6 of 13
@@ -72,7 +72,7 @@ limit(x * log(x),x = 0)
 --R 
 --R
 --R   (2)  [leftHandLimit= "failed",rightHandLimit= 0]
---IType: Union(Record(leftHandLimit: Union(OrderedCompletion ...
+--IType: Union(Record(leftHandLimit: Union(OrderedCompletion(...
 --E 6
 
 )clear all
@@ -82,7 +82,7 @@ limit(sqrt(y**2)/y,y = 0)
 --R 
 --R
 --R   (1)  [leftHandLimit= - 1,rightHandLimit= 1]
---IType: Union(Record(leftHandLimit: Union(OrderedCompletion ...
+--IType: Union(Record(leftHandLimit: Union(OrderedCompletion(...
 --E 7
 
 --S 8 of 13
@@ -93,7 +93,7 @@ limit(sqrt(1 - cos(t))/t,t = 0)
 --R   (2)  [leftHandLimit= - ----,rightHandLimit= ----]
 --R                           +-+                  +-+
 --R                          \|2                  \|2
---IType: Union(Record(leftHandLimit: Union(OrderedCompletion ...
+--IType: Union(Record(leftHandLimit: Union(OrderedCompletion(...
 --E 8
 
 )clear all
@@ -106,7 +106,7 @@ limit(sqrt(3*x**2 + 1)/(5*x),x = %plusInfinity)
 --R        \|3
 --R   (1)  ----
 --R          5
---R                        Type: Union(OrderedCompletion Expression Integer,...)
+--R                      Type: Union(OrderedCompletion(Expression(Integer)),...)
 --E 9
 
 --S 10 of 13
@@ -117,7 +117,7 @@ limit(sqrt(3*x**2 + 1)/(5*x),x = %minusInfinity)
 --R          \|3
 --R   (2)  - ----
 --R            5
---R                        Type: Union(OrderedCompletion Expression Integer,...)
+--R                      Type: Union(OrderedCompletion(Expression(Integer)),...)
 --E 10
 
 )clear all
@@ -129,7 +129,7 @@ limit(sinh(a*x)/tan(b*x),x = 0)
 --R        a
 --R   (1)  -
 --R        b
---R                        Type: Union(OrderedCompletion Expression Integer,...)
+--R                      Type: Union(OrderedCompletion(Expression(Integer)),...)
 --E 11
 
 )clear all
@@ -139,7 +139,7 @@ limit(z * sin(1/z),z = 0)
 --R 
 --R
 --R   (1)  0
---R                        Type: Union(OrderedCompletion Expression Integer,...)
+--R                      Type: Union(OrderedCompletion(Expression(Integer)),...)
 --E 12
 
 --S 13 of 13
diff --git a/src/input/exp.input.pamphlet b/src/input/exp.input.pamphlet
index cf57b86..cee335a 100644
--- a/src/input/exp.input.pamphlet
+++ b/src/input/exp.input.pamphlet
@@ -231,7 +231,7 @@ Dover Publications, Inc. New York 1965. pp136-137
 --R    [9.8,18033.7449278285 11,18033.7449278285 11246,0.246 E -12],
 --R    [9.9,19930.3704382302 89,19930.3704382302 8949,0.49 E -12],
 --R    [10.0,22026.4657948067 17,22026.4657948067 16517,- 0.483 E -12]]
---R                                                        Type: List List Float
+--R                                                      Type: List(List(Float))
 --E 1
 
 \end{chunk} 
@@ -446,7 +446,7 @@ Dover Publications, Inc. New York 1965. pp136-137
 --R    [9.8,0.0000554515 9943217698,0.0000554515 9943217698 1808,0.181 E -20],
 --R    [9.9,0.0000501746 820561753,0.0000501746 8205617530 2187,0.219 E -20],
 --R    [10.0,0.0000453999 2976248485,0.0000453999 2976248485 1536,0.154 E -20]]
---R                                                        Type: List List Float
+--R                                                      Type: List(List(Float))
 --E 2
 
 )spool 
diff --git a/src/input/expexpan.input.pamphlet b/src/input/expexpan.input.pamphlet
index 6ca6673..3338da1 100644
--- a/src/input/expexpan.input.pamphlet
+++ b/src/input/expexpan.input.pamphlet
@@ -40,20 +40,20 @@ f1 := (a**2 + 1) * exp(1/x**3 + 2/x**2) - exp(b) * exp(1/x**3 + 3/x**2)
 --R               3                     3
 --R              x     b     2         x
 --R   (2)  - %e      %e  + (a  + 1)%e
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 2
 
 --S 3 of 18
 x1 := xxp f1
 --R 
---R   Compiling function xxp with type Expression Integer -> Union(
---R      %expansion: ExponentialExpansion(Integer,Expression Integer,x,0),
---R      %problem: Record(func: String,prob: String)) 
+--R   Compiling function xxp with type Expression(Integer) -> Union(
+--R      %expansion: ExponentialExpansion(Integer,Expression(Integer),x,0)
+--R      ,%problem: Record(func: String,prob: String)) 
 --R
 --R                - 3     - 2              - 3     - 2
 --R            b  x    + 3x        2       x    + 2x
 --R   (3)  - %e %e             + (a  + 1)%e
---RType: Union(%expansion: ExponentialExpansion(Integer,Expression Integer,x,0),...)
+--RType: Union(%expansion: ExponentialExpansion(Integer,Expression(Integer),x,0),...)
 --E 3
 
 --S 4 of 18
@@ -61,7 +61,7 @@ limitPlus x1   -- %minusInfinity
 --R 
 --R
 --R   (4)  - infinity
---R                        Type: Union(OrderedCompletion Expression Integer,...)
+--R                      Type: Union(OrderedCompletion(Expression(Integer)),...)
 --E 4
 
 --S 5 of 18
@@ -73,7 +73,7 @@ f2 := (a**2 + 1) * exp(1/x**3 + 2/x**2) - exp(b) * exp(-1/x**3 + 3/x**2)
 --R               3                     3
 --R              x     b     2         x
 --R   (5)  - %e      %e  + (a  + 1)%e
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 5
 
 --S 6 of 18
@@ -83,7 +83,7 @@ x2 := xxp f2
 --R                   - 3     - 2           - 3     - 2
 --R          2       x    + 2x        b  - x    + 3x
 --R   (6)  (a  + 1)%e             - %e %e
---RType: Union(%expansion: ExponentialExpansion(Integer,Expression Integer,x,0),...)
+--RType: Union(%expansion: ExponentialExpansion(Integer,Expression(Integer),x,0),...)
 --E 6
 
 --S 7 of 18
@@ -91,7 +91,7 @@ limitPlus x2   -- %plusInfinity
 --R 
 --R
 --R   (7)   + infinity
---R                        Type: Union(OrderedCompletion Expression Integer,...)
+--R                      Type: Union(OrderedCompletion(Expression(Integer)),...)
 --E 7
 
 --S 8 of 18
@@ -103,7 +103,7 @@ f3 := (a**2 + 1) * exp(1/x**3) - exp(b) * exp(c/x**2)
 --R             2                 3
 --R            x   b     2       x
 --R   (8)  - %e  %e  + (a  + 1)%e
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 8
 
 --S 9 of 18
@@ -113,7 +113,7 @@ x3 := xxp f3
 --R                   - 3           - 2
 --R          2       x        b  c x
 --R   (9)  (a  + 1)%e     - %e %e
---RType: Union(%expansion: ExponentialExpansion(Integer,Expression Integer,x,0),...)
+--RType: Union(%expansion: ExponentialExpansion(Integer,Expression(Integer),x,0),...)
 --E 9
 
 --S 10 of 18
@@ -121,7 +121,7 @@ limitPlus x3   -- %plusInfinity
 --R 
 --R
 --R   (10)   + infinity
---R                        Type: Union(OrderedCompletion Expression Integer,...)
+--R                      Type: Union(OrderedCompletion(Expression(Integer)),...)
 --E 10
 
 --S 11 of 18
@@ -133,7 +133,7 @@ f4 := (a**2 + 1) * exp(-1/x**3) - exp(b) * exp(c/x**2)
 --R              2                   3
 --R             x   b     2         x
 --R   (11)  - %e  %e  + (a  + 1)%e
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 11
 
 --S 12 of 18
@@ -143,7 +143,7 @@ x4 := xxp f4
 --R                      - 3           - 2
 --R           2       - x        b  c x
 --R   (12)  (a  + 1)%e       - %e %e
---RType: Union(%expansion: ExponentialExpansion(Integer,Expression Integer,x,0),...)
+--RType: Union(%expansion: ExponentialExpansion(Integer,Expression(Integer),x,0),...)
 --E 12
 
 --S 13 of 18
@@ -163,7 +163,7 @@ p5 := tan(x) * exp(1/x**2) - tan(x) * exp(1/x**2 - 1/x) + sin(x) * exp(1/x)
 --R             2         2              -
 --R            x         x               x
 --R   (14)  (%e   - %e       )tan(x) + %e sin(x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 14
 
 --S 15 of 18
@@ -175,7 +175,7 @@ q5 := -4 * exp(-1/x**2 - 1/x) + sin(x) * exp(-1/x**2 + 1/x)
 --R              2                 2
 --R             x                 x
 --R   (15)  %e     sin(x) - 4%e
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 15
 
 --S 16 of 18
@@ -193,7 +193,7 @@ f5 := p5 / q5
 --R                   2                 2
 --R                  x                 x
 --R              %e     sin(x) - 4%e
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 16
 
 --S 17 of 18
@@ -231,7 +231,7 @@ x5 := xxp f5
 --R              2   1  4    1   6     1    8      1    10      11    - x    - x
 --R     (- 4 + 2x  - - x  + --- x  - ----- x  + ------ x   + O(x  ))%e
 --R                  6      180      10080      907200
---RType: Union(%expansion: ExponentialExpansion(Integer,Expression Integer,x,0),...)
+--RType: Union(%expansion: ExponentialExpansion(Integer,Expression(Integer),x,0),...)
 --E 17
 
 --S 18 of 18
@@ -239,7 +239,7 @@ limitPlus x5   -- %plusInfinity
 --R 
 --R
 --R   (18)   + infinity
---R                        Type: Union(OrderedCompletion Expression Integer,...)
+--R                      Type: Union(OrderedCompletion(Expression(Integer)),...)
 --E 18
 )spool 
 )lisp (bye)
diff --git a/src/input/explim.input.pamphlet b/src/input/explim.input.pamphlet
index 593f067..a7a7cdb 100644
--- a/src/input/explim.input.pamphlet
+++ b/src/input/explim.input.pamphlet
@@ -32,7 +32,7 @@ limit(x/exp(x),x = %plusInfinity)              -- 0
 --R 
 --R
 --R   (1)  0
---R                        Type: Union(OrderedCompletion Expression Integer,...)
+--R                      Type: Union(OrderedCompletion(Expression(Integer)),...)
 --E 1
 
 --S 2 of 12
@@ -40,7 +40,7 @@ limit(x**10000/exp(x),x = %plusInfinity)       -- 0
 --R 
 --R
 --R   (2)  0
---R                        Type: Union(OrderedCompletion Expression Integer,...)
+--R                      Type: Union(OrderedCompletion(Expression(Integer)),...)
 --E 2
 
 --S 3 of 12
@@ -48,7 +48,7 @@ limit(x**(10**20)/exp(x),x = %plusInfinity)    -- 0
 --R 
 --R
 --R   (3)  0
---R                        Type: Union(OrderedCompletion Expression Integer,...)
+--R                      Type: Union(OrderedCompletion(Expression(Integer)),...)
 --E 3
 
 --S 4 of 12
@@ -56,7 +56,7 @@ limit(x**h/exp(x),x = %plusInfinity)           -- 0
 --R 
 --R
 --R   (4)  0
---R                        Type: Union(OrderedCompletion Expression Integer,...)
+--R                      Type: Union(OrderedCompletion(Expression(Integer)),...)
 --E 4
 
 --S 5 of 12
@@ -64,7 +64,7 @@ limit(x/exp(x),x = %minusInfinity)             -- %minusInfinity
 --R 
 --R
 --R   (5)  - infinity
---R                        Type: Union(OrderedCompletion Expression Integer,...)
+--R                      Type: Union(OrderedCompletion(Expression(Integer)),...)
 --E 5
 
 --S 6 of 12
@@ -72,7 +72,7 @@ limit(x**10000/exp(x),x = %minusInfinity)      -- %plusInfinity
 --R 
 --R
 --R   (6)   + infinity
---R                        Type: Union(OrderedCompletion Expression Integer,...)
+--R                      Type: Union(OrderedCompletion(Expression(Integer)),...)
 --E 6
 
 --S 7 of 12
@@ -80,7 +80,7 @@ limit(x**(10**20)/exp(x),x = %minusInfinity)   -- %plusInfinity
 --R 
 --R
 --R   (7)   + infinity
---R                        Type: Union(OrderedCompletion Expression Integer,...)
+--R                      Type: Union(OrderedCompletion(Expression(Integer)),...)
 --E 7
 
 --S 8 of 12
@@ -98,7 +98,7 @@ limit(exp(-x) * sinh(x),x = %plusInfinity)     -- 1/2
 --R        1
 --R   (9)  -
 --R        2
---R                        Type: Union(OrderedCompletion Expression Integer,...)
+--R                      Type: Union(OrderedCompletion(Expression(Integer)),...)
 --E 9
 
 --S 10 of 12
@@ -108,7 +108,7 @@ limit(exp(-x) * cosh(x),x = %plusInfinity)     -- 1/2
 --R         1
 --R   (10)  -
 --R         2
---R                        Type: Union(OrderedCompletion Expression Integer,...)
+--R                      Type: Union(OrderedCompletion(Expression(Integer)),...)
 --E 10
 
 --S 11 of 12
@@ -116,7 +116,7 @@ limit(exp(-x) * exp(x),x = %plusInfinity)      -- 1
 --R 
 --R
 --R   (11)  1
---R                        Type: Union(OrderedCompletion Expression Integer,...)
+--R                      Type: Union(OrderedCompletion(Expression(Integer)),...)
 --E 11
 
 --S 12 of 12
@@ -124,7 +124,7 @@ limit((x + 1)**(x + 1)/x**x - x**x/(x - 1)**(x - 1),x = %plusInfinity)  -- %e
 --R 
 --R
 --R   (12)  %e
---R                        Type: Union(OrderedCompletion Expression Integer,...)
+--R                      Type: Union(OrderedCompletion(Expression(Integer)),...)
 --E 12
 )spool 
 )lisp (bye)
diff --git a/src/input/expr.input.pamphlet b/src/input/expr.input.pamphlet
index 7febcd9..80e6ae5 100644
--- a/src/input/expr.input.pamphlet
+++ b/src/input/expr.input.pamphlet
@@ -42,7 +42,7 @@ g := foo x
 --R 
 --R
 --R   (3)  foo(x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 3
 
 --S 4 of 29
@@ -51,7 +51,7 @@ eval(g, x = x**2 + 1)
 --R
 --R             2
 --R   (4)  foo(x  + 1)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 4
 
 \end{chunk}
@@ -64,7 +64,7 @@ differentiate(%, x)
 --R             ,  2
 --R   (5)  2xfoo (x  + 1)
 --R
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 5
 
 \end{chunk}
@@ -75,7 +75,7 @@ f := bar(x, y)
 --R 
 --R
 --R   (6)  bar(x,y)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 6
 
 \end{chunk}
@@ -86,7 +86,7 @@ eval(f, [x = y, y = x])
 --R 
 --R
 --R   (7)  bar(y,x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 7
 
 --S 8 of 29
@@ -95,7 +95,7 @@ eval(f, [x = y, y = x])
 --R
 --R   (8)  [bar  (x,y),bar  (x,y)]
 --R            ,1         ,2
---R                                                Type: List Expression Integer
+--R                                              Type: List(Expression(Integer))
 --E 8
 
 \end{chunk}
@@ -107,7 +107,7 @@ ff := eval(f, [x = x**2 * foo y, y = x + y])
 --R
 --R             2
 --R   (9)  bar(x foo(y),y + x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 9
 
 --S 10 of 29
@@ -117,7 +117,7 @@ differentiate(ff, x)
 --R                2                                2
 --R   (10)  bar  (x foo(y),y + x) + 2x foo(y)bar  (x foo(y),y + x)
 --R            ,2                               ,1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 10
 
 --S 11 of 29
@@ -127,7 +127,7 @@ differentiate(ff, y)
 --R                2                 2       2                ,
 --R   (11)  bar  (x foo(y),y + x) + x bar  (x foo(y),y + x)foo (y)
 --R            ,2                        ,1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 11
 
 \end{chunk}
@@ -137,7 +137,7 @@ Let's change the way bar is printed on the screen, make it \#1 \@ \#2
 --S 12 of 29
 pbar(l:List OUTFORM):OUTFORM == infix(" @ "::SYMBOL::OUTFORM, l)
 --R 
---R   Function declaration pbar : List OutputForm -> OutputForm has been 
+--R   Function declaration pbar : List(OutputForm) -> OutputForm has been 
 --R      added to workspace.
 --R                                                                   Type: Void
 --E 12
@@ -145,7 +145,7 @@ pbar(l:List OUTFORM):OUTFORM == infix(" @ "::SYMBOL::OUTFORM, l)
 --S 13 of 29
 display(bar, pbar)
 --R 
---R   Compiling function pbar with type List OutputForm -> OutputForm 
+--R   Compiling function pbar with type List(OutputForm) -> OutputForm 
 --R
 --R   (13)  bar
 --R                                                          Type: BasicOperator
@@ -159,7 +159,7 @@ f
 --R 
 --R
 --R   (14)  x @ y
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 14
 
 --S 15 of 29
@@ -168,7 +168,7 @@ ff
 --R
 --R          2
 --R   (15)  x foo(y) @ y + x
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 15
 
 \end{chunk}
@@ -198,7 +198,7 @@ f
 --R 
 --R
 --R   (16)  x @ y
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 17
 
 \end{chunk}
@@ -219,10 +219,10 @@ bar2 l == first l
 --S 20 of 29
 derivative(bar, [bar1, bar2]$(LIST(LIST(EXPR INT) -> EXPR INT)))
 --R 
---R   Compiling function bar1 with type List Expression Integer -> 
---R      Expression Integer 
---R   Compiling function bar2 with type List Expression Integer -> 
---R      Expression Integer 
+--R   Compiling function bar1 with type List(Expression(Integer)) -> 
+--R      Expression(Integer) 
+--R   Compiling function bar2 with type List(Expression(Integer)) -> 
+--R      Expression(Integer) 
 --R
 --R   (19)  bar
 --R                                                          Type: BasicOperator
@@ -233,7 +233,7 @@ derivative(bar, [bar1, bar2]$(LIST(LIST(EXPR INT) -> EXPR INT)))
 --R 
 --R
 --R   (20)  [y,x]
---R                                                Type: List Expression Integer
+--R                                              Type: List(Expression(Integer))
 --E 21
 
 --S 22 of 29
@@ -243,7 +243,7 @@ derivative(bar, [bar1, bar2]$(LIST(LIST(EXPR INT) -> EXPR INT)))
 --R                    2          2     3    ,       2
 --R   (21)  [(2x y + 3x )foo(y),(x y + x )foo (y) + x foo(y)]
 --R
---R                                                Type: List Expression Integer
+--R                                              Type: List(Expression(Integer))
 --E 22
 
 \end{chunk}
@@ -257,7 +257,7 @@ h := inv(x + f + g**2)
 --R   (22)  -------------------
 --R               2
 --R         foo(x)  + x @ y + x
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 23
 
 --S 24 of 29
@@ -266,7 +266,7 @@ isPower h
 --R
 --R                     2
 --R   (23)  [val= foo(x)  + x @ y + x,exponent= - 1]
---R           Type: Union(Record(val: Expression Integer,exponent: Integer),...)
+--R          Type: Union(Record(val: Expression(Integer),exponent: Integer),...)
 --E 24
 
 --S 25 of 29
@@ -278,7 +278,7 @@ y * g**2 * h
 --R   (24)  -------------------
 --R               2
 --R         foo(x)  + x @ y + x
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 25
 
 --S 26 of 29
@@ -289,7 +289,7 @@ isTimes %
 --R   (25)  [foo(x) ,y,-------------------]
 --R                          2
 --R                    foo(x)  + x @ y + x
---R                                     Type: Union(List Expression Integer,...)
+--R                                   Type: Union(List(Expression(Integer)),...)
 --E 26
 
 --S 27 of 29
@@ -298,7 +298,7 @@ isPlus(denom(h)::EXPR(INT))
 --R
 --R                2
 --R   (26)  [foo(x) ,x @ y,x]
---R                                     Type: Union(List Expression Integer,...)
+--R                                   Type: Union(List(Expression(Integer)),...)
 --E 27
 
 --S 28 of 29
@@ -306,7 +306,7 @@ isExpt(inv(g**2), "foo")
 --R 
 --R
 --R   (27)  [var= foo(x),exponent= - 2]
---R    Type: Union(Record(var: Kernel Expression Integer,exponent: Integer),...)
+--R  Type: Union(Record(var: Kernel(Expression(Integer)),exponent: Integer),...)
 --E 28
 
 --S 29 of 29
diff --git a/src/input/expr1.input.pamphlet b/src/input/expr1.input.pamphlet
index e2fa1cb..b05a48f 100644
--- a/src/input/expr1.input.pamphlet
+++ b/src/input/expr1.input.pamphlet
@@ -27,7 +27,7 @@ sin(x) + 3*cos(x)**2
 --R
 --R                        2
 --R   (1)  sin(x) + 3cos(x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 1
 
 --S 2 of 23
@@ -35,7 +35,7 @@ tan(x) - 3.45*x
 --R 
 --R
 --R   (2)  tan(x) - 3.45 x
---R                                                       Type: Expression Float
+--R                                                      Type: Expression(Float)
 --E 2
 
 --S 3 of 23
@@ -46,7 +46,7 @@ tan(x) - 3.45*x
 --R        - tan(\|7 )  + 2sin(\|11 )tan(\|7 ) - sin(\|11 )
 --R   (3)  -------------------------------------------------
 --R                          cos(y - x) - 4
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 3
 
 --S 4 of 23
@@ -54,7 +54,7 @@ log(exp  x)@Expression(Integer)
 --R 
 --R
 --R   (4)  x
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 4
 
 --S 5 of 23
@@ -63,7 +63,7 @@ log(exp  x)@Expression(Complex Integer)
 --R
 --R              x
 --R   (5)  log(%e )
---R                                             Type: Expression Complex Integer
+--R                                           Type: Expression(Complex(Integer))
 --E 5
 
 --S 6 of 23
@@ -83,7 +83,7 @@ sqrt 3 + sqrt(2 + sqrt(-5))
 --R         +----------+
 --R         | +---+         +-+
 --R   (7)  \|\|- 5  + 2  + \|3
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 7
 
 --S 8 of 23
@@ -103,7 +103,7 @@ e := (sin(x) - 4)**2 / ( 1 - 2*y*sqrt(- y) )
 --R   (9)  ------------------------
 --R                 +---+
 --R              2y\|- y  - 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 9
 
 --S 10 of 23
@@ -112,7 +112,7 @@ numer e
 --R
 --R                 2
 --R   (10)  - sin(x)  + 8sin(x) - 16
---R        Type: SparseMultivariatePolynomial(Integer,Kernel Expression Integer)
+--R      Type: SparseMultivariatePolynomial(Integer,Kernel(Expression(Integer)))
 --E 10
 
 --S 11 of 23
@@ -121,7 +121,7 @@ denom e
 --R
 --R            +---+
 --R   (11)  2y\|- y  - 1
---R        Type: SparseMultivariatePolynomial(Integer,Kernel Expression Integer)
+--R      Type: SparseMultivariatePolynomial(Integer,Kernel(Expression(Integer)))
 --E 11
 
 --S 12 of 23
@@ -133,7 +133,7 @@ D(e, x)
 --R   (12)  --------------------------------------------------------------
 --R                                  +---+     3
 --R                               4y\|- y  + 4y  - 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 12
 
 --S 13 of 23
@@ -155,7 +155,7 @@ D(e, [x, y], [1, 2])
 --R     + 
 --R          2
 --R       16y
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 13
 
 --S 14 of 23
@@ -163,7 +163,7 @@ complexNumeric(cos(2 - 3*%i))
 --R 
 --R
 --R   (14)  - 4.1896256909 688072301 + 9.1092278937 55336598 %i
---R                                                          Type: Complex Float
+--R                                                         Type: Complex(Float)
 --E 14
 
 --S 15 of 23
@@ -180,7 +180,7 @@ e2 := cos(x**2 - y + 3)
 --R
 --R                  2
 --R   (16)  cos(y - x  - 3)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 16
 
 --S 17 of 23
@@ -189,7 +189,7 @@ e3 := asin(e2) - %pi/2
 --R
 --R                2
 --R   (17)  - y + x  + 3
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 17
 
 --S 18 of 23
@@ -198,7 +198,7 @@ e3 :: Polynomial Integer
 --R
 --R                2
 --R   (18)  - y + x  + 3
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 18
 
 --S 19 of 23
@@ -215,7 +215,7 @@ sin %pi
 --R 
 --R
 --R   (20)  0
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 20
 
 --S 21 of 23
@@ -226,7 +226,7 @@ cos(%pi / 4)
 --R         \|2
 --R   (21)  ----
 --R           2
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 21
 
 --S 22 of 23
@@ -235,7 +235,7 @@ tan(x)**6 + 3*tan(x)**4 + 3*tan(x)**2 + 1
 --R
 --R               6          4          2
 --R   (22)  tan(x)  + 3tan(x)  + 3tan(x)  + 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 22
 
 --S 23 of 23
@@ -246,7 +246,7 @@ simplify %
 --R   (23)  -------
 --R               6
 --R         cos(x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 23
 )spool 
 )lisp (bye)
diff --git a/src/input/exprode.input.pamphlet b/src/input/exprode.input.pamphlet
index 339e07c..024227f 100644
--- a/src/input/exprode.input.pamphlet
+++ b/src/input/exprode.input.pamphlet
@@ -43,15 +43,15 @@ eq := differentiate(y x, x, 3) - sin differentiate(y x, x, 2) * exp y x
 --R         ,,,        y(x)     ,,
 --R   (2)  y   (x) - %e    sin(y  (x))= cos(x)
 --R
---R                                            Type: Equation Expression Integer
+--R                                          Type: Equation(Expression(Integer))
 --E 2
 
 --S 3 of 13
 seriesSolve(eq, y, x = 0, [1, 0, 0])
 --R 
---R   Compiling function %B with type List UnivariateTaylorSeries(
---R      Expression Integer,x,0) -> UnivariateTaylorSeries(Expression 
---R      Integer,x,0) 
+--I   Compiling function %B with type List(UnivariateTaylorSeries(
+--I      Expression(Integer),x,0)) -> UnivariateTaylorSeries(Expression(
+--I      Integer),x,0) 
 --R
 --R   (3)
 --R                          2            3              4      2
@@ -61,7 +61,7 @@ seriesSolve(eq, y, x = 0, [1, 0, 0])
 --R   + 
 --R        8
 --R     O(x )
---R                         Type: UnivariateTaylorSeries(Expression Integer,x,0)
+--R                        Type: UnivariateTaylorSeries(Expression(Integer),x,0)
 --E 3
  
 \end{chunk}
@@ -74,20 +74,20 @@ airy := differentiate(y x, x, 2) - x * y x
 --R         ,,
 --R   (4)  y  (x) - x y(x)
 --R
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 4
 
 --S 5 of 13
 seriesSolve(airy, y, x = 0, [a0, a1])
 --R 
---R   Compiling function %D with type List UnivariateTaylorSeries(
---R      Expression Integer,x,0) -> UnivariateTaylorSeries(Expression 
---R      Integer,x,0) 
+--I   Compiling function %D with type List(UnivariateTaylorSeries(
+--I      Expression(Integer),x,0)) -> UnivariateTaylorSeries(Expression(
+--I      Integer),x,0) 
 --R
 --R                    a0  3   a1  4    a0  6    a1  7      8
 --R   (5)  a0 + a1 x + -- x  + -- x  + --- x  + --- x  + O(x )
 --R                     6      12      180      504
---R                         Type: UnivariateTaylorSeries(Expression Integer,x,0)
+--R                        Type: UnivariateTaylorSeries(Expression(Integer),x,0)
 --E 5
 
 \end{chunk} 
@@ -96,9 +96,9 @@ We can solve around other points than $x = 0$
 --S 6 of 13
 seriesSolve(airy, y, x = 1, [a0, a1])
 --R 
---R   Compiling function %F with type List UnivariateTaylorSeries(
---R      Expression Integer,x,1) -> UnivariateTaylorSeries(Expression 
---R      Integer,x,1) 
+--I   Compiling function %F with type List(UnivariateTaylorSeries(
+--I      Expression(Integer),x,1)) -> UnivariateTaylorSeries(Expression(
+--I      Integer),x,1) 
 --R
 --R   (6)
 --R                      a0        2   a1 + a0        3   2a1 + a0        4
@@ -108,7 +108,7 @@ seriesSolve(airy, y, x = 1, [a0, a1])
 --R     a1 + 4a0        5   6a1 + 5a0        6   11a1 + 9a0        7            8
 --R     -------- (x - 1)  + --------- (x - 1)  + ---------- (x - 1)  + O((x - 1) )
 --R        120                 720                  5040
---R                         Type: UnivariateTaylorSeries(Expression Integer,x,1)
+--R                        Type: UnivariateTaylorSeries(Expression(Integer),x,1)
 --E 6
 
 \end{chunk}
@@ -117,9 +117,9 @@ System of equations for tan(t) and sec(t)
 --S 7 of 13
 x := operator 'x
 --R 
---R   Compiled code for %F has been cleared.
---R   Compiled code for %D has been cleared.
---R   Compiled code for %B has been cleared.
+--I   Compiled code for %F has been cleared.
+--I   Compiled code for %D has been cleared.
+--I   Compiled code for %B has been cleared.
 --R
 --R   (7)  x
 --R                                                          Type: BasicOperator
@@ -132,7 +132,7 @@ eq1 := differentiate(x t, t) = 1 + x(t)**2
 --R         ,         2
 --R   (8)  x (t)= x(t)  + 1
 --R
---R                                            Type: Equation Expression Integer
+--R                                          Type: Equation(Expression(Integer))
 --E 8
 
 --S 9 of 13
@@ -142,23 +142,23 @@ eq2 := differentiate(y t, t) = x(t) * y(t)
 --R         ,
 --R   (9)  y (t)= x(t)y(t)
 --R
---R                                            Type: Equation Expression Integer
+--R                                          Type: Equation(Expression(Integer))
 --E 9
 
 --S 10 of 13
 seriesSolve([eq2, eq1], [x, y], t = 0, [y 0 = 1, x 0 = 0])
 --R 
---R   Compiling function %H with type List UnivariateTaylorSeries(
---R      Expression Integer,t,0) -> UnivariateTaylorSeries(Expression 
---R      Integer,t,0) 
---R   Compiling function %I with type List UnivariateTaylorSeries(
---R      Expression Integer,t,0) -> UnivariateTaylorSeries(Expression 
---R      Integer,t,0) 
+--I   Compiling function %H with type List(UnivariateTaylorSeries(
+--I      Expression(Integer),t,0)) -> UnivariateTaylorSeries(Expression(
+--I      Integer),t,0) 
+--I   Compiling function %I with type List(UnivariateTaylorSeries(
+--I      Expression(Integer),t,0)) -> UnivariateTaylorSeries(Expression(
+--I      Integer),t,0) 
 --R
 --R              1  3    2  5    17  7      8      1  2    5  4    61  6      8
 --R   (10)  [t + - t  + -- t  + --- t  + O(t ),1 + - t  + -- t  + --- t  + O(t )]
 --R              3      15      315                2      24      720
---R                    Type: List UnivariateTaylorSeries(Expression Integer,t,0)
+--R                  Type: List(UnivariateTaylorSeries(Expression(Integer),t,0))
 --E 10
 
 \end{chunk}
@@ -171,7 +171,7 @@ eq1 := differentiate(x t, t) = y t
 --R          ,
 --R   (11)  x (t)= y(t)
 --R
---R                                            Type: Equation Expression Integer
+--R                                          Type: Equation(Expression(Integer))
 --E 11
 
 --S 12 of 13
@@ -181,18 +181,18 @@ eq2 := differentiate(y t, t) = - g * sin(x t) - c * y t
 --R          ,
 --R   (12)  y (t)= - g sin(x(t)) - c y(t)
 --R
---R                                            Type: Equation Expression Integer
+--R                                          Type: Equation(Expression(Integer))
 --E 12
 
 --S 13 of 13
 seriesSolve([eq1, eq2], [x, y], t = 0, [y 0 = a, x 0 = b])
 --R 
---R   Compiling function %K with type List UnivariateTaylorSeries(
---R      Expression Integer,t,0) -> UnivariateTaylorSeries(Expression 
---R      Integer,t,0) 
---R   Compiling function %L with type List UnivariateTaylorSeries(
---R      Expression Integer,t,0) -> UnivariateTaylorSeries(Expression 
---R      Integer,t,0) 
+--I   Compiling function %K with type List(UnivariateTaylorSeries(
+--I      Expression(Integer),t,0)) -> UnivariateTaylorSeries(Expression(
+--I      Integer),t,0) 
+--I   Compiling function %L with type List(UnivariateTaylorSeries(
+--I      Expression(Integer),t,0)) -> UnivariateTaylorSeries(Expression(
+--I      Integer),t,0) 
 --R
 --R   (13)
 --R   [
@@ -336,7 +336,7 @@ seriesSolve([eq1, eq2], [x, y], t = 0, [y 0 = a, x 0 = b])
 --R          8
 --R       O(t )
 --R     ]
---R                    Type: List UnivariateTaylorSeries(Expression Integer,t,0)
+--R                  Type: List(UnivariateTaylorSeries(Expression(Integer),t,0))
 --E 13
 )spool 
 )lisp (bye)
diff --git a/src/input/exprpoly.input.pamphlet b/src/input/exprpoly.input.pamphlet
index 2288066..16eda49 100644
--- a/src/input/exprpoly.input.pamphlet
+++ b/src/input/exprpoly.input.pamphlet
@@ -34,7 +34,7 @@ a := sin(i)*x**2 - y*x*sin(j)
 --R
 --R                        2
 --R   (1)  - x y sin(j) + x sin(i)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 1
 
 \end{chunk}
@@ -46,7 +46,7 @@ a :: DMP([x,y], EXPR INT)
 --R
 --R               2
 --R   (2)  sin(i)x  - sin(j)x y
---R            Type: DistributedMultivariatePolynomial([x,y],Expression Integer)
+--R           Type: DistributedMultivariatePolynomial([x,y],Expression(Integer))
 --E 2
 
 --S 3 of 20
@@ -54,7 +54,7 @@ leadingCoefficient %
 --R 
 --R
 --R   (3)  sin(i)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 3
 
 --S 4 of 20
@@ -63,7 +63,7 @@ a :: HDMP([x,y], EXPR INT)
 --R
 --R               2
 --R   (4)  sin(i)x  - sin(j)x y
---R Type: HomogeneousDistributedMultivariatePolynomial([x,y],Expression Integer)
+--RType: HomogeneousDistributedMultivariatePolynomial([x,y],Expression(Integer))
 --E 4
 
 --S 5 of 20
@@ -72,7 +72,7 @@ a :: MPOLY([x,y], EXPR INT)
 --R
 --R               2
 --R   (5)  sin(i)x  - sin(j)y x
---R                       Type: MultivariatePolynomial([x,y],Expression Integer)
+--R                      Type: MultivariatePolynomial([x,y],Expression(Integer))
 --E 5
 
 --S 6 of 20
@@ -81,7 +81,7 @@ a :: MPOLY([y,x], EXPR INT)
 --R
 --R                             2
 --R   (6)  - sin(j)x y + sin(i)x
---R                       Type: MultivariatePolynomial([y,x],Expression Integer)
+--R                      Type: MultivariatePolynomial([y,x],Expression(Integer))
 --E 6
 
 \end{chunk}
@@ -93,7 +93,7 @@ Coerce it back to type Expression
 --R
 --R                        2
 --R   (7)  - x y sin(j) + x sin(i)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 7
 
 --S 8 of 20
@@ -101,7 +101,7 @@ a - %
 --R 
 --R
 --R   (8)  0
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 8
 
 \end{chunk}
@@ -113,7 +113,7 @@ a :: UP(x, EXPR INT)
 --R
 --R               2
 --R   (9)  sin(i)x  - y sin(j)x
---R                             Type: UnivariatePolynomial(x,Expression Integer)
+--R                            Type: UnivariatePolynomial(x,Expression(Integer))
 --E 9
 
 --S 10 of 20
@@ -122,7 +122,7 @@ a :: UP(y, EXPR INT)
 --R
 --R                        2
 --R   (10)  - x sin(j)y + x sin(i)
---R                             Type: UnivariatePolynomial(y,Expression Integer)
+--R                            Type: UnivariatePolynomial(y,Expression(Integer))
 --E 10
 
 --S 11 of 20
@@ -131,7 +131,7 @@ a :: UP(y, UP(x, EXPR INT))
 --R
 --R                              2
 --R   (11)  - sin(j)x y + sin(i)x
---R     Type: UnivariatePolynomial(y,UnivariatePolynomial(x,Expression Integer))
+--R    Type: UnivariatePolynomial(y,UnivariatePolynomial(x,Expression(Integer)))
 --E 11
 
 \end{chunk}
@@ -143,7 +143,7 @@ Coerce it back to type Expression
 --R
 --R                         2
 --R   (12)  - x y sin(j) + x sin(i)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 12
 
 --S 13 of 20
@@ -151,7 +151,7 @@ a - %
 --R 
 --R
 --R   (13)  0
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 13
 
 \end{chunk}
@@ -165,7 +165,7 @@ b : EXPR INT := (x - 2*y + 3*z)**3
 --R   (14)
 --R      3                 2       2             2       3        2     2     3
 --R   27z  + (- 54y + 27x)z  + (36y  - 36x y + 9x )z - 8y  + 12x y  - 6x y + x
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 14
 
 --S 15 of 20
@@ -193,7 +193,7 @@ b - (% :: EXPR INT)
 --R 
 --R
 --R   (17)  0
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 17
 
 --S 18 of 20
@@ -213,7 +213,7 @@ b :: UP(y, HDMP([x,z], Integer))
 --R   (19)
 --R       3               2        2              2      3     2         2      3
 --R   - 8y  + (12x + 36z)y  + (- 6x  - 36x z - 54z )y + x  + 9x z + 27x z  + 27z
---IType: UnivariatePolynomial(y,HomogeneousDistributedMultivariatePolynomial(...
+--IType: UnivariatePolynomial(y,...
 --E 19
 
 --S 20 of 20
@@ -221,7 +221,7 @@ b - (% :: EXPR INT)
 --R 
 --R
 --R   (20)  0
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 20
 )spool 
 )lisp (bye)
diff --git a/src/input/exseries.input.pamphlet b/src/input/exseries.input.pamphlet
index cf3acef..b107e60 100644
--- a/src/input/exseries.input.pamphlet
+++ b/src/input/exseries.input.pamphlet
@@ -33,7 +33,7 @@ f := taylor(exp(x))
 --R        1    9      1     10      11
 --R     ------ x  + ------- x   + O(x  )
 --R     362880      3628800
---R                         Type: UnivariateTaylorSeries(Expression Integer,x,0)
+--R                        Type: UnivariateTaylorSeries(Expression(Integer),x,0)
 --E 1
 
 --S 2 of 9
@@ -44,7 +44,7 @@ eval(f,1.0)
 --R   [1.0, 2.0, 2.5, 2.6666666666 666666667, 2.7083333333 333333333,
 --R    2.7166666666 666666667, 2.7180555555 555555556, 2.7182539682 53968254,
 --R    2.7182787698 412698413, 2.7182815255 731922399, ...]
---R                                                Type: Stream Expression Float
+--R                                              Type: Stream(Expression(Float))
 --E 2
 
 )clear all
@@ -57,7 +57,7 @@ series(sin(a*x),x = 0)
 --R              a   3    a   5    a    7     a     9      a      11      12
 --R   (1)  a x - -- x  + --- x  - ---- x  + ------ x  - -------- x   + O(x  )
 --R               6      120      5040      362880      39916800
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 3
 
 --S 4 of 9
@@ -94,7 +94,7 @@ series(sin(a*x),a = %pi/4)
 --R                4         %pi 10          %pi 11
 --R     - ------------- (a - ---)   + O((a - ---)  )
 --R          3628800          4               4
---R                     Type: UnivariatePuiseuxSeries(Expression Integer,a,pi/4)
+--R                   Type: UnivariatePuiseuxSeries(Expression(Integer),a,%pi/4)
 --E 4
 
 )clear all
@@ -105,7 +105,7 @@ f := series(1/(1-x),x = 0)
 --R
 --R                 2    3    4    5    6    7    8    9    10      11
 --R   (1)  1 + x + x  + x  + x  + x  + x  + x  + x  + x  + x   + O(x  )
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 5
 
 --S 6 of 9
@@ -119,7 +119,7 @@ g := log(f)
 --R   + 
 --R        12
 --R     O(x  )
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 6
 
 --S 7 of 9
@@ -128,7 +128,7 @@ exp(g)
 --R
 --R                 2    3    4    5    6    7    8    9    10      11
 --R   (3)  1 + x + x  + x  + x  + x  + x  + x  + x  + x  + x   + O(x  )
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 7
 
 )clear all
@@ -139,7 +139,7 @@ f := series(1/(1-x),x = 0)
 --R
 --R                 2    3    4    5    6    7    8    9    10      11
 --R   (1)  1 + x + x  + x  + x  + x  + x  + x  + x  + x  + x   + O(x  )
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 8
 
 --S 9 of 9
@@ -149,7 +149,7 @@ f ** 2
 --R   (2)
 --R              2     3     4     5     6     7     8      9      10      11
 --R   1 + 2x + 3x  + 4x  + 5x  + 6x  + 7x  + 8x  + 9x  + 10x  + 11x   + O(x  )
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 9
 )spool 
 )lisp (bye)
diff --git a/src/input/exsum.input.pamphlet b/src/input/exsum.input.pamphlet
index 3e893fd..c47b5a8 100644
--- a/src/input/exsum.input.pamphlet
+++ b/src/input/exsum.input.pamphlet
@@ -30,7 +30,7 @@ sum(k * x**k,k = 1..n)
 --R   (1)  -------------------------
 --R                2
 --R               x  - 2x + 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 1
 
 )clear all
@@ -42,7 +42,7 @@ limit( sum(1/(k * (k + 2)),k = 1..n) ,n = %plusInfinity)
 --R        3
 --R   (1)  -
 --R        4
---R               Type: Union(OrderedCompletion Fraction Polynomial Integer,...)
+--R            Type: Union(OrderedCompletion(Fraction(Polynomial(Integer))),...)
 --E 2
 
 )clear all
@@ -55,7 +55,7 @@ s := sum(k**2,k = a..b)
 --R        2b  + 3b  + b - 2a  + 3a  - a
 --R   (1)  -----------------------------
 --R                      6
---R                                            Type: Fraction Polynomial Integer
+--R                                          Type: Fraction(Polynomial(Integer))
 --E 3
 
 --S 4 of 13
@@ -63,7 +63,7 @@ eval(s,[a,b],[1,25])
 --R 
 --R
 --R   (2)  5525
---R                                            Type: Fraction Polynomial Integer
+--R                                          Type: Fraction(Polynomial(Integer))
 --E 4
 
 --S 5 of 13
@@ -89,7 +89,7 @@ sum(3*k**2/(c**2 + 1) + 12*k/d,k = (3*a)..(4*b))
 --R  /
 --R        2
 --R     (2c  + 2)d
---R                                 Type: Union(Fraction Polynomial Integer,...)
+--R                               Type: Union(Fraction(Polynomial(Integer)),...)
 --E 6
 
 )clear all
@@ -99,7 +99,7 @@ sum(3*k**2/(c**2 + 1) + 12*k/d,k = (3*a)..(4*b))
 --R 
 --R
 --R   (1)  [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15]
---R                                                   Type: List PositiveInteger
+--R                                                  Type: List(PositiveInteger)
 --E 7
 
 --S 8 of 13
@@ -127,7 +127,7 @@ reduce(+,[1.0/factorial(n) for n in 0..20])
 --R 
 --R
 --R   (1)  [25,36,49,64,81,100,121,144,169,196,225,256,289,324,361,400]
---R                                                   Type: List PositiveInteger
+--R                                                  Type: List(PositiveInteger)
 --E 10
 
 --S 11 of 13
@@ -148,7 +148,7 @@ sum(k**3,k = 1..n)
 --R        n  + 2n  + n
 --R   (1)  -------------
 --R              4
---R                                            Type: Fraction Polynomial Integer
+--R                                          Type: Fraction(Polynomial(Integer))
 --E 12
 
 --S 13 of 13
@@ -159,7 +159,7 @@ sum(k,k = 1..n) ** 2
 --R        n  + 2n  + n
 --R   (2)  -------------
 --R              4
---R                                            Type: Fraction Polynomial Integer
+--R                                          Type: Fraction(Polynomial(Integer))
 --E 13
 )spool 
 )lisp (bye)
diff --git a/src/input/farray.input.pamphlet b/src/input/farray.input.pamphlet
index 5cac2fe..0303b3c 100644
--- a/src/input/farray.input.pamphlet
+++ b/src/input/farray.input.pamphlet
@@ -26,7 +26,7 @@ flexibleArray [i for i in 1..6]
 --R 
 --R
 --R   (1)  [1,2,3,4,5,6]
---R                                          Type: FlexibleArray PositiveInteger
+--R                                         Type: FlexibleArray(PositiveInteger)
 --E 1
 
 --S 2 of 16
@@ -34,7 +34,7 @@ f : FARRAY INT := new(6,0)
 --R 
 --R
 --R   (2)  [0,0,0,0,0,0]
---R                                                  Type: FlexibleArray Integer
+--R                                                 Type: FlexibleArray(Integer)
 --E 2
 
 --S 3 of 16
@@ -42,7 +42,7 @@ for i in 1..6 repeat f.i := i; f
 --R 
 --R
 --R   (3)  [1,2,3,4,5,6]
---R                                                  Type: FlexibleArray Integer
+--R                                                 Type: FlexibleArray(Integer)
 --E 3
 
 --S 4 of 16
@@ -58,7 +58,7 @@ concat!(f,11)
 --R 
 --R
 --R   (5)  [1,2,3,4,5,6,11]
---R                                                  Type: FlexibleArray Integer
+--R                                                 Type: FlexibleArray(Integer)
 --E 5
 
 --S 6 of 16
@@ -74,7 +74,7 @@ physicalLength!(f,15)
 --R 
 --R
 --R   (7)  [1,2,3,4,5,6,11]
---R                                                  Type: FlexibleArray Integer
+--R                                                 Type: FlexibleArray(Integer)
 --E 7
 
 --S 8 of 16
@@ -82,7 +82,7 @@ concat!(f,f)
 --R 
 --R
 --R   (8)  [1,2,3,4,5,6,11,1,2,3,4,5,6,11]
---R                                                  Type: FlexibleArray Integer
+--R                                                 Type: FlexibleArray(Integer)
 --E 8
 
 --S 9 of 16
@@ -90,7 +90,7 @@ insert!(22,f,1)
 --R 
 --R
 --R   (9)  [22,1,2,3,4,5,6,11,1,2,3,4,5,6,11]
---R                                                  Type: FlexibleArray Integer
+--R                                                 Type: FlexibleArray(Integer)
 --E 9
 
 --S 10 of 16
@@ -98,7 +98,7 @@ g := f(10..)
 --R 
 --R
 --R   (10)  [2,3,4,5,6,11]
---R                                                  Type: FlexibleArray Integer
+--R                                                 Type: FlexibleArray(Integer)
 --E 10
 
 --S 11 of 16
@@ -106,7 +106,7 @@ insert!(g,f,1)
 --R 
 --R
 --R   (11)  [2,3,4,5,6,11,22,1,2,3,4,5,6,11,1,2,3,4,5,6,11]
---R                                                  Type: FlexibleArray Integer
+--R                                                 Type: FlexibleArray(Integer)
 --E 11
 
 --S 12 of 16
@@ -114,7 +114,7 @@ merge!(sort! f, sort! g)
 --R 
 --R
 --R   (12)  [1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,6,6,6,6,11,11,11,11,22]
---R                                                  Type: FlexibleArray Integer
+--R                                                 Type: FlexibleArray(Integer)
 --E 12
 
 --S 13 of 16
@@ -122,7 +122,7 @@ removeDuplicates! f
 --R 
 --R
 --R   (13)  [1,2,3,4,5,6,11,22]
---R                                                  Type: FlexibleArray Integer
+--R                                                 Type: FlexibleArray(Integer)
 --E 13
 
 --S 14 of 16
@@ -130,7 +130,7 @@ select!(i +-> even? i,f)
 --R 
 --R
 --R   (14)  [2,4,6,22]
---R                                                  Type: FlexibleArray Integer
+--R                                                 Type: FlexibleArray(Integer)
 --E 14
 
 --S 15 of 16
diff --git a/src/input/ffdemo.input.pamphlet b/src/input/ffdemo.input.pamphlet
index b491ebb..9d2877a 100644
--- a/src/input/ffdemo.input.pamphlet
+++ b/src/input/ffdemo.input.pamphlet
@@ -41,7 +41,7 @@ Construct a field
 F:=PrimeField p
 --R 
 --R
---R   (2)  PrimeField 4817
+--R   (2)  PrimeField(4817)
 --R                                                                 Type: Domain
 --E 2
 
@@ -63,7 +63,7 @@ a:=index(size()$F quo 3)$F
 --R 
 --R
 --R   (4)  1605
---R                                                        Type: PrimeField 4817
+--R                                                       Type: PrimeField(4817)
 --E 4
 
 --S 5 of 350
@@ -71,7 +71,7 @@ b:=index(size()$F quo 7)$F
 --R 
 --R
 --R   (5)  688
---R                                                        Type: PrimeField 4817
+--R                                                       Type: PrimeField(4817)
 --E 5
 
 \end{chunk}
@@ -82,7 +82,7 @@ a+b
 --R 
 --R
 --R   (6)  2293
---R                                                        Type: PrimeField 4817
+--R                                                       Type: PrimeField(4817)
 --E 6
 
 --S 7 of 350
@@ -90,7 +90,7 @@ a-b
 --R 
 --R
 --R   (7)  917
---R                                                        Type: PrimeField 4817
+--R                                                       Type: PrimeField(4817)
 --E 7
 
 --S 8 of 350
@@ -98,7 +98,7 @@ a*b
 --R 
 --R
 --R   (8)  1147
---R                                                        Type: PrimeField 4817
+--R                                                       Type: PrimeField(4817)
 --E 8
 
 --S 9 of 350
@@ -106,7 +106,7 @@ a/b
 --R 
 --R
 --R   (9)  3216
---R                                                        Type: PrimeField 4817
+--R                                                       Type: PrimeField(4817)
 --E 9
 
 --S 10 of 350
@@ -114,7 +114,7 @@ a**1234
 --R 
 --R
 --R   (10)  2068
---R                                                        Type: PrimeField 4817
+--R                                                       Type: PrimeField(4817)
 --E 10
 
 --S 11 of 350
@@ -122,7 +122,7 @@ a**(-1)
 --R 
 --R
 --R   (11)  2407
---R                                                        Type: PrimeField 4817
+--R                                                       Type: PrimeField(4817)
 --E 11
 
 --S 12 of 350
@@ -130,7 +130,7 @@ g := generator()$F
 --R 
 --R
 --R   (12)  1
---R                                                        Type: PrimeField 4817
+--R                                                       Type: PrimeField(4817)
 --E 12
 
 --S 13 of 350
@@ -138,7 +138,7 @@ g := generator()$F
 --R 
 --R
 --R   (13)  0
---R                                                        Type: PrimeField 4817
+--R                                                       Type: PrimeField(4817)
 --E 13
 
 \end{chunk}
@@ -157,7 +157,7 @@ g:=primitiveElement()$F
 --R 
 --R
 --R   (15)  3
---R                                                        Type: PrimeField 4817
+--R                                                       Type: PrimeField(4817)
 --E 15
 
 --S 16 of 350
@@ -176,7 +176,7 @@ g**% - a
 --R 
 --R
 --R   (17)  0
---R                                                        Type: PrimeField 4817
+--R                                                       Type: PrimeField(4817)
 --E 17
 
 \end{chunk}
@@ -215,7 +215,7 @@ normalElement()$F
 --R 
 --R
 --R   (21)  1
---R                                                        Type: PrimeField 4817
+--R                                                       Type: PrimeField(4817)
 --E 21
 
 --S 22 of 350
@@ -223,7 +223,7 @@ definingPolynomial()$F
 --R 
 --R
 --R   (22)  ? + 4816
---R                             Type: SparseUnivariatePolynomial PrimeField 4817
+--R                           Type: SparseUnivariatePolynomial(PrimeField(4817))
 --E 22
 
 --S 23 of 350
@@ -231,7 +231,7 @@ minimalPolynomial(a)
 --R 
 --R
 --R   (23)  ? + 3212
---R                             Type: SparseUnivariatePolynomial PrimeField 4817
+--R                           Type: SparseUnivariatePolynomial(PrimeField(4817))
 --E 23
 
 --S 24 of 350
@@ -239,7 +239,7 @@ Frobenius(a)
 --R 
 --R
 --R   (24)  1605
---R                                                        Type: PrimeField 4817
+--R                                                       Type: PrimeField(4817)
 --E 24
 
 --S 25 of 350
@@ -247,7 +247,7 @@ linearAssociatedOrder(a)
 --R 
 --R
 --R   (25)  ? + 4816
---R                             Type: SparseUnivariatePolynomial PrimeField 4817
+--R                           Type: SparseUnivariatePolynomial(PrimeField(4817))
 --E 25
 
 --S 26 of 350
@@ -255,7 +255,7 @@ linearAssociatedLog(a)
 --R 
 --R
 --R   (26)  1605
---R                             Type: SparseUnivariatePolynomial PrimeField 4817
+--R                           Type: SparseUnivariatePolynomial(PrimeField(4817))
 --E 26
 
 --S 27 of 350
@@ -287,7 +287,7 @@ p:=7
 P:=PrimeField p
 --R 
 --R
---R   (29)  PrimeField 7
+--R   (29)  PrimeField(7)
 --R                                                                 Type: Domain
 --E 29
 
@@ -311,7 +311,7 @@ f:=createIrreduciblePoly(d)$FFPOLY(P)
 --R
 --R          6
 --R   (31)  ?  + 2
---R                                Type: SparseUnivariatePolynomial PrimeField 7
+--R                              Type: SparseUnivariatePolynomial(PrimeField(7))
 --E 31
 
 \end{chunk}
@@ -321,7 +321,7 @@ Construct the field
 F:=FFP(P,f)
 --R 
 --R
---R   (32)  FiniteFieldExtensionByPolynomial(PrimeField 7,?**6+2)
+--R   (32)  FiniteFieldExtensionByPolynomial(PrimeField(7),?^6+2)
 --R                                                                 Type: Domain
 --E 32
 
@@ -345,7 +345,7 @@ a:=index(size()$F quo 3)$F
 --R
 --R            5      4      3      2
 --R   (34)  2%A  + 2%A  + 2%A  + 2%A  + 2%A + 2
---R                  Type: FiniteFieldExtensionByPolynomial(PrimeField 7,?**6+2)
+--R                  Type: FiniteFieldExtensionByPolynomial(PrimeField(7),?^6+2)
 --E 34
 
 --S 35 of 350
@@ -354,7 +354,7 @@ b:=index(size()$F quo 7)$F
 --R
 --R           5
 --R   (35)  %A
---R                  Type: FiniteFieldExtensionByPolynomial(PrimeField 7,?**6+2)
+--R                  Type: FiniteFieldExtensionByPolynomial(PrimeField(7),?^6+2)
 --E 35
 
 \end{chunk}
@@ -366,7 +366,7 @@ a+b
 --R
 --R            5      4      3      2
 --R   (36)  3%A  + 2%A  + 2%A  + 2%A  + 2%A + 2
---R                  Type: FiniteFieldExtensionByPolynomial(PrimeField 7,?**6+2)
+--R                  Type: FiniteFieldExtensionByPolynomial(PrimeField(7),?^6+2)
 --E 36
 
 --S 37 of 350
@@ -375,7 +375,7 @@ a-b
 --R
 --R           5      4      3      2
 --R   (37)  %A  + 2%A  + 2%A  + 2%A  + 2%A + 2
---R                  Type: FiniteFieldExtensionByPolynomial(PrimeField 7,?**6+2)
+--R                  Type: FiniteFieldExtensionByPolynomial(PrimeField(7),?^6+2)
 --E 37
 
 --S 38 of 350
@@ -384,7 +384,7 @@ a*b
 --R
 --R            5      4      3      2
 --R   (38)  2%A  + 3%A  + 3%A  + 3%A  + 3%A + 3
---R                  Type: FiniteFieldExtensionByPolynomial(PrimeField 7,?**6+2)
+--R                  Type: FiniteFieldExtensionByPolynomial(PrimeField(7),?^6+2)
 --E 38
 
 --S 39 of 350
@@ -393,7 +393,7 @@ a/b
 --R
 --R            5      4      3      2
 --R   (39)  6%A  + 6%A  + 6%A  + 6%A  + 6%A + 2
---R                  Type: FiniteFieldExtensionByPolynomial(PrimeField 7,?**6+2)
+--R                  Type: FiniteFieldExtensionByPolynomial(PrimeField(7),?^6+2)
 --E 39
 
 --S 40 of 350
@@ -402,7 +402,7 @@ a**1234
 --R
 --R            5     4      3
 --R   (40)  5%A  + %A  + 3%A  + 3%A + 4
---R                  Type: FiniteFieldExtensionByPolynomial(PrimeField 7,?**6+2)
+--R                  Type: FiniteFieldExtensionByPolynomial(PrimeField(7),?^6+2)
 --E 40
 
 --S 41 of 350
@@ -410,7 +410,7 @@ a**(-1)
 --R 
 --R
 --R   (41)  %A + 6
---R                  Type: FiniteFieldExtensionByPolynomial(PrimeField 7,?**6+2)
+--R                  Type: FiniteFieldExtensionByPolynomial(PrimeField(7),?^6+2)
 --E 41
 
 --S 42 of 350
@@ -418,7 +418,7 @@ g := generator()$F
 --R 
 --R
 --R   (42)  %A
---R                  Type: FiniteFieldExtensionByPolynomial(PrimeField 7,?**6+2)
+--R                  Type: FiniteFieldExtensionByPolynomial(PrimeField(7),?^6+2)
 --E 42
 
 --S 43 of 350
@@ -426,7 +426,7 @@ g := generator()$F
 --R 
 --R
 --R   (43)  0
---R                  Type: FiniteFieldExtensionByPolynomial(PrimeField 7,?**6+2)
+--R                  Type: FiniteFieldExtensionByPolynomial(PrimeField(7),?^6+2)
 --E 43
 
 \end{chunk}
@@ -445,7 +445,7 @@ g:=primitiveElement()$F
 --R 
 --R
 --R   (45)  %A + 1
---R                  Type: FiniteFieldExtensionByPolynomial(PrimeField 7,?**6+2)
+--R                  Type: FiniteFieldExtensionByPolynomial(PrimeField(7),?^6+2)
 --E 45
 
 --S 46 of 350
@@ -464,7 +464,7 @@ g**% - a
 --R 
 --R
 --R   (47)  0
---R                  Type: FiniteFieldExtensionByPolynomial(PrimeField 7,?**6+2)
+--R                  Type: FiniteFieldExtensionByPolynomial(PrimeField(7),?^6+2)
 --E 47
 
 \end{chunk}
@@ -504,7 +504,7 @@ normalElement()$F
 --R
 --R            5      4      3      2
 --R   (51)  5%A  + 3%A  + 3%A  + 5%A  + %A + 5
---R                  Type: FiniteFieldExtensionByPolynomial(PrimeField 7,?**6+2)
+--R                  Type: FiniteFieldExtensionByPolynomial(PrimeField(7),?^6+2)
 --E 51
 
 --S 52 of 350
@@ -513,7 +513,7 @@ definingPolynomial()$F
 --R
 --R          6
 --R   (52)  ?  + 2
---R                                Type: SparseUnivariatePolynomial PrimeField 7
+--R                              Type: SparseUnivariatePolynomial(PrimeField(7))
 --E 52
 
 --S 53 of 350
@@ -522,7 +522,7 @@ minimalPolynomial(a)
 --R
 --R          6     5     4     3     2
 --R   (53)  ?  + 2?  + 5?  + 2?  + 5?  + 2? + 5
---R                                Type: SparseUnivariatePolynomial PrimeField 7
+--R                              Type: SparseUnivariatePolynomial(PrimeField(7))
 --E 53
 
 --S 54 of 350
@@ -531,7 +531,7 @@ Frobenius(a)
 --R
 --R            5      4      3     2
 --R   (54)  6%A  + 4%A  + 5%A  + %A  + 3%A + 2
---R                  Type: FiniteFieldExtensionByPolynomial(PrimeField 7,?**6+2)
+--R                  Type: FiniteFieldExtensionByPolynomial(PrimeField(7),?^6+2)
 --E 54
 
 --S 55 of 350
@@ -540,7 +540,7 @@ linearAssociatedOrder(a)
 --R
 --R          6
 --R   (55)  ?  + 6
---R                                Type: SparseUnivariatePolynomial PrimeField 7
+--R                              Type: SparseUnivariatePolynomial(PrimeField(7))
 --E 55
 
 --S 56 of 350
@@ -549,7 +549,7 @@ linearAssociatedLog(a)
 --R
 --R           5     4     3     2
 --R   (56)  2?  + 3?  + 3?  + 3?  + 2
---R                                Type: SparseUnivariatePolynomial PrimeField 7
+--R                              Type: SparseUnivariatePolynomial(PrimeField(7))
 --E 56
 
 --S 57 of 350
@@ -585,7 +585,7 @@ f:=createNormalPoly(d)$FFPOLY(P)
 --R
 --R          6     5
 --R   (58)  ?  + 6?  + 2? + 4
---R                                Type: SparseUnivariatePolynomial PrimeField 7
+--R                              Type: SparseUnivariatePolynomial(PrimeField(7))
 --E 58
 
 \end{chunk}
@@ -596,7 +596,7 @@ F:=FFNBP(P,f)
 --R 
 --R
 --R   (59)
---R   FiniteFieldNormalBasisExtensionByPolynomial(PrimeField 7,?**6+6*?**5+2*?+4)
+--R   FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(7),?^6+6*?^5+2*?+4)
 --R                                                                 Type: Domain
 --E 59
 
@@ -621,7 +621,7 @@ a:=index(size()$F quo 3)$F
 --R             5       4       3       2
 --R            q       q       q       q       q
 --R   (61)  2%B   + 2%B   + 2%B   + 2%B   + 2%B  + 2%B
---RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField 7,?**6+6*?**5+2*?+4)
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(7),?^6+6*?^5+2*?+4)
 --E 61
 
 --S 62 of 350
@@ -631,7 +631,7 @@ b:=index(size()$F quo 7)$F
 --R            5
 --R           q
 --R   (62)  %B
---RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField 7,?**6+6*?**5+2*?+4)
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(7),?^6+6*?^5+2*?+4)
 --E 62
 
 \end{chunk}
@@ -644,7 +644,7 @@ a+b
 --R             5       4       3       2
 --R            q       q       q       q       q
 --R   (63)  3%B   + 2%B   + 2%B   + 2%B   + 2%B  + 2%B
---RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField 7,?**6+6*?**5+2*?+4)
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(7),?^6+6*?^5+2*?+4)
 --E 63
 
 --S 64 of 350
@@ -654,7 +654,7 @@ a-b
 --R            5       4       3       2
 --R           q       q       q       q       q
 --R   (64)  %B   + 2%B   + 2%B   + 2%B   + 2%B  + 2%B
---RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField 7,?**6+6*?**5+2*?+4)
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(7),?^6+6*?^5+2*?+4)
 --E 64
 
 --S 65 of 350
@@ -664,7 +664,7 @@ a*b
 --R             5
 --R            q
 --R   (65)  2%B
---RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField 7,?**6+6*?**5+2*?+4)
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(7),?^6+6*?^5+2*?+4)
 --E 65
 
 --S 66 of 350
@@ -674,7 +674,7 @@ a/b
 --R             4       3       2
 --R            q       q       q      q
 --R   (66)  3%B   + 2%B   + 4%B   + %B  + 3%B
---RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField 7,?**6+6*?**5+2*?+4)
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(7),?^6+6*?^5+2*?+4)
 --E 66
 
 --S 67 of 350
@@ -684,7 +684,7 @@ a**1234
 --R             5       4       3       2
 --R            q       q       q       q       q
 --R   (67)  2%B   + 2%B   + 2%B   + 2%B   + 2%B  + 2%B
---RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField 7,?**6+6*?**5+2*?+4)
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(7),?^6+6*?^5+2*?+4)
 --E 67
 
 --S 68 of 350
@@ -694,7 +694,7 @@ a**(-1)
 --R             5       4       3       2
 --R            q       q       q       q       q
 --R   (68)  4%B   + 4%B   + 4%B   + 4%B   + 4%B  + 4%B
---RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField 7,?**6+6*?**5+2*?+4)
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(7),?^6+6*?^5+2*?+4)
 --E 68
 
 --S 69 of 350
@@ -702,7 +702,7 @@ g := generator()$F
 --R 
 --R
 --R   (69)  %B
---RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField 7,?**6+6*?**5+2*?+4)
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(7),?^6+6*?^5+2*?+4)
 --E 69
 
 --S 70 of 350
@@ -710,7 +710,7 @@ g := generator()$F
 --R 
 --R
 --R   (70)  0
---RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField 7,?**6+6*?**5+2*?+4)
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(7),?^6+6*?^5+2*?+4)
 --E 70
 
 \end{chunk}
@@ -731,7 +731,7 @@ g:=primitiveElement()$F
 --R            2
 --R           q
 --R   (72)  %B   + %B
---RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField 7,?**6+6*?**5+2*?+4)
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(7),?^6+6*?^5+2*?+4)
 --E 72
 
 --S 73 of 350
@@ -750,7 +750,7 @@ g**% - a
 --R 
 --R
 --R   (74)  0
---RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField 7,?**6+6*?**5+2*?+4)
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(7),?^6+6*?^5+2*?+4)
 --E 74
 
 \end{chunk}
@@ -788,7 +788,7 @@ normalElement()$F
 --R 
 --R
 --R   (78)  %B
---RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField 7,?**6+6*?**5+2*?+4)
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(7),?^6+6*?^5+2*?+4)
 --E 78
 
 --S 79 of 350
@@ -797,7 +797,7 @@ definingPolynomial()$F
 --R
 --R          6     5
 --R   (79)  ?  + 6?  + 2? + 4
---R                                Type: SparseUnivariatePolynomial PrimeField 7
+--R                              Type: SparseUnivariatePolynomial(PrimeField(7))
 --E 79
 
 --S 80 of 350
@@ -805,7 +805,7 @@ minimalPolynomial(a)
 --R 
 --R
 --R   (80)  ? + 5
---R                                Type: SparseUnivariatePolynomial PrimeField 7
+--R                              Type: SparseUnivariatePolynomial(PrimeField(7))
 --E 80
 
 --S 81 of 350
@@ -815,7 +815,7 @@ Frobenius(a)
 --R             5       4       3       2
 --R            q       q       q       q       q
 --R   (81)  2%B   + 2%B   + 2%B   + 2%B   + 2%B  + 2%B
---RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField 7,?**6+6*?**5+2*?+4)
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(7),?^6+6*?^5+2*?+4)
 --E 81
 
 --S 82 of 350
@@ -823,7 +823,7 @@ linearAssociatedOrder(a)
 --R 
 --R
 --R   (82)  ? + 6
---R                                Type: SparseUnivariatePolynomial PrimeField 7
+--R                              Type: SparseUnivariatePolynomial(PrimeField(7))
 --E 82
 
 --S 83 of 350
@@ -832,7 +832,7 @@ linearAssociatedLog(a)
 --R
 --R           5     4     3     2
 --R   (83)  2?  + 2?  + 2?  + 2?  + 2? + 2
---R                                Type: SparseUnivariatePolynomial PrimeField 7
+--R                              Type: SparseUnivariatePolynomial(PrimeField(7))
 --E 83
 
 --S 84 of 350
@@ -887,7 +887,7 @@ p:=5
 P:=PrimeField p
 --R 
 --R
---R   (86)  PrimeField 5
+--R   (86)  PrimeField(5)
 --R                                                                 Type: Domain
 --E 86
 
@@ -911,7 +911,7 @@ f:=createPrimitivePoly(d)$FFPOLY(P)
 --R
 --R          4    2
 --R   (88)  ?  + ?  + 2? + 2
---R                                Type: SparseUnivariatePolynomial PrimeField 5
+--R                              Type: SparseUnivariatePolynomial(PrimeField(5))
 --E 88
 
 \end{chunk}
@@ -922,7 +922,7 @@ F:=FFCGP(P,f)
 --R 
 --R
 --R   (89)
---R   FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField 5,?**4+?*?+2*?+2)
+--R   FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(5),?^4+?^2+2*?+2)
 --R                                                                 Type: Domain
 --E 89
 
@@ -946,7 +946,7 @@ a:=index(size()$F quo 3)$F
 --R
 --R           207
 --R   (91)  %C
---RType: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField 5,?**4+?*?+2*?+2)
+--RType: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(5),?^4+?^2+2*?+2)
 --E 91
 
 --S 92 of 350
@@ -955,7 +955,7 @@ b:=index(size()$F quo 7)$F
 --R
 --R           88
 --R   (92)  %C
---RType: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField 5,?**4+?*?+2*?+2)
+--RType: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(5),?^4+?^2+2*?+2)
 --E 92
 
 \end{chunk}
@@ -967,7 +967,7 @@ a+b
 --R
 --R           70
 --R   (93)  %C
---RType: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField 5,?**4+?*?+2*?+2)
+--RType: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(5),?^4+?^2+2*?+2)
 --E 93
 
 --S 94 of 350
@@ -976,7 +976,7 @@ a-b
 --R
 --R           237
 --R   (94)  %C
---RType: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField 5,?**4+?*?+2*?+2)
+--RType: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(5),?^4+?^2+2*?+2)
 --E 94
 
 --S 95 of 350
@@ -985,7 +985,7 @@ a*b
 --R
 --R           295
 --R   (95)  %C
---RType: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField 5,?**4+?*?+2*?+2)
+--RType: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(5),?^4+?^2+2*?+2)
 --E 95
 
 --S 96 of 350
@@ -994,7 +994,7 @@ a/b
 --R
 --R           119
 --R   (96)  %C
---RType: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField 5,?**4+?*?+2*?+2)
+--RType: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(5),?^4+?^2+2*?+2)
 --E 96
 
 --S 97 of 350
@@ -1003,7 +1003,7 @@ a**1234
 --R
 --R           222
 --R   (97)  %C
---RType: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField 5,?**4+?*?+2*?+2)
+--RType: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(5),?^4+?^2+2*?+2)
 --E 97
 
 --S 98 of 350
@@ -1012,7 +1012,7 @@ a**(-1)
 --R
 --R           417
 --R   (98)  %C
---RType: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField 5,?**4+?*?+2*?+2)
+--RType: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(5),?^4+?^2+2*?+2)
 --E 98
 
 --S 99 of 350
@@ -1021,7 +1021,7 @@ g := generator()$F
 --R
 --R           1
 --R   (99)  %C
---RType: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField 5,?**4+?*?+2*?+2)
+--RType: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(5),?^4+?^2+2*?+2)
 --E 99
 
 --S 100 of 350
@@ -1029,7 +1029,7 @@ g := generator()$F
 --R 
 --R
 --R   (100)  0
---RType: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField 5,?**4+?*?+2*?+2)
+--RType: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(5),?^4+?^2+2*?+2)
 --E 100
 
 \end{chunk}
@@ -1049,7 +1049,7 @@ g:=primitiveElement()$F
 --R
 --R            1
 --R   (102)  %C
---RType: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField 5,?**4+?*?+2*?+2)
+--RType: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(5),?^4+?^2+2*?+2)
 --E 102
 
 --S 103 of 350
@@ -1068,7 +1068,7 @@ g**% - a
 --R 
 --R
 --R   (104)  0
---RType: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField 5,?**4+?*?+2*?+2)
+--RType: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(5),?^4+?^2+2*?+2)
 --E 104
 
 \end{chunk}
@@ -1107,7 +1107,7 @@ normalElement()$F
 --R
 --R            3
 --R   (108)  %C
---RType: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField 5,?**4+?*?+2*?+2)
+--RType: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(5),?^4+?^2+2*?+2)
 --E 108
 
 --S 109 of 350
@@ -1116,7 +1116,7 @@ definingPolynomial()$F
 --R
 --R           4    2
 --R   (109)  ?  + ?  + 2? + 2
---R                                Type: SparseUnivariatePolynomial PrimeField 5
+--R                              Type: SparseUnivariatePolynomial(PrimeField(5))
 --E 109
 
 --S 110 of 350
@@ -1125,7 +1125,7 @@ minimalPolynomial(a)
 --R
 --R           4    3    2
 --R   (110)  ?  + ?  + ?  + 3? + 3
---R                                Type: SparseUnivariatePolynomial PrimeField 5
+--R                              Type: SparseUnivariatePolynomial(PrimeField(5))
 --E 110
 
 --S 111 of 350
@@ -1134,7 +1134,7 @@ Frobenius(a)
 --R
 --R            411
 --R   (111)  %C
---RType: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField 5,?**4+?*?+2*?+2)
+--RType: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(5),?^4+?^2+2*?+2)
 --E 111
 
 --S 112 of 350
@@ -1143,7 +1143,7 @@ linearAssociatedOrder(a)
 --R
 --R           4
 --R   (112)  ?  + 4
---R                                Type: SparseUnivariatePolynomial PrimeField 5
+--R                              Type: SparseUnivariatePolynomial(PrimeField(5))
 --E 112
 
 --S 113 of 350
@@ -1152,7 +1152,7 @@ linearAssociatedLog(a)
 --R
 --R            3
 --R   (113)  3?  + 4? + 4
---R                                Type: SparseUnivariatePolynomial PrimeField 5
+--R                              Type: SparseUnivariatePolynomial(PrimeField(5))
 --E 113
 
 --S 114 of 350
@@ -1192,7 +1192,7 @@ p:=3
 P:=PrimeField p
 --R 
 --R
---R   (116)  PrimeField 3
+--R   (116)  PrimeField(3)
 --R                                                                 Type: Domain
 --E 116
 
@@ -1224,14 +1224,14 @@ f1:=createIrreduciblePoly(d1)$FFPOLY(P)
 --R
 --R           2
 --R   (119)  ?  + 1
---R                                Type: SparseUnivariatePolynomial PrimeField 3
+--R                              Type: SparseUnivariatePolynomial(PrimeField(3))
 --E 119
 
 --S 120 of 350
 F1:=FFP(P,f1)
 --R 
 --R
---R   (120)  FiniteFieldExtensionByPolynomial(PrimeField 3,?*?+1)
+--R   (120)  FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1)
 --R                                                                 Type: Domain
 --E 120
 
@@ -1244,7 +1244,7 @@ f2:=createIrreduciblePoly(d2)$FFPOLY(F1)
 --R
 --R           3
 --R   (121)  ?  + ? + %D
---IType: SparseUnivariatePolynomial FiniteFieldExtensionByPolynomial(...
+--RType: SparseUnivariatePolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1))
 --E 121
 
 \end{chunk}
@@ -1255,8 +1255,8 @@ F:=FFP(F1,f2)
 --R 
 --R
 --R   (122)
---I  FiniteFieldExtensionByPolynomial(FiniteFieldExtensionByPolynomial(...
---R  3,?*?+1),?**3+?+D)
+--R  FiniteFieldExtensionByPolynomial(FiniteFieldExtensionByPolynomial(PrimeField(
+--R  3),?^2+1),?^3+?+%D)
 --R                                                                 Type: Domain
 --E 122
 
@@ -1280,7 +1280,7 @@ a:=index(size()$F quo 3)$F
 --R
 --R               2
 --R   (124)  %D %E
---IType: FiniteFieldExtensionByPolynomial(FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1),?^3+?+%D)
 --E 124
 
 --S 125 of 350
@@ -1289,7 +1289,7 @@ b:=index(size()$F quo 7)$F
 --R
 --R            2
 --R   (125)  %E  + 2%E + %D + 2
---IType: FiniteFieldExtensionByPolynomial(FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1),?^3+?+%D)
 --E 125
 
 \end{chunk}
@@ -1301,7 +1301,7 @@ a+b
 --R
 --R                    2
 --R   (126)  (%D + 1)%E  + 2%E + %D + 2
---IType: FiniteFieldExtensionByPolynomial(FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1),?^3+?+%D)
 --E 126
 
 --S 127 of 350
@@ -1310,7 +1310,7 @@ a-b
 --R
 --R                    2
 --R   (127)  (%D + 2)%E  + %E + 2%D + 1
---IType: FiniteFieldExtensionByPolynomial(FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1),?^3+?+%D)
 --E 127
 
 --S 128 of 350
@@ -1319,7 +1319,7 @@ a*b
 --R
 --R                    2
 --R   (128)  (%D + 2)%E  + (%D + 1)%E + 2
---IType: FiniteFieldExtensionByPolynomial(FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1),?^3+?+%D)
 --E 128
 
 --S 129 of 350
@@ -1328,7 +1328,7 @@ a/b
 --R
 --R                2
 --R   (129)  2%D %E  + 2%D + 2
---IType: FiniteFieldExtensionByPolynomial(FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1),?^3+?+%D)
 --E 129
 
 --S 130 of 350
@@ -1337,7 +1337,7 @@ a**1234
 --R
 --R             2
 --R   (130)  2%E  + %D %E + 2
---IType: FiniteFieldExtensionByPolynomial(FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1),?^3+?+%D)
 --E 130
 
 --S 131 of 350
@@ -1346,7 +1346,7 @@ a**(-1)
 --R
 --R               2
 --R   (131)  %D %E  + %E + %D
---IType: FiniteFieldExtensionByPolynomial(FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1),?^3+?+%D)
 --E 131
 
 --S 132 of 350
@@ -1354,7 +1354,7 @@ g := generator()$F
 --R 
 --R
 --R   (132)  %E
---IType: FiniteFieldExtensionByPolynomial(FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1),?^3+?+%D)
 --E 132
 
 --S 133 of 350
@@ -1362,7 +1362,7 @@ g := generator()$F
 --R 
 --R
 --R   (133)  0
---IType: FiniteFieldExtensionByPolynomial(FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1),?^3+?+%D)
 --E 133
 
 \end{chunk}
@@ -1381,7 +1381,7 @@ g:=primitiveElement()$F
 --R 
 --R
 --R   (135)  %E + 1
---IType: FiniteFieldExtensionByPolynomial(FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1),?^3+?+%D)
 --E 135
 
 --S 136 of 350
@@ -1400,7 +1400,7 @@ g**% - a
 --R 
 --R
 --R   (137)  0
---IType: FiniteFieldExtensionByPolynomial(FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1),?^3+?+%D)
 --E 137
 
 \end{chunk}
@@ -1439,7 +1439,7 @@ normalElement()$F
 --R
 --R            2
 --R   (141)  %E  + %E
---IType: FiniteFieldExtensionByPolynomial(FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1),?^3+?+%D)
 --E 141
 
 --S 142 of 350
@@ -1448,7 +1448,7 @@ definingPolynomial()$F
 --R
 --R           3
 --R   (142)  ?  + ? + %D
---IType: SparseUnivariatePolynomial FiniteFieldExtensionByPolynomial(...
+--RType: SparseUnivariatePolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1))
 --E 142
 
 --S 143 of 350
@@ -1457,7 +1457,7 @@ minimalPolynomial(a)
 --R
 --R           3        2
 --R   (143)  ?  + 2%D ?  + 2? + 2%D
---IType: SparseUnivariatePolynomial FiniteFieldExtensionByPolynomial(...
+--RType: SparseUnivariatePolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1))
 --E 143
 
 --S 144 of 350
@@ -1466,7 +1466,7 @@ Frobenius(a)
 --R
 --R               2
 --R   (144)  %D %E  + 2%E + 2%D
---IType: FiniteFieldExtensionByPolynomial(FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1),?^3+?+%D)
 --E 144
 
 --S 145 of 350
@@ -1475,7 +1475,7 @@ linearAssociatedOrder(a)
 --R
 --R           3
 --R   (145)  ?  + 2
---IType: SparseUnivariatePolynomial FiniteFieldExtensionByPolynomial(...
+--RType: SparseUnivariatePolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1))
 --E 145
 
 --S 146 of 350
@@ -1484,7 +1484,7 @@ linearAssociatedLog(a)
 --R
 --R                    2
 --R   (146)  (2%D + 2)?  + (2%D + 1)?
---IType: SparseUnivariatePolynomial FiniteFieldExtensionByPolynomial(...
+--RType: SparseUnivariatePolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1))
 --E 146
 
 --S 147 of 350
@@ -1513,14 +1513,14 @@ f1:=createNormalPoly(d1)$FFPOLY(P)
 --R
 --R           2
 --R   (148)  ?  + 2? + 2
---R                                Type: SparseUnivariatePolynomial PrimeField 3
+--R                              Type: SparseUnivariatePolynomial(PrimeField(3))
 --E 148
 
 --S 149 of 350
 F1:=FFNBP(P,f1)
 --R 
 --R
---R   (149)  FiniteFieldNormalBasisExtensionByPolynomial(PrimeField 3,?*?+2*?+2)
+--R   (149)  FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2)
 --R                                                                 Type: Domain
 --E 149
 
@@ -1533,7 +1533,7 @@ f2:=createIrreduciblePoly(d2)$FFPOLY(F1)
 --R
 --R           3
 --R   (150)  ?  + ? + %F
---IType: SparseUnivariatePolynomial FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: SparseUnivariatePolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2))
 --E 150
 
 \end{chunk}
@@ -1545,7 +1545,7 @@ F:=FFP(F1,f2)
 --R
 --R   (151)
 --R  FiniteFieldExtensionByPolynomial(FiniteFieldNormalBasisExtensionByPolynomial(
---R  PrimeField 3,?*?+2*?+2),?**3+?+F)
+--R  PrimeField(3),?^2+2*?+2),?^3+?+%F)
 --R                                                                 Type: Domain
 --E 151 of 350
 
@@ -1569,7 +1569,7 @@ a:=index(size()$F quo 3)$F
 --R
 --R            q  2
 --R   (153)  %F %G
---IType: FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2),?^3+?+%F)
 --E 153
 
 --S 154 of 350
@@ -1578,7 +1578,7 @@ b:=index(size()$F quo 7)$F
 --R
 --R               2              q
 --R   (154)  %F %G  + 2%F %G + %F  + 2%F
---IType: FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2),?^3+?+%F)
 --E 154
 
 \end{chunk}
@@ -1590,7 +1590,7 @@ a+b
 --R
 --R            2              q
 --R   (155)  %G  + 2%F %G + %F  + 2%F
---IType: FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2),?^3+?+%F)
 --E 155
 
 --S 156 of 350
@@ -1599,7 +1599,7 @@ a-b
 --R
 --R             q         2              q
 --R   (156)  (%F  + 2%F)%G  + %F %G + 2%F  + %F
---IType: FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2),?^3+?+%F)
 --E 156
 
 --S 157 of 350
@@ -1608,7 +1608,7 @@ a*b
 --R
 --R            q  2      q
 --R   (157)  %F %G  + 2%F %G + 2%F
---IType: FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2),?^3+?+%F)
 --E 157
 
 --S 158 of 350
@@ -1617,7 +1617,7 @@ a/b
 --R
 --R            2
 --R   (158)  %G  + %G
---IType: FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2),?^3+?+%F)
 --E 158
 
 --S 159 of 350
@@ -1626,7 +1626,7 @@ a**1234
 --R
 --R            q  2             q
 --R   (159)  %F %G  + %F %G + %F  + 2%F
---IType: FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2),?^3+?+%F)
 --E 159
 
 --S 160 of 350
@@ -1635,7 +1635,7 @@ a**(-1)
 --R
 --R            q  2          q
 --R   (160)  %F %G  + %G + %F
---IType: FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2),?^3+?+%F)
 --E 160
 
 --S 161 of 350
@@ -1643,7 +1643,7 @@ g := generator()$F
 --R 
 --R
 --R   (161)  %G
---IType: FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2),?^3+?+%F)
 --E 161
 
 --S 162 of 350
@@ -1651,7 +1651,7 @@ g := generator()$F
 --R 
 --R
 --R   (162)  0
---IType: FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2),?^3+?+%F)
 --E 162
 
 \end{chunk}
@@ -1670,7 +1670,7 @@ g:=primitiveElement()$F
 --R 
 --R
 --R   (164)  %G
---IType: FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2),?^3+?+%F)
 --E 164
 
 --S 165 of 350
@@ -1689,7 +1689,7 @@ g**% - a
 --R 
 --R
 --R   (166)  0
---IType: FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2),?^3+?+%F)
 --E 166
 
 \end{chunk}
@@ -1729,7 +1729,7 @@ normalElement()$F
 --R
 --R            2
 --R   (170)  %G
---IType: FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2),?^3+?+%F)
 --E 170
 
 --S 171 of 350
@@ -1738,7 +1738,7 @@ definingPolynomial()$F
 --R
 --R           3
 --R   (171)  ?  + ? + %F
---IType: SparseUnivariatePolynomial ...
+--RType: SparseUnivariatePolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2))
 --E 171
 
 --S 172 of 350
@@ -1747,7 +1747,7 @@ minimalPolynomial(a)
 --R
 --R           3      q 2       q             q
 --R   (172)  ?  + 2%F ?  + (2%F  + %F)? + 2%F
---IType: SparseUnivariatePolynomial ...
+--RType: SparseUnivariatePolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2))
 --E 172
 
 --S 173 of 350
@@ -1756,7 +1756,7 @@ Frobenius(a)
 --R
 --R            q  2               q
 --R   (173)  %F %G  + 2%F %G + 2%F
---IType: FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2),?^3+?+%F)
 --E 173
 
 --S 174 of 350
@@ -1765,7 +1765,7 @@ linearAssociatedOrder(a)
 --R
 --R           3      q
 --R   (174)  ?  + 2%F  + 2%F
---IType: SparseUnivariatePolynomial ...
+--RType: SparseUnivariatePolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2))
 --E 174
 
 --S 175 of 350
@@ -1774,7 +1774,7 @@ linearAssociatedLog(a)
 --R
 --R            q
 --R   (175)  %F
---IType: SparseUnivariatePolynomial ...
+--RType: SparseUnivariatePolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2))
 --E 175
 
 --S 176 of 350
@@ -1805,14 +1805,14 @@ f1:=createPrimitivePoly(d1)$FFPOLY(P)
 --R
 --R           2
 --R   (177)  ?  + ? + 2
---R                                Type: SparseUnivariatePolynomial PrimeField 3
+--R                              Type: SparseUnivariatePolynomial(PrimeField(3))
 --E 177
 
 --S 178 of 350
 F1:=FFCGP(P,f1)
 --R 
 --R
---R   (178)  FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField 3,?*?+?+2)
+--R   (178)  FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2)
 --R                                                                 Type: Domain
 --E 178
 
@@ -1825,7 +1825,7 @@ f2:=createIrreduciblePoly(d2)$FFPOLY(F1)
 --R
 --R           3         1
 --R   (179)  ?  + ? + %H
---IType: SparseUnivariatePolynomial ...
+--RType: SparseUnivariatePolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2))
 --E 179
 
 \end{chunk}
@@ -1837,7 +1837,7 @@ F:=FFP(F1,f2)
 --R
 --R   (180)
 --R  FiniteFieldExtensionByPolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(
---R  PrimeField 3,?*?+?+2),?**3+?+H**1)
+--R  PrimeField(3),?^2+?+2),?^3+?+%H^1)
 --R                                                                 Type: Domain
 --E 180
 
@@ -1861,7 +1861,7 @@ a:=index(size()$F quo 3)$F
 --R
 --R            2  2
 --R   (182)  %H %I
---IType: FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2),?^3+?+%H^1)
 --E 182
 
 --S 183 of 350
@@ -1870,7 +1870,7 @@ b:=index(size()$F quo 7)$F
 --R
 --R            2     1       4
 --R   (183)  %I  + %H %I + %H
---IType: FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2),?^3+?+%H^1)
 --E 183
 
 \end{chunk}
@@ -1882,7 +1882,7 @@ a+b
 --R
 --R            3  2     1       4
 --R   (184)  %H %I  + %H %I + %H
---IType: FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2),?^3+?+%H^1)
 --E 184
 
 --S 185 of 350
@@ -1891,7 +1891,7 @@ a-b
 --R
 --R            5  2     5
 --R   (185)  %H %I  + %H %I + 1
---IType: FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2),?^3+?+%H^1)
 --E 185
 
 --S 186 of 350
@@ -1900,7 +1900,7 @@ a*b
 --R
 --R            2  2     3
 --R   (186)  %H %I  + %H %I + 1
---IType: FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2),?^3+?+%H^1)
 --E 186
 
 --S 187 of 350
@@ -1909,7 +1909,7 @@ a/b
 --R
 --R            1  2     6
 --R   (187)  %H %I  + %H %I
---IType: FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2),?^3+?+%H^1)
 --E 187
 
 --S 188 of 350
@@ -1918,7 +1918,7 @@ a**1234
 --R
 --R            5  2     7
 --R   (188)  %H %I  + %H %I + 1
---IType: FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2),?^3+?+%H^1)
 --E 188
 
 --S 189 of 350
@@ -1927,7 +1927,7 @@ a**(-1)
 --R
 --R            4  2     1       4
 --R   (189)  %H %I  + %H %I + %H
---IType: FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2),?^3+?+%H^1)
 --E 189
 
 --S 190 of 350
@@ -1935,7 +1935,7 @@ g := generator()$F
 --R 
 --R
 --R   (190)  %I
---IType: FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2),?^3+?+%H^1)
 --E 190
 
 --S 191 of 350
@@ -1943,7 +1943,7 @@ g := generator()$F
 --R 
 --R
 --R   (191)  0
---IType: FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2),?^3+?+%H^1)
 --E 191
 
 \end{chunk}
@@ -1962,7 +1962,7 @@ g:=primitiveElement()$F
 --R 
 --R
 --R   (193)  %I
---IType: FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2),?^3+?+%H^1)
 --E 193
 
 --S 194 of 350
@@ -1981,7 +1981,7 @@ g**% - a
 --R 
 --R
 --R   (195)  0
---IType: FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2),?^3+?+%H^1)
 --E 195
 
 \end{chunk}
@@ -2020,7 +2020,7 @@ normalElement()$F
 --R
 --R            2
 --R   (199)  %I
---IType: FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2),?^3+?+%H^1)
 --E 199
 
 --S 200 of 350
@@ -2029,7 +2029,7 @@ definingPolynomial()$F
 --R
 --R           3         1
 --R   (200)  ?  + ? + %H
---IType: SparseUnivariatePolynomial ...
+--RType: SparseUnivariatePolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2))
 --E 200
 
 --S 201 of 350
@@ -2038,7 +2038,7 @@ minimalPolynomial(a)
 --R
 --R           3     6 2     4      4
 --R   (201)  ?  + %H ?  + %H ? + %H
---IType: SparseUnivariatePolynomial ...
+--RType: SparseUnivariatePolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2))
 --E 201
 
 --S 202 of 350
@@ -2047,7 +2047,7 @@ Frobenius(a)
 --R
 --R            2  2          6
 --R   (202)  %H %I  + %I + %H
---IType: FiniteFieldExtensionByPolynomial(...
+--RType: FiniteFieldExtensionByPolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2),?^3+?+%H^1)
 --E 202
 
 --S 203 of 350
@@ -2056,7 +2056,7 @@ linearAssociatedOrder(a)
 --R
 --R           3     4
 --R   (203)  ?  + %H
---IType: SparseUnivariatePolynomial ...
+--RType: SparseUnivariatePolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2))
 --E 203
 
 --S 204 of 350
@@ -2065,7 +2065,7 @@ linearAssociatedLog(a)
 --R
 --R            2
 --R   (204)  %H
---IType: SparseUnivariatePolynomial ...
+--RType: SparseUnivariatePolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2))
 --E 204
 
 --S 205 of 350
@@ -2095,14 +2095,14 @@ f1:=createIrreduciblePoly(d1)$FFPOLY(P)
 --R
 --R           2
 --R   (206)  ?  + 1
---R                                Type: SparseUnivariatePolynomial PrimeField 3
+--R                              Type: SparseUnivariatePolynomial(PrimeField(3))
 --E 206
 
 --S 207 of 350
 F1:=FFP(P,f1)
 --R 
 --R
---R   (207)  FiniteFieldExtensionByPolynomial(PrimeField 3,?*?+1)
+--R   (207)  FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1)
 --R                                                                 Type: Domain
 --E 207
 
@@ -2115,7 +2115,7 @@ f2:=createNormalPoly(d2)$FFPOLY(F1)
 --R
 --R           3     2
 --R   (208)  ?  + 2?  + 1
---IType: SparseUnivariatePolynomial FiniteFieldExtensionByPolynomial(...
+--RType: SparseUnivariatePolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1))
 --E 208
 
 \end{chunk}
@@ -2127,7 +2127,7 @@ F:=FFNBP(F1,f2)
 --R
 --R   (209)
 --R  FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldExtensionByPolynomial(
---R  PrimeField 3,?*?+1),?**3+2*?*?+1)
+--R  PrimeField(3),?^2+1),?^3+2*?^2+1)
 --R                                                                 Type: Domain
 --E 209
 
@@ -2152,7 +2152,7 @@ a:=index(size()$F quo 3)$F
 --R                2
 --R               q
 --R   (211)  %D %J
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1),?^3+2*?^2+1)
 --E 211
 
 --S 212 of 350
@@ -2162,7 +2162,7 @@ b:=index(size()$F quo 7)$F
 --R             2
 --R            q       q
 --R   (212)  %J   + 2%J  + (%D + 2)%J
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1),?^3+2*?^2+1)
 --E 212
 
 \end{chunk}
@@ -2175,7 +2175,7 @@ a+b
 --R                     2
 --R                    q       q
 --R   (213)  (%D + 1)%J   + 2%J  + (%D + 2)%J
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1),?^3+2*?^2+1)
 --E 213
 
 --S 214 of 350
@@ -2185,7 +2185,7 @@ a-b
 --R                     2
 --R                    q      q
 --R   (214)  (%D + 2)%J   + %J  + (2%D + 1)%J
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1),?^3+2*?^2+1)
 --E 214
 
 --S 215 of 350
@@ -2195,7 +2195,7 @@ a*b
 --R                     2
 --R                    q         q
 --R   (215)  (%D + 2)%J   + %D %J  + (2%D + 1)%J
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1),?^3+2*?^2+1)
 --E 215
 
 --S 216 of 350
@@ -2205,7 +2205,7 @@ a/b
 --R              2
 --R             q         q
 --R   (216)  2%J   + %D %J  + 2%J
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1),?^3+2*?^2+1)
 --E 216
 
 --S 217 of 350
@@ -2214,7 +2214,7 @@ a**1234
 --R
 --R            q
 --R   (217)  %J  + 2%J
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1),?^3+2*?^2+1)
 --E 217
 
 --S 218 of 350
@@ -2223,7 +2223,7 @@ a**(-1)
 --R
 --R                q
 --R   (218)  2%D %J  + %D %J
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1),?^3+2*?^2+1)
 --E 218
 
 --S 219 of 350
@@ -2231,7 +2231,7 @@ g := generator()$F
 --R 
 --R
 --R   (219)  %J
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1),?^3+2*?^2+1)
 --E 219
 
 --S 220 of 350
@@ -2239,7 +2239,7 @@ g := generator()$F
 --R 
 --R
 --R   (220)  0
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1),?^3+2*?^2+1)
 --E 220
 
 \end{chunk}
@@ -2259,7 +2259,7 @@ g:=primitiveElement()$F
 --R
 --R                    q
 --R   (222)  (%D + 1)%J  + 2%J
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1),?^3+2*?^2+1)
 --E 222
 
 --S 223 of 350
@@ -2278,7 +2278,7 @@ g**% - a
 --R 
 --R
 --R   (224)  0
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1),?^3+2*?^2+1)
 --E 224
 
 \end{chunk}
@@ -2316,7 +2316,7 @@ normalElement()$F
 --R 
 --R
 --R   (228)  %J
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1),?^3+2*?^2+1)
 --E 228
 
 --S 229 of 350
@@ -2325,7 +2325,7 @@ definingPolynomial()$F
 --R
 --R           3     2
 --R   (229)  ?  + 2?  + 1
---IType: SparseUnivariatePolynomial FiniteFieldExtensionByPolynomial(...
+--RType: SparseUnivariatePolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1))
 --E 229
 
 --S 230 of 350
@@ -2334,7 +2334,7 @@ minimalPolynomial(a)
 --R
 --R           3        2
 --R   (230)  ?  + 2%D ?  + 2%D
---IType: SparseUnivariatePolynomial FiniteFieldExtensionByPolynomial(...
+--RType: SparseUnivariatePolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1))
 --E 230
 
 --S 231 of 350
@@ -2342,7 +2342,7 @@ Frobenius(a)
 --R 
 --R
 --R   (231)  %D %J
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1),?^3+2*?^2+1)
 --E 231
 
 --S 232 of 350
@@ -2351,7 +2351,7 @@ linearAssociatedOrder(a)
 --R
 --R           3
 --R   (232)  ?  + 2
---IType: SparseUnivariatePolynomial ...
+--RType: SparseUnivariatePolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1))
 --E 232
 
 --S 233 of 350
@@ -2360,7 +2360,7 @@ linearAssociatedLog(a)
 --R
 --R              2
 --R   (233)  %D ?
---IType: SparseUnivariatePolynomial ...
+--RType: SparseUnivariatePolynomial(FiniteFieldExtensionByPolynomial(PrimeField(3),?^2+1))
 --E 233
 
 --S 234 of 350
@@ -2394,14 +2394,14 @@ f1:=createNormalPoly(d1)$FFPOLY(P)
 --R
 --R           2
 --R   (235)  ?  + 2? + 2
---R                                Type: SparseUnivariatePolynomial PrimeField 3
+--R                              Type: SparseUnivariatePolynomial(PrimeField(3))
 --E 235
 
 --S 236 of 350
 F1:=FFNBP(P,f1)
 --R 
 --R
---R   (236)  FiniteFieldNormalBasisExtensionByPolynomial(PrimeField 3,?*?+2*?+2)
+--R   (236)  FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2)
 --R                                                                 Type: Domain
 --E 236
 
@@ -2414,7 +2414,7 @@ f2:=createNormalPoly(d2)$FFPOLY(F1)
 --R
 --R           3       q        2     q
 --R   (237)  ?  + (2%F  + 2%F)?  + %F  + %F
---IType: SparseUnivariatePolynomial ...
+--RType: SparseUnivariatePolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2))
 --E 237
 
 \end{chunk}
@@ -2426,7 +2426,7 @@ F:=FFNBP(F1,f2)
 --R
 --R   (238)
 --R  FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldNormalBasisExtensionBy
---R  Polynomial(PrimeField 3,?*?+2*?+2),?**3+(2*F**q+2*F)*?*?+F**q+F)
+--R  Polynomial(PrimeField(3),?^2+2*?+2),?^3+(2*%F^q+2*%F)*?^2+(%F^q+%F))
 --R                                                                 Type: Domain
 --E 238
 
@@ -2451,7 +2451,7 @@ a:=index(size()$F quo 3)$F
 --R                2
 --R            q  q
 --R   (240)  %F %K
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2),?^3+(2*%F^q+2*%F)*?^2+(%F^q+%F))
 --E 240
 
 --S 241 of 350
@@ -2461,7 +2461,7 @@ b:=index(size()$F quo 7)$F
 --R                2
 --R               q          q      q
 --R   (241)  %F %K   + 2%F %K  + (%F  + 2%F)%K
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2),?^3+(2*%F^q+2*%F)*?^2+(%F^q+%F))
 --E 241
 
 \end{chunk}
@@ -2474,7 +2474,7 @@ a+b
 --R             2
 --R            q          q      q
 --R   (242)  %K   + 2%F %K  + (%F  + 2%F)%K
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2),?^3+(2*%F^q+2*%F)*?^2+(%F^q+%F))
 --E 242
 
 --S 243 of 350
@@ -2484,7 +2484,7 @@ a-b
 --R                        2
 --R             q         q         q       q
 --R   (243)  (%F  + 2%F)%K   + %F %K  + (2%F  + %F)%K
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2),?^3+(2*%F^q+2*%F)*?^2+(%F^q+%F))
 --E 243
 
 --S 244 of 350
@@ -2494,7 +2494,7 @@ a*b
 --R                2
 --R            q  q        q         q      q
 --R   (244)  %F %K   + (2%F  + 2%F)%K  + 2%F %K
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2),?^3+(2*%F^q+2*%F)*?^2+(%F^q+%F))
 --E 244
 
 --S 245 of 350
@@ -2504,7 +2504,7 @@ a/b
 --R                         2
 --R              q         q       q         q       q
 --R   (245)  (2%F  + 2%F)%K   + (%F  + 2%F)%K  + (2%F  + 2%F)%K
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2),?^3+(2*%F^q+2*%F)*?^2+(%F^q+%F))
 --E 245
 
 --S 246 of 350
@@ -2513,7 +2513,7 @@ a**1234
 --R
 --R             q         q       q
 --R   (246)  (%F  + 2%F)%K  + (2%F  + %F)%K
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2),?^3+(2*%F^q+2*%F)*?^2+(%F^q+%F))
 --E 246
 
 --S 247 of 350
@@ -2522,7 +2522,7 @@ a**(-1)
 --R
 --R                q
 --R   (247)  2%F %K  + %F %K
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2),?^3+(2*%F^q+2*%F)*?^2+(%F^q+%F))
 --E 247
 
 --S 248 of 350
@@ -2530,7 +2530,7 @@ g := generator()$F
 --R 
 --R
 --R   (248)  %K
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2),?^3+(2*%F^q+2*%F)*?^2+(%F^q+%F))
 --E 248
 
 --S 249 of 350
@@ -2538,7 +2538,7 @@ g := generator()$F
 --R 
 --R
 --R   (249)  0
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2),?^3+(2*%F^q+2*%F)*?^2+(%F^q+%F))
 --E 249
 
 \end{chunk}
@@ -2558,7 +2558,7 @@ g:=primitiveElement()$F
 --R
 --R               q     q
 --R   (251)  %F %K  + %F %K
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2),?^3+(2*%F^q+2*%F)*?^2+(%F^q+%F))
 --E 251
 
 --S 252 of 350
@@ -2577,7 +2577,7 @@ g**% - a
 --R 
 --R
 --R   (253)  0
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2),?^3+(2*%F^q+2*%F)*?^2+(%F^q+%F))
 --E 253
 
 \end{chunk}
@@ -2616,7 +2616,7 @@ normalElement()$F
 --R 
 --R
 --R   (257)  %K
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2),?^3+(2*%F^q+2*%F)*?^2+(%F^q+%F))
 --E 257
 
 --S 258 of 350
@@ -2625,7 +2625,7 @@ definingPolynomial()$F
 --R
 --R           3       q        2     q
 --R   (258)  ?  + (2%F  + 2%F)?  + %F  + %F
---IType: SparseUnivariatePolynomial ...
+--RType: SparseUnivariatePolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2))
 --E 258
 
 --S 259 of 350
@@ -2634,7 +2634,7 @@ minimalPolynomial(a)
 --R
 --R           3      q 2
 --R   (259)  ?  + 2%F ?  + %F
---IType: SparseUnivariatePolynomial ...
+--RType: SparseUnivariatePolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2))
 --E 259
 
 --S 260 of 350
@@ -2643,7 +2643,7 @@ Frobenius(a)
 --R
 --R            q
 --R   (260)  %F %K
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2),?^3+(2*%F^q+2*%F)*?^2+(%F^q+%F))
 --E 260
 
 --S 261 of 350
@@ -2652,7 +2652,7 @@ linearAssociatedOrder(a)
 --R
 --R           3      q
 --R   (261)  ?  + 2%F  + 2%F
---IType: SparseUnivariatePolynomial ...
+--RType: SparseUnivariatePolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2))
 --E 261
 
 --S 262 of 350
@@ -2661,7 +2661,7 @@ linearAssociatedLog(a)
 --R
 --R            q 2
 --R   (262)  %F ?
---IType: SparseUnivariatePolynomial ...
+--RType: SparseUnivariatePolynomial(FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^2+2*?+2))
 --E 262
 
 --S 263 of 350
@@ -2695,14 +2695,14 @@ f1:=createPrimitivePoly(d1)$FFPOLY(P)
 --R
 --R           2
 --R   (264)  ?  + ? + 2
---R                                Type: SparseUnivariatePolynomial PrimeField 3
+--R                              Type: SparseUnivariatePolynomial(PrimeField(3))
 --E 264
 
 --S 265 of 350
 F1:=FFCGP(P,f1)
 --R 
 --R
---R   (265)  FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField 3,?*?+?+2)
+--R   (265)  FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2)
 --R                                                                 Type: Domain
 --E 265
 
@@ -2715,7 +2715,7 @@ f2:=createNormalPoly(d2)$FFPOLY(F1)
 --R
 --R           3     4 2
 --R   (266)  ?  + %H ?  + 1
---IType: SparseUnivariatePolynomial ...
+--RType: SparseUnivariatePolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2))
 --E 266
 
 \end{chunk}
@@ -2727,7 +2727,7 @@ F:=FFNBP(F1,f2)
 --R
 --R   (267)
 --R  FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldCyclicGroupExtensionBy
---R  Polynomial(PrimeField 3,?*?+?+2),?**3+H**4*?*?+1)
+--R  Polynomial(PrimeField(3),?^2+?+2),?^3+%H^4*?^2+(1))
 --R                                                                 Type: Domain
 --E 267
 
@@ -2752,7 +2752,7 @@ a:=index(size()$F quo 3)$F
 --R                2
 --R            2  q
 --R   (269)  %H %L
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2),?^3+%H^4*?^2+(1))
 --E 269
 
 --S 270 of 350
@@ -2762,7 +2762,7 @@ b:=index(size()$F quo 7)$F
 --R             2
 --R            q      1  q     4
 --R   (270)  %L   + %H %L  + %H %L
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2),?^3+%H^4*?^2+(1))
 --E 270
 
 \end{chunk}
@@ -2775,7 +2775,7 @@ a+b
 --R                2
 --R            3  q      1  q     4
 --R   (271)  %H %L   + %H %L  + %H %L
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2),?^3+%H^4*?^2+(1))
 --E 271
 
 --S 272 of 350
@@ -2785,7 +2785,7 @@ a-b
 --R                2
 --R            5  q      5  q
 --R   (272)  %H %L   + %H %L  + %L
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2),?^3+%H^4*?^2+(1))
 --E 272
 
 --S 273 of 350
@@ -2795,7 +2795,7 @@ a*b
 --R                2
 --R            7  q      q     6
 --R   (273)  %H %L   + %L  + %H %L
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2),?^3+%H^4*?^2+(1))
 --E 273
 
 --S 274 of 350
@@ -2805,7 +2805,7 @@ a/b
 --R                2
 --R            2  q      5  q     6
 --R   (274)  %H %L   + %H %L  + %H %L
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2),?^3+%H^4*?^2+(1))
 --E 274
 
 --S 275 of 350
@@ -2814,7 +2814,7 @@ a**1234
 --R
 --R            q     4
 --R   (275)  %L  + %H %L
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2),?^3+%H^4*?^2+(1))
 --E 275
 
 --S 276 of 350
@@ -2823,7 +2823,7 @@ a**(-1)
 --R
 --R            6  q     2
 --R   (276)  %H %L  + %H %L
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2),?^3+%H^4*?^2+(1))
 --E 276
 
 --S 277 of 350
@@ -2831,7 +2831,7 @@ g := generator()$F
 --R 
 --R
 --R   (277)  %L
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2),?^3+%H^4*?^2+(1))
 --E 277
 
 --S 278 of 350
@@ -2839,7 +2839,7 @@ g := generator()$F
 --R 
 --R
 --R   (278)  0
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2),?^3+%H^4*?^2+(1))
 --E 278
 
 \end{chunk}
@@ -2859,7 +2859,7 @@ g:=primitiveElement()$F
 --R
 --R            1  q     2
 --R   (280)  %H %L  + %H %L
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2),?^3+%H^4*?^2+(1))
 --E 280
 
 --S 281 of 350
@@ -2878,7 +2878,7 @@ g**% - a
 --R 
 --R
 --R   (282)  0
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2),?^3+%H^4*?^2+(1))
 --E 282
 
 \end{chunk}
@@ -2916,7 +2916,7 @@ normalElement()$F
 --R 
 --R
 --R   (286)  %L
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2),?^3+%H^4*?^2+(1))
 --E 286
 
 --S 287 of 350
@@ -2925,7 +2925,7 @@ definingPolynomial()$F
 --R
 --R           3     4 2
 --R   (287)  ?  + %H ?  + 1
---IType: SparseUnivariatePolynomial ...
+--RType: SparseUnivariatePolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2))
 --E 287
 
 --S 288 of 350
@@ -2934,7 +2934,7 @@ minimalPolynomial(a)
 --R
 --R           3     6 2     6
 --R   (288)  ?  + %H ?  + %H
---IType: SparseUnivariatePolynomial ...
+--RType: SparseUnivariatePolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2))
 --E 288
 
 --S 289 of 350
@@ -2943,7 +2943,7 @@ Frobenius(a)
 --R
 --R            2
 --R   (289)  %H %L
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2),?^3+%H^4*?^2+(1))
 --E 289
 
 --S 290 of 350
@@ -2952,7 +2952,7 @@ linearAssociatedOrder(a)
 --R
 --R           3     4
 --R   (290)  ?  + %H
---IType: SparseUnivariatePolynomial ...
+--RType: SparseUnivariatePolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2))
 --E 290 of 350
 
 --S 291 of 350
@@ -2961,7 +2961,7 @@ linearAssociatedLog(a)
 --R
 --R            2 2
 --R   (291)  %H ?
---IType: SparseUnivariatePolynomial ...
+--RType: SparseUnivariatePolynomial(FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^2+?+2))
 --E 291
 
 --S 292 of 350
@@ -2992,7 +2992,7 @@ End of common finite field demonstration
 P3:= PF 3
 --R 
 --R
---R   (293)  PrimeField 3
+--R   (293)  PrimeField(3)
 --R                                                                 Type: Domain
 --E 293
 
@@ -3005,7 +3005,7 @@ fi:=createIrreduciblePoly(6)$FFPOLY(P3)
 --R
 --R           6
 --R   (294)  ?  + ? + 2
---R                                Type: SparseUnivariatePolynomial PrimeField 3
+--R                              Type: SparseUnivariatePolynomial(PrimeField(3))
 --E 294
 
 --S 295 of 350
@@ -3014,7 +3014,7 @@ fn:=createNormalPoly(6)$FFPOLY(P3)
 --R
 --R           6     5    3
 --R   (295)  ?  + 2?  + ?  + 1
---R                                Type: SparseUnivariatePolynomial PrimeField 3
+--R                              Type: SparseUnivariatePolynomial(PrimeField(3))
 --E 295
 
 --S 296 of 350
@@ -3023,7 +3023,7 @@ fp:=createPrimitivePoly(3)$FFPOLY(P3)
 --R
 --R           3
 --R   (296)  ?  + 2? + 1
---R                                Type: SparseUnivariatePolynomial PrimeField 3
+--R                              Type: SparseUnivariatePolynomial(PrimeField(3))
 --E 296
 
 \end{chunk}
@@ -3033,7 +3033,7 @@ fp:=createPrimitivePoly(3)$FFPOLY(P3)
 F:=FFP(P3,fn)
 --R 
 --R
---R   (297)  FiniteFieldExtensionByPolynomial(PrimeField 3,?**6+2*?**5+?**3+1)
+--R   (297)  FiniteFieldExtensionByPolynomial(PrimeField(3),?^6+2*?^5+?^3+1)
 --R                                                                 Type: Domain
 --E 297
 
@@ -3042,7 +3042,7 @@ N:=FFNBP(P3,fn)
 --R 
 --R
 --R   (298)
---R   FiniteFieldNormalBasisExtensionByPolynomial(PrimeField 3,?**6+2*?**5+?**3+1)
+--R   FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^6+2*?^5+?^3+1)
 --R                                                                 Type: Domain
 --E 298
 
@@ -3052,7 +3052,7 @@ a:=index(size()$F quo 3)$F
 --R
 --R            5
 --R   (299)  %M
---R      Type: FiniteFieldExtensionByPolynomial(PrimeField 3,?**6+2*?**5+?**3+1)
+--R        Type: FiniteFieldExtensionByPolynomial(PrimeField(3),?^6+2*?^5+?^3+1)
 --E 299
 
 --S 300 of 350
@@ -3061,7 +3061,7 @@ b:=index(size()$F quo 7)$F
 --R
 --R            4      2
 --R   (300)  %M  + 2%M  + %M + 2
---R      Type: FiniteFieldExtensionByPolynomial(PrimeField 3,?**6+2*?**5+?**3+1)
+--R        Type: FiniteFieldExtensionByPolynomial(PrimeField(3),?^6+2*?^5+?^3+1)
 --E 300
 
 --S 301 of 350
@@ -3071,7 +3071,7 @@ an:=coerce(a)$FFHOM(F,P3,N)
 --R             4      3
 --R            q      q      q
 --R   (301)  %N   + %N   + %N  + 2%N
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^6+2*?^5+?^3+1)
 --E 301
 
 --S 302 of 350
@@ -3081,7 +3081,7 @@ bn:=coerce(b)$FFHOM(F,P3,N)
 --R             3      2
 --R            q      q       q
 --R   (302)  %N   + %N   + 2%N  + 2%N
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^6+2*?^5+?^3+1)
 --E 302
 
 --S 303 of 350
@@ -3091,7 +3091,7 @@ cn := an*bn
 --R              5       4      3
 --R             q       q      q      q
 --R   (303)  2%N   + 2%N   + %N   + %N
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^6+2*?^5+?^3+1)
 --E 303
 
 --S 304 of 350
@@ -3100,7 +3100,7 @@ coerce(cn)$FFHOM(F,P3,N)
 --R
 --R            5      3      2
 --R   (304)  %M  + 2%M  + 2%M
---R      Type: FiniteFieldExtensionByPolynomial(PrimeField 3,?**6+2*?**5+?**3+1)
+--R        Type: FiniteFieldExtensionByPolynomial(PrimeField(3),?^6+2*?^5+?^3+1)
 --E 304
 
 \end{chunk}
@@ -3112,7 +3112,7 @@ c:=a*b
 --R
 --R            5      3      2
 --R   (305)  %M  + 2%M  + 2%M
---R      Type: FiniteFieldExtensionByPolynomial(PrimeField 3,?**6+2*?**5+?**3+1)
+--R        Type: FiniteFieldExtensionByPolynomial(PrimeField(3),?^6+2*?^5+?^3+1)
 --E 305
 
 \end{chunk}
@@ -3122,7 +3122,7 @@ c:=a*b
 F:=FFP(P3,fi)
 --R 
 --R
---R   (306)  FiniteFieldExtensionByPolynomial(PrimeField 3,?**6+?+2)
+--R   (306)  FiniteFieldExtensionByPolynomial(PrimeField(3),?^6+?+2)
 --R                                                                 Type: Domain
 --E 306
 
@@ -3131,7 +3131,7 @@ N:=FFNBP(P3,fn)
 --R 
 --R
 --R   (307)
---R   FiniteFieldNormalBasisExtensionByPolynomial(PrimeField 3,?**6+2*?**5+?**3+1)
+--R   FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^6+2*?^5+?^3+1)
 --R                                                                 Type: Domain
 --E 307
 
@@ -3141,7 +3141,7 @@ a:=index(size()$F quo 3)$F
 --R
 --R            5
 --R   (308)  %O
---R                Type: FiniteFieldExtensionByPolynomial(PrimeField 3,?**6+?+2)
+--R                Type: FiniteFieldExtensionByPolynomial(PrimeField(3),?^6+?+2)
 --E 308
 
 --S 309 of 350
@@ -3150,7 +3150,7 @@ b:=index(size()$F quo 7)$F
 --R
 --R            4      2
 --R   (309)  %O  + 2%O  + %O + 2
---R                Type: FiniteFieldExtensionByPolynomial(PrimeField 3,?**6+?+2)
+--R                Type: FiniteFieldExtensionByPolynomial(PrimeField(3),?^6+?+2)
 --E 309
 
 --S 310 of 350
@@ -3160,7 +3160,7 @@ an:=coerce(a)$FFHOM(F,P3,N)
 --R              5      4       3      2
 --R             q      q       q      q      q
 --R   (310)  2%N   + %N   + 2%N   + %N   + %N
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^6+2*?^5+?^3+1)
 --E 310
 
 --S 311 of 350
@@ -3170,7 +3170,7 @@ bn:=coerce(b)$FFHOM(F,P3,N)
 --R              3      2
 --R             q      q
 --R   (311)  2%N   + %N
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^6+2*?^5+?^3+1)
 --E 311
 
 --S 312 of 350
@@ -3180,7 +3180,7 @@ cn := an*bn
 --R              5      4      3      2
 --R             q      q      q      q      q
 --R   (312)  2%N   + %N   + %N   + %N   + %N  + 2%N
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^6+2*?^5+?^3+1)
 --E 312
 
 --S 313 of 350
@@ -3189,7 +3189,7 @@ coerce(cn)$FFHOM(F,P3,N)
 --R
 --R             5      4     3     2
 --R   (313)  2%O  + 2%O  + %O  + %O  + %O + 1
---R                Type: FiniteFieldExtensionByPolynomial(PrimeField 3,?**6+?+2)
+--R                Type: FiniteFieldExtensionByPolynomial(PrimeField(3),?^6+?+2)
 --E 313
 
 \end{chunk}
@@ -3201,7 +3201,7 @@ c:=a*b
 --R
 --R             5      4     3     2
 --R   (314)  2%O  + 2%O  + %O  + %O  + %O + 1
---R                Type: FiniteFieldExtensionByPolynomial(PrimeField 3,?**6+?+2)
+--R                Type: FiniteFieldExtensionByPolynomial(PrimeField(3),?^6+?+2)
 --E 314
 
 \end{chunk}
@@ -3211,7 +3211,7 @@ c:=a*b
 C:=FFCGP(P3,fp)
 --R 
 --R
---R   (315)  FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField 3,?**3+2*?+1)
+--R   (315)  FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^3+2*?+1)
 --R                                                                 Type: Domain
 --E 315
 
@@ -3220,7 +3220,7 @@ N:=FFNBP(P3,fn)
 --R 
 --R
 --R   (316)
---R   FiniteFieldNormalBasisExtensionByPolynomial(PrimeField 3,?**6+2*?**5+?**3+1)
+--R   FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^6+2*?^5+?^3+1)
 --R                                                                 Type: Domain
 --E 316
 
@@ -3230,7 +3230,7 @@ a:=index(size()$C quo 3)$C
 --R
 --R            8
 --R   (317)  %P
---R   Type: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField 3,?**3+2*?+1)
+--R   Type: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^3+2*?+1)
 --E 317
 
 --S 318 of 350
@@ -3239,7 +3239,7 @@ b:=index(size()$C quo 7)$C
 --R
 --R            2
 --R   (318)  %P
---R   Type: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField 3,?**3+2*?+1)
+--R   Type: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^3+2*?+1)
 --E 318
 
 --S 319 of 350
@@ -3249,7 +3249,7 @@ an:=coerce(a)$FFHOM(C,P3,N)
 --R              4       3
 --R             q       q       q
 --R   (319)  2%N   + 2%N   + 2%N  + 2%N
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^6+2*?^5+?^3+1)
 --E 319
 
 --S 320 of 350
@@ -3259,7 +3259,7 @@ bn:=coerce(b)$FFHOM(C,P3,N)
 --R              5       2
 --R             q       q
 --R   (320)  2%N   + 2%N
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^6+2*?^5+?^3+1)
 --E 320
 
 --S 321 of 350
@@ -3269,7 +3269,7 @@ cn := an+bn
 --R              5       4       3       2
 --R             q       q       q       q       q
 --R   (321)  2%N   + 2%N   + 2%N   + 2%N   + 2%N  + 2%N
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--RType: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^6+2*?^5+?^3+1)
 --E 321
 
 --S 322 of 350
@@ -3278,7 +3278,7 @@ coerce(cn)$FFHOM(C,P3,N)
 --R
 --R            13
 --R   (322)  %P
---R   Type: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField 3,?**3+2*?+1)
+--R   Type: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^3+2*?+1)
 --E 322
 
 \end{chunk}
@@ -3290,7 +3290,7 @@ c:=a+b
 --R
 --R            13
 --R   (323)  %P
---R   Type: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField 3,?**3+2*?+1)
+--R   Type: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^3+2*?+1)
 --E 323
 
 \end{chunk}
@@ -3302,14 +3302,14 @@ f:=createPrimitiveNormalPoly(5)$FFPOLY(P3)
 --R
 --R           5     4
 --R   (324)  ?  + 2?  + 1
---R                                Type: SparseUnivariatePolynomial PrimeField 3
+--R                              Type: SparseUnivariatePolynomial(PrimeField(3))
 --E 324
 
 --S 325 of 350
 FP:=FFP(P3,f)
 --R 
 --R
---R   (325)  FiniteFieldExtensionByPolynomial(PrimeField 3,?**5+2*?**4+1)
+--R   (325)  FiniteFieldExtensionByPolynomial(PrimeField(3),?^5+2*?^4+1)
 --R                                                                 Type: Domain
 --E 325
 
@@ -3318,16 +3318,16 @@ Fc:=FFCGP(P3,f)  -- FC is a domain abbreviation
 --R 
 --R
 --R   (326)
---R   FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField 3,?**5+2*?**4+1)
+--R   FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^5+2*?^4+1)
 --R                                                                 Type: Domain
 --E 326
 
---S 328 of 350
+--S 327 of 350
 FN:=FFNBP(P3,f)
 --R 
 --R
 --R   (327)
---R   FiniteFieldNormalBasisExtensionByPolynomial(PrimeField 3,?**5+2*?**4+1)
+--R   FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^5+2*?^4+1)
 --R                                                                 Type: Domain
 --E 327
 
@@ -3337,7 +3337,7 @@ ap:=index(size()$FP quo 3)$FP
 --R
 --R            4
 --R   (328)  %Q
---R           Type: FiniteFieldExtensionByPolynomial(PrimeField 3,?**5+2*?**4+1)
+--R            Type: FiniteFieldExtensionByPolynomial(PrimeField(3),?^5+2*?^4+1)
 --E 328
 
 --S 329 of 350
@@ -3346,7 +3346,7 @@ ac:=coerce(ap)$FFHOM(Fc,P3,FP)
 --R
 --R            4
 --R   (329)  %R
---IType: FiniteFieldCyclicGroupExtensionByPolynomial(...
+--R Type: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^5+2*?^4+1)
 --E 329
 
 --S 330 of 350
@@ -3356,7 +3356,7 @@ an:=coerce(ap)$FFHOM(FN,P3,FP)
 --R              3       2
 --R             q       q       q
 --R   (330)  2%S   + 2%S   + 2%S  + %S
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--R Type: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^5+2*?^4+1)
 --E 330
 
 --S 331 of 350
@@ -3365,7 +3365,7 @@ bp:=index(size()$FP quo 7)$FP
 --R
 --R            3
 --R   (331)  %Q  + 2%Q + 1
---R           Type: FiniteFieldExtensionByPolynomial(PrimeField 3,?**5+2*?**4+1)
+--R            Type: FiniteFieldExtensionByPolynomial(PrimeField(3),?^5+2*?^4+1)
 --E 331
 
 --S 332 of 350
@@ -3374,7 +3374,7 @@ bc:=coerce(bp)$FFHOM(Fc,P3,FP)
 --R
 --R            133
 --R   (332)  %R
---IType: FiniteFieldCyclicGroupExtensionByPolynomial(...
+--R Type: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^5+2*?^4+1)
 --E 332
 
 --S 333 of 350
@@ -3384,7 +3384,7 @@ bn:=coerce(bp)$FFHOM(FN,P3,FP)
 --R             4      3      2
 --R            q      q      q       q
 --R   (333)  %S   + %S   + %S   + 2%S
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--R Type: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^5+2*?^4+1)
 --E 333
 
 \end{chunk}
@@ -3396,7 +3396,7 @@ ac+bc
 --R
 --R            187
 --R   (334)  %R
---IType: FiniteFieldCyclicGroupExtensionByPolynomial(...
+--R Type: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^5+2*?^4+1)
 --E 334
 
 --S 335 of 350
@@ -3406,7 +3406,7 @@ an*bn
 --R             4      2
 --R            q      q      q
 --R   (335)  %S   + %S   + %S  + 2%S
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--R Type: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^5+2*?^4+1)
 --E 335
 
 \end{chunk}
@@ -3419,7 +3419,7 @@ ap+bp
 --R
 --R            4     3
 --R   (336)  %Q  + %Q  + 2%Q + 1
---R           Type: FiniteFieldExtensionByPolynomial(PrimeField 3,?**5+2*?**4+1)
+--R            Type: FiniteFieldExtensionByPolynomial(PrimeField(3),?^5+2*?^4+1)
 --E 336
 
 --S 337 of 350
@@ -3429,7 +3429,7 @@ an+bn
 --R             4
 --R            q      q
 --R   (337)  %S   + %S  + %S
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--R Type: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^5+2*?^4+1)
 --E 337
 
 --S 338 of 350
@@ -3438,7 +3438,7 @@ ac+bc
 --R
 --R            187
 --R   (338)  %R
---IType: FiniteFieldCyclicGroupExtensionByPolynomial(...
+--R Type: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^5+2*?^4+1)
 --E 338
 
 \end{chunk}
@@ -3450,7 +3450,7 @@ ap*bp
 --R
 --R            4      2
 --R   (339)  %Q  + 2%Q  + 2%Q
---R           Type: FiniteFieldExtensionByPolynomial(PrimeField 3,?**5+2*?**4+1)
+--R            Type: FiniteFieldExtensionByPolynomial(PrimeField(3),?^5+2*?^4+1)
 --E 339
 
 --S 340 of 350
@@ -3460,7 +3460,7 @@ an*bn
 --R             4      2
 --R            q      q      q
 --R   (340)  %S   + %S   + %S  + 2%S
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--R Type: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^5+2*?^4+1)
 --E 340
 
 --S 341 of 350
@@ -3469,7 +3469,7 @@ ac*bc
 --R
 --R            137
 --R   (341)  %R
---IType: FiniteFieldCyclicGroupExtensionByPolynomial(...
+--R Type: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^5+2*?^4+1)
 --E 341
 
 \end{chunk}
@@ -3508,7 +3508,7 @@ ap**1234567
 --R
 --R             4     2
 --R   (345)  2%Q  + %Q  + %Q
---R           Type: FiniteFieldExtensionByPolynomial(PrimeField 3,?**5+2*?**4+1)
+--R            Type: FiniteFieldExtensionByPolynomial(PrimeField(3),?^5+2*?^4+1)
 --E 345
 
 --S 346 of 350
@@ -3518,7 +3518,7 @@ an**1234567
 --R              4       2
 --R             q       q       q
 --R   (346)  2%S   + 2%S   + 2%S  + %S
---IType: FiniteFieldNormalBasisExtensionByPolynomial(...
+--R Type: FiniteFieldNormalBasisExtensionByPolynomial(PrimeField(3),?^5+2*?^4+1)
 --E 346
 
 --S 347 of 350
@@ -3527,7 +3527,7 @@ ac**1234567
 --R
 --R            16
 --R   (347)  %R
---IType: FiniteFieldCyclicGroupExtensionByPolynomial(...
+--R Type: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^5+2*?^4+1)
 --E 347
 
 \end{chunk}
@@ -3539,7 +3539,7 @@ ap+bc
 --R
 --R            187
 --R   (348)  %R
---IType: FiniteFieldCyclicGroupExtensionByPolynomial(...
+--R Type: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^5+2*?^4+1)
 --E 348
 
 --S 349 of 350
@@ -3548,7 +3548,7 @@ an+bc
 --R
 --R            187
 --R   (349)  %R
---IType: FiniteFieldCyclicGroupExtensionByPolynomial(...
+--R Type: FiniteFieldCyclicGroupExtensionByPolynomial(PrimeField(3),?^5+2*?^4+1)
 --E 349
 
 --S 350 of 350
@@ -3557,7 +3557,7 @@ an+bp
 --R
 --R            4     3
 --R   (350)  %Q  + %Q  + 2%Q + 1
---R           Type: FiniteFieldExtensionByPolynomial(PrimeField 3,?**5+2*?**4+1)
+--R            Type: FiniteFieldExtensionByPolynomial(PrimeField(3),?^5+2*?^4+1)
 --E 350
 )spool 
 )lisp (bye)
diff --git a/src/input/fferr.input.pamphlet b/src/input/fferr.input.pamphlet
index c9d41f5..c4af44c 100644
--- a/src/input/fferr.input.pamphlet
+++ b/src/input/fferr.input.pamphlet
@@ -25,7 +25,7 @@
 pf := PF 3
 --R 
 --R
---R   (1)  PrimeField 3
+--R   (1)  PrimeField(3)
 --R                                                                 Type: Domain
 --E 1
 
@@ -35,7 +35,7 @@ createIrreduciblePoly(6)$FFPOLY(pf)
 --R
 --R         6
 --R   (2)  ?  + ? + 2
---R                                Type: SparseUnivariatePolynomial PrimeField 3
+--R                              Type: SparseUnivariatePolynomial(PrimeField(3))
 --E 2
 
 --S 3 of 7
@@ -44,7 +44,7 @@ createNormalPoly(6)$FFPOLY(pf)
 --R
 --R         6     5    3
 --R   (3)  ?  + 2?  + ?  + 1
---R                                Type: SparseUnivariatePolynomial PrimeField 3
+--R                              Type: SparseUnivariatePolynomial(PrimeField(3))
 --E 3
 
 --S 4 of 7
@@ -53,7 +53,7 @@ createPrimitivePoly(3)$FFPOLY(pf)
 --R
 --R         3
 --R   (4)  ?  + 2? + 1
---R                                Type: SparseUnivariatePolynomial PrimeField 3
+--R                              Type: SparseUnivariatePolynomial(PrimeField(3))
 --E 4
 
 --S 5 of 7
@@ -62,7 +62,7 @@ createIrreduciblePoly(3)$FFPOLY(pf)
 --R
 --R         3
 --R   (5)  ?  + 2? + 1
---R                                Type: SparseUnivariatePolynomial PrimeField 3
+--R                              Type: SparseUnivariatePolynomial(PrimeField(3))
 --E 5
 
 --S 6 of 7
@@ -71,7 +71,7 @@ createNormalPoly(3)$FFPOLY(pf)
 --R
 --R         3     2
 --R   (6)  ?  + 2?  + 1
---R                                Type: SparseUnivariatePolynomial PrimeField 3
+--R                              Type: SparseUnivariatePolynomial(PrimeField(3))
 --E 6
 
 --S 7 of 7
@@ -80,7 +80,7 @@ createPrimitivePoly(3)$FFPOLY(pf)
 --R
 --R         3
 --R   (7)  ?  + 2? + 1
---R                                Type: SparseUnivariatePolynomial PrimeField 3
+--R                              Type: SparseUnivariatePolynomial(PrimeField(3))
 --E 7
 )spool 
 )lisp (bye)
diff --git a/src/input/ffieldbug.input.pamphlet b/src/input/ffieldbug.input.pamphlet
index 844e2e8..e0d1e47 100644
--- a/src/input/ffieldbug.input.pamphlet
+++ b/src/input/ffieldbug.input.pamphlet
@@ -21,7 +21,7 @@
 gf2 := PrimeField 2
 --R 
 --R
---R   (1)  PrimeField 2
+--R   (1)  PrimeField(2)
 --R                                                                 Type: Domain
 --E 1
 
@@ -29,7 +29,7 @@ gf2 := PrimeField 2
 gf16 := FiniteFieldExtensionByPolynomial(gf2,x**4+x+1)
 --R 
 --R
---R   (2)  FiniteFieldExtensionByPolynomial(PrimeField 2,?**4+?+1)
+--R   (2)  FiniteFieldExtensionByPolynomial(PrimeField(2),?^4+?+1)
 --R                                                                 Type: Domain
 --E 2
 
@@ -38,7 +38,7 @@ a:=primitiveElement()$gf16
 --R 
 --R
 --R   (3)  %A
---R                Type: FiniteFieldExtensionByPolynomial(PrimeField 2,?**4+?+1)
+--R                Type: FiniteFieldExtensionByPolynomial(PrimeField(2),?^4+?+1)
 --E 3
 
 --S 4 of 29
@@ -47,7 +47,7 @@ p:POLY gf16:=a*x**3
 --R
 --R            3
 --R   (4)  %A x
---R     Type: Polynomial FiniteFieldExtensionByPolynomial(PrimeField 2,?**4+?+1)
+--R    Type: Polynomial(FiniteFieldExtensionByPolynomial(PrimeField(2),?^4+?+1))
 --E 4
 
 --S 5 of 29
@@ -56,7 +56,7 @@ q:POLY gf16:=a*x**2+1
 --R
 --R            2
 --R   (5)  %A x  + 1
---R     Type: Polynomial FiniteFieldExtensionByPolynomial(PrimeField 2,?**4+?+1)
+--R    Type: Polynomial(FiniteFieldExtensionByPolynomial(PrimeField(2),?^4+?+1))
 --E 5
 
 --S 6 of 29
@@ -77,7 +77,7 @@ p rem q
 gf2 := PrimeField 2
 --R 
 --R
---R   (1)  PrimeField 2
+--R   (1)  PrimeField(2)
 --R                                                                 Type: Domain
 --E 7
 
@@ -85,7 +85,7 @@ gf2 := PrimeField 2
 gf16:=FiniteFieldExtension(gf2,4)
 --R 
 --R
---R   (2)  FiniteFieldExtension(PrimeField 2,4)
+--R   (2)  FiniteFieldExtension(PrimeField(2),4)
 --R                                                                 Type: Domain
 --E 8
 
@@ -94,7 +94,7 @@ a:=primitiveElement()$gf16
 --R 
 --R
 --R   (3)  %A
---R                                   Type: FiniteFieldExtension(PrimeField 2,4)
+--R                                  Type: FiniteFieldExtension(PrimeField(2),4)
 --E 9
 
 --S 10 of 29
@@ -103,7 +103,7 @@ p:POLY gf16:=a*x**3
 --R
 --R            3
 --R   (4)  %A x
---R                        Type: Polynomial FiniteFieldExtension(PrimeField 2,4)
+--R                      Type: Polynomial(FiniteFieldExtension(PrimeField(2),4))
 --E 10
 
 --S 11 of 29
@@ -112,7 +112,7 @@ q:POLY gf16:=a*x**2+1
 --R
 --R            2
 --R   (5)  %A x  + 1
---R                        Type: Polynomial FiniteFieldExtension(PrimeField 2,4)
+--R                      Type: Polynomial(FiniteFieldExtension(PrimeField(2),4))
 --E 11
 
 --S 12 of 29
@@ -133,7 +133,7 @@ p rem q
 gf2 := PrimeField 2
 --R 
 --R
---R   (1)  PrimeField 2
+--R   (1)  PrimeField(2)
 --R                                                                 Type: Domain
 --E 13
 
@@ -159,7 +159,7 @@ p:POLY gf16:=a*x**3
 --R
 --R            3
 --R   (4)  %A x
---R                                            Type: Polynomial FiniteField(2,4)
+--R                                           Type: Polynomial(FiniteField(2,4))
 --E 16
 
 --S 17 of 29
@@ -168,7 +168,7 @@ q:POLY gf16:=a*x**2+1
 --R
 --R            2
 --R   (5)  %A x  + 1
---R                                            Type: Polynomial FiniteField(2,4)
+--R                                           Type: Polynomial(FiniteField(2,4))
 --E 17
 
 --S 18 of 29
@@ -206,7 +206,7 @@ FiniteFieldExtensionByPolynomial(PrimeField(2),?^4+?+1).
 gf2:=PrimeField 2
 --R 
 --R
---R   (1)  PrimeField 2
+--R   (1)  PrimeField(2)
 --R                                                                 Type: Domain
 --E 19
 
@@ -214,7 +214,7 @@ gf2:=PrimeField 2
 gf16:=FiniteFieldExtensionByPolynomial(gf2,x**4+x+1)
 --R 
 --R
---R   (2)  FiniteFieldExtensionByPolynomial(PrimeField 2,?**4+?+1)
+--R   (2)  FiniteFieldExtensionByPolynomial(PrimeField(2),?^4+?+1)
 --R                                                                 Type: Domain
 --E 20
 
@@ -223,8 +223,8 @@ P:=SUP gf16
 --R 
 --R
 --R   (3)
---R  SparseUnivariatePolynomial FiniteFieldExtensionByPolynomial(PrimeField 2,?**4
---R  +?+1)
+--R  SparseUnivariatePolynomial(FiniteFieldExtensionByPolynomial(PrimeField(2),?^4
+--R  +?+1))
 --R                                                                 Type: Domain
 --E 21
 
@@ -233,7 +233,7 @@ a:gf16:=primitiveElement()
 --R 
 --R
 --R   (4)  %A
---R                Type: FiniteFieldExtensionByPolynomial(PrimeField 2,?**4+?+1)
+--R                Type: FiniteFieldExtensionByPolynomial(PrimeField(2),?^4+?+1)
 --E 22
 
 --S 23 of 29
@@ -253,7 +253,7 @@ m:P:=monomial(1,1)
 --R 
 --R
 --R   (5)  ?
---RType: SparseUnivariatePolynomial FiniteFieldExtensionByPolynomial(PrimeField 2,?**4+?+1)
+--RType: SparseUnivariatePolynomial(FiniteFieldExtensionByPolynomial(PrimeField(2),?^4+?+1))
 --E 24
 
 --S 25 of 29
@@ -262,7 +262,7 @@ p:P:=a*m^3
 --R
 --R            3
 --R   (6)  %A ?
---RType: SparseUnivariatePolynomial FiniteFieldExtensionByPolynomial(PrimeField 2,?**4+?+1)
+--RType: SparseUnivariatePolynomial(FiniteFieldExtensionByPolynomial(PrimeField(2),?^4+?+1))
 --E 25
 
 --S 26 of 29
@@ -282,7 +282,7 @@ a:=primitiveElement()$gf16
 --R 
 --R
 --R   (7)  %A
---R                Type: FiniteFieldExtensionByPolynomial(PrimeField 2,?**4+?+1)
+--R                Type: FiniteFieldExtensionByPolynomial(PrimeField(2),?^4+?+1)
 --E 27
 
 --S 28 of 29
@@ -291,7 +291,7 @@ q:P:=a*m^2+1
 --R
 --R            2
 --R   (8)  %A ?  + 1
---RType: SparseUnivariatePolynomial FiniteFieldExtensionByPolynomial(PrimeField 2,?**4+?+1)
+--RType: SparseUnivariatePolynomial(FiniteFieldExtensionByPolynomial(PrimeField(2),?^4+?+1))
 --E 28
 
 --S 29 of 29
@@ -299,7 +299,7 @@ p rem q
 --R 
 --R
 --R   (9)  ?
---RType: SparseUnivariatePolynomial FiniteFieldExtensionByPolynomial(PrimeField 2,?**4+?+1)
+--RType: SparseUnivariatePolynomial(FiniteFieldExtensionByPolynomial(PrimeField(2),?^4+?+1))
 --E 29
 
 )spool 
diff --git a/src/input/ffx72.input.pamphlet b/src/input/ffx72.input.pamphlet
index 08bf82e..5329a68 100644
--- a/src/input/ffx72.input.pamphlet
+++ b/src/input/ffx72.input.pamphlet
@@ -45,7 +45,7 @@ u: UP(x,PF 7) := x**2 + 1
 --R
 --R         2
 --R   (2)  x  + 1
---R                                   Type: UnivariatePolynomial(x,PrimeField 7)
+--R                                  Type: UnivariatePolynomial(x,PrimeField(7))
 --E 2
 
 --S 3 of 13
@@ -54,7 +54,7 @@ factor u
 --R
 --R         2
 --R   (3)  x  + 1
---R                          Type: Factored UnivariatePolynomial(x,PrimeField 7)
+--R                        Type: Factored(UnivariatePolynomial(x,PrimeField(7)))
 --E 3 
 
 \end{chunk}
@@ -74,7 +74,7 @@ factor u2
 --R 
 --R
 --R   (5)  (x + %A)(x + 6%A)
---R                      Type: Factored UnivariatePolynomial(x,FiniteField(7,2))
+--R                     Type: Factored(UnivariatePolynomial(x,FiniteField(7,2)))
 --E 5
 
 \end{chunk} 
@@ -88,7 +88,7 @@ definingPolynomial()$gf72
 --R
 --R         2
 --R   (6)  ?  + 1
---R                                Type: SparseUnivariatePolynomial PrimeField 7
+--R                              Type: SparseUnivariatePolynomial(PrimeField(7))
 --E 6
 
 \end{chunk} 
@@ -107,7 +107,7 @@ norm e
 --R 
 --R
 --R   (8)  1
---R                                                           Type: PrimeField 7
+--R                                                          Type: PrimeField(7)
 --E 8
 
 --S 9 of 13
@@ -115,7 +115,7 @@ trace e
 --R 
 --R
 --R   (9)  4
---R                                                           Type: PrimeField 7
+--R                                                          Type: PrimeField(7)
 --E 9
 
 \end{chunk} 
@@ -144,7 +144,7 @@ allElts := [index(i :: PI)$gf72 for i in 1..48]
 --R    4%A + 3, 4%A + 4, 4%A + 5, 4%A + 6, 5%A, 5%A + 1, 5%A + 2, 5%A + 3,
 --R    5%A + 4, 5%A + 5, 5%A + 6, 6%A, 6%A + 1, 6%A + 2, 6%A + 3, 6%A + 4,
 --R    6%A + 5, 6%A + 6]
---R                                                  Type: List FiniteField(7,2)
+--R                                                 Type: List(FiniteField(7,2))
 --E 11
 
 \end{chunk} 
@@ -169,7 +169,7 @@ order 48 generates the multiplicative group of non-zero elements.
 --R   [1, 3, 6, 3, 6, 2, 4, 24, 48, 48, 48, 48, 24, 12, 48, 8, 16, 16, 8, 48, 12,
 --R    48, 16, 24, 24, 16, 48, 12, 48, 16, 24, 24, 16, 48, 12, 48, 8, 16, 16, 8,
 --R    48, 4, 24, 48, 48, 48, 48, 24]
---R                                                   Type: List PositiveInteger
+--R                                                  Type: List(PositiveInteger)
 --E 13
 )spool 
 )lisp (bye)
diff --git a/src/input/file.input.pamphlet b/src/input/file.input.pamphlet
index d301e6e..d94f9bf 100644
--- a/src/input/file.input.pamphlet
+++ b/src/input/file.input.pamphlet
@@ -26,7 +26,7 @@ ifile:File List Integer:=open("/tmp/jazz1","output")
 --R 
 --R
 --R   (1)  "/tmp/jazz1"
---R                                                      Type: File List Integer
+--R                                                    Type: File(List(Integer))
 --E 1
 
 --S 2 of 12
@@ -34,7 +34,7 @@ write!(ifile, [-1,2,3])
 --R 
 --R
 --R   (2)  [- 1,2,3]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 2
 
 --S 3 of 12
@@ -42,7 +42,7 @@ write!(ifile, [10,-10,0,111])
 --R 
 --R
 --R   (3)  [10,- 10,0,111]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 3
 
 --S 4 of 12
@@ -50,7 +50,7 @@ write!(ifile, [7])
 --R 
 --R
 --R   (4)  [7]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 4
 
 --S 5 of 12
@@ -58,7 +58,7 @@ reopen!(ifile, "input")
 --R 
 --R
 --R   (5)  "/tmp/jazz1"
---R                                                      Type: File List Integer
+--R                                                    Type: File(List(Integer))
 --E 5
 
 --S 6 of 12
@@ -66,7 +66,7 @@ read! ifile
 --R 
 --R
 --R   (6)  [- 1,2,3]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 6
 
 --S 7 of 12
@@ -74,7 +74,7 @@ read! ifile
 --R 
 --R
 --R   (7)  [10,- 10,0,111]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 7
 
 --S 8 of 12
@@ -82,7 +82,7 @@ readIfCan! ifile
 --R 
 --R
 --R   (8)  [7]
---R                                                Type: Union(List Integer,...)
+--R                                               Type: Union(List(Integer),...)
 --E 8
 
 --S 9 of 12
@@ -114,7 +114,7 @@ close! ifile
 --R 
 --R
 --R   (12)  "/tmp/jazz1"
---R                                                      Type: File List Integer
+--R                                                    Type: File(List(Integer))
 --E 12
 )spool 
 )system rm /tmp/jazz1
diff --git a/src/input/finitegraph.input.pamphlet b/src/input/finitegraph.input.pamphlet
index c77308f..8e882a0 100644
--- a/src/input/finitegraph.input.pamphlet
+++ b/src/input/finitegraph.input.pamphlet
@@ -79,7 +79,7 @@ FiniteGraph(nodes: BasicType): Exports == Implementation where
 g:FiniteGraph(INT):=new();
 --R 
 --R
---R                                                    Type: FiniteGraph Integer
+--R                                                   Type: FiniteGraph(Integer)
 --E 1
 
 --S 2 of 8
@@ -87,7 +87,7 @@ addNode(g,1)
 --R 
 --R
 --R   (2)  [1]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 2
 
 --S 3 of 8
@@ -95,7 +95,7 @@ addNode(g,2)
 --R 
 --R
 --R   (3)  [2]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 3
 
 --S 4 of 8
@@ -127,7 +127,7 @@ edgeList(g)
 --R 
 --R
 --R   (7)  [[source= 1,target= 2]]
---R                           Type: List Record(source: Integer,target: Integer)
+--R                          Type: List(Record(source: Integer,target: Integer))
 --E 7
 
 --S 8 of 8
@@ -135,7 +135,7 @@ nodeList(g)
 --R 
 --R
 --R   (8)  [1,2]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 8
 
 )spool 
diff --git a/src/input/fixed.input.pamphlet b/src/input/fixed.input.pamphlet
index 13557dd..34816b6 100644
--- a/src/input/fixed.input.pamphlet
+++ b/src/input/fixed.input.pamphlet
@@ -42,8 +42,8 @@ t1:=series(x/(x+log(x)))
 --R   ------- x  - ------- x  + ------- x  - -------- x   + -------- x   + O(x  )
 --R         7            8            9            10             11
 --R   log(x)       log(x)       log(x)       log(x)         log(x)
---R                   Type: GeneralUnivariatePowerSeries(Expression Integer,x,0)
---E
+--R                  Type: GeneralUnivariatePowerSeries(Expression(Integer),x,0)
+--E 1
 
 \end{chunk}
 Here integrate is treating log(x) as a constant, which is incorrect.
@@ -59,7 +59,7 @@ integrate(t1)
 --R
 --R   Continuing to read the file...
 --R
---E
+--E 2
 
 \end{chunk}
 bmt/10/19/92 integrate problem -- serious, wrong answer
@@ -71,8 +71,8 @@ t1:=2*sin(t)*sqrt(1+cos(t))
 --R
 --R                +----------+
 --R   (1)  2sin(t)\|cos(t) + 1
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 3
 
 \end{chunk}
 Correct answer is \[\frac{2\sin(t)}{\sqrt{1+\cos(t)}}\]
@@ -85,8 +85,8 @@ integrate(t1,t)
 --R        (- 4cos(t) - 4)\|cos(t) + 1
 --R   (2)  ----------------------------
 --R                      3
---R                                          Type: Union(Expression Integer,...)
---E
+--R                                         Type: Union(Expression(Integer),...)
+--E 4
 
 \end{chunk}
 bmt/10/20/92 multiple complex in type tower
@@ -96,7 +96,7 @@ bmt/10/20/92 multiple complex in type tower
 --S 5 of 267
 n:Complex ?
 --R                                                                   Type: Void
---E
+--E 5
 
 \end{chunk}
 An invalid type. can't have 2 complex constructors in a tower
@@ -108,8 +108,8 @@ n:=x/y+%i
 --R        x
 --R   (2)  - + %i
 --R        y
---R                                    Type: Complex Fraction Polynomial Integer
---E
+--R                                 Type: Complex(Fraction(Polynomial(Integer)))
+--E 6
 
 \end{chunk}
 grabm/09/28/92 coercion bug
@@ -126,23 +126,23 @@ f:=(a-b-c-d)**2::EXPR INT
 --R
 --R         2                      2                 2           2
 --R   (1)  d  + (2c + 2b - 2a)d + c  + (2b - 2a)c + b  - 2a b + a
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 7
 
 --S 8 of 267
 t1:=f::DMP(['a,'b],EXPR INT)
 --R
 --R         2                          2                 2           2
 --R   (2)  a  - 2a b + (- 2d - 2c)a + b  + (2d + 2c)b + d  + 2c d + c
---R            Type: DistributedMultivariatePolynomial([a,b],Expression Integer)
---E
+--R           Type: DistributedMultivariatePolynomial([a,b],Expression(Integer))
+--E 8
 
 --S 9 of 267
 degree t1
 --R
 --R   (3)  [2,0]
 --R                                    Type: DirectProduct(2,NonNegativeInteger)
---E
+--E 9
 
 \end{chunk}
 bmt/10/26/92 wrong answer
@@ -165,8 +165,8 @@ integrate(sqrt(1+cos(x)),x)
 --R        2sin(x)\|cos(x) + 1
 --R   (1)  --------------------
 --R             cos(x) + 1
---R                                          Type: Union(Expression Integer,...)
---E
+--R                                         Type: Union(Expression(Integer),...)
+--E 10 
 
 \end{chunk}
 bmt/09/28/92 bug in ITRIGMNP
@@ -182,8 +182,8 @@ integrate(exp(x**2),x)
 --I         ++    %K
 --I   (1)   |   %e   d%K
 --R        ++
---R                                          Type: Union(Expression Integer,...)
---E
+--R                                         Type: Union(Expression(Integer),...)
+--E 11
 
 \end{chunk}
 themos/11/06/92 integration bug
@@ -211,8 +211,8 @@ f:=log(1-(b*x/(a+c*x**2)))/x
 --R               c x  + a
 --R   (1)  -------------------
 --R                 x
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 12
 
 --S 13 of 267
 integrate(f,x)
@@ -224,8 +224,8 @@ integrate(f,x)
 --I         ++          %K c + a
 --I   (2)   |   -------------------- d%K
 --I        ++            %K
---R                                          Type: Union(Expression Integer,...)
---E
+--R                                         Type: Union(Expression(Integer),...)
+--E 13
 
 --S 14 of 267
 g:=expand f
@@ -234,8 +234,8 @@ g:=expand f
 --R        - log(c x  + a) + log(c x  - b x + a)
 --R   (3)  -------------------------------------
 --R                          x
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 14
 
 --S 15 of 267
 integrate(g,x)
@@ -244,8 +244,8 @@ integrate(g,x)
 --I         ++  - log(%K c + a) + log(%K c - %K b + a)
 --I   (4)   |   -------------------------------------- d%K
 --I        ++                     %K
---R                                          Type: Union(Expression Integer,...)
---E
+--R                                         Type: Union(Expression(Integer),...)
+--E 15
 
 \end{chunk}
 bmt/11/17/92 interpreter resolve problem\\
@@ -260,8 +260,8 @@ Says cannot find an appropriate *
 --R        %i\|m
 --R   (1)  ------
 --R           m
---R                                             Type: Expression Complex Integer
---E
+--R                                           Type: Expression(Complex(Integer))
+--E 16
 
 \end{chunk}
 tpd/09/22/92 this generates extra brackets
@@ -271,14 +271,14 @@ tpd/09/22/92 this generates extra brackets
 --S 17 of 267
 foo n == matrix[[i for i in 1..n] for j in 1..n]
 --R                                                                   Type: Void
---E
+--E 17
 
 --S 18 of 267
 foo
 --R
 --R   (2)  foo n == [[i for i in 1..n] for j in 1..n]
---R                                                     Type: FunctionCalled foo
---E
+--R                                                    Type: FunctionCalled(foo)
+--E 18
 
 )clear all
 
@@ -310,9 +310,9 @@ comment: this works in version 2
 msq := Matrix SquareMatrix(2,POLY INT)
 --R 
 --R
---R   (1)  Matrix SquareMatrix(2,Polynomial Integer)
+--R   (1)  Matrix(SquareMatrix(2,Polynomial(Integer)))
 --R                                                                 Type: Domain
---E
+--E 19
 
 --S 20 of 267
 m : msq := zero(2,2)
@@ -324,8 +324,8 @@ m : msq := zero(2,2)
 --R        |+0  0+  +0  0+|
 --R        ||    |  |    ||
 --R        ++0  0+  +0  0++
---R                              Type: Matrix SquareMatrix(2,Polynomial Integer)
---E
+--R                            Type: Matrix(SquareMatrix(2,Polynomial(Integer)))
+--E 20
 
 --S 21 of 267
 m(1,1) := matrix([[1,2],[a,b]])
@@ -333,8 +333,8 @@ m(1,1) := matrix([[1,2],[a,b]])
 --R        +1  2+
 --R   (3)  |    |
 --R        +a  b+
---R                                     Type: SquareMatrix(2,Polynomial Integer)
---E
+--R                                    Type: SquareMatrix(2,Polynomial(Integer))
+--E 21
 
 --S 22 of 267
 m(1,2) := matrix([[a,b],[2,b]])
@@ -342,8 +342,8 @@ m(1,2) := matrix([[a,b],[2,b]])
 --R        +a  b+
 --R   (4)  |    |
 --R        +2  b+
---R                                     Type: SquareMatrix(2,Polynomial Integer)
---E
+--R                                    Type: SquareMatrix(2,Polynomial(Integer))
+--E 22
 
 --S 23 of 267
 m(2,2) := matrix([[1,2],[2,b]])
@@ -351,8 +351,8 @@ m(2,2) := matrix([[1,2],[2,b]])
 --R        +1  2+
 --R   (5)  |    |
 --R        +2  b+
---R                                     Type: SquareMatrix(2,Polynomial Integer)
---E
+--R                                    Type: SquareMatrix(2,Polynomial(Integer))
+--E 23
 
 --S 24 of 267
 m
@@ -364,8 +364,8 @@ m
 --R        |+0  0+  +1  2+|
 --R        ||    |  |    ||
 --R        ++0  0+  +2  b++
---R                              Type: Matrix SquareMatrix(2,Polynomial Integer)
---E
+--R                            Type: Matrix(SquareMatrix(2,Polynomial(Integer)))
+--E 24
 
 --S 25 of 267
 m*m
@@ -380,8 +380,8 @@ m*m
 --R        |      |    |              |              |      |
 --R        |      +0  0+              |         2    |      |
 --R        +                          +2b + 2  b  + 4+      +
---R                              Type: Matrix SquareMatrix(2,Polynomial Integer)
---E
+--R                            Type: Matrix(SquareMatrix(2,Polynomial(Integer)))
+--E 25
 
 --S 26 of 267
 m**2
@@ -396,8 +396,8 @@ m**2
 --R        |      |    |              |              |      |
 --R        |      +0  0+              |         2    |      |
 --R        +                          +2b + 2  b  + 4+      +
---R                              Type: Matrix SquareMatrix(2,Polynomial Integer)
---E
+--R                            Type: Matrix(SquareMatrix(2,Polynomial(Integer)))
+--E 26
 
 --S 27 of 267
 m**3
@@ -430,8 +430,8 @@ m**3
 --R   and matrix4= |                            |
 --R                |  2              3          |
 --R                +2b  + 2b + 10   b  + 8b + 4 +
---R                              Type: Matrix SquareMatrix(2,Polynomial Integer)
---E
+--R                            Type: Matrix(SquareMatrix(2,Polynomial(Integer)))
+--E 27
 
 --S 28 of 267
 (m*m)*m
@@ -464,8 +464,8 @@ m**3
 --R   and matrix4= |                            |
 --R                |  2              3          |
 --R                +2b  + 2b + 10   b  + 8b + 4 +
---R                              Type: Matrix SquareMatrix(2,Polynomial Integer)
---E
+--R                            Type: Matrix(SquareMatrix(2,Polynomial(Integer)))
+--E 28
 
 --S 29 of 267
 mm:=m*m
@@ -480,8 +480,8 @@ mm:=m*m
 --R         |      |    |              |              |      |
 --R         |      +0  0+              |         2    |      |
 --R         +                          +2b + 2  b  + 4+      +
---R                              Type: Matrix SquareMatrix(2,Polynomial Integer)
---E
+--R                            Type: Matrix(SquareMatrix(2,Polynomial(Integer)))
+--E 29
 
 --S 30 of 267
 mm*m
@@ -514,8 +514,8 @@ mm*m
 --R   and matrix4= |                            |
 --R                |  2              3          |
 --R                +2b  + 2b + 10   b  + 8b + 4 +
---R                              Type: Matrix SquareMatrix(2,Polynomial Integer)
---E
+--R                            Type: Matrix(SquareMatrix(2,Polynomial(Integer)))
+--E 30
 
 \end{chunk}
 tpd/09/25/92 new equation.spad from johannes grabmeier
@@ -531,80 +531,80 @@ eq1 := (-6*x**3+13*x**2+4)=(-x**4+12*x)
 --R
 --R            3      2         4
 --R   (1)  - 6x  + 13x  + 4= - x  + 12x
---R                                            Type: Equation Polynomial Integer
---E
+--R                                          Type: Equation(Polynomial(Integer))
+--E 31
 
 --S 32 of 267
 eq2 := x**4+13*x**2-12*x = 6*x**3-4
 --R
 --R         4      2          3
 --R   (2)  x  + 13x  - 12x= 6x  - 4
---R                                            Type: Equation Polynomial Integer
---E
+--R                                          Type: Equation(Polynomial(Integer))
+--E 32
 
 --S 33 of 267
 eq := eq1*y**2+eq2
 --R
 --R             3      2      2    4      2            4        2     3
 --R   (3)  (- 6x  + 13x  + 4)y  + x  + 13x  - 12x= (- x  + 12x)y  + 6x  - 4
---R                                            Type: Equation Polynomial Integer
---E
+--R                                          Type: Equation(Polynomial(Integer))
+--E 33
 
 --S 34 of 267
 t1:=swap eq
 --R
 --R            4        2     3           3      2      2    4      2
 --R   (4)  (- x  + 12x)y  + 6x  - 4= (- 6x  + 13x  + 4)y  + x  + 13x  - 12x
---R                                            Type: Equation Polynomial Integer
---E
+--R                                          Type: Equation(Polynomial(Integer))
+--E 34
 
 --S 35 of 267
 t2:=t1 + 4
 --R
 --R            4        2     3       3      2      2    4      2
 --R   (5)  (- x  + 12x)y  + 6x = (- 6x  + 13x  + 4)y  + x  + 13x  - 12x + 4
---R                                            Type: Equation Polynomial Integer
---E
+--R                                          Type: Equation(Polynomial(Integer))
+--E 35
 
 --S 36 of 267
 t3:=t2-6*x**3
 --R
 --R            4        2       3      2      2    4     3      2
 --R   (6)  (- x  + 12x)y = (- 6x  + 13x  + 4)y  + x  - 6x  + 13x  - 12x + 4
---R                                            Type: Equation Polynomial Integer
---E
+--R                                          Type: Equation(Polynomial(Integer))
+--E 36
 
 --S 37 of 267
 t4:=leftZero t3
 --R
 --R             4     3      2            2    4     3      2
 --R   (7)  0= (x  - 6x  + 13x  - 12x + 4)y  + x  - 6x  + 13x  - 12x + 4
---R                                            Type: Equation Polynomial Integer
---E
+--R                                          Type: Equation(Polynomial(Integer))
+--E 37
 
 --S 38 of 267
 t5:=swap t4
 --R
 --R          4     3      2            2    4     3      2
 --R   (8)  (x  - 6x  + 13x  - 12x + 4)y  + x  - 6x  + 13x  - 12x + 4= 0
---R                                            Type: Equation Polynomial Integer
---E
+--R                                          Type: Equation(Polynomial(Integer))
+--E 38
 
 --S 39 of 267
 t6:=factor lhs t5
 --R
 --R               2       2  2
 --R   (9)  (x - 2) (x - 1) (y  + 1)
---R                                            Type: Factored Polynomial Integer
---E
+--R                                          Type: Factored(Polynomial(Integer))
+--E 39
 
 --S 40 of 267
 t7:=factorAndSplit eq
 --R
 --R                             2
 --R   (10)  [x - 2= 0,x - 1= 0,y  + 1= 0]
---R                                       Type: List Equation Polynomial Integer
---E
+--R                                    Type: List(Equation(Polynomial(Integer)))
+--E 40
 
 --S 41 of 267
 t8:=inv (eq :: EQ FRAC POLY INT)
@@ -613,8 +613,8 @@ t8:=inv (eq :: EQ FRAC POLY INT)
 --R   (11)  - ------------------------------------= - ----------------------
 --R              3      2      2    4      2            4        2     3
 --R           (6x  - 13x  - 4)y  - x  - 13x  + 12x    (x  - 12x)y  - 6x  + 4
---R                                   Type: Equation Fraction Polynomial Integer
---E
+--R                                Type: Equation(Fraction(Polynomial(Integer)))
+--E 41
 
 --S 42 of 267
 - t8
@@ -623,8 +623,8 @@ t8:=inv (eq :: EQ FRAC POLY INT)
 --R   (12)  ------------------------------------= ----------------------
 --R            3      2      2    4      2          4        2     3
 --R         (6x  - 13x  - 4)y  - x  - 13x  + 12x  (x  - 12x)y  - 6x  + 4
---R                                   Type: Equation Fraction Polynomial Integer
---E
+--R                                Type: Equation(Fraction(Polynomial(Integer)))
+--E 42
 
 \end{chunk}
 bmt/09/29/92 coercion bug\\
@@ -654,7 +654,7 @@ properly declared despite the error message. --Tim
 --S 43 of 267
 (p1,p2):UP(x,INT)
 --R                                                                   Type: Void
---E
+--E 43
 
 --S 44 of 267
 p1:=3*x**4+11*x**2-4
@@ -662,7 +662,7 @@ p1:=3*x**4+11*x**2-4
 --R          4      2
 --R   (2)  3x  + 11x  - 4
 --R                                        Type: UnivariatePolynomial(x,Integer)
---E
+--E 44
 
 --S 45 of 267
 p2:=9*x**4+9*x**2-4
@@ -670,17 +670,17 @@ p2:=9*x**4+9*x**2-4
 --R          4     2
 --R   (3)  9x  + 9x  - 4
 --R                                        Type: UnivariatePolynomial(x,Integer)
---E
+--E 45
 
 --S 46 of 267
 myNextPrime: (INT,NNI) -> INT
 --R                                                                   Type: Void
---E
+--E 46
 
 --S 47 of 267
 myNextPrime(x,n)==nextPrime(x)$PRIMES(INT)
 --R                                                                   Type: Void
---E
+--E 47
 
 \end{chunk}
 Runs forever due to algebra bug in handling leading coefficients
@@ -693,7 +693,7 @@ modularGcd([p1,p2])$InnerModularGcd(INT,UP(x,INT),67108859,myNextPrime)
 --R          2
 --R   (6)  3x  - 1
 --R                                        Type: UnivariatePolynomial(x,Integer)
---E
+--E 48
 
 \end{chunk}
 dewar/10/02/92 actually, this was never wrong
@@ -705,7 +705,7 @@ numeric(%e ** %pi)
 --R
 --R   (1)  23.1406926327 79269006
 --R                                                                  Type: Float
---E
+--E 49
 
 \end{chunk}
 themos/10/07/92
@@ -717,7 +717,7 @@ y:=operator 'y
 --R
 --R   (1)  y
 --R                                                          Type: BasicOperator
---E
+--E 50
 
 --S 51 of 267
 deqx:=differentiate(y(x),x,2)+differentiate(y(x),x)+y(x)
@@ -725,8 +725,8 @@ deqx:=differentiate(y(x),x,2)+differentiate(y(x),x)+y(x)
 --R         ,,       ,
 --R   (2)  y  (x) + y (x) + y(x)
 --R
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 51
 
 --S 52 of 267
 solve(deqx,y,x)
@@ -736,8 +736,8 @@ solve(deqx,y,x)
 --R                                   x\|3      2     2    x\|3
 --R   (3)  [particular= 0,basis= [cos(-----)%e   ,%e   sin(-----)]]
 --R                                     2                    2
---IType: Union(Record(particular: Expression Integer,...
---E
+--RType: Union(Record(particular: Expression(Integer),basis: List(Expression(Integer))),...)
+--E 52
 
 --S 53 of 267
 solve(deqx,y,x=0,[1])
@@ -747,8 +747,8 @@ solve(deqx,y,x=0,[1])
 --R            x\|3      2
 --R   (4)  cos(-----)%e
 --R              2
---R                                          Type: Union(Expression Integer,...)
---E
+--R                                         Type: Union(Expression(Integer),...)
+--E 53
 
 --S 54 of 267
 deqt:=differentiate(y(t),t,2)+differentiate(y(t),t)+y(t)
@@ -756,8 +756,8 @@ deqt:=differentiate(y(t),t,2)+differentiate(y(t),t)+y(t)
 --R         ,,       ,
 --R   (5)  y  (t) + y (t) + y(t)
 --R
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 54
 
 --S 55 of 267
 solve(deqt,y,t)
@@ -767,8 +767,8 @@ solve(deqt,y,t)
 --R                                   t\|3      2     2    t\|3
 --R   (6)  [particular= 0,basis= [cos(-----)%e   ,%e   sin(-----)]]
 --R                                     2                    2
---IType: Union(Record(particular: Expression Integer,basis: ...
---E
+--RType: Union(Record(particular: Expression(Integer),basis: List(Expression(Integer))),...)
+--E 55
 
 --S 56 of 267
 solve(deqt,y,t=0,[1]) -- bug
@@ -778,8 +778,8 @@ solve(deqt,y,t=0,[1]) -- bug
 --R            t\|3      2
 --R   (7)  cos(-----)%e
 --R              2
---R                                          Type: Union(Expression Integer,...)
---E
+--R                                         Type: Union(Expression(Integer),...)
+--E 56
 
 --S 57 of 267
 deqz:=differentiate(y(z),z,2)+differentiate(y(z),z)+y(z)
@@ -787,8 +787,8 @@ deqz:=differentiate(y(z),z,2)+differentiate(y(z),z)+y(z)
 --R         ,,       ,
 --R   (8)  y  (z) + y (z) + y(z)
 --R
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 57
 
 --S 58 of 267
 solve(deqz,y,z)
@@ -798,8 +798,8 @@ solve(deqz,y,z)
 --R                                   z\|3      2     2    z\|3
 --R   (9)  [particular= 0,basis= [cos(-----)%e   ,%e   sin(-----)]]
 --R                                     2                    2
---IType: Union(Record(particular: Expression Integer,...
---E
+--RType: Union(Record(particular: Expression(Integer),basis: List(Expression(Integer))),...)
+--E 58
 
 --S 59 of 267
 solve(deqz,y,z=0,[1]) --bug
@@ -809,8 +809,8 @@ solve(deqz,y,z=0,[1]) --bug
 --R             z\|3      2
 --R   (10)  cos(-----)%e
 --R               2
---R                                          Type: Union(Expression Integer,...)
---E
+--R                                         Type: Union(Expression(Integer),...)
+--E 59
 
 \end{chunk}
 themos/10/07/92 equation
@@ -822,7 +822,7 @@ y:=operator 'y
 --R
 --R   (1)  y
 --R                                                          Type: BasicOperator
---E
+--E 60
 
 --S 61 of 267
 deq:=D(y(x),x)+x**2=(y x)/x-(y x)**2
@@ -831,8 +831,8 @@ deq:=D(y(x),x)+x**2=(y x)/x-(y x)**2
 --R         ,       2  - x y(x)  + y(x)
 --R   (2)  y (x) + x = ----------------
 --R                            x
---R                                            Type: Equation Expression Integer
---E
+--R                                          Type: Equation(Expression(Integer))
+--E 61
 
 \end{chunk}
 bmt/10/08/92 laplace
@@ -845,8 +845,8 @@ laplace(exp(-x**3)*x**7,x,s)
 --R                       3
 --R                 7  - x
 --R   (1)  laplace(x %e    ,x,s)
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 62
 
 \end{chunk}
 bmt/09/30/92 nonlinear ODE 
@@ -862,7 +862,7 @@ y:=operator 'y
 --R
 --R   (1)  y
 --R                                                          Type: BasicOperator
---E
+--E 63
 
 --S 64 of 267
 x**2 * D(y x, x) + 2*x*(y x) - (y x)**3 = 0
@@ -870,8 +870,8 @@ x**2 * D(y x, x) + 2*x*(y x) - (y x)**3 = 0
 --R         2 ,          3
 --R   (2)  x y (x) - y(x)  + 2x y(x)= 0
 --R
---R                                            Type: Equation Expression Integer
---E
+--R                                          Type: Equation(Expression(Integer))
+--E 64
 
 --S 65 of 267
 solve(%,y,x)
@@ -881,8 +881,8 @@ solve(%,y,x)
 --R   (3)  ---------------------
 --R                 5    2
 --R               5x y(x)
---R                                          Type: Union(Expression Integer,...)
---E
+--R                                         Type: Union(Expression(Integer),...)
+--E 65
 
 \end{chunk}
 sit/10/08/92 factor bug
@@ -893,8 +893,8 @@ sit/10/08/92 factor bug
 p:POLY FRAC INT := 3*(x+1)
 --R
 --R   (1)  3x + 3
---R                                            Type: Polynomial Fraction Integer
---E
+--R                                          Type: Polynomial(Fraction(Integer))
+--E 66
 
 \end{chunk}
 Is wrong (missing factor of 3).
@@ -905,8 +905,8 @@ factor(p)**2
 --R
 --R                2
 --R   (2)  9(x + 1)
---R                                   Type: Factored Polynomial Fraction Integer
---E
+--R                                Type: Factored(Polynomial(Fraction(Integer)))
+--E 67
 
 \end{chunk}
 henderson/10/08/92 
@@ -929,55 +929,55 @@ fout:TextFile:=open("/tmp/foo","output")
 --R
 --R   (1)  "/tmp/foo"
 --R                                                               Type: TextFile
---E
+--E 68
 
 --S 69 of 267
 write!(fout,"foo")
 --R
 --R   (2)  "foo"
 --R                                                                 Type: String
---E
+--E 69
 
 --S 70 of 267
 close!(fout)
 --R
 --R   (3)  "/tmp/foo"
 --R                                                               Type: TextFile
---E
+--E 70
 
 --S 71 of 267
 fin:TextFile:=open("/tmp/foo","input")
 --R
 --R   (4)  "/tmp/foo"
 --R                                                               Type: TextFile
---E
+--E 71
 
 --S 72 of 267
 readLineIfCan!(fin)
 --R
 --R   (5)  "foo"
 --R                                                      Type: Union(String,...)
---E
+--E 72
 
 --S 73 of 267
 readLineIfCan!(fin)
 --R
 --R   (6)  "failed"
 --R                                                    Type: Union("failed",...)
---E
+--E 73
 
 --S 74 of 267
 close!(fin)
 --R
 --R   (7)  "/tmp/foo"
 --R                                                               Type: TextFile
---E
+--E 74
 
 --S 75 of 267
 )lisp (system "rm /tmp/foo")
 --R 
 --RValue = 0
---E
+--E 75
 
 \end{chunk}
 bmt/10/08/92 factoring over SAEs
@@ -993,23 +993,23 @@ a | a**2+1
 --R   a : SAEa := a
 --R
 --R   (1)  a
---IType: SimpleAlgebraicExtension(Fraction Integer,...
---E
+--RType: SimpleAlgebraicExtension(Fraction(Integer),UnivariatePolynomial(a,Fraction(Integer)),a^2+1)
+--E 76
 
 --S 77 of 267
 t1:=(x+a)*(x+a+1)
 --R
 --R         2
 --R   (2)  x  + (2a + 1)x + a - 1
---IType: Polynomial SimpleAlgebraicExtension(Fraction Integer,...
---E
+--RType: Polynomial(SimpleAlgebraicExtension(Fraction(Integer),UnivariatePolynomial(a,Fraction(Integer)),a^2+1))
+--E 77
 
 --S 78 of 267
 factor t1
 --R
 --R   (3)  (x + a + 1)(x + a)
---IType: Factored Polynomial SimpleAlgebraicExtension(Fraction Integer,...
---E
+--RType: Factored(Polynomial(SimpleAlgebraicExtension(Fraction(Integer),UnivariatePolynomial(a,Fraction(Integer)),a^2+1)))
+--E 78
 
 \end{chunk}
 miller/10/09/92 local vars in types
@@ -1031,7 +1031,7 @@ Do this in a virgin system
 S2:= SquareMatrix(2,FRAC POLY INT);
 --R
 --R                                                                 Type: Domain
---E
+--E 79
 
 --S 80 of 267
 V2: S2 := matrix([[v,-v],[-v,v]])
@@ -1039,8 +1039,8 @@ V2: S2 := matrix([[v,-v],[-v,v]])
 --R        + v   - v+
 --R   (2)  |        |
 --R        +- v   v +
---R                            Type: SquareMatrix(2,Fraction Polynomial Integer)
---E
+--R                          Type: SquareMatrix(2,Fraction(Polynomial(Integer)))
+--E 80
 
 --S 81 of 267
 I2: S2 := 1
@@ -1048,15 +1048,15 @@ I2: S2 := 1
 --R        +1  0+
 --R   (3)  |    |
 --R        +0  1+
---R                            Type: SquareMatrix(2,Fraction Polynomial Integer)
---E
+--R                          Type: SquareMatrix(2,Fraction(Polynomial(Integer)))
+--E 81
 
 --S 82 of 267
 m:=5
 --R
 --R   (4)  5
 --R                                                        Type: PositiveInteger
---E
+--E 82
 
 --S 83 of 267
 l: List(S2) := append(cons(V2+h*I2,_
@@ -1071,8 +1071,8 @@ l: List(S2) := append(cons(V2+h*I2,_
 --R    +v + h   - v +
 --R    |            |]
 --R    + - v   v + h+
---R                       Type: List SquareMatrix(2,Fraction Polynomial Integer)
---E
+--R                    Type: List(SquareMatrix(2,Fraction(Polynomial(Integer))))
+--E 83
 
 \end{chunk}
 Does this give an error of deleteAssoc not defined ??
@@ -1103,8 +1103,8 @@ A: SquareMatrix(m, S2) := diagonalMatrix(l)
 --R                +v + 2h   - v  +
 --R   and matrix3= |              |
 --R                + - v    v + 2h+
---R            Type: SquareMatrix(5,SquareMatrix(2,Fraction Polynomial Integer))
---E
+--R          Type: SquareMatrix(5,SquareMatrix(2,Fraction(Polynomial(Integer))))
+--E 84
 
 \end{chunk}
 load definition of deleteAssoc
@@ -1126,8 +1126,8 @@ squareFree((2*x*y+1)*(x*y+1)**2)
 --R
 --R                 2
 --R   (1)  (x y + 1) (2x y + 1)
---R                                            Type: Factored Polynomial Integer
---E
+--R                                          Type: Factored(Polynomial(Integer))
+--E 85
 
 \end{chunk}
 bmt/10/19/92 division by zero error
@@ -1140,8 +1140,8 @@ limit(atan(1/sin(x)),x=0)
 --R                          %pi                 %pi
 --R   (1)  [leftHandLimit= - ---,rightHandLimit= ---]
 --R                           2                   2
---IType: Union(Record(leftHandLimit: Union(OrderedCompletion ...
---E
+--RType: Union(Record(leftHandLimit: Union(OrderedCompletion(Expression(Integer)),"failed"),rightHandLimit: Union(OrderedCompletion(Expression(Integer)),"failed")),...)
+--E 86
 
 \end{chunk}
 bmt/10/19/92 limit problem
@@ -1156,8 +1156,8 @@ limit(atan(-sin(x)/(cos(x)+e)),x=acos(-e))
 --R                          %pi                 %pi
 --R   (1)  [leftHandLimit= - ---,rightHandLimit= ---]
 --R                           2                   2
---IType: Union(Record(leftHandLimit: Union(OrderedCompletion ...
---E
+--RType: Union(Record(leftHandLimit: Union(OrderedCompletion(Expression(Integer)),"failed"),rightHandLimit: Union(OrderedCompletion(Expression(Integer)),"failed")),...)
+--E 87
 
 --S 88 of 267
 limit(atan(1/(cos(x)+e)),x=acos(-e))
@@ -1165,8 +1165,8 @@ limit(atan(1/(cos(x)+e)),x=acos(-e))
 --R                        %pi                   %pi
 --R   (2)  [leftHandLimit= ---,rightHandLimit= - ---]
 --R                         2                     2
---IType: Union(Record(leftHandLimit: Union(OrderedCompletion ...
---E
+--RType: Union(Record(leftHandLimit: Union(OrderedCompletion(Expression(Integer)),"failed"),rightHandLimit: Union(OrderedCompletion(Expression(Integer)),"failed")),...)
+--E 88
 
 \end{chunk}
 grabmeier/10/19/92 unable to compute the determinant of an 8x8
@@ -1176,14 +1176,14 @@ grabmeier/10/19/92 unable to compute the determinant of an 8x8
 --S 89 of 267
 D := MATRIX FRAC(POLY INT)
 --R
---R   (1)  Matrix Fraction Polynomial Integer
+--R   (1)  Matrix(Fraction(Polynomial(Integer)))
 --R                                                                 Type: Domain
---E
+--E 89
 
 --S 90 of 267
 d : (INT, Boolean) -> POLY INT
 --R                                                                   Type: Void
---E
+--E 90
 
 --S 91 of 267
 d(i,ss)  ==
@@ -1200,7 +1200,7 @@ d(i,ss)  ==
   'ddd
 --R 
 --R                                                                   Type: Void
---E
+--E 91
 
 -- 1,d,dd,ddd,s,sd,sdd,sddd
 
@@ -1222,8 +1222,8 @@ mTV4 : D := new(8,8,0)
 --R        |0  0  0  0  0  0  0  0|
 --R        |                      |
 --R        +0  0  0  0  0  0  0  0+
---R                                     Type: Matrix Fraction Polynomial Integer
---E
+--R                                  Type: Matrix(Fraction(Polynomial(Integer)))
+--E 92
 
 --S 93 of 267
 for i in 1..8 repeat
@@ -1235,10 +1235,10 @@ for i in 1..8 repeat
       j <= 4 => d(i+j-2,true)
       d(-i+j,false)
 --R 
---R   Compiling function d with type (Integer,Boolean) -> Polynomial 
---R      Integer 
+--R   Compiling function d with type (Integer,Boolean) -> Polynomial(
+--R      Integer) 
 --R                                                                   Type: Void
---E
+--E 93
 
 --S 94 of 267
 mTV4
@@ -1258,8 +1258,8 @@ mTV4
 --R        |sdd   sddd   s     sd    dd   ddd    1     d  |
 --R        |                                              |
 --R        +sddd   s     sd   sdd    d     dd   ddd    1  +
---R                                     Type: Matrix Fraction Polynomial Integer
---E
+--R                                  Type: Matrix(Fraction(Polynomial(Integer)))
+--E 94
 
 --S 95 of 267
 gdd4 := determinant mTV4
@@ -2090,8 +2090,8 @@ gdd4 := determinant mTV4
 --R   + 
 --R        8     4
 --R     - d  + 2d  - 1
---R                                            Type: Fraction Polynomial Integer
---E
+--R                                          Type: Fraction(Polynomial(Integer))
+--E 95
 
 \end{chunk}
 sutor/09/28/92 operator bug?
@@ -2105,14 +2105,14 @@ L n ==
   (2*n-1)/n * x * L(n-1) - (n-1)/n * L(n-2)
 --R 
 --R                                                                   Type: Void
---E
+--E 96
 
 --S 97 of 267
 dx:=operator("D")::OP(POLY FRAC INT)
 --R
 --R   (2)  D
---R                                   Type: Operator Polynomial Fraction Integer
---E
+--R                                Type: Operator(Polynomial(Fraction(Integer)))
+--E 97
 
 --S 98 of 267
 evaluate(dx,p+-> differentiate(p,'x))
@@ -2128,22 +2128,22 @@ evaluate(dx,p+-> differentiate(p,'x))
 --RDaly Bug
 --R   Cannot find a definition or applicable library operation named 
 --R      evaluate with argument type(s) 
---R                    Operator Polynomial Fraction Integer
+--R                   Operator(Polynomial(Fraction(Integer)))
 --R                              AnonymousFunction
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
 --R      or "$" to specify which version of the function you need.
---E
+--E 98
 
 --S 99 of 267
 E n == (1-x**2)*dx**2-2*x*dx+n*(n+1)
 --R                                                                   Type: Void
---E
+--E 99
 
 --S 100 of 267
 L 15
---R   Compiling function L with type Integer -> Polynomial Fraction 
---R      Integer 
+--R   Compiling function L with type Integer -> Polynomial(Fraction(
+--R      Integer)) 
 --R   Compiling function L as a recurrence relation.
 --R
 --R   (4)
@@ -2154,8 +2154,8 @@ L 15
 --R       2909907  5   255255  3   6435
 --R     - ------- x  + ------ x  - ---- x
 --R         2048        2048       2048
---R                                            Type: Polynomial Fraction Integer
---E
+--R                                          Type: Polynomial(Fraction(Integer))
+--E 100
 
 \end{chunk}
 Used to fail on this line
@@ -2163,13 +2163,13 @@ Used to fail on this line
 
 --S 101 of 267
 E 15
---R   Compiling function E with type PositiveInteger -> Operator 
---R      Polynomial Fraction Integer 
+--R   Compiling function E with type PositiveInteger -> Operator(
+--R      Polynomial(Fraction(Integer))) 
 --R
 --R                       2      2
 --R   (5)  240 - 2x D - (x  - 1)D
---R                                   Type: Operator Polynomial Fraction Integer
---E
+--R                                Type: Operator(Polynomial(Fraction(Integer)))
+--E 101
 
 \end{chunk}
 bmt/10/12/92 EFSTRUC recursion problem
@@ -2185,8 +2185,8 @@ bug:=(1+x**(1/4))**(1/3)/(x**(1/2))
 --R   (1)  -----------
 --R             +-+
 --R            \|x
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 102
 
 \end{chunk}
 Gives a value stack overflow
@@ -2201,8 +2201,8 @@ integrate(bug,x)
 --R        (12\|x   + 3\|x  - 9)\|\|x  + 1
 --R   (2)  --------------------------------
 --R                        7
---R                                          Type: Union(Expression Integer,...)
---E
+--R                                         Type: Union(Expression(Integer),...)
+--E 103
 
 \end{chunk}
 james/10/28/92 coerce bug
@@ -2222,7 +2222,7 @@ g::ROMAN
 --R
 --R   Continuing to read the file...
 --R
---E
+--E 104
 
 \end{chunk}
 grabm/10/28/92 runs forever
@@ -2236,8 +2236,8 @@ factor 1068303355883998767544567663620885466990173600
 --R
 --R         5 7 2 4  2  2  2
 --R   (1)  2 3 5 7 17 19 23 3343 4219 326705949951846198203
---R                                                       Type: Factored Integer
---E
+--R                                                      Type: Factored(Integer)
+--E 105
 
 --S 106 of 267
 sqrt 1068303355883998767544567663620885466990173600
@@ -2245,7 +2245,7 @@ sqrt 1068303355883998767544567663620885466990173600
 --R                  +-----------------------------+
 --R   (2)  196571340\|27647393656301898872761810506
 --R                                                        Type: AlgebraicNumber
---E
+--E 106
 
 \end{chunk}
 themos/11/05/92 fortran output bug
@@ -2271,8 +2271,8 @@ a1:=sin(x)/(x**2+y**2)
 --R   (1)  -------
 --R         2    2
 --R        y  + x
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 107
 
 --S 108 of 267
 a2:=D(a1,[x,y])
@@ -2282,8 +2282,8 @@ a2:=D(a1,[x,y])
 --R   (2)  ----------------------------------
 --R               6     2 4     4 2    6
 --R              y  + 3x y  + 3x y  + x
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 108
 
 --S 109 of 267
 a2+D(a2,x)
@@ -2297,8 +2297,8 @@ a2+D(a2,x)
 --R  /
 --R      8     2 6     4 4     6 2    8
 --R     y  + 4x y  + 6x y  + 4x y  + x
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 109
 
 \end{chunk}
 grabm/11/05/92 
@@ -2319,23 +2319,23 @@ working in POLY INT is o.k.
 --S 110 of 267
 R := FRAC INT
 --R
---R   (1)  Fraction Integer
+--R   (1)  Fraction(Integer)
 --R                                                                 Type: Domain
---E
+--E 110
 
 --S 111 of 267
 lpx : List POLY R := [x1+x2+x3, x1*x2+x1*x3+x2*x3,x1*x2*x3]
 --R
 --R   (2)  [x3 + x2 + x1,(x2 + x1)x3 + x1 x2,x1 x2 x3]
---R                                       Type: List Polynomial Fraction Integer
---E
+--R                                    Type: List(Polynomial(Fraction(Integer)))
+--E 111
 
 --S 112 of 267
 lip := [lpx.1-e3, lpx.2-e2, lpx.3-e1]--R
 --R
 --R   (3)  [x3 + x2 + x1 - e3,(x2 + x1)x3 + x1 x2 - e2,x1 x2 x3 - e1]
---R                                       Type: List Polynomial Fraction Integer
---E
+--R                                    Type: List(Polynomial(Fraction(Integer)))
+--E 112
 
 --S 113 of 267
 gbp := groebner lip
@@ -2345,30 +2345,30 @@ gbp := groebner lip
 --R   [x3 + x2 + x1 - e3, x2  + (x1 - e3)x2 + x1  - e3 x1 + e2,
 --R      3        2
 --R    x1  - e3 x1  + e2 x1 - e1]
---R                                       Type: List Polynomial Fraction Integer
---E
+--R                                    Type: List(Polynomial(Fraction(Integer)))
+--E 113
 
 --S 114 of 267
 normalForm(x1**2+x2**2+x3**2,gbp)
 --R
 --R          2
 --R   (5)  e3  - 2e2
---R                                            Type: Polynomial Fraction Integer
---E
+--R                                          Type: Polynomial(Fraction(Integer))
+--E 114
 
 --S 115 of 267
 dmp := DMP([x1,x2,x3,e1,e2,e3],INT)
 --R
 --R   (6)  DistributedMultivariatePolynomial([x1,x2,x3,e1,e2,e3],Integer)
 --R                                                                 Type: Domain
---E
+--E 115
 
 --S 116 of 267
 li : List dmp := [lpx.1-e1, lpx.2-e2, lpx.3-e3]
 --R
 --R   (7)  [x1 + x2 + x3 - e1,x1 x2 + x1 x3 + x2 x3 - e2,x1 x2 x3 - e3]
---R    Type: List DistributedMultivariatePolynomial([x1,x2,x3,e1,e2,e3],Integer)
---E
+--R   Type: List(DistributedMultivariatePolynomial([x1,x2,x3,e1,e2,e3],Integer))
+--E 116
 
 --S 117 of 267
 gb := groebner li
@@ -2378,8 +2378,8 @@ gb := groebner li
 --R   [x1 + x2 + x3 - e1, x2  + x2 x3 - x2 e1 + x3  - x3 e1 + e2,
 --R      3     2
 --R    x3  - x3 e1 + x3 e2 - e3]
---R    Type: List DistributedMultivariatePolynomial([x1,x2,x3,e1,e2,e3],Integer)
---E
+--R   Type: List(DistributedMultivariatePolynomial([x1,x2,x3,e1,e2,e3],Integer))
+--E 117
 
 --S 118 of 267
 p:dmp:=(x1**2+x2**2+x3**2)
@@ -2387,23 +2387,23 @@ p:dmp:=(x1**2+x2**2+x3**2)
 --R          2     2     2
 --R   (9)  x1  + x2  + x3
 --R         Type: DistributedMultivariatePolynomial([x1,x2,x3,e1,e2,e3],Integer)
---E
+--E 118
 
 --S 119 of 267
 normalForm(p,gb)
 --R
 --R           2
 --R   (10)  e1  - 2e2
---RType: DistributedMultivariatePolynomial([x1,x2,x3,e1,e2,e3],Fraction Integer)
---E
+--RType: DistributedMultivariatePolynomial([x1,x2,x3,e1,e2,e3],Fraction(Integer))
+--E 119
 
 --S 120 of 267
 normalForm(x1**2+x2**2+x3**2,gb)
 --R
 --R            2                      2              2
 --R   (11)  2x2  + (2x1 - 2e1)x2 + 2x1  - 2e1 x1 + e1
---R                                            Type: Polynomial Fraction Integer
---E
+--R                                          Type: Polynomial(Fraction(Integer))
+--E 120
 
 \end{chunk}
 bmt/11/17/92 Ifintegrate
@@ -2433,8 +2433,8 @@ integrate(normalize(sqrt(1+cos(x)),x),x)
 --R                  x
 --R              cos(-)
 --R                  2
---R                                          Type: Union(Expression Integer,...)
---E
+--R                                         Type: Union(Expression(Integer),...)
+--E 121
 
 \end{chunk}
 This gets a non-invertible error
@@ -2459,8 +2459,8 @@ integrate(((-x-1)*log((x**2+x))**2+2*log(x))/(x+1),x)
 --I         ++  (- %K - 1)log(%K  + %K)  + 2log(%K)
 --I   (1)   |   ----------------------------------- d%K
 --I        ++                  %K + 1
---R                                          Type: Union(Expression Integer,...)
---E
+--R                                         Type: Union(Expression(Integer),...)
+--E 122
 
 \end{chunk}
 dewar/02/15/93
@@ -2480,22 +2480,22 @@ will become obsolete, so the suggested fix is to use tagged unions instead:
 t1:=i::POLY INT
 --R
 --R   (1)  i
---R                                                     Type: Polynomial Integer
---E
+--R                                                    Type: Polynomial(Integer)
+--E 123
 
 --S 124 of 267
 t2:=t1::Union(s:Symbol, p:POLY INT)
 --R
 --R   (2)  i
---R                                       Type: Union(p: Polynomial Integer,...)
---E
+--R                                      Type: Union(p: Polynomial(Integer),...)
+--E 124
 
 --S 125 of 267
 list t2
 --R
 --R   (3)  [i]
---R                            Type: List Union(s: Symbol,p: Polynomial Integer)
---E
+--R                          Type: List(Union(s: Symbol,p: Polynomial(Integer)))
+--E 125
 
 \end{chunk}
 grabm/03/04/93 parser bug? not for system commands
@@ -2516,14 +2516,14 @@ I:=operator 'I
 --R
 --R   (1)  I
 --R                                                          Type: BasicOperator
---E
+--E 126
 
 --S 127 of 267
 J:=operator 'J
 --R
 --R   (2)  J
 --R                                                          Type: BasicOperator
---E
+--E 127
 
 --S 128 of 267
 eq := mu * D(I x,x) = - (K + S) * I(x) + S*J(x)
@@ -2531,8 +2531,8 @@ eq := mu * D(I x,x) = - (K + S) * I(x) + S*J(x)
 --R           ,
 --R   (3)  muI (x)= S J(x) + (- S - K)I(x)
 --R
---R                                            Type: Equation Expression Integer
---E
+--R                                          Type: Equation(Expression(Integer))
+--E 128
 
 --S 129 of 267
 solve(eq,I,x)
@@ -2546,8 +2546,8 @@ solve(eq,I,x)
 --R                                      -------------
 --R                                            mu
 --R                                 mu %e
---IType: Union(Record(particular: Expression Integer,...
---E
+--RType: Union(Record(particular: Expression(Integer),basis: List(Expression(Integer))),...)
+--E 129
 
 \end{chunk}
 
@@ -2573,8 +2573,8 @@ no escape characters.
 ofile: File String := open("/tmp/test","output")
 --R
 --R   (1)  "/tmp/test"
---R                                                            Type: File String
---E
+--R                                                           Type: File(String)
+--E 130
 
 \end{chunk}
 This writes ``\verb|\\\\test|'' but should write ``\verb|\\test|''
@@ -2585,14 +2585,14 @@ write!(ofile,"\\test"::String)
 --R
 --R   (2)  "\\test"
 --R                                                                 Type: String
---E
+--E 131
 
 --S 132 of 267
 close! ofile
 --R
 --R   (3)  "/tmp/test"
---R                                                            Type: File String
---E
+--R                                                           Type: File(String)
+--E 132
 
 \end{chunk}
 
@@ -2609,16 +2609,16 @@ pol:DMP([x,y,z],PF(2)):=x**2*y**2+x**2*y*z+x**2*z**2+x*y*z**2+y**3*z+y*z**3
 --R
 --R         2 2    2       2 2        2    3       3
 --R   (1)  x y  + x y z + x z  + x y z  + y z + y z
---R                Type: DistributedMultivariatePolynomial([x,y,z],PrimeField 2)
---E
+--R               Type: DistributedMultivariatePolynomial([x,y,z],PrimeField(2))
+--E 133
 
 --S 134 of 267
 factor pol
 --R
 --R         2 2    2       2 2        2    3       3
 --R   (2)  x y  + x y z + x z  + x y z  + y z + y z
---R       Type: Factored DistributedMultivariatePolynomial([x,y,z],PrimeField 2)
---E
+--R     Type: Factored(DistributedMultivariatePolynomial([x,y,z],PrimeField(2)))
+--E 134
 
 \end{chunk}
 williamson/04/21/93
@@ -2633,34 +2633,34 @@ SAEFACT.
 --S 135 of 267
 up := UP('w,FRAC INT)
 --R
---R   (1)  UnivariatePolynomial(w,Fraction Integer)
+--R   (1)  UnivariatePolynomial(w,Fraction(Integer))
 --R                                                                 Type: Domain
---E
+--E 135
 
 --S 136 of 267
 p : up := w**4 + w**3 + w**2 + w + 1
 --R
 --R         4    3    2
 --R   (2)  w  + w  + w  + w + 1
---R                               Type: UnivariatePolynomial(w,Fraction Integer)
---E
+--R                              Type: UnivariatePolynomial(w,Fraction(Integer))
+--E 136
 
 --S 137 of 267
 sae := SAE(FRAC INT,up,p)
 --R
 --R   (3)
---R  SimpleAlgebraicExtension(Fraction Integer,UnivariatePolynomial(w,Fraction Int
---R  eger),w**4+w**3+w*w+w+1)
+--R  SimpleAlgebraicExtension(Fraction(Integer),UnivariatePolynomial(w,Fraction(In
+--R  teger)),w^4+w^3+w^2+w+1)
 --R                                                                 Type: Domain
---E
+--E 137
 
 --S 138 of 267
 q : UP('x,sae) := x**5 - 1
 --R
 --R         5
 --R   (4)  x  - 1
---IType: UnivariatePolynomial(x,SimpleAlgebraicExtension(...
---E
+--RType: UnivariatePolynomial(x,SimpleAlgebraicExtension(Fraction(Integer),UnivariatePolynomial(w,Fraction(Integer)),w^4+w^3+w^2+w+1))
+--E 138
 
 \end{chunk}
 Used to report: x**5-1 
@@ -2670,27 +2670,27 @@ factor q
 --R
 --R                            2       3       3    2
 --R   (5)  (x - 1)(x - w)(x - w )(x - w )(x + w  + w  + w + 1)
---IType: Factored UnivariatePolynomial(x,SimpleAlgebraicExtension(...
---E
+--RType: Factored(UnivariatePolynomial(x,SimpleAlgebraicExtension(Fraction(Integer),UnivariatePolynomial(w,Fraction(Integer)),w^4+w^3+w^2+w+1)))
+--E 139
 
 --S 140 of 267
 saefact := SAEFACT(up,sae,UP('x,sae))
 --R
 --R   (6)
---R  SimpleAlgebraicExtensionAlgFactor(UnivariatePolynomial(w,Fraction Integer),Si
---R  mpleAlgebraicExtension(Fraction Integer,UnivariatePolynomial(w,Fraction Integ
---R  er),w**4+w**3+w*w+w+1),UnivariatePolynomial(x,SimpleAlgebraicExtension(Fracti
---R  on Integer,UnivariatePolynomial(w,Fraction Integer),w**4+w**3+w*w+w+1)))
+--R  SimpleAlgebraicExtensionAlgFactor(UnivariatePolynomial(w,Fraction(Integer)),S
+--R  impleAlgebraicExtension(Fraction(Integer),UnivariatePolynomial(w,Fraction(Int
+--R  eger)),w^4+w^3+w^2+w+1),UnivariatePolynomial(x,SimpleAlgebraicExtension(Fract
+--R  ion(Integer),UnivariatePolynomial(w,Fraction(Integer)),w^4+w^3+w^2+w+1)))
 --R                                                                 Type: Domain
---E
+--E 140
 
 --S 141 of 267
 factor(q)$saefact
 --R
 --R                            2       3       3    2
 --R   (7)  (x - 1)(x - w)(x - w )(x - w )(x + w  + w  + w + 1)
---IType: Factored UnivariatePolynomial(x,SimpleAlgebraicExtension(...
---E
+--RType: Factored(UnivariatePolynomial(x,SimpleAlgebraicExtension(Fraction(Integer),UnivariatePolynomial(w,Fraction(Integer)),w^4+w^3+w^2+w+1)))
+--E 141
 
 \end{chunk}
 
@@ -2711,8 +2711,8 @@ Results in 10 and not A
 10::RadixExpansion(16)
 --R
 --R   (1)  A
---R                                                      Type: RadixExpansion 16
---E
+--R                                                     Type: RadixExpansion(16)
+--E 142
 
 \end{chunk}
 bronstei@inf.ethz.ch (manuel bronstein)
@@ -2725,15 +2725,15 @@ Used to return x, now returns 1
 r:=rule 'x == 1
 --R
 --R   (1)  x == 1
---R                        Type: RewriteRule(Integer,Integer,Expression Integer)
---E
+--R                       Type: RewriteRule(Integer,Integer,Expression(Integer))
+--E 143
 
 --S 144 of 267
 r x
 --R
 --R   (2)  1
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 144
 
 \end{chunk}
 ADK@scri.fsu.edu (tony kennedy)
@@ -2746,16 +2746,16 @@ t1:=factor(-12)
 --R
 --R           2
 --R   (1)  - 2 3
---R                                                       Type: Factored Integer
---E
+--R                                                      Type: Factored(Integer)
+--E 145
 
 --S 146 of 267
 t1**2
 --R
 --R         4 2
 --R   (2)  2 3
---R                                                       Type: Factored Integer
---E
+--R                                                      Type: Factored(Integer)
+--E 146
 
 \end{chunk}
 bronstei@inf.ethz.ch (manuel bronstein)
@@ -2768,8 +2768,8 @@ Error: cannot retract nonconstant polynomial
 complexNumeric(log(sqrt(-3)))
 --R
 --R   (1)  0.5493061443 340548457 + 1.5707963267 948966192 %i
---R                                                          Type: Complex Float
---E
+--R                                                         Type: Complex(Float)
+--E 147
 
 \end{chunk}
 quitte@knuth.univ-poitiers.fr/8/15/93 (Claude Quitte)
@@ -2808,7 +2808,6 @@ Your problem in TEST about specifying target types which are Mapping's
 was a bug in the compiler and has been fixed for Axiom release 2.0.
 
 \begin{chunk}{*}
-\begin{verbatim}
 )clear all
 )sys rm -f /tmp/tpd.spad
 )lisp (setq ofile (open "/tmp/tpd.spad" :direction :output))
@@ -2824,7 +2823,6 @@ was a bug in the compiler and has been fixed for Axiom release 2.0.
 )compile /tmp/tpd.spad
 )sys rm -f /tmp/tpd.spad
 )sys rm -rf /tmp/TPD.nrlib
-
 \end{chunk}
 bronstei@inf.ethz.ch/10/6/93 (Manuel Bronstein)
 
@@ -2846,31 +2844,31 @@ sqrt(-1::EXPR FLOAT)
 --R
 --R         +-----+
 --R   (1)  \|- 1.0
---R                                                       Type: Expression Float
---E
+--R                                                      Type: Expression(Float)
+--E 148
 
 --S 149 of 267
 sqrt(2::EXPR FLOAT)
 --R 
 --R
 --R   (2)  1.4142135623 730950488
---R                                                       Type: Expression Float
---E
+--R                                                      Type: Expression(Float)
+--E 149
 
 --S 150 of 267
 nthRoot(-2::EXPR FLOAT, 3)
 --R
 --R   (3)  - 1.2599210498 948731648
---R                                                       Type: Expression Float
---E
+--R                                                      Type: Expression(Float)
+--E 150
 
 --S 151 of 267
 nthRoot(-2::EXPR FLOAT, 4)
 --R
 --R        4+-----+
 --R   (4)  \|- 2.0
---R                                                       Type: Expression Float
---E
+--R                                                      Type: Expression(Float)
+--E 151
 
 \end{chunk}
 bronstei@inf.ethz.ch/10/6/93 (Manuel Bronstein)
@@ -2884,8 +2882,8 @@ real abs(4 + %i * 5)
 --R
 --R         +--+
 --R   (1)  \|41
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 152
 
 \end{chunk}
 bronstei@inf.ethz.ch/10/5/93 (Manuel Bronstein)
@@ -2906,8 +2904,8 @@ exp(5/3*%i*%pi)
 --R        - %i\|3  + 1
 --R   (1)  ------------
 --R              2
---R                                             Type: Expression Complex Integer
---E
+--R                                           Type: Expression(Complex(Integer))
+--E 153
 
 \end{chunk}
 bronstei@inf.ethz.ch/10/4/93 (Manuel Bronstein),\\
@@ -2919,8 +2917,8 @@ luczak@nag.com (Richard Luczak)
 exp(log(-1))
 --R
 --R   (1)  - 1
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 154
 
 --S 155 of 267
 sum((-1)**k * (k+m),k=0..n)
@@ -2929,8 +2927,8 @@ sum((-1)**k * (k+m),k=0..n)
 --R        (2n + 2m + 1)(- 1)  + 2m - 1
 --R   (2)  ----------------------------
 --R                      4
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 155
 
 \end{chunk}
 bronstei@inf.ethz.ch/10/4/93 (Manuel Bronstein)
@@ -2945,8 +2943,8 @@ abs((1/2)::EXPR(INT))
 --R        1
 --R   (1)  -
 --R        2
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 156
 
 \end{chunk}
 bronstei@inf.ethz.ch/10/4/93 (Manuel Bronstein)
@@ -2962,8 +2960,8 @@ integrate(1/(x**2 + %i*a),x)
 --R        \| a         \| a         \| a           \| a
 --R   (1)  ---------------------------------------------------
 --R                                 2
---R                                  Type: Union(Expression Complex Integer,...)
---E
+--R                                Type: Union(Expression(Complex(Integer)),...)
+--E 157
 
 \end{chunk}
 bmt@spadserv.watson.ibm.com/9/28/93 (Barry Trager)
@@ -2974,8 +2972,8 @@ bmt@spadserv.watson.ibm.com/9/28/93 (Barry Trager)
 limit(1/2**n,n=%plusInfinity)
 --R
 --R   (1)  0
---R                        Type: Union(OrderedCompletion Expression Integer,...)
---E
+--R                      Type: Union(OrderedCompletion(Expression(Integer)),...)
+--E 158
 
 \end{chunk}
 bronstei@inf.ethz.ch/9/22/93 (Manuel Bronstein)
@@ -2995,23 +2993,23 @@ x := sqrt(-3) + sqrt 2 + sqrt(- exp a) + log(-a**2-1)
 --R         +-----+
 --R         |    a           2         +-+    +---+
 --R   (1)  \|- %e   + log(- a  - 1) + \|2  + \|- 3
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 159
 
 --S 160 of 267
 real? x
 --R
 --R   (2)  false
 --R                                                                Type: Boolean
---E
+--E 160
 
 --S 161 of 267
 real x
 --R
 --R             2         +-+
 --R   (3)  log(a  + 1) + \|2
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 161
 
 --S 162 of 267
 imag x
@@ -3019,8 +3017,8 @@ imag x
 --R         +---+
 --R         |  a     +-+
 --R   (4)  \|%e   + \|3  + %pi
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 162
 
 \end{chunk}
 bronstei@inf.ethz.ch/9/22/93 (Manuel Bronstein)
@@ -3046,36 +3044,36 @@ haha := rule x*x == z
 --R
 --R         2
 --R   (1)  x  == z
---R                        Type: RewriteRule(Integer,Integer,Expression Integer)
---E
+--R                       Type: RewriteRule(Integer,Integer,Expression(Integer))
+--E 163
 
 --S 164 of 267
 haha 4
 --R
 --R   (2)  z
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 164
 
 --S 165 of 267
 haha 3
 --R
 --R   (3)  3
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 165
 
 --S 166 of 267
 haha(4*z)
 --R
 --R   (4)  z
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 166
 
 --S 167 of 267
 haha(3*z)
 --R
 --R   (5)  3z
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 167
 
 \end{chunk}
 To see the whole rewrite chain:
@@ -3086,30 +3084,30 @@ t1:=a*a + b*b + c**2 + d*d
 --R
 --R         2    2    2    2
 --R   (6)  d  + c  + b  + a
---R                                                     Type: Polynomial Integer
---E
+--R                                                    Type: Polynomial(Integer)
+--E 168
 
 --S 169 of 267
 t2:=applyRules([haha], t1, 1)$APPRULE(INT,INT,EXPR INT)
 --R
 --R   (7)  4z
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 169
 
 --S 170 of 267
 t3:=applyRules([haha], t2, 1)$APPRULE(INT,INT,EXPR INT)
 --R
 --R         2
 --R   (8)  z
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 170
 
 --S 171 of 267
 t4:=applyRules([haha], t3, 1)$APPRULE(INT,INT,EXPR INT)
 --R
 --R   (9)  z
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 171
 
 \end{chunk}
 I think it's actually the proper behavior for the pattern matcher. This
@@ -3125,21 +3123,21 @@ There's an odd discontinuity about the behaviour of the following function:
 --S 172 of 267
 harm(1) == 1
 --R                                                                   Type: Void
---E
+--E 172
 
 --S 173 of 267
 harm(n) == harm(n-1) + 1/n
 --R                                                                   Type: Void
---E
+--E 173
 
 --S 174 of 267
 harm : Integer -> Fraction Integer
 --R                                                                   Type: Void
---E
+--E 174
 
 --S 175 of 267
 harm(1023)
---R   Compiling function harm with type Integer -> Fraction Integer 
+--R   Compiling function harm with type Integer -> Fraction(Integer) 
 --R   Compiling function harm as a recurrence relation.
 --R
 --R   (4)
@@ -3158,8 +3156,8 @@ harm(1023)
 --R     3824612373575784564285126841732340269099782510311467722310664215128464192_
 --R     0090417465131869897386008931792841181410706392968052396422445537614139284_
 --R     160000
---R                                                       Type: Fraction Integer
---E
+--R                                                      Type: Fraction(Integer)
+--E 175
 
 --S 176 of 267
 harm(1024)
@@ -3180,8 +3178,8 @@ harm(1024)
 --R     6764922474715156912857025368346468053819956502062293544462132843025692838_
 --R     4018083493026373979477201786358568236282141278593610479284489107522827856_
 --R     8320000
---R                                                       Type: Fraction Integer
---E
+--R                                                      Type: Fraction(Integer)
+--E 176
 
 \end{chunk}
 williams@inf.ethz.ch/9/1/93 (Clifton Williamson)
@@ -3208,8 +3206,8 @@ t1:=series(x**x,x=0)
 --R     log(x)   6   log(x)   7   log(x)   8   log(x)   9   log(x)    10      11
 --R     ------- x  + ------- x  + ------- x  + ------- x  + -------- x   + O(x  )
 --R       720          5040        40320        362880       3628800
---R                   Type: GeneralUnivariatePowerSeries(Expression Integer,x,0)
---E
+--R                  Type: GeneralUnivariatePowerSeries(Expression(Integer),x,0)
+--E 177
 
 \end{chunk}
 In this case, as currently implemented, 'differentiate' returns incorrect
@@ -3218,11 +3216,36 @@ answers:
 
 --S 178 of 267
 differentiate t1
- 
-   >> Error detected within library code:
-   "'differentiate' unavailable on this domain;  use 'approximate' first"
-
---E
+--R 
+--R   >> Error detected within library code:
+--R   "'differentiate' unavailable on this domain;  use 'approximate' first"
+--R 
+--I  Line2690: --R
+--I  Line2691: --R   (1)
+--I  Line2692: --R                         2            3            4            5
+--I  Line2693: --R                   log(x)   2   log(x)   3   log(x)   4   log(x)   5
+--I  Line2694: --R     1 + log(x)x + ------- x  + ------- x  + ------- x  + ------- x
+--I  Line2695: --R                      2            6            24          120
+--I  Line2696: --R   + 
+--I  Line2697: --R           6            7            8            9            10
+--I  Line2698: --R     log(x)   6   log(x)   7   log(x)   8   log(x)   9   log(x)    10      11
+--I  Line2699: --R     ------- x  + ------- x  + ------- x  + ------- x  + -------- x   + O(x  )
+--I  Line2700: --R       720          5040        40320        362880       3628800
+--I  Line2701: --R                   Type: GeneralUnivariatePowerSeries(Expression Integer,x,0)
+--I  Line2702: --E 178
+--I  Line2703: 
+--I  Line2704: 
+--I  Line2705: --S 178 of 267
+--I  Line2706: differentiate t1
+--I  Line2707:  
+--I  Line2708:    >> Error detected within library code:
+--I           ...A....................................B
+--I  Error  A: (from #\A up to #\B) Ignored.
+--I  Error  B: Improper syntax.
+--I  Line2709:    "'differentiate' unavailable on this domain;  use 'approximate' first"
+--I   2 error(s) parsing 
+--I
+--E 178
 
 \end{chunk}
 The solution we discussed (perhaps ``resolution'' is a better word) was to
@@ -3268,8 +3291,8 @@ t1:=laurent(cos(a+x)/x,x=0)
 --R       cos(a)  5   sin(a)  6   cos(a)  7   sin(a)  8    cos(a)  9      10
 --R     - ------ x  + ------ x  + ------ x  - ------ x  - ------- x  + O(x  )
 --R         720        5040        40320      362880      3628800
---R                        Type: UnivariateLaurentSeries(Expression Integer,x,0)
---E
+--R                       Type: UnivariateLaurentSeries(Expression(Integer),x,0)
+--E 179
 
 --S 180 of 267
 approximate(t1,3)
@@ -3278,8 +3301,8 @@ approximate(t1,3)
 --R        (4x  - 24x)sin(a) + (x  - 12x  + 24)cos(a)
 --R   (2)  ------------------------------------------
 --R                            24x
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 180
 
 \end{chunk}
 But, unfortunately, I never implemented it for Puiseux series:
@@ -3296,8 +3319,8 @@ t2:=puiseux(cos(a+x)/x,x=0)
 --R       cos(a)  5   sin(a)  6   cos(a)  7   sin(a)  8    cos(a)  9      10
 --R     - ------ x  + ------ x  + ------ x  - ------ x  - ------- x  + O(x  )
 --R         720        5040        40320      362880      3628800
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
---E
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
+--E 181
 
 --S 182 of 267
 approximate(t2,3)
@@ -3306,8 +3329,8 @@ approximate(t2,3)
 --R        (4x  - 24x)sin(a) + (x  - 12x  + 24)cos(a)
 --R   (4)  ------------------------------------------
 --R                            24x
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 182
 
 --S 183 of 267
 t3:=series(cos(x**(2/3) + a),x=0)
@@ -3318,8 +3341,8 @@ t3:=series(cos(x**(2/3) + a),x=0)
 --R                   3   cos(a)  3   sin(a)  2   cos(a)  3   sin(a)   3       3
 --R   cos(a) - sin(a)x  - ------ x  + ------ x  + ------ x  - ------ x   + O(x  )
 --R                          2           6          24          120
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
---E
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
+--E 183
 
 --S 184 of 267
 approximate(t3,2)
@@ -3328,8 +3351,8 @@ approximate(t3,2)
 --R        - 6sin(a)\|x   - 3x cos(a)\|x  + x sin(a) + 6cos(a)
 --R   (6)  ---------------------------------------------------
 --R                                 6
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 184
 
 --S 185 of 267
 approximate(t1,7)
@@ -3342,8 +3365,8 @@ approximate(t1,7)
 --R       (x  - 56x  + 1680x  - 20160x  + 40320)cos(a)
 --R  /
 --R     40320x
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 185
 
 \end{chunk}
 bronstei@inf.ethz.ch/10/6/93 (manuel bronstein)
@@ -3363,30 +3386,30 @@ sqrt(-1::EXPR FLOAT)
 --R
 --R         +-----+
 --R   (1)  \|- 1.0
---R                                                       Type: Expression Float
---E
+--R                                                      Type: Expression(Float)
+--E 186
 
 --S 187 of 267
 sqrt(2::EXPR FLOAT)
 --R
 --R   (2)  1.4142135623 730950488
---R                                                       Type: Expression Float
---E
+--R                                                      Type: Expression(Float)
+--E 187
 
 --S 188 of 267
 nthRoot(-2::EXPR FLOAT, 3)
 --R
 --R   (3)  - 1.2599210498 948731648
---R                                                       Type: Expression Float
---E
+--R                                                      Type: Expression(Float)
+--E 188
 
 --S 189 of 267
 nthRoot(-2::EXPR FLOAT, 4)
 --R
 --R        4+-----+
 --R   (4)  \|- 2.0
---R                                                       Type: Expression Float
---E
+--R                                                      Type: Expression(Float)
+--E 189
 
 \end{chunk}
 As a side-effect, this fixes the problem with numeric\hfill\\
@@ -3431,7 +3454,6 @@ jhd@maths.bath.ac.uk/8/15/93 James Davenport
                             1
       ( Or (a - 1=0) -> - ------)
            (a + 1=0)      log(x)
-                                          Type: ConditionalExpression Integer
 
 \end{verbatim}
 is still fairly ugly.
@@ -3453,8 +3475,8 @@ integrate(1/(x*(log(x)**2+a**2-1)),x)
 --R                          +--------+                            +------+
 --R                          |   2                                 | 2
 --R                        2\|- a  + 1                            \|a  - 1
---R                                     Type: Union(List Expression Integer,...)
---E
+--R                                   Type: Union(List(Expression(Integer)),...)
+--E 190
 
 \end{chunk}
 bronstei@inf.ethz.ch/8/9/93 (manuel bronstein)
@@ -3469,8 +3491,8 @@ normalize(2**(1/2) + 2**(1/4))
 --R
 --R        4+-+2   4+-+
 --R   (1)  \|2   + \|2
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 191
 
 \end{chunk}
 
@@ -3486,15 +3508,15 @@ Isn't this a bug?
 integrate(%e**x,x=0..1)
 --R
 --R   (1)  %e - 1
---R                    Type: Union(f1: OrderedCompletion Expression Integer,...)
---E
+--R                  Type: Union(f1: OrderedCompletion(Expression(Integer)),...)
+--E 192
 
 --S 913 of 267
 integrate(log(x),x=1..2)
 --R
 --R   (2)  log(4) - 1
---R                    Type: Union(f1: OrderedCompletion Expression Integer,...)
---E
+--R                  Type: Union(f1: OrderedCompletion(Expression(Integer)),...)
+--E 193
 
 \end{chunk}
 
@@ -3509,8 +3531,8 @@ simplify(2**(1/3)*2**(1/2)) --
 --R
 --R        6+-+5
 --R   (1)  \|2
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 194
 
 \end{chunk}
 bronstei@inf.ethz.ch/8/4/93 (manuel bronstein)
@@ -3527,8 +3549,8 @@ integrate(1/sqrt(1+cos(x)), x)
 --R                              cos(x)  + 2cos(x) + 1
 --R   (1)  ---------------------------------------------------------
 --R                                    2
---R                                          Type: Union(Expression Integer,...)
---E
+--R                                         Type: Union(Expression(Integer),...)
+--E 195
 
 \end{chunk}
 bronstei@inf.ethz.ch/8/4/93 (manuel bronstein)
@@ -3543,8 +3565,8 @@ normalize atan(cos(x)/sin(x))
 --R        - 2x + %pi
 --R   (1)  ----------
 --R             2
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 196
 
 \end{chunk}
 
@@ -3558,15 +3580,15 @@ a := 2**(1/6)
 --R        6+-+
 --R   (1)  \|2
 --R                                                        Type: AlgebraicNumber
---E
+--E 197
 
 --S 198 of 267
 [a**n for n in 2..13]
 --R
 --R         6+-+2 6+-+3 6+-+4 6+-+5    6+-+  6+-+2  6+-+3  6+-+4  6+-+5    6+-+
 --R   (2)  [\|2  ,\|2  ,\|2  ,\|2  ,2,2\|2 ,2\|2  ,2\|2  ,2\|2  ,2\|2  ,4,4\|2 ]
---R                                                   Type: List AlgebraicNumber
---E
+--R                                                  Type: List(AlgebraicNumber)
+--E 198
 
 \end{chunk}
 
@@ -3585,8 +3607,8 @@ int:=sqrt(a*(1-u**2)/(1+u**2))/u
 --R        \|  u  + 1
 --R   (1)  -------------
 --R              u
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 199
 
 --S 200 of 267
 integrate(eval(int,a=1),u) 
@@ -3602,8 +3624,8 @@ integrate(eval(int,a=1),u)
 --R                       u                                u
 --R   (2)  -------------------------------------------------------------
 --R                                      2
---R                                          Type: Union(Expression Integer,...)
---E
+--R                                         Type: Union(Expression(Integer),...)
+--E 200
 
 \end{chunk}
 Runs forever?
@@ -3649,8 +3671,8 @@ integrate(eval(int,a=sqrt(-1)),u)
 --R                                        u \|- 1 \|2
 --R  /
 --R     4
---R                                          Type: Union(Expression Integer,...)
---E
+--R                                         Type: Union(Expression(Integer),...)
+--E 201
 
 \end{chunk}
 Dies after a long time with an elt index error
@@ -3690,8 +3712,8 @@ integrate(eval(int,a=1)*(-1)**(1/4),u)
 --R                                           u \|- 1
 --R  /
 --R     4
---R                                          Type: Union(Expression Integer,...)
---E
+--R                                         Type: Union(Expression(Integer),...)
+--E 202
 
 \end{chunk}
 bronstei@inf.ethz.ch/8/4/93 (manuel bronstein)
@@ -3704,8 +3726,8 @@ t1:=sqrt((1-x**2)*(1-k**2*x**2))
 --R         +-----------------------+
 --R         | 2 4       2      2
 --R   (1)  \|k x  + (- k  - 1)x  + 1
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 203
 
 --S 204 of 267
 integrate(x/t1,x)
@@ -3715,8 +3737,8 @@ integrate(x/t1,x)
 --R          log(2k\|k x  + (- k  - 1)x  + 1  - 2k x  + k  + 1)
 --R   (2)  - --------------------------------------------------
 --R                                  2k
---R                                          Type: Union(Expression Integer,...)
---E
+--R                                         Type: Union(Expression(Integer),...)
+--E 204
 
 \end{chunk}
 bronstei@inf.ethz.ch/7/26/93 (manuel bronstein)
@@ -3732,8 +3754,8 @@ t1:=last zerosOf((2+y)**8-3,y)
 --R        - \|- 2\|- 4\|3    - 4
 --R   (1)  ----------------------
 --R                   2
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 205
 
 --S 206 of 267
 k:=first kernels t1
@@ -3742,8 +3764,8 @@ k:=first kernels t1
 --R         |    +-------+
 --R         |    |    +-+
 --R   (2)  \|- 2\|- 4\|3
---R                                              Type: Kernel Expression Integer
---E
+--R                                            Type: Kernel(Expression(Integer))
+--E 206
 
 --S 207 of 267
 eval(t1,k,t1)
@@ -3754,8 +3776,8 @@ eval(t1,k,t1)
 --R        \|- 2\|- 4\|3    - 4
 --R   (3)  --------------------
 --R                  4
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 207
 
 \end{chunk}
 nagttt@vax.ox.ac.uk/7/15/93 themos tsikas
@@ -3768,8 +3790,8 @@ f := (x - y) / (x + y)
 --R        - y + x
 --R   (1)  -------
 --R         y + x
---R                                            Type: Fraction Polynomial Integer
---E
+--R                                          Type: Fraction(Polynomial(Integer))
+--E 208
 
 --S 209 of 267
 eval(f,x=1/x)
@@ -3777,8 +3799,8 @@ eval(f,x=1/x)
 --R        - x y + 1
 --R   (2)  ---------
 --R         x y + 1
---R                                            Type: Fraction Polynomial Integer
---E
+--R                                          Type: Fraction(Polynomial(Integer))
+--E 209
 
 \end{chunk}
 nagttt@vax.ox.ac.uk/7/15/93 themos tsikas
@@ -3794,7 +3816,7 @@ digits 200
 --R
 --R   (1)  20
 --R                                                        Type: PositiveInteger
---E
+--E 210
 
 --S 211 of 267
 a:=4*sin(2*%pi/9)*sin(5*%pi/9)/sqrt(3)
@@ -3805,8 +3827,8 @@ a:=4*sin(2*%pi/9)*sin(5*%pi/9)/sqrt(3)
 --R   (2)  -------------------
 --R                 +-+
 --R                \|3
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 211
 
 --S 212 of 267
 b:=1/(2*sin(%pi/9))
@@ -3816,8 +3838,8 @@ b:=1/(2*sin(%pi/9))
 --R             %pi
 --R        2sin(---)
 --R              9
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 212
 
 --S 213 of 267
 a::EXPR FLOAT
@@ -3826,8 +3848,8 @@ a::EXPR FLOAT
 --R  1.4619022000 8154362611 6377206683 1458519367 5283075946 2240855318 493177672
 --R  5 8139967590 4919627790 5155131563 5927196029 5136978338 4351923544 366777748
 --R  4 3145835284 9347399264 0517928099 4530246377 7454860377 762537213
---R                                                       Type: Expression Float
---E
+--R                                                      Type: Expression(Float)
+--E 213
 
 --S 214 of 267
 b::EXPR FLOAT
@@ -3836,15 +3858,15 @@ b::EXPR FLOAT
 --R  1.4619022000 8154362611 6377206683 1458519367 5283075946 2240855318 493177672
 --R  5 8139967590 4919627790 5155131563 5927196029 5136978338 4351923544 366777748
 --R  4 3145835284 9347399264 0517928099 4530246377 7454860377 762537213
---R                                                       Type: Expression Float
---E
+--R                                                      Type: Expression(Float)
+--E 214
 
 --S 215 of 267
 digits 20
 --R
 --R   (6)  200
 --R                                                        Type: PositiveInteger
---E
+--E 215
 \end{chunk}
 bmt@spadserv.watson.ibm.com/9/15/93 (Barry Trager)
 \begin{chunk}{*}
@@ -3854,8 +3876,8 @@ bmt@spadserv.watson.ibm.com/9/15/93 (Barry Trager)
 limit(tanh(x),x=%plusInfinity)
 --R
 --R   (1)  1
---R                        Type: Union(OrderedCompletion Expression Integer,...)
---E
+--R                      Type: Union(OrderedCompletion(Expression(Integer)),...)
+--E 216
 
 \end{chunk}
 bronstei@inf.ethz.ch/6/14/93 (manuel bronstein)
@@ -3866,15 +3888,15 @@ bronstei@inf.ethz.ch/6/14/93 (manuel bronstein)
 a := x::EXPR INT
 --R
 --R   (1)  x
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 217
 
 --S 218 of 267
 b := x::EXPR COMPLEX INT
 --R
 --R   (2)  x
---R                                             Type: Expression Complex Integer
---E
+--R                                           Type: Expression(Complex(Integer))
+--E 218
 
 --S 219 of 267
 zeroOf(a**4+1,x)
@@ -3884,8 +3906,8 @@ zeroOf(a**4+1,x)
 --R   (3)  ----------
 --R            +-+
 --R           \|2
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 219
 
 --S 220 of 267
 zeroOf(b**4+1,x)
@@ -3894,8 +3916,8 @@ zeroOf(b**4+1,x)
 --R   (4)  ------
 --R          +-+
 --R         \|2
---R                                             Type: Expression Complex Integer
---E
+--R                                           Type: Expression(Complex(Integer))
+--E 220
 
 \end{chunk}
 bronstei@inf.ethz.ch/6/11/93 (manuel bronstein)
@@ -3908,8 +3930,8 @@ Now returns 0  (was crashing before)
 normalize(0**a)
 --R
 --R   (1)  0
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 221
 
 \end{chunk}
 bronstei@inf.ethz.ch/6/11/93 (manuel bronstein)
@@ -3922,8 +3944,8 @@ New export ``complexForm(f)'' which returns the rectangular complex form of f:
 t1:=log(a+%i * b)
 --R
 --R   (1)  log(%i b + a)
---R                                             Type: Expression Complex Integer
---E
+--R                                           Type: Expression(Complex(Integer))
+--E 222
 
 --S 223 of 267
 complexForm t1
@@ -3932,15 +3954,15 @@ complexForm t1
 --R        log(b  + a )        b
 --R   (2)  ------------ + atan(-)%i
 --R              2             a
---R                                             Type: Complex Expression Integer
---E
+--R                                           Type: Complex(Expression(Integer))
+--E 223
 
 --S 224 of 267
 t2:=complexIntegrate(1/(x-%i),x)
 --R
 --R   (3)  log(x - %i)
---R                                             Type: Expression Complex Integer
---E
+--R                                           Type: Expression(Complex(Integer))
+--E 224
 
 --S 225 of 267
 complexForm t2
@@ -3949,8 +3971,8 @@ complexForm t2
 --R        log(x  + 1)        1
 --R   (4)  ----------- - atan(-)%i
 --R             2             x
---R                                             Type: Complex Expression Integer
---E
+--R                                           Type: Complex(Expression(Integer))
+--E 225
 
 \end{chunk}
 jcf@posso.ibp.fr
@@ -3964,28 +3986,28 @@ D:=DMP([a,b],INT)
 --R
 --R   (1)  DistributedMultivariatePolynomial([a,b],Integer)
 --R                                                                 Type: Domain
---E
+--E 226
 
 --S 227 of 267
 l:List D:=[2*a-1,b-a]
 --R
 --R   (2)  [2a - 1,- a + b]
---R                  Type: List DistributedMultivariatePolynomial([a,b],Integer)
---E
+--R                 Type: List(DistributedMultivariatePolynomial([a,b],Integer))
+--E 227
 
 --S 228 of 267
 g:=groebner l
 --R
 --R   (3)  [2a - 1,2b - 1]
---R                  Type: List DistributedMultivariatePolynomial([a,b],Integer)
---E
+--R                 Type: List(DistributedMultivariatePolynomial([a,b],Integer))
+--E 228
 
 --S 229 of 267
 p:D:=a
 --R
 --R   (4)  a
 --R                       Type: DistributedMultivariatePolynomial([a,b],Integer)
---E
+--E 229
 
 \end{chunk}
 Was 1, au lieu de 1/2 !!
@@ -3996,8 +4018,8 @@ normalForm(p,g)
 --R        1
 --R   (5)  -
 --R        2
---R              Type: DistributedMultivariatePolynomial([a,b],Fraction Integer)
---E
+--R             Type: DistributedMultivariatePolynomial([a,b],Fraction(Integer))
+--E 230
 
 \end{chunk}
 nagttt@vax.ox.ac.uk/6/9/93 themos tsikas
@@ -4009,7 +4031,7 @@ squareFreePart(50)
 --R
 --R   (1)  10
 --R                                                        Type: PositiveInteger
---E
+--E 231
 
 \end{chunk}
 
@@ -4021,15 +4043,15 @@ mcd@maths.bath.ac.uk/6/4/92 mike dewar
 f:=complexIntegrate(1/((x-%i)*(x-2*%i)),x)
 --R
 --R   (1)  %i log(x - %i) - %i log(x - 2%i)
---R                                             Type: Expression Complex Integer
---E
+--R                                           Type: Expression(Complex(Integer))
+--E 232
 
 --S 233 of 267
 g:=subst(f,x=1)
 --R
 --R   (2)  %i log(1 - %i) - %i log(1 - 2%i)
---R                                             Type: Expression Complex Integer
---E
+--R                                           Type: Expression(Complex(Integer))
+--E 233
 
 --S 234 of 267
 imag g
@@ -4037,8 +4059,8 @@ imag g
 --R        - log(5) + log(2)
 --R   (3)  -----------------
 --R                2
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 234
 
 \end{chunk}
 daly - not wrong but the order is obscure...
@@ -4049,8 +4071,8 @@ daly - not wrong but the order is obscure...
 primes(1,10)
 --R
 --R   (1)  [2,7,5,3]
---R                                                           Type: List Integer
---E
+--R                                                          Type: List(Integer)
+--E 235
 
 \end{chunk}
 nagttt@vax.ox.ac.uk/1/11/93 themos tsikas
@@ -4065,8 +4087,8 @@ m:=matrix[[1,a,0],[b,0,a],[0,b,c]]
 --R   (1)  |b  0  a|
 --R        |       |
 --R        +0  b  c+
---R                                              Type: Matrix Polynomial Integer
---E
+--R                                            Type: Matrix(Polynomial(Integer))
+--E 236
 
 \end{chunk}
 This ends in error:
@@ -4892,8 +4914,8 @@ ll:=radicalEigenvectors m
 --R           ]
 --R       ]
 --R     ]
---IType: List Record(radval: Expression Integer,radmult: Integer,...
---E
+--RType: List(Record(radval: Expression(Integer),radmult: Integer,radvect: List(Matrix(Expression(Integer)))))
+--E 237
 
 \end{chunk}
 but this works
@@ -5157,8 +5179,8 @@ ll 1
 --R    [1]]
 --R         ]
 --R     ]
---IType: Record(radval: Expression Integer,radmult: Integer,...
---E
+--RType: Record(radval: Expression(Integer),radmult: Integer,radvect: List(Matrix(Expression(Integer))))
+--E 238
 
 --S 239 of 267
 ll 2
@@ -5437,8 +5459,8 @@ ll 2
 --R    [1]]
 --R         ]
 --R     ]
---IType: Record(radval: Expression Integer,radmult: Integer,...
---E
+--RType: Record(radval: Expression(Integer),radmult: Integer,radvect: List(Matrix(Expression(Integer))))
+--E 239
 
 --S 240 of 267
 ll 3
@@ -5717,8 +5739,8 @@ ll 3
 --R    [1]]
 --R         ]
 --R     ]
---IType: Record(radval: Expression Integer,radmult: Integer,...
---E
+--RType: Record(radval: Expression(Integer),radmult: Integer,radvect: List(Matrix(Expression(Integer))))
+--E 240
 
 \end{chunk}
 bronstei@inf.ethz.ch/11/24/93 Manuel Bronstein
@@ -5806,36 +5828,36 @@ qrimes : Stream Integer := generate(nextPrime,2**512-5000)
 --R     06081129
 --R     ,
 --R    ...]
---R                                                         Type: Stream Integer
---E
+--R                                                        Type: Stream(Integer)
+--E 241
 
 --S 242 of 267
 rrimes := [ 2**512-p for p in qrimes while p < 2**512 ]
 --R
 --R   (2)  [5000,4893,4653,4475,4005,3893,3669,3459,3143,2967,...]
---R                                                         Type: Stream Integer
---E
+--R                                                        Type: Stream(Integer)
+--E 242
 
 --S 243 of 267
 srimes := complete rrimes
 --R
 --R   (3)  [5000,4893,4653,4475,4005,3893,3669,3459,3143,2967,...]
---R                                                         Type: Stream Integer
---E
+--R                                                        Type: Stream(Integer)
+--E 243
 
 --S 244 of 267
 [srimes.i for i in [1..18]]
 --R
 --R   (4)  [[5000,4893,4653,4475,4005,3893,3669,3459,3143,2967,...]]
---R                                                    Type: List Stream Integer
---E
+--R                                                  Type: List(Stream(Integer))
+--E 244
 
 --S 245 of 267
 [srimes.i for i in [10..18]]
 --R
 --R   (5)  [[2967,2807,2529,1827,1695,975,875,629,569]]
---R                                                    Type: List Stream Integer
---E
+--R                                                  Type: List(Stream(Integer))
+--E 245
 
 \end{chunk}
 miker@num-alg-grp.co.uk/12/13/93 (Mike Richardson)
@@ -5856,8 +5878,8 @@ I suspect that this is an example of the same thing - but it looks worse:
 X := log(0.7*%i*x)
 --R
 --R   (1)  log(0.7 %i x)
---R                                               Type: Expression Complex Float
---E
+--R                                             Type: Expression(Complex(Float))
+--E 246
 
 \end{chunk}
 
@@ -5880,7 +5902,7 @@ log2() --> Float
 --R
 --R   (1)  0.6931471805 5994530942
 --R                                                                  Type: Float
---E
+--E 247
 
 --S 248 of 267
 exp1() --> DoubleFLoat ???
@@ -5888,7 +5910,7 @@ exp1() --> DoubleFLoat ???
 --R
 --R   (2)  2.7182818284 590452354
 --R                                                                  Type: Float
---E
+--E 248
 
 \end{chunk}
 quitte@knuth.univ-poitiers.fr/12/14/93 Claude Quitte
@@ -5926,36 +5948,36 @@ A little session :
 L : List(String) := ["There is", "it seems", "a real bug", "here"]
 --R
 --R   (1)  ["There is","it seems","a real bug","here"]
---R                                                            Type: List String
---E
+--R                                                           Type: List(String)
+--E 249
 
 --S 250 of 267
 L1 := delete!(L, 1)
 --R
 --R   (2)  ["it seems","a real bug","here"]
---R                                                            Type: List String
---E
+--R                                                           Type: List(String)
+--E 250
 
 --S 251 of 267
 L
 --R
 --R   (3)  ["There is","it seems","a real bug","here"]
---R                                                            Type: List String
---E
+--R                                                           Type: List(String)
+--E 251
 
 --S 252 of 267
 L2 := delete!(L, 2)
 --R
 --R   (4)  ["There is","a real bug","here"]
---R                                                            Type: List String
---E
+--R                                                           Type: List(String)
+--E 252
 
 --S 253 of 267
 L
 --R
 --R   (5)  ["There is","a real bug","here"]
---R                                                            Type: List String
---E
+--R                                                           Type: List(String)
+--E 253
 
 \end{chunk}
 \begin{verbatim}
@@ -5985,54 +6007,54 @@ quitte@knuth.univ-poitiers.fr/1/13/94 Claude Quitte
 --S 254 of 267
 K := Fraction(Integer)   
 --R
---R   (1)  Fraction Integer
+--R   (1)  Fraction(Integer)
 --R                                                                 Type: Domain
---E
+--E 254
 
 --S 255 of 267
 PolK := UP('X, K) 
 --R
---R   (2)  UnivariatePolynomial(X,Fraction Integer)
+--R   (2)  UnivariatePolynomial(X,Fraction(Integer))
 --R                                                                 Type: Domain
---E
+--E 255
 
 --S 256 of 267
 X : PolK := monomial(1, 1) 
 --R
 --R   (3)  X
---R                               Type: UnivariatePolynomial(X,Fraction Integer)
---E
+--R                              Type: UnivariatePolynomial(X,Fraction(Integer))
+--E 256
 
 --S 257 of 267
 n : PositiveInteger := 15 
 --R
 --R   (4)  15
 --R                                                        Type: PositiveInteger
---E
+--E 257
 
 --S 258 of 267
 E := SimpleAlgebraicExtension(K, PolK, X**n + X**(n-3) -1) 
 --R
 --R   (5)
---R  SimpleAlgebraicExtension(Fraction Integer,UnivariatePolynomial(X,Fraction Int
---R  eger),X**15+X**12-1)
+--R  SimpleAlgebraicExtension(Fraction(Integer),UnivariatePolynomial(X,Fraction(In
+--R  teger)),X^15+X^12+-1)
 --R                                                                 Type: Domain
---E
+--E 258
 
 --S 259 of 267
 y : E := X::E
 --R
 --R   (6)  X
---IType: SimpleAlgebraicExtension(Fraction Integer,UnivariatePolynomial(...
---E
+--RType: SimpleAlgebraicExtension(Fraction(Integer),UnivariatePolynomial(X,Fraction(Integer)),X^15+X^12+-1)
+--E 259
 
 --S 260 of 267
 minimalPolynomial(y)$E
 --R
 --R         15    12
 --R   (7)  X   + X   - 1
---R                               Type: UnivariatePolynomial(X,Fraction Integer)
---E
+--R                              Type: UnivariatePolynomial(X,Fraction(Integer))
+--E 260
 
 \end{chunk}
 \begin{verbatim}
@@ -6058,8 +6080,8 @@ tr := rule cos(x)**(n | integer? n and even? n)==(1-sin(x)**2)**(n/2)
 --R                                  -
 --R              n             2     2
 --R   (1)  cos(x)  == (- sin(x)  + 1)
---R                        Type: RewriteRule(Integer,Integer,Expression Integer)
---E
+--R                       Type: RewriteRule(Integer,Integer,Expression(Integer))
+--E 261
 
 \end{chunk}
 Axiom returns
@@ -6072,7 +6094,7 @@ Axiom returns
                                   -
               n             2     2
    (2)  cos(x)  == (- sin(x)  + 1)
-                        Type: RewriteRule(Integer,Integer,Expression Integer)
+
 
 \end{verbatim}
 and henceforth the rule does not work as desired. Variations on the same bug
@@ -6177,16 +6199,16 @@ sqrt(2)*2.0 -- fails
 --R 
 --R
 --R   (1)  2.8284271247 461900976
---R                                                       Type: Expression Float
---E
+--R                                                      Type: Expression(Float)
+--E 262
 
 --S 263 of 267
 sqrt(2)::EXPR INT * 2.0 -- works
 --R 
 --R
 --R   (2)  2.8284271247 461900976
---R                                                       Type: Expression Float
---E
+--R                                                      Type: Expression(Float)
+--E 263
 
 \end{chunk}
 tpd: this now fails with sample : () -> Reference Integer is missing
@@ -6211,8 +6233,8 @@ f := exp(exp(x)*exp(1/exp(x))) / exp exp x
 --R               x
 --R             %e
 --R           %e
---R                                                     Type: Expression Integer
---E
+--R                                                    Type: Expression(Integer)
+--E 264
 
 \end{chunk}
 \begin{verbatim}
@@ -6235,8 +6257,8 @@ You can now do things like
 [1,2,3] :: DirectProduct(3, Fraction Integer)
 --R
 --R   (1)  [1,2,3]
---R                                      Type: DirectProduct(3,Fraction Integer)
---E
+--R                                     Type: DirectProduct(3,Fraction(Integer))
+--E 265
 
 \end{chunk}
 I also fixed coercions from Vector to List, which seems to have
@@ -6253,8 +6275,8 @@ x**10+1::Polynomial PrimeField 2
 --R
 --R         10
 --R   (1)  x   + 1
---R                                                Type: Polynomial PrimeField 2
---E
+--R                                              Type: Polynomial(PrimeField(2))
+--E 266
 
 \end{chunk}
 themos@num-alg-grp.co.uk/03/11/94 Themos Tsikas
@@ -6264,7 +6286,7 @@ themos@num-alg-grp.co.uk/03/11/94 Themos Tsikas
 --S 267 of 267
 f(x)==x**2
 --R                                                                   Type: Void
---E
+--E 267
 
 \end{chunk}
 draw(f,-1..1)
diff --git a/src/input/float1.input.pamphlet b/src/input/float1.input.pamphlet
index 97087ca..7a75037 100644
--- a/src/input/float1.input.pamphlet
+++ b/src/input/float1.input.pamphlet
@@ -69,7 +69,7 @@ i :: Fraction Integer
 --R 
 --R
 --R   (3)  3
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 6
 
 --S 7 of 37
@@ -87,7 +87,7 @@ r :: Fraction Integer
 --R        3
 --R   (5)  -
 --R        7
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 8
 
 --S 9 of 37
@@ -305,7 +305,7 @@ a: Matrix Fraction Integer := matrix [[1/(i+j+1) for j in 0..9] for i in 0..9]
 --R        | 1   1   1   1   1   1   1   1   1   1|
 --R        |--  --  --  --  --  --  --  --  --  --|
 --R        +10  11  12  13  14  15  16  17  18  19+
---R                                                Type: Matrix Fraction Integer
+--R                                              Type: Matrix(Fraction(Integer))
 --E 29
 
 --S 30 of 37
@@ -315,7 +315,7 @@ d:= determinant a
 --R                                  1
 --R   (2)  -----------------------------------------------------
 --R        46206893947914691316295628839036278726983680000000000
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 30
 
 --S 31 of 37
@@ -331,7 +331,7 @@ b: Matrix DoubleFloat := matrix [[1/(i+j+1$DoubleFloat) _
     for j in 0..9] for i in 0..9];
 --R 
 --R
---R                                                     Type: Matrix DoubleFloat
+--R                                                    Type: Matrix(DoubleFloat)
 --E 32
 
 --S 33 of 37
@@ -354,7 +354,7 @@ digits 40
 c: Matrix Float := matrix [[1/(i+j+1$Float) for j in 0..9] for i in 0..9];
 --R 
 --R
---R                                                           Type: Matrix Float
+--R                                                          Type: Matrix(Float)
 --E 35
 
 --S 36 of 37
diff --git a/src/input/fname.input.pamphlet b/src/input/fname.input.pamphlet
index f3ccb02..4bc334b 100644
--- a/src/input/fname.input.pamphlet
+++ b/src/input/fname.input.pamphlet
@@ -55,7 +55,7 @@ writo: FNAME := "/tmp/writo"
 --R 
 --R
 --R   (4)  ["/tmp","reado",""]
---R                                                            Type: List String
+--R                                                           Type: List(String)
 --E 4
 
 --S 5 of 9
@@ -63,7 +63,7 @@ writo: FNAME := "/tmp/writo"
 --R 
 --R
 --R   (5)  ["/tmp","writo",""]
---R                                                            Type: List String
+--R                                                           Type: List(String)
 --E 5
 
 --S 6 of 9
@@ -71,7 +71,7 @@ writo: FNAME := "/tmp/writo"
 --R 
 --R
 --I   (6)  ["","nullo1406","x"]
---R                                                            Type: List String
+--R                                                           Type: List(String)
 --E 6
 
 --S 7 of 9
@@ -79,7 +79,7 @@ writo: FNAME := "/tmp/writo"
 --R 
 --R
 --R   (7)  [true,true,false]
---R                                                           Type: List Boolean
+--R                                                          Type: List(Boolean)
 --E 7
 
 --S 8 of 9
@@ -87,7 +87,7 @@ writo: FNAME := "/tmp/writo"
 --R 
 --R
 --R   (8)  [true,true,true]
---R                                                           Type: List Boolean
+--R                                                          Type: List(Boolean)
 --E 8
 
 --S 9 of 9
@@ -95,7 +95,7 @@ writo: FNAME := "/tmp/writo"
 --R 
 --R
 --R   (9)  [false,false,true]
---R                                                           Type: List Boolean
+--R                                                          Type: List(Boolean)
 --E 9
 )system rm -f /tmp/reado
 )system rm -f /tmp/writo
diff --git a/src/input/fns.input.pamphlet b/src/input/fns.input.pamphlet
index 2ed1f15..32b4398 100644
--- a/src/input/fns.input.pamphlet
+++ b/src/input/fns.input.pamphlet
@@ -33,7 +33,7 @@ odd(i) == 2*i - 1
 --R   Compiling function odd with type PositiveInteger -> Integer 
 --R
 --R   (2)  [1,3,5,7,9,11,13,15,17,19]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 2
 
 --S 3 of 20
@@ -58,7 +58,7 @@ odd(1111)
 --R 
 --R
 --R   (5)  [2,3,5,7,11,13,17,19,23,29,...]
---R                                                 Type: Stream PositiveInteger
+--R                                                Type: Stream(PositiveInteger)
 --E 5
 
 --S 6 of 20
@@ -66,7 +66,7 @@ primes := /
 --R 
 --R
 --R   (6)  /
---R                                                             Type: Variable /
+--R                                                            Type: Variable(/)
 --E 6
 
 --S 7 of 20
@@ -87,7 +87,7 @@ primes
 --R      will allow you to apply the operation.
 --R   Cannot find a definition or applicable library operation named 
 --R      nextPrime with argument type(s) 
---R                             Polynomial Integer
+--R                             Polynomial(Integer)
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
 --R      or "$" to specify which version of the function you need.
@@ -95,7 +95,7 @@ primes
 --R 
 --RDaly Bug
 --R   AXIOM can only iterate over lists now and you supplied an object of 
---R      type UniversalSegment PositiveInteger .
+--R      type UniversalSegment(PositiveInteger) .
 --E 8
 
 --S 9 of 20
@@ -110,7 +110,7 @@ primes(20)
 --R      will allow you to apply the operation.
 --R   Cannot find a definition or applicable library operation named 
 --R      nextPrime with argument type(s) 
---R                             Polynomial Integer
+--R                             Polynomial(Integer)
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
 --R      or "$" to specify which version of the function you need.
@@ -118,7 +118,7 @@ primes(20)
 --R 
 --RDaly Bug
 --R   AXIOM can only iterate over lists now and you supplied an object of 
---R      type UniversalSegment PositiveInteger .
+--R      type UniversalSegment(PositiveInteger) .
 --E 9
 
 --S 10 of 20
@@ -139,7 +139,7 @@ firstPrimes(25)
 --R      will allow you to apply the operation.
 --R   Cannot find a definition or applicable library operation named 
 --R      nextPrime with argument type(s) 
---R                             Polynomial Integer
+--R                             Polynomial(Integer)
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
 --R      or "$" to specify which version of the function you need.
@@ -149,7 +149,7 @@ firstPrimes(25)
 --R 
 --RDaly Bug
 --R   AXIOM can only iterate over lists now and you supplied an object of 
---R      type UniversalSegment PositiveInteger .
+--R      type UniversalSegment(PositiveInteger) .
 --E 11
 
 --S 12 of 20
@@ -170,7 +170,7 @@ primesLessThan 1000
 --R      will allow you to apply the operation.
 --R   Cannot find a definition or applicable library operation named 
 --R      nextPrime with argument type(s) 
---R                             Polynomial Integer
+--R                             Polynomial(Integer)
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
 --R      or "$" to specify which version of the function you need.
@@ -180,7 +180,7 @@ primesLessThan 1000
 --R 
 --RDaly Bug
 --R   AXIOM can only iterate over lists now and you supplied an object of 
---R      type UniversalSegment PositiveInteger .
+--R      type UniversalSegment(PositiveInteger) .
 --E 13
 
 --S 14 of 20
@@ -201,7 +201,7 @@ isPrime?(1111)
 --R      will allow you to apply the operation.
 --R   Cannot find a definition or applicable library operation named 
 --R      nextPrime with argument type(s) 
---R                             Polynomial Integer
+--R                             Polynomial(Integer)
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
 --R      or "$" to specify which version of the function you need.
@@ -211,7 +211,7 @@ isPrime?(1111)
 --R 
 --RDaly Bug
 --R   AXIOM can only iterate over lists now and you supplied an object of 
---R      type UniversalSegment PositiveInteger .
+--R      type UniversalSegment(PositiveInteger) .
 --E 15
 
 --S 16 of 20
@@ -226,7 +226,7 @@ twins := [p,p+2 for p in primes | prime?(p+2)]
 --R      will allow you to apply the operation.
 --R   Cannot find a definition or applicable library operation named 
 --R      nextPrime with argument type(s) 
---R                             Polynomial Integer
+--R                             Polynomial(Integer)
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
 --R      or "$" to specify which version of the function you need.
@@ -234,7 +234,7 @@ twins := [p,p+2 for p in primes | prime?(p+2)]
 --R 
 --RDaly Bug
 --R   AXIOM can only iterate over lists now and you supplied an object of 
---R      type UniversalSegment PositiveInteger .
+--R      type UniversalSegment(PositiveInteger) .
 --E 16
 
 --S 17 of 20
@@ -249,7 +249,7 @@ twins := [p, p+2 for i in 1.. | (p := primes(i)) + 2 = primes(i+1)]
 --R      will allow you to apply the operation.
 --R   Cannot find a definition or applicable library operation named 
 --R      nextPrime with argument type(s) 
---R                             Polynomial Integer
+--R                             Polynomial(Integer)
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
 --R      or "$" to specify which version of the function you need.
@@ -293,7 +293,7 @@ twins(i) ==firsts(i),2 + firsts(i)
 --RDaly Bug
 --R   Cannot find a definition or applicable library operation named 
 --R      firsts with argument type(s) 
---R                                 Variable i
+--R                                 Variable(i)
 --R      
 --R      Perhaps you should use "@" to indicate the required return type, 
 --R      or "$" to specify which version of the function you need.
diff --git a/src/input/fparfrac.input.pamphlet b/src/input/fparfrac.input.pamphlet
index 77119c2..67533ff 100644
--- a/src/input/fparfrac.input.pamphlet
+++ b/src/input/fparfrac.input.pamphlet
@@ -29,7 +29,7 @@ This file demonstrates the factor-free conversion to full partial fractions.
 Q := FRAC INT
 --R 
 --R
---R   (1)  Fraction Integer
+--R   (1)  Fraction(Integer)
 --R                                                                 Type: Domain
 --E 1
 
@@ -37,7 +37,7 @@ Q := FRAC INT
 Px := UP(x, Q)
 --R 
 --R
---R   (2)  UnivariatePolynomial(x,Fraction Integer)
+--R   (2)  UnivariatePolynomial(x,Fraction(Integer))
 --R                                                                 Type: Domain
 --E 2
 
@@ -45,7 +45,7 @@ Px := UP(x, Q)
 Fx := FRAC Px
 --R 
 --R
---R   (3)  Fraction UnivariatePolynomial(x,Fraction Integer)
+--R   (3)  Fraction(UnivariatePolynomial(x,Fraction(Integer)))
 --R                                                                 Type: Domain
 --E 3
 
@@ -60,7 +60,7 @@ f:Fx := 36 / (x**5-2*x**4-2*x**3+4*x**2+x-2)
 --R   (4)  ----------------------------
 --R         5     4     3     2
 --R        x  - 2x  - 2x  + 4x  + x - 2
---R                      Type: Fraction UnivariatePolynomial(x,Fraction Integer)
+--R                    Type: Fraction(UnivariatePolynomial(x,Fraction(Integer)))
 --E 4
 
 \end{chunk}
@@ -75,7 +75,7 @@ g := fullPartialFraction f
 --R        x - 2   x + 1      --+              2
 --R                          2         (x - %A)
 --R                        %A  - 1= 0
---IType: FullPartialFractionExpansion(Fraction Integer,...
+--RType: FullPartialFractionExpansion(Fraction(Integer),UnivariatePolynomial(x,Fraction(Integer)))
 --E 5
 
 \end{chunk}
@@ -89,7 +89,7 @@ g::Fx
 --R   (6)  ----------------------------
 --R         5     4     3     2
 --R        x  - 2x  - 2x  + 4x  + x - 2
---R                      Type: Fraction UnivariatePolynomial(x,Fraction Integer)
+--R                    Type: Fraction(UnivariatePolynomial(x,Fraction(Integer)))
 --E 6
 
 \end{chunk}
@@ -104,7 +104,7 @@ g5 := D(g, 5)
 --R                 6          6      --+                7
 --R          (x - 2)    (x + 1)      2           (x - %A)
 --R                                %A  - 1= 0
---IType: FullPartialFractionExpansion(Fraction Integer,...
+--RType: FullPartialFractionExpansion(Fraction(Integer),UnivariatePolynomial(x,Fraction(Integer)))
 --E 7
 
 --S 8 of 18
@@ -126,7 +126,7 @@ f5 := D(f, 5)
 --R     + 
 --R           4        3       2
 --R       276x  - 1184x  + 208x  + 192x - 64
---R                      Type: Fraction UnivariatePolynomial(x,Fraction Integer)
+--R                    Type: Fraction(UnivariatePolynomial(x,Fraction(Integer)))
 --E 8
 
 \end{chunk}
@@ -137,7 +137,7 @@ g5::Fx - f5
 --R 
 --R
 --R   (9)  0
---R                      Type: Fraction UnivariatePolynomial(x,Fraction Integer)
+--R                    Type: Fraction(UnivariatePolynomial(x,Fraction(Integer)))
 --E 9
 
 \end{chunk}
@@ -152,7 +152,7 @@ f:Fx := (x**5 * (x-1)) / ((x**2 + x + 1)**2 * (x-2)**3)
 --R   (10)  -----------------------------------
 --R          7     6     5     3     2
 --R         x  - 4x  + 3x  + 9x  - 6x  - 4x - 8
---R                      Type: Fraction UnivariatePolynomial(x,Fraction Integer)
+--R                    Type: Fraction(UnivariatePolynomial(x,Fraction(Integer)))
 --E 10
 
 --S 11 of 18
@@ -175,7 +175,7 @@ g := fullPartialFraction f
 --R           --+                   2
 --R       2                 (x - %A)
 --R     %A  + %A + 1= 0
---IType: FullPartialFractionExpansion(Fraction Integer,...
+--RType: FullPartialFractionExpansion(Fraction(Integer),UnivariatePolynomial(x,Fraction(Integer)))
 --E 11
 
 --S 12 of 18
@@ -183,7 +183,7 @@ g::Fx - f
 --R 
 --R
 --R   (12)  0
---R                      Type: Fraction UnivariatePolynomial(x,Fraction Integer)
+--R                    Type: Fraction(UnivariatePolynomial(x,Fraction(Integer)))
 --E 12
 
 --S 13 of 18
@@ -195,7 +195,7 @@ f:Fx := (2*x**7-7*x**5+26*x**3+8*x)/(x**8-5*x**6+6*x**4+4*x**2-8)
 --R   (13)  ------------------------
 --R          8     6     4     2
 --R         x  - 5x  + 6x  + 4x  - 8
---R                      Type: Fraction UnivariatePolynomial(x,Fraction Integer)
+--R                    Type: Fraction(UnivariatePolynomial(x,Fraction(Integer)))
 --E 13
 
 --S 14 of 18
@@ -209,7 +209,7 @@ g := fullPartialFraction f
 --R            --+      x - %A      --+              3      --+      x - %A
 --R           2                    2         (x - %A)      2
 --R         %A  - 2= 0           %A  - 2= 0              %A  + 1= 0
---IType: FullPartialFractionExpansion(Fraction Integer,...
+--RType: FullPartialFractionExpansion(Fraction(Integer),UnivariatePolynomial(x,Fraction(Integer)))
 --E 14
 
 --S 15 of 18
@@ -217,7 +217,7 @@ g::Fx - f
 --R 
 --R
 --R   (15)  0
---R                      Type: Fraction UnivariatePolynomial(x,Fraction Integer)
+--R                    Type: Fraction(UnivariatePolynomial(x,Fraction(Integer)))
 --E 15
 
 --S 16 of 18
@@ -237,7 +237,7 @@ f:Fx := x**3/(x**21+2*x**20+4*x**19+7*x**18+10*x**17+17*x**16+22*x**15+30*x**14
 --R       47x   + 46x   + 49x  + 43x  + 38x  + 32x  + 23x  + 19x  + 10x  + 7x  + 2x
 --R     + 
 --R       1
---R                      Type: Fraction UnivariatePolynomial(x,Fraction Integer)
+--R                    Type: Fraction(UnivariatePolynomial(x,Fraction(Integer)))
 --E 16
 
 --S 17 of 18
@@ -296,7 +296,7 @@ g := fullPartialFraction f
 --R        -------------------------------------------------------------------
 --R                                             3
 --R                                     (x - %A)
---IType: FullPartialFractionExpansion(Fraction Integer,...
+--RType: FullPartialFractionExpansion(Fraction(Integer),UnivariatePolynomial(x,Fraction(Integer)))
 --E 17
 
 \end{chunk}
@@ -307,7 +307,7 @@ g::Fx - f
 --R 
 --R
 --R   (18)  0
---R                      Type: Fraction UnivariatePolynomial(x,Fraction Integer)
+--R                    Type: Fraction(UnivariatePolynomial(x,Fraction(Integer)))
 --E 18
 )spool 
 )lisp (bye)
diff --git a/src/input/fparfrc.input.pamphlet b/src/input/fparfrc.input.pamphlet
index bdae515..ed0f84f 100644
--- a/src/input/fparfrc.input.pamphlet
+++ b/src/input/fparfrc.input.pamphlet
@@ -25,7 +25,7 @@
 Fx := FRAC UP(x, FRAC INT)
 --R 
 --R
---R   (1)  Fraction UnivariatePolynomial(x,Fraction Integer)
+--R   (1)  Fraction(UnivariatePolynomial(x,Fraction(Integer)))
 --R                                                                 Type: Domain
 --E 1
 
@@ -37,7 +37,7 @@ f : Fx := 36 / (x**5-2*x**4-2*x**3+4*x**2+x-2)
 --R   (2)  ----------------------------
 --R         5     4     3     2
 --R        x  - 2x  - 2x  + 4x  + x - 2
---R                      Type: Fraction UnivariatePolynomial(x,Fraction Integer)
+--R                    Type: Fraction(UnivariatePolynomial(x,Fraction(Integer)))
 --E 2
 
 --S 3 of 16
@@ -49,7 +49,7 @@ g := fullPartialFraction f
 --R        x - 2   x + 1      --+              2
 --R                          2         (x - %A)
 --R                        %A  - 1= 0
---IType: FullPartialFractionExpansion(Fraction Integer,...
+--RType: FullPartialFractionExpansion(Fraction(Integer),UnivariatePolynomial(x,Fraction(Integer)))
 --E 3
 
 --S 4 of 16
@@ -60,7 +60,7 @@ g :: Fx
 --R   (4)  ----------------------------
 --R         5     4     3     2
 --R        x  - 2x  - 2x  + 4x  + x - 2
---R                      Type: Fraction UnivariatePolynomial(x,Fraction Integer)
+--R                    Type: Fraction(UnivariatePolynomial(x,Fraction(Integer)))
 --E 4
 
 --S 5 of 16
@@ -72,7 +72,7 @@ g5 := D(g, 5)
 --R                 6          6      --+                7
 --R          (x - 2)    (x + 1)      2           (x - %A)
 --R                                %A  - 1= 0
---IType: FullPartialFractionExpansion(Fraction Integer,...
+--RType: FullPartialFractionExpansion(Fraction(Integer),UnivariatePolynomial(x,Fraction(Integer)))
 --E 5
 
 --S 6 of 16
@@ -94,7 +94,7 @@ f5 := D(f, 5)
 --R     + 
 --R           4        3       2
 --R       276x  - 1184x  + 208x  + 192x - 64
---R                      Type: Fraction UnivariatePolynomial(x,Fraction Integer)
+--R                    Type: Fraction(UnivariatePolynomial(x,Fraction(Integer)))
 --E 6
 
 --S 7 of 16
@@ -102,7 +102,7 @@ g5::Fx - f5
 --R 
 --R
 --R   (7)  0
---R                      Type: Fraction UnivariatePolynomial(x,Fraction Integer)
+--R                    Type: Fraction(UnivariatePolynomial(x,Fraction(Integer)))
 --E 7
 
 --S 8 of 16
@@ -114,7 +114,7 @@ f : Fx := (x**5 * (x-1)) / ((x**2 + x + 1)**2 * (x-2)**3)
 --R   (8)  -----------------------------------
 --R         7     6     5     3     2
 --R        x  - 4x  + 3x  + 9x  - 6x  - 4x - 8
---R                      Type: Fraction UnivariatePolynomial(x,Fraction Integer)
+--R                    Type: Fraction(UnivariatePolynomial(x,Fraction(Integer)))
 --E 8
 
 --S 9 of 16
@@ -137,7 +137,7 @@ g := fullPartialFraction f
 --R           --+                   2
 --R       2                 (x - %A)
 --R     %A  + %A + 1= 0
---IType: FullPartialFractionExpansion(Fraction Integer,...
+--RType: FullPartialFractionExpansion(Fraction(Integer),UnivariatePolynomial(x,Fraction(Integer)))
 --E 9
 
 --S 10 of 16
@@ -145,7 +145,7 @@ g :: Fx - f
 --R 
 --R
 --R   (10)  0
---R                      Type: Fraction UnivariatePolynomial(x,Fraction Integer)
+--R                    Type: Fraction(UnivariatePolynomial(x,Fraction(Integer)))
 --E 10
 
 --S 11 of 16
@@ -157,7 +157,7 @@ f : Fx := (2*x**7-7*x**5+26*x**3+8*x) / (x**8-5*x**6+6*x**4+4*x**2-8)
 --R   (11)  ------------------------
 --R          8     6     4     2
 --R         x  - 5x  + 6x  + 4x  - 8
---R                      Type: Fraction UnivariatePolynomial(x,Fraction Integer)
+--R                    Type: Fraction(UnivariatePolynomial(x,Fraction(Integer)))
 --E 11
 
 --S 12 of 16
@@ -171,7 +171,7 @@ g := fullPartialFraction f
 --R            --+      x - %A      --+              3      --+      x - %A
 --R           2                    2         (x - %A)      2
 --R         %A  - 2= 0           %A  - 2= 0              %A  + 1= 0
---IType: FullPartialFractionExpansion(Fraction Integer,...
+--RType: FullPartialFractionExpansion(Fraction(Integer),UnivariatePolynomial(x,Fraction(Integer)))
 --E 12
 
 --S 13 of 16
@@ -179,7 +179,7 @@ g :: Fx - f
 --R 
 --R
 --R   (13)  0
---R                      Type: Fraction UnivariatePolynomial(x,Fraction Integer)
+--R                    Type: Fraction(UnivariatePolynomial(x,Fraction(Integer)))
 --E 13
 
 --S 14 of 16
@@ -200,7 +200,7 @@ f:Fx := x**3 / (x**21 + 2*x**20 + 4*x**19 + 7*x**18 + 10*x**17 + 17*x**16 + _
 --R       47x   + 46x   + 49x  + 43x  + 38x  + 32x  + 23x  + 19x  + 10x  + 7x  + 2x
 --R     + 
 --R       1
---R                      Type: Fraction UnivariatePolynomial(x,Fraction Integer)
+--R                    Type: Fraction(UnivariatePolynomial(x,Fraction(Integer)))
 --E 14
 
 --S 15 of 16
@@ -259,7 +259,7 @@ g := fullPartialFraction f
 --R        -------------------------------------------------------------------
 --R                                             3
 --R                                     (x - %A)
---IType: FullPartialFractionExpansion(Fraction Integer,...
+--RType: FullPartialFractionExpansion(Fraction(Integer),UnivariatePolynomial(x,Fraction(Integer)))
 --E 15
 
 --S 16 of 16
@@ -267,7 +267,7 @@ g :: Fx - f
 --R 
 --R
 --R   (16)  0
---R                      Type: Fraction UnivariatePolynomial(x,Fraction Integer)
+--R                    Type: Fraction(UnivariatePolynomial(x,Fraction(Integer)))
 --E 16
 )spool 
 )lisp (bye)
diff --git a/src/input/fr.input.pamphlet b/src/input/fr.input.pamphlet
index 7e8ad87..a89fe63 100644
--- a/src/input/fr.input.pamphlet
+++ b/src/input/fr.input.pamphlet
@@ -36,7 +36,7 @@ x := 2**8 * 78**7 * 111**3 * 74534
 --R
 --R         16 10  7  3
 --R   (2)  2  3  13 37 83 449
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 2
 
 --S 3 of 55
@@ -45,7 +45,7 @@ y := 2**4 * 45**3 * 162**6 * 774325
 --R
 --R         10 30 5
 --R   (3)  2  3  5 47 659
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 3
 
 \end{chunk}
@@ -65,7 +65,7 @@ z := z1 :: (FR INT)
 --R
 --R         47 22 12 8  4  3  2  2  2
 --R   (5)  2  3  5  7 11 13 17 19 23 29 31 37 41 43 47
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 5
 
 \end{chunk}
@@ -112,7 +112,7 @@ factorList z
 --R    [flg= "prime",fctr= 31,xpnt= 1], [flg= "prime",fctr= 37,xpnt= 1],
 --R    [flg= "prime",fctr= 41,xpnt= 1], [flg= "prime",fctr= 43,xpnt= 1],
 --R    [flg= "prime",fctr= 47,xpnt= 1]]
---IType: List Record(flg: Union("nil","sqfr","irred","prime"),fctr: ...
+--IType: List(Record(flg: Union("nil","sqfr","irred","prime"),...
 --E 9
 
 \end{chunk}
@@ -123,7 +123,7 @@ r:=reduce(*,[(nthFactor(z,i) :: (FR INT)) for i in 1..(numberOfFactors z)])
 --R 
 --R
 --R   (10)  2 3 5 7 11 13 17 19 23 29 31 37 41 43 47
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 10
 
 \end{chunk}
@@ -135,7 +135,7 @@ exquo(z,r)
 --R
 --R          46 21 11 7  3  2
 --R   (11)  2  3  5  7 11 13 17 19 23
---R                                            Type: Union(Factored Integer,...)
+--R                                           Type: Union(Factored(Integer),...)
 --E 11
 
 --S 12 of 55
@@ -144,7 +144,7 @@ x*y
 --R
 --R          26 40 5  7  3
 --R   (12)  2  3  5 13 37 47 83 449 659
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 12
 
 --S 13 of 55
@@ -153,7 +153,7 @@ y*x
 --R
 --R          26 40 5  7  3
 --R   (13)  2  3  5 13 37 47 83 449 659
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 13
 
 --S 14 of 55
@@ -170,7 +170,7 @@ gcd(x,z)
 --R
 --R          16 10  3
 --R   (15)  2  3  13 37
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 15
 
 --S 16 of 55
@@ -179,7 +179,7 @@ x+y
 --R
 --R          10 10
 --R   (16)  2  3  1109 3557 2007307818601
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 16
 
 \end{chunk}
@@ -205,7 +205,7 @@ f := x/y
 --R   (18)  --------------
 --R            20 5
 --R           3  5 47 659
---R                                              Type: Fraction Factored Integer
+--R                                            Type: Fraction(Factored(Integer))
 --E 18
 
 --S 19 of 55
@@ -217,7 +217,7 @@ g := (x ** 9) / y
 --R   (19)  ----------------------
 --R                 5
 --R                5 47 659
---R                                              Type: Fraction Factored Integer
+--R                                            Type: Fraction(Factored(Integer))
 --E 19
 
 --S 20 of 55
@@ -229,7 +229,7 @@ f * g
 --R   (20)  ------------------------
 --R                 10  2   2
 --R                5  47 659
---R                                              Type: Fraction Factored Integer
+--R                                            Type: Fraction(Factored(Integer))
 --E 20
 
 --S 21 of 55
@@ -241,7 +241,7 @@ f * g
 --R   (21)  ---------------
 --R          194 20 5
 --R         2   3  5 47 659
---R                                              Type: Fraction Factored Integer
+--R                                            Type: Fraction(Factored(Integer))
 --E 21
 
 --S 22 of 55
@@ -253,7 +253,7 @@ f * g
 --R   (22)  -------------------------------------------
 --R                            147
 --R                           2   659
---R                                              Type: Fraction Factored Integer
+--R                                            Type: Fraction(Factored(Integer))
 --E 22 
  
 \end{chunk}
@@ -276,7 +276,7 @@ u := (x**4 - y**4) :: POLY INT
 --R
 --R                          2    2
 --R   (2)  - (y - x)(y + x)(y  + x )
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 24
 
 \end{chunk}
@@ -288,7 +288,7 @@ v := primeFactor(x-y,2) * primeFactor(x+y,2) * primeFactor(x**2 + y**2,1)
 --R
 --R               2       2  2    2
 --R   (3)  (y - x) (y + x) (y  + x )
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 25
 
 --S 26 of 55
@@ -297,7 +297,7 @@ w := factor(x**2 + 2*x*y + 2*x + 2*y + y**2 + 1) * primeFactor(x-y,2)
 --R
 --R               2           2
 --R   (4)  (y - x) (y + x + 1)
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 26
 
 --S 27 of 55
@@ -305,7 +305,7 @@ unit w
 --R 
 --R
 --R   (5)  1
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 27
 
 \end{chunk}
@@ -319,7 +319,7 @@ l := factorList u
 --R   [[flg= "prime",fctr= y - x,xpnt= 1], [flg= "prime",fctr= y + x,xpnt= 1],
 --R                         2    2
 --R    [flg= "prime",fctr= y  + x ,xpnt= 1]]
---IType: List Record(flg: Union("nil","sqfr","irred","prime"),fctr: ...
+--IType: List(Record(flg: Union("nil","sqfr","irred","prime"),...
 --E 28
 
 --S 29 of 55
@@ -330,7 +330,7 @@ factorList v
 --R   [[flg= "prime",fctr= y - x,xpnt= 2], [flg= "prime",fctr= y + x,xpnt= 2],
 --R                         2    2
 --R    [flg= "prime",fctr= y  + x ,xpnt= 1]]
---IType: List Record(flg: Union("nil","sqfr","irred","prime"),fctr: ...
+--IType: List(Record(flg: Union("nil","sqfr","irred","prime"),...
 --E 29
 
 --S 30 of 55
@@ -339,7 +339,7 @@ factorList w
 --R
 --R   (8)
 --R   [[flg= "prime",fctr= y - x,xpnt= 2],[flg= "prime",fctr= y + x + 1,xpnt= 2]]
---IType: List Record(flg: Union("nil","sqfr","irred","prime"),fctr: ...
+--IType: List(Record(flg: Union("nil","sqfr","irred","prime"),...
 --E 30
 
 --S 31 of 55
@@ -347,7 +347,7 @@ l.1.fctr
 --R 
 --R
 --R   (9)  y - x
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 31
 
 --S 32 of 55
@@ -363,7 +363,7 @@ nthFactor(u,1)
 --R 
 --R
 --R   (11)  y - x
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 33
 
 --S 34 of 55
@@ -371,7 +371,7 @@ nthFactor(u,2)
 --R 
 --R
 --R   (12)  y + x
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 34
 
 --S 35 of 55
@@ -380,7 +380,7 @@ nthFactor(u,3)
 --R
 --R          2    2
 --R   (13)  y  + x
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 35
 
 --S 36 of 55
@@ -404,7 +404,7 @@ nthFactor(u,4)
 --R 
 --R
 --R   (16)  1
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 38
 
 \end{chunk}
@@ -417,7 +417,7 @@ s:=reduce(*,[(nthFactor(v,i) :: FR POLY INT) for i in 1..(numberOfFactors v)])
 --R
 --R                         2    2
 --R   (17)  (y - x)(y + x)(y  + x )
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 39
 
 \end{chunk}
@@ -428,7 +428,7 @@ exquo(v,s)
 --R 
 --R
 --R   (18)  (y - x)(y + x)
---R                                 Type: Union(Factored Polynomial Integer,...)
+--R                               Type: Union(Factored(Polynomial(Integer)),...)
 --E 40
 
 --S 41 of 55
@@ -437,7 +437,7 @@ gcd(u,v)
 --R
 --R                         2    2
 --R   (19)  (y - x)(y + x)(y  + x )
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 41
 
 --S 42 of 55
@@ -446,7 +446,7 @@ u + v
 --R
 --R                         2    2       2    2
 --R   (20)  (y - x)(y + x)(y  - x  - 1)(y  + x )
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 42
 
 --S 43 of 55
@@ -455,7 +455,7 @@ lcm(v,w)
 --R
 --R                2       2           2  2    2
 --R   (21)  (y - x) (y + x) (y + x + 1) (y  + x )
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 43
 
 --S 44 of 55
@@ -464,7 +464,7 @@ u * v * w
 --R
 --R                  5       3           2  2    2 2
 --R   (22)  - (y - x) (y + x) (y + x + 1) (y  + x )
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 44
 
 \end{chunk}
@@ -486,7 +486,7 @@ expand(u * v * w)
 --R   + 
 --R          12     11      14     13    12
 --R     (- 2x   - 2x  )y + x   + 2x   + x
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 45
 
 \end{chunk}
@@ -501,7 +501,7 @@ u/w
 --R   (24)  - -------------------
 --R                             2
 --R           (y - x)(y + x + 1)
---R                                   Type: Fraction Factored Polynomial Integer
+--R                                Type: Fraction(Factored(Polynomial(Integer)))
 --E 46
 
 --S 47 of 55
@@ -513,7 +513,7 @@ w/(u*v)
 --R   (25)  - -------------------------
 --R                         3  2    2 2
 --R           (y - x)(y + x) (y  + x )
---R                                   Type: Fraction Factored Polynomial Integer
+--R                                Type: Fraction(Factored(Polynomial(Integer)))
 --E 47
 
 \end{chunk}
@@ -527,7 +527,7 @@ w/(u*v) * u/w
 --R   (26)  -------------------------
 --R                2       2  2    2
 --R         (y - x) (y + x) (y  + x )
---R                                   Type: Fraction Factored Polynomial Integer
+--R                                Type: Fraction(Factored(Polynomial(Integer)))
 --E 48
 
 --S 49 of 55
@@ -547,7 +547,7 @@ w/(u*v) + u/w
 --R     /
 --R                      3           2  2    2 2
 --R        (y - x)(y + x) (y + x + 1) (y  + x )
---R                                   Type: Fraction Factored Polynomial Integer
+--R                                Type: Fraction(Factored(Polynomial(Integer)))
 --E 49
 
 --S 50 of 55
@@ -555,7 +555,7 @@ differentiate(w,x)
 --R 
 --R
 --R   (28)  - 2(2x + 1)(y - x)(y + x + 1)
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 50
 
 --S 51 of 55
@@ -563,7 +563,7 @@ differentiate(w,y)
 --R 
 --R
 --R   (29)  2(y - x)(y + x + 1)(2y + 1)
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 51
 
 --S 52 of 55
@@ -587,7 +587,7 @@ characteristic()$FR POLY INT
 --R 
 --R
 --R   (32)  1
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 54
 
 --S 55 of 55
@@ -595,7 +595,7 @@ characteristic()$FR POLY INT
 --R 
 --R
 --R   (33)  0
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 55
 )spool 
 )lisp (bye)
diff --git a/src/input/fr1.input.pamphlet b/src/input/fr1.input.pamphlet
index 17d41bd..be447a2 100644
--- a/src/input/fr1.input.pamphlet
+++ b/src/input/fr1.input.pamphlet
@@ -27,7 +27,7 @@ g := factor(4312)
 --R
 --R         3 2
 --R   (1)  2 7 11
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 1
 
 --S 2 of 38
@@ -51,7 +51,7 @@ numberOfFactors(g)
 --R 
 --R
 --R   (4)  [2,7,11]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 4
 
 --S 5 of 38
@@ -59,7 +59,7 @@ numberOfFactors(g)
 --R 
 --R
 --R   (5)  [3,2,1]
---R                                                           Type: List Integer
+--R                                                          Type: List(Integer)
 --E 5
 
 --S 6 of 38
@@ -67,7 +67,7 @@ numberOfFactors(g)
 --R 
 --R
 --R   (6)  ["prime","prime","prime"]
---R                               Type: List Union("nil","sqfr","irred","prime")
+--R                              Type: List(Union("nil","sqfr","irred","prime"))
 --E 6
 
 --S 7 of 38
@@ -77,7 +77,7 @@ factorList(g)
 --R   (7)
 --R   [[flg= "prime",fctr= 2,xpnt= 3], [flg= "prime",fctr= 7,xpnt= 2],
 --R    [flg= "prime",fctr= 11,xpnt= 1]]
---IType: List Record(flg: Union("nil","sqfr","irred","prime"),...
+--IType: List(Record(flg: Union("nil","sqfr","irred","prime"),...
 --E 7
 
 --S 8 of 38
@@ -86,7 +86,7 @@ factors(g)
 --R
 --R   (8)
 --R   [[factor= 2,exponent= 3],[factor= 7,exponent= 2],[factor= 11,exponent= 1]]
---R                         Type: List Record(factor: Integer,exponent: Integer)
+--R                        Type: List(Record(factor: Integer,exponent: Integer))
 --E 8
 
 --S 9 of 38
@@ -105,7 +105,7 @@ g := factor(4312)
 --R
 --R         3 2
 --R   (1)  2 7 11
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 10
 
 --S 11 of 38
@@ -132,7 +132,7 @@ g := factor(4312)
 --R
 --R         3 2
 --R   (1)  2 7 11
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 13
 
 --S 14 of 38
@@ -141,7 +141,7 @@ f := factor(246960)
 --R
 --R         4 2   3
 --R   (2)  2 3 5 7
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 14
 
 --S 15 of 38
@@ -150,7 +150,7 @@ f * g
 --R
 --R         7 2   5
 --R   (3)  2 3 5 7 11
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 15
 
 --S 16 of 38
@@ -159,7 +159,7 @@ f**500
 --R
 --R         2000 1000 500 1500
 --R   (4)  2    3    5   7
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 16
 
 --S 17 of 38
@@ -168,7 +168,7 @@ gcd(f,g)
 --R
 --R         3 2
 --R   (5)  2 7
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 17
 
 --S 18 of 38
@@ -177,7 +177,7 @@ lcm(f,g)
 --R
 --R         4 2   3
 --R   (6)  2 3 5 7 11
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 18
 
 --S 19 of 38
@@ -186,7 +186,7 @@ f + g
 --R
 --R         3 2
 --R   (7)  2 7 641
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 19
 
 --S 20 of 38
@@ -195,7 +195,7 @@ f - g
 --R
 --R         3 2
 --R   (8)  2 7 619
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 20
 
 --S 21 of 38
@@ -235,7 +235,7 @@ one?(f)
 --R 
 --R
 --R   (13)  0
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 25
 
 --S 26 of 38
@@ -243,7 +243,7 @@ one?(f)
 --R 
 --R
 --R   (14)  1
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 26
 
 )clear all
@@ -254,7 +254,7 @@ nilFactor(24,2)
 --R
 --R          2
 --R   (1)  24
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 27
 
 --S 28 of 38
@@ -271,7 +271,7 @@ sqfrFactor(30,2)
 --R
 --R          2
 --R   (3)  30
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 29
 
 --S 30 of 38
@@ -280,7 +280,7 @@ irreducibleFactor(13,10)
 --R
 --R          10
 --R   (4)  13
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 30
 
 --S 31 of 38
@@ -289,7 +289,7 @@ primeFactor(11,5)
 --R
 --R          5
 --R   (5)  11
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 31
 
 --S 32 of 38
@@ -298,7 +298,7 @@ h := factor(-720)
 --R
 --R           4 2
 --R   (6)  - 2 3 5
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 32
 
 --S 33 of 38
@@ -306,7 +306,7 @@ h - makeFR(unit(h),factorList(h))
 --R 
 --R
 --R   (7)  0
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 33
 
 )clear all
@@ -317,7 +317,7 @@ p := (4*x*x-12*x+9)*y*y + (4*x*x-12*x+9)*y + 28*x*x - 84*x + 63
 --R
 --R           2            2      2                  2
 --R   (1)  (4x  - 12x + 9)y  + (4x  - 12x + 9)y + 28x  - 84x + 63
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 34
 
 --S 35 of 38
@@ -326,7 +326,7 @@ fp := factor(p)
 --R
 --R                2  2
 --R   (2)  (2x - 3) (y  + y + 7)
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 35
 
 --S 36 of 38
@@ -335,7 +335,7 @@ D(p,x)
 --R
 --R                  2
 --R   (3)  (8x - 12)y  + (8x - 12)y + 56x - 84
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 36
 
 --S 37 of 38
@@ -344,7 +344,7 @@ D(fp,x)
 --R
 --R                   2
 --R   (4)  4(2x - 3)(y  + y + 7)
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 37
 
 --S 38 of 38
diff --git a/src/input/fr2.input.pamphlet b/src/input/fr2.input.pamphlet
index 4fbb3e9..6e6f5dd 100644
--- a/src/input/fr2.input.pamphlet
+++ b/src/input/fr2.input.pamphlet
@@ -33,7 +33,7 @@ f := factor(720)
 --R
 --R         4 2
 --R   (2)  2 3 5
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 2
 
 --S 3 of 6
@@ -43,7 +43,7 @@ map(double,f)
 --R
 --R           4 2
 --R   (3)  2 4 6 10
---R                                                       Type: Factored Integer
+--R                                                      Type: Factored(Integer)
 --E 3
 
 --S 4 of 6
@@ -55,11 +55,12 @@ makePoly(b) == x + b
 --S 5 of 6
 g := map(makePoly,f)
 --R 
---R   Compiling function makePoly with type Integer -> Polynomial Integer 
+--R   Compiling function makePoly with type Integer -> Polynomial(Integer)
+--R      
 --R
 --R                      4       2
 --R   (5)  (x + 1)(x + 2) (x + 3) (x + 5)
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 5
 
 --S 6 of 6
diff --git a/src/input/frac.input.pamphlet b/src/input/frac.input.pamphlet
index d27c9da..9f3669c 100644
--- a/src/input/frac.input.pamphlet
+++ b/src/input/frac.input.pamphlet
@@ -28,7 +28,7 @@ a := 11/12
 --R        11
 --R   (1)  --
 --R        12
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 1
 
 --S 2 of 12
@@ -38,7 +38,7 @@ b := 23/24
 --R        23
 --R   (2)  --
 --R        24
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 2
 
 --S 3 of 12
@@ -48,7 +48,7 @@ b := 23/24
 --R        313271
 --R   (3)  ------
 --R         76032
---R                                                       Type: Fraction Integer
+--R                                                      Type: Fraction(Integer)
 --E 3
 
 --S 4 of 12
@@ -76,7 +76,7 @@ r := (x**2 + 2*x + 1)/(x**2 - 2*x + 1)
 --R   (6)  -----------
 --R         2
 --R        x  - 2x + 1
---R                                            Type: Fraction Polynomial Integer
+--R                                          Type: Fraction(Polynomial(Integer))
 --E 6
 
 --S 7 of 12
@@ -88,7 +88,7 @@ factor(r)
 --R   (7)  -----------
 --R         2
 --R        x  - 2x + 1
---R                                   Type: Factored Fraction Polynomial Integer
+--R                                Type: Factored(Fraction(Polynomial(Integer)))
 --E 7
 
 --S 8 of 12
@@ -100,7 +100,7 @@ map(factor,r)
 --R   (8)  --------
 --R               2
 --R        (x - 1)
---R                                   Type: Fraction Factored Polynomial Integer
+--R                                Type: Fraction(Factored(Polynomial(Integer)))
 --E 8
 
 --S 9 of 12
@@ -110,7 +110,7 @@ continuedFraction(7/12)
 --R          1 |     1 |     1 |     1 |
 --R   (9)  +---+ + +---+ + +---+ + +---+
 --R        | 1     | 1     | 2     | 2
---R                                              Type: ContinuedFraction Integer
+--R                                             Type: ContinuedFraction(Integer)
 --E 9
 
 --S 10 of 12
@@ -121,7 +121,7 @@ partialFraction(7,12)
 --R   (10)  1 - -- + -
 --R              2   3
 --R             2
---R                                                Type: PartialFraction Integer
+--R                                               Type: PartialFraction(Integer)
 --E 10
 
 --S 11 of 12
@@ -131,7 +131,7 @@ g := 2/3 + 4/5*%i
 --R         2   4
 --R   (11)  - + - %i
 --R         3   5
---R                                               Type: Complex Fraction Integer
+--R                                             Type: Complex(Fraction(Integer))
 --E 11
 
 --S 12 of 12
@@ -141,7 +141,7 @@ g :: FRAC COMPLEX INT
 --R         10 + 12%i
 --R   (12)  ---------
 --R             15
---R                                               Type: Fraction Complex Integer
+--R                                             Type: Fraction(Complex(Integer))
 --E 12
 )spool 
 )lisp (bye)
diff --git a/src/input/frame.input.pamphlet b/src/input/frame.input.pamphlet
index 224a6ba..2066a9e 100644
--- a/src/input/frame.input.pamphlet
+++ b/src/input/frame.input.pamphlet
@@ -113,7 +113,7 @@ a
 --R 
 --R
 --R   (1)  a
---R                                                             Type: Variable a
+--R                                                            Type: Variable(a)
 --E 14
 
 --S 15 of 24
diff --git a/src/input/free.input.pamphlet b/src/input/free.input.pamphlet
index 7c31ef5..d62c15b 100644
--- a/src/input/free.input.pamphlet
+++ b/src/input/free.input.pamphlet
@@ -21,7 +21,7 @@ We expect that $-b < z < a < b$
 --S 1 of 8
 Z2:=FreeAbelianGroup Symbol
 --R
---R   (1)  FreeAbelianGroup Symbol
+--R   (1)  FreeAbelianGroup(Symbol)
 --R                                                                 Type: Domain
 --E 1
 
@@ -29,21 +29,21 @@ Z2:=FreeAbelianGroup Symbol
 a:=a::FreeAbelianGroup Symbol
 --R
 --R   (2)  a
---R                                                Type: FreeAbelianGroup Symbol
+--R                                               Type: FreeAbelianGroup(Symbol)
 --E 2
 
 --S 3 of 8
 b:=b::FreeAbelianGroup Symbol
 --R
 --R   (3)  b
---R                                                Type: FreeAbelianGroup Symbol
+--R                                               Type: FreeAbelianGroup(Symbol)
 --E 3
 
 --S 4 of 8
 z:=0::FreeAbelianGroup Symbol
 --R
 --R   (4)  0
---R                                                Type: FreeAbelianGroup Symbol
+--R                                               Type: FreeAbelianGroup(Symbol)
 --E 4
 
 --S 5 of 8
diff --git a/src/input/function.input.pamphlet b/src/input/function.input.pamphlet
index b44c0df..a9331aa 100644
--- a/src/input/function.input.pamphlet
+++ b/src/input/function.input.pamphlet
@@ -24,21 +24,21 @@ f := (x - y) / (x + y)
 --R        - y + x
 --R   (1)  -------
 --R         y + x
---R                                            Type: Fraction Polynomial Integer
+--R                                          Type: Fraction(Polynomial(Integer))
 --E 1
 
 --S 2 of 33
 numer f
 --R
 --R   (2)  - y + x
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 2
 
 --S 3 of 33
 denom f
 --R
 --R   (3)  y + x
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 3
 
 --S 4 of 33
@@ -47,7 +47,7 @@ eval(f, x = 1/x)
 --R        - x y + 1
 --R   (4)  ---------
 --R         x y + 1
---R                                            Type: Fraction Polynomial Integer
+--R                                          Type: Fraction(Polynomial(Integer))
 --E 4
 
 --S 5 of 33
@@ -56,7 +56,7 @@ eval(f, [x = y, y = x])
 --R        y - x
 --R   (5)  -----
 --R        y + x
---R                                            Type: Fraction Polynomial Integer
+--R                                          Type: Fraction(Polynomial(Integer))
 --E 5
 
 \end{chunk}
@@ -70,14 +70,14 @@ f := sqrt(1 + x ** (1/3))
 --R         +--------+
 --R         |3+-+
 --R   (1)  \|\|x  + 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 6
 
 --S 7 of 33
 y := rootOf(y**3 + y**2 - x*y + x**3 - 1, y)
 --R
 --R   (2)  y
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 7
 
 --S 8 of 33
@@ -88,7 +88,7 @@ differentiate(y, x)
 --R   (3)  ------------
 --R          2
 --R        3y  + 2y - x
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 8
 
 --S 9 of 33
@@ -96,7 +96,7 @@ differentiate(y, x)
 --R
 --R          2               3
 --R   (4)  2y  + (x + 3)y - x  + 2
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 9
 
 --S 10 of 33
@@ -107,7 +107,7 @@ g := inv f
 --R         +--------+
 --R         |3+-+
 --R        \|\|x  + 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 10
 
 --S 11 of 33
@@ -115,7 +115,7 @@ ratPoly g
 --R
 --R                6     4     2
 --R   (6)  (x + 1)?  - 3?  + 3?  - 1
---R                          Type: SparseUnivariatePolynomial Expression Integer
+--R                        Type: SparseUnivariatePolynomial(Expression(Integer))
 --E 11
 
 \end{chunk}
@@ -129,7 +129,7 @@ f := x * log y * sin(1/(x+y))
 --R                      1
 --R   (1)  x log(y)sin(-----)
 --R                    y + x
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 12
 
 --S 13 of 33
@@ -138,7 +138,7 @@ eval(f, [x = y, y = x])
 --R                      1
 --R   (2)  y log(x)sin(-----)
 --R                    y + x
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 13
 
 --S 14 of 33
@@ -147,7 +147,7 @@ eval(f, log y = acosh(x + sqrt y))
 --R                1          +-+
 --R   (3)  x sin(-----)acosh(\|y  + x)
 --R              y + x
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 14
 
 \end{chunk}
@@ -165,7 +165,7 @@ f := cos(x)/sec(x) * log(sin(x)**2/(cos(x)**2+sin(x)**2))
 --R                  sin(x)  + cos(x)
 --R   (1)  ----------------------------
 --R                   sec(x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 15
 
 --S 16 of 33
@@ -173,7 +173,7 @@ g := simplify f
 --R
 --R              2            2
 --R   (2)  cos(x) log(- cos(x)  + 1)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 16
 
 --S 17 of 33
@@ -187,7 +187,7 @@ h := sin2csc cos2sec g
 --R   (3)  ----------------
 --R                   2
 --R             sec(x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 17
 
 --S 18 of 33
@@ -198,7 +198,7 @@ expandLog h
 --R   (4)  -------------------------------
 --R                          2
 --R                    sec(x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 18
 
 --S 19 of 33
@@ -207,7 +207,7 @@ f1 := sqrt((x+1)**3)
 --R         +-----------------+
 --R         | 3     2
 --R   (5)  \|x  + 3x  + 3x + 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 19
 
 --S 20 of 33
@@ -215,14 +215,14 @@ rootSimp f1
 --R
 --R                +-----+
 --R   (6)  (x + 1)\|x + 1
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 20
 
 --S 21 of 33
 g1 := sin(x + cos x)
 --R
 --R   (7)  sin(cos(x) + x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 21
 
 --S 22 of 33
@@ -245,21 +245,21 @@ g2 := complexElementary g1
 --R                                           x\|- 1
 --R                                        2%e
 --R                  2%e
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 22
 
 --S 23 of 33
 trigs g2
 --R
 --R   (9)  sin(cos(x) + x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 23
 
 --S 24 of 33
 h1 := sinh(x + cosh x)
 --R
 --R   (10)  sinh(cosh(x) + x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 24
 
 --S 25 of 33
@@ -278,14 +278,14 @@ h2 := realElementary h1
 --R                          x
 --R                       2%e
 --R            2%e
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 25
 
 --S 26 of 33
 htrigs h2
 --R
 --R   (12)  sinh(cosh(x) + x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 26
 
 \end{chunk}
@@ -298,7 +298,7 @@ groupSqrt := _rule(sqrt(a) * sqrt(b), sqrt(a*b))
 --R
 --R           +-+ +-+       +---+
 --I   (1)  %B\|a \|b  == %B\|a b
---R                        Type: RewriteRule(Integer,Integer,Expression Integer)
+--R                       Type: RewriteRule(Integer,Integer,Expression(Integer))
 --E 27
 
 --S 28 of 33
@@ -314,7 +314,7 @@ groupSqrt a
 --R
 --R         +-+
 --R   (3)  \|6
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 29
 
 --S 30 of 33
@@ -322,7 +322,7 @@ a := (sqrt(x) + sqrt(y))**4
 --R
 --R                  +-+ +-+    2           2
 --R   (4)  (4y + 4x)\|x \|y  + y  + 6x y + x
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 30
 
 --S 31 of 33
@@ -330,7 +330,7 @@ groupSqrt a
 --R
 --R                  +---+    2           2
 --R   (5)  (4y + 4x)\|x y  + y  + 6x y + x
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 31
 
 --S 32 of 33
@@ -351,14 +351,14 @@ sinCosExpand := rule
 --R    cos(y + x) == - sin(x)sin(y) + cos(x)cos(y),
 --R    sin(n x) == cos(x)sin((n - 1)x) + cos((n - 1)x)sin(x),
 --R    cos(n x) == - sin(x)sin((n - 1)x) + cos(x)cos((n - 1)x)}
---R                            Type: Ruleset(Integer,Integer,Expression Integer)
+--R                           Type: Ruleset(Integer,Integer,Expression(Integer))
 --E 32
 
 --S 33 of 33
 sinCosExpand(sin(x+y-2*z) * cos y)
 --R
 --R   (7)  - cos(y)sin(2z - y - x)
---R                                                     Type: Expression Integer
+--R                                                    Type: Expression(Integer)
 --E 33
 
 )spool
diff --git a/src/input/galois.input.pamphlet b/src/input/galois.input.pamphlet
index 5930c77..1e1904a 100644
--- a/src/input/galois.input.pamphlet
+++ b/src/input/galois.input.pamphlet
@@ -27,7 +27,7 @@ p := x**5 - 5*x + 12
 --R
 --R         5
 --R   (1)  x  - 5x + 12
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 1
 
 --S 2 of 28
@@ -40,7 +40,7 @@ q := resultant(eval(p,x,y),-eval(p,x,y-x),y)
 --R   + 
 --R              7            5
 --R     18000000x  + 64000000x
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 2
 
 --S 3 of 28
@@ -53,7 +53,7 @@ q1 := exquo(q, x**5)
 --R   + 
 --R              2
 --R     18000000x  + 64000000
---R                                          Type: Union(Polynomial Integer,...)
+--R                                         Type: Union(Polynomial(Integer),...)
 --E 3
 
 --S 4 of 28
@@ -66,7 +66,7 @@ factoredQ := factor q1
 --R  *
 --R       10      8       6       4        2
 --R     (x   + 10x  + 125x  + 500x  + 2500x  + 4000)
---R                                            Type: Factored Polynomial Integer
+--R                                          Type: Factored(Polynomial(Integer))
 --E 4
 
 --S 5 of 28
@@ -75,7 +75,7 @@ r := nthFactor(factoredQ,1)
 --R
 --R         10      8      6        4        2
 --R   (5)  x   - 10x  - 75x  + 1500x  - 5500x  + 16000
---R                                                     Type: Polynomial Integer
+--R                                                    Type: Polynomial(Integer)
 --E 5
 
 --S 6 of 28
@@ -134,7 +134,7 @@ algFactors := factor(p,[beta])
 --R           - 327000b  + 405200b + 2062400
 --R      /
 --R         1339200
---R                       Type: Factored UnivariatePolynomial(x,AlgebraicNumber)
+--R                      Type: Factored(UnivariatePolynomial(x,AlgebraicNumber))
 --E 8
 
 --S 9 of 28
@@ -143,7 +143,7 @@ factor(p)
 --R
 --R         5
 --R   (9)  x  - 5x + 12
---R                       Type: Factored UnivariatePolynomial(x,AlgebraicNumber)
+--R                      Type: Factored(UnivariatePolynomial(x,AlgebraicNumber))
 --E 9
 
 --S 10 of 28
@@ -211,7 +211,7 @@ roots := [-coefficient(nthFactor(algFactors,i),0) for i in 1..5]
 --R    /
 --R       1339200
 --R     ]
---R                                                   Type: List AlgebraicNumber
+--R                                                  Type: List(AlgebraicNumber)
 --E 12
 
 --S 13 of 28
@@ -233,7 +233,7 @@ eval(r,x,a1 - a2)
 --R 
 --R
 --R   (14)  0
---R                                             Type: Polynomial AlgebraicNumber
+--R                                            Type: Polynomial(AlgebraicNumber)
 --E 14
 
 --S 15 of 28
@@ -248,7 +248,7 @@ eval(r,x,a1 - a3)
 --R       75572250b  + 161688000b  - 184600000b - 710912000
 --R  /
 --R     4464
---R                                             Type: Polynomial AlgebraicNumber
+--R                                            Type: Polynomial(AlgebraicNumber)
 --E 15
 
 --S 16 of 28
@@ -256,7 +256,7 @@ eval(r,x,a1 - a4)
 --R 
 --R
 --R   (16)  0
---R                                             Type: Polynomial AlgebraicNumber
+--R                                            Type: Polynomial(AlgebraicNumber)
 --E 16
 
 --S 17 of 28
@@ -267,7 +267,7 @@ eval(r,x,a1 - a5)
 --R         405b  + 3450b  - 19875b  - 198000b  - 588000
 --R   (17)  --------------------------------------------
 --R                              31
---R                                             Type: Polynomial AlgebraicNumber
+--R                                            Type: Polynomial(AlgebraicNumber)
 --E 17
 
 --S 18 of 28
diff --git a/src/input/gamma.input.pamphlet b/src/input/gamma.input.pamphlet
index 6ea72c4..dbca279 100644
--- a/src/input/gamma.input.pamphlet
+++ b/src/input/gamma.input.pamphlet
@@ -831,7 +831,7 @@ Dover Publications, Inc. New York 1965. pp267-270
 --R     [1.9950000000000001, 0.99789636429999995, 0.99789636418206007,
 --R      - 1.1793988008435008E-10]
 --R     ]
---R                                                  Type: List List DoubleFloat
+--R                                                Type: List(List(DoubleFloat))
 --E 1
 
 \end{chunk}
@@ -1683,7 +1683,7 @@ Dover Publications, Inc. New York 1965. pp267-270
 --R      2.8108293470552326E-11]
 --R     ,
 --R    [2.,0.42278433510000002,0.42278433509846725,- 1.5327739077974911E-12]]
---R                                                  Type: List List DoubleFloat
+--R                                                Type: List(List(DoubleFloat))
 --E 3
 \end{chunk}
 \section{log(Gamma) 1+0.0i to 1+10.0i by 0+0.1i}
@@ -2521,7 +2521,7 @@ log(Gamma(1. + 10.0 * %i))-(- 13.637732188247 + 13.802912974230 * %i)]]
 --R      - 13.637732188247268 + 1.2365423598707301 %i,
 --R      - 2.6822988274943782E-13 - 12.56637061435927 %i]
 --R     ]
---R                                          Type: List List Complex DoubleFloat
+--R                                       Type: List(List(Complex(DoubleFloat)))
 --E 4
 
 \end{chunk}
@@ -2899,10 +2899,10 @@ H(1. + 10.0 * %i)-(- 13.637732188247 + 13.802912974230 * %i)]]
 --R 
 --R   Compiling function inner with type (NonNegativeInteger,
 --R      PositiveInteger) -> Integer 
---R   Compiling function B with type PositiveInteger -> Fraction Integer 
---R   Compiling function Z with type (PositiveInteger,Complex Float) -> 
---R      Complex Float 
---R   Compiling function H with type Complex Float -> Complex Float 
+--R   Compiling function B with type PositiveInteger -> Fraction(Integer) 
+--R   Compiling function Z with type (PositiveInteger,Complex(Float)) -> 
+--R      Complex(Float) 
+--R   Compiling function H with type Complex(Float) -> Complex(Float) 
 --R
 --R   (10)
 --R   [[1.0,0.0,0.0005342523 0039183749 9,0.0005342523 0039183749 9],
@@ -3406,7 +3406,7 @@ H(1. + 10.0 * %i)-(- 13.637732188247 + 13.802912974230 * %i)]]
 --R      - 13.6377321882 47287365 + 13.8029129742 29909153 %i,
 --R      - 0.287365 E -12 - 0.908474 E -13 %i]
 --R     ]
---R                                                Type: List List Complex Float
+--R                                             Type: List(List(Complex(Float)))
 --E 10
 \end{chunk}
 Another definition of the logGamma function that is 
@@ -3433,8 +3433,8 @@ lng2(xx:COMPLEX(DFLOAT)):COMPLEX(DFLOAT)==
   result:COMPLEX(DFLOAT):=log(2.5066282746310005*ser/x)-t1
   result
 --R 
---R   Function declaration lng2 : Complex DoubleFloat -> Complex 
---R      DoubleFloat has been added to workspace.
+--R   Function declaration lng2 : Complex(DoubleFloat) -> Complex(
+--R      DoubleFloat) has been added to workspace.
 --R                                                                   Type: Void
 --E 11
 
@@ -4045,8 +4045,8 @@ lng2(1. + 10.0 * %i),logGamma(1. + 10.0 * %i),_
 lng2(1. + 10.0 * %i)-logGamma(1. + 10.0 * %i),_
 lng2(1. + 10.0 * %i)-(- 13.637732188247 + 13.802912974230 * %i)]]
 --R 
---R   Compiling function lng2 with type Complex DoubleFloat -> Complex 
---R      DoubleFloat 
+--R   Compiling function lng2 with type Complex(DoubleFloat) -> Complex(
+--R      DoubleFloat) 
 --R
 --R   (12)
 --R   [[1.,0.,0.,0.],
@@ -5068,7 +5068,7 @@ lng2(1. + 10.0 * %i)-(- 13.637732188247 + 13.802912974230 * %i)]]
 --R      4.6176396040209511E-11 - 5.0027537668029254E-11 %i,
 --R      4.5908166157460073E-11 - 5.0125237294196268E-11 %i]
 --R     ]
---R                                          Type: List List Complex DoubleFloat
+--R                                       Type: List(List(Complex(DoubleFloat)))
 --E 12
 )spool 
 )lisp (bye)
diff --git a/src/input/gbf.input.pamphlet b/src/input/gbf.input.pamphlet
index 55fd502..cda69a6 100644
--- a/src/input/gbf.input.pamphlet
+++ b/src/input/gbf.input.pamphlet
@@ -48,7 +48,7 @@ mfzn : SQMATRIX(6,DMP([x,y,z],Fraction INT)) := _
 --R        |   8     8      |
 --R        |1  -  y  -  1  0|
 --R        +   3     3      +
---RType: SquareMatrix(6,DistributedMultivariatePolynomial([x,y,z],Fraction Integer))
+--RType: SquareMatrix(6,DistributedMultivariatePolynomial([x,y,z],Fraction(Integer)))
 --E 1
 
 --S 2 of 3
@@ -59,7 +59,7 @@ eq := determinant mfzn
 --R      2 2   22  2    25  2   22    2   388       250     25  2   250     14575
 --R   - x y  + -- x y - -- x  + -- x y  - --- x y - --- x - -- y  - --- y + -----
 --R             3        9       3         9         27      9       27       81
---R            Type: DistributedMultivariatePolynomial([x,y,z],Fraction Integer)
+--R           Type: DistributedMultivariatePolynomial([x,y,z],Fraction(Integer))
 --E 2
 
 --S 3 of 3
@@ -90,7 +90,7 @@ groebnerFactorize [eq, eval(eq, [x,y,z], [y,z,x]), eval(eq, [x,y,z], [z,x,y])]
 --R         19     5     5
 --R    [x - --,y + -,z + -]]
 --R          3     3     3
---R  Type: List List DistributedMultivariatePolynomial([x,y,z],Fraction Integer)
+--RType: List(List(DistributedMultivariatePolynomial([x,y,z],Fraction(Integer))))
 --E 3
 )spool 
 )lisp (bye)
diff --git a/src/input/genups.input.pamphlet b/src/input/genups.input.pamphlet
index 41d4c81..349380a 100644
--- a/src/input/genups.input.pamphlet
+++ b/src/input/genups.input.pamphlet
@@ -33,7 +33,7 @@ taylor(n +-> 1/factorial(n),x = 0)      -- expansion of exp(x) at x = 0
 --R        1    9      1     10      11
 --R     ------ x  + ------- x   + O(x  )
 --R     362880      3628800
---R                         Type: UnivariateTaylorSeries(Expression Integer,x,0)
+--R                        Type: UnivariateTaylorSeries(Expression(Integer),x,0)
 --E 1
 
 --S 2 of 40
@@ -48,7 +48,7 @@ taylor(n +-> (-1)**(n-1)/n,x = 1,1..)   -- expansion of log(x) at x = 1
 --R     1        7   1        8   1        9    1        10            11
 --R     - (x - 1)  - - (x - 1)  + - (x - 1)  - -- (x - 1)   + O((x - 1)  )
 --R     7            8            9            10
---R                         Type: UnivariateTaylorSeries(Expression Integer,x,1)
+--R                        Type: UnivariateTaylorSeries(Expression(Integer),x,1)
 --E 2
 
 --S 3 of 40
@@ -59,7 +59,7 @@ taylor(n +-> (-1)**(n-1)/n,x = 1,1..6)  -- truncated expansion of log(x)
 --R             1        2   1        3   1        4   1        5   1        6
 --R   (x - 1) - - (x - 1)  + - (x - 1)  - - (x - 1)  + - (x - 1)  - - (x - 1)
 --R             2            3            4            5            6
---R                         Type: UnivariateTaylorSeries(Expression Integer,x,1)
+--R                        Type: UnivariateTaylorSeries(Expression(Integer),x,1)
 --E 3
 
 --S 4 of 40
@@ -72,7 +72,7 @@ laurent(m +-> m**2,x = 7,-2..)          -- infinite Laurent expansion
 --R   + 
 --R              5            6            7            8            9
 --R     25(x - 7)  + 36(x - 7)  + 49(x - 7)  + 64(x - 7)  + O((x - 7) )
---R                        Type: UnivariateLaurentSeries(Expression Integer,x,7)
+--R                       Type: UnivariateLaurentSeries(Expression(Integer),x,7)
 --E 4
 
 --S 5 of 40
@@ -85,7 +85,7 @@ laurent(m +-> m**2,x = 7,-2..5)         --   finite Laurent expansion
 --R   + 
 --R              5
 --R     25(x - 7)
---R                        Type: UnivariateLaurentSeries(Expression Integer,x,7)
+--R                       Type: UnivariateLaurentSeries(Expression(Integer),x,7)
 --E 5
 
 --S 6 of 40
@@ -95,7 +95,7 @@ puiseux(i +-> (-1)**((i-1)/2)/factorial(i),x = 0,1..,2)  -- sin(x) at x = 0
 --R            1  3    1   5     1   7      1    9       1     11      12
 --R   (6)  x - - x  + --- x  - ---- x  + ------ x  - -------- x   + O(x  )
 --R            6      120      5040      362880      39916800
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 6
 
 --S 7 of 40
@@ -105,7 +105,7 @@ puiseux(i +-> (-1)**(i/2)/factorial(i),x = 0,0..,2)      -- cos(x) at x = 0
 --R            1  2    1  4    1   6     1    8      1     10      11
 --R   (7)  1 - - x  + -- x  - --- x  + ----- x  - ------- x   + O(x  )
 --R            2      24      720      40320      3628800
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 7
 
 -- puiseux(i +-> (-1)**((i-1)/2)/factorial(i),x = 0,1..9,2) -- truncated sin(x)
@@ -117,7 +117,7 @@ puiseux(i +-> (-1)**((i-1)/2)/factorial(i),x = 0,1..9/1,2) -- truncated sin(x)
 --R            1  3    1   5     1   7      1    9
 --R   (8)  x - - x  + --- x  - ---- x  + ------ x
 --R            6      120      5040      362880
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 8
 
 --S 9 of 40
@@ -130,7 +130,7 @@ puiseux(j +-> j,x = 8,-4/3..,1/2)
 --R     4          3   5          6   1          3   1        6            2
 --R   - - (x - 8)    - - (x - 8)    - - (x - 8)    + - (x - 8)  + O((x - 8) )
 --R     3              6              3              6
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,8)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,8)
 --E 9
 
 --S 10 of 40
@@ -142,7 +142,7 @@ puiseux(j +-> j,x = 8,-4/3..1/6,1/2)
 --R           4          3   5          6   1          3   1        6
 --R   (10)  - - (x - 8)    - - (x - 8)    - - (x - 8)    + - (x - 8)
 --R           3              6              3              6
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,8)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,8)
 --E 10
 
 \end{chunk}
@@ -160,7 +160,7 @@ taylor(1/factorial(n),n,x = 0)      -- expansion of exp(x) at x = 0
 --R        1    9      1     10      11
 --R     ------ x  + ------- x   + O(x  )
 --R     362880      3628800
---R                         Type: UnivariateTaylorSeries(Expression Integer,x,0)
+--R                        Type: UnivariateTaylorSeries(Expression(Integer),x,0)
 --E 11
 
 --S 12 of 40
@@ -175,7 +175,7 @@ taylor((-1)**(n-1)/n,n,x = 1,1..)   -- expansion of log(x) at x = 1
 --R     1        7   1        8   1        9    1        10            11
 --R     - (x - 1)  - - (x - 1)  + - (x - 1)  - -- (x - 1)   + O((x - 1)  )
 --R     7            8            9            10
---R                         Type: UnivariateTaylorSeries(Expression Integer,x,1)
+--R                        Type: UnivariateTaylorSeries(Expression(Integer),x,1)
 --E 12
 
 --S 13 of 40
@@ -186,7 +186,7 @@ taylor((-1)**(n-1)/n,n,x = 1,1..6)  -- truncated expansion of log(x)
 --R             1        2   1        3   1        4   1        5   1        6
 --R   (x - 1) - - (x - 1)  + - (x - 1)  - - (x - 1)  + - (x - 1)  - - (x - 1)
 --R             2            3            4            5            6
---R                         Type: UnivariateTaylorSeries(Expression Integer,x,1)
+--R                        Type: UnivariateTaylorSeries(Expression(Integer),x,1)
 --E 13
 
 --S 14 of 40
@@ -199,7 +199,7 @@ laurent(m**2,m,x = 7,-2..)          -- infinite Laurent expansion
 --R   + 
 --R              5            6            7            8            9
 --R     25(x - 7)  + 36(x - 7)  + 49(x - 7)  + 64(x - 7)  + O((x - 7) )
---R                        Type: UnivariateLaurentSeries(Expression Integer,x,7)
+--R                       Type: UnivariateLaurentSeries(Expression(Integer),x,7)
 --E 14
 
 --S 15 of 40
@@ -212,7 +212,7 @@ laurent(m**2,m,x = 7,-2..5)         --   finite Laurent expansion
 --R   + 
 --R              5
 --R     25(x - 7)
---R                        Type: UnivariateLaurentSeries(Expression Integer,x,7)
+--R                       Type: UnivariateLaurentSeries(Expression(Integer),x,7)
 --E 15
 
 --S 16 of 40
@@ -222,7 +222,7 @@ puiseux((-1)**((i-1)/2)/factorial(i),i,x = 0,1..,2)  -- sin(x) at x = 0
 --R             1  3    1   5     1   7      1    9       1     11      12
 --R   (16)  x - - x  + --- x  - ---- x  + ------ x  - -------- x   + O(x  )
 --R             6      120      5040      362880      39916800
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 16
 
 --S 17 of 40
@@ -232,7 +232,7 @@ puiseux((-1)**(i/2)/factorial(i),i,x = 0,0..,2)      -- cos(x) at x = 0
 --R             1  2    1  4    1   6     1    8      1     10      11
 --R   (17)  1 - - x  + -- x  - --- x  + ----- x  - ------- x   + O(x  )
 --R             2      24      720      40320      3628800
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 17
 
 -- puiseux((-1)**((i-1)/2)/factorial(i),i,x = 0,1..9,2) -- truncated sin(x)
@@ -244,7 +244,7 @@ puiseux((-1)**((i-1)/2)/factorial(i),i,x = 0,1..9/1,2) -- truncated sin(x)
 --R             1  3    1   5     1   7      1    9
 --R   (18)  x - - x  + --- x  - ---- x  + ------ x
 --R             6      120      5040      362880
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 18
 
 --S 19 of 40
@@ -257,7 +257,7 @@ puiseux(j,j,x = 8,-4/3..,1/2)
 --R     4          3   5          6   1          3   1        6            2
 --R   - - (x - 8)    - - (x - 8)    - - (x - 8)    + - (x - 8)  + O((x - 8) )
 --R     3              6              3              6
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,8)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,8)
 --E 19
 
 --S 20 of 40
@@ -269,7 +269,7 @@ puiseux(j,j,x = 8,-4/3..1/6,1/2)
 --R           4          3   5          6   1          3   1        6
 --R   (20)  - - (x - 8)    - - (x - 8)    - - (x - 8)    + - (x - 8)
 --R           3              6              3              6
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,8)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,8)
 --E 20
 
 \end{chunk}
@@ -288,7 +288,7 @@ series(n +-> 1/factorial(n),x = 0)      -- expansion of exp(x) at x = 0
 --R        1    9      1     10      11
 --R     ------ x  + ------- x   + O(x  )
 --R     362880      3628800
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 21
 
 --S 22 of 40
@@ -306,7 +306,7 @@ series(n +-> (-1)**(n-1)/n,x = 1,1..)   -- expansion of log(x) at x = 1
 --R   + 
 --R              12
 --R     O((x - 1)  )
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,1)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,1)
 --E 22
 
 --S 23 of 40
@@ -317,7 +317,7 @@ series(n +-> (-1)**(n-1)/n,x = 1,1..6)  -- truncated expansion of log(x)
 --R             1        2   1        3   1        4   1        5   1        6
 --R   (x - 1) - - (x - 1)  + - (x - 1)  - - (x - 1)  + - (x - 1)  - - (x - 1)
 --R             2            3            4            5            6
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,1)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,1)
 --E 23
 
 --S 24 of 40
@@ -330,7 +330,7 @@ series(m +-> m**2,x = 7,-2..)          -- infinite Laurent expansion
 --R   + 
 --R              5            6            7            8            9
 --R     25(x - 7)  + 36(x - 7)  + 49(x - 7)  + 64(x - 7)  + O((x - 7) )
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,7)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,7)
 --E 24
 
 --S 25 of 40
@@ -343,7 +343,7 @@ series(m +-> m**2,x = 7,-2..5)         --   finite Laurent expansion
 --R   + 
 --R              5
 --R     25(x - 7)
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,7)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,7)
 --E 25
 
 --S 26 of 40
@@ -353,7 +353,7 @@ series(i +-> (-1)**((i-1)/2)/factorial(i),x = 0,1..,2)  -- sin(x) at x = 0
 --R             1  3    1   5     1   7      1    9       1     11      12
 --R   (26)  x - - x  + --- x  - ---- x  + ------ x  - -------- x   + O(x  )
 --R             6      120      5040      362880      39916800
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 26
 
 --S 27 of 40
@@ -363,7 +363,7 @@ series(i +-> (-1)**(i/2)/factorial(i),x = 0,0..,2)      -- cos(x) at x = 0
 --R             1  2    1  4    1   6     1    8      1     10      11
 --R   (27)  1 - - x  + -- x  - --- x  + ----- x  - ------- x   + O(x  )
 --R             2      24      720      40320      3628800
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 27
 
 -- series(i +-> (-1)**((i-1)/2)/factorial(i),x = 0,1..9,2) -- truncated sin(x)
@@ -375,7 +375,7 @@ series(i +-> (-1)**((i-1)/2)/factorial(i),x = 0,1..9/1,2) -- truncated sin(x)
 --R             1  3    1   5     1   7      1    9
 --R   (28)  x - - x  + --- x  - ---- x  + ------ x
 --R             6      120      5040      362880
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 28
 
 --S 29 of 40
@@ -388,7 +388,7 @@ series(j +-> j,x = 8,-4/3..,1/2)
 --R     4          3   5          6   1          3   1        6            2
 --R   - - (x - 8)    - - (x - 8)    - - (x - 8)    + - (x - 8)  + O((x - 8) )
 --R     3              6              3              6
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,8)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,8)
 --E 29
 
 --S 30 of 40
@@ -400,7 +400,7 @@ series(j +-> j,x = 8,-4/3..1/6,1/2)
 --R           4          3   5          6   1          3   1        6
 --R   (30)  - - (x - 8)    - - (x - 8)    - - (x - 8)    + - (x - 8)
 --R           3              6              3              6
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,8)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,8)
 --E 30
 
 \end{chunk}
@@ -418,7 +418,7 @@ series(1/factorial(n),n,x = 0)      -- expansion of exp(x) at x = 0
 --R        1    9      1     10      11
 --R     ------ x  + ------- x   + O(x  )
 --R     362880      3628800
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 31
 
 --S 32 of 40
@@ -436,7 +436,7 @@ series((-1)**(n-1)/n,n,x = 1,1..)   -- expansion of log(x) at x = 1
 --R   + 
 --R              12
 --R     O((x - 1)  )
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,1)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,1)
 --E 32
 
 --S 33 of 40
@@ -447,7 +447,7 @@ series((-1)**(n-1)/n,n,x = 1,1..6)  -- truncated expansion of log(x)
 --R             1        2   1        3   1        4   1        5   1        6
 --R   (x - 1) - - (x - 1)  + - (x - 1)  - - (x - 1)  + - (x - 1)  - - (x - 1)
 --R             2            3            4            5            6
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,1)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,1)
 --E 33
 
 --S 34 of 40
@@ -460,7 +460,7 @@ series(m**2,m,x = 7,-2..)          -- infinite Laurent expansion
 --R   + 
 --R              5            6            7            8            9
 --R     25(x - 7)  + 36(x - 7)  + 49(x - 7)  + 64(x - 7)  + O((x - 7) )
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,7)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,7)
 --E 34
 
 --S 35 of 40
@@ -473,7 +473,7 @@ series(m**2,m,x = 7,-2..5)         --   finite Laurent expansion
 --R   + 
 --R              5
 --R     25(x - 7)
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,7)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,7)
 --E 35
 
 --S 36 of 40
@@ -483,7 +483,7 @@ series((-1)**((i-1)/2)/factorial(i),i,x = 0,1..,2)  -- sin(x) at x = 0
 --R             1  3    1   5     1   7      1    9       1     11      12
 --R   (36)  x - - x  + --- x  - ---- x  + ------ x  - -------- x   + O(x  )
 --R             6      120      5040      362880      39916800
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 36
 
 --S 37 of 40
@@ -493,7 +493,7 @@ series((-1)**(i/2)/factorial(i),i,x = 0,0..,2)      -- cos(x) at x = 0
 --R             1  2    1  4    1   6     1    8      1     10      11
 --R   (37)  1 - - x  + -- x  - --- x  + ----- x  - ------- x   + O(x  )
 --R             2      24      720      40320      3628800
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 37
 
 -- series((-1)**((i-1)/2)/factorial(i),i,x = 0,1..9,2) -- truncated sin(x)
@@ -505,7 +505,7 @@ series((-1)**((i-1)/2)/factorial(i),i,x = 0,1..9/1,2) -- truncated sin(x)
 --R             1  3    1   5     1   7      1    9
 --R   (38)  x - - x  + --- x  - ---- x  + ------ x
 --R             6      120      5040      362880
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,0)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,0)
 --E 38
 
 --S 39 of 40
@@ -518,7 +518,7 @@ series(j,j,x = 8,-4/3..,1/2)
 --R     4          3   5          6   1          3   1        6            2
 --R   - - (x - 8)    - - (x - 8)    - - (x - 8)    + - (x - 8)  + O((x - 8) )
 --R     3              6              3              6
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,8)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,8)
 --E 39
 
 --S 40 of 40
@@ -530,7 +530,7 @@ series(j,j,x = 8,-4/3..1/6,1/2)
 --R           4          3   5          6   1          3   1        6
 --R   (40)  - - (x - 8)    - - (x - 8)    - - (x - 8)    + - (x - 8)
 --R           3              6              3              6
---R                        Type: UnivariatePuiseuxSeries(Expression Integer,x,8)
+--R                       Type: UnivariatePuiseuxSeries(Expression(Integer),x,8)
 --E 40
 )spool 
 )lisp (bye)
diff --git a/src/input/gonshor.input.pamphlet b/src/input/gonshor.input.pamphlet
index d8e9675..f851a52 100644
--- a/src/input/gonshor.input.pamphlet
+++ b/src/input/go