120 files changed, 59 insertions, 59 deletions

diff --git a/.hgignore b/.hgignore
index e4fdd97e..a4684089 100644
--- a/.hgignore
+++ b/.hgignore
@@ -6,8 +6,8 @@ src/.cm
 
 bin/*
 
-src/lacweb.cm
-src/lacweb.mlb
+src/urweb.cm
+src/urweb.mlb
 
 *.lex.*
 *.grm.*
diff --git a/Makefile b/Makefile
index ace1e702..e78602c6 100644
--- a/Makefile
+++ b/Makefile
@@ -2,31 +2,31 @@ all: smlnj mlton c
 
 .PHONY: all smlnj mlton c clean
 
-smlnj: src/lacweb.cm
-mlton: bin/lacweb
-c: clib/lacweb.o clib/driver.o
+smlnj: src/urweb.cm
+mlton: bin/urweb
+c: clib/urweb.o clib/driver.o
 
 clean:
 	rm -f src/*.mlton.grm.* src/*.mlton.lex.* \
-		src/lacweb.cm src/lacweb.mlb \
+		src/urweb.cm src/urweb.mlb \
 		clib/*.o
 	rm -rf .cm src/.cm
 
-clib/lacweb.o: src/c/lacweb.c
-	gcc -O3 -I include -c src/c/lacweb.c -o clib/lacweb.o
+clib/urweb.o: src/c/urweb.c
+	gcc -O3 -I include -c src/c/urweb.c -o clib/urweb.o
 
 clib/driver.o: src/c/driver.c
 	gcc -O3 -I include -c src/c/driver.c -o clib/driver.o
 
-src/lacweb.cm: src/prefix.cm src/sources
+src/urweb.cm: src/prefix.cm src/sources
 	cat src/prefix.cm src/sources \
-	>src/lacweb.cm
+	>src/urweb.cm
 
-src/lacweb.mlb: src/prefix.mlb src/sources src/suffix.mlb
+src/urweb.mlb: src/prefix.mlb src/sources src/suffix.mlb
 	cat src/prefix.mlb src/sources src/suffix.mlb \
 	| sed 's/^\(.*\).grm$$/\1.mlton.grm.sig\n\1.mlton.grm.sml/' \
 	| sed 's/^\(.*\).lex$$/\1.mlton.lex.sml/' \
-	>src/lacweb.mlb
+	>src/urweb.mlb
 
 %.mlton.lex: %.lex
 	cp $< $@
@@ -45,7 +45,7 @@ ifdef DEBUG
 	MLTON += -const 'Exn.keepHistory true'
 endif
 
-bin/lacweb: src/lacweb.mlb src/*.sig src/*.sml \
-		src/lacweb.mlton.lex.sml \
-		src/lacweb.mlton.grm.sig src/lacweb.mlton.grm.sml
-	$(MLTON) -output $@ src/lacweb.mlb
+bin/urweb: src/urweb.mlb src/*.sig src/*.sml \
+		src/urweb.mlton.lex.sml \
+		src/urweb.mlton.grm.sig src/urweb.mlton.grm.sml
+	$(MLTON) -output $@ src/urweb.mlb
diff --git a/include/lacweb.h b/include/urweb.h
index 3ca2a966..3ca2a966 100644
--- a/include/lacweb.h
+++ b/include/urweb.h
diff --git a/lib/basis.lig b/lib/basis.urs
index f9fc23d5..f9fc23d5 100644
--- a/lib/basis.lig
+++ b/lib/basis.urs
diff --git a/src/c/driver.c b/src/c/driver.c
index 21001d0c..5300371d 100644
--- a/src/c/driver.c
+++ b/src/c/driver.c
@@ -7,7 +7,7 @@
 
 #include <pthread.h>
 
-#include "lacweb.h"
+#include "urweb.h"
 
 int lw_port = 8080;
 int lw_backlog = 10;
diff --git a/src/cjr_print.sig b/src/cjr_print.sig
index 2c860550..f8ffa193 100644
--- a/src/cjr_print.sig
+++ b/src/cjr_print.sig
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *)
 
-(* Pretty-printing Laconic/Web C jr. language *)
+(* Pretty-printing Ur/Web C jr. language *)
 
 signature CJR_PRINT = sig
     val p_typ : CjrEnv.env -> Cjr.typ Print.printer
diff --git a/src/cjr_print.sml b/src/cjr_print.sml
index 227abf2e..115f09fc 100644
--- a/src/cjr_print.sml
+++ b/src/cjr_print.sml
@@ -1145,7 +1145,7 @@ fun p_file env (ds, ps) =
              string "#include <stdlib.h>",
              newline,
              newline,
-             string "#include \"lacweb.h\"",
+             string "#include \"urweb.h\"",
              newline,
              newline,
              p_list_sep newline (fn x => x) pds,
diff --git a/src/compiler.sig b/src/compiler.sig
index 2594a0c7..51ec0537 100644
--- a/src/compiler.sig
+++ b/src/compiler.sig
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *)
 
-(* Laconic/Web main compiler interface *)
+(* Ur/Web main compiler interface *)
 
 signature COMPILER = sig
 
@@ -44,8 +44,8 @@ signature COMPILER = sig
     val time : ('src, 'dst) transform -> 'src -> unit
     val timePrint : ('src, 'dst) transform -> 'src -> unit
 
-    val parseLac : (string, Source.file) phase
-    val parseLig : (string, Source.sgn_item list) phase
+    val parseUr : (string, Source.file) phase
+    val parseUrs : (string, Source.sgn_item list) phase
 
     val parse : (job, Source.file) phase
     val elaborate : (Source.file, Elab.file) phase
diff --git a/src/compiler.sml b/src/compiler.sml
index 6ea393a6..4df71bcd 100644
--- a/src/compiler.sml
+++ b/src/compiler.sml
@@ -25,13 +25,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *)
 
-(* Laconic/Web language parser *)
+(* Ur/Web language parser *)
 
 structure Compiler :> COMPILER = struct 
 
-structure LacwebLrVals = LacwebLrValsFn(structure Token = LrParser.Token)
-structure Lex = LacwebLexFn(structure Tokens = LacwebLrVals.Tokens)
-structure LacwebP = Join(structure ParserData = LacwebLrVals.ParserData
+structure UrwebLrVals = UrwebLrValsFn(structure Token = LrParser.Token)
+structure Lex = UrwebLexFn(structure Tokens = UrwebLrVals.Tokens)
+structure UrwebP = Join(structure ParserData = UrwebLrVals.ParserData
                          structure Lex = Lex
                          structure LrParser = LrParser)
 
@@ -123,7 +123,7 @@ fun timePrint (tr : ('src, 'dst) transform) input =
              print "\n")
     end
 
-val parseLig =
+val parseUrs =
     {func = fn filename => let
                    val fname = OS.FileSys.tmpName ()
                    val outf = TextIO.openOut fname
@@ -145,7 +145,7 @@ val parseLig =
 	           fun get _ = TextIO.input file
 	           fun parseerror (s, p1, p2) = ErrorMsg.errorAt' (p1, p2) s
 	           val lexer = LrParser.Stream.streamify (Lex.makeLexer get)
-	           val (absyn, _) = LacwebP.parse (30, lexer, parseerror, ())
+	           val (absyn, _) = UrwebP.parse (30, lexer, parseerror, ())
                in
                    TextIO.closeIn file;
                    case absyn of
@@ -161,7 +161,7 @@ val parseLig =
      print = Print.p_list_sep Print.PD.newline SourcePrint.p_sgn_item}
 
 (* The main parsing routine *)
-val parseLac = {
+val parseUr = {
     func = fn filename =>
               let
                   val () = (ErrorMsg.resetErrors ();
@@ -171,7 +171,7 @@ val parseLac = {
 	          fun get _ = TextIO.input file
 	          fun parseerror (s, p1, p2) = ErrorMsg.errorAt' (p1, p2) s
 	          val lexer = LrParser.Stream.streamify (Lex.makeLexer get)
-	          val (absyn, _) = LacwebP.parse (30, lexer, parseerror, ())
+	          val (absyn, _) = UrwebP.parse (30, lexer, parseerror, ())
               in
                   TextIO.closeIn file;
                   case absyn of
@@ -198,23 +198,23 @@ val parse = {
                   fun parseOne fname =
                       let
                           val mname = nameOf fname
-                          val lac = OS.Path.joinBaseExt {base = fname, ext = SOME "lac"}
-                          val lig = OS.Path.joinBaseExt {base = fname, ext = SOME "lig"}
+                          val ur = OS.Path.joinBaseExt {base = fname, ext = SOME "ur"}
+                          val urs = OS.Path.joinBaseExt {base = fname, ext = SOME "urs"}
 
                           val sgnO =
-                              if Posix.FileSys.access (lig, []) then
-                                  SOME (Source.SgnConst (#func parseLig lig),
-                                        {file = lig,
+                              if Posix.FileSys.access (urs, []) then
+                                  SOME (Source.SgnConst (#func parseUrs urs),
+                                        {file = urs,
                                          first = ErrorMsg.dummyPos,
                                          last = ErrorMsg.dummyPos})
                               else
                                   NONE
 
-                          val loc = {file = lac,
+                          val loc = {file = ur,
                                      first = ErrorMsg.dummyPos,
                                      last = ErrorMsg.dummyPos}
 
-                          val ds = #func parseLac lac
+                          val ds = #func parseUr ur
                       in
                           (Source.DStr (mname, sgnO, (Source.StrConst ds, loc)), loc)
                       end
@@ -234,7 +234,7 @@ val toParse = transform parse "parse"
 
 val elaborate = {
     func = fn file => let
-                  val basis = #func parseLig "lib/basis.lig"
+                  val basis = #func parseUrs "lib/basis.urs"
               in
                   Elaborate.elabFile basis ElabEnv.empty file
               end,
@@ -334,7 +334,7 @@ val toCjrize = toMono_opt2 o transform cjrize "cjrize"
 fun compileC {cname, oname, ename} =
     let
         val compile = "gcc -O3 -I include -c " ^ cname ^ " -o " ^ oname
-        val link = "gcc -pthread -O3 clib/lacweb.o " ^ oname ^ " clib/driver.o -o " ^ ename
+        val link = "gcc -pthread -O3 clib/urweb.o " ^ oname ^ " clib/driver.o -o " ^ ename
     in
         if not (OS.Process.isSuccess (OS.Process.system compile)) then
             print "C compilation failed\n"
@@ -346,11 +346,11 @@ fun compileC {cname, oname, ename} =
 
 fun compile job =
     case run toCjrize job of
-        NONE => print "Laconic compilation failed\n"
+        NONE => print "Ur compilation failed\n"
       | SOME file =>
         let
-            val cname = "/tmp/lacweb.c"
-            val oname = "/tmp/lacweb.o"
+            val cname = "/tmp/urweb.c"
+            val oname = "/tmp/urweb.o"
             val ename = "/tmp/webapp"
 
             val outf = TextIO.openOut cname
diff --git a/src/core_print.sig b/src/core_print.sig
index dfad5827..38a51aef 100644
--- a/src/core_print.sig
+++ b/src/core_print.sig
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *)
 
-(* Pretty-printing Laconic/Web internal language *)
+(* Pretty-printing Ur/Web internal language *)
 
 signature CORE_PRINT = sig
     val p_kind : Core.kind Print.printer
diff --git a/src/core_print.sml b/src/core_print.sml
index 66432866..b03b25f6 100644
--- a/src/core_print.sml
+++ b/src/core_print.sml
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *)
 
-(* Pretty-printing core Laconic/Web *)
+(* Pretty-printing core Ur/Web *)
 
 structure CorePrint :> CORE_PRINT = struct
 
diff --git a/src/elab_print.sig b/src/elab_print.sig
index ead61e68..3d078576 100644
--- a/src/elab_print.sig
+++ b/src/elab_print.sig
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *)
 
-(* Pretty-printing Laconic/Web *)
+(* Pretty-printing Ur/Web *)
 
 signature ELAB_PRINT = sig
     val p_kind : Elab.kind Print.printer
diff --git a/src/elab_print.sml b/src/elab_print.sml
index 337b1d8a..a0589b7d 100644
--- a/src/elab_print.sml
+++ b/src/elab_print.sml
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *)
 
-(* Pretty-printing elaborated Laconic/Web *)
+(* Pretty-printing elaborated Ur/Web *)
 
 structure ElabPrint :> ELAB_PRINT = struct
 
diff --git a/src/expl_print.sml b/src/expl_print.sml
index f854c03d..ded90ada 100644
--- a/src/expl_print.sml
+++ b/src/expl_print.sml
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *)
 
-(* Pretty-printing elaborated Laconic/Web *)
+(* Pretty-printing elaborated Ur/Web *)
 
 structure ExplPrint :> EXPL_PRINT = struct
 
diff --git a/src/mono_print.sig b/src/mono_print.sig
index 6f7f09a9..405ff416 100644
--- a/src/mono_print.sig
+++ b/src/mono_print.sig
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *)
 
-(* Pretty-printing Laconic/Web monomorphic language *)
+(* Pretty-printing Ur/Web monomorphic language *)
 
 signature MONO_PRINT = sig
     val p_typ : MonoEnv.env -> Mono.typ Print.printer
diff --git a/src/mono_print.sml b/src/mono_print.sml
index afa86c18..7acb05b5 100644
--- a/src/mono_print.sml
+++ b/src/mono_print.sml
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *)
 
-(* Pretty-printing monomorphic Laconic/Web *)
+(* Pretty-printing monomorphic Ur/Web *)
 
 structure MonoPrint :> MONO_PRINT = struct
 
diff --git a/src/print.sml b/src/print.sml
index db6af55c..3917a998 100644
--- a/src/print.sml
+++ b/src/print.sml
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *)
 
-(* Pretty-printing Laconic/Web *)
+(* Generic printing support code *)
 
 structure Print :> PRINT = struct
 
diff --git a/src/source_print.sig b/src/source_print.sig
index 2128aa3f..be68cdd4 100644
--- a/src/source_print.sig
+++ b/src/source_print.sig
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *)
 
-(* Pretty-printing Laconic/Web *)
+(* Pretty-printing Ur/Web *)
 
 signature SOURCE_PRINT = sig
     val p_kind : Source.kind Print.printer
diff --git a/src/source_print.sml b/src/source_print.sml
index 7ae2b23e..f98227ec 100644
--- a/src/source_print.sml
+++ b/src/source_print.sml
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *)
 
-(* Pretty-printing Laconic/Web *)
+(* Pretty-printing Ur/Web *)
 
 structure SourcePrint :> SOURCE_PRINT = struct
 
diff --git a/src/sources b/src/sources
index 94c37050..c57a30b1 100644
--- a/src/sources
+++ b/src/sources
@@ -18,8 +18,8 @@ prim.sml
 
 source.sml
 
-lacweb.grm
-lacweb.lex
+urweb.grm
+urweb.lex
 
 source_print.sig
 source_print.sml
diff --git a/src/lacweb.grm b/src/urweb.grm
index feff82df..aa062516 100644
--- a/src/lacweb.grm
+++ b/src/urweb.grm
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *)
 
-(* Grammar for Laconic/Web programs *)
+(* Grammar for Ur/Web programs *)
 
 open Source
 
@@ -142,7 +142,7 @@ fun sql_relop (oper, sqlexp1, sqlexp2, loc) =
     end
 
 %%
-%header (functor LacwebLrValsFn(structure Token : TOKEN))
+%header (functor UrwebLrValsFn(structure Token : TOKEN))
 
 %term 
    EOF
@@ -275,7 +275,7 @@ fun sql_relop (oper, sqlexp1, sqlexp2, loc) =
 %eop EOF
 %noshift EOF
 
-%name Lacweb
+%name Urweb
 
 %right SEMI
 %nonassoc LARROW
diff --git a/src/lacweb.lex b/src/urweb.lex
index e593c5fe..1d64a85c 100644
--- a/src/lacweb.lex
+++ b/src/urweb.lex
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *)
 
-(* Lexing info for Laconic/Web programs *)
+(* Lexing info for Ur/Web programs *)
 
 type pos = int
 type svalue = Tokens.svalue
@@ -107,7 +107,7 @@ fun initialize () = (xmlTag := [];
 
 
 %%
-%header (functor LacwebLexFn(structure Tokens : Lacweb_TOKENS));
+%header (functor UrwebLexFn(structure Tokens : Urweb_TOKENS));
 %full
 %s COMMENT STRING XML XMLTAG;
 
diff --git a/tests/agg.lac b/tests/agg.ur
index 8aa72e6c..8aa72e6c 100644
--- a/tests/agg.lac
+++ b/tests/agg.ur
diff --git a/tests/attrs.lac b/tests/attrs.ur
index ffc52c67..ffc52c67 100644
--- a/tests/attrs.lac
+++ b/tests/attrs.ur
diff --git a/tests/attrs_escape.lac b/tests/attrs_escape.ur
index 12de101e..12de101e 100644
--- a/tests/attrs_escape.lac
+++ b/tests/attrs_escape.ur
diff --git a/tests/bool.lac b/tests/bool.ur
index b7e57dca..b7e57dca 100644
--- a/tests/bool.lac
+++ b/tests/bool.ur
diff --git a/tests/broad_unif.lac b/tests/broad_unif.ur
index bebd9104..bebd9104 100644
--- a/tests/broad_unif.lac
+++ b/tests/broad_unif.ur
diff --git a/tests/cargs.lac b/tests/cargs.ur
index 7aa10d1b..7aa10d1b 100644
--- a/tests/cargs.lac
+++ b/tests/cargs.ur
diff --git a/tests/case.lac b/tests/case.ur
index b131b27b..b131b27b 100644
--- a/tests/case.lac
+++ b/tests/case.ur
diff --git a/tests/caseFfi.lac b/tests/caseFfi.ur
index 76232cb3..76232cb3 100644
--- a/tests/caseFfi.lac
+++ b/tests/caseFfi.ur
diff --git a/tests/caseMod.lac b/tests/caseMod.ur
index 0a870160..0a870160 100644
--- a/tests/caseMod.lac
+++ b/tests/caseMod.ur
diff --git a/tests/cdata.lac b/tests/cdata.ur
index 04556658..04556658 100644
--- a/tests/cdata.lac
+++ b/tests/cdata.ur
diff --git a/tests/cdataF.lac b/tests/cdataF.ur
index 3f8da45b..3f8da45b 100644
--- a/tests/cdataF.lac
+++ b/tests/cdataF.ur
diff --git a/tests/cdataL.lac b/tests/cdataL.ur
index 3aa3bef6..3aa3bef6 100644
--- a/tests/cdataL.lac
+++ b/tests/cdataL.ur
diff --git a/tests/cdatas.lac b/tests/cdatas.ur
index bcbf26e3..bcbf26e3 100644
--- a/tests/cdatas.lac
+++ b/tests/cdatas.ur
diff --git a/tests/cfold.lac b/tests/cfold.ur
index 0fcf9d60..0fcf9d60 100644
--- a/tests/cfold.lac
+++ b/tests/cfold.ur
diff --git a/tests/cfold_disj.lac b/tests/cfold_disj.ur
index e0a19484..e0a19484 100644
--- a/tests/cfold_disj.lac
+++ b/tests/cfold_disj.ur
diff --git a/tests/checkbox.lac b/tests/checkbox.ur
index 6d7ee34c..6d7ee34c 100644
--- a/tests/checkbox.lac
+++ b/tests/checkbox.ur
diff --git a/tests/cloconv.lac b/tests/cloconv.ur
index 3dd9ad86..3dd9ad86 100644
--- a/tests/cloconv.lac
+++ b/tests/cloconv.ur
diff --git a/tests/constraint.lac b/tests/constraint.ur
index e350a4ea..e350a4ea 100644
--- a/tests/constraint.lac
+++ b/tests/constraint.ur
diff --git a/tests/ctuple.lac b/tests/ctuple.ur
index 68c1301f..68c1301f 100644
--- a/tests/ctuple.lac
+++ b/tests/ctuple.ur
diff --git a/tests/curry.lac b/tests/curry.ur
index 46577284..46577284 100644
--- a/tests/curry.lac
+++ b/tests/curry.ur
diff --git a/tests/curry3.lac b/tests/curry3.ur
index fa2804cf..fa2804cf 100644
--- a/tests/curry3.lac
+++ b/tests/curry3.ur
diff --git a/tests/cut.lac b/tests/cut.ur
index 6b7b4ef3..6b7b4ef3 100644
--- a/tests/cut.lac
+++ b/tests/cut.ur
diff --git a/tests/datatype.lac b/tests/datatype.ur
index 1e1a91aa..1e1a91aa 100644
--- a/tests/datatype.lac
+++ b/tests/datatype.ur
diff --git a/tests/datatypeMod.lac b/tests/datatypeMod.ur
index f82b0098..f82b0098 100644
--- a/tests/datatypeMod.lac
+++ b/tests/datatypeMod.ur
diff --git a/tests/datatypeP.lac b/tests/datatypeP.ur
index 171d8812..171d8812 100644
--- a/tests/datatypeP.lac
+++ b/tests/datatypeP.ur
diff --git a/tests/datatypeP2.lac b/tests/datatypeP2.ur
index 09cc964a..09cc964a 100644
--- a/tests/datatypeP2.lac
+++ b/tests/datatypeP2.ur
diff --git a/tests/disjoint.lac b/tests/disjoint.ur
index 26278014..26278014 100644
--- a/tests/disjoint.lac
+++ b/tests/disjoint.ur
diff --git a/tests/eargs.lac b/tests/eargs.ur
index bfac497a..bfac497a 100644
--- a/tests/eargs.lac
+++ b/tests/eargs.ur
diff --git a/tests/efold.lac b/tests/efold.ur
index 317d0852..317d0852 100644
--- a/tests/efold.lac
+++ b/tests/efold.ur
diff --git a/tests/equiv.lac b/tests/equiv.ur
index 19ac18d4..19ac18d4 100644
--- a/tests/equiv.lac
+++ b/tests/equiv.ur
diff --git a/tests/ffi.lac b/tests/ffi.ur
index 79f7ab2e..79f7ab2e 100644
--- a/tests/ffi.lac
+++ b/tests/ffi.ur
diff --git a/tests/foldm.lac b/tests/foldm.ur
index 64d30ba2..64d30ba2 100644
--- a/tests/foldm.lac
+++ b/tests/foldm.ur
diff --git a/tests/form.lac b/tests/form.ur
index a046928a..a046928a 100644
--- a/tests/form.lac
+++ b/tests/form.ur
diff --git a/tests/form2.lac b/tests/form2.ur
index d3ea4736..d3ea4736 100644
--- a/tests/form2.lac
+++ b/tests/form2.ur
diff --git a/tests/form3.lac b/tests/form3.ur
index 3c0915f7..3c0915f7 100644
--- a/tests/form3.lac
+++ b/tests/form3.ur
diff --git a/tests/functor.lac b/tests/functor.ur
index 5adfb597..5adfb597 100644
--- a/tests/functor.lac
+++ b/tests/functor.ur
diff --git a/tests/gform.lac b/tests/gform.ur
index e1b194c0..e1b194c0 100644
--- a/tests/gform.lac
+++ b/tests/gform.ur
diff --git a/tests/gformText.lac b/tests/gformText.ur
index 98d0f4ee..98d0f4ee 100644
--- a/tests/gformText.lac
+++ b/tests/gformText.ur
diff --git a/tests/group_by.lac b/tests/group_by.ur
index 569676d5..569676d5 100644
--- a/tests/group_by.lac
+++ b/tests/group_by.ur
diff --git a/tests/html.lac b/tests/html.ur
index e6f93ab3..e6f93ab3 100644
--- a/tests/html.lac
+++ b/tests/html.ur
diff --git a/tests/html_fn.lac b/tests/html_fn.ur
index fab70cc3..fab70cc3 100644
--- a/tests/html_fn.lac
+++ b/tests/html_fn.ur
diff --git a/tests/impl.lac b/tests/impl.ur
index 5304598c..5304598c 100644
--- a/tests/impl.lac
+++ b/tests/impl.ur
diff --git a/tests/include.lac b/tests/include.ur
index 6661d0f9..6661d0f9 100644
--- a/tests/include.lac
+++ b/tests/include.ur
diff --git a/tests/lexerr.lac b/tests/lexerr.ur
index c9d17adf..c9d17adf 100644
--- a/tests/lexerr.lac
+++ b/tests/lexerr.ur
diff --git a/tests/lexerrS.lac b/tests/lexerrS.ur
index 93ab30a0..93ab30a0 100644
--- a/tests/lexerrS.lac
+++ b/tests/lexerrS.ur
diff --git a/tests/limit.lac b/tests/limit.ur
index 5bfb1a81..5bfb1a81 100644
--- a/tests/limit.lac
+++ b/tests/limit.ur
diff --git a/tests/link.lac b/tests/link.ur
index 26f093ed..26f093ed 100644
--- a/tests/link.lac
+++ b/tests/link.ur
diff --git a/tests/links.lac b/tests/links.ur
index 7a7b1e98..7a7b1e98 100644
--- a/tests/links.lac
+++ b/tests/links.ur
diff --git a/tests/linksF.lac b/tests/linksF.ur
index 0bcfe1d1..0bcfe1d1 100644
--- a/tests/linksF.lac
+++ b/tests/linksF.ur
diff --git a/tests/list.lac b/tests/list.ur
index a4602d0e..a4602d0e 100644
--- a/tests/list.lac
+++ b/tests/list.ur
diff --git a/tests/modnested.lac b/tests/modnested.ur
index d9ff576d..d9ff576d 100644
--- a/tests/modnested.lac
+++ b/tests/modnested.ur
diff --git a/tests/modproj.lac b/tests/modproj.ur
index a12e25a7..a12e25a7 100644
--- a/tests/modproj.lac
+++ b/tests/modproj.ur
diff --git a/tests/modules.lac b/tests/modules.ur
index 5089f17b..5089f17b 100644
--- a/tests/modules.lac
+++ b/tests/modules.ur
diff --git a/tests/open.lac b/tests/open.ur
index 47f81219..47f81219 100644
--- a/tests/open.lac
+++ b/tests/open.ur
diff --git a/tests/open_functor.lac b/tests/open_functor.ur
index 36525a05..36525a05 100644
--- a/tests/open_functor.lac
+++ b/tests/open_functor.ur
diff --git a/tests/option.lac b/tests/option.ur
index 76fcc6ea..76fcc6ea 100644
--- a/tests/option.lac
+++ b/tests/option.ur
diff --git a/tests/order_by.lac b/tests/order_by.ur
index f2b501c4..f2b501c4 100644
--- a/tests/order_by.lac
+++ b/tests/order_by.ur
diff --git a/tests/pass.lac b/tests/pass.ur
index 2260267a..2260267a 100644
--- a/tests/pass.lac
+++ b/tests/pass.ur
diff --git a/tests/pcase.lac b/tests/pcase.ur
index 581d94c3..581d94c3 100644
--- a/tests/pcase.lac
+++ b/tests/pcase.ur
diff --git a/tests/plink.lac b/tests/plink.ur
index eda255f4..eda255f4 100644
--- a/tests/plink.lac
+++ b/tests/plink.ur
diff --git a/tests/plink2.lac b/tests/plink2.ur
index e446515e..e446515e 100644
--- a/tests/plink2.lac
+++ b/tests/plink2.ur
diff --git a/tests/plink3.lac b/tests/plink3.ur
index 0ecd3ac9..0ecd3ac9 100644
--- a/tests/plink3.lac
+++ b/tests/plink3.ur
diff --git a/tests/prim.lac b/tests/prim.ur
index c1a76b33..c1a76b33 100644
--- a/tests/prim.lac
+++ b/tests/prim.ur
diff --git a/tests/query.lac b/tests/query.ur
index 2caf0412..2caf0412 100644
--- a/tests/query.lac
+++ b/tests/query.ur
diff --git a/tests/radio.lac b/tests/radio.ur
index e40872f8..e40872f8 100644
--- a/tests/radio.lac
+++ b/tests/radio.ur
diff --git a/tests/rec.lac b/tests/rec.ur
index 6131337e..6131337e 100644
--- a/tests/rec.lac
+++ b/tests/rec.ur
diff --git a/tests/rec2.lac b/tests/rec2.ur
index e5f208c9..e5f208c9 100644
--- a/tests/rec2.lac
+++ b/tests/rec2.ur
diff --git a/tests/rec3.lac b/tests/rec3.ur
index eaa07fe2..eaa07fe2 100644
--- a/tests/rec3.lac
+++ b/tests/rec3.ur
diff --git a/tests/recBad.lac b/tests/recBad.ur
index 11934ec0..11934ec0 100644
--- a/tests/recBad.lac
+++ b/tests/recBad.ur
diff --git a/tests/recReal.lac b/tests/recReal.ur
index e3d46e81..e3d46e81 100644
--- a/tests/recReal.lac
+++ b/tests/recReal.ur
diff --git a/tests/recReal2.lac b/tests/recReal2.ur
index efe24004..efe24004 100644
--- a/tests/recReal2.lac
+++ b/tests/recReal2.ur
diff --git a/tests/recReal3.lac b/tests/recReal3.ur
index 0ebc489a..0ebc489a 100644
--- a/tests/recReal3.lac
+++ b/tests/recReal3.ur
diff --git a/tests/record_page.lac b/tests/record_page.ur
index a54a9133..a54a9133 100644
--- a/tests/record_page.lac
+++ b/tests/record_page.ur
diff --git a/tests/reduce.lac b/tests/reduce.ur
index f292a294..f292a294 100644
--- a/tests/reduce.lac
+++ b/tests/reduce.ur
diff --git a/tests/relops.lac b/tests/relops.ur
index c9fca0cc..c9fca0cc 100644
--- a/tests/relops.lac
+++ b/tests/relops.ur
diff --git a/tests/rpat.lac b/tests/rpat.ur
index 6c4f9c5e..6c4f9c5e 100644
--- a/tests/rpat.lac
+++ b/tests/rpat.ur
diff --git a/tests/select.lac b/tests/select.ur
index d97e6a55..d97e6a55 100644
--- a/tests/select.lac
+++ b/tests/select.ur
diff --git a/tests/selexp.lac b/tests/selexp.ur
index 11bb7965..11bb7965 100644
--- a/tests/selexp.lac
+++ b/tests/selexp.ur
diff --git a/tests/sig_impl.lac b/tests/sig_impl.ur
index cdcd4ef7..cdcd4ef7 100644
--- a/tests/sig_impl.lac
+++ b/tests/sig_impl.ur
diff --git a/tests/sig_wild.lac b/tests/sig_wild.ur
index 3f714772..3f714772 100644
--- a/tests/sig_wild.lac
+++ b/tests/sig_wild.ur
diff --git a/tests/sigdupe.lac b/tests/sigdupe.ur
index 50bed798..50bed798 100644
--- a/tests/sigdupe.lac
+++ b/tests/sigdupe.ur
diff --git a/tests/split.lac b/tests/split.ur
index 0a855c5e..0a855c5e 100644
--- a/tests/split.lac
+++ b/tests/split.ur
diff --git a/tests/split.lig b/tests/split.urs
index d095f7c4..d095f7c4 100644
--- a/tests/split.lig
+++ b/tests/split.urs
diff --git a/tests/split2.lac b/tests/split2.ur
index fb66e528..fb66e528 100644
--- a/tests/split2.lac
+++ b/tests/split2.ur
diff --git a/tests/strdupe.lac b/tests/strdupe.ur
index 2a11aa51..2a11aa51 100644
--- a/tests/strdupe.lac
+++ b/tests/strdupe.ur
diff --git a/tests/stuff.lac b/tests/stuff.ur
index 806e4dfe..806e4dfe 100644
--- a/tests/stuff.lac
+++ b/tests/stuff.ur
diff --git a/tests/subs_sig.lac b/tests/subs_sig.ur
index 934f6042..934f6042 100644
--- a/tests/subs_sig.lac
+++ b/tests/subs_sig.ur
diff --git a/tests/subs_sig.lig b/tests/subs_sig.urs
index 7a6ab8fc..7a6ab8fc 100644
--- a/tests/subs_sig.lig
+++ b/tests/subs_sig.urs
diff --git a/tests/subs_str.lac b/tests/subs_str.ur
index fcdc6991..fcdc6991 100644
--- a/tests/subs_str.lac
+++ b/tests/subs_str.ur
diff --git a/tests/subs_str.lig b/tests/subs_str.urs
index 11ab2e2d..11ab2e2d 100644
--- a/tests/subs_str.lig
+++ b/tests/subs_str.urs
diff --git a/tests/subsig.lac b/tests/subsig.ur
index c10fb3ba..c10fb3ba 100644
--- a/tests/subsig.lac
+++ b/tests/subsig.ur
diff --git a/tests/table.lac b/tests/table.ur
index b27874c9..b27874c9 100644
--- a/tests/table.lac
+++ b/tests/table.ur
diff --git a/tests/textarea.lac b/tests/textarea.ur
index 708c9b03..708c9b03 100644
--- a/tests/textarea.lac
+++ b/tests/textarea.ur
diff --git a/tests/tuple.lac b/tests/tuple.ur
index 555cfd0c..555cfd0c 100644
--- a/tests/tuple.lac
+++ b/tests/tuple.ur
diff --git a/tests/type_class.lac b/tests/type_class.ur
index 0acca7cd..0acca7cd 100644
--- a/tests/type_class.lac
+++ b/tests/type_class.ur
diff --git a/tests/type_classMod.lac b/tests/type_classMod.ur
index bcf03d1e..bcf03d1e 100644
--- a/tests/type_classMod.lac
+++ b/tests/type_classMod.ur
diff --git a/tests/type_classMod2.lac b/tests/type_classMod2.ur
index ba700c22..ba700c22 100644
--- a/tests/type_classMod2.lac
+++ b/tests/type_classMod2.ur
diff --git a/tests/where.lac b/tests/where.ur
index ab430941..ab430941 100644
--- a/tests/where.lac
+++ b/tests/where.ur