Re-named some list functions.

28 files changed, 40 insertions, 40 deletions

diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/case.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/case.lux
index f0b4faba6..c9443b43f 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/case.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/case.lux
@@ -194,14 +194,14 @@
                 num-sub-patterns (list.size sub-patterns)
                 matches (cond (n.< num-subs num-sub-patterns)
                               (let [[prefix suffix] (list.split (dec num-sub-patterns) subs)]
-                                (list.zip2 (list@compose prefix (list (type.tuple suffix))) sub-patterns))
+                                (list.zip/2 (list@compose prefix (list (type.tuple suffix))) sub-patterns))
 
                               (n.> num-subs num-sub-patterns)
                               (let [[prefix suffix] (list.split (dec num-subs) sub-patterns)]
-                                (list.zip2 subs (list@compose prefix (list (code.tuple suffix)))))
+                                (list.zip/2 subs (list@compose prefix (list (code.tuple suffix)))))
                               
                               ## (n.= num-subs num-sub-patterns)
-                              (list.zip2 subs sub-patterns))]
+                              (list.zip/2 subs sub-patterns))]
             (do @
               [[memberP+ thenA] (list@fold (: (All [a]
                                                 (-> [Type Code] (Operation [(List Pattern) a])
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/case/coverage.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/case/coverage.lux
index 896312463..bb9eef8cb 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/case/coverage.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/case/coverage.lux
@@ -200,7 +200,7 @@
         (and (n.= (list.size flatR) (list.size flatS))
              (list.every? (function (_ [coverageR coverageS])
                             (= coverageR coverageS))
-                          (list.zip2 flatR flatS))))
+                          (list.zip/2 flatR flatS))))
 
       _
       #0)))
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/function.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/function.lux
index 52b790d60..2430ce82f 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/function.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/function.lux
@@ -36,7 +36,7 @@
   (ex.report ["Function type" (%.type functionT)]
              ["Function" (%.code functionC)]
              ["Arguments" (|> arguments
-                              list.enumerate
+                              list.enumeration
                               (list@map (.function (_ [idx argC])
                                           (format (%.nat idx) " " (%.code argC))))
                               (text.join-with text.new-line))]))
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/module.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/module.lux
index 3e06ed0e7..06b0c41c6 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/module.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/module.lux
@@ -260,7 +260,7 @@
                                                                         (list@fold (function (_ [idx tag] table)
                                                                                      (plist.put tag [idx namespaced-tags exported? type] table))
                                                                                    tag-bindings
-                                                                                   (list.enumerate tags))))
+                                                                                   (list.enumeration tags))))
                                                       (update@ #.types (plist.put type-name [namespaced-tags exported? type]))))
                                    state)
                           []]))
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/structure.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/structure.lux
index 1355b25c6..fd0b58449 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/structure.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/analysis/structure.lux
@@ -313,7 +313,7 @@
            (wrap [])
            (/.throw ..record-size-mismatch [size-ts size-record recordT record]))
        #let [tuple-range (list.indices size-ts)
-             tag->idx (dictionary.from-list name.hash (list.zip2 tag-set tuple-range))]
+             tag->idx (dictionary.from-list name.hash (list.zip/2 tag-set tuple-range))]
        idx->val (monad.fold @
                             (function (_ [key val] idx->val)
                               (do @
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
index 46cfd01e6..9900c6764 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
@@ -1063,7 +1063,7 @@
                                                                   #.None
                                                                   actualJC)))))
                                     true
-                                    (list.zip2 parameters inputsJT))]]
+                                    (list.zip/2 parameters inputsJT))]]
     (wrap (and correct-class?
                correct-method?
                static-matches?
@@ -1093,7 +1093,7 @@
                                                         #.None
                                                         actualJC)))))
                           true
-                          (list.zip2 parameters inputsJT))))))
+                          (list.zip/2 parameters inputsJT))))))
 
 (def: idx-to-parameter
   (-> Nat .Type)
@@ -1104,7 +1104,7 @@
   (let [jvm-tvars (list@compose owner-tvars method-tvars)
         lux-tvars (|> jvm-tvars
                       list.reverse
-                      list.enumerate
+                      list.enumeration
                       (list@map (function (_ [idx name])
                                   [name (idx-to-parameter idx)]))
                       list.reverse)
@@ -1214,8 +1214,8 @@
 
 (def: (aliasing expected actual)
   (-> (List (Type Var)) (List (Type Var)) Aliasing)
-  (|> (list.zip2 (list@map jvm-parser.name actual)
-                 (list@map jvm-parser.name expected))
+  (|> (list.zip/2 (list@map jvm-parser.name actual)
+                  (list@map jvm-parser.name expected))
       (dictionary.from-list text.hash)))
 
 (def: (method-candidate actual-class-tvars class-name actual-method-tvars method-name method-style inputsJT)
@@ -1295,7 +1295,7 @@
 (def: (decorate-inputs typesT inputsA)
   (-> (List (Type Value)) (List Analysis) (List Analysis))
   (|> inputsA
-      (list.zip2 (list@map (|>> ..signature /////analysis.text) typesT))
+      (list.zip/2 (list@map (|>> ..signature /////analysis.text) typesT))
       (list@map (function (_ [type value])
                   (/////analysis.tuple (list type value))))))
 
@@ -1890,7 +1890,7 @@
      _ (phase.assert ..class-parameter-mismatch [expected-parameters actual-parameters]
                      (n.= (list.size expected-parameters)
                           (list.size actual-parameters)))]
-    (wrap (|> (list.zip2 expected-parameters actual-parameters)
+    (wrap (|> (list.zip/2 expected-parameters actual-parameters)
               (list@fold (function (_ [expected actual] mapping)
                            (case (jvm-parser.var? actual)
                              (#.Some actual)
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
index 59241f43d..1e3a18cba 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
@@ -58,7 +58,7 @@
                               (function (_ [argT argC])
                                 (typeA.with-type argT
                                   (analyse archive argC)))
-                              (list.zip2 inputsT+ args))]
+                              (list.zip/2 inputsT+ args))]
             (wrap (#////analysis.Extension extension-name argsA)))
           (////analysis.throw ///.incorrect-arity [extension-name num-expected num-actual]))))))
 
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux
index 935baa3db..7c4d09936 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux
@@ -1023,7 +1023,7 @@
                                      set.to-list)
                global-mapping (|> total-environment
                                   ## Give them names as "foreign" variables.
-                                  list.enumerate
+                                  list.enumeration
                                   (list@map (function (_ [id capture])
                                               [capture (#//////variable.Foreign id)]))
                                   (dictionary.from-list //////variable.hash))
@@ -1033,7 +1033,7 @@
                                                            self-name arguments returnT exceptionsT
                                                            body]])
                                               (let [local-mapping (|> environment
-                                                                      list.enumerate
+                                                                      list.enumeration
                                                                       (list@map (function (_ [foreign-id capture])
                                                                                   [(#//////variable.Foreign foreign-id)
                                                                                    (|> global-mapping
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common-lisp/function.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common-lisp/function.lux
index 22c34fd21..36c082daf 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common-lisp/function.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common-lisp/function.lux
@@ -42,7 +42,7 @@
     _
     (do {@ ////.monad}
       [@closure (:: @ map _.var (///.gensym "closure"))]
-      (wrap (_.labels (list [@closure [(|> (list.enumerate inits)
+      (wrap (_.labels (list [@closure [(|> (list.enumeration inits)
                                            (list@map (|>> product.left ..capture))
                                            _.args)
                                        function-definition]])
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common-lisp/loop.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common-lisp/loop.lux
index 7abad4556..b5de4353e 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common-lisp/loop.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/common-lisp/loop.lux
@@ -28,7 +28,7 @@
      bodyG (///.with-anchor @scope
              (generate bodyS))]
     (wrap (_.labels (list [@scope {#_.input (|> initsS+
-                                                list.enumerate
+                                                list.enumeration
                                                 (list@map (|>> product.left (n.+ start) //case.register))
                                                 _.args)
                                    #_.output bodyG}])
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/function.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/function.lux
index 54595bb75..93b400c37 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/function.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/function.lux
@@ -46,7 +46,7 @@
     (let [capture (: (-> Register Var)
                      (|>> (///reference.foreign //reference.system) :assume))]
       [(_.function! @self
-                    (|> (list.enumerate inits)
+                    (|> (list.enumeration inits)
                         (list@map (|>> product.left capture)))
                     (_.return (_.function @self (list) function-body)))
        (_.apply/* @self inits)])))
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/loop.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/loop.lux
index 8863b30a3..07169e856 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/loop.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/loop.lux
@@ -30,7 +30,7 @@
 (def: (setup initial? offset bindings body)
   (-> Bit Register (List Expression) Statement Statement)
   (|> bindings
-      list.enumerate
+      list.enumeration
       (list@map (function (_ [register value])
                   (let [variable (//case.register (n.+ offset register))]
                     (if initial?
@@ -74,7 +74,7 @@
                (statement expression archive bodyS))
        #let [closure (_.closure
                       (|> initsS+
-                          list.enumerate
+                          list.enumeration
                           (list@map (|>> product.left (n.+ start) //case.register)))
                       (_.with-label (_.label @scope)
                         (_.do-while (_.boolean true)
@@ -92,7 +92,7 @@
               (_.define @temp (_.array argsO+))
               (..setup false offset
                        (|> argsO+
-                           list.enumerate
+                           list.enumeration
                            (list@map (function (_ [idx _])
                                        (_.at (_.i32 (.int idx)) @temp))))
                        (_.continue-at (_.label @scope)))))))
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux
index ee594cde2..05ac70a6a 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux
@@ -88,7 +88,7 @@
   (do {@ macro.monad}
     [ids (monad.seq @ (list.repeat (list.size vars) macro.count))]
     (wrap (list (` (let [(~+ (|> vars
-                                 (list.zip2 ids)
+                                 (list.zip/2 ids)
                                  (list@map (function (_ [id var])
                                              (list (code.local-identifier var)
                                                    (` (_.var (~ (code.text (format "v" (%.nat id)))))))))
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function.lux
index d52d8afbc..99a6c247e 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function.lux
@@ -123,7 +123,7 @@
     (wrap ($_ _.compose
               abstractionG
               (|> inputsG
-                  (list.split-all /arity.maximum)
+                  (list.chunk /arity.maximum)
                   (monad.map _.monad
                              (function (_ batchG)
                                ($_ _.compose
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/apply.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/apply.lux
index 095c07dc2..9e88895f5 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/apply.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/apply.lux
@@ -98,7 +98,7 @@
                                                (monad.seq _.monad))
                                   #let [cases (|> (list@compose (#.Cons [@labelsH @labelsT])
                                                                 (list @default))
-                                                  list.enumerate
+                                                  list.enumeration
                                                   (list@map (function (_ [stage @case])
                                                               (let [current-partials (|> (list.indices stage)
                                                                                          (list@map (///partial.get class))
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/loop.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/loop.lux
index 0f79b6e86..cea8fda10 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/loop.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/loop.lux
@@ -41,7 +41,7 @@
   (do {@ phase.monad}
     [[@begin offset] generation.anchor
      updatesG (|> updatesS
-                  list.enumerate
+                  list.enumeration
                   (list@map (function (_ [index updateS])
                               [(n.+ offset index) updateS]))
                   (monad.map @ (function (_ [register updateS])
@@ -77,7 +77,7 @@
      initsI+ (monad.map @ (translate archive) initsS+)
      iterationG (generation.with-anchor [@begin offset]
                   (translate archive iterationS))
-     #let [initializationG (|> (list.enumerate initsI+)
+     #let [initializationG (|> (list.enumeration initsI+)
                                (list@map (function (_ [index initG])
                                            ($_ _.compose
                                                initG
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/structure.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/structure.lux
index 79eafb572..eb786662c 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/structure.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/structure.lux
@@ -37,7 +37,7 @@
     _
     (do {@ phase.monad}
       [membersI (|> membersS
-                    list.enumerate
+                    list.enumeration
                     (monad.map @ (function (_ [idx member])
                                    (do @
                                      [memberI (generate archive member)]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua/function.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua/function.lux
index 755caf660..0f440080f 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua/function.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua/function.lux
@@ -48,7 +48,7 @@
     (do {@ ///////phase.monad}
       [@closure (:: @ map _.var (/////generation.gensym "closure"))
        #let [directive (_.function @closure
-                         (|> (list.enumerate inits)
+                         (|> (list.enumeration inits)
                              (list@map (|>> product.left ..capture)))
                          ($_ _.then
                              function-definition
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua/loop.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua/loop.lux
index 06d187642..957924e8f 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua/loop.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/lua/loop.lux
@@ -33,7 +33,7 @@
      bodyO (/////generation.with-anchor @loop
              (generate archive bodyS))
      #let [directive (_.function @loop (|> initsS+
-                                           list.enumerate
+                                           list.enumeration
                                            (list@map (|>> product.left (n.+ start) //case.register)))
                        (_.return bodyO))]
      _ (/////generation.execute! directive)
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/loop.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/loop.lux
index 19b3fa46d..15734c737 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/loop.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/php/loop.lux
@@ -34,7 +34,7 @@
                              (_.set @loopL)
                              (_.closure (list (_.reference @loopL))
                                         (|> initsS+
-                                            list.enumerate
+                                            list.enumeration
                                             (list@map (|>> product.left (n.+ start) //case.register [#0])))
                                         (_.return bodyO)))
                          (_.; (_.set @loopG @loopL)))]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python/function.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python/function.lux
index cc3e27165..30f3f38fd 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python/function.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python/function.lux
@@ -48,7 +48,7 @@
     (do {@ ///////phase.monad}
       [@closure (:: @ map _.var (/////generation.gensym "closure"))
        #let [directive (_.def @closure
-                              (|> (list.enumerate inits)
+                              (|> (list.enumeration inits)
                                   (list@map (|>> product.left ..capture)))
                               ($_ _.then
                                   function-definition
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python/loop.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python/loop.lux
index 2edbab5ec..042cbba35 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python/loop.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/python/loop.lux
@@ -33,7 +33,7 @@
      bodyO (/////generation.with-anchor @loop
              (generate archive bodyS))
      #let [directive (_.def @loop (|> initsS+
-                                      list.enumerate
+                                      list.enumeration
                                       (list@map (|>> product.left (n.+ start) //case.register)))
                             (_.return bodyO))]
      _ (/////generation.execute! directive)
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby/function.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby/function.lux
index 08691f6f2..76a25d333 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby/function.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby/function.lux
@@ -45,7 +45,7 @@
     (|> function-definition
         _.return
         (_.lambda #.None
-                  (|> (list.enumerate inits)
+                  (|> (list.enumeration inits)
                       (list@map (|>> product.left ..capture))))
         (_.do "call" inits))))
 
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux
index f5a2f1615..149e67c31 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux
@@ -35,7 +35,7 @@
     (wrap (|> (_.return bodyO)
               (_.lambda (#.Some @loop)
                         (|> initsS+
-                            list.enumerate
+                            list.enumeration
                             (list@map (|>> product.left (n.+ start) //case.register))))
               (_.apply/* initsO+)))))
 
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/function.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/function.lux
index 59311ce15..ba48ab2ec 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/function.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/function.lux
@@ -45,7 +45,7 @@
      _
      (let [@closure (_.var (format function-name "___CLOSURE"))]
        (_.letrec (list [@closure
-                        (_.lambda [(|> (list.enumerate inits)
+                        (_.lambda [(|> (list.enumeration inits)
                                   (list;map (|>> product.left ..capture)))
                               #.None]
                              function-definition)])
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/loop.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/loop.lux
index a8a8447ef..aac83a7dc 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/loop.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/loop.lux
@@ -28,7 +28,7 @@
      bodyO (///.with-anchor @scope
              (generate bodyS))]
     (wrap (_.letrec (list [@scope (_.lambda [(|> initsS+
-                                            list.enumerate
+                                            list.enumeration
                                             (list;map (|>> product.left (n.+ start) //case.register)))
                                         #.None]
                                        bodyO)])
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux
index 34c1edeaf..7c3c3975b 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux
@@ -102,7 +102,7 @@
                           (` (_.define-constant (~ @runtime) [(list) #.None] (~ definition)))
 
                           _
-                          (` (let [(~+ (|> (list.zip2 argsC+ argsLC+)
+                          (` (let [(~+ (|> (list.zip/2 argsC+ argsLC+)
                                            (list;map (function (_ [left right])
                                                        (list left right)))
                                            list;join))]
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis/case.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis/case.lux
index d7225ca48..32db39342 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis/case.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/synthesis/case.lux
@@ -85,7 +85,7 @@
                            (when> [(new> (not end?') [])] [(///@map ..clean-up)])
                            nextC))))
                  thenC
-                 (list.reverse (list.enumerate tuple))))
+                 (list.reverse (list.enumeration tuple))))
     ))
 
 (def: (path archive synthesize pattern bodyA)