3 files changed, 17 insertions, 16 deletions
diff --git a/stdlib/source/library/lux/data/format/binary.lux b/stdlib/source/library/lux/data/format/binary.lux
index c794c5b3d..fa55d392e 100644
--- a/stdlib/source/library/lux/data/format/binary.lux
+++ b/stdlib/source/library/lux/data/format/binary.lux
@@ -219,8 +219,8 @@
   (All (_ a) (-> (Writer a) (Writer (Set a))))
   (|>> set.list (..list value)))
 
-(def: .public name
-  (Writer Name)
+(def: .public symbol
+  (Writer Symbol)
   (..and ..text ..text))
 
 (def: .public type
@@ -252,7 +252,7 @@
             [7 .#UnivQ quantified]
             [8 .#ExQ quantified]
             [9 .#Apply pair]
-            [10 .#Named (..and ..name recur)])
+            [10 .#Named (..and ..symbol recur)])
            ))))))
 
 (def: .public location
@@ -283,7 +283,7 @@
                    [3 .#Rev ..rev]
                    [4 .#Frac ..frac]
                    [5 .#Text ..text]
-                   [6 .#Identifier ..name]
+                   [6 .#Identifier ..symbol]
                    [7 .#Form sequence]
                    [8 .#Variant sequence]
                    [9 .#Tuple sequence])
diff --git a/stdlib/source/library/lux/data/format/tar.lux b/stdlib/source/library/lux/data/format/tar.lux
index 96448c214..fdc3c0022 100644
--- a/stdlib/source/library/lux/data/format/tar.lux
+++ b/stdlib/source/library/lux/data/format/tar.lux
@@ -1,6 +1,6 @@
 (.module:
   [library
-   [lux {"-" Mode Name and}
+   [lux {"-" Mode and}
     [abstract
      [monad {"+" do}]]
     [control
diff --git a/stdlib/source/library/lux/data/format/xml.lux b/stdlib/source/library/lux/data/format/xml.lux
index df6642565..1db81f6d7 100644
--- a/stdlib/source/library/lux/data/format/xml.lux
+++ b/stdlib/source/library/lux/data/format/xml.lux
@@ -11,7 +11,6 @@
       ["<[0]>" text {"+" Parser}]]]
     [data
      ["[0]" product]
-     ["[0]" name ("[1]#[0]" equivalence codec)]
      ["[0]" text {"+" \n} ("[1]#[0]" equivalence monoid)]
      [collection
       ["[0]" list ("[1]#[0]" functor)]
@@ -19,20 +18,22 @@
     [math
      [number
       ["n" nat]
-      ["[0]" int]]]]])
+      ["[0]" int]]]
+    [meta
+     ["[0]" symbol ("[1]#[0]" equivalence codec)]]]])
 
 (type: .public Tag
-  Name)
+  Symbol)
 
 (type: .public Attribute
-  Name)
+  Symbol)
 
 (type: .public Attrs
   (Dictionary Attribute Text))
 
 (def: .public attributes
   Attrs
-  (dictionary.empty name.hash))
+  (dictionary.empty symbol.hash))
 
 (type: .public XML
   (Rec XML
@@ -87,7 +88,7 @@
     (in ($_ text#composite head tail))))
 
 (def: namespaced_symbol^
-  (Parser Name)
+  (Parser Symbol)
   (do <>.monad
     [first_part xml_identifier
      ?second_part (<| <>.maybe (<>.after (<text>.this ..namespace_separator)) xml_identifier)]
@@ -115,7 +116,7 @@
 
 (def: attrs^
   (Parser Attrs)
-  (<| (# <>.monad each (dictionary.of_list name.hash))
+  (<| (# <>.monad each (dictionary.of_list symbol.hash))
       <>.some
       (<>.and (..spaced^ attr_name^))
       (<>.after (<text>.this "="))
@@ -129,9 +130,9 @@
                 (<>.after (<text>.this "/"))
                 (<text>.enclosed ["<" ">"]))]
     (<>.assertion ($_ text#composite "Close tag does not match open tag." \n
-                      "Expected: " (name#encoded expected) \n
-                      "  Actual: " (name#encoded actual) \n)
-                  (name#= expected actual))))
+                      "Expected: " (symbol#encoded expected) \n
+                      "  Actual: " (symbol#encoded actual) \n)
+                  (symbol#= expected actual))))
 
 (def: comment^
   (Parser Text)
@@ -284,7 +285,7 @@
 
       [{#Node reference/tag reference/attrs reference/children}
        {#Node sample/tag sample/attrs sample/children}]
-      (and (name#= reference/tag sample/tag)
+      (and (symbol#= reference/tag sample/tag)
            (# (dictionary.equivalence text.equivalence) = reference/attrs sample/attrs)
            (n.= (list.size reference/children)
                 (list.size sample/children))