- Removed the "M" suffix from monadic functions.

61 files changed, 76 insertions, 76 deletions

diff --git a/stdlib/test/test/lux.lux b/stdlib/test/test/lux.lux
index a43609668..dcf1997f0 100644
--- a/stdlib/test/test/lux.lux
+++ b/stdlib/test/test/lux.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   lux/test
-  (lux (control monad)
+  (lux (control ["M" monad #+ do Monad])
        [io]
        [math]
        ["R" math/random]
diff --git a/stdlib/test/test/lux/cli.lux b/stdlib/test/test/lux/cli.lux
index 8e1188a02..fb7301359 100644
--- a/stdlib/test/test/lux/cli.lux
+++ b/stdlib/test/test/lux/cli.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control ["M" monad #+ do Monad]
                 pipe
                 ["p" parser])
        (data text/format
diff --git a/stdlib/test/test/lux/concurrency/actor.lux b/stdlib/test/test/lux/concurrency/actor.lux
index a0e51cb09..41618cb64 100644
--- a/stdlib/test/test/lux/concurrency/actor.lux
+++ b/stdlib/test/test/lux/concurrency/actor.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io #- run]
-       (control monad
+       (control ["M" monad #+ do Monad]
                 ["ex" exception])
        (data [number]
              text/format
diff --git a/stdlib/test/test/lux/concurrency/atom.lux b/stdlib/test/test/lux/concurrency/atom.lux
index e3f30902b..d841a4e84 100644
--- a/stdlib/test/test/lux/concurrency/atom.lux
+++ b/stdlib/test/test/lux/concurrency/atom.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad)
+       (control ["M" monad #+ do Monad])
        (data [number]
              (coll [list "" Functor<List>])
              text/format)
diff --git a/stdlib/test/test/lux/concurrency/frp.lux b/stdlib/test/test/lux/concurrency/frp.lux
index 302a59d06..de462b2b6 100644
--- a/stdlib/test/test/lux/concurrency/frp.lux
+++ b/stdlib/test/test/lux/concurrency/frp.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io #- run]
-       (control monad)
+       (control ["M" monad #+ do Monad])
        (data [number]
              text/format)
        (concurrency ["P" promise #+ "P/" Monad<Promise>]
@@ -12,8 +12,8 @@
   (-> (List Int) (&;Channel Int))
   (let [_channel (&;channel Int)]
     (io;run (do Monad<IO>
-              [_ (mapM @ (function [value] (&;write value _channel))
-                       values)
+              [_ (M;map @ (function [value] (&;write value _channel))
+                        values)
                _ (&;close _channel)]
               (wrap _channel)))))
 
diff --git a/stdlib/test/test/lux/concurrency/promise.lux b/stdlib/test/test/lux/concurrency/promise.lux
index 305cfe0f9..21e2aa7db 100644
--- a/stdlib/test/test/lux/concurrency/promise.lux
+++ b/stdlib/test/test/lux/concurrency/promise.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io #- run]
-       (control monad
+       (control ["M" monad #+ do Monad]
                 pipe)
        (data [number]
              text/format)
diff --git a/stdlib/test/test/lux/concurrency/stm.lux b/stdlib/test/test/lux/concurrency/stm.lux
index 8471eb67a..b7403d8d5 100644
--- a/stdlib/test/test/lux/concurrency/stm.lux
+++ b/stdlib/test/test/lux/concurrency/stm.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad)
+       (control ["M" monad #+ do Monad])
        (data [number]
              (coll [list "" Functor<List> "List/" Fold<List>])
              text/format)
@@ -43,11 +43,11 @@
 
         (let [_concurrency-var (&;var 0)]
           (do promise;Monad<Promise>
-            [_ (seqM @
-                     (map (function [_]
-                            (mapM @ (function [_] (&;commit (&;update i.inc _concurrency-var)))
-                                  (list;i.range 1 iterations/processes)))
-                          (list;i.range 1 (nat-to-int promise;concurrency-level))))
+            [_ (M;seq @
+                      (map (function [_]
+                             (M;map @ (function [_] (&;commit (&;update i.inc _concurrency-var)))
+                                    (list;i.range 1 iterations/processes)))
+                           (list;i.range 1 (nat-to-int promise;concurrency-level))))
              last-val (&;commit (&;read _concurrency-var))]
             (test "Can modify STM vars concurrently from multiple threads."
                   (i.= (i.* iterations/processes (nat-to-int promise;concurrency-level))
diff --git a/stdlib/test/test/lux/control/cont.lux b/stdlib/test/test/lux/control/cont.lux
index b053e4d38..926525942 100644
--- a/stdlib/test/test/lux/control/cont.lux
+++ b/stdlib/test/test/lux/control/cont.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control ["M" monad #+ do Monad]
                 ["&" cont])
        (data [text "Text/" Monoid<Text>]
              text/format
diff --git a/stdlib/test/test/lux/control/exception.lux b/stdlib/test/test/lux/control/exception.lux
index d8c4ff9c2..5680b95f1 100644
--- a/stdlib/test/test/lux/control/exception.lux
+++ b/stdlib/test/test/lux/control/exception.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control ["M" monad #+ do Monad]
                 ["&" exception #+ exception:])
        (data ["E" result]
              [text]
diff --git a/stdlib/test/test/lux/control/interval.lux b/stdlib/test/test/lux/control/interval.lux
index 79ec0ed5e..8cf46012c 100644
--- a/stdlib/test/test/lux/control/interval.lux
+++ b/stdlib/test/test/lux/control/interval.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   lux/test
-  (lux (control monad
+  (lux (control ["M" monad #+ do Monad]
                 pipe
                 ["&" interval])
        [io]
diff --git a/stdlib/test/test/lux/control/parser.lux b/stdlib/test/test/lux/control/parser.lux
index ad5a57a1c..df3e9f364 100644
--- a/stdlib/test/test/lux/control/parser.lux
+++ b/stdlib/test/test/lux/control/parser.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control ["M" monad #+ do Monad]
                 [eq #+ Eq]
                 ["&" parser]
                 pipe)
diff --git a/stdlib/test/test/lux/control/pipe.lux b/stdlib/test/test/lux/control/pipe.lux
index ca80e8c1b..37f76e9af 100644
--- a/stdlib/test/test/lux/control/pipe.lux
+++ b/stdlib/test/test/lux/control/pipe.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control ["M" monad #+ do Monad]
                 pipe)
        (data text/format
              [number]
diff --git a/stdlib/test/test/lux/control/reader.lux b/stdlib/test/test/lux/control/reader.lux
index b3e89f353..6a6133aa1 100644
--- a/stdlib/test/test/lux/control/reader.lux
+++ b/stdlib/test/test/lux/control/reader.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control [monad #+ do Monad]
                 pipe
                 ["&" reader])
        (data [text "Text/" Monoid<Text>]
diff --git a/stdlib/test/test/lux/control/state.lux b/stdlib/test/test/lux/control/state.lux
index cc5db9ee1..87731de60 100644
--- a/stdlib/test/test/lux/control/state.lux
+++ b/stdlib/test/test/lux/control/state.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control ["M" monad #+ do Monad]
                 pipe
                 ["&" state])
        (data [text "Text/" Monoid<Text>]
diff --git a/stdlib/test/test/lux/control/thunk.lux b/stdlib/test/test/lux/control/thunk.lux
index 506c675a1..878cf4144 100644
--- a/stdlib/test/test/lux/control/thunk.lux
+++ b/stdlib/test/test/lux/control/thunk.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control ["M" monad #+ do Monad]
                 ["&" thunk])
        ["R" math/random])
   lux/test)
diff --git a/stdlib/test/test/lux/data/bit.lux b/stdlib/test/test/lux/data/bit.lux
index 789eaa88f..89fdb3bdd 100644
--- a/stdlib/test/test/lux/data/bit.lux
+++ b/stdlib/test/test/lux/data/bit.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control [monad])
+       (control ["M" monad #+ do Monad])
        (data ["&" bit]
              number)
        ["R" math/random])
diff --git a/stdlib/test/test/lux/data/bool.lux b/stdlib/test/test/lux/data/bool.lux
index 13203a5a3..f26c98a43 100644
--- a/stdlib/test/test/lux/data/bool.lux
+++ b/stdlib/test/test/lux/data/bool.lux
@@ -1,6 +1,6 @@
 (;module:
   lux
-  (lux (control [monad])
+  (lux (control ["M" monad #+ do Monad])
        [io]
        (data bool)
        ["R" math/random])
diff --git a/stdlib/test/test/lux/data/coll/array.lux b/stdlib/test/test/lux/data/coll/array.lux
index 97ecedadb..b98c20c66 100644
--- a/stdlib/test/test/lux/data/coll/array.lux
+++ b/stdlib/test/test/lux/data/coll/array.lux
@@ -1,6 +1,6 @@
 (;module:
   lux
-  (lux (control [monad]
+  (lux (control [monad #+ do Monad]
                 pipe)
        [io]
        (data (coll ["&" array]
diff --git a/stdlib/test/test/lux/data/coll/dict.lux b/stdlib/test/test/lux/data/coll/dict.lux
index a6934a78b..b317cdfa8 100644
--- a/stdlib/test/test/lux/data/coll/dict.lux
+++ b/stdlib/test/test/lux/data/coll/dict.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control [monad #+ do Monad]
                 [eq])
        (data [text]
              text/format
diff --git a/stdlib/test/test/lux/data/coll/list.lux b/stdlib/test/test/lux/data/coll/list.lux
index 7315c3013..08bd547f4 100644
--- a/stdlib/test/test/lux/data/coll/list.lux
+++ b/stdlib/test/test/lux/data/coll/list.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control [monad #+ do Monad]
                 pipe)
        (data (coll ["&" list])
              [text "Text/" Monoid<Text>]
diff --git a/stdlib/test/test/lux/data/coll/ordered/dict.lux b/stdlib/test/test/lux/data/coll/ordered/dict.lux
index 76e9083eb..e2c0d3b7d 100644
--- a/stdlib/test/test/lux/data/coll/ordered/dict.lux
+++ b/stdlib/test/test/lux/data/coll/ordered/dict.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control [monad #+ do Monad]
                 [eq #+ Eq])
        (data [product]
              [number]
diff --git a/stdlib/test/test/lux/data/coll/ordered/set.lux b/stdlib/test/test/lux/data/coll/ordered/set.lux
index 40b448f1e..937d54aa7 100644
--- a/stdlib/test/test/lux/data/coll/ordered/set.lux
+++ b/stdlib/test/test/lux/data/coll/ordered/set.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad)
+       (control [monad #+ do Monad])
        (data (coll (ordered ["&" set])
                    ["s" set]
                    [list "" Fold<List>])
diff --git a/stdlib/test/test/lux/data/coll/priority-queue.lux b/stdlib/test/test/lux/data/coll/priority-queue.lux
index fede1766a..d2fdb9969 100644
--- a/stdlib/test/test/lux/data/coll/priority-queue.lux
+++ b/stdlib/test/test/lux/data/coll/priority-queue.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad)
+       (control [monad #+ do Monad])
        (data (coll ["&" priority-queue])
              [number])
        ["R" math/random])
@@ -11,12 +11,12 @@
   (-> Nat (R;Random (&;Queue Nat)))
   (do R;Monad<Random>
     [inputs (R;list size R;nat)]
-    (foldM @ (function [head tail]
-               (do @
-                 [priority R;nat]
-                 (wrap (&;push priority head tail))))
-           &;empty
-           inputs)))
+    (monad;fold @ (function [head tail]
+                    (do @
+                      [priority R;nat]
+                      (wrap (&;push priority head tail))))
+                &;empty
+                inputs)))
 
 (context: "Queues"
   [size (|> R;nat (:: @ map (n.% +100)))
diff --git a/stdlib/test/test/lux/data/coll/queue.lux b/stdlib/test/test/lux/data/coll/queue.lux
index 1fdcbd25a..08c905e95 100644
--- a/stdlib/test/test/lux/data/coll/queue.lux
+++ b/stdlib/test/test/lux/data/coll/queue.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad)
+       (control [monad #+ do Monad])
        (data (coll ["&" queue])
              [number])
        ["R" math/random])
diff --git a/stdlib/test/test/lux/data/coll/seq.lux b/stdlib/test/test/lux/data/coll/seq.lux
index f6d221180..15d6241de 100644
--- a/stdlib/test/test/lux/data/coll/seq.lux
+++ b/stdlib/test/test/lux/data/coll/seq.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control [monad #+ do Monad]
                 pipe)
        (data (coll ["&" seq]
                    ["F" tree/finger]
diff --git a/stdlib/test/test/lux/data/coll/set.lux b/stdlib/test/test/lux/data/coll/set.lux
index 23f23121a..0aafdd580 100644
--- a/stdlib/test/test/lux/data/coll/set.lux
+++ b/stdlib/test/test/lux/data/coll/set.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad)
+       (control [monad #+ do Monad])
        (data (coll ["&" set]
                    [list "" Fold<List>])
              [number])
diff --git a/stdlib/test/test/lux/data/coll/stack.lux b/stdlib/test/test/lux/data/coll/stack.lux
index 78921b83a..60fb1a4bd 100644
--- a/stdlib/test/test/lux/data/coll/stack.lux
+++ b/stdlib/test/test/lux/data/coll/stack.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad)
+       (control [monad #+ do Monad])
        (data (coll ["&" stack]
                    [list "" Fold<List>])
              [number])
diff --git a/stdlib/test/test/lux/data/coll/stream.lux b/stdlib/test/test/lux/data/coll/stream.lux
index e12293fa7..0dfc03ed2 100644
--- a/stdlib/test/test/lux/data/coll/stream.lux
+++ b/stdlib/test/test/lux/data/coll/stream.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control [monad #+ do Monad]
                 comonad
                 [cont])
        (data [text "Text/" Monoid<Text>]
diff --git a/stdlib/test/test/lux/data/coll/tree/rose.lux b/stdlib/test/test/lux/data/coll/tree/rose.lux
index fe8ffa71b..ca95fd185 100644
--- a/stdlib/test/test/lux/data/coll/tree/rose.lux
+++ b/stdlib/test/test/lux/data/coll/tree/rose.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad)
+       (control [monad #+ do Monad])
        (data [product]
              [number]
              [text "T/" Eq<Text>]
diff --git a/stdlib/test/test/lux/data/coll/tree/zipper.lux b/stdlib/test/test/lux/data/coll/tree/zipper.lux
index 38dd55b99..b7936b140 100644
--- a/stdlib/test/test/lux/data/coll/tree/zipper.lux
+++ b/stdlib/test/test/lux/data/coll/tree/zipper.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control [monad #+ do Monad]
                 pipe)
        (data (coll [list "List/" Fold<List> Functor<List>]
                    (tree ["&" zipper]
diff --git a/stdlib/test/test/lux/data/coll/vector.lux b/stdlib/test/test/lux/data/coll/vector.lux
index 2816c904e..f197b8f10 100644
--- a/stdlib/test/test/lux/data/coll/vector.lux
+++ b/stdlib/test/test/lux/data/coll/vector.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad)
+       (control [monad #+ do Monad])
        (data (coll ["&" vector]
                    [list "List/" Fold<List> Functor<List>])
              [text "Text/" Monoid<Text>]
diff --git a/stdlib/test/test/lux/data/format/json.lux b/stdlib/test/test/lux/data/format/json.lux
index eba3b4cf9..6372b26f1 100644
--- a/stdlib/test/test/lux/data/format/json.lux
+++ b/stdlib/test/test/lux/data/format/json.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control [monad #+ do Monad]
                 codec
                 [eq #+ Eq]
                 pipe)
diff --git a/stdlib/test/test/lux/data/format/xml.lux b/stdlib/test/test/lux/data/format/xml.lux
index 25002112a..1910caf3e 100644
--- a/stdlib/test/test/lux/data/format/xml.lux
+++ b/stdlib/test/test/lux/data/format/xml.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control [monad #+ do Monad]
                 pipe)
        (data [text "Text/" Monoid<Text>]
              text/format
diff --git a/stdlib/test/test/lux/data/ident.lux b/stdlib/test/test/lux/data/ident.lux
index 060007607..6ca00d09f 100644
--- a/stdlib/test/test/lux/data/ident.lux
+++ b/stdlib/test/test/lux/data/ident.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control ["M" monad #+ do Monad]
                 pipe)
        (data ["&" ident]
              [text "Text/" Eq<Text>]
diff --git a/stdlib/test/test/lux/data/identity.lux b/stdlib/test/test/lux/data/identity.lux
index 5995f1ae2..e0e32ca04 100644
--- a/stdlib/test/test/lux/data/identity.lux
+++ b/stdlib/test/test/lux/data/identity.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control ["M" monad #+ do Monad]
                 comonad)
        (data ["&" identity]
              [text "Text/" Monoid<Text> Eq<Text>]))
diff --git a/stdlib/test/test/lux/data/log.lux b/stdlib/test/test/lux/data/log.lux
index 6286b19fb..bcd3a1a56 100644
--- a/stdlib/test/test/lux/data/log.lux
+++ b/stdlib/test/test/lux/data/log.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control ["M" monad #+ do Monad]
                 pipe)
        (data ["&" log]
              [text "Text/" Monoid<Text> Eq<Text>]
diff --git a/stdlib/test/test/lux/data/maybe.lux b/stdlib/test/test/lux/data/maybe.lux
index 2f426d65f..35beef257 100644
--- a/stdlib/test/test/lux/data/maybe.lux
+++ b/stdlib/test/test/lux/data/maybe.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control ["M" monad #+ do Monad]
                 pipe)
        (data ["&" maybe]
              [text "Text/" Monoid<Text>]
diff --git a/stdlib/test/test/lux/data/number.lux b/stdlib/test/test/lux/data/number.lux
index 5e8f9a384..dc6a1ad29 100644
--- a/stdlib/test/test/lux/data/number.lux
+++ b/stdlib/test/test/lux/data/number.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control ["M" monad #+ do Monad]
                 pipe)
        (data number
              [text "Text/" Monoid<Text> Eq<Text>]
diff --git a/stdlib/test/test/lux/data/number/complex.lux b/stdlib/test/test/lux/data/number/complex.lux
index ad5401270..52ad12afb 100644
--- a/stdlib/test/test/lux/data/number/complex.lux
+++ b/stdlib/test/test/lux/data/number/complex.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control [monad #+ do Monad]
                 pipe)
        (data [text "Text/" Monoid<Text>]
              text/format
diff --git a/stdlib/test/test/lux/data/number/ratio.lux b/stdlib/test/test/lux/data/number/ratio.lux
index 31a3407bf..968f38b96 100644
--- a/stdlib/test/test/lux/data/number/ratio.lux
+++ b/stdlib/test/test/lux/data/number/ratio.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control [monad #+ do Monad]
                 pipe)
        (data [text "Text/" Monoid<Text>]
              text/format
diff --git a/stdlib/test/test/lux/data/product.lux b/stdlib/test/test/lux/data/product.lux
index 53340c072..de424fe9a 100644
--- a/stdlib/test/test/lux/data/product.lux
+++ b/stdlib/test/test/lux/data/product.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad)
+       (control ["M" monad #+ do Monad])
        (data product
              [text "Text/" Monoid<Text>]
              [number]))
diff --git a/stdlib/test/test/lux/data/result.lux b/stdlib/test/test/lux/data/result.lux
index 498d55439..efd1009c8 100644
--- a/stdlib/test/test/lux/data/result.lux
+++ b/stdlib/test/test/lux/data/result.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control ["M" monad #+ do Monad]
                 pipe)
        (data text/format
              ["&" result]))
diff --git a/stdlib/test/test/lux/data/sum.lux b/stdlib/test/test/lux/data/sum.lux
index 26f30f4e4..90c679ad1 100644
--- a/stdlib/test/test/lux/data/sum.lux
+++ b/stdlib/test/test/lux/data/sum.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control ["M" monad #+ do Monad]
                 pipe)
        (data sum
              [text "Text/" Monoid<Text>]
diff --git a/stdlib/test/test/lux/data/text.lux b/stdlib/test/test/lux/data/text.lux
index 7005fdaf4..9d0731b22 100644
--- a/stdlib/test/test/lux/data/text.lux
+++ b/stdlib/test/test/lux/data/text.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control ["M" monad #+ do Monad]
                 pipe)
        (data ["&" text]
              text/format
diff --git a/stdlib/test/test/lux/data/text/format.lux b/stdlib/test/test/lux/data/text/format.lux
index b852c6e56..9ffa120bb 100644
--- a/stdlib/test/test/lux/data/text/format.lux
+++ b/stdlib/test/test/lux/data/text/format.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad)
+       (control [monad #+ do Monad])
        (data text/format
              [text]
              [number]))
diff --git a/stdlib/test/test/lux/data/text/lexer.lux b/stdlib/test/test/lux/data/text/lexer.lux
index 3f9621d9c..37f915e6c 100644
--- a/stdlib/test/test/lux/data/text/lexer.lux
+++ b/stdlib/test/test/lux/data/text/lexer.lux
@@ -1,6 +1,6 @@
 (;module:
   lux
-  (lux (control monad
+  (lux (control [monad #+ do Monad]
                 pipe
                 ["p" parser])
        [io]
diff --git a/stdlib/test/test/lux/data/text/regex.lux b/stdlib/test/test/lux/data/text/regex.lux
index b819b99bb..fff3ead39 100644
--- a/stdlib/test/test/lux/data/text/regex.lux
+++ b/stdlib/test/test/lux/data/text/regex.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control [monad #+ do Monad]
                 pipe
                 ["p" parser])
        (data [product]
diff --git a/stdlib/test/test/lux/host.js.lux b/stdlib/test/test/lux/host.js.lux
index f533a8fe6..92ac8ddb4 100644
--- a/stdlib/test/test/lux/host.js.lux
+++ b/stdlib/test/test/lux/host.js.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad)
+       (control ["M" monad #+ do Monad])
        (data text/format)
        ["&" host]
        ["R" math/random])
diff --git a/stdlib/test/test/lux/host.jvm.lux b/stdlib/test/test/lux/host.jvm.lux
index 191d0f463..5cbe2dffc 100644
--- a/stdlib/test/test/lux/host.jvm.lux
+++ b/stdlib/test/test/lux/host.jvm.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control ["M" monad #+ do Monad]
                 pipe)
        (data text/format
              [number]
diff --git a/stdlib/test/test/lux/io.lux b/stdlib/test/test/lux/io.lux
index 0347d75ec..7a76a2ac9 100644
--- a/stdlib/test/test/lux/io.lux
+++ b/stdlib/test/test/lux/io.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux ["&" io]
-       (control monad)
+       (control ["M" monad #+ do Monad])
        (data [text "Text/" Monoid<Text> Eq<Text>]
              text/format
              [number]))
diff --git a/stdlib/test/test/lux/macro/code.lux b/stdlib/test/test/lux/macro/code.lux
index 5e5d71d44..c01a370a2 100644
--- a/stdlib/test/test/lux/macro/code.lux
+++ b/stdlib/test/test/lux/macro/code.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad)
+       (control [monad #+ do Monad])
        (data [text "T/" Eq<Text>]
              text/format
              [number])
diff --git a/stdlib/test/test/lux/macro/poly/eq.lux b/stdlib/test/test/lux/macro/poly/eq.lux
index 8bd102823..44ecbff1e 100644
--- a/stdlib/test/test/lux/macro/poly/eq.lux
+++ b/stdlib/test/test/lux/macro/poly/eq.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control [monad #+ do Monad]
                 [eq #+ Eq])
        (data text/format
              [bool]
diff --git a/stdlib/test/test/lux/macro/poly/functor.lux b/stdlib/test/test/lux/macro/poly/functor.lux
index e97093d81..11cdcf824 100644
--- a/stdlib/test/test/lux/macro/poly/functor.lux
+++ b/stdlib/test/test/lux/macro/poly/functor.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control [monad #+ do Monad]
                 [functor]
                 [eq #+ Eq])
        (data text/format
diff --git a/stdlib/test/test/lux/macro/poly/text-encoder.lux b/stdlib/test/test/lux/macro/poly/text-encoder.lux
index 1b38aa9b9..d5a871e5c 100644
--- a/stdlib/test/test/lux/macro/poly/text-encoder.lux
+++ b/stdlib/test/test/lux/macro/poly/text-encoder.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control [monad #+ do Monad]
                 [eq #+ Eq])
        (data text/format
              [bool]
diff --git a/stdlib/test/test/lux/macro/syntax.lux b/stdlib/test/test/lux/macro/syntax.lux
index f99385521..2d4f771d2 100644
--- a/stdlib/test/test/lux/macro/syntax.lux
+++ b/stdlib/test/test/lux/macro/syntax.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control [monad #+ do Monad]
                 [eq #+ Eq]
                 ["p" parser])
        (data [text "Text/" Monoid<Text>]
diff --git a/stdlib/test/test/lux/math.lux b/stdlib/test/test/lux/math.lux
index a3000e7dd..f3cdb0666 100644
--- a/stdlib/test/test/lux/math.lux
+++ b/stdlib/test/test/lux/math.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad)
+       (control ["M" monad #+ do Monad])
        (data [text "Text/" Monoid<Text>]
              text/format
              [bool "b/" Eq<Bool>]
diff --git a/stdlib/test/test/lux/math/logic/continuous.lux b/stdlib/test/test/lux/math/logic/continuous.lux
index c57060400..4b2af88f3 100644
--- a/stdlib/test/test/lux/math/logic/continuous.lux
+++ b/stdlib/test/test/lux/math/logic/continuous.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad)
+       (control [monad #+ do Monad])
        ["R" math/random]
        ["&" math/logic/continuous])
   lux/test)
diff --git a/stdlib/test/test/lux/math/logic/fuzzy.lux b/stdlib/test/test/lux/math/logic/fuzzy.lux
index bdc283551..bb27a435d 100644
--- a/stdlib/test/test/lux/math/logic/fuzzy.lux
+++ b/stdlib/test/test/lux/math/logic/fuzzy.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad)
+       (control [monad #+ do Monad])
        (data (coll [list]
                    [set])
              [bool "B/" Eq<Bool>]
diff --git a/stdlib/test/test/lux/type.lux b/stdlib/test/test/lux/type.lux
index 3896d6fcc..3e50f2035 100644
--- a/stdlib/test/test/lux/type.lux
+++ b/stdlib/test/test/lux/type.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control ["M" monad #+ do Monad]
                 pipe)
        (data [text "Text/" Monoid<Text>]
              text/format
@@ -89,7 +89,7 @@
                              _
                              true)))
                (list;repeat size)
-               (seqM @))
+               (M;seq @))
    #let [(^open "&/") &;Eq<Type>
          (^open "L/") (list;Eq<List> &;Eq<Type>)]]
   (with-expansions
@@ -109,7 +109,7 @@
 
 (context: "Type construction [parameterized]"
   [size (|> R;nat (:: @ map (n.% +3)))
-   members (seqM @ (list;repeat size gen-type))
+   members (M;seq @ (list;repeat size gen-type))
    extra (|> gen-type
              (R;filter (function [type]
                          (case type
diff --git a/stdlib/test/test/lux/type/auto.lux b/stdlib/test/test/lux/type/auto.lux
index 95185671c..f12d97c75 100644
--- a/stdlib/test/test/lux/type/auto.lux
+++ b/stdlib/test/test/lux/type/auto.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad
+       (control [monad #+ do Monad]
                 functor
                 [eq])
        (data [text "Text/" Monoid<Text>]
diff --git a/stdlib/test/test/lux/type/check.lux b/stdlib/test/test/lux/type/check.lux
index 703d89d11..83d7cc5a3 100644
--- a/stdlib/test/test/lux/type/check.lux
+++ b/stdlib/test/test/lux/type/check.lux
@@ -1,7 +1,7 @@
 (;module:
   lux
   (lux [io]
-       (control monad)
+       (control [monad #+ do Monad])
        (data [text "Text/" Monoid<Text> Eq<Text>]
              text/format
              [number]