14 files changed, 25 insertions, 22 deletions
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]]]