1 files changed, 103 insertions, 103 deletions

diff --git a/src/WixToolset.Data/Tuples/ControlTuple.cs b/src/WixToolset.Data/Tuples/ControlTuple.cs
index 165e40e2..732566d5 100644
--- a/src/WixToolset.Data/Tuples/ControlTuple.cs
+++ b/src/WixToolset.Data/Tuples/ControlTuple.cs
@@ -2,44 +2,44 @@
 
 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 Control = new IntermediateTupleDefinition(
-            TupleDefinitionType.Control,
+        public static readonly IntermediateSymbolDefinition Control = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.Control,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ControlTupleFields.DialogRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ControlTupleFields.Control), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ControlTupleFields.Type), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ControlTupleFields.X), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ControlTupleFields.Y), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ControlTupleFields.Width), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ControlTupleFields.Height), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ControlTupleFields.Attributes), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ControlTupleFields.Enabled), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(ControlTupleFields.Indirect), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(ControlTupleFields.Integer), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(ControlTupleFields.LeftScroll), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(ControlTupleFields.RightAligned), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(ControlTupleFields.RightToLeft), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(ControlTupleFields.Sunken), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(ControlTupleFields.Visible), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(ControlTupleFields.Property), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ControlTupleFields.Text), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ControlTupleFields.NextControlRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ControlTupleFields.Help), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ControlTupleFields.TrackDiskSpace), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(ControlTupleFields.SourceFile), IntermediateFieldType.Path),
+                new IntermediateFieldDefinition(nameof(ControlSymbolFields.DialogRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlSymbolFields.Control), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlSymbolFields.Type), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlSymbolFields.X), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ControlSymbolFields.Y), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ControlSymbolFields.Width), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ControlSymbolFields.Height), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ControlSymbolFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ControlSymbolFields.Enabled), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ControlSymbolFields.Indirect), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ControlSymbolFields.Integer), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ControlSymbolFields.LeftScroll), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ControlSymbolFields.RightAligned), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ControlSymbolFields.RightToLeft), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ControlSymbolFields.Sunken), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ControlSymbolFields.Visible), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ControlSymbolFields.Property), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlSymbolFields.Text), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlSymbolFields.NextControlRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlSymbolFields.Help), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlSymbolFields.TrackDiskSpace), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ControlSymbolFields.SourceFile), IntermediateFieldType.Path),
             },
-            typeof(ControlTuple));
+            typeof(ControlSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ControlTupleFields
+    public enum ControlSymbolFields
     {
         DialogRef,
         Control,
@@ -65,239 +65,239 @@ namespace WixToolset.Data.Tuples
         SourceFile,
     }
 
-    public class ControlTuple : IntermediateTuple
+    public class ControlSymbol : IntermediateSymbol
     {
-        public ControlTuple() : base(TupleDefinitions.Control, null, null)
+        public ControlSymbol() : base(SymbolDefinitions.Control, null, null)
         {
         }
 
-        public ControlTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Control, sourceLineNumber, id)
+        public ControlSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Control, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ControlTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ControlSymbolFields index] => this.Fields[(int)index];
 
         public string DialogRef
         {
-            get => (string)this.Fields[(int)ControlTupleFields.DialogRef];
-            set => this.Set((int)ControlTupleFields.DialogRef, value);
+            get => (string)this.Fields[(int)ControlSymbolFields.DialogRef];
+            set => this.Set((int)ControlSymbolFields.DialogRef, value);
         }
 
         public string Control
         {
-            get => (string)this.Fields[(int)ControlTupleFields.Control];
-            set => this.Set((int)ControlTupleFields.Control, value);
+            get => (string)this.Fields[(int)ControlSymbolFields.Control];
+            set => this.Set((int)ControlSymbolFields.Control, value);
         }
 
         public string Type
         {
-            get => (string)this.Fields[(int)ControlTupleFields.Type];
-            set => this.Set((int)ControlTupleFields.Type, value);
+            get => (string)this.Fields[(int)ControlSymbolFields.Type];
+            set => this.Set((int)ControlSymbolFields.Type, value);
         }
 
         public int X
         {
-            get => (int)this.Fields[(int)ControlTupleFields.X];
-            set => this.Set((int)ControlTupleFields.X, value);
+            get => (int)this.Fields[(int)ControlSymbolFields.X];
+            set => this.Set((int)ControlSymbolFields.X, value);
         }
 
         public int Y
         {
-            get => (int)this.Fields[(int)ControlTupleFields.Y];
-            set => this.Set((int)ControlTupleFields.Y, value);
+            get => (int)this.Fields[(int)ControlSymbolFields.Y];
+            set => this.Set((int)ControlSymbolFields.Y, value);
         }
 
         public int Width
         {
-            get => (int)this.Fields[(int)ControlTupleFields.Width];
-            set => this.Set((int)ControlTupleFields.Width, value);
+            get => (int)this.Fields[(int)ControlSymbolFields.Width];
+            set => this.Set((int)ControlSymbolFields.Width, value);
         }
 
         public int Height
         {
-            get => (int)this.Fields[(int)ControlTupleFields.Height];
-            set => this.Set((int)ControlTupleFields.Height, value);
+            get => (int)this.Fields[(int)ControlSymbolFields.Height];
+            set => this.Set((int)ControlSymbolFields.Height, value);
         }
 
         public int? Attributes
         {
-            get => (int?)this.Fields[(int)ControlTupleFields.Attributes];
-            set => this.Set((int)ControlTupleFields.Attributes, value);
+            get => (int?)this.Fields[(int)ControlSymbolFields.Attributes];
+            set => this.Set((int)ControlSymbolFields.Attributes, value);
         }
 
         public bool Enabled
         {
-            get => this.Fields[(int)ControlTupleFields.Enabled].AsBool();
-            set => this.Set((int)ControlTupleFields.Enabled, value);
+            get => this.Fields[(int)ControlSymbolFields.Enabled].AsBool();
+            set => this.Set((int)ControlSymbolFields.Enabled, value);
         }
 
         public bool Indirect
         {
-            get => this.Fields[(int)ControlTupleFields.Indirect].AsBool();
-            set => this.Set((int)ControlTupleFields.Indirect, value);
+            get => this.Fields[(int)ControlSymbolFields.Indirect].AsBool();
+            set => this.Set((int)ControlSymbolFields.Indirect, value);
         }
 
         public bool Integer
         {
-            get => this.Fields[(int)ControlTupleFields.Integer].AsBool();
-            set => this.Set((int)ControlTupleFields.Integer, value);
+            get => this.Fields[(int)ControlSymbolFields.Integer].AsBool();
+            set => this.Set((int)ControlSymbolFields.Integer, value);
         }
         /*
         /// <summary>PictureButton control</summary>
         public bool Bitmap
         {
-            get => this.Fields[(int)ControlTupleFields.Bitmap].AsBool();
-            set => this.Set((int)ControlTupleFields.Bitmap, value);
+            get => this.Fields[(int)ControlSymbolFields.Bitmap].AsBool();
+            set => this.Set((int)ControlSymbolFields.Bitmap, value);
         }
 
         /// <summary>RadioButton control</summary>
         public bool Border
         {
-            get => this.Fields[(int)ControlTupleFields.Border].AsBool();
-            set => this.Set((int)ControlTupleFields.Border, value);
+            get => this.Fields[(int)ControlSymbolFields.Border].AsBool();
+            set => this.Set((int)ControlSymbolFields.Border, value);
         }
 
         /// <summary>ListBox and ComboBox control</summary>
         public bool ComboList
         {
-            get => this.Fields[(int)ControlTupleFields.ComboList].AsBool();
-            set => this.Set((int)ControlTupleFields.ComboList, value);
+            get => this.Fields[(int)ControlSymbolFields.ComboList].AsBool();
+            set => this.Set((int)ControlSymbolFields.ComboList, value);
         }
 
         /// <summary>PushButton control</summary>
         public bool ElevationShield
         {
-            get => this.Fields[(int)ControlTupleFields.ElevationShield].AsBool();
-            set => this.Set((int)ControlTupleFields.ElevationShield, value);
+            get => this.Fields[(int)ControlSymbolFields.ElevationShield].AsBool();
+            set => this.Set((int)ControlSymbolFields.ElevationShield, value);
         }
 
         /// <summary>PictureButton control</summary>
         public bool FixedSize
         {
-            get => this.Fields[(int)ControlTupleFields.FixedSize].AsBool();
-            set => this.Set((int)ControlTupleFields.FixedSize, value);
+            get => this.Fields[(int)ControlSymbolFields.FixedSize].AsBool();
+            set => this.Set((int)ControlSymbolFields.FixedSize, value);
         }
 
         /// <summary>PictureButton control</summary>
         public bool Icon
         {
-            get => this.Fields[(int)ControlTupleFields.Icon].AsBool();
-            set => this.Set((int)ControlTupleFields.Icon, value);
+            get => this.Fields[(int)ControlSymbolFields.Icon].AsBool();
+            set => this.Set((int)ControlSymbolFields.Icon, value);
         }
 
         /// <summary>PictureButton control</summary>
         public bool Icon16
         {
-            get => this.Fields[(int)ControlTupleFields.Icon16].AsBool();
-            set => this.Set((int)ControlTupleFields.Icon16, value);
+            get => this.Fields[(int)ControlSymbolFields.Icon16].AsBool();
+            set => this.Set((int)ControlSymbolFields.Icon16, value);
         }
 
         /// <summary>PictureButton control</summary>
         public bool Icon32
         {
-            get => this.Fields[(int)ControlTupleFields.Icon32].AsBool();
-            set => this.Set((int)ControlTupleFields.Icon32, value);
+            get => this.Fields[(int)ControlSymbolFields.Icon32].AsBool();
+            set => this.Set((int)ControlSymbolFields.Icon32, value);
         }
 
         /// <summary>PictureButton control</summary>
         public bool Icon48
         {
-            get => this.Fields[(int)ControlTupleFields.Icon48].AsBool();
-            set => this.Set((int)ControlTupleFields.Icon48, value);
+            get => this.Fields[(int)ControlSymbolFields.Icon48].AsBool();
+            set => this.Set((int)ControlSymbolFields.Icon48, value);
         }
         */
         public bool LeftScroll
         {
-            get => this.Fields[(int)ControlTupleFields.LeftScroll].AsBool();
-            set => this.Set((int)ControlTupleFields.LeftScroll, value);
+            get => this.Fields[(int)ControlSymbolFields.LeftScroll].AsBool();
+            set => this.Set((int)ControlSymbolFields.LeftScroll, value);
         }
         /*
         /// <summary>PictureButton control</summary>
         public bool PushLike
         {
-            get => this.Fields[(int)ControlTupleFields.PushLike].AsBool();
-            set => this.Set((int)ControlTupleFields.PushLike, value);
+            get => this.Fields[(int)ControlSymbolFields.PushLike].AsBool();
+            set => this.Set((int)ControlSymbolFields.PushLike, value);
         }
 
         /// <summary>Edit control</summary>
         public bool Mulitline
         {
-            get => this.Fields[(int)ControlTupleFields.Mulitline].AsBool();
-            set => this.Set((int)ControlTupleFields.Mulitline, value);
+            get => this.Fields[(int)ControlSymbolFields.Mulitline].AsBool();
+            set => this.Set((int)ControlSymbolFields.Mulitline, value);
         }
         */
         public bool RightAligned
         {
-            get => this.Fields[(int)ControlTupleFields.RightAligned].AsBool();
-            set => this.Set((int)ControlTupleFields.RightAligned, value);
+            get => this.Fields[(int)ControlSymbolFields.RightAligned].AsBool();
+            set => this.Set((int)ControlSymbolFields.RightAligned, value);
         }
 
         public bool RightToLeft
         {
-            get => this.Fields[(int)ControlTupleFields.RightToLeft].AsBool();
-            set => this.Set((int)ControlTupleFields.RightToLeft, value);
+            get => this.Fields[(int)ControlSymbolFields.RightToLeft].AsBool();
+            set => this.Set((int)ControlSymbolFields.RightToLeft, value);
         }
         /*
         /// <summary>VolumeCostList control</summary>
         public bool ShowRollbackCost
         {
-            get => this.Fields[(int)ControlTupleFields.ShowRollbackCost].AsBool();
-            set => this.Set((int)ControlTupleFields.ShowRollbackCost, value);
+            get => this.Fields[(int)ControlSymbolFields.ShowRollbackCost].AsBool();
+            set => this.Set((int)ControlSymbolFields.ShowRollbackCost, value);
         }
 
         /// <summary>ListBox and ComboBox control</summary>
         public bool Sorted
         {
-            get => this.Fields[(int)ControlTupleFields.Sorted].AsBool();
-            set => this.Set((int)ControlTupleFields.Sorted, value);
+            get => this.Fields[(int)ControlSymbolFields.Sorted].AsBool();
+            set => this.Set((int)ControlSymbolFields.Sorted, value);
         }
         */
         public bool Sunken
         {
-            get => this.Fields[(int)ControlTupleFields.Sunken].AsBool();
-            set => this.Set((int)ControlTupleFields.Sunken, value);
+            get => this.Fields[(int)ControlSymbolFields.Sunken].AsBool();
+            set => this.Set((int)ControlSymbolFields.Sunken, value);
         }
 
         public bool Visible
         {
-            get => this.Fields[(int)ControlTupleFields.Visible].AsBool();
-            set => this.Set((int)ControlTupleFields.Visible, value);
+            get => this.Fields[(int)ControlSymbolFields.Visible].AsBool();
+            set => this.Set((int)ControlSymbolFields.Visible, value);
         }
 
         public string Property
         {
-            get => (string)this.Fields[(int)ControlTupleFields.Property];
-            set => this.Set((int)ControlTupleFields.Property, value);
+            get => (string)this.Fields[(int)ControlSymbolFields.Property];
+            set => this.Set((int)ControlSymbolFields.Property, value);
         }
 
         public string Text
         {
-            get => (string)this.Fields[(int)ControlTupleFields.Text];
-            set => this.Set((int)ControlTupleFields.Text, value);
+            get => (string)this.Fields[(int)ControlSymbolFields.Text];
+            set => this.Set((int)ControlSymbolFields.Text, value);
         }
 
         public string NextControlRef
         {
-            get => (string)this.Fields[(int)ControlTupleFields.NextControlRef];
-            set => this.Set((int)ControlTupleFields.NextControlRef, value);
+            get => (string)this.Fields[(int)ControlSymbolFields.NextControlRef];
+            set => this.Set((int)ControlSymbolFields.NextControlRef, value);
         }
 
         public string Help
         {
-            get => (string)this.Fields[(int)ControlTupleFields.Help];
-            set => this.Set((int)ControlTupleFields.Help, value);
+            get => (string)this.Fields[(int)ControlSymbolFields.Help];
+            set => this.Set((int)ControlSymbolFields.Help, value);
         }
 
         public bool TrackDiskSpace
         {
-            get => this.Fields[(int)ControlTupleFields.TrackDiskSpace].AsBool();
-            set => this.Set((int)ControlTupleFields.TrackDiskSpace, value);
+            get => this.Fields[(int)ControlSymbolFields.TrackDiskSpace].AsBool();
+            set => this.Set((int)ControlSymbolFields.TrackDiskSpace, value);
         }
 
         public IntermediateFieldPathValue SourceFile
         {
-            get => this.Fields[(int)ControlTupleFields.SourceFile].AsPath();
-            set => this.Set((int)ControlTupleFields.SourceFile, value);
+            get => this.Fields[(int)ControlSymbolFields.SourceFile].AsPath();
+            set => this.Set((int)ControlSymbolFields.SourceFile, value);
         }
     }
 }
\ No newline at end of file