Fixed some inconsistent naming.

23 files changed, 158 insertions, 107 deletions

diff --git a/stdlib/source/test/aedifex/artifact.lux b/stdlib/source/test/aedifex/artifact.lux
index 6afbbf27c..ce0af7e7f 100644
--- a/stdlib/source/test/aedifex/artifact.lux
+++ b/stdlib/source/test/aedifex/artifact.lux
@@ -6,7 +6,9 @@
      [monad (#+ do)]
      [hash (#+ Hash)]
      [\\specification
-      ["$." equivalence]]]
+      ["$." equivalence]
+      ["$." order]
+      ["$." hash]]]
     [control
      [concurrency
       [promise (#+ Promise)]]]
@@ -37,11 +39,21 @@
 (def: #export test
   Test
   (<| (_.covering /._)
+      (do random.monad
+        [sample ..random])
       (_.for [/.Group /.Name /.Version
               /.Artifact]
              ($_ _.and
                  (_.for [/.equivalence]
                         ($equivalence.spec /.equivalence ..random))
+                 (_.for [/.order]
+                        ($order.spec /.order ..random))
+                 (_.for [/.hash]
+                        ($hash.spec /.hash ..random))
+
+                 (_.cover [/.format /.identity]
+                          (and (text.ends_with? (/.identity sample) (/.format sample))
+                               (not (text\= (/.identity sample) (/.format sample)))))
                  
                  /extension.test
                  /snapshot.test
diff --git a/stdlib/source/test/aedifex/artifact/extension.lux b/stdlib/source/test/aedifex/artifact/extension.lux
index fd28c5d92..b8a2144aa 100644
--- a/stdlib/source/test/aedifex/artifact/extension.lux
+++ b/stdlib/source/test/aedifex/artifact/extension.lux
@@ -29,10 +29,12 @@
                                 uniques (set.from_list text.hash options)]
                             (n.= (list.size options)
                                  (set.size uniques))))
-                 (_.cover [/.extension]
+                 (_.cover [/.extension /.type]
                           (`` (and (~~ (template [<type> <extension>]
-                                         [(text\= <extension>
-                                                  (/.extension <type>))]
+                                         [(and (text\= <extension>
+                                                       (/.extension <type>))
+                                               (text\= <type>
+                                                       (/.type (/.extension <type>))))]
 
                                          [//.lux_library /.lux_library]
                                          [//.jvm_library /.jvm_library]
diff --git a/stdlib/source/test/aedifex/artifact/time.lux b/stdlib/source/test/aedifex/artifact/time.lux
index f69566096..131155500 100644
--- a/stdlib/source/test/aedifex/artifact/time.lux
+++ b/stdlib/source/test/aedifex/artifact/time.lux
@@ -10,6 +10,8 @@
      ["." try ("#\." functor)]
      [parser
       ["<.>" text]]]
+    [time
+     ["." instant ("#\." equivalence)]]
     [math
      ["." random (#+ Random)]
      [number
@@ -43,6 +45,16 @@
                          (<text>.run /.parser)
                          (try\map (\ /.equivalence = expected))
                          (try.default false))))
+          (do random.monad
+            [expected ..random]
+            (_.cover [/.instant /.from_instant]
+                     (|> expected
+                         /.instant
+                         /.from_instant
+                         (try\map (\ /.equivalence = expected))
+                         (try.default false))))
+          (_.cover [/.epoch]
+                   (instant\= instant.epoch (/.instant /.epoch)))
 
           /date.test
           /time.test
diff --git a/stdlib/source/test/lux/abstract/fold.lux b/stdlib/source/test/lux/abstract/fold.lux
index 787a8a03d..a07a19870 100644
--- a/stdlib/source/test/lux/abstract/fold.lux
+++ b/stdlib/source/test/lux/abstract/fold.lux
@@ -20,7 +20,7 @@
     [samples (random.list 10 random.nat)]
     (<| (_.covering /._)
         ($_ _.and
-            (_.cover [/.with-monoid]
+            (_.cover [/.with_monoid]
                      (n.= (\ list.fold fold (\ n.addition compose) (\ n.addition identity) samples)
-                          (/.with-monoid n.addition list.fold samples)))
+                          (/.with_monoid n.addition list.fold samples)))
             ))))
diff --git a/stdlib/source/test/lux/control/exception.lux b/stdlib/source/test/lux/control/exception.lux
index f62ad9271..534d03252 100644
--- a/stdlib/source/test/lux/control/exception.lux
+++ b/stdlib/source/test/lux/control/exception.lux
@@ -16,11 +16,11 @@
     [//
      ["." try (#+ Try)]]]])
 
-(exception: an-exception)
-(exception: another-exception)
+(exception: an_exception)
+(exception: another_exception)
 
 (def: label "YOLO")
-(exception: (custom-exception {value Nat})
+(exception: (custom_exception {value Nat})
   (/.report [label (%.nat value)]))
 
 (def: #export test
@@ -28,12 +28,12 @@
   (do {! random.monad}
     [expected random.nat
      wrong (|> random.nat (random.filter (|>> (n.= expected) not)))
-     assertion-succeeded? random.bit
-     #let [report-element (\ ! map %.nat random.nat)]
-     field0 report-element
-     value0 report-element
-     field1 report-element
-     value1 report-element]
+     assertion_succeeded? random.bit
+     #let [report_element (\ ! map %.nat random.nat)]
+     field0 report_element
+     value0 report_element
+     field1 report_element
+     value1 report_element]
     (<| (_.covering /._)
         (_.for [/.Exception])
         ($_ _.and
@@ -42,41 +42,41 @@
                        (#try.Success actual) (n.= expected actual)
                        (#try.Failure _) false))
             (_.cover [/.throw]
-                     (case (/.throw ..an-exception [])
+                     (case (/.throw ..an_exception [])
                        (#try.Success _) false
                        (#try.Failure _) true))
             (_.cover [/.construct]
-                     (case (/.throw ..an-exception [])
+                     (case (/.throw ..an_exception [])
                        (#try.Success _)
                        false
                        
                        (#try.Failure message)
-                       (text\= message (/.construct ..an-exception []))))
+                       (text\= message (/.construct ..an_exception []))))
             (_.cover [/.match?]
-                     (/.match? ..an-exception
-                               (/.construct ..an-exception [])))
+                     (/.match? ..an_exception
+                               (/.construct ..an_exception [])))
             (_.cover [/.assert]
-                     (case (/.assert ..an-exception [] assertion-succeeded?)
+                     (case (/.assert ..an_exception [] assertion_succeeded?)
                        (#try.Success _)
-                       assertion-succeeded?
+                       assertion_succeeded?
                        
                        (#try.Failure message)
-                       (and (not assertion-succeeded?)
-                            (text\= message (/.construct ..an-exception [])))))
+                       (and (not assertion_succeeded?)
+                            (text\= message (/.construct ..an_exception [])))))
             (_.cover [/.catch]
                      (and (n.= expected
-                               (|> (/.throw ..an-exception [])
-                                   (/.catch ..an-exception (function (_ ex) expected))
+                               (|> (/.throw ..an_exception [])
+                                   (/.catch ..an_exception (function (_ ex) expected))
                                    (/.otherwise (function (_ ex) wrong))))
                           (n.= expected
-                               (|> (/.throw ..another-exception [])
-                                   (/.catch ..an-exception (function (_ ex) wrong))
-                                   (/.catch ..another-exception (function (_ ex) expected))
+                               (|> (/.throw ..another_exception [])
+                                   (/.catch ..an_exception (function (_ ex) wrong))
+                                   (/.catch ..another_exception (function (_ ex) expected))
                                    (/.otherwise (function (_ ex) wrong))))))
             (_.cover [/.otherwise]
                      (n.= expected
-                          (|> (/.throw ..another-exception [])
-                              (/.catch ..an-exception (function (_ ex) wrong))
+                          (|> (/.throw ..another_exception [])
+                              (/.catch ..an_exception (function (_ ex) wrong))
                               (/.otherwise (function (_ ex) expected)))))
             (_.cover [/.report]
                      (let [report (/.report [field0 value0]
@@ -92,23 +92,23 @@
                             (text.contains? field1 enumeration)
                             (text.contains? value1 enumeration))))
             (_.cover [/.with]
-                     (and (case (/.with ..an-exception [] (#try.Success expected))
+                     (and (case (/.with ..an_exception [] (#try.Success expected))
                             (#try.Success actual) (n.= expected actual)
                             (#try.Failure _) false)
-                          (case (/.with ..an-exception [] (#try.Failure ""))
+                          (case (/.with ..an_exception [] (#try.Failure ""))
                             (#try.Success _) false
-                            (#try.Failure message) (text\= message (/.construct ..an-exception [])))
-                          (case (/.with ..an-exception []
+                            (#try.Failure message) (text\= message (/.construct ..an_exception [])))
+                          (case (/.with ..an_exception []
                                   (: (Try Nat)
-                                     (/.throw ..another-exception [])))
+                                     (/.throw ..another_exception [])))
                             (#try.Success _)
                             false
                             
                             (#try.Failure message)
-                            (and (text.contains? (/.construct ..an-exception []) message)
-                                 (text.contains? (/.construct ..another-exception []) message)))))
+                            (and (text.contains? (/.construct ..an_exception []) message)
+                                 (text.contains? (/.construct ..another_exception []) message)))))
             (_.cover [/.exception:]
-                     (case (/.throw ..custom-exception [expected])
+                     (case (/.throw ..custom_exception [expected])
                        (#try.Success _)
                        false
                        
diff --git a/stdlib/source/test/lux/control/function/mixin.lux b/stdlib/source/test/lux/control/function/mixin.lux
index 339216526..31b1e338d 100644
--- a/stdlib/source/test/lux/control/function/mixin.lux
+++ b/stdlib/source/test/lux/control/function/mixin.lux
@@ -123,9 +123,9 @@
                                      (|> input function (state.run dummy) product.right))))
                      ))
           (_.for [/.Recursive]
-                 (_.cover [/.from-recursive]
+                 (_.cover [/.from_recursive]
                           (let [factorial (/.mixin
-                                           (/.from-recursive
+                                           (/.from_recursive
                                             (function (_ recur input)
                                               (case input
                                                 (^or 0 1) 1
diff --git a/stdlib/source/test/lux/control/parser/tree.lux b/stdlib/source/test/lux/control/parser/tree.lux
index 62c4ab04e..e330464b4 100644
--- a/stdlib/source/test/lux/control/parser/tree.lux
+++ b/stdlib/source/test/lux/control/parser/tree.lux
@@ -159,12 +159,12 @@
                                        (tree.leaf dummy))))
           (do {! random.monad}
             [dummy random.nat]
-            (_.cover [/.cannot-move-further]
+            (_.cover [/.cannot_move_further]
                      (`` (and (~~ (template [<parser>]
                                     [(|> (/.run <parser>
                                                 (tree.leaf dummy))
                                          (!expect (^multi (#try.Failure error)
-                                                          (exception.match? /.cannot-move-further error))))]
+                                                          (exception.match? /.cannot_move_further error))))]
 
                                     [/.down] [/.up]
                                     [/.right] [/.left]
diff --git a/stdlib/source/test/lux/control/security/capability.lux b/stdlib/source/test/lux/control/security/capability.lux
index 2798c21b2..ec2d91d20 100644
--- a/stdlib/source/test/lux/control/security/capability.lux
+++ b/stdlib/source/test/lux/control/security/capability.lux
@@ -15,11 +15,11 @@
   [\\library
    ["." /]])
 
-(/.capability: (Can-Shift a)
-  (can-shift [a Nat] [a Nat]))
+(/.capability: (Can_Shift a)
+  (can_shift [a Nat] [a Nat]))
 
-(/.capability: Can-IO
-  (can-io [] (IO Nat)))
+(/.capability: Can_IO
+  (can_io [] (IO Nat)))
 
 (def: #export test
   Test
@@ -28,16 +28,16 @@
         [shift random.nat
          base random.nat
          #let [expected (n.+ shift base)]
-         pass-through (random.ascii 1)]
+         pass_through (random.ascii 1)]
         (_.for [/.Capability]
                ($_ _.and
                    (_.cover [/.capability: /.use]
-                            (let [capability (..can-shift (function (_ [no-op raw])
-                                                            [no-op (n.+ shift raw)]))
-                                  [untouched actual] (/.use capability [pass-through base])]
-                              (and (is? pass-through untouched)
+                            (let [capability (..can_shift (function (_ [no_op raw])
+                                                            [no_op (n.+ shift raw)]))
+                                  [untouched actual] (/.use capability [pass_through base])]
+                              (and (is? pass_through untouched)
                                    (n.= expected actual))))
-                   (wrap (let [capability (..can-io (function (_ _) (io.io expected)))]
+                   (wrap (let [capability (..can_io (function (_ _) (io.io expected)))]
                            (do promise.monad
                              [actual (/.use (/.async capability) [])]
                              (_.cover' [/.async]
diff --git a/stdlib/source/test/lux/control/state.lux b/stdlib/source/test/lux/control/state.lux
index 53622408d..a037f8a91 100644
--- a/stdlib/source/test/lux/control/state.lux
+++ b/stdlib/source/test/lux/control/state.lux
@@ -20,7 +20,7 @@
   [\\library
    ["." / (#+ State)]])
 
-(def: (with-conditions [state output] computation)
+(def: (with_conditions [state output] computation)
   (-> [Nat Nat] (State Nat Nat) Bit)
   (|> computation
       (/.run state)
@@ -33,23 +33,23 @@
      value random.nat]
     ($_ _.and
         (_.cover [/.State /.get]
-                 (with-conditions [state state]
+                 (with_conditions [state state]
                    /.get))
         (_.cover [/.put]
-                 (with-conditions [state value]
+                 (with_conditions [state value]
                    (do /.monad
                      [_ (/.put value)]
                      /.get)))
         (_.cover [/.update]
-                 (with-conditions [state (n.* value state)]
+                 (with_conditions [state (n.* value state)]
                    (do /.monad
                      [_ (/.update (n.* value))]
                      /.get)))
         (_.cover [/.use]
-                 (with-conditions [state (inc state)]
+                 (with_conditions [state (inc state)]
                    (/.use inc)))
         (_.cover [/.local]
-                 (with-conditions [state (n.* value state)]
+                 (with_conditions [state (n.* value state)]
                    (/.local (n.* value)
                             /.get)))
         )))
@@ -92,8 +92,8 @@
                      (/.run 0)
                      (let> [state' output']
                            (n.= limit state'))))
-        (_.cover [/.do-while]
-                 (|> (/.do-while condition (/.update inc))
+        (_.cover [/.do_while]
+                 (|> (/.do_while condition (/.update inc))
                      (/.run 0)
                      (let> [state' output']
                            (or (n.= limit state')
@@ -101,7 +101,7 @@
                                     (n.= 1 state'))))))
         )))
 
-(def: monad-transformer
+(def: monad_transformer
   Test
   (do random.monad
     [state random.nat
@@ -128,4 +128,4 @@
           ..basics
           ..structures
           ..loops
-          ..monad-transformer)))
+          ..monad_transformer)))
diff --git a/stdlib/source/test/lux/data/collection/bits.lux b/stdlib/source/test/lux/data/collection/bits.lux
index bc59e6b34..3e8b89d2a 100644
--- a/stdlib/source/test/lux/data/collection/bits.lux
+++ b/stdlib/source/test/lux/data/collection/bits.lux
@@ -59,12 +59,12 @@
                 (_.cover [/.flip]
                          (and (|> /.empty (/.flip idx) (/.get idx))
                               (|> /.empty (/.flip idx) (/.flip idx) (/.get idx) not)))
-                (_.cover [/.Chunk /.capacity /.chunk-size]
+                (_.cover [/.Chunk /.capacity /.chunk_size]
                          (and (n.= 0 (/.capacity /.empty))
                               (|> /.empty (/.set idx) /.capacity
                                   (n.- idx)
                                   (predicate.unite (n.>= 0)
-                                                   (n.< /.chunk-size)))
+                                                   (n.< /.chunk_size)))
                               (let [grown (/.flip idx /.empty)]
                                 (and (n.> 0 (/.capacity grown))
                                      (is? /.empty (/.flip idx grown))))))
diff --git a/stdlib/source/test/lux/data/collection/tree.lux b/stdlib/source/test/lux/data/collection/tree.lux
index ff281844a..a610fdef5 100644
--- a/stdlib/source/test/lux/data/collection/tree.lux
+++ b/stdlib/source/test/lux/data/collection/tree.lux
@@ -19,12 +19,12 @@
   [\\library
    ["." / (#+ Tree)]])
 
-(def: #export (tree gen-value)
+(def: #export (tree gen_value)
   (All [a] (-> (Random a) (Random [Nat (Tree a)])))
   (do {! random.monad}
-    [value gen-value
-     num-children (\ ! map (n.% 2) random.nat)
-     children (random.list num-children (tree gen-value))]
+    [value gen_value
+     num_children (\ ! map (n.% 2) random.nat)
+     children (random.list num_children (tree gen_value))]
     (wrap [(|> children
                (list\map product.left)
                (list\fold n.+ 1))
@@ -58,8 +58,8 @@
                         (/.flatten (/.leaf expected)))))
           (do {! random.monad}
             [value random.nat
-             num-children (\ ! map (n.% 3) random.nat)
-             children (random.list num-children random.nat)]
+             num_children (\ ! map (n.% 3) random.nat)
+             children (random.list num_children random.nat)]
             (_.cover [/.branch]
                      (\ (list.equivalence n.equivalence) =
                         (list& value children)
diff --git a/stdlib/source/test/lux/data/collection/tree/zipper.lux b/stdlib/source/test/lux/data/collection/tree/zipper.lux
index 06e53f225..d04b3b8e9 100644
--- a/stdlib/source/test/lux/data/collection/tree/zipper.lux
+++ b/stdlib/source/test/lux/data/collection/tree/zipper.lux
@@ -231,21 +231,21 @@
                                      [/.right]
                                      [/.value (n.= dummy) wrap])
                                 (maybe.default false)))))
-            (_.cover [/.insert-left]
+            (_.cover [/.insert_left]
                      (|> (tree.branch dummy (list (tree.leaf dummy)))
                          /.zip
                          (do> maybe.monad
                               [/.down]
-                              [(/.insert-left expected)]
+                              [(/.insert_left expected)]
                               [/.left]
                               [/.value (n.= expected) wrap])
                          (maybe.default false)))
-            (_.cover [/.insert-right]
+            (_.cover [/.insert_right]
                      (|> (tree.branch dummy (list (tree.leaf dummy)))
                          /.zip
                          (do> maybe.monad
                               [/.down]
-                              [(/.insert-right expected)]
+                              [(/.insert_right expected)]
                               [/.right]
                               [/.value (n.= expected) wrap])
                          (maybe.default false)))
@@ -254,7 +254,7 @@
                          /.zip
                          (do> maybe.monad
                               [/.down]
-                              [(/.insert-left expected)]
+                              [(/.insert_left expected)]
                               [/.remove]
                               [/.value (n.= expected) wrap])
                          (maybe.default false)))
diff --git a/stdlib/source/test/lux/data/maybe.lux b/stdlib/source/test/lux/data/maybe.lux
index 4f5accd9b..899541f37 100644
--- a/stdlib/source/test/lux/data/maybe.lux
+++ b/stdlib/source/test/lux/data/maybe.lux
@@ -75,8 +75,8 @@
                      (is? value (/.assume (#.Some value)))))
           (do random.monad
             [value random.nat]
-            (_.cover [/.to-list]
+            (_.cover [/.to_list]
                      (\ (list.equivalence n.equivalence) =
                         (list value)
-                        (/.to-list (#.Some value)))))
+                        (/.to_list (#.Some value)))))
           )))
diff --git a/stdlib/source/test/lux/ffi.lua.lux b/stdlib/source/test/lux/ffi.lua.lux
index a1f181edc..963d45387 100644
--- a/stdlib/source/test/lux/ffi.lua.lux
+++ b/stdlib/source/test/lux/ffi.lua.lux
@@ -7,9 +7,7 @@
     [control
      ["." io]]
     [math
-     ["." random]
-     [number
-      ["i" int]]]]]
+     ["." random]]]]
   [\\library
    ["." /]])
 
diff --git a/stdlib/source/test/lux/ffi.rb.lux b/stdlib/source/test/lux/ffi.rb.lux
index c8d4ea6d5..0b57aee7e 100644
--- a/stdlib/source/test/lux/ffi.rb.lux
+++ b/stdlib/source/test/lux/ffi.rb.lux
@@ -4,22 +4,49 @@
     ["_" test (#+ Test)]
     [abstract
      [monad (#+ do)]]
-    [control
-     ["." try]]
-    [data
-     ["." text ("#\." equivalence)]]
     [math
-     ["." random (#+ Random)]
-     [number
-      ["." nat]
-      ["." frac]]]]]
+     ["." random]]]]
   [\\library
    ["." /]])
 
+(/.import: File
+  ["#::."
+   (#static SEPARATOR /.String)])
+
 (def: #export test
   Test
   (do {! random.monad}
-    []
+    [boolean random.bit
+     integer random.int
+     float random.frac
+     string (random.ascii/lower 1)]
     (<| (_.covering /._)
-        (_.test "TBD"
-                true))))
+        (`` ($_ _.and
+                (~~ (template [<type> <sample>]
+                      [(_.cover [<type>]
+                                (exec
+                                  (: <type> <sample>)
+                                  true))]
+
+                      [/.Boolean boolean]
+                      [/.Integer integer]
+                      [/.Float float]
+                      [/.String string]
+                      ))
+                (_.for [/.Object]
+                       ($_ _.and
+                           (~~ (template [<type>]
+                                 [(_.cover [<type>]
+                                           (exec
+                                             (|> []
+                                                 (:as <type>)
+                                                 (: (Ex [a] (/.Object a))))
+                                             true))]
+
+                                 [/.Nil]
+                                 [/.Function]
+                                 ))))
+                (_.cover [/.import:]
+                         (is? (..File::SEPARATOR)
+                              (..File::SEPARATOR)))
+                )))))
diff --git a/stdlib/source/test/lux/math/modular.lux b/stdlib/source/test/lux/math/modular.lux
index 090481806..40a091008 100644
--- a/stdlib/source/test/lux/math/modular.lux
+++ b/stdlib/source/test/lux/math/modular.lux
@@ -93,17 +93,17 @@
                                      (/.- zero subject)))))
                 (_.cover [/.inverse]
                          (let [one (/.modular (/.modulus subject) +1)
-                               co-prime? (i.co-prime? (//.divisor (/.modulus subject))
+                               co_prime? (i.co_prime? (//.divisor (/.modulus subject))
                                                       (/.value subject))]
                            (case (/.inverse subject)
                              (#.Some subject^-1)
-                             (and co-prime?
+                             (and co_prime?
                                   (|> subject
                                       (/.* subject^-1)
                                       (/.= one)))
                              
                              #.None
-                             (not co-prime?))))
+                             (not co_prime?))))
                 (_.cover [/.adapter]
                          (<| (try.default false)
                              (do try.monad
diff --git a/stdlib/source/test/lux/math/number/int.lux b/stdlib/source/test/lux/math/number/int.lux
index 9b650e795..1d95a10e5 100644
--- a/stdlib/source/test/lux/math/number/int.lux
+++ b/stdlib/source/test/lux/math/number/int.lux
@@ -158,9 +158,9 @@
                                          (/.* right_k right)))]
                            (and same_gcd!
                                 bezout_identity!)))
-                (_.cover [/.co-prime?]
+                (_.cover [/.co_prime?]
                          (bit\= (/.= +1 (/.gcd left right))
-                                (/.co-prime? left right)))
+                                (/.co_prime? left right)))
                 (_.cover [/.lcm]
                          (let [lcm (/.lcm left right)]
                            (and (/.= +0 (/.% left lcm))
diff --git a/stdlib/source/test/lux/math/number/nat.lux b/stdlib/source/test/lux/math/number/nat.lux
index 9577b25db..c9bb2102b 100644
--- a/stdlib/source/test/lux/math/number/nat.lux
+++ b/stdlib/source/test/lux/math/number/nat.lux
@@ -112,9 +112,9 @@
                          (let [gcd (/.gcd left right)]
                            (and (/.= 0 (/.% gcd left))
                                 (/.= 0 (/.% gcd right)))))
-                (_.cover [/.co-prime?]
+                (_.cover [/.co_prime?]
                          (bit\= (/.= 1 (/.gcd left right))
-                                (/.co-prime? left right)))
+                                (/.co_prime? left right)))
                 (_.cover [/.lcm]
                          (let [lcm (/.lcm left right)]
                            (and (/.= 0 (/.% left lcm))
diff --git a/stdlib/source/test/lux/time/year.lux b/stdlib/source/test/lux/time/year.lux
index b1e2691db..d97eb8334 100644
--- a/stdlib/source/test/lux/time/year.lux
+++ b/stdlib/source/test/lux/time/year.lux
@@ -62,13 +62,13 @@
                            (#try.Failure _)
                            (i.= +0 expected)))
                 ))
-          (_.cover [/.there-is-no-year-0]
+          (_.cover [/.there_is_no_year_0]
                    (case (/.year +0)
                      (#try.Success _)
                      false
 
                      (#try.Failure error)
-                     (exception.match? /.there-is-no-year-0 error)))
+                     (exception.match? /.there_is_no_year_0 error)))
           (_.cover [/.days]
                    (n.= (.nat (//duration.query //duration.day //duration.normal_year))
                         /.days))
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux
index a1d16b40b..44807af9d 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux
@@ -144,8 +144,8 @@
          variant-name (r.unicode 5)
          record-name (|> (r.unicode 5) (r.filter (|>> (text\= variant-name) not)))
          size (|> r.nat (\ ! map (|>> (n.% 10) (n.max 2))))
-         variant-tags (|> (r.set text.hash size (r.unicode 5)) (\ ! map set.to-list))
-         record-tags (|> (r.set text.hash size (r.unicode 5)) (\ ! map set.to-list))
+         variant-tags (|> (r.set text.hash size (r.unicode 5)) (\ ! map set.to_list))
+         record-tags (|> (r.set text.hash size (r.unicode 5)) (\ ! map set.to_list))
          primitivesTC (r.list size _primitive.primitive)
          #let [primitivesT (list\map product.left primitivesTC)
                primitivesC (list\map product.right primitivesTC)
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/structure.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/structure.lux
index 2f0f5d810..d263e3f0d 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/structure.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/structure.lux
@@ -231,7 +231,7 @@
 (def: variant
   (do {! r.monad}
     [size (|> r.nat (\ ! map (|>> (n.% 10) (n.max 2))))
-     tags (|> (r.set text.hash size (r.unicode 5)) (\ ! map set.to-list))
+     tags (|> (r.set text.hash size (r.unicode 5)) (\ ! map set.to_list))
      choice (|> r.nat (\ ! map (n.% size)))
      other-choice (|> r.nat (\ ! map (n.% size)) (r.filter (|>> (n.= choice) not)))
      primitives (r.list size _primitive.primitive)
@@ -277,7 +277,7 @@
 (def: record
   (do {! r.monad}
     [size (|> r.nat (\ ! map (|>> (n.% 10) (n.max 2))))
-     tags (|> (r.set text.hash size (r.unicode 5)) (\ ! map set.to-list))
+     tags (|> (r.set text.hash size (r.unicode 5)) (\ ! map set.to_list))
      primitives (r.list size _primitive.primitive)
      module-name (r.unicode 5)
      type-name (r.unicode 5)
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux
index 7cce92462..0a7a9d9c5 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux
@@ -184,7 +184,7 @@
   (All [a] (-> (Hash a) (Random a) (Random [a a a a a])))
   (|> random-element
       (random.set hash 5)
-      (\ random.monad map (|>> set.to-list
+      (\ random.monad map (|>> set.to_list
                                (case> (^ (list s0 s1 s2 s3 s4))
                                       [s0 s1 s2 s3 s4]
 
diff --git a/stdlib/source/test/lux/world/output/video/resolution.lux b/stdlib/source/test/lux/world/output/video/resolution.lux
index 671b1952c..a063a23bf 100644
--- a/stdlib/source/test/lux/world/output/video/resolution.lux
+++ b/stdlib/source/test/lux/world/output/video/resolution.lux
@@ -33,7 +33,7 @@
                                        /.fhd
                                        /.wuxga
                                        /.wqhd
-                                       /.uhd-4k)]
+                                       /.uhd_4k)]
   (def: listing
     (List /.Resolution)
     (list <resolutions>))