1 files changed, 26 insertions, 26 deletions

diff --git a/src/WixToolset.Data/Tuples/RegLocatorTuple.cs b/src/WixToolset.Data/Tuples/RegLocatorTuple.cs
index 8f358051..bf50dab7 100644
--- a/src/WixToolset.Data/Tuples/RegLocatorTuple.cs
+++ b/src/WixToolset.Data/Tuples/RegLocatorTuple.cs
@@ -2,27 +2,27 @@
 
 namespace WixToolset.Data
 {
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
 
-    public static partial class TupleDefinitions
+    public static partial class SymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition RegLocator = new IntermediateTupleDefinition(
-            TupleDefinitionType.RegLocator,
+        public static readonly IntermediateSymbolDefinition RegLocator = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.RegLocator,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(RegLocatorTupleFields.Root), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(RegLocatorTupleFields.Key), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(RegLocatorTupleFields.Name), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(RegLocatorTupleFields.Type), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(RegLocatorTupleFields.Win64), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(RegLocatorSymbolFields.Root), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(RegLocatorSymbolFields.Key), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RegLocatorSymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RegLocatorSymbolFields.Type), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(RegLocatorSymbolFields.Win64), IntermediateFieldType.Bool),
             },
-            typeof(RegLocatorTuple));
+            typeof(RegLocatorSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum RegLocatorTupleFields
+    public enum RegLocatorSymbolFields
     {
         Root,
         Key,
@@ -38,46 +38,46 @@ namespace WixToolset.Data.Tuples
         Raw
     };
 
-    public class RegLocatorTuple : IntermediateTuple
+    public class RegLocatorSymbol : IntermediateSymbol
     {
-        public RegLocatorTuple() : base(TupleDefinitions.RegLocator, null, null)
+        public RegLocatorSymbol() : base(SymbolDefinitions.RegLocator, null, null)
         {
         }
 
-        public RegLocatorTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.RegLocator, sourceLineNumber, id)
+        public RegLocatorSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.RegLocator, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[RegLocatorTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[RegLocatorSymbolFields index] => this.Fields[(int)index];
 
         public RegistryRootType Root
         {
-            get => (RegistryRootType)this.Fields[(int)RegLocatorTupleFields.Root].AsNumber();
-            set => this.Set((int)RegLocatorTupleFields.Root, (int)value);
+            get => (RegistryRootType)this.Fields[(int)RegLocatorSymbolFields.Root].AsNumber();
+            set => this.Set((int)RegLocatorSymbolFields.Root, (int)value);
         }
 
         public string Key
         {
-            get => (string)this.Fields[(int)RegLocatorTupleFields.Key];
-            set => this.Set((int)RegLocatorTupleFields.Key, value);
+            get => (string)this.Fields[(int)RegLocatorSymbolFields.Key];
+            set => this.Set((int)RegLocatorSymbolFields.Key, value);
         }
 
         public string Name
         {
-            get => (string)this.Fields[(int)RegLocatorTupleFields.Name];
-            set => this.Set((int)RegLocatorTupleFields.Name, value);
+            get => (string)this.Fields[(int)RegLocatorSymbolFields.Name];
+            set => this.Set((int)RegLocatorSymbolFields.Name, value);
         }
 
         public RegLocatorType Type
         {
-            get => (RegLocatorType)this.Fields[(int)RegLocatorTupleFields.Type].AsNumber();
-            set => this.Set((int)RegLocatorTupleFields.Type, (int)value);
+            get => (RegLocatorType)this.Fields[(int)RegLocatorSymbolFields.Type].AsNumber();
+            set => this.Set((int)RegLocatorSymbolFields.Type, (int)value);
         }
 
         public bool Win64
         {
-            get => this.Fields[(int)RegLocatorTupleFields.Win64].AsBool();
-            set => this.Set((int)RegLocatorTupleFields.Win64, value);
+            get => this.Fields[(int)RegLocatorSymbolFields.Win64].AsBool();
+            set => this.Set((int)RegLocatorSymbolFields.Win64, value);
         }
     }
 }