- Re-named ".../eq" modules to ".../equality".

- Other minor improvements.

51 files changed, 57 insertions, 57 deletions

diff --git a/lux-mode/lux-mode.el b/lux-mode/lux-mode.el
index a254c1ad2..663f421cb 100644
--- a/lux-mode/lux-mode.el
+++ b/lux-mode/lux-mode.el
@@ -387,14 +387,10 @@ This function also returns nil meaning don't specify the indentation."
   (All 'defun)
   (Ex 'defun)
   (Rec 'defun)
-  (_lux_def 'defun)
-  (_lux_case 'defun)
-  (_lux_function 'defun)
   (synchronized 'defun)
   (object 'defun)
   (do-to 'defun)
   (import 'defun)
-  (testing 'defun)
   (comment 'defun)
   (^template 'defun)
   )
diff --git a/stdlib/source/lux/control/eq.lux b/stdlib/source/lux/control/equality.lux
index f75a78fdd..3750312e0 100644
--- a/stdlib/source/lux/control/eq.lux
+++ b/stdlib/source/lux/control/equality.lux
@@ -1,10 +1,12 @@
 (.module: lux)
 
-(sig: #export (Eq a)
+(sig: #export (Equality a)
   {#.doc "Equality for a type's instances."}
   (: (-> a a Bool)
      =))
 
+(alias: Eq Equality)
+
 (def: #export (product left right)
   (All [l r] (-> (Eq l) (Eq r) (Eq [l r])))
   (struct (def: (= [a b] [x y])
diff --git a/stdlib/source/lux/control/hash.lux b/stdlib/source/lux/control/hash.lux
index 722b0fdca..6399307bf 100644
--- a/stdlib/source/lux/control/hash.lux
+++ b/stdlib/source/lux/control/hash.lux
@@ -1,6 +1,6 @@
 (.module:
   lux
-  (// [eq #+ Eq]))
+  (// [equality #+ Eq]))
 
 ## [Signatures]
 (sig: #export (Hash a)
diff --git a/stdlib/source/lux/control/interval.lux b/stdlib/source/lux/control/interval.lux
index 90addfe19..70540622f 100644
--- a/stdlib/source/lux/control/interval.lux
+++ b/stdlib/source/lux/control/interval.lux
@@ -1,6 +1,6 @@
 (.module:
   lux
-  (lux (control [eq #+ Eq]
+  (lux (control [equality #+ Eq]
                 [order]
                 [enum #+ Enum])))
 
diff --git a/stdlib/source/lux/control/order.lux b/stdlib/source/lux/control/order.lux
index 0e67a9b56..fd595b1f3 100644
--- a/stdlib/source/lux/control/order.lux
+++ b/stdlib/source/lux/control/order.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux function)
-  (// [eq #+ Eq]))
+  (// [equality #+ Eq]))
 
 ## [Signatures]
 (sig: #export (Order a)
diff --git a/stdlib/source/lux/control/predicate.lux b/stdlib/source/lux/control/predicate.lux
index de9d0dab0..a113339b8 100644
--- a/stdlib/source/lux/control/predicate.lux
+++ b/stdlib/source/lux/control/predicate.lux
@@ -2,9 +2,11 @@
   lux
   (lux (data (coll (set ["set" unordered #+ Set])))))
 
-(type: #export (Pred a)
+(type: #export (Predicate a)
   (-> a Bool))
 
+(alias: Pred Predicate)
+
 (do-template [<name> <combo>]
   [(def: #export (<name> left right)
      (All [a] (-> (Pred a) (Pred a) (Pred a)))
diff --git a/stdlib/source/lux/data/bool.lux b/stdlib/source/lux/data/bool.lux
index 9ccbc87ab..21ae0526f 100644
--- a/stdlib/source/lux/data/bool.lux
+++ b/stdlib/source/lux/data/bool.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux (control [monoid #+ Monoid]
-                [eq #+ Eq]
+                [equality #+ Eq]
                 hash
                 [codec #+ Codec])
        function))
diff --git a/stdlib/source/lux/data/coll/array.lux b/stdlib/source/lux/data/coll/array.lux
index dd3a94553..3e649fc7d 100644
--- a/stdlib/source/lux/data/coll/array.lux
+++ b/stdlib/source/lux/data/coll/array.lux
@@ -2,7 +2,7 @@
   lux
   (lux (control [monoid #+ Monoid]
                 [functor #+ Functor]
-                [eq #+ Eq]
+                [equality #+ Eq]
                 fold)
        (data (coll [list "list/" Fold<List>])
              [product])
diff --git a/stdlib/source/lux/data/coll/bits.lux b/stdlib/source/lux/data/coll/bits.lux
index 304076048..84e536676 100644
--- a/stdlib/source/lux/data/coll/bits.lux
+++ b/stdlib/source/lux/data/coll/bits.lux
@@ -1,6 +1,6 @@
 (.module:
   [lux #- not and or]
-  (lux (control [eq #+ Eq]
+  (lux (control [equality #+ Eq]
                 pipe)
        (data [maybe]
              [bit]
diff --git a/stdlib/source/lux/data/coll/dictionary/ordered.lux b/stdlib/source/lux/data/coll/dictionary/ordered.lux
index 2feb18e0f..16412e648 100644
--- a/stdlib/source/lux/data/coll/dictionary/ordered.lux
+++ b/stdlib/source/lux/data/coll/dictionary/ordered.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux (control [monad #+ do Monad]
-                eq
+                equality
                 [order #+ Order])
        (data (coll [list "L/" Monad<List> Monoid<List> Fold<List>])
              ["p" product]
diff --git a/stdlib/source/lux/data/coll/dictionary/unordered.lux b/stdlib/source/lux/data/coll/dictionary/unordered.lux
index aad28249f..053d53d48 100644
--- a/stdlib/source/lux/data/coll/dictionary/unordered.lux
+++ b/stdlib/source/lux/data/coll/dictionary/unordered.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux (control hash
-                [eq #+ Eq])
+                [equality #+ Eq])
        (data [maybe]
              (coll [list "list/" Fold<List> Functor<List> Monoid<List>]
                    [array "array/" Functor<Array> Fold<Array>])
diff --git a/stdlib/source/lux/data/coll/list.lux b/stdlib/source/lux/data/coll/list.lux
index f970ccf9f..063e9648c 100644
--- a/stdlib/source/lux/data/coll/list.lux
+++ b/stdlib/source/lux/data/coll/list.lux
@@ -4,7 +4,7 @@
                 [functor #+ Functor]
                 [apply #+ Apply]
                 [monad #+ do Monad]
-                [eq #+ Eq]
+                [equality #+ Eq]
                 [fold])
        (data [number "nat/" Codec<Text,Nat>]
              bool
diff --git a/stdlib/source/lux/data/coll/queue.lux b/stdlib/source/lux/data/coll/queue.lux
index 2f48d3035..3a39a3e41 100644
--- a/stdlib/source/lux/data/coll/queue.lux
+++ b/stdlib/source/lux/data/coll/queue.lux
@@ -1,6 +1,6 @@
 (.module:
   lux
-  (lux (control [eq #+ Eq]
+  (lux (control [equality #+ Eq]
                 ["F" functor])
        (data (coll [list "L/" Monoid<List> Functor<List>]))))
 
diff --git a/stdlib/source/lux/data/coll/queue/priority.lux b/stdlib/source/lux/data/coll/queue/priority.lux
index 970cb9cc9..1c9c51075 100644
--- a/stdlib/source/lux/data/coll/queue/priority.lux
+++ b/stdlib/source/lux/data/coll/queue/priority.lux
@@ -1,6 +1,6 @@
 (.module:
   lux
-  (lux (control [eq #+ Eq]
+  (lux (control [equality #+ Eq]
                 [monad #+ do Monad])
        (data (coll (tree ["F" finger]))
              [number "nat/" Interval<Nat>]
diff --git a/stdlib/source/lux/data/coll/sequence.lux b/stdlib/source/lux/data/coll/sequence.lux
index 5fe3befae..f5ade6bed 100644
--- a/stdlib/source/lux/data/coll/sequence.lux
+++ b/stdlib/source/lux/data/coll/sequence.lux
@@ -3,7 +3,7 @@
   (lux (control [functor #+ Functor]
                 [apply #+ Apply]
                 [monad #+ do Monad]
-                [eq #+ Eq]
+                [equality #+ Eq]
                 monoid
                 fold
                 ["p" parser])
diff --git a/stdlib/source/lux/data/coll/set/ordered.lux b/stdlib/source/lux/data/coll/set/ordered.lux
index 2e2ca56fc..5b7524a8a 100644
--- a/stdlib/source/lux/data/coll/set/ordered.lux
+++ b/stdlib/source/lux/data/coll/set/ordered.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux (control [monad #+ do Monad]
-                eq
+                equality
                 [order #+ Order])
        (data (coll [list "L/" Monad<List> Monoid<List> Fold<List>]
                    (dictionary ["d" ordered]))
diff --git a/stdlib/source/lux/data/coll/set/unordered.lux b/stdlib/source/lux/data/coll/set/unordered.lux
index 199a076c8..e977f35e5 100644
--- a/stdlib/source/lux/data/coll/set/unordered.lux
+++ b/stdlib/source/lux/data/coll/set/unordered.lux
@@ -1,6 +1,6 @@
 (.module:
   lux
-  (lux (control [eq #+ Eq]
+  (lux (control [equality #+ Eq]
                 [hash #*])
        (data (coll (dictionary ["dict" unordered #+ Dict])
                    [list "list/" Fold<List> Functor<List>]))))
diff --git a/stdlib/source/lux/data/coll/tree/rose.lux b/stdlib/source/lux/data/coll/tree/rose.lux
index 6c137878f..28ca96d41 100644
--- a/stdlib/source/lux/data/coll/tree/rose.lux
+++ b/stdlib/source/lux/data/coll/tree/rose.lux
@@ -2,7 +2,7 @@
   lux
   (lux (control functor
                 [monad #+ do Monad]
-                eq
+                equality
                 ["p" parser]
                 fold)
        (data (coll [list "L/" Monad<List> Fold<List>]))
diff --git a/stdlib/source/lux/data/color.lux b/stdlib/source/lux/data/color.lux
index 8e6254c6b..56e324cac 100644
--- a/stdlib/source/lux/data/color.lux
+++ b/stdlib/source/lux/data/color.lux
@@ -1,6 +1,6 @@
 (.module:
   lux
-  (lux (control [eq])
+  (lux (control ["eq" equality])
        (data (coll [list "L/" Functor<List>]))
        [math]
        (type abstract)))
diff --git a/stdlib/source/lux/data/format/json.lux b/stdlib/source/lux/data/format/json.lux
index d960830db..03d4de615 100644
--- a/stdlib/source/lux/data/format/json.lux
+++ b/stdlib/source/lux/data/format/json.lux
@@ -3,7 +3,7 @@
                   For more information, please see: http://www.json.org/"}
   [lux #- Array]
   (lux (control [monad #+ do Monad]
-                [eq #+ Eq]
+                [equality #+ Eq]
                 codec
                 ["p" parser "parser/" Monad<Parser>])
        (data [bool]
diff --git a/stdlib/source/lux/data/format/xml.lux b/stdlib/source/lux/data/format/xml.lux
index ceeb59b1e..d1a84d675 100644
--- a/stdlib/source/lux/data/format/xml.lux
+++ b/stdlib/source/lux/data/format/xml.lux
@@ -1,7 +1,7 @@
 (.module: {#.doc "Functionality for reading, generating and processing values in the XML format."}
   lux
   (lux (control monad
-                [eq #+ Eq]
+                [equality #+ Eq]
                 codec
                 ["p" parser "p/" Monad<Parser>]
                 ["ex" exception #+ exception:])
diff --git a/stdlib/source/lux/data/ident.lux b/stdlib/source/lux/data/ident.lux
index feb456d94..867f96d8b 100644
--- a/stdlib/source/lux/data/ident.lux
+++ b/stdlib/source/lux/data/ident.lux
@@ -1,6 +1,6 @@
 (.module:
   lux
-  (lux (control [eq #+ Eq]
+  (lux (control [equality #+ Eq]
                 [codec #+ Codec]
                 hash)
        (data [text "text/" Monoid<Text> Eq<Text>])))
diff --git a/stdlib/source/lux/data/maybe.lux b/stdlib/source/lux/data/maybe.lux
index 89be2362c..6c5a7d02e 100644
--- a/stdlib/source/lux/data/maybe.lux
+++ b/stdlib/source/lux/data/maybe.lux
@@ -4,7 +4,7 @@
                 ["F" functor]
                 ["A" apply]
                 [monad #+ do Monad]
-                [eq #+ Eq])))
+                [equality #+ Eq])))
 
 ## [Types]
 ## (type: (Maybe a)
diff --git a/stdlib/source/lux/data/number.lux b/stdlib/source/lux/data/number.lux
index bb5cb8b8a..2aba0da7a 100644
--- a/stdlib/source/lux/data/number.lux
+++ b/stdlib/source/lux/data/number.lux
@@ -2,7 +2,7 @@
   lux
   (lux (control number
                 [monoid #+ Monoid]
-                [eq #+ Eq]
+                [equality #+ Eq]
                 hash
                 [order]
                 enum
diff --git a/stdlib/source/lux/data/number/complex.lux b/stdlib/source/lux/data/number/complex.lux
index 879ee0c1e..52cf8066f 100644
--- a/stdlib/source/lux/data/number/complex.lux
+++ b/stdlib/source/lux/data/number/complex.lux
@@ -1,7 +1,7 @@
 (.module: {#.doc "Complex arithmetic."}
   lux
   (lux [math]
-       (control [eq #+ Eq]
+       (control [equality #+ Eq]
                 number
                 codec
                 ["M" monad #+ do Monad]
diff --git a/stdlib/source/lux/data/number/ratio.lux b/stdlib/source/lux/data/number/ratio.lux
index 2fe759932..9d241fe89 100644
--- a/stdlib/source/lux/data/number/ratio.lux
+++ b/stdlib/source/lux/data/number/ratio.lux
@@ -1,7 +1,7 @@
 (.module: {#.doc "Rational arithmetic."}
   lux
   (lux [math]
-       (control [eq #+ Eq]
+       (control [equality #+ Eq]
                 [order]
                 number
                 codec
diff --git a/stdlib/source/lux/data/text.lux b/stdlib/source/lux/data/text.lux
index 9dbf0dec5..6b259b49f 100644
--- a/stdlib/source/lux/data/text.lux
+++ b/stdlib/source/lux/data/text.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux (control [monoid #+ Monoid]
-                [eq #+ Eq]
+                [equality #+ Eq]
                 [order]
                 [monad #+ do Monad]
                 [codec #+ Codec]
diff --git a/stdlib/source/lux/lang/type.lux b/stdlib/source/lux/lang/type.lux
index d7dc33ca9..1bfea13d6 100644
--- a/stdlib/source/lux/lang/type.lux
+++ b/stdlib/source/lux/lang/type.lux
@@ -1,6 +1,6 @@
 (.module: {#.doc "Basic functionality for working with types."}
   [lux #- function]
-  (lux (control [eq #+ Eq]
+  (lux (control [equality #+ Eq]
                 [monad #+ do Monad])
        (data [text "text/" Monoid<Text> Eq<Text>]
              [ident "ident/" Eq<Ident>]
diff --git a/stdlib/source/lux/macro/code.lux b/stdlib/source/lux/macro/code.lux
index 44cd21b6d..cde2f97fe 100644
--- a/stdlib/source/lux/macro/code.lux
+++ b/stdlib/source/lux/macro/code.lux
@@ -1,6 +1,6 @@
 (.module:
   [lux #- nat int deg]
-  (lux (control [eq #+ Eq])
+  (lux (control [equality #+ Eq])
        (data bool
              number
              [text #+ Eq<Text> "Text/" Monoid<Text>]
diff --git a/stdlib/source/lux/macro/poly.lux b/stdlib/source/lux/macro/poly.lux
index 4d9d6cf12..63590953b 100644
--- a/stdlib/source/lux/macro/poly.lux
+++ b/stdlib/source/lux/macro/poly.lux
@@ -1,7 +1,7 @@
 (.module:
   [lux #- function]
   (lux (control [monad #+ do Monad]
-                [eq]
+                [equality]
                 ["p" parser]
                 ["ex" exception #+ exception:])
        [function]
diff --git a/stdlib/source/lux/macro/poly/eq.lux b/stdlib/source/lux/macro/poly/equality.lux
index 7d3083660..4cf8b2de0 100644
--- a/stdlib/source/lux/macro/poly/eq.lux
+++ b/stdlib/source/lux/macro/poly/equality.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux (control [monad #+ do Monad]
-                [eq]
+                ["eq" equality]
                 ["p" parser])
        (data [text "text/" Monoid<Text>]
              text/format
diff --git a/stdlib/source/lux/macro/poly/json.lux b/stdlib/source/lux/macro/poly/json.lux
index 51a996c4c..1bf0cba96 100644
--- a/stdlib/source/lux/macro/poly/json.lux
+++ b/stdlib/source/lux/macro/poly/json.lux
@@ -1,7 +1,7 @@
 (.module: {#.doc "Codecs for values in the JSON format."}
   lux
   (lux (control [monad #+ do Monad]
-                [eq #+ Eq]
+                [equality #+ Eq]
                 codec
                 ["p" parser "p/" Monad<Parser>])
        (data [bool]
diff --git a/stdlib/source/lux/macro/syntax.lux b/stdlib/source/lux/macro/syntax.lux
index 5f5c17e20..d7621eba4 100644
--- a/stdlib/source/lux/macro/syntax.lux
+++ b/stdlib/source/lux/macro/syntax.lux
@@ -2,7 +2,7 @@
   [lux #- nat int deg]
   (lux [macro #+ with-gensyms]
        (control [monad #+ do Monad]
-                [eq #+ Eq]
+                [equality #+ Eq]
                 ["p" parser])
        (data [bool]
              [number]
diff --git a/stdlib/source/lux/time/date.lux b/stdlib/source/lux/time/date.lux
index 93fa324cb..89f906040 100644
--- a/stdlib/source/lux/time/date.lux
+++ b/stdlib/source/lux/time/date.lux
@@ -1,6 +1,6 @@
 (.module:
   lux
-  (lux (control eq
+  (lux (control equality
                 order
                 enum
                 codec
diff --git a/stdlib/source/lux/time/duration.lux b/stdlib/source/lux/time/duration.lux
index a91553544..5efccf432 100644
--- a/stdlib/source/lux/time/duration.lux
+++ b/stdlib/source/lux/time/duration.lux
@@ -1,6 +1,6 @@
 (.module:
   lux
-  (lux (control eq
+  (lux (control equality
                 order
                 codec
                 [monoid #+ Monoid]
diff --git a/stdlib/source/lux/time/instant.lux b/stdlib/source/lux/time/instant.lux
index c4d3c6fdf..12fe66172 100644
--- a/stdlib/source/lux/time/instant.lux
+++ b/stdlib/source/lux/time/instant.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io #- run]
-       (control eq
+       (control equality
                 order
                 enum
                 codec
diff --git a/stdlib/source/lux/type/implicit.lux b/stdlib/source/lux/type/implicit.lux
index 0d6f5b4df..84bff5ec9 100644
--- a/stdlib/source/lux/type/implicit.lux
+++ b/stdlib/source/lux/type/implicit.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux (control [monad #+ do Monad]
-                [eq]
+                ["eq" equality]
                 ["p" parser])
        (data [text "text/" Eq<Text>]
              text/format
diff --git a/stdlib/source/lux/type/unit.lux b/stdlib/source/lux/type/unit.lux
index 2af12b5df..0f81c6a08 100644
--- a/stdlib/source/lux/type/unit.lux
+++ b/stdlib/source/lux/type/unit.lux
@@ -2,7 +2,7 @@
   lux
   (lux (control [monad #+ do Monad]
                 ["p" parser "p/" Monad<Parser>]
-                [eq #+ Eq]
+                [equality #+ Eq]
                 [order #+ Order]
                 [enum #+ Enum])
        (data text/format
diff --git a/stdlib/source/lux/world/blob.jvm.lux b/stdlib/source/lux/world/blob.jvm.lux
index 2cb4ed291..88b1913e9 100644
--- a/stdlib/source/lux/world/blob.jvm.lux
+++ b/stdlib/source/lux/world/blob.jvm.lux
@@ -2,7 +2,7 @@
   [lux #- i64]
   (lux (control [monad #+ do]
                 ["ex" exception #+ exception:]
-                [eq])
+                ["eq" equality])
        (data [bit]
              [maybe]
              ["e" error]
diff --git a/stdlib/test/test/lux/control/eq.lux b/stdlib/test/test/lux/control/equality.lux
index c63973079..5139b41ea 100644
--- a/stdlib/test/test/lux/control/eq.lux
+++ b/stdlib/test/test/lux/control/equality.lux
@@ -1,6 +1,6 @@
 (.module:
   lux
-  (lux (control ["/" eq]
+  (lux (control ["/" equality]
                 [monad #+ do])
        (math ["r" random])
        test))
diff --git a/stdlib/test/test/lux/control/parser.lux b/stdlib/test/test/lux/control/parser.lux
index c295463cf..bc26444ce 100644
--- a/stdlib/test/test/lux/control/parser.lux
+++ b/stdlib/test/test/lux/control/parser.lux
@@ -2,7 +2,7 @@
   lux
   (lux [io]
        (control ["M" monad #+ do Monad]
-                [eq #+ Eq]
+                [equality #+ Eq]
                 ["&" parser]
                 pipe)
        (data [text "Text/" Monoid<Text>]
diff --git a/stdlib/test/test/lux/data/coll/bits.lux b/stdlib/test/test/lux/data/coll/bits.lux
index f416f9866..a5141034c 100644
--- a/stdlib/test/test/lux/data/coll/bits.lux
+++ b/stdlib/test/test/lux/data/coll/bits.lux
@@ -5,7 +5,7 @@
        (data (coll ["/" bits]))
        ["r" math/random])
   lux/test
-  (test (lux (control ["_." eq]))))
+  (test (lux (control ["_eq" equality]))))
 
 (def: (size min max)
   (-> Nat Nat (r.Random Nat))
diff --git a/stdlib/test/test/lux/data/coll/dictionary/ordered.lux b/stdlib/test/test/lux/data/coll/dictionary/ordered.lux
index 041e27484..a373f6107 100644
--- a/stdlib/test/test/lux/data/coll/dictionary/ordered.lux
+++ b/stdlib/test/test/lux/data/coll/dictionary/ordered.lux
@@ -2,7 +2,7 @@
   lux
   (lux [io]
        (control [monad #+ do Monad]
-                [eq #+ Eq])
+                [equality #+ Eq])
        (data [product]
              [number]
              (coll (set ["s" unordered])
diff --git a/stdlib/test/test/lux/data/coll/dictionary/unordered.lux b/stdlib/test/test/lux/data/coll/dictionary/unordered.lux
index f0224a015..93b83dc7b 100644
--- a/stdlib/test/test/lux/data/coll/dictionary/unordered.lux
+++ b/stdlib/test/test/lux/data/coll/dictionary/unordered.lux
@@ -2,7 +2,7 @@
   lux
   (lux [io]
        (control [monad #+ do Monad]
-                [eq])
+                ["eq" equality])
        (data [text]
              text/format
              [number]
diff --git a/stdlib/test/test/lux/data/format/json.lux b/stdlib/test/test/lux/data/format/json.lux
index e2781d2a5..43b0851c0 100644
--- a/stdlib/test/test/lux/data/format/json.lux
+++ b/stdlib/test/test/lux/data/format/json.lux
@@ -3,7 +3,7 @@
   (lux [io]
        (control [monad #+ do Monad]
                 codec
-                [eq #+ Eq]
+                [equality #+ Eq]
                 pipe
                 ["p" parser])
        (data [text]
@@ -20,7 +20,7 @@
        (macro [code]
               [syntax #+ syntax:]
               [poly #+ derived:]
-              [poly/eq]
+              [poly/equality]
               [poly/json])
        (type [unit])
        ["r" math/random]
@@ -97,7 +97,7 @@
            (r.alt r.frac
                   (r.seq r.frac gen-recursive)))))
 
-(derived: (poly/eq.Eq<?> Recursive))
+(derived: (poly/equality.Eq<?> Recursive))
 
 (def: qty
   (All [unit] (r.Random (unit.Qty unit)))
diff --git a/stdlib/test/test/lux/macro/poly/eq.lux b/stdlib/test/test/lux/macro/poly/equality.lux
index d22475b11..beb203bcb 100644
--- a/stdlib/test/test/lux/macro/poly/eq.lux
+++ b/stdlib/test/test/lux/macro/poly/equality.lux
@@ -2,7 +2,7 @@
   lux
   (lux [io]
        (control [monad #+ do Monad]
-                [eq #+ Eq])
+                [equality #+ Eq])
        (data text/format
              [bool]
              [number "int/" Number<Int>]
@@ -12,7 +12,7 @@
        ["r" math/random]
        [macro]
        (macro [poly #+ derived:]
-              ["&" poly/eq]))
+              ["&" poly/equality]))
   lux/test)
 
 ## [Utils]
diff --git a/stdlib/test/test/lux/macro/poly/functor.lux b/stdlib/test/test/lux/macro/poly/functor.lux
index 3cb6653a5..86c3eca7f 100644
--- a/stdlib/test/test/lux/macro/poly/functor.lux
+++ b/stdlib/test/test/lux/macro/poly/functor.lux
@@ -3,7 +3,7 @@
   (lux [io]
        (control [monad #+ do Monad]
                 [functor]
-                [eq #+ Eq]
+                [equality #+ Eq]
                 [state])
        (data text/format
              [bool]
diff --git a/stdlib/test/test/lux/macro/syntax.lux b/stdlib/test/test/lux/macro/syntax.lux
index 5c5ea835f..ba45ff6e4 100644
--- a/stdlib/test/test/lux/macro/syntax.lux
+++ b/stdlib/test/test/lux/macro/syntax.lux
@@ -2,7 +2,7 @@
   lux
   (lux [io]
        (control [monad #+ do Monad]
-                [eq #+ Eq]
+                [equality #+ Eq]
                 ["p" parser])
        (data [text "Text/" Monoid<Text>]
              text/format
diff --git a/stdlib/test/test/lux/type/implicit.lux b/stdlib/test/test/lux/type/implicit.lux
index c07067b3e..a5af06c5d 100644
--- a/stdlib/test/test/lux/type/implicit.lux
+++ b/stdlib/test/test/lux/type/implicit.lux
@@ -3,7 +3,7 @@
   (lux [io]
        (control [monad #+ do Monad]
                 functor
-                [eq])
+                [equality])
        (data [number]
              [bool "bool/" Eq<Bool>]
              (coll [list]))
diff --git a/stdlib/test/test/lux/world/blob.lux b/stdlib/test/test/lux/world/blob.lux
index 1093f302f..e1c77552b 100644
--- a/stdlib/test/test/lux/world/blob.lux
+++ b/stdlib/test/test/lux/world/blob.lux
@@ -10,7 +10,7 @@
        (world ["/" blob])
        ["r" math/random])
   lux/test
-  (test (lux (control ["_." eq]))))
+  (test (lux (control ["_eq" equality]))))
 
 (def: (succeed result)
   (-> (e.Error Bool) Bool)
diff --git a/stdlib/test/tests.lux b/stdlib/test/tests.lux
index 6a429093b..ce4113317 100644
--- a/stdlib/test/tests.lux
+++ b/stdlib/test/tests.lux
@@ -66,7 +66,7 @@
                           ["_." fuzzy]))
              (macro ["_." code]
                     ["_." syntax]
-                    (poly ["poly_." eq]
+                    (poly ["poly_." equality]
                           ["poly_." functor]))
              (type ["_." implicit]
                    ["_." resource]