11 files changed, 26 insertions, 26 deletions
diff --git a/stdlib/test/test/lux/lang/analysis/case.lux b/stdlib/test/test/lux/lang/compiler/analysis/case.lux
index 9e775f8a3..d2836558e 100644
--- a/stdlib/test/test/lux/lang/analysis/case.lux
+++ b/stdlib/test/test/lux/lang/compiler/analysis/case.lux
@@ -14,12 +14,12 @@
        ["r" math/random "r/" Monad<Random>]
        [macro #+ Monad<Meta>]
        (macro [code])
-       [lang]
        (lang [type "type/" Eq<Type>]
              (type ["tc" check])
              [".L" module]
-             (analysis [".A" type]
-                       ["/" case]))
+             (compiler [analysis]
+                       (analysis [".A" type]
+                                 ["/" case])))
        test)
   (// ["_." primitive]
       ["_." structure]))
@@ -145,8 +145,8 @@
                variantTC (list.zip2 variant-tags+ primitivesC)]
          inputC (input variant-tags+ record-tags+ primitivesC)
          [outputT outputC] _primitive.primitive
-         [heterogeneousT heterogeneousC] (|> _primitive.primitive
-                                             (r.filter (|>> product.left (tc.checks? outputT) not)))
+         [heterogeneousT heterogeneousC] (r.filter (|>> product.left (tc.checks? outputT) not)
+                                                   _primitive.primitive)
          exhaustive-patterns (exhaustive-branches true variantTC inputC)
          redundant-patterns (exhaustive-branches false variantTC inputC)
          redundancy-idx (|> r.nat (:: @ map (n/% (list.size redundant-patterns))))
@@ -166,7 +166,7 @@
                                                           (list.drop (inc heterogeneous-idx) exhaustive-branchesC)))
                analyse-pm (|>> (/.case _primitive.analyse inputC)
                                (typeA.with-type outputT)
-                               lang.with-scope
+                               analysis.with-scope
                                (do Monad<Meta>
                                  [_ (moduleL.declare-tags variant-tags false
                                                           (#.Named [module-name variant-name]
@@ -190,5 +190,5 @@
                       _structure.check-fails))
             (test "Will reject pattern-matching if the bodies of the branches do not all have the same type."
                   (|> (analyse-pm heterogeneous-branchesC)
-                      _structure.check-fails))
-            ))))
+                      _structure.check-fails)))
+        )))
diff --git a/stdlib/test/test/lux/lang/analysis/function.lux b/stdlib/test/test/lux/lang/compiler/analysis/function.lux
index a99504045..147cbcc9e 100644
--- a/stdlib/test/test/lux/lang/analysis/function.lux
+++ b/stdlib/test/test/lux/lang/compiler/analysis/function.lux
@@ -14,12 +14,12 @@
        (macro [code])
        [lang]
        (lang [type "type/" Eq<Type>]
-             [".L" init]
              [".L" reference]
-             [".L" analysis #+ Analysis]
-             (analysis [".A" type]
-                       [".A" expression]
-                       ["/" function]))
+             (compiler [".L" init]
+                       [".L" analysis #+ Analysis]
+                       (analysis [".A" type]
+                                 [".A" expression]
+                                 ["/" function])))
        test)
   (// ["_." primitive]
       ["_." structure]))
diff --git a/stdlib/test/test/lux/lang/analysis/primitive.lux b/stdlib/test/test/lux/lang/compiler/analysis/primitive.lux
index 6e2a8aae9..18b8f6c46 100644
--- a/stdlib/test/test/lux/lang/analysis/primitive.lux
+++ b/stdlib/test/test/lux/lang/compiler/analysis/primitive.lux
@@ -11,10 +11,10 @@
        (macro [code])
        [lang]
        (lang [".L" type "type/" Eq<Type>]
-             [".L" init]
-             [analysis #+ Analysis]
-             (analysis [".A" type]
-                       [".A" expression]))
+             (compiler [".L" init]
+                       [analysis #+ Analysis]
+                       (analysis [".A" type]
+                                 [".A" expression])))
        test))
 
 (def: #export analyse (expressionA.analyser (:! lang.Eval [])))
diff --git a/stdlib/test/test/lux/lang/analysis/procedure/common.lux b/stdlib/test/test/lux/lang/compiler/analysis/procedure/common.lux
index 898376045..898376045 100644
--- a/stdlib/test/test/lux/lang/analysis/procedure/common.lux
+++ b/stdlib/test/test/lux/lang/compiler/analysis/procedure/common.lux
diff --git a/stdlib/test/test/lux/lang/analysis/procedure/host.jvm.lux b/stdlib/test/test/lux/lang/compiler/analysis/procedure/host.jvm.lux
index 0a60149d5..0a60149d5 100644
--- a/stdlib/test/test/lux/lang/analysis/procedure/host.jvm.lux
+++ b/stdlib/test/test/lux/lang/compiler/analysis/procedure/host.jvm.lux
diff --git a/stdlib/test/test/lux/lang/analysis/reference.lux b/stdlib/test/test/lux/lang/compiler/analysis/reference.lux
index 6551e3cba..ff7ce3412 100644
--- a/stdlib/test/test/lux/lang/analysis/reference.lux
+++ b/stdlib/test/test/lux/lang/compiler/analysis/reference.lux
@@ -12,11 +12,11 @@
        (lang [type "type/" Eq<Type>]
              [".L" scope]
              [".L" module]
-             [".L" init]
              [".L" reference]
-             [".L" analysis]
-             (analysis [".A" type]
-                       [".A" expression]))
+             (compiler [".L" init]
+                       [".L" analysis]
+                       (analysis [".A" type]
+                                 [".A" expression])))
        test)
   (// ["_." primitive]))
 
diff --git a/stdlib/test/test/lux/lang/analysis/structure.lux b/stdlib/test/test/lux/lang/compiler/analysis/structure.lux
index 20b911714..2f3e369d6 100644
--- a/stdlib/test/test/lux/lang/analysis/structure.lux
+++ b/stdlib/test/test/lux/lang/compiler/analysis/structure.lux
@@ -18,11 +18,11 @@
        (lang [type "type/" Eq<Type>]
              (type ["tc" check])
              [".L" module]
-             [".L" init]
-             [".L" analysis #+ Analysis Variant Tag]
-             (analysis [".A" type]
-                       ["/" structure]
-                       [".A" expression]))
+             (compiler [".L" init]
+                       [".L" analysis #+ Analysis Variant Tag]
+                       (analysis [".A" type]
+                                 ["/" structure]
+                                 [".A" expression])))
        test)
   (// ["_." primitive]))
 
diff --git a/stdlib/test/test/lux/lang/synthesis/case.lux b/stdlib/test/test/lux/lang/compiler/synthesis/case.lux
index 228ed2920..228ed2920 100644
--- a/stdlib/test/test/lux/lang/synthesis/case.lux
+++ b/stdlib/test/test/lux/lang/compiler/synthesis/case.lux
diff --git a/stdlib/test/test/lux/lang/synthesis/function.lux b/stdlib/test/test/lux/lang/compiler/synthesis/function.lux
index c7b16de27..c7b16de27 100644
--- a/stdlib/test/test/lux/lang/synthesis/function.lux
+++ b/stdlib/test/test/lux/lang/compiler/synthesis/function.lux
diff --git a/stdlib/test/test/lux/lang/synthesis/primitive.lux b/stdlib/test/test/lux/lang/compiler/synthesis/primitive.lux
index 1c8368204..1c8368204 100644
--- a/stdlib/test/test/lux/lang/synthesis/primitive.lux
+++ b/stdlib/test/test/lux/lang/compiler/synthesis/primitive.lux
diff --git a/stdlib/test/test/lux/lang/synthesis/structure.lux b/stdlib/test/test/lux/lang/compiler/synthesis/structure.lux
index e61386044..e61386044 100644
--- a/stdlib/test/test/lux/lang/synthesis/structure.lux
+++ b/stdlib/test/test/lux/lang/compiler/synthesis/structure.lux