3 files changed, 24 insertions, 23 deletions
diff --git a/new-luxc/test/test/luxc/lang/analysis/host.jvm.lux b/new-luxc/test/test/luxc/lang/analysis/host.jvm.lux
index fcdcfbe6a..dabef0e08 100644
--- a/new-luxc/test/test/luxc/lang/analysis/host.jvm.lux
+++ b/new-luxc/test/test/luxc/lang/analysis/host.jvm.lux
@@ -1,34 +1,34 @@
 (.module:
   [lux #*
-   [io]
    [control
     [monad (#+ do)]
     pipe]
    [concurrency
-    [atom]]
+    ["." atom]]
    [data
     ["e" error]
-    [product]
-    [maybe]
+    ["." product]
+    ["." maybe]
     [text ("text/" Equivalence<Text>)
      format]
     [collection
-     [array]
+     ["." array]
      [list ("list/" Fold<List>)]
      ["dict" dictionary]]]
    [math
     ["r" random "r/" Monad<Random>]]
+   ["." type]
    [macro (#+ Monad<Meta>)
-    [code]]
-   ["." language
-    [type]
-    [compiler
+    ["." code]]
+   [compiler
+    ["." default
      [".L" init]
-     [analysis
-      [".A" type]]
-     [extension
+     [phase
       [analysis
-       [".AE" host]]]]]
+       [".A" type]]
+      [extension
+       [analysis
+        [".AE" host]]]]]]
    test]
   [///
    ["_." primitive]])
@@ -39,10 +39,10 @@
      (|> (do Monad<Meta>
            [## runtime-bytecode @runtime.translate
             ]
-           (language.with-scope
+           (default.with-scope
              (typeA.with-type output-type
                (_primitive.analyse (` ((~ (code.text procedure)) (~+ params)))))))
-         (language.with-current-module "")
+         (analysis.with-current-module "")
          (macro.run (initL.compiler []))
          (case> (#e.Success _)
                 <success>
@@ -60,10 +60,10 @@
      (|> (do Monad<Meta>
            [## runtime-bytecode @runtime.translate
             ]
-           (language.with-scope
+           (default.with-scope
              (typeA.with-type output-type
                (_primitive.analyse syntax))))
-         (language.with-current-module "")
+         (analysis.with-current-module "")
          (macro.run (initL.compiler []))
          (case> (#e.Success _)
                 <success>
diff --git a/new-luxc/test/test/luxc/lang/translation/primitive.lux b/new-luxc/test/test/luxc/lang/translation/primitive.lux
index 1c4236913..f4ff98287 100644
--- a/new-luxc/test/test/luxc/lang/translation/primitive.lux
+++ b/new-luxc/test/test/luxc/lang/translation/primitive.lux
@@ -4,15 +4,16 @@
     [monad (#+ do)]
     pipe]
    [data
-    [error]
+    ["." error]
     [bit ("bit/" Equivalence<Bit>)]
     [text ("text/" Equivalence<Text>)
      format]]
    [math
     ["r" random]]
-   [language
-    [compiler
-     [synthesis]]]
+   [compiler
+    [default
+     [phase
+      ["." synthesis]]]]
    test]
   [test
    [luxc
diff --git a/new-luxc/test/test/luxc/lang/translation/reference.lux b/new-luxc/test/test/luxc/lang/translation/reference.lux
index 66dd8de9f..4aaed8124 100644
--- a/new-luxc/test/test/luxc/lang/translation/reference.lux
+++ b/new-luxc/test/test/luxc/lang/translation/reference.lux
@@ -19,7 +19,7 @@
                            )))
   (test/luxc common))
 
-(def: ident-part
+(def: name-part
   (r.Random Text)
   (|> (r.ascii +5)
       (r.filter (function (_ sample)
@@ -30,7 +30,7 @@
 (def: (definitions-spec define)
   (-> Definer Test)
   (do r.Monad<Random>
-    [def-name (r.seq ident-part ident-part)
+    [def-name (r.seq name-part name-part)
      def-value r.int]
     (test "Can refer to definitions."
           (|> (define def-name (//synthesis.i64 def-value))