8 files changed, 24 insertions, 24 deletions
diff --git a/stdlib/source/library/lux/macro/code.lux b/stdlib/source/library/lux/macro/code.lux
index 0ced45d10..4df6d86e0 100644
--- a/stdlib/source/library/lux/macro/code.lux
+++ b/stdlib/source/library/lux/macro/code.lux
@@ -1,6 +1,6 @@
 (.using
  [library
-  [lux {"-" nat int rev symbol}
+  [lux {"-" nat int rev local global symbol}
    [abstract
     [equivalence {"+" Equivalence}]]
    [data
@@ -58,7 +58,7 @@
      (-> Text Code)
      [location.dummy {<tag> ["" name]}])]
 
-  [local_symbol .#Symbol])
+  [local .#Symbol])
 
 (implementation: .public equivalence
   (Equivalence Code)
diff --git a/stdlib/source/library/lux/macro/pattern.lux b/stdlib/source/library/lux/macro/pattern.lux
index 1b237996e..62d829875 100644
--- a/stdlib/source/library/lux/macro/pattern.lux
+++ b/stdlib/source/library/lux/macro/pattern.lux
@@ -57,7 +57,7 @@
   [expected_type]
 
   [wrong_syntax_error]
-  [local_symbol$]
+  [local$]
 
   [list#reversed]
   [untemplated_list]
@@ -146,7 +146,7 @@
 (macro: .public (let tokens)
   (case tokens
     (pattern (list& [_meta {.#Form (list [_ {.#Symbol ["" name]}] pattern)}] body branches))
-    (.let [g!whole (local_symbol$ name)]
+    (.let [g!whole (local$ name)]
       (meta#in (list& g!whole
                       (.` (case (~ g!whole) (~ pattern) (~ body)))
                       branches)))
@@ -157,7 +157,7 @@
 (macro: .public (|> tokens)
   (case tokens
     (pattern (list& [_meta {.#Form (list [_ {.#Symbol ["" name]}] [_ {.#Tuple steps}])}] body branches))
-    (.let [g!name (local_symbol$ name)]
+    (.let [g!name (local$ name)]
       (meta#in (list& g!name
                       (.` (.let [(~ g!name) (.|> (~ g!name) (~+ steps))]
                             (~ body)))
diff --git a/stdlib/source/library/lux/macro/syntax.lux b/stdlib/source/library/lux/macro/syntax.lux
index 8530307be..7f76debb1 100644
--- a/stdlib/source/library/lux/macro/syntax.lux
+++ b/stdlib/source/library/lux/macro/syntax.lux
@@ -48,7 +48,7 @@
   (/export.parser
    ($_ <>.and
        (</>.form ($_ <>.and
-                     </>.local_symbol
+                     </>.local
                      (</>.tuple (<>.some </>.any))))
        </>.any)))
 
diff --git a/stdlib/source/library/lux/macro/syntax/check.lux b/stdlib/source/library/lux/macro/syntax/check.lux
index 00f01aa3f..da0ad9ca1 100644
--- a/stdlib/source/library/lux/macro/syntax/check.lux
+++ b/stdlib/source/library/lux/macro/syntax/check.lux
@@ -38,6 +38,6 @@
 (def: .public parser
   (Parser Check)
   (<| <code>.form
-      (<>.after (<code>.text! ..extension))
+      (<>.after (<code>.this_text ..extension))
       (<>.and <code>.any
               <code>.any)))
diff --git a/stdlib/source/library/lux/macro/syntax/declaration.lux b/stdlib/source/library/lux/macro/syntax/declaration.lux
index d817fa193..f6c92855e 100644
--- a/stdlib/source/library/lux/macro/syntax/declaration.lux
+++ b/stdlib/source/library/lux/macro/syntax/declaration.lux
@@ -28,17 +28,17 @@
 
 (def: .public parser
   (Parser Declaration)
-  (<>.either (<>.and <code>.local_symbol
+  (<>.either (<>.and <code>.local
                      (<>#in (list)))
-             (<code>.form (<>.and <code>.local_symbol
-                                  (<>.some <code>.local_symbol)))))
+             (<code>.form (<>.and <code>.local
+                                  (<>.some <code>.local)))))
 
 (def: .public (format value)
   (-> Declaration Code)
-  (let [g!name (code.local_symbol (the #name value))]
+  (let [g!name (code.local (the #name value))]
     (case (the #arguments value)
       {.#End}
       g!name
       
       arguments
-      (` ((~ g!name) (~+ (list#each code.local_symbol arguments)))))))
+      (` ((~ g!name) (~+ (list#each code.local arguments)))))))
diff --git a/stdlib/source/library/lux/macro/syntax/definition.lux b/stdlib/source/library/lux/macro/syntax/definition.lux
index c6b914bf3..af8e3baf0 100644
--- a/stdlib/source/library/lux/macro/syntax/definition.lux
+++ b/stdlib/source/library/lux/macro/syntax/definition.lux
@@ -53,7 +53,7 @@
 (def: .public (format (open "_[0]"))
   (-> Definition Code)
   (` ((~ (code.text ..extension))
-      (~ (code.local_symbol _#name))
+      (~ (code.local _#name))
       (~ (case _#value
            {.#Left check}
            (//check.format check)
@@ -70,11 +70,11 @@
                 macro.full_expansion
                 (meta.result compiler)
                 <>.lifted)]
-    (<| (<code>.local me_raw)
+    (<| (<code>.locally me_raw)
         <code>.form
-        (<>.after (<code>.text! ..extension))
+        (<>.after (<code>.this_text ..extension))
         ($_ <>.and
-            <code>.local_symbol
+            <code>.local
             (<>.or //check.parser
                    <code>.any)
             <code>.bit
diff --git a/stdlib/source/library/lux/macro/syntax/type/variable.lux b/stdlib/source/library/lux/macro/syntax/type/variable.lux
index 5bb62d302..88dbd1be4 100644
--- a/stdlib/source/library/lux/macro/syntax/type/variable.lux
+++ b/stdlib/source/library/lux/macro/syntax/type/variable.lux
@@ -20,8 +20,8 @@
 
 (def: .public format
   (-> Variable Code)
-  code.local_symbol)
+  code.local)
 
 (def: .public parser
   (Parser Variable)
-  <code>.local_symbol)
+  <code>.local)
diff --git a/stdlib/source/library/lux/macro/template.lux b/stdlib/source/library/lux/macro/template.lux
index d2260f584..778a5fe44 100644
--- a/stdlib/source/library/lux/macro/template.lux
+++ b/stdlib/source/library/lux/macro/template.lux
@@ -34,7 +34,7 @@
 (syntax: .public (amount [parts (<code>.tuple (<>.some <code>.any))])
   (in (list (code.nat (list.size parts)))))
 
-(syntax: .public (with_locals [locals (<code>.tuple (<>.some <code>.local_symbol))
+(syntax: .public (with_locals [locals (<code>.tuple (<>.some <code>.local))
                                body <code>.any])
   (do [! meta.monad]
     [g!locals (|> locals
@@ -42,7 +42,7 @@
                   (monad.all !))]
     (in (list (` (.with_expansions [(~+ (|> (list.zipped/2 locals g!locals)
                                             (list#each (function (_ [name symbol])
-                                                         (list (code.local_symbol name) (as_is symbol))))
+                                                         (list (code.local name) (as_is symbol))))
                                             list#conjoint))]
                    (~ body)))))))
 
@@ -63,7 +63,7 @@
         <code>.text
         (if module_side?
           full_symbol
-          (<>.either <code>.local_symbol
+          (<>.either <code>.local
                      full_symbol))
         (<>#each bit#encoded <code>.bit)
         (<>#each nat#encoded <code>.nat)
@@ -90,7 +90,7 @@
        {.#Right simple}
        (in (list (|> simple (text.interposed "") <simple>)))))]
 
-  [symbol code.local_symbol code.symbol]
+  [symbol code.local code.symbol]
   )
 
 (type: Environment
@@ -145,8 +145,8 @@
 (def: local
   (Parser Local)
   (do <>.monad
-    [[name parameters] (<code>.form (<>.and <code>.local_symbol
-                                            (<>.many <code>.local_symbol)))
+    [[name parameters] (<code>.form (<>.and <code>.local
+                                            (<>.many <code>.local)))
      template (<code>.tuple (<>.some <code>.any))]
     (in [#name name
          #parameters parameters