2 files changed, 10 insertions, 11 deletions
diff --git a/stdlib/source/lux/control/concurrency/actor.lux b/stdlib/source/lux/control/concurrency/actor.lux
index fb782b169..851a7c790 100644
--- a/stdlib/source/lux/control/concurrency/actor.lux
+++ b/stdlib/source/lux/control/concurrency/actor.lux
@@ -18,13 +18,13 @@
      ["%" format (#+ format)]]
     [collection
      ["." list ("#@." monoid monad fold)]]]
-   ["." macro (#+ with-gensyms monad)
+   [macro
     ["." code]
     [syntax (#+ syntax:)
      ["cs" common
       ["csr" reader]
       ["csw" writer]]]]
-   [meta
+   ["." meta (#+ with-gensyms monad)
     ["." annotation]]
    [type
     abstract]]
@@ -191,8 +191,8 @@
 
    (def: (<resolve> name)
      (-> Name (Meta Name))
-     (do macro.monad
-       [constant (macro.find-def name)]
+     (do meta.monad
+       [constant (meta.find-def name)]
        (case constant
          (#.Left de-aliased)
          (<resolve> de-aliased)
@@ -203,7 +203,7 @@
            (wrap actor-name)
 
            _
-           (macro.fail (format "Definition is not " <desc> "."))))))]
+           (meta.fail (format "Definition is not " <desc> "."))))))]
 
   [with-actor   resolve-actor   #..actor   "an actor"]
   [with-message resolve-message #..message "a message"]
@@ -268,8 +268,8 @@
                     #let [_ (log! "AFTER")]]
                    (wrap output)))))}
   (with-gensyms [g!_ g!init]
-    (do macro.monad
-      [module macro.current-module-name
+    (do meta.monad
+      [module meta.current-module-name
        #let [g!type (code.local-identifier (state-name _name))
              g!behavior (code.local-identifier (behavior-name _name))
              g!actor (code.local-identifier _name)
@@ -358,8 +358,8 @@
                 (let [state' (#.Cons value state)]
                   (promise.resolved (#try.Success [state' state'])))))}
   (with-gensyms [g!_ g!return g!error g!task g!sent? g!resolve]
-    (do macro.monad
-      [current-module macro.current-module-name
+    (do meta.monad
+      [current-module meta.current-module-name
        actor-name (resolve-actor actor-name)
        #let [message-name [current-module (get@ #name signature)]
              g!type (code.identifier (product.both function.identity state-name actor-name))
diff --git a/stdlib/source/lux/control/concurrency/semaphore.lux b/stdlib/source/lux/control/concurrency/semaphore.lux
index 3edcbd332..83e5ad005 100644
--- a/stdlib/source/lux/control/concurrency/semaphore.lux
+++ b/stdlib/source/lux/control/concurrency/semaphore.lux
@@ -16,8 +16,7 @@
      ["." queue (#+ Queue)]]]
    [type
     abstract
-    ["." refinement]]
-   ["." macro]]
+    ["." refinement]]]
   [//
    ["." atom (#+ Atom)]
    ["." promise (#+ Promise Resolver)]])