Re-named "Symbol" to "Identifier".

35 files changed, 92 insertions, 92 deletions

diff --git a/new-luxc/source/luxc/lang/extension/statement.lux b/new-luxc/source/luxc/lang/extension/statement.lux
index 9b7b9da52..7ee6b898d 100644
--- a/new-luxc/source/luxc/lang/extension/statement.lux
+++ b/new-luxc/source/luxc/lang/extension/statement.lux
@@ -54,7 +54,7 @@
 (def: (ensure-valid-alias def-name annotations value)
   (-> Text Code Code (Meta Any))
   (case [annotations value]
-    (^multi [[_ (#.Record pairs)] [_ (#.Symbol _)]]
+    (^multi [[_ (#.Record pairs)] [_ (#.Identifier _)]]
             (|> pairs list.size (n/= +1)))
     (:: macro.Monad<Meta> wrap [])
 
@@ -65,13 +65,13 @@
   (-> Text //.Statement)
   (function (_ inputsC+)
     (case inputsC+
-      (^ (list [_ (#.Symbol ["" def-name])] valueC annotationsC))
+      (^ (list [_ (#.Identifier ["" def-name])] valueC annotationsC))
       (hostL.with-context def-name
         (lang.with-fresh-type-env
           (do macro.Monad<Meta>
             [syntheses //.all-syntheses
              [annotationsI annotationsV] (process-annotations syntheses annotationsC)]
-            (case (macro.get-symbol-ann (ident-for #.alias) annotationsV)
+            (case (macro.get-identifier-ann (ident-for #.alias) annotationsV)
               (#.Some real-def)
               (do @
                 [_ (ensure-valid-alias def-name annotationsV valueC)
@@ -103,7 +103,7 @@
   (-> Text //.Statement)
   (function (_ inputsC+)
     (case inputsC+
-      (^ (list [_ (#.Symbol ["" args])] programC))
+      (^ (list [_ (#.Identifier ["" args])] programC))
       (do macro.Monad<Meta>
         [[_ programA] (<| lang.with-scope
                           (scopeL.with-local [args (type (List Text))])
diff --git a/new-luxc/source/luxc/lang/host/jvm.lux b/new-luxc/source/luxc/lang/host/jvm.lux
index bbfc5e136..7e5abd6d4 100644
--- a/new-luxc/source/luxc/lang/host/jvm.lux
+++ b/new-luxc/source/luxc/lang/host/jvm.lux
@@ -105,17 +105,17 @@
   (translation.Compiler ..Anchor Inst Definition))
 
 ## [Values]
-(syntax: (config: {type s.local-symbol}
-           {none s.local-symbol}
-           {++ s.local-symbol}
-           {options (s.tuple (p.many s.local-symbol))})
-  (let [g!type (code.local-symbol type)
-        g!none (code.local-symbol none)
+(syntax: (config: {type s.local-identifier}
+           {none s.local-identifier}
+           {++ s.local-identifier}
+           {options (s.tuple (p.many s.local-identifier))})
+  (let [g!type (code.local-identifier type)
+        g!none (code.local-identifier none)
         g!tags+ (list/map code.local-tag options)
-        g!_left (code.local-symbol "_left")
-        g!_right (code.local-symbol "_right")
+        g!_left (code.local-identifier "_left")
+        g!_right (code.local-identifier "_right")
         g!options+ (list/map (function (_ option)
-                               (` (def: (~' #export) (~ (code.local-symbol option))
+                               (` (def: (~' #export) (~ (code.local-identifier option))
                                     (~ g!type)
                                     (|> (~ g!none)
                                         (set@ (~ (code.local-tag option)) #1)))))
@@ -131,7 +131,7 @@
                                                   [tag (` #0)])
                                                 g!tags+)))))
 
-                 (` (def: (~' #export) ((~ (code.local-symbol ++)) (~ g!_left) (~ g!_right))
+                 (` (def: (~' #export) ((~ (code.local-identifier ++)) (~ g!_left) (~ g!_right))
                       (-> (~ g!type) (~ g!type) (~ g!type))
                       (~ (code.record (list/map (function (_ tag)
                                                   [tag (` (or (get@ (~ tag) (~ g!_left))
diff --git a/new-luxc/source/luxc/lang/host/jvm/inst.lux b/new-luxc/source/luxc/lang/host/jvm/inst.lux
index 9426fabe3..463861798 100644
--- a/new-luxc/source/luxc/lang/host/jvm/inst.lux
+++ b/new-luxc/source/luxc/lang/host/jvm/inst.lux
@@ -24,9 +24,9 @@
 (import: #long java/lang/Object)
 (import: #long java/lang/String)
 
-(syntax: (declare {codes (p.many s.local-symbol)})
+(syntax: (declare {codes (p.many s.local-identifier)})
   (|> codes
-      (list/map (function (_ code) (` ((~' #static) (~ (code.local-symbol code)) (~' int)))))
+      (list/map (function (_ code) (` ((~' #static) (~ (code.local-identifier code)) (~' int)))))
       wrap))
 
 (`` (import: org/objectweb/asm/Opcodes
@@ -141,8 +141,8 @@
   [string  Text id]
   )
 
-(syntax: (prefix {base s.local-symbol})
-  (wrap (list (code.local-symbol (format "Opcodes::" base)))))
+(syntax: (prefix {base s.local-identifier})
+  (wrap (list (code.local-identifier (format "Opcodes::" base)))))
 
 (def: #export NULL
   Inst
diff --git a/new-luxc/source/luxc/lang/translation.lux b/new-luxc/source/luxc/lang/translation.lux
index 7c1de9883..158158c51 100644
--- a/new-luxc/source/luxc/lang/translation.lux
+++ b/new-luxc/source/luxc/lang/translation.lux
@@ -100,7 +100,7 @@
                     (&.with-type Macro
                       (analyse macroC)))
        [_macroT _macroM _macroV] (case macroA
-                                   [_ (#.Symbol macro-name)]
+                                   [_ (#.Identifier macro-name)]
                                    (macro.find-def macro-name)
 
                                    _
diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/expression.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/expression.jvm.lux
index d3761ff6b..45887cdae 100644
--- a/new-luxc/source/luxc/lang/translation/common-lisp/expression.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/common-lisp/expression.jvm.lux
@@ -57,7 +57,7 @@
     (^ [_ (#.Form (list [_ (#.Int var)]))])
     (referenceT.translate-variable var)
 
-    [_ (#.Symbol definition)]
+    [_ (#.Identifier definition)]
     (referenceT.translate-definition definition)
 
     (^code ("lux call" (~ functionS) (~+ argsS)))
diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/procedure/common.jvm.lux
index 8148bf0c6..ba2e0a8b4 100644
--- a/new-luxc/source/luxc/lang/translation/common-lisp/procedure/common.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/common-lisp/procedure/common.jvm.lux
@@ -61,11 +61,11 @@
           "Expected: " (|> expected .int %i) "\n"
           "  Actual: " (|> actual .int %i)))
 
-(syntax: (arity: {name s.local-symbol} {arity s.nat})
+(syntax: (arity: {name s.local-identifier} {arity s.nat})
   (with-gensyms [g!_ g!proc g!name g!translate g!inputs]
     (do @
       [g!input+ (monad.seq @ (list.repeat arity (macro.gensym "input")))]
-      (wrap (list (` (def: #export ((~ (code.local-symbol name)) (~ g!proc))
+      (wrap (list (` (def: #export ((~ (code.local-identifier name)) (~ g!proc))
                        (-> (-> (..Vector (~ (code.nat arity)) Expression) Expression)
                            (-> Text ..Proc))
                        (function ((~ g!_) (~ g!name))
diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux
index fe0a620d9..3750bc674 100644
--- a/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux
@@ -55,19 +55,19 @@
 
 (def: declaration
   (s.Syntax [Text (List Text)])
-  (p.either (p.seq s.local-symbol (p/wrap (list)))
-            (s.form (p.seq s.local-symbol (p.some s.local-symbol)))))
+  (p.either (p.seq s.local-identifier (p/wrap (list)))
+            (s.form (p.seq s.local-identifier (p.some s.local-identifier)))))
 
 (syntax: (runtime: {[name args] declaration}
            definition)
-  (let [implementation (code.local-symbol (format "@@" name))
+  (let [implementation (code.local-identifier (format "@@" name))
         runtime (format prefix "__" (lang.normalize-name name))
         $runtime (` (_.var (~ (code.text runtime))))
         @runtime (` (@@ (~ $runtime)))
-        argsC+ (list/map code.local-symbol args)
+        argsC+ (list/map code.local-identifier args)
         argsLC+ (list/map (|>> lang.normalize-name (format "LRV__") code.text (~) (_.var) (`))
                           args)
-        declaration (` ((~ (code.local-symbol name))
+        declaration (` ((~ (code.local-identifier name))
                         (~+ argsC+)))
         type (` (-> (~+ (list.repeat (list.size argsC+) (` _.Expression)))
                     _.Expression))]
@@ -93,11 +93,11 @@
                                (_.defun (~ $runtime) (list (~+ argsLC+))
                                         (~ definition))))))))))))
 
-(syntax: #export (with-vars {vars (s.tuple (p.many s.local-symbol))}
+(syntax: #export (with-vars {vars (s.tuple (p.many s.local-identifier))}
                    body)
   (wrap (list (` (let [(~+ (|> vars
                                (list/map (function (_ var)
-                                           (list (code.local-symbol var)
+                                           (list (code.local-identifier var)
                                                  (` (_.var (~ (code.text (format "LRV__" (lang.normalize-name var)))))))))
                                list/join))]
                    (~ body))))))
@@ -320,7 +320,7 @@
         (_.progn (list (_.setq! process//incoming (_.list (list)))
                        (_.map/3 _.nil
                                 (_.lambda (_.poly (list process))
-                                     (_.funcall (list ..unit) (@@ process)))
+                                          (_.funcall (list ..unit) (@@ process)))
                                 (@@ queue))
                        (process//loop ..unit)))))
     ..unit))
diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/statement.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/statement.jvm.lux
index 549142f3f..74bf3d118 100644
--- a/new-luxc/source/luxc/lang/translation/common-lisp/statement.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/common-lisp/statement.jvm.lux
@@ -15,7 +15,7 @@
   (do macro.Monad<Meta>
     [current-module macro.current-module-name
      #let [def-ident [current-module name]]]
-    (case (macro.get-symbol-ann (ident-for #.alias) metaV)
+    (case (macro.get-identifier-ann (ident-for #.alias) metaV)
       (#.Some real-def)
       (do @
         [[realT realA realV] (macro.find-def real-def)
diff --git a/new-luxc/source/luxc/lang/translation/js/expression.jvm.lux b/new-luxc/source/luxc/lang/translation/js/expression.jvm.lux
index 544dd1eca..0adc4255c 100644
--- a/new-luxc/source/luxc/lang/translation/js/expression.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/js/expression.jvm.lux
@@ -58,7 +58,7 @@
     (^ [_ (#.Form (list [_ (#.Int var)]))])
     (referenceT.translate-variable var)
 
-    [_ (#.Symbol definition)]
+    [_ (#.Identifier definition)]
     (referenceT.translate-definition definition)
 
     (^code ("lux let" (~ [_ (#.Nat register)]) (~ inputS) (~ exprS)))
diff --git a/new-luxc/source/luxc/lang/translation/js/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/js/procedure/common.jvm.lux
index a2b30390d..4c3b0afe8 100644
--- a/new-luxc/source/luxc/lang/translation/js/procedure/common.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/js/procedure/common.jvm.lux
@@ -60,11 +60,11 @@
           "Expected: " (|> expected .int %i) "\n"
           "  Actual: " (|> actual .int %i)))
 
-(syntax: (arity: {name s.local-symbol} {arity s.nat})
+(syntax: (arity: {name s.local-identifier} {arity s.nat})
   (with-gensyms [g!_ g!proc g!name g!translate g!inputs]
     (do @
       [g!input+ (monad.seq @ (list.repeat arity (macro.gensym "input")))]
-      (wrap (list (` (def: #export ((~ (code.local-symbol name)) (~ g!proc))
+      (wrap (list (` (def: #export ((~ (code.local-identifier name)) (~ g!proc))
                        (-> (-> (..Vector (~ (code.nat arity)) Expression) Expression)
                            (-> Text ..Proc))
                        (function ((~ g!_) (~ g!name))
diff --git a/new-luxc/source/luxc/lang/translation/js/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/js/runtime.jvm.lux
index fca27344e..c5d85eb0d 100644
--- a/new-luxc/source/luxc/lang/translation/js/runtime.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/js/runtime.jvm.lux
@@ -55,8 +55,8 @@
   (-> Text (-> Text Expression) Statement)
   (format "var " name " = " (definition name) ";\n"))
 
-(syntax: (runtime-implementation-name {runtime-name s.local-symbol})
-  (wrap (list (code.local-symbol (format "__" runtime-name)))))
+(syntax: (runtime-implementation-name {runtime-name s.local-identifier})
+  (wrap (list (code.local-identifier (format "__" runtime-name)))))
 
 (template: (runtime: <lux-name> <js-name> <js-definition>)
   (def: #export <lux-name> Text (runtime-name <js-name>))
diff --git a/new-luxc/source/luxc/lang/translation/js/statement.jvm.lux b/new-luxc/source/luxc/lang/translation/js/statement.jvm.lux
index 317193691..fddc8e045 100644
--- a/new-luxc/source/luxc/lang/translation/js/statement.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/js/statement.jvm.lux
@@ -15,7 +15,7 @@
   (do macro.Monad<Meta>
     [current-module macro.current-module-name
      #let [def-ident [current-module name]]]
-    (case (macro.get-symbol-ann (ident-for #.alias) metaV)
+    (case (macro.get-identifier-ann (ident-for #.alias) metaV)
       (#.Some real-def)
       (do @
         [[realT realA realV] (macro.find-def real-def)
diff --git a/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux
index 0bf625624..6447ec20a 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux
@@ -75,11 +75,11 @@
           "Expected: " (|> expected .int %i) "\n"
           "  Actual: " (|> actual .int %i)))
 
-(syntax: (arity: {name s.local-symbol} {arity s.nat})
+(syntax: (arity: {name s.local-identifier} {arity s.nat})
   (with-gensyms [g!_ g!proc g!name g!translate g!inputs]
     (do @
       [g!input+ (monad.seq @ (list.repeat arity (macro.gensym "input")))]
-      (wrap (list (` (def: #export ((~ (code.local-symbol name)) (~ g!proc))
+      (wrap (list (` (def: #export ((~ (code.local-identifier name)) (~ g!proc))
                        (-> (-> (..Vector (~ (code.nat arity)) $.Inst) $.Inst)
                            (-> Text ..Proc))
                        (function ((~ g!_) (~ g!name))
diff --git a/new-luxc/source/luxc/lang/translation/jvm/statement.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/statement.jvm.lux
index 81b60e1ce..3ed9a8ebc 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/statement.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/statement.jvm.lux
@@ -41,7 +41,7 @@
   (do macro.Monad<Meta>
     [current-module macro.current-module-name
      #let [def-ident [current-module def-name]]]
-    (case (macro.get-symbol-ann (ident-for #.alias) metaV)
+    (case (macro.get-identifier-ann (ident-for #.alias) metaV)
       (#.Some real-def)
       (do @
         [[realT realA realV] (macro.find-def real-def)
diff --git a/new-luxc/source/luxc/lang/translation/lua/expression.jvm.lux b/new-luxc/source/luxc/lang/translation/lua/expression.jvm.lux
index 0fefcc8ba..5d6b073fc 100644
--- a/new-luxc/source/luxc/lang/translation/lua/expression.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/lua/expression.jvm.lux
@@ -58,7 +58,7 @@
     (^ [_ (#.Form (list [_ (#.Int var)]))])
     (referenceT.translate-variable var)
 
-    [_ (#.Symbol definition)]
+    [_ (#.Identifier definition)]
     (referenceT.translate-definition definition)
 
     (^code ("lux let" (~ [_ (#.Nat register)]) (~ inputS) (~ exprS)))
diff --git a/new-luxc/source/luxc/lang/translation/lua/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/lua/procedure/common.jvm.lux
index c750bbaf4..cfbe7f0ac 100644
--- a/new-luxc/source/luxc/lang/translation/lua/procedure/common.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/lua/procedure/common.jvm.lux
@@ -60,11 +60,11 @@
           "Expected: " (|> expected .int %i) "\n"
           "  Actual: " (|> actual .int %i)))
 
-(syntax: (arity: {name s.local-symbol} {arity s.nat})
+(syntax: (arity: {name s.local-identifier} {arity s.nat})
   (with-gensyms [g_ g!proc g!name g!translate g!inputs]
     (do @
       [g!input+ (monad.seq @ (list.repeat arity (macro.gensym "input")))]
-      (wrap (list (` (def: #export ((~ (code.local-symbol name)) (~ g!proc))
+      (wrap (list (` (def: #export ((~ (code.local-identifier name)) (~ g!proc))
                        (-> (-> (..Vector (~ (code.nat arity)) Expression) Expression)
                            (-> Text ..Proc))
                        (function ((~ g_ ) (~ g!name))
diff --git a/new-luxc/source/luxc/lang/translation/lua/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/lua/runtime.jvm.lux
index 7c45f0786..8121b2c9d 100644
--- a/new-luxc/source/luxc/lang/translation/lua/runtime.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/lua/runtime.jvm.lux
@@ -52,16 +52,16 @@
 
 (def: declaration
   (s.Syntax [Text (List Text)])
-  (p.either (p.seq s.local-symbol (p/wrap (list)))
-            (s.form (p.seq s.local-symbol (p.some s.local-symbol)))))
+  (p.either (p.seq s.local-identifier (p/wrap (list)))
+            (s.form (p.seq s.local-identifier (p.some s.local-identifier)))))
 
 (syntax: (runtime: {[name args] declaration}
            definition)
-  (let [implementation (code.local-symbol (format "@@" name))
+  (let [implementation (code.local-identifier (format "@@" name))
         runtime (code.text (format "__" prefix "__" (lang.normalize-name name)))
-        argsC+ (list/map code.local-symbol args)
+        argsC+ (list/map code.local-identifier args)
         argsLC+ (list/map (|>> lang.normalize-name code.text) args)
-        declaration (` ((~ (code.local-symbol name))
+        declaration (` ((~ (code.local-identifier name))
                         (~+ argsC+)))
         type (` (-> (~+ (list.repeat (list.size argsC+) (` lua.Lua)))
                     lua.Lua))]
diff --git a/new-luxc/source/luxc/lang/translation/lua/statement.jvm.lux b/new-luxc/source/luxc/lang/translation/lua/statement.jvm.lux
index 8ff9c1ccd..4fb814f6c 100644
--- a/new-luxc/source/luxc/lang/translation/lua/statement.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/lua/statement.jvm.lux
@@ -15,7 +15,7 @@
   (do macro.Monad<Meta>
     [current-module macro.current-module-name
      #let [def-ident [current-module name]]]
-    (case (macro.get-symbol-ann (ident-for #.alias) metaV)
+    (case (macro.get-identifier-ann (ident-for #.alias) metaV)
       (#.Some real-def)
       (do @
         [[realT realA realV] (macro.find-def real-def)
diff --git a/new-luxc/source/luxc/lang/translation/php/expression.jvm.lux b/new-luxc/source/luxc/lang/translation/php/expression.jvm.lux
index b7f9661e7..3d7d652bf 100644
--- a/new-luxc/source/luxc/lang/translation/php/expression.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/php/expression.jvm.lux
@@ -50,7 +50,7 @@
     (^ [_ (#.Form (list [_ (#.Int var)]))])
     (referenceT.translate-variable var)
 
-    [_ (#.Symbol definition)]
+    [_ (#.Identifier definition)]
     (referenceT.translate-definition definition)
 
     (^code ("lux let" (~ [_ (#.Nat register)]) (~ inputS) (~ exprS)))
diff --git a/new-luxc/source/luxc/lang/translation/php/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/php/procedure/common.jvm.lux
index eea8682d3..9638ec9bf 100644
--- a/new-luxc/source/luxc/lang/translation/php/procedure/common.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/php/procedure/common.jvm.lux
@@ -61,11 +61,11 @@
           "Expected: " (|> expected .int %i) "\n"
           "  Actual: " (|> actual .int %i)))
 
-(syntax: (arity: {name s.local-symbol} {arity s.nat})
+(syntax: (arity: {name s.local-identifier} {arity s.nat})
   (with-gensyms [g!_ g!proc g!name g!translate g!inputs]
     (do @
       [g!input+ (monad.seq @ (list.repeat arity (macro.gensym "input")))]
-      (wrap (list (` (def: #export ((~ (code.local-symbol name)) (~ g!proc))
+      (wrap (list (` (def: #export ((~ (code.local-identifier name)) (~ g!proc))
                        (-> (-> (..Vector (~ (code.nat arity)) Expression) Expression)
                            (-> Text ..Proc))
                        (function ((~ g!_) (~ g!name))
diff --git a/new-luxc/source/luxc/lang/translation/php/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/php/runtime.jvm.lux
index 7feb0033c..ac04df255 100644
--- a/new-luxc/source/luxc/lang/translation/php/runtime.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/php/runtime.jvm.lux
@@ -54,18 +54,18 @@
 
 (def: declaration
   (s.Syntax [Text (List Text)])
-  (p.either (p.seq s.local-symbol (p/wrap (list)))
-            (s.form (p.seq s.local-symbol (p.some s.local-symbol)))))
+  (p.either (p.seq s.local-identifier (p/wrap (list)))
+            (s.form (p.seq s.local-identifier (p.some s.local-identifier)))))
 
 (syntax: (runtime: {[name args] declaration}
            definition)
-  (let [implementation (code.local-symbol (format "@@" name))
+  (let [implementation (code.local-identifier (format "@@" name))
         runtime (format "__" prefix "__" (lang.normalize-name name))
         @runtime (` (_.global (~ (code.text runtime))))
-        argsC+ (list/map code.local-symbol args)
+        argsC+ (list/map code.local-identifier args)
         argsLC+ (list/map (|>> lang.normalize-name code.text (~) (_.var) (`))
                           args)
-        declaration (` ((~ (code.local-symbol name))
+        declaration (` ((~ (code.local-identifier name))
                         (~+ argsC+)))
         type (` (-> (~+ (list.repeat (list.size argsC+) (` _.Expression)))
                     _.Computation))]
@@ -87,11 +87,11 @@
                                             ((~! list/map) _.parameter (list (~+ argsLC+)))
                                             (~ definition))))))))))))
 
-(syntax: (with-vars {vars (s.tuple (p.many s.local-symbol))}
+(syntax: (with-vars {vars (s.tuple (p.many s.local-identifier))}
            body)
   (wrap (list (` (let [(~+ (|> vars
                                (list/map (function (_ var)
-                                           (list (code.local-symbol var)
+                                           (list (code.local-identifier var)
                                                  (` (_.var (~ (code.text (lang.normalize-name var))))))))
                                list/join))]
                    (~ body))))))
diff --git a/new-luxc/source/luxc/lang/translation/php/statement.jvm.lux b/new-luxc/source/luxc/lang/translation/php/statement.jvm.lux
index 70a39a575..d4b4a03a8 100644
--- a/new-luxc/source/luxc/lang/translation/php/statement.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/php/statement.jvm.lux
@@ -15,7 +15,7 @@
   (do macro.Monad<Meta>
     [current-module macro.current-module-name
      #let [def-ident [current-module name]]]
-    (case (macro.get-symbol-ann (ident-for #.alias) metaV)
+    (case (macro.get-identifier-ann (ident-for #.alias) metaV)
       (#.Some real-def)
       (do @
         [[realT realA realV] (macro.find-def real-def)
diff --git a/new-luxc/source/luxc/lang/translation/python/expression.jvm.lux b/new-luxc/source/luxc/lang/translation/python/expression.jvm.lux
index 62be95f27..0bbfb2f2c 100644
--- a/new-luxc/source/luxc/lang/translation/python/expression.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/python/expression.jvm.lux
@@ -57,7 +57,7 @@
     (^ [_ (#.Form (list [_ (#.Int var)]))])
     (referenceT.translate-variable var)
 
-    [_ (#.Symbol definition)]
+    [_ (#.Identifier definition)]
     (referenceT.translate-definition definition)
 
     (^code ("lux let" (~ [_ (#.Nat register)]) (~ inputS) (~ exprS)))
diff --git a/new-luxc/source/luxc/lang/translation/python/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/python/procedure/common.jvm.lux
index 2dece65c5..f7cdf044a 100644
--- a/new-luxc/source/luxc/lang/translation/python/procedure/common.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/python/procedure/common.jvm.lux
@@ -61,11 +61,11 @@
           "Expected: " (|> expected .int %i) "\n"
           "  Actual: " (|> actual .int %i)))
 
-(syntax: (arity: {name s.local-symbol} {arity s.nat})
+(syntax: (arity: {name s.local-identifier} {arity s.nat})
   (with-gensyms [g!_ g!proc g!name g!translate g!inputs]
     (do @
       [g!input+ (monad.seq @ (list.repeat arity (macro.gensym "input")))]
-      (wrap (list (` (def: #export ((~ (code.local-symbol name)) (~ g!proc))
+      (wrap (list (` (def: #export ((~ (code.local-identifier name)) (~ g!proc))
                        (-> (-> (..Vector (~ (code.nat arity)) Expression) Expression)
                            (-> Text ..Proc))
                        (function ((~ g!_) (~ g!name))
diff --git a/new-luxc/source/luxc/lang/translation/python/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/python/runtime.jvm.lux
index 68af2d630..275eea636 100644
--- a/new-luxc/source/luxc/lang/translation/python/runtime.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/python/runtime.jvm.lux
@@ -54,19 +54,19 @@
 
 (def: declaration
   (s.Syntax [Text (List Text)])
-  (p.either (p.seq s.local-symbol (p/wrap (list)))
-            (s.form (p.seq s.local-symbol (p.some s.local-symbol)))))
+  (p.either (p.seq s.local-identifier (p/wrap (list)))
+            (s.form (p.seq s.local-identifier (p.some s.local-identifier)))))
 
 (syntax: (runtime: {[name args] declaration}
            definition)
-  (let [implementation (code.local-symbol (format "@@" name))
+  (let [implementation (code.local-identifier (format "@@" name))
         runtime (format "__" prefix "__" (lang.normalize-name name))
         $runtime (` (python.var (~ (code.text runtime))))
         @runtime (` (@@ (~ $runtime)))
-        argsC+ (list/map code.local-symbol args)
+        argsC+ (list/map code.local-identifier args)
         argsLC+ (list/map (|>> lang.normalize-name code.text (~) (python.var) (`))
                           args)
-        declaration (` ((~ (code.local-symbol name))
+        declaration (` ((~ (code.local-identifier name))
                         (~+ argsC+)))
         type (` (-> (~+ (list.repeat (list.size argsC+) (` python.Expression)))
                     python.Expression))]
@@ -88,11 +88,11 @@
                                             (list (~+ argsLC+))
                                             (~ definition))))))))))))
 
-(syntax: (with-vars {vars (s.tuple (p.many s.local-symbol))}
+(syntax: (with-vars {vars (s.tuple (p.many s.local-identifier))}
            body)
   (wrap (list (` (let [(~+ (|> vars
                                (list/map (function (_ var)
-                                           (list (code.local-symbol var)
+                                           (list (code.local-identifier var)
                                                  (` (python.var (~ (code.text (lang.normalize-name var))))))))
                                list/join))]
                    (~ body))))))
diff --git a/new-luxc/source/luxc/lang/translation/python/statement.jvm.lux b/new-luxc/source/luxc/lang/translation/python/statement.jvm.lux
index c241afa8a..0d8321470 100644
--- a/new-luxc/source/luxc/lang/translation/python/statement.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/python/statement.jvm.lux
@@ -15,7 +15,7 @@
   (do macro.Monad<Meta>
     [current-module macro.current-module-name
      #let [def-ident [current-module name]]]
-    (case (macro.get-symbol-ann (ident-for #.alias) metaV)
+    (case (macro.get-identifier-ann (ident-for #.alias) metaV)
       (#.Some real-def)
       (do @
         [[realT realA realV] (macro.find-def real-def)
diff --git a/new-luxc/source/luxc/lang/translation/r/expression.jvm.lux b/new-luxc/source/luxc/lang/translation/r/expression.jvm.lux
index 2e30b4999..d838bc332 100644
--- a/new-luxc/source/luxc/lang/translation/r/expression.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/r/expression.jvm.lux
@@ -58,7 +58,7 @@
     (^ [_ (#.Form (list [_ (#.Int var)]))])
     (referenceT.translate-variable var)
 
-    [_ (#.Symbol definition)]
+    [_ (#.Identifier definition)]
     (referenceT.translate-definition definition)
 
     (^code ("lux let" (~ [_ (#.Nat register)]) (~ inputS) (~ exprS)))
diff --git a/new-luxc/source/luxc/lang/translation/r/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/r/procedure/common.jvm.lux
index 00f04e49f..eab139f33 100644
--- a/new-luxc/source/luxc/lang/translation/r/procedure/common.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/r/procedure/common.jvm.lux
@@ -61,11 +61,11 @@
           "Expected: " (|> expected .int %i) "\n"
           "  Actual: " (|> actual .int %i)))
 
-(syntax: (arity: {name s.local-symbol} {arity s.nat})
+(syntax: (arity: {name s.local-identifier} {arity s.nat})
   (with-gensyms [g!_ g!proc g!name g!translate g!inputs]
     (do @
       [g!input+ (monad.seq @ (list.repeat arity (macro.gensym "input")))]
-      (wrap (list (` (def: #export ((~ (code.local-symbol name)) (~ g!proc))
+      (wrap (list (` (def: #export ((~ (code.local-identifier name)) (~ g!proc))
                        (-> (-> (..Vector (~ (code.nat arity)) Expression) Expression)
                            (-> Text ..Proc))
                        (function ((~ g!_) (~ g!name))
diff --git a/new-luxc/source/luxc/lang/translation/r/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/r/runtime.jvm.lux
index 3ea37ae85..fd4adfb1a 100644
--- a/new-luxc/source/luxc/lang/translation/r/runtime.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/r/runtime.jvm.lux
@@ -82,19 +82,19 @@
 
 (def: declaration
   (s.Syntax [Text (List Text)])
-  (p.either (p.seq s.local-symbol (p/wrap (list)))
-            (s.form (p.seq s.local-symbol (p.some s.local-symbol)))))
+  (p.either (p.seq s.local-identifier (p/wrap (list)))
+            (s.form (p.seq s.local-identifier (p.some s.local-identifier)))))
 
 (syntax: (runtime: {[name args] declaration}
            definition)
-  (let [implementation (code.local-symbol (format "@@" name))
+  (let [implementation (code.local-identifier (format "@@" name))
         runtime (format prefix "__" (lang.normalize-name name))
         $runtime (` (r.var (~ (code.text runtime))))
         @runtime (` (@@ (~ $runtime)))
-        argsC+ (list/map code.local-symbol args)
+        argsC+ (list/map code.local-identifier args)
         argsLC+ (list/map (|>> lang.normalize-name (format "LRV__") code.text (~) (r.var) (`))
                           args)
-        declaration (` ((~ (code.local-symbol name))
+        declaration (` ((~ (code.local-identifier name))
                         (~+ argsC+)))
         type (` (-> (~+ (list.repeat (list.size argsC+) (` r.Expression)))
                     r.Expression))]
@@ -121,11 +121,11 @@
                                        (r.function (list (~+ argsLC+))
                                          (~ definition)))))))))))))
 
-(syntax: #export (with-vars {vars (s.tuple (p.many s.local-symbol))}
+(syntax: #export (with-vars {vars (s.tuple (p.many s.local-identifier))}
                    body)
   (wrap (list (` (let [(~+ (|> vars
                                (list/map (function (_ var)
-                                           (list (code.local-symbol var)
+                                           (list (code.local-identifier var)
                                                  (` (r.var (~ (code.text (format "LRV__" (lang.normalize-name var)))))))))
                                list/join))]
                    (~ body))))))
diff --git a/new-luxc/source/luxc/lang/translation/r/statement.jvm.lux b/new-luxc/source/luxc/lang/translation/r/statement.jvm.lux
index e09410f40..a5515efdc 100644
--- a/new-luxc/source/luxc/lang/translation/r/statement.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/r/statement.jvm.lux
@@ -15,7 +15,7 @@
   (do macro.Monad<Meta>
     [current-module macro.current-module-name
      #let [def-ident [current-module name]]]
-    (case (macro.get-symbol-ann (ident-for #.alias) metaV)
+    (case (macro.get-identifier-ann (ident-for #.alias) metaV)
       (#.Some real-def)
       (do @
         [[realT realA realV] (macro.find-def real-def)
diff --git a/new-luxc/source/luxc/lang/translation/ruby/expression.jvm.lux b/new-luxc/source/luxc/lang/translation/ruby/expression.jvm.lux
index e68cf8a8f..6023f3a82 100644
--- a/new-luxc/source/luxc/lang/translation/ruby/expression.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/ruby/expression.jvm.lux
@@ -55,7 +55,7 @@
     (^ [_ (#.Form (list [_ (#.Int var)]))])
     (referenceT.translate-variable var)
 
-    [_ (#.Symbol definition)]
+    [_ (#.Identifier definition)]
     (referenceT.translate-definition definition)
 
     (^code ("lux let" (~ [_ (#.Nat register)]) (~ inputS) (~ exprS)))
diff --git a/new-luxc/source/luxc/lang/translation/ruby/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/ruby/procedure/common.jvm.lux
index 7100cf9a4..bed68a0a0 100644
--- a/new-luxc/source/luxc/lang/translation/ruby/procedure/common.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/ruby/procedure/common.jvm.lux
@@ -60,11 +60,11 @@
           "Expected: " (|> expected .int %i) "\n"
           "  Actual: " (|> actual .int %i)))
 
-(syntax: (arity: {name s.local-symbol} {arity s.nat})
+(syntax: (arity: {name s.local-identifier} {arity s.nat})
   (with-gensyms [g!_ g!proc g!name g!translate g!inputs]
     (do @
       [g!input+ (monad.seq @ (list.repeat arity (macro.gensym "input")))]
-      (wrap (list (` (def: #export ((~ (code.local-symbol name)) (~ g!proc))
+      (wrap (list (` (def: #export ((~ (code.local-identifier name)) (~ g!proc))
                        (-> (-> (..Vector (~ (code.nat arity)) Expression) Expression)
                            (-> Text ..Proc))
                        (function ((~ g!_) (~ g!name))
diff --git a/new-luxc/source/luxc/lang/translation/ruby/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/ruby/runtime.jvm.lux
index 4ab5417a1..49f5d9d79 100644
--- a/new-luxc/source/luxc/lang/translation/ruby/runtime.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/ruby/runtime.jvm.lux
@@ -52,16 +52,16 @@
 
 (def: declaration
   (s.Syntax [Text (List Text)])
-  (p.either (p.seq s.local-symbol (p/wrap (list)))
-            (s.form (p.seq s.local-symbol (p.some s.local-symbol)))))
+  (p.either (p.seq s.local-identifier (p/wrap (list)))
+            (s.form (p.seq s.local-identifier (p.some s.local-identifier)))))
 
 (syntax: (runtime: {[name args] declaration}
            definition)
-  (let [implementation (code.local-symbol (format "@@" name))
+  (let [implementation (code.local-identifier (format "@@" name))
         runtime (code.text (format "__" prefix "__" (lang.normalize-name name)))
-        argsC+ (list/map code.local-symbol args)
+        argsC+ (list/map code.local-identifier args)
         argsLC+ (list/map (|>> lang.normalize-name code.text) args)
-        declaration (` ((~ (code.local-symbol name))
+        declaration (` ((~ (code.local-identifier name))
                         (~+ argsC+)))
         type (` (-> (~+ (list.repeat (list.size argsC+) (` ruby.Ruby)))
                     ruby.Ruby))]
diff --git a/new-luxc/source/luxc/lang/translation/ruby/statement.jvm.lux b/new-luxc/source/luxc/lang/translation/ruby/statement.jvm.lux
index 83792921d..a1b2a9e6f 100644
--- a/new-luxc/source/luxc/lang/translation/ruby/statement.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/ruby/statement.jvm.lux
@@ -15,7 +15,7 @@
   (do macro.Monad<Meta>
     [current-module macro.current-module-name
      #let [def-ident [current-module name]]]
-    (case (macro.get-symbol-ann (ident-for #.alias) metaV)
+    (case (macro.get-identifier-ann (ident-for #.alias) metaV)
       (#.Some real-def)
       (do @
         [[realT realA realV] (macro.find-def real-def)
diff --git a/new-luxc/source/luxc/lang/translation/scheme/statement.jvm.lux b/new-luxc/source/luxc/lang/translation/scheme/statement.jvm.lux
index aa1411c18..8c5bdc797 100644
--- a/new-luxc/source/luxc/lang/translation/scheme/statement.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/scheme/statement.jvm.lux
@@ -15,7 +15,7 @@
   (do macro.Monad<Meta>
     [current-module macro.current-module-name
      #let [def-ident [current-module name]]]
-    (case (macro.get-symbol-ann (ident-for #.alias) metaV)
+    (case (macro.get-identifier-ann (ident-for #.alias) metaV)
       (#.Some real-def)
       (do @
         [[realT realA realV] (macro.find-def real-def)