1 files changed, 11 insertions, 11 deletions
diff --git a/new-luxc/source/luxc/generator/function.jvm.lux b/new-luxc/source/luxc/generator/function.jvm.lux
index e3582e183..97d3a7c91 100644
--- a/new-luxc/source/luxc/generator/function.jvm.lux
+++ b/new-luxc/source/luxc/generator/function.jvm.lux
@@ -3,7 +3,7 @@
   (lux (control [monad #+ do])
        (data text/format
              (coll [list "list/" Functor<List> Monoid<List>]))
-       [macro])
+       [meta])
   (luxc ["&" base]
         (lang ["la" analysis]
               ["ls" synthesis])
@@ -268,10 +268,10 @@
                     ))))
 
 (def: #export (with-function generate class env arity body)
-  (-> (-> ls;Synthesis (Lux $;Inst))
+  (-> (-> ls;Synthesis (Meta $;Inst))
       Text (List ls;Variable) ls;Arity ls;Synthesis
-      (Lux [$;Def $;Inst]))
-  (do macro;Monad<Lux>
+      (Meta [$;Def $;Inst]))
+  (do meta;Monad<Meta>
     [@begin $i;make-label
      bodyI (&common;with-function class (generate body))
      #let [env-size (list;size env)
@@ -297,11 +297,11 @@
     (wrap [functionD instanceI])))
 
 (def: #export (generate-function generate env arity body)
-  (-> (-> ls;Synthesis (Lux $;Inst))
+  (-> (-> ls;Synthesis (Meta $;Inst))
       (List ls;Variable) ls;Arity ls;Synthesis
-      (Lux $;Inst))
-  (do macro;Monad<Lux>
-    [function-class (:: @ map %code (macro;gensym "function"))
+      (Meta $;Inst))
+  (do meta;Monad<Meta>
+    [function-class (:: @ map %code (meta;gensym "function"))
      [functionD instanceI] (with-function generate function-class env arity body)
      _ (&common;store-class function-class
                             ($d;class #$;V1.6 #$;Public $;finalC
@@ -318,10 +318,10 @@
       (list& pre (segment size post)))))
 
 (def: #export (generate-call generate functionS argsS)
-  (-> (-> ls;Synthesis (Lux $;Inst))
+  (-> (-> ls;Synthesis (Meta $;Inst))
       ls;Synthesis (List ls;Synthesis)
-      (Lux $;Inst))
-  (do macro;Monad<Lux>
+      (Meta $;Inst))
+  (do meta;Monad<Meta>
     [functionI (generate functionS)
      argsI (monad;map @ generate argsS)
      #let [applyI (|> (segment &runtime;num-apply-variants argsI)