6 files changed, 12 insertions, 10 deletions
diff --git a/stdlib/source/test/lux/macro.lux b/stdlib/source/test/lux/macro.lux
index d7389dd20..acd4bcdac 100644
--- a/stdlib/source/test/lux/macro.lux
+++ b/stdlib/source/test/lux/macro.lux
@@ -1,7 +1,7 @@
 (.module:
   [lux #*
    data/text/format
-   [control/monad (#+ do)]
+   [abstract/monad (#+ do)]
    ["r" math/random (#+ Random)]
    ["_" test (#+ Test)]]
   {1
diff --git a/stdlib/source/test/lux/macro/code.lux b/stdlib/source/test/lux/macro/code.lux
index c400bf206..c8d0b8077 100644
--- a/stdlib/source/test/lux/macro/code.lux
+++ b/stdlib/source/test/lux/macro/code.lux
@@ -1,7 +1,7 @@
 (.module:
   [lux #*
    data/text/format
-   [control/monad (#+ do)]
+   [abstract/monad (#+ do)]
    ["r" math/random (#+ Random)]
    ["_" test (#+ Test)]
    [data
diff --git a/stdlib/source/test/lux/macro/poly/equivalence.lux b/stdlib/source/test/lux/macro/poly/equivalence.lux
index 41ae1ecd0..4024d0a89 100644
--- a/stdlib/source/test/lux/macro/poly/equivalence.lux
+++ b/stdlib/source/test/lux/macro/poly/equivalence.lux
@@ -3,8 +3,8 @@
    data/text/format
    ["r" math/random (#+ Random)]
    ["_" test (#+ Test)]
-   [control ["." monad (#+ do)]]
-   [control
+   [abstract/monad (#+ do)]
+   [abstract
     [equivalence (#+ Equivalence)]]
    [data
     ["." bit]
diff --git a/stdlib/source/test/lux/macro/poly/functor.lux b/stdlib/source/test/lux/macro/poly/functor.lux
index 5b477682d..7f47148ab 100644
--- a/stdlib/source/test/lux/macro/poly/functor.lux
+++ b/stdlib/source/test/lux/macro/poly/functor.lux
@@ -1,7 +1,7 @@
 (.module:
   [lux #*
    data/text/format
-   [control/monad (#+ do)]
+   [abstract/monad (#+ do)]
    ["r" math/random (#+ Random)]
    ["_" test (#+ Test)]
    [control
diff --git a/stdlib/source/test/lux/macro/poly/json.lux b/stdlib/source/test/lux/macro/poly/json.lux
index 2669b9801..1209aa90a 100644
--- a/stdlib/source/test/lux/macro/poly/json.lux
+++ b/stdlib/source/test/lux/macro/poly/json.lux
@@ -2,16 +2,17 @@
   [lux #*
    data/text/format
    ["_" test (#+ Test)]
-   [control
-    pipe
+   [abstract
     codec
     [monad (#+ do Monad)]
     [equivalence (#+ Equivalence)]
-    ["p" parser]
     {[0 #test]
      [/
       ["$." equivalence]
       ["$." codec]]}]
+   [control
+    pipe
+    ["p" parser]]
    [data
     ["." error]
     ["." bit]
diff --git a/stdlib/source/test/lux/macro/syntax.lux b/stdlib/source/test/lux/macro/syntax.lux
index 60dd38b6e..92ba86d4d 100644
--- a/stdlib/source/test/lux/macro/syntax.lux
+++ b/stdlib/source/test/lux/macro/syntax.lux
@@ -1,11 +1,12 @@
 (.module:
   [lux #*
    data/text/format
-   [control/monad (#+ do)]
+   [abstract/monad (#+ do)]
    ["r" math/random (#+ Random)]
    ["_" test (#+ Test)]
+   [abstract
+    [equivalence (#+ Equivalence)]]
    [control
-    [equivalence (#+ Equivalence)]
     ["p" parser]]
    [data
     ["." bit]