Added the special # syntax for referring to the module's alias when opening structures.

46 files changed, 104 insertions, 99 deletions

diff --git a/stdlib/source/test/licentia.lux b/stdlib/source/test/licentia.lux
index 7b723ad0e..0dd3183ca 100644
--- a/stdlib/source/test/licentia.lux
+++ b/stdlib/source/test/licentia.lux
@@ -6,13 +6,13 @@
    [control
     [monad (#+ do)]]
    [data
-    [bit ("bit/." equivalence)]
-    ["." maybe ("maybe/." functor)]
+    ["." bit ("#/." equivalence)]
+    ["." maybe ("#/." functor)]
     [number
-     [nat ("nat/." interval)]]
+     ["." nat ("#/." interval)]]
     ["." text]
     [collection
-     ["." list ("list/." functor)]]]
+     ["." list ("#/." functor)]]]
    [math
     ["r" random (#+ Random)]]]
   {#program
diff --git a/stdlib/source/test/lux.lux b/stdlib/source/test/lux.lux
index adc14e47a..e498c1445 100644
--- a/stdlib/source/test/lux.lux
+++ b/stdlib/source/test/lux.lux
@@ -10,7 +10,7 @@
      ["." i64]]]
    ["." function]
    ["." math
-    ["r" random (#+ Random) ("r/." functor)]]
+    ["r" random (#+ Random) ("#/." functor)]]
    ["_" test (#+ Test)]
    ## These modules do not need to be tested.
    [type
diff --git a/stdlib/source/test/lux/cli.lux b/stdlib/source/test/lux/cli.lux
index e202b3aa7..8c04a119d 100644
--- a/stdlib/source/test/lux/cli.lux
+++ b/stdlib/source/test/lux/cli.lux
@@ -7,8 +7,8 @@
    [data
     ["." error]
     [number
-     ["." nat ("nat/." decimal)]]
-    [text ("text/." equivalence)
+     ["." nat ("#/." decimal)]]
+    ["." text ("#/." equivalence)
      format]
     [collection
      ["." list]]]
diff --git a/stdlib/source/test/lux/compiler/default/phase/analysis/case.lux b/stdlib/source/test/lux/compiler/default/phase/analysis/case.lux
index 2bf02bb0e..a05eda326 100644
--- a/stdlib/source/test/lux/compiler/default/phase/analysis/case.lux
+++ b/stdlib/source/test/lux/compiler/default/phase/analysis/case.lux
@@ -6,12 +6,12 @@
    [data
     ["." product]
     ["." maybe]
-    ["." text ("text/." equivalence)]
+    ["." text ("#/." equivalence)]
     [collection
-     ["." list ("list/." monad)]
+     ["." list ("#/." monad)]
      ["." set]]]
    [math
-    ["r" random ("random/." monad)]]
+    ["r" random ("#/." monad)]]
    ["." type
     ["." check]]
    [macro
@@ -47,7 +47,7 @@
   (-> Bit (List [Code Code]) Code (r.Random (List Code)))
   (case inputC
     [_ (#.Bit _)]
-    (random/wrap (list (' #1) (' #0)))
+    (r/wrap (list (' #1) (' #0)))
 
     (^template [<tag> <gen> <wrapper>]
       [_ (<tag> _)]
@@ -62,7 +62,7 @@
 
             #.None
             (wrap (list (' _)))))
-        (random/wrap (list (' _)))))
+        (r/wrap (list (' _)))))
     ([#.Nat  r.nat          code.nat]
      [#.Int  r.int          code.int]
      [#.Rev  r.rev          code.rev]
@@ -70,10 +70,10 @@
      [#.Text (r.unicode 5) code.text])
     
     (^ [_ (#.Tuple (list))])
-    (random/wrap (list (' [])))
+    (r/wrap (list (' [])))
 
     (^ [_ (#.Record (list))])
-    (random/wrap (list (' {})))
+    (r/wrap (list (' {})))
 
     [_ (#.Tuple members)]
     (do r.monad
@@ -103,7 +103,7 @@
       (wrap (list/join bundles)))
 
     _
-    (random/wrap (list))
+    (r/wrap (list))
     ))
 
 (def: #export (input variant-tags record-tags primitivesC)
@@ -111,7 +111,7 @@
   (r.rec
    (function (_ input)
      ($_ r.either
-         (random/map product.right _primitive.primitive)
+         (r/map product.right _primitive.primitive)
          (do r.monad
            [choice (|> r.nat (:: @ map (n/% (list.size variant-tags))))
             #let [choiceT (maybe.assume (list.nth choice variant-tags))
@@ -121,7 +121,7 @@
            [size (|> r.nat (:: @ map (n/% 3)))
             elems (r.list size input)]
            (wrap (code.tuple elems)))
-         (random/wrap (code.record (list.zip2 record-tags primitivesC)))
+         (r/wrap (code.record (list.zip2 record-tags primitivesC)))
          ))))
 
 (def: (branch body pattern)
diff --git a/stdlib/source/test/lux/compiler/default/phase/analysis/function.lux b/stdlib/source/test/lux/compiler/default/phase/analysis/function.lux
index 0ec5d4766..829f83713 100644
--- a/stdlib/source/test/lux/compiler/default/phase/analysis/function.lux
+++ b/stdlib/source/test/lux/compiler/default/phase/analysis/function.lux
@@ -7,10 +7,10 @@
     ["." error]
     ["." maybe]
     ["." product]
-    [text ("text/." equivalence)
+    ["." text ("#/." equivalence)
      format]
     [collection
-     ["." list ("list/." functor)]]]
+     ["." list ("#/." functor)]]]
    [math
     ["r" random]]
    ["." type]
diff --git a/stdlib/source/test/lux/compiler/default/phase/analysis/primitive.lux b/stdlib/source/test/lux/compiler/default/phase/analysis/primitive.lux
index de079094b..b73e4f81c 100644
--- a/stdlib/source/test/lux/compiler/default/phase/analysis/primitive.lux
+++ b/stdlib/source/test/lux/compiler/default/phase/analysis/primitive.lux
@@ -9,8 +9,8 @@
     [text
      format]]
    [math
-    ["r" random ("random/." monad)]]
-   [".L" type ("type/." equivalence)]
+    ["r" random ("#/." monad)]]
+   ["." type ("#/." equivalence)]
    [macro
     ["." code]]
    [compiler
@@ -35,13 +35,13 @@
 
 (def: unit
   (r.Random Code)
-  (random/wrap (' [])))
+  (r/wrap (' [])))
 
 (def: #export primitive
   (r.Random [Type Code])
   (`` ($_ r.either
           (~~ (do-template [<type> <code-wrapper> <value-gen>]
-                [(r.and (random/wrap <type>) (random/map <code-wrapper> <value-gen>))]
+                [(r.and (r/wrap <type>) (r/map <code-wrapper> <value-gen>))]
 
                 [Any  code.tuple (r.list 0 ..unit)]
                 [Bit  code.bit   r.bit]
diff --git a/stdlib/source/test/lux/compiler/default/phase/analysis/procedure/common.lux b/stdlib/source/test/lux/compiler/default/phase/analysis/procedure/common.lux
index 6576ae90d..5464981a1 100644
--- a/stdlib/source/test/lux/compiler/default/phase/analysis/procedure/common.lux
+++ b/stdlib/source/test/lux/compiler/default/phase/analysis/procedure/common.lux
@@ -13,7 +13,7 @@
      format]]
    [math
     ["r" random]]
-   [type ("type/." equivalence)]
+   ["." type ("#/." equivalence)]
    [macro
     ["." code]]
    [compiler
diff --git a/stdlib/source/test/lux/compiler/default/phase/analysis/reference.lux b/stdlib/source/test/lux/compiler/default/phase/analysis/reference.lux
index 18ab58fa9..b2f64ac19 100644
--- a/stdlib/source/test/lux/compiler/default/phase/analysis/reference.lux
+++ b/stdlib/source/test/lux/compiler/default/phase/analysis/reference.lux
@@ -5,11 +5,11 @@
     pipe]
    [data
     ["." error (#+ Error)]
-    [name ("name/." equivalence)]
-    [text ("text/." equivalence)]]
+    ["." name ("#/." equivalence)]
+    ["." text ("#/." equivalence)]]
    [math
     ["r" random]]
-   [type ("type/." equivalence)]
+   ["." type ("#/." equivalence)]
    [macro
     ["." code]]
    [compiler
diff --git a/stdlib/source/test/lux/compiler/default/phase/analysis/structure.lux b/stdlib/source/test/lux/compiler/default/phase/analysis/structure.lux
index 63c6da493..34a43c042 100644
--- a/stdlib/source/test/lux/compiler/default/phase/analysis/structure.lux
+++ b/stdlib/source/test/lux/compiler/default/phase/analysis/structure.lux
@@ -4,17 +4,17 @@
     [monad (#+ do)]
     pipe]
    [data
-    [bit ("bit/." equivalence)]
+    ["." bit ("#/." equivalence)]
     ["e" error]
     ["." product]
     ["." maybe]
     ["." text]
     [collection
-     ["." list ("list/." functor)]
+     ["." list ("#/." functor)]
      ["." set]]]
    [math
     ["r" random]]
-   ["." type ("type/." equivalence)
+   ["." type ("#/." equivalence)
     ["." check]]
    [macro
     ["." code]]
diff --git a/stdlib/source/test/lux/compiler/default/phase/synthesis/case.lux b/stdlib/source/test/lux/compiler/default/phase/synthesis/case.lux
index 319d4ab57..7a67e4bfa 100644
--- a/stdlib/source/test/lux/compiler/default/phase/synthesis/case.lux
+++ b/stdlib/source/test/lux/compiler/default/phase/synthesis/case.lux
@@ -4,7 +4,7 @@
     [monad (#+ do)]
     pipe]
    [data
-    ["." error ("error/." functor)]]
+    ["." error ("#/." functor)]]
    [compiler
     [default
      ["." reference]
diff --git a/stdlib/source/test/lux/compiler/default/phase/synthesis/function.lux b/stdlib/source/test/lux/compiler/default/phase/synthesis/function.lux
index f2565dfa0..4866086aa 100644
--- a/stdlib/source/test/lux/compiler/default/phase/synthesis/function.lux
+++ b/stdlib/source/test/lux/compiler/default/phase/synthesis/function.lux
@@ -11,7 +11,7 @@
     [text
      format]
     [collection
-     ["." list ("list/." functor fold)]
+     ["." list ("#/." functor fold)]
      ["dict" dictionary (#+ Dictionary)]
      ["." set]]]
    [compiler
diff --git a/stdlib/source/test/lux/compiler/default/phase/synthesis/structure.lux b/stdlib/source/test/lux/compiler/default/phase/synthesis/structure.lux
index 7f9eae209..97d4c037d 100644
--- a/stdlib/source/test/lux/compiler/default/phase/synthesis/structure.lux
+++ b/stdlib/source/test/lux/compiler/default/phase/synthesis/structure.lux
@@ -4,7 +4,7 @@
     [monad (#+ do)]
     pipe]
    [data
-    [bit ("bit/." equivalence)]
+    ["." bit ("#/." equivalence)]
     ["." product]
     ["." error]
     [collection
diff --git a/stdlib/source/test/lux/compiler/default/syntax.lux b/stdlib/source/test/lux/compiler/default/syntax.lux
index fb83bda4c..6f1d2152d 100644
--- a/stdlib/source/test/lux/compiler/default/syntax.lux
+++ b/stdlib/source/test/lux/compiler/default/syntax.lux
@@ -11,7 +11,7 @@
      ["." list]
      ["." dictionary (#+ Dictionary)]]]
    [math
-    ["r" random ("r/." monad)]]
+    ["r" random ("#/." monad)]]
    [macro
     ["." code]]
    [compiler
diff --git a/stdlib/source/test/lux/control/concurrency/actor.lux b/stdlib/source/test/lux/control/concurrency/actor.lux
index c035cabe2..791fefec8 100644
--- a/stdlib/source/test/lux/control/concurrency/actor.lux
+++ b/stdlib/source/test/lux/control/concurrency/actor.lux
@@ -5,7 +5,7 @@
     ["M" monad (#+ do Monad)]
     ["ex" exception]
     [concurrency
-     ["P" promise ("promise/." monad)]
+     ["." promise ("#/." monad)]
      ["T" task]
      ["&" actor (#+ actor: message:)]]]
    [data
diff --git a/stdlib/source/test/lux/control/concurrency/frp.lux b/stdlib/source/test/lux/control/concurrency/frp.lux
index cfe70ff0e..7c1552f41 100644
--- a/stdlib/source/test/lux/control/concurrency/frp.lux
+++ b/stdlib/source/test/lux/control/concurrency/frp.lux
@@ -4,7 +4,7 @@
    [control
     ["." monad (#+ do Monad)]
     [concurrency
-     ["." promise ("promise/." monad)]
+     ["." promise ("#/." monad)]
      ["." frp (#+ Channel)]
      ["." atom (#+ Atom atom)]]]
    [data
diff --git a/stdlib/source/test/lux/control/concurrency/semaphore.lux b/stdlib/source/test/lux/control/concurrency/semaphore.lux
index 0c4167ee7..3ceac16b7 100644
--- a/stdlib/source/test/lux/control/concurrency/semaphore.lux
+++ b/stdlib/source/test/lux/control/concurrency/semaphore.lux
@@ -8,10 +8,10 @@
      ["." atom (#+ Atom)]]]
    [data
     ["." maybe]
-    ["." text ("text/." equivalence monoid)
+    ["." text ("#/." equivalence monoid)
      format]
     [collection
-     ["." list ("list/." functor)]]]
+     ["." list ("#/." functor)]]]
    ["." io]
    [math
     ["r" random]]]
diff --git a/stdlib/source/test/lux/control/concurrency/stm.lux b/stdlib/source/test/lux/control/concurrency/stm.lux
index 966ab6007..869a995b0 100644
--- a/stdlib/source/test/lux/control/concurrency/stm.lux
+++ b/stdlib/source/test/lux/control/concurrency/stm.lux
@@ -12,7 +12,7 @@
    [data
     ["." number]
     [collection
-     ["." list ("list/." functor)]]]
+     ["." list ("#/." functor)]]]
    [math
     ["r" random]]]
   lux/test)
diff --git a/stdlib/source/test/lux/control/pipe.lux b/stdlib/source/test/lux/control/pipe.lux
index 21d7b8b90..371021ddd 100644
--- a/stdlib/source/test/lux/control/pipe.lux
+++ b/stdlib/source/test/lux/control/pipe.lux
@@ -5,7 +5,7 @@
     [monad (#+ do)]]
    [data
     ["." identity]
-    [text ("text/." equivalence)
+    ["." text ("#/." equivalence)
      format]]
    [math
     ["r" random]]]
diff --git a/stdlib/source/test/lux/control/security/integrity.lux b/stdlib/source/test/lux/control/security/integrity.lux
index f306cf7e5..dfd7bf5ea 100644
--- a/stdlib/source/test/lux/control/security/integrity.lux
+++ b/stdlib/source/test/lux/control/security/integrity.lux
@@ -7,7 +7,7 @@
      ["@" integrity]]]
    [data
     ["." error]
-    ["." text ("text/." equivalence)
+    ["." text ("#/." equivalence)
      format]]
    [math
     ["r" random]]]
diff --git a/stdlib/source/test/lux/control/security/privacy.lux b/stdlib/source/test/lux/control/security/privacy.lux
index 72c23e4c1..5505433ed 100644
--- a/stdlib/source/test/lux/control/security/privacy.lux
+++ b/stdlib/source/test/lux/control/security/privacy.lux
@@ -6,7 +6,7 @@
     [security
      ["@" privacy (#+ Context Privilege Private with-privacy)]]]
    [data
-    ["." text ("text/." equivalence)
+    ["." text ("#/." equivalence)
      format]]
    [math
     ["r" random]]]
diff --git a/stdlib/source/test/lux/control/writer.lux b/stdlib/source/test/lux/control/writer.lux
index 5c2c47a3e..12670c58e 100644
--- a/stdlib/source/test/lux/control/writer.lux
+++ b/stdlib/source/test/lux/control/writer.lux
@@ -13,7 +13,7 @@
       [".T" monad]]}]
    [data
     ["." product]
-    ["." text ("text/." equivalence)
+    ["." text ("#/." equivalence)
      format]]
    [math
     ["r" random]]]
diff --git a/stdlib/source/test/lux/data/collection/dictionary.lux b/stdlib/source/test/lux/data/collection/dictionary.lux
index 3ad45704e..b3a275238 100644
--- a/stdlib/source/test/lux/data/collection/dictionary.lux
+++ b/stdlib/source/test/lux/data/collection/dictionary.lux
@@ -8,7 +8,7 @@
     ["." maybe]
     [collection
      ["&" dictionary]
-     ["." list ("list/." fold functor)]]]
+     ["." list ("#/." fold functor)]]]
    [math
     ["r" random]]]
   lux/test)
diff --git a/stdlib/source/test/lux/data/collection/dictionary/ordered.lux b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux
index 6b1f131cb..233afe569 100644
--- a/stdlib/source/test/lux/data/collection/dictionary/ordered.lux
+++ b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux
@@ -1,7 +1,7 @@
 (.module:
   [lux #*
    [control
-    [monad (#+ do Monad)]
+    [monad (#+ Monad do)]
     [equivalence (#+ Equivalence)]]
    [data
     ["." product]
@@ -10,7 +10,7 @@
      ["s" set]
      ["dict" dictionary
       ["&" ordered]]
-     ["." list ("list/." functor)]]]
+     ["." list ("#/." functor)]]]
    [math
     ["r" random]]]
   lux/test)
diff --git a/stdlib/source/test/lux/data/collection/row.lux b/stdlib/source/test/lux/data/collection/row.lux
index 2eb342e6e..dd70b7272 100644
--- a/stdlib/source/test/lux/data/collection/row.lux
+++ b/stdlib/source/test/lux/data/collection/row.lux
@@ -7,7 +7,7 @@
     ["." maybe]
     [collection
      ["&" row]
-     [list ("list/." fold)]]]
+     ["." list ("#/." fold)]]]
    [math
     ["r" random]]]
   lux/test)
diff --git a/stdlib/source/test/lux/data/collection/sequence.lux b/stdlib/source/test/lux/data/collection/sequence.lux
index de398e6f6..6e806e629 100644
--- a/stdlib/source/test/lux/data/collection/sequence.lux
+++ b/stdlib/source/test/lux/data/collection/sequence.lux
@@ -5,8 +5,9 @@
     comonad]
    [data
     ["." maybe]
-    ["." number ("nat/." codec)]
-    ["." text ("text/." monoid)]
+    [number
+     ["." nat ("#/." codec)]]
+    ["." text ("#/." monoid)]
     [collection
      ["." list]
      ["&" sequence]]]
diff --git a/stdlib/source/test/lux/data/collection/tree/rose.lux b/stdlib/source/test/lux/data/collection/tree/rose.lux
index 47dbf94cf..388065ef0 100644
--- a/stdlib/source/test/lux/data/collection/tree/rose.lux
+++ b/stdlib/source/test/lux/data/collection/tree/rose.lux
@@ -5,10 +5,10 @@
    [data
     ["." product]
     ["." number]
-    [text ("text/." equivalence)
+    ["." text ("#/." equivalence)
      format]
     [collection
-     ["." list ("list/." functor fold)]
+     ["." list ("#/." functor fold)]
      [tree
       ["&" rose]]]]
    [math
diff --git a/stdlib/source/test/lux/data/color.lux b/stdlib/source/test/lux/data/color.lux
index 503421db2..24ed8f615 100644
--- a/stdlib/source/test/lux/data/color.lux
+++ b/stdlib/source/test/lux/data/color.lux
@@ -4,7 +4,8 @@
     [monad (#+ do)]]
    [data
     ["@" color]
-    [number ("frac/." number)]]
+    [number
+     ["." frac ("#/." number)]]]
    ["." math
     ["r" random]]]
   lux/test)
diff --git a/stdlib/source/test/lux/data/format/xml.lux b/stdlib/source/test/lux/data/format/xml.lux
index 0f86eb63d..05784915f 100644
--- a/stdlib/source/test/lux/data/format/xml.lux
+++ b/stdlib/source/test/lux/data/format/xml.lux
@@ -8,15 +8,15 @@
     ["." name]
     ["E" error]
     ["." maybe]
-    ["." text ("text/." equivalence)
+    ["." text ("#/." equivalence)
      format]
     [format
      ["&" xml]]
     [collection
      ["dict" dictionary]
-     ["." list ("list/." functor)]]]
+     ["." list ("#/." functor)]]]
    [math
-    ["r" random ("r/." monad)]]]
+    ["r" random ("#/." monad)]]]
   lux/test)
 
 (def: char-range
diff --git a/stdlib/source/test/lux/data/identity.lux b/stdlib/source/test/lux/data/identity.lux
index 31bf105cd..22511e7b3 100644
--- a/stdlib/source/test/lux/data/identity.lux
+++ b/stdlib/source/test/lux/data/identity.lux
@@ -5,7 +5,7 @@
     comonad]
    [data
     ["&" identity]
-    [text ("text/." monoid equivalence)]]]
+    ["." text ("#/." monoid equivalence)]]]
   lux/test)
 
 (context: "Identity"
diff --git a/stdlib/source/test/lux/data/maybe.lux b/stdlib/source/test/lux/data/maybe.lux
index eb09491a1..a6ec17131 100644
--- a/stdlib/source/test/lux/data/maybe.lux
+++ b/stdlib/source/test/lux/data/maybe.lux
@@ -4,9 +4,9 @@
     ["M" monad (#+ Monad do)]
     pipe]
    [data
-    ["&" maybe ("&/." monoid)]
-    ["." text ("text/." monoid)]]
-   ["." io ("io/." monad)]]
+    ["&" maybe ("#/." monoid)]
+    ["." text ("#/." monoid)]]
+   ["." io ("#/." monad)]]
   lux/test)
 
 (context: "Maybe"
diff --git a/stdlib/source/test/lux/data/name.lux b/stdlib/source/test/lux/data/name.lux
index 3855fe221..57d4d9a1e 100644
--- a/stdlib/source/test/lux/data/name.lux
+++ b/stdlib/source/test/lux/data/name.lux
@@ -5,7 +5,7 @@
     pipe]
    [data
     ["&" name]
-    ["." text ("text/." equivalence)
+    ["." text ("#/." equivalence)
      format]]
    [math
     ["r" random]]]
diff --git a/stdlib/source/test/lux/data/number.lux b/stdlib/source/test/lux/data/number.lux
index 9d870ab08..9460b149b 100644
--- a/stdlib/source/test/lux/data/number.lux
+++ b/stdlib/source/test/lux/data/number.lux
@@ -5,7 +5,7 @@
     pipe]
    [data
     number
-    [text ("text/." equivalence)
+    ["." text ("#/." equivalence)
      format]]
    [math
     ["r" random]]]
diff --git a/stdlib/source/test/lux/data/number/complex.lux b/stdlib/source/test/lux/data/number/complex.lux
index 850845296..a622ef6b3 100644
--- a/stdlib/source/test/lux/data/number/complex.lux
+++ b/stdlib/source/test/lux/data/number/complex.lux
@@ -4,10 +4,11 @@
     [monad (#+ do Monad)]
     pipe]
    [data
-    ["." number ("frac/." number)
+    ["." number
+     ["." frac ("#/." number)]
      ["&" complex]]
     [collection
-     ["." list ("list/." functor)]]]
+     ["." list ("#/." functor)]]]
    ["." math
     ["r" random]]]
   lux/test)
diff --git a/stdlib/source/test/lux/data/text/lexer.lux b/stdlib/source/test/lux/data/text/lexer.lux
index a1e52b64c..dc8cf75c9 100644
--- a/stdlib/source/test/lux/data/text/lexer.lux
+++ b/stdlib/source/test/lux/data/text/lexer.lux
@@ -6,7 +6,7 @@
     ["p" parser]]
    [data
     ["." error (#+ Error)]
-    ["." text ("text/." equivalence)
+    ["." text ("#/." equivalence)
      format
      ["&" lexer]]
     [collection
diff --git a/stdlib/source/test/lux/data/text/regex.lux b/stdlib/source/test/lux/data/text/regex.lux
index f6bc7d098..cbb44f332 100644
--- a/stdlib/source/test/lux/data/text/regex.lux
+++ b/stdlib/source/test/lux/data/text/regex.lux
@@ -6,7 +6,7 @@
     ["p" parser]]
    [data
     [number (#+ hex)]
-    ["." text ("text/." equivalence)
+    ["." text ("#/." equivalence)
      format
      ["." lexer (#+ Lexer)]
      ["&" regex]]]
diff --git a/stdlib/source/test/lux/host.jvm.lux b/stdlib/source/test/lux/host.jvm.lux
index 3de5e28d7..318a66cec 100644
--- a/stdlib/source/test/lux/host.jvm.lux
+++ b/stdlib/source/test/lux/host.jvm.lux
@@ -4,7 +4,7 @@
     [monad (#+ Monad do)]
     pipe]
    [data
-    [text ("text/." equivalence)]]
+    ["." text ("#/." equivalence)]]
    [math
     ["r" random]]
    ["_" test (#+ Test)]]
diff --git a/stdlib/source/test/lux/macro/code.lux b/stdlib/source/test/lux/macro/code.lux
index 02baf04a5..cc5997606 100644
--- a/stdlib/source/test/lux/macro/code.lux
+++ b/stdlib/source/test/lux/macro/code.lux
@@ -5,7 +5,7 @@
     [monad (#+ do Monad)]]
    [data
     [number]
-    ["." text ("text/." equivalence)
+    ["." text ("#/." equivalence)
      format]]
    [math
     ["r" random]]
diff --git a/stdlib/source/test/lux/macro/poly/equivalence.lux b/stdlib/source/test/lux/macro/poly/equivalence.lux
index 3d943f6e6..3c6bfd234 100644
--- a/stdlib/source/test/lux/macro/poly/equivalence.lux
+++ b/stdlib/source/test/lux/macro/poly/equivalence.lux
@@ -6,7 +6,8 @@
    [data
     ["." bit]
     ["." maybe]
-    [number ("int/." int-number)]
+    [number
+     ["." int ("#/." number)]]
     ["." text
      format]
     [collection
diff --git a/stdlib/source/test/lux/math.lux b/stdlib/source/test/lux/math.lux
index 002cdaa41..0ed9cab76 100644
--- a/stdlib/source/test/lux/math.lux
+++ b/stdlib/source/test/lux/math.lux
@@ -3,8 +3,9 @@
    [control
     [monad (#+ Monad do)]]
    [data
-    [bit ("bit/." equivalence)]
-    [number ("frac/." number)]]
+    ["." bit ("#/." equivalence)]
+    [number
+     ["." frac ("#/." number)]]]
    ["&" math
     infix
     ["r" random]]]
diff --git a/stdlib/source/test/lux/math/logic/fuzzy.lux b/stdlib/source/test/lux/math/logic/fuzzy.lux
index 60223e8a3..b64b3cb8c 100644
--- a/stdlib/source/test/lux/math/logic/fuzzy.lux
+++ b/stdlib/source/test/lux/math/logic/fuzzy.lux
@@ -3,7 +3,7 @@
    [control
     [monad (#+ do Monad)]]
    [data
-    [bit ("bit/." equivalence)]
+    ["." bit ("#/." equivalence)]
     ["." number]
     [text
      format]
diff --git a/stdlib/source/test/lux/math/modular.lux b/stdlib/source/test/lux/math/modular.lux
index b5ff0e40b..462fad44a 100644
--- a/stdlib/source/test/lux/math/modular.lux
+++ b/stdlib/source/test/lux/math/modular.lux
@@ -4,14 +4,14 @@
     [monad (#+ do)]]
    [data
     ["." product]
-    [bit ("bit/." equivalence)]
+    ["." bit ("#/." equivalence)]
     ["." error]
     [text
      format]]
    [math
     ["r" random]
     ["/" modular]]
-   [type ("type/." equivalence)]]
+   ["." type ("#/." equivalence)]]
   lux/test)
 
 (def: %3 (/.modulus +3))
diff --git a/stdlib/source/test/lux/time/date.lux b/stdlib/source/test/lux/time/date.lux
index d89ccccc8..2aee2dcb0 100644
--- a/stdlib/source/test/lux/time/date.lux
+++ b/stdlib/source/test/lux/time/date.lux
@@ -6,7 +6,7 @@
    [data
     ["." error]]
    [math
-    ["r" random ("random/." monad)]]
+    ["r" random ("#/." monad)]]
    [time
     ["@." instant]
     ["@" date]]]
@@ -16,18 +16,18 @@
 
 (def: month
   (r.Random @.Month)
-  (r.either (r.either (r.either (random/wrap #@.January)
-                                (r.either (random/wrap #@.February)
-                                          (random/wrap #@.March)))
-                      (r.either (random/wrap #@.April)
-                                (r.either (random/wrap #@.May)
-                                          (random/wrap #@.June))))
-            (r.either (r.either (random/wrap #@.July)
-                                (r.either (random/wrap #@.August)
-                                          (random/wrap #@.September)))
-                      (r.either (random/wrap #@.October)
-                                (r.either (random/wrap #@.November)
-                                          (random/wrap #@.December))))))
+  (r.either (r.either (r.either (r/wrap #@.January)
+                                (r.either (r/wrap #@.February)
+                                          (r/wrap #@.March)))
+                      (r.either (r/wrap #@.April)
+                                (r.either (r/wrap #@.May)
+                                          (r/wrap #@.June))))
+            (r.either (r.either (r/wrap #@.July)
+                                (r.either (r/wrap #@.August)
+                                          (r/wrap #@.September)))
+                      (r.either (r/wrap #@.October)
+                                (r.either (r/wrap #@.November)
+                                          (r/wrap #@.December))))))
 
 (context: "(Month) Equivalence."
   (<| (times 100)
@@ -64,13 +64,13 @@
 
 (def: day
   (r.Random @.Day)
-  (r.either (r.either (r.either (random/wrap #@.Sunday)
-                                (random/wrap #@.Monday))
-                      (r.either (random/wrap #@.Tuesday)
-                                (random/wrap #@.Wednesday)))
-            (r.either (r.either (random/wrap #@.Thursday)
-                                (random/wrap #@.Friday))
-                      (random/wrap #@.Saturday))))
+  (r.either (r.either (r.either (r/wrap #@.Sunday)
+                                (r/wrap #@.Monday))
+                      (r.either (r/wrap #@.Tuesday)
+                                (r/wrap #@.Wednesday)))
+            (r.either (r.either (r/wrap #@.Thursday)
+                                (r/wrap #@.Friday))
+                      (r/wrap #@.Saturday))))
 
 (context: "(Day) Equivalence."
   (<| (times 100)
diff --git a/stdlib/source/test/lux/type/check.lux b/stdlib/source/test/lux/type/check.lux
index 426127fb6..bd0b14167 100644
--- a/stdlib/source/test/lux/type/check.lux
+++ b/stdlib/source/test/lux/type/check.lux
@@ -7,13 +7,13 @@
     ["." product]
     ["." maybe]
     ["." number]
-    [text ("text/." equivalence)]
+    ["." text ("#/." equivalence)]
     [collection
-     ["." list ("list/." functor)]
+     ["." list ("#/." functor)]
      ["." set]]]
    [math
     ["r" random]]
-   ["." type ("type/." equivalence)
+   ["." type ("#/." equivalence)
     ["@" check]]]
   lux/test
   ["." //])
diff --git a/stdlib/source/test/lux/type/implicit.lux b/stdlib/source/test/lux/type/implicit.lux
index 98b647bf1..49c52aa48 100644
--- a/stdlib/source/test/lux/type/implicit.lux
+++ b/stdlib/source/test/lux/type/implicit.lux
@@ -6,7 +6,7 @@
     [functor]
     [monad (#+ Monad do)]]
    [data
-    [bit ("bit/." equivalence)]
+    ["." bit ("#/." equivalence)]
     [number]
     [collection [list]]]
    [math
diff --git a/stdlib/source/test/lux/world/file.lux b/stdlib/source/test/lux/world/file.lux
index 4beb4fd69..361cf99ba 100644
--- a/stdlib/source/test/lux/world/file.lux
+++ b/stdlib/source/test/lux/world/file.lux
@@ -19,7 +19,7 @@
     ["@" file (#+ Path File)]
     ["." binary (#+ Binary)]]
    [math
-    ["r" random ("r/." monad)]]]
+    ["r" random ("#/." monad)]]]
   lux/test
   [//
    ["_." binary]])
diff --git a/stdlib/source/test/lux/world/net/tcp.lux b/stdlib/source/test/lux/world/net/tcp.lux
index fae5ac05d..78be41610 100644
--- a/stdlib/source/test/lux/world/net/tcp.lux
+++ b/stdlib/source/test/lux/world/net/tcp.lux
@@ -8,7 +8,7 @@
      ["." taint]]]
    [concurrency
     ["." promise (#+ Promise promise)]
-    [frp ("frp/." functor)]]
+    ["." frp ("#/." functor)]]
    [data
     ["." error]
     ["." text