The Great Tuple to Symbol Rename (tm)

181 files changed, 4905 insertions, 4905 deletions

diff --git a/src/WixToolset.Data/Tuples/ActionTextTuple.cs b/src/WixToolset.Data/Tuples/ActionTextTuple.cs
index e816a5e1..80662060 100644
--- a/src/WixToolset.Data/Tuples/ActionTextTuple.cs
+++ b/src/WixToolset.Data/Tuples/ActionTextTuple.cs
@@ -2,59 +2,59 @@
 
 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 ActionText = new IntermediateTupleDefinition(
-            TupleDefinitionType.ActionText,
+        public static readonly IntermediateSymbolDefinition ActionText = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.ActionText,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ActionTextTupleFields.Action), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ActionTextTupleFields.Description), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ActionTextTupleFields.Template), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ActionTextSymbolFields.Action), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ActionTextSymbolFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ActionTextSymbolFields.Template), IntermediateFieldType.String),
             },
-            typeof(ActionTextTuple));
+            typeof(ActionTextSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ActionTextTupleFields
+    public enum ActionTextSymbolFields
     {
         Action,
         Description,
         Template,
     }
 
-    public class ActionTextTuple : IntermediateTuple
+    public class ActionTextSymbol : IntermediateSymbol
     {
-        public ActionTextTuple() : base(TupleDefinitions.ActionText, null, null)
+        public ActionTextSymbol() : base(SymbolDefinitions.ActionText, null, null)
         {
         }
 
-        public ActionTextTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ActionText, sourceLineNumber, id)
+        public ActionTextSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ActionText, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ActionTextTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ActionTextSymbolFields index] => this.Fields[(int)index];
 
         public string Action
         {
-            get => (string)this.Fields[(int)ActionTextTupleFields.Action];
-            set => this.Set((int)ActionTextTupleFields.Action, value);
+            get => (string)this.Fields[(int)ActionTextSymbolFields.Action];
+            set => this.Set((int)ActionTextSymbolFields.Action, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)ActionTextTupleFields.Description];
-            set => this.Set((int)ActionTextTupleFields.Description, value);
+            get => (string)this.Fields[(int)ActionTextSymbolFields.Description];
+            set => this.Set((int)ActionTextSymbolFields.Description, value);
         }
 
         public string Template
         {
-            get => (string)this.Fields[(int)ActionTextTupleFields.Template];
-            set => this.Set((int)ActionTextTupleFields.Template, value);
+            get => (string)this.Fields[(int)ActionTextSymbolFields.Template];
+            set => this.Set((int)ActionTextSymbolFields.Template, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/AppIdTuple.cs b/src/WixToolset.Data/Tuples/AppIdTuple.cs
index 22cec56e..3eafa26f 100644
--- a/src/WixToolset.Data/Tuples/AppIdTuple.cs
+++ b/src/WixToolset.Data/Tuples/AppIdTuple.cs
@@ -2,29 +2,29 @@
 
 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 AppId = new IntermediateTupleDefinition(
-            TupleDefinitionType.AppId,
+        public static readonly IntermediateSymbolDefinition AppId = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.AppId,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(AppIdTupleFields.AppId), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(AppIdTupleFields.RemoteServerName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(AppIdTupleFields.LocalService), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(AppIdTupleFields.ServiceParameters), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(AppIdTupleFields.DllSurrogate), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(AppIdTupleFields.ActivateAtStorage), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(AppIdTupleFields.RunAsInteractiveUser), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(AppIdSymbolFields.AppId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(AppIdSymbolFields.RemoteServerName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(AppIdSymbolFields.LocalService), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(AppIdSymbolFields.ServiceParameters), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(AppIdSymbolFields.DllSurrogate), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(AppIdSymbolFields.ActivateAtStorage), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(AppIdSymbolFields.RunAsInteractiveUser), IntermediateFieldType.Number),
             },
-            typeof(AppIdTuple));
+            typeof(AppIdSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum AppIdTupleFields
+    public enum AppIdSymbolFields
     {
         AppId,
         RemoteServerName,
@@ -35,58 +35,58 @@ namespace WixToolset.Data.Tuples
         RunAsInteractiveUser,
     }
 
-    public class AppIdTuple : IntermediateTuple
+    public class AppIdSymbol : IntermediateSymbol
     {
-        public AppIdTuple() : base(TupleDefinitions.AppId, null, null)
+        public AppIdSymbol() : base(SymbolDefinitions.AppId, null, null)
         {
         }
 
-        public AppIdTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.AppId, sourceLineNumber, id)
+        public AppIdSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.AppId, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[AppIdTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[AppIdSymbolFields index] => this.Fields[(int)index];
 
         public string AppId
         {
-            get => (string)this.Fields[(int)AppIdTupleFields.AppId];
-            set => this.Set((int)AppIdTupleFields.AppId, value);
+            get => (string)this.Fields[(int)AppIdSymbolFields.AppId];
+            set => this.Set((int)AppIdSymbolFields.AppId, value);
         }
 
         public string RemoteServerName
         {
-            get => (string)this.Fields[(int)AppIdTupleFields.RemoteServerName];
-            set => this.Set((int)AppIdTupleFields.RemoteServerName, value);
+            get => (string)this.Fields[(int)AppIdSymbolFields.RemoteServerName];
+            set => this.Set((int)AppIdSymbolFields.RemoteServerName, value);
         }
 
         public string LocalService
         {
-            get => (string)this.Fields[(int)AppIdTupleFields.LocalService];
-            set => this.Set((int)AppIdTupleFields.LocalService, value);
+            get => (string)this.Fields[(int)AppIdSymbolFields.LocalService];
+            set => this.Set((int)AppIdSymbolFields.LocalService, value);
         }
 
         public string ServiceParameters
         {
-            get => (string)this.Fields[(int)AppIdTupleFields.ServiceParameters];
-            set => this.Set((int)AppIdTupleFields.ServiceParameters, value);
+            get => (string)this.Fields[(int)AppIdSymbolFields.ServiceParameters];
+            set => this.Set((int)AppIdSymbolFields.ServiceParameters, value);
         }
 
         public string DllSurrogate
         {
-            get => (string)this.Fields[(int)AppIdTupleFields.DllSurrogate];
-            set => this.Set((int)AppIdTupleFields.DllSurrogate, value);
+            get => (string)this.Fields[(int)AppIdSymbolFields.DllSurrogate];
+            set => this.Set((int)AppIdSymbolFields.DllSurrogate, value);
         }
 
         public bool? ActivateAtStorage
         {
-            get => (bool?)this.Fields[(int)AppIdTupleFields.ActivateAtStorage];
-            set => this.Set((int)AppIdTupleFields.ActivateAtStorage, value);
+            get => (bool?)this.Fields[(int)AppIdSymbolFields.ActivateAtStorage];
+            set => this.Set((int)AppIdSymbolFields.ActivateAtStorage, value);
         }
 
         public bool? RunAsInteractiveUser
         {
-            get => (bool?)this.Fields[(int)AppIdTupleFields.RunAsInteractiveUser];
-            set => this.Set((int)AppIdTupleFields.RunAsInteractiveUser, value);
+            get => (bool?)this.Fields[(int)AppIdSymbolFields.RunAsInteractiveUser];
+            set => this.Set((int)AppIdSymbolFields.RunAsInteractiveUser, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/AppSearchTuple.cs b/src/WixToolset.Data/Tuples/AppSearchTuple.cs
index 098b4946..2bd3d6ba 100644
--- a/src/WixToolset.Data/Tuples/AppSearchTuple.cs
+++ b/src/WixToolset.Data/Tuples/AppSearchTuple.cs
@@ -2,51 +2,51 @@
 
 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 AppSearch = new IntermediateTupleDefinition(
-            TupleDefinitionType.AppSearch,
+        public static readonly IntermediateSymbolDefinition AppSearch = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.AppSearch,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(AppSearchTupleFields.PropertyRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(AppSearchTupleFields.SignatureRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(AppSearchSymbolFields.PropertyRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(AppSearchSymbolFields.SignatureRef), IntermediateFieldType.String),
             },
-            typeof(AppSearchTuple));
+            typeof(AppSearchSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum AppSearchTupleFields
+    public enum AppSearchSymbolFields
     {
         PropertyRef,
         SignatureRef,
     }
 
-    public class AppSearchTuple : IntermediateTuple
+    public class AppSearchSymbol : IntermediateSymbol
     {
-        public AppSearchTuple() : base(TupleDefinitions.AppSearch, null, null)
+        public AppSearchSymbol() : base(SymbolDefinitions.AppSearch, null, null)
         {
         }
 
-        public AppSearchTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.AppSearch, sourceLineNumber, id)
+        public AppSearchSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.AppSearch, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[AppSearchTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[AppSearchSymbolFields index] => this.Fields[(int)index];
 
         public string PropertyRef
         {
-            get => (string)this.Fields[(int)AppSearchTupleFields.PropertyRef];
-            set => this.Set((int)AppSearchTupleFields.PropertyRef, value);
+            get => (string)this.Fields[(int)AppSearchSymbolFields.PropertyRef];
+            set => this.Set((int)AppSearchSymbolFields.PropertyRef, value);
         }
 
         public string SignatureRef
         {
-            get => (string)this.Fields[(int)AppSearchTupleFields.SignatureRef];
-            set => this.Set((int)AppSearchTupleFields.SignatureRef, value);
+            get => (string)this.Fields[(int)AppSearchSymbolFields.SignatureRef];
+            set => this.Set((int)AppSearchSymbolFields.SignatureRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/AssemblyTuple.cs b/src/WixToolset.Data/Tuples/AssemblyTuple.cs
index d1e5e1ce..192ca4eb 100644
--- a/src/WixToolset.Data/Tuples/AssemblyTuple.cs
+++ b/src/WixToolset.Data/Tuples/AssemblyTuple.cs
@@ -2,28 +2,28 @@
 
 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 Assembly = new IntermediateTupleDefinition(
-            TupleDefinitionType.Assembly,
+        public static readonly IntermediateSymbolDefinition Assembly = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.Assembly,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(AssemblyTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(AssemblyTupleFields.FeatureRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(AssemblyTupleFields.ManifestFileRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(AssemblyTupleFields.ApplicationFileRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(AssemblyTupleFields.Type), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(AssemblyTupleFields.ProcessorArchitecture), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(AssemblySymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(AssemblySymbolFields.FeatureRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(AssemblySymbolFields.ManifestFileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(AssemblySymbolFields.ApplicationFileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(AssemblySymbolFields.Type), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(AssemblySymbolFields.ProcessorArchitecture), IntermediateFieldType.String),
             },
-            typeof(AssemblyTuple));
+            typeof(AssemblySymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum AssemblyTupleFields
+    public enum AssemblySymbolFields
     {
         ComponentRef,
         FeatureRef,
@@ -45,52 +45,52 @@ namespace WixToolset.Data.Tuples
         Win32Assembly,
     }
 
-    public class AssemblyTuple : IntermediateTuple
+    public class AssemblySymbol : IntermediateSymbol
     {
-        public AssemblyTuple() : base(TupleDefinitions.Assembly, null, null)
+        public AssemblySymbol() : base(SymbolDefinitions.Assembly, null, null)
         {
         }
 
-        public AssemblyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Assembly, sourceLineNumber, id)
+        public AssemblySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Assembly, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[AssemblyTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[AssemblySymbolFields index] => this.Fields[(int)index];
 
         public string ComponentRef
         {
-            get => (string)this.Fields[(int)AssemblyTupleFields.ComponentRef];
-            set => this.Set((int)AssemblyTupleFields.ComponentRef, value);
+            get => (string)this.Fields[(int)AssemblySymbolFields.ComponentRef];
+            set => this.Set((int)AssemblySymbolFields.ComponentRef, value);
         }
 
         public string FeatureRef
         {
-            get => (string)this.Fields[(int)AssemblyTupleFields.FeatureRef];
-            set => this.Set((int)AssemblyTupleFields.FeatureRef, value);
+            get => (string)this.Fields[(int)AssemblySymbolFields.FeatureRef];
+            set => this.Set((int)AssemblySymbolFields.FeatureRef, value);
         }
 
         public string ManifestFileRef
         {
-            get => (string)this.Fields[(int)AssemblyTupleFields.ManifestFileRef];
-            set => this.Set((int)AssemblyTupleFields.ManifestFileRef, value);
+            get => (string)this.Fields[(int)AssemblySymbolFields.ManifestFileRef];
+            set => this.Set((int)AssemblySymbolFields.ManifestFileRef, value);
         }
 
         public string ApplicationFileRef
         {
-            get => (string)this.Fields[(int)AssemblyTupleFields.ApplicationFileRef];
-            set => this.Set((int)AssemblyTupleFields.ApplicationFileRef, value);
+            get => (string)this.Fields[(int)AssemblySymbolFields.ApplicationFileRef];
+            set => this.Set((int)AssemblySymbolFields.ApplicationFileRef, value);
         }
 
         public AssemblyType Type
         {
-            get => (AssemblyType)this.Fields[(int)AssemblyTupleFields.Type].AsNumber();
-            set => this.Set((int)AssemblyTupleFields.Type, (int)value);
+            get => (AssemblyType)this.Fields[(int)AssemblySymbolFields.Type].AsNumber();
+            set => this.Set((int)AssemblySymbolFields.Type, (int)value);
         }
 
         public string ProcessorArchitecture
         {
-            get => (string)this.Fields[(int)AssemblyTupleFields.ProcessorArchitecture];
-            set => this.Set((int)AssemblyTupleFields.ProcessorArchitecture, value);
+            get => (string)this.Fields[(int)AssemblySymbolFields.ProcessorArchitecture];
+            set => this.Set((int)AssemblySymbolFields.ProcessorArchitecture, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/BBControlTuple.cs b/src/WixToolset.Data/Tuples/BBControlTuple.cs
index cef525bf..277d1d85 100644
--- a/src/WixToolset.Data/Tuples/BBControlTuple.cs
+++ b/src/WixToolset.Data/Tuples/BBControlTuple.cs
@@ -2,40 +2,40 @@
 
 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 BBControl = new IntermediateTupleDefinition(
-            TupleDefinitionType.BBControl,
+        public static readonly IntermediateSymbolDefinition BBControl = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.BBControl,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(BBControlTupleFields.BillboardRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(BBControlTupleFields.BBControl), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(BBControlTupleFields.Type), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(BBControlTupleFields.X), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(BBControlTupleFields.Y), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(BBControlTupleFields.Width), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(BBControlTupleFields.Height), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(BBControlTupleFields.Attributes), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(BBControlTupleFields.Enabled), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(BBControlTupleFields.Indirect), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(BBControlTupleFields.Integer), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(BBControlTupleFields.LeftScroll), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(BBControlTupleFields.RightAligned), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(BBControlTupleFields.RightToLeft), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(BBControlTupleFields.Sunken), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(BBControlTupleFields.Visible), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(BBControlTupleFields.Text), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(BBControlTupleFields.SourceFile), IntermediateFieldType.Path),
+                new IntermediateFieldDefinition(nameof(BBControlSymbolFields.BillboardRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(BBControlSymbolFields.BBControl), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(BBControlSymbolFields.Type), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(BBControlSymbolFields.X), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(BBControlSymbolFields.Y), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(BBControlSymbolFields.Width), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(BBControlSymbolFields.Height), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(BBControlSymbolFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(BBControlSymbolFields.Enabled), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(BBControlSymbolFields.Indirect), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(BBControlSymbolFields.Integer), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(BBControlSymbolFields.LeftScroll), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(BBControlSymbolFields.RightAligned), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(BBControlSymbolFields.RightToLeft), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(BBControlSymbolFields.Sunken), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(BBControlSymbolFields.Visible), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(BBControlSymbolFields.Text), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(BBControlSymbolFields.SourceFile), IntermediateFieldType.Path),
             },
-            typeof(BBControlTuple));
+            typeof(BBControlSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum BBControlTupleFields
+    public enum BBControlSymbolFields
     {
         BillboardRef,
         BBControl,
@@ -57,124 +57,124 @@ namespace WixToolset.Data.Tuples
         SourceFile
     }
 
-    public class BBControlTuple : IntermediateTuple
+    public class BBControlSymbol : IntermediateSymbol
     {
-        public BBControlTuple() : base(TupleDefinitions.BBControl, null, null)
+        public BBControlSymbol() : base(SymbolDefinitions.BBControl, null, null)
         {
         }
 
-        public BBControlTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.BBControl, sourceLineNumber, id)
+        public BBControlSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.BBControl, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[BBControlTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[BBControlSymbolFields index] => this.Fields[(int)index];
 
         public string BillboardRef
         {
-            get => (string)this.Fields[(int)BBControlTupleFields.BillboardRef];
-            set => this.Set((int)BBControlTupleFields.BillboardRef, value);
+            get => (string)this.Fields[(int)BBControlSymbolFields.BillboardRef];
+            set => this.Set((int)BBControlSymbolFields.BillboardRef, value);
         }
 
         public string BBControl
         {
-            get => (string)this.Fields[(int)BBControlTupleFields.BBControl];
-            set => this.Set((int)BBControlTupleFields.BBControl, value);
+            get => (string)this.Fields[(int)BBControlSymbolFields.BBControl];
+            set => this.Set((int)BBControlSymbolFields.BBControl, value);
         }
 
         public string Type
         {
-            get => (string)this.Fields[(int)BBControlTupleFields.Type];
-            set => this.Set((int)BBControlTupleFields.Type, value);
+            get => (string)this.Fields[(int)BBControlSymbolFields.Type];
+            set => this.Set((int)BBControlSymbolFields.Type, value);
         }
 
         public int X
         {
-            get => (int)this.Fields[(int)BBControlTupleFields.X];
-            set => this.Set((int)BBControlTupleFields.X, value);
+            get => (int)this.Fields[(int)BBControlSymbolFields.X];
+            set => this.Set((int)BBControlSymbolFields.X, value);
         }
 
         public int Y
         {
-            get => (int)this.Fields[(int)BBControlTupleFields.Y];
-            set => this.Set((int)BBControlTupleFields.Y, value);
+            get => (int)this.Fields[(int)BBControlSymbolFields.Y];
+            set => this.Set((int)BBControlSymbolFields.Y, value);
         }
 
         public int Width
         {
-            get => (int)this.Fields[(int)BBControlTupleFields.Width].AsNumber();
-            set => this.Set((int)BBControlTupleFields.Width, value);
+            get => (int)this.Fields[(int)BBControlSymbolFields.Width].AsNumber();
+            set => this.Set((int)BBControlSymbolFields.Width, value);
         }
 
         public int Height
         {
-            get => (int)this.Fields[(int)BBControlTupleFields.Height];
-            set => this.Set((int)BBControlTupleFields.Height, value);
+            get => (int)this.Fields[(int)BBControlSymbolFields.Height];
+            set => this.Set((int)BBControlSymbolFields.Height, value);
         }
 
         public int Attributes
         {
-            get => this.Fields[(int)BBControlTupleFields.Attributes].AsNumber();
-            set => this.Set((int)BBControlTupleFields.Attributes, value);
+            get => this.Fields[(int)BBControlSymbolFields.Attributes].AsNumber();
+            set => this.Set((int)BBControlSymbolFields.Attributes, value);
         }
 
         public bool Enabled
         {
-            get => this.Fields[(int)BBControlTupleFields.Enabled].AsBool();
-            set => this.Set((int)BBControlTupleFields.Enabled, value);
+            get => this.Fields[(int)BBControlSymbolFields.Enabled].AsBool();
+            set => this.Set((int)BBControlSymbolFields.Enabled, value);
         }
 
         public bool Indirect
         {
-            get => this.Fields[(int)BBControlTupleFields.Indirect].AsBool();
-            set => this.Set((int)BBControlTupleFields.Indirect, value);
+            get => this.Fields[(int)BBControlSymbolFields.Indirect].AsBool();
+            set => this.Set((int)BBControlSymbolFields.Indirect, value);
         }
 
         public bool Integer
         {
-            get => this.Fields[(int)BBControlTupleFields.Integer].AsBool();
-            set => this.Set((int)BBControlTupleFields.Integer, value);
+            get => this.Fields[(int)BBControlSymbolFields.Integer].AsBool();
+            set => this.Set((int)BBControlSymbolFields.Integer, value);
         }
 
         public bool LeftScroll
         {
-            get => this.Fields[(int)BBControlTupleFields.LeftScroll].AsBool();
-            set => this.Set((int)BBControlTupleFields.LeftScroll, value);
+            get => this.Fields[(int)BBControlSymbolFields.LeftScroll].AsBool();
+            set => this.Set((int)BBControlSymbolFields.LeftScroll, value);
         }
 
         public bool RightAligned
         {
-            get => this.Fields[(int)BBControlTupleFields.RightAligned].AsBool();
-            set => this.Set((int)BBControlTupleFields.RightAligned, value);
+            get => this.Fields[(int)BBControlSymbolFields.RightAligned].AsBool();
+            set => this.Set((int)BBControlSymbolFields.RightAligned, value);
         }
 
         public bool RightToLeft
         {
-            get => this.Fields[(int)BBControlTupleFields.RightToLeft].AsBool();
-            set => this.Set((int)BBControlTupleFields.RightToLeft, value);
+            get => this.Fields[(int)BBControlSymbolFields.RightToLeft].AsBool();
+            set => this.Set((int)BBControlSymbolFields.RightToLeft, value);
         }
 
         public bool Sunken
         {
-            get => this.Fields[(int)BBControlTupleFields.Sunken].AsBool();
-            set => this.Set((int)BBControlTupleFields.Sunken, value);
+            get => this.Fields[(int)BBControlSymbolFields.Sunken].AsBool();
+            set => this.Set((int)BBControlSymbolFields.Sunken, value);
         }
 
         public bool Visible
         {
-            get => this.Fields[(int)BBControlTupleFields.Visible].AsBool();
-            set => this.Set((int)BBControlTupleFields.Visible, value);
+            get => this.Fields[(int)BBControlSymbolFields.Visible].AsBool();
+            set => this.Set((int)BBControlSymbolFields.Visible, value);
         }
 
         public string Text
         {
-            get => (string)this.Fields[(int)BBControlTupleFields.Text];
-            set => this.Set((int)BBControlTupleFields.Text, value);
+            get => (string)this.Fields[(int)BBControlSymbolFields.Text];
+            set => this.Set((int)BBControlSymbolFields.Text, value);
         }
 
         public IntermediateFieldPathValue SourceFile
         {
-            get => this.Fields[(int)BBControlTupleFields.SourceFile].AsPath();
-            set => this.Set((int)BBControlTupleFields.SourceFile, value);
+            get => this.Fields[(int)BBControlSymbolFields.SourceFile].AsPath();
+            set => this.Set((int)BBControlSymbolFields.SourceFile, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/BillboardTuple.cs b/src/WixToolset.Data/Tuples/BillboardTuple.cs
index c5242d33..77f60bcb 100644
--- a/src/WixToolset.Data/Tuples/BillboardTuple.cs
+++ b/src/WixToolset.Data/Tuples/BillboardTuple.cs
@@ -2,59 +2,59 @@
 
 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 Billboard = new IntermediateTupleDefinition(
-            TupleDefinitionType.Billboard,
+        public static readonly IntermediateSymbolDefinition Billboard = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.Billboard,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(BillboardTupleFields.FeatureRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(BillboardTupleFields.Action), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(BillboardTupleFields.Ordering), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(BillboardSymbolFields.FeatureRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(BillboardSymbolFields.Action), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(BillboardSymbolFields.Ordering), IntermediateFieldType.Number),
             },
-            typeof(BillboardTuple));
+            typeof(BillboardSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum BillboardTupleFields
+    public enum BillboardSymbolFields
     {
         FeatureRef,
         Action,
         Ordering,
     }
 
-    public class BillboardTuple : IntermediateTuple
+    public class BillboardSymbol : IntermediateSymbol
     {
-        public BillboardTuple() : base(TupleDefinitions.Billboard, null, null)
+        public BillboardSymbol() : base(SymbolDefinitions.Billboard, null, null)
         {
         }
 
-        public BillboardTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Billboard, sourceLineNumber, id)
+        public BillboardSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Billboard, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[BillboardTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[BillboardSymbolFields index] => this.Fields[(int)index];
 
         public string FeatureRef
         {
-            get => (string)this.Fields[(int)BillboardTupleFields.FeatureRef];
-            set => this.Set((int)BillboardTupleFields.FeatureRef, value);
+            get => (string)this.Fields[(int)BillboardSymbolFields.FeatureRef];
+            set => this.Set((int)BillboardSymbolFields.FeatureRef, value);
         }
 
         public string Action
         {
-            get => (string)this.Fields[(int)BillboardTupleFields.Action];
-            set => this.Set((int)BillboardTupleFields.Action, value);
+            get => (string)this.Fields[(int)BillboardSymbolFields.Action];
+            set => this.Set((int)BillboardSymbolFields.Action, value);
         }
 
         public int? Ordering
         {
-            get => (int?)this.Fields[(int)BillboardTupleFields.Ordering];
-            set => this.Set((int)BillboardTupleFields.Ordering, value);
+            get => (int?)this.Fields[(int)BillboardSymbolFields.Ordering];
+            set => this.Set((int)BillboardSymbolFields.Ordering, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/BinaryTuple.cs b/src/WixToolset.Data/Tuples/BinaryTuple.cs
index 358f5bf6..ec26b01a 100644
--- a/src/WixToolset.Data/Tuples/BinaryTuple.cs
+++ b/src/WixToolset.Data/Tuples/BinaryTuple.cs
@@ -2,43 +2,43 @@
 
 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 Binary = new IntermediateTupleDefinition(
-            TupleDefinitionType.Binary,
+        public static readonly IntermediateSymbolDefinition Binary = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.Binary,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(BinaryTupleFields.Data), IntermediateFieldType.Path),
+                new IntermediateFieldDefinition(nameof(BinarySymbolFields.Data), IntermediateFieldType.Path),
             },
-            typeof(BinaryTuple));
+            typeof(BinarySymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum BinaryTupleFields
+    public enum BinarySymbolFields
     {
         Data,
     }
 
-    public class BinaryTuple : IntermediateTuple
+    public class BinarySymbol : IntermediateSymbol
     {
-        public BinaryTuple() : base(TupleDefinitions.Binary, null, null)
+        public BinarySymbol() : base(SymbolDefinitions.Binary, null, null)
         {
         }
 
-        public BinaryTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Binary, sourceLineNumber, id)
+        public BinarySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Binary, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[BinaryTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[BinarySymbolFields index] => this.Fields[(int)index];
 
         public IntermediateFieldPathValue Data
         {
-            get => this.Fields[(int)BinaryTupleFields.Data].AsPath();
-            set => this.Set((int)BinaryTupleFields.Data, value);
+            get => this.Fields[(int)BinarySymbolFields.Data].AsPath();
+            set => this.Set((int)BinarySymbolFields.Data, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/CCPSearchTuple.cs b/src/WixToolset.Data/Tuples/CCPSearchTuple.cs
index 63720d64..6f6227fd 100644
--- a/src/WixToolset.Data/Tuples/CCPSearchTuple.cs
+++ b/src/WixToolset.Data/Tuples/CCPSearchTuple.cs
@@ -2,35 +2,35 @@
 
 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 CCPSearch = new IntermediateTupleDefinition(
-            TupleDefinitionType.CCPSearch,
+        public static readonly IntermediateSymbolDefinition CCPSearch = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.CCPSearch,
             new IntermediateFieldDefinition[]
             {
             },
-            typeof(CCPSearchTuple));
+            typeof(CCPSearchSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum CCPSearchTupleFields
+    public enum CCPSearchSymbolFields
     {
     }
 
-    public class CCPSearchTuple : IntermediateTuple
+    public class CCPSearchSymbol : IntermediateSymbol
     {
-        public CCPSearchTuple() : base(TupleDefinitions.CCPSearch, null, null)
+        public CCPSearchSymbol() : base(SymbolDefinitions.CCPSearch, null, null)
         {
         }
 
-        public CCPSearchTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.CCPSearch, sourceLineNumber, id)
+        public CCPSearchSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.CCPSearch, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[CCPSearchTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[CCPSearchSymbolFields index] => this.Fields[(int)index];
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/CheckBoxTuple.cs b/src/WixToolset.Data/Tuples/CheckBoxTuple.cs
index b35ff1f0..cd6355c4 100644
--- a/src/WixToolset.Data/Tuples/CheckBoxTuple.cs
+++ b/src/WixToolset.Data/Tuples/CheckBoxTuple.cs
@@ -2,51 +2,51 @@
 
 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 CheckBox = new IntermediateTupleDefinition(
-            TupleDefinitionType.CheckBox,
+        public static readonly IntermediateSymbolDefinition CheckBox = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.CheckBox,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(CheckBoxTupleFields.Property), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(CheckBoxTupleFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(CheckBoxSymbolFields.Property), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(CheckBoxSymbolFields.Value), IntermediateFieldType.String),
             },
-            typeof(CheckBoxTuple));
+            typeof(CheckBoxSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum CheckBoxTupleFields
+    public enum CheckBoxSymbolFields
     {
         Property,
         Value,
     }
 
-    public class CheckBoxTuple : IntermediateTuple
+    public class CheckBoxSymbol : IntermediateSymbol
     {
-        public CheckBoxTuple() : base(TupleDefinitions.CheckBox, null, null)
+        public CheckBoxSymbol() : base(SymbolDefinitions.CheckBox, null, null)
         {
         }
 
-        public CheckBoxTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.CheckBox, sourceLineNumber, id)
+        public CheckBoxSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.CheckBox, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[CheckBoxTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[CheckBoxSymbolFields index] => this.Fields[(int)index];
 
         public string Property
         {
-            get => (string)this.Fields[(int)CheckBoxTupleFields.Property];
-            set => this.Set((int)CheckBoxTupleFields.Property, value);
+            get => (string)this.Fields[(int)CheckBoxSymbolFields.Property];
+            set => this.Set((int)CheckBoxSymbolFields.Property, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)CheckBoxTupleFields.Value];
-            set => this.Set((int)CheckBoxTupleFields.Value, value);
+            get => (string)this.Fields[(int)CheckBoxSymbolFields.Value];
+            set => this.Set((int)CheckBoxSymbolFields.Value, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ClassTuple.cs b/src/WixToolset.Data/Tuples/ClassTuple.cs
index a5ff89e8..833867b1 100644
--- a/src/WixToolset.Data/Tuples/ClassTuple.cs
+++ b/src/WixToolset.Data/Tuples/ClassTuple.cs
@@ -2,35 +2,35 @@
 
 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 Class = new IntermediateTupleDefinition(
-            TupleDefinitionType.Class,
+        public static readonly IntermediateSymbolDefinition Class = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.Class,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ClassTupleFields.CLSID), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ClassTupleFields.Context), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ClassTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ClassTupleFields.DefaultProgIdRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ClassTupleFields.Description), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ClassTupleFields.AppIdRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ClassTupleFields.FileTypeMask), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ClassTupleFields.IconRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ClassTupleFields.IconIndex), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ClassTupleFields.DefInprocHandler), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ClassTupleFields.Argument), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ClassTupleFields.FeatureRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ClassTupleFields.RelativePath), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ClassSymbolFields.CLSID), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ClassSymbolFields.Context), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ClassSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ClassSymbolFields.DefaultProgIdRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ClassSymbolFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ClassSymbolFields.AppIdRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ClassSymbolFields.FileTypeMask), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ClassSymbolFields.IconRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ClassSymbolFields.IconIndex), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ClassSymbolFields.DefInprocHandler), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ClassSymbolFields.Argument), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ClassSymbolFields.FeatureRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ClassSymbolFields.RelativePath), IntermediateFieldType.Bool),
             },
-            typeof(ClassTuple));
+            typeof(ClassSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ClassTupleFields
+    public enum ClassSymbolFields
     {
         CLSID,
         Context,
@@ -47,94 +47,94 @@ namespace WixToolset.Data.Tuples
         RelativePath,
     }
 
-    public class ClassTuple : IntermediateTuple
+    public class ClassSymbol : IntermediateSymbol
     {
-        public ClassTuple() : base(TupleDefinitions.Class, null, null)
+        public ClassSymbol() : base(SymbolDefinitions.Class, null, null)
         {
         }
 
-        public ClassTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Class, sourceLineNumber, id)
+        public ClassSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Class, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ClassTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ClassSymbolFields index] => this.Fields[(int)index];
 
         public string CLSID
         {
-            get => (string)this.Fields[(int)ClassTupleFields.CLSID];
-            set => this.Set((int)ClassTupleFields.CLSID, value);
+            get => (string)this.Fields[(int)ClassSymbolFields.CLSID];
+            set => this.Set((int)ClassSymbolFields.CLSID, value);
         }
 
         public string Context
         {
-            get => (string)this.Fields[(int)ClassTupleFields.Context];
-            set => this.Set((int)ClassTupleFields.Context, value);
+            get => (string)this.Fields[(int)ClassSymbolFields.Context];
+            set => this.Set((int)ClassSymbolFields.Context, value);
         }
 
         public string ComponentRef
         {
-            get => (string)this.Fields[(int)ClassTupleFields.ComponentRef];
-            set => this.Set((int)ClassTupleFields.ComponentRef, value);
+            get => (string)this.Fields[(int)ClassSymbolFields.ComponentRef];
+            set => this.Set((int)ClassSymbolFields.ComponentRef, value);
         }
 
         public string DefaultProgIdRef
         {
-            get => (string)this.Fields[(int)ClassTupleFields.DefaultProgIdRef];
-            set => this.Set((int)ClassTupleFields.DefaultProgIdRef, value);
+            get => (string)this.Fields[(int)ClassSymbolFields.DefaultProgIdRef];
+            set => this.Set((int)ClassSymbolFields.DefaultProgIdRef, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)ClassTupleFields.Description];
-            set => this.Set((int)ClassTupleFields.Description, value);
+            get => (string)this.Fields[(int)ClassSymbolFields.Description];
+            set => this.Set((int)ClassSymbolFields.Description, value);
         }
 
         public string AppIdRef
         {
-            get => (string)this.Fields[(int)ClassTupleFields.AppIdRef];
-            set => this.Set((int)ClassTupleFields.AppIdRef, value);
+            get => (string)this.Fields[(int)ClassSymbolFields.AppIdRef];
+            set => this.Set((int)ClassSymbolFields.AppIdRef, value);
         }
 
         public string FileTypeMask
         {
-            get => (string)this.Fields[(int)ClassTupleFields.FileTypeMask];
-            set => this.Set((int)ClassTupleFields.FileTypeMask, value);
+            get => (string)this.Fields[(int)ClassSymbolFields.FileTypeMask];
+            set => this.Set((int)ClassSymbolFields.FileTypeMask, value);
         }
 
         public string IconRef
         {
-            get => (string)this.Fields[(int)ClassTupleFields.IconRef];
-            set => this.Set((int)ClassTupleFields.IconRef, value);
+            get => (string)this.Fields[(int)ClassSymbolFields.IconRef];
+            set => this.Set((int)ClassSymbolFields.IconRef, value);
         }
 
         public int? IconIndex
         {
-            get => (int?)this.Fields[(int)ClassTupleFields.IconIndex];
-            set => this.Set((int)ClassTupleFields.IconIndex, value);
+            get => (int?)this.Fields[(int)ClassSymbolFields.IconIndex];
+            set => this.Set((int)ClassSymbolFields.IconIndex, value);
         }
 
         public string DefInprocHandler
         {
-            get => (string)this.Fields[(int)ClassTupleFields.DefInprocHandler];
-            set => this.Set((int)ClassTupleFields.DefInprocHandler, value);
+            get => (string)this.Fields[(int)ClassSymbolFields.DefInprocHandler];
+            set => this.Set((int)ClassSymbolFields.DefInprocHandler, value);
         }
 
         public string Argument
         {
-            get => (string)this.Fields[(int)ClassTupleFields.Argument];
-            set => this.Set((int)ClassTupleFields.Argument, value);
+            get => (string)this.Fields[(int)ClassSymbolFields.Argument];
+            set => this.Set((int)ClassSymbolFields.Argument, value);
         }
 
         public string FeatureRef
         {
-            get => (string)this.Fields[(int)ClassTupleFields.FeatureRef];
-            set => this.Set((int)ClassTupleFields.FeatureRef, value);
+            get => (string)this.Fields[(int)ClassSymbolFields.FeatureRef];
+            set => this.Set((int)ClassSymbolFields.FeatureRef, value);
         }
 
         public bool RelativePath
         {
-            get => this.Fields[(int)ClassTupleFields.RelativePath].AsBool();
-            set => this.Set((int)ClassTupleFields.RelativePath, value);
+            get => this.Fields[(int)ClassSymbolFields.RelativePath].AsBool();
+            set => this.Set((int)ClassSymbolFields.RelativePath, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ComboBoxTuple.cs b/src/WixToolset.Data/Tuples/ComboBoxTuple.cs
index f3629c5f..c7d8d986 100644
--- a/src/WixToolset.Data/Tuples/ComboBoxTuple.cs
+++ b/src/WixToolset.Data/Tuples/ComboBoxTuple.cs
@@ -2,26 +2,26 @@
 
 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 ComboBox = new IntermediateTupleDefinition(
-            TupleDefinitionType.ComboBox,
+        public static readonly IntermediateSymbolDefinition ComboBox = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.ComboBox,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ComboBoxTupleFields.Property), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ComboBoxTupleFields.Order), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ComboBoxTupleFields.Value), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ComboBoxTupleFields.Text), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComboBoxSymbolFields.Property), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComboBoxSymbolFields.Order), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ComboBoxSymbolFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComboBoxSymbolFields.Text), IntermediateFieldType.String),
             },
-            typeof(ComboBoxTuple));
+            typeof(ComboBoxSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ComboBoxTupleFields
+    public enum ComboBoxSymbolFields
     {
         Property,
         Order,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
         Text,
     }
 
-    public class ComboBoxTuple : IntermediateTuple
+    public class ComboBoxSymbol : IntermediateSymbol
     {
-        public ComboBoxTuple() : base(TupleDefinitions.ComboBox, null, null)
+        public ComboBoxSymbol() : base(SymbolDefinitions.ComboBox, null, null)
         {
         }
 
-        public ComboBoxTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ComboBox, sourceLineNumber, id)
+        public ComboBoxSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ComboBox, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ComboBoxTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ComboBoxSymbolFields index] => this.Fields[(int)index];
 
         public string Property
         {
-            get => (string)this.Fields[(int)ComboBoxTupleFields.Property];
-            set => this.Set((int)ComboBoxTupleFields.Property, value);
+            get => (string)this.Fields[(int)ComboBoxSymbolFields.Property];
+            set => this.Set((int)ComboBoxSymbolFields.Property, value);
         }
 
         public int Order
         {
-            get => (int)this.Fields[(int)ComboBoxTupleFields.Order];
-            set => this.Set((int)ComboBoxTupleFields.Order, value);
+            get => (int)this.Fields[(int)ComboBoxSymbolFields.Order];
+            set => this.Set((int)ComboBoxSymbolFields.Order, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)ComboBoxTupleFields.Value];
-            set => this.Set((int)ComboBoxTupleFields.Value, value);
+            get => (string)this.Fields[(int)ComboBoxSymbolFields.Value];
+            set => this.Set((int)ComboBoxSymbolFields.Value, value);
         }
 
         public string Text
         {
-            get => (string)this.Fields[(int)ComboBoxTupleFields.Text];
-            set => this.Set((int)ComboBoxTupleFields.Text, value);
+            get => (string)this.Fields[(int)ComboBoxSymbolFields.Text];
+            set => this.Set((int)ComboBoxSymbolFields.Text, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/CompLocatorTuple.cs b/src/WixToolset.Data/Tuples/CompLocatorTuple.cs
index 58b32604..9004859c 100644
--- a/src/WixToolset.Data/Tuples/CompLocatorTuple.cs
+++ b/src/WixToolset.Data/Tuples/CompLocatorTuple.cs
@@ -2,59 +2,59 @@
 
 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 CompLocator = new IntermediateTupleDefinition(
-            TupleDefinitionType.CompLocator,
+        public static readonly IntermediateSymbolDefinition CompLocator = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.CompLocator,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(CompLocatorTupleFields.SignatureRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(CompLocatorTupleFields.ComponentId), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(CompLocatorTupleFields.Type), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(CompLocatorSymbolFields.SignatureRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(CompLocatorSymbolFields.ComponentId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(CompLocatorSymbolFields.Type), IntermediateFieldType.Number),
             },
-            typeof(CompLocatorTuple));
+            typeof(CompLocatorSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum CompLocatorTupleFields
+    public enum CompLocatorSymbolFields
     {
         SignatureRef,
         ComponentId,
         Type,
     }
 
-    public class CompLocatorTuple : IntermediateTuple
+    public class CompLocatorSymbol : IntermediateSymbol
     {
-        public CompLocatorTuple() : base(TupleDefinitions.CompLocator, null, null)
+        public CompLocatorSymbol() : base(SymbolDefinitions.CompLocator, null, null)
         {
         }
 
-        public CompLocatorTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.CompLocator, sourceLineNumber, id)
+        public CompLocatorSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.CompLocator, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[CompLocatorTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[CompLocatorSymbolFields index] => this.Fields[(int)index];
 
         public string SignatureRef
         {
-            get => (string)this.Fields[(int)CompLocatorTupleFields.SignatureRef];
-            set => this.Set((int)CompLocatorTupleFields.SignatureRef, value);
+            get => (string)this.Fields[(int)CompLocatorSymbolFields.SignatureRef];
+            set => this.Set((int)CompLocatorSymbolFields.SignatureRef, value);
         }
 
         public string ComponentId
         {
-            get => (string)this.Fields[(int)CompLocatorTupleFields.ComponentId];
-            set => this.Set((int)CompLocatorTupleFields.ComponentId, value);
+            get => (string)this.Fields[(int)CompLocatorSymbolFields.ComponentId];
+            set => this.Set((int)CompLocatorSymbolFields.ComponentId, value);
         }
 
         public LocatorType Type
         {
-            get => (LocatorType)this.Fields[(int)CompLocatorTupleFields.Type].AsNumber();
-            set => this.Set((int)CompLocatorTupleFields.Type, (int)value);
+            get => (LocatorType)this.Fields[(int)CompLocatorSymbolFields.Type].AsNumber();
+            set => this.Set((int)CompLocatorSymbolFields.Type, (int)value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ComplusTuple.cs b/src/WixToolset.Data/Tuples/ComplusTuple.cs
index 428f3a8e..fa16af86 100644
--- a/src/WixToolset.Data/Tuples/ComplusTuple.cs
+++ b/src/WixToolset.Data/Tuples/ComplusTuple.cs
@@ -2,51 +2,51 @@
 
 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 Complus = new IntermediateTupleDefinition(
-            TupleDefinitionType.Complus,
+        public static readonly IntermediateSymbolDefinition Complus = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.Complus,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ComplusTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ComplusTupleFields.ExpType), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ComplusSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComplusSymbolFields.ExpType), IntermediateFieldType.Number),
             },
-            typeof(ComplusTuple));
+            typeof(ComplusSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ComplusTupleFields
+    public enum ComplusSymbolFields
     {
         ComponentRef,
         ExpType,
     }
 
-    public class ComplusTuple : IntermediateTuple
+    public class ComplusSymbol : IntermediateSymbol
     {
-        public ComplusTuple() : base(TupleDefinitions.Complus, null, null)
+        public ComplusSymbol() : base(SymbolDefinitions.Complus, null, null)
         {
         }
 
-        public ComplusTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Complus, sourceLineNumber, id)
+        public ComplusSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Complus, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ComplusTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ComplusSymbolFields index] => this.Fields[(int)index];
 
         public string ComponentRef
         {
-            get => (string)this.Fields[(int)ComplusTupleFields.ComponentRef];
-            set => this.Set((int)ComplusTupleFields.ComponentRef, value);
+            get => (string)this.Fields[(int)ComplusSymbolFields.ComponentRef];
+            set => this.Set((int)ComplusSymbolFields.ComponentRef, value);
         }
 
         public int? ExpType
         {
-            get => (int?)this.Fields[(int)ComplusTupleFields.ExpType];
-            set => this.Set((int)ComplusTupleFields.ExpType, value);
+            get => (int?)this.Fields[(int)ComplusSymbolFields.ExpType];
+            set => this.Set((int)ComplusSymbolFields.ExpType, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ComponentTuple.cs b/src/WixToolset.Data/Tuples/ComponentTuple.cs
index 51693b53..13d398b1 100644
--- a/src/WixToolset.Data/Tuples/ComponentTuple.cs
+++ b/src/WixToolset.Data/Tuples/ComponentTuple.cs
@@ -2,36 +2,36 @@
 
 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 Component = new IntermediateTupleDefinition(
-            TupleDefinitionType.Component,
+        public static readonly IntermediateSymbolDefinition Component = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.Component,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ComponentTupleFields.ComponentId), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ComponentTupleFields.DirectoryRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ComponentTupleFields.Location), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ComponentTupleFields.DisableRegistryReflection), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(ComponentTupleFields.NeverOverwrite), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(ComponentTupleFields.Permanent), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(ComponentTupleFields.SharedDllRefCount), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(ComponentTupleFields.Shared), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(ComponentTupleFields.Transitive), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(ComponentTupleFields.UninstallWhenSuperseded), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(ComponentTupleFields.Win64), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(ComponentTupleFields.Condition), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ComponentTupleFields.KeyPath), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ComponentTupleFields.KeyPathType), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ComponentSymbolFields.ComponentId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComponentSymbolFields.DirectoryRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComponentSymbolFields.Location), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ComponentSymbolFields.DisableRegistryReflection), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ComponentSymbolFields.NeverOverwrite), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ComponentSymbolFields.Permanent), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ComponentSymbolFields.SharedDllRefCount), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ComponentSymbolFields.Shared), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ComponentSymbolFields.Transitive), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ComponentSymbolFields.UninstallWhenSuperseded), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ComponentSymbolFields.Win64), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ComponentSymbolFields.Condition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComponentSymbolFields.KeyPath), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ComponentSymbolFields.KeyPathType), IntermediateFieldType.Number),
             },
-            typeof(ComponentTuple));
+            typeof(ComponentSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ComponentTupleFields
+    public enum ComponentSymbolFields
     {
         ComponentId,
         DirectoryRef,
@@ -56,100 +56,100 @@ namespace WixToolset.Data.Tuples
         Either
     }
 
-    public class ComponentTuple : IntermediateTuple
+    public class ComponentSymbol : IntermediateSymbol
     {
-        public ComponentTuple() : base(TupleDefinitions.Component, null, null)
+        public ComponentSymbol() : base(SymbolDefinitions.Component, null, null)
         {
         }
 
-        public ComponentTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Component, sourceLineNumber, id)
+        public ComponentSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Component, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ComponentTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ComponentSymbolFields index] => this.Fields[(int)index];
 
         public string ComponentId
         {
-            get => (string)this.Fields[(int)ComponentTupleFields.ComponentId];
-            set => this.Set((int)ComponentTupleFields.ComponentId, value);
+            get => (string)this.Fields[(int)ComponentSymbolFields.ComponentId];
+            set => this.Set((int)ComponentSymbolFields.ComponentId, value);
         }
 
         public string DirectoryRef
         {
-            get => (string)this.Fields[(int)ComponentTupleFields.DirectoryRef];
-            set => this.Set((int)ComponentTupleFields.DirectoryRef, value);
+            get => (string)this.Fields[(int)ComponentSymbolFields.DirectoryRef];
+            set => this.Set((int)ComponentSymbolFields.DirectoryRef, value);
         }
 
         public ComponentLocation Location
         {
-            get => (ComponentLocation)this.Fields[(int)ComponentTupleFields.Location].AsNumber();
-            set => this.Set((int)ComponentTupleFields.Location, (int)value);
+            get => (ComponentLocation)this.Fields[(int)ComponentSymbolFields.Location].AsNumber();
+            set => this.Set((int)ComponentSymbolFields.Location, (int)value);
         }
 
         public bool DisableRegistryReflection
         {
-            get => this.Fields[(int)ComponentTupleFields.DisableRegistryReflection].AsBool();
-            set => this.Set((int)ComponentTupleFields.DisableRegistryReflection, value);
+            get => this.Fields[(int)ComponentSymbolFields.DisableRegistryReflection].AsBool();
+            set => this.Set((int)ComponentSymbolFields.DisableRegistryReflection, value);
         }
 
         public bool NeverOverwrite
         {
-            get => this.Fields[(int)ComponentTupleFields.NeverOverwrite].AsBool();
-            set => this.Set((int)ComponentTupleFields.NeverOverwrite, value);
+            get => this.Fields[(int)ComponentSymbolFields.NeverOverwrite].AsBool();
+            set => this.Set((int)ComponentSymbolFields.NeverOverwrite, value);
         }
 
         public bool Permanent
         {
-            get => this.Fields[(int)ComponentTupleFields.Permanent].AsBool();
-            set => this.Set((int)ComponentTupleFields.Permanent, value);
+            get => this.Fields[(int)ComponentSymbolFields.Permanent].AsBool();
+            set => this.Set((int)ComponentSymbolFields.Permanent, value);
         }
 
         public bool SharedDllRefCount
         {
-            get => this.Fields[(int)ComponentTupleFields.SharedDllRefCount].AsBool();
-            set => this.Set((int)ComponentTupleFields.SharedDllRefCount, value);
+            get => this.Fields[(int)ComponentSymbolFields.SharedDllRefCount].AsBool();
+            set => this.Set((int)ComponentSymbolFields.SharedDllRefCount, value);
         }
 
         public bool Shared
         {
-            get => this.Fields[(int)ComponentTupleFields.Shared].AsBool();
-            set => this.Set((int)ComponentTupleFields.Shared, value);
+            get => this.Fields[(int)ComponentSymbolFields.Shared].AsBool();
+            set => this.Set((int)ComponentSymbolFields.Shared, value);
         }
 
         public bool Transitive
         {
-            get => this.Fields[(int)ComponentTupleFields.Transitive].AsBool();
-            set => this.Set((int)ComponentTupleFields.Transitive, value);
+            get => this.Fields[(int)ComponentSymbolFields.Transitive].AsBool();
+            set => this.Set((int)ComponentSymbolFields.Transitive, value);
         }
 
         public bool UninstallWhenSuperseded
         {
-            get => this.Fields[(int)ComponentTupleFields.UninstallWhenSuperseded].AsBool();
-            set => this.Set((int)ComponentTupleFields.UninstallWhenSuperseded, value);
+            get => this.Fields[(int)ComponentSymbolFields.UninstallWhenSuperseded].AsBool();
+            set => this.Set((int)ComponentSymbolFields.UninstallWhenSuperseded, value);
         }
 
         public bool Win64
         {
-            get => this.Fields[(int)ComponentTupleFields.Win64].AsBool();
-            set => this.Set((int)ComponentTupleFields.Win64, value);
+            get => this.Fields[(int)ComponentSymbolFields.Win64].AsBool();
+            set => this.Set((int)ComponentSymbolFields.Win64, value);
         }
 
         public string Condition
         {
-            get => (string)this.Fields[(int)ComponentTupleFields.Condition];
-            set => this.Set((int)ComponentTupleFields.Condition, value);
+            get => (string)this.Fields[(int)ComponentSymbolFields.Condition];
+            set => this.Set((int)ComponentSymbolFields.Condition, value);
         }
 
         public string KeyPath
         {
-            get => (string)this.Fields[(int)ComponentTupleFields.KeyPath];
-            set => this.Set((int)ComponentTupleFields.KeyPath, value);
+            get => (string)this.Fields[(int)ComponentSymbolFields.KeyPath];
+            set => this.Set((int)ComponentSymbolFields.KeyPath, value);
         }
 
         public ComponentKeyPathType KeyPathType
         {
-            get => (ComponentKeyPathType)this.Fields[(int)ComponentTupleFields.KeyPathType].AsNumber();
-            set => this.Set((int)ComponentTupleFields.KeyPathType, (int)value);
+            get => (ComponentKeyPathType)this.Fields[(int)ComponentSymbolFields.KeyPathType].AsNumber();
+            set => this.Set((int)ComponentSymbolFields.KeyPathType, (int)value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ConditionTuple.cs b/src/WixToolset.Data/Tuples/ConditionTuple.cs
index 9b2284a4..3a94ebb1 100644
--- a/src/WixToolset.Data/Tuples/ConditionTuple.cs
+++ b/src/WixToolset.Data/Tuples/ConditionTuple.cs
@@ -2,59 +2,59 @@
 
 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 Condition = new IntermediateTupleDefinition(
-            TupleDefinitionType.Condition,
+        public static readonly IntermediateSymbolDefinition Condition = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.Condition,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ConditionTupleFields.FeatureRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ConditionTupleFields.Level), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ConditionTupleFields.Condition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ConditionSymbolFields.FeatureRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ConditionSymbolFields.Level), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ConditionSymbolFields.Condition), IntermediateFieldType.String),
             },
-            typeof(ConditionTuple));
+            typeof(ConditionSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ConditionTupleFields
+    public enum ConditionSymbolFields
     {
         FeatureRef,
         Level,
         Condition,
     }
 
-    public class ConditionTuple : IntermediateTuple
+    public class ConditionSymbol : IntermediateSymbol
     {
-        public ConditionTuple() : base(TupleDefinitions.Condition, null, null)
+        public ConditionSymbol() : base(SymbolDefinitions.Condition, null, null)
         {
         }
 
-        public ConditionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Condition, sourceLineNumber, id)
+        public ConditionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Condition, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ConditionTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ConditionSymbolFields index] => this.Fields[(int)index];
 
         public string FeatureRef
         {
-            get => (string)this.Fields[(int)ConditionTupleFields.FeatureRef];
-            set => this.Set((int)ConditionTupleFields.FeatureRef, value);
+            get => (string)this.Fields[(int)ConditionSymbolFields.FeatureRef];
+            set => this.Set((int)ConditionSymbolFields.FeatureRef, value);
         }
 
         public int Level
         {
-            get => (int)this.Fields[(int)ConditionTupleFields.Level];
-            set => this.Set((int)ConditionTupleFields.Level, value);
+            get => (int)this.Fields[(int)ConditionSymbolFields.Level];
+            set => this.Set((int)ConditionSymbolFields.Level, value);
         }
 
         public string Condition
         {
-            get => (string)this.Fields[(int)ConditionTupleFields.Condition];
-            set => this.Set((int)ConditionTupleFields.Condition, value);
+            get => (string)this.Fields[(int)ConditionSymbolFields.Condition];
+            set => this.Set((int)ConditionSymbolFields.Condition, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ControlConditionTuple.cs b/src/WixToolset.Data/Tuples/ControlConditionTuple.cs
index 2e5dbf77..cc5f2d74 100644
--- a/src/WixToolset.Data/Tuples/ControlConditionTuple.cs
+++ b/src/WixToolset.Data/Tuples/ControlConditionTuple.cs
@@ -2,26 +2,26 @@
 
 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 ControlCondition = new IntermediateTupleDefinition(
-            TupleDefinitionType.ControlCondition,
+        public static readonly IntermediateSymbolDefinition ControlCondition = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.ControlCondition,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ControlConditionTupleFields.DialogRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ControlConditionTupleFields.ControlRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ControlConditionTupleFields.Action), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ControlConditionTupleFields.Condition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlConditionSymbolFields.DialogRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlConditionSymbolFields.ControlRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlConditionSymbolFields.Action), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlConditionSymbolFields.Condition), IntermediateFieldType.String),
             },
-            typeof(ControlConditionTuple));
+            typeof(ControlConditionSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ControlConditionTupleFields
+    public enum ControlConditionSymbolFields
     {
         DialogRef,
         ControlRef,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
         Condition,
     }
 
-    public class ControlConditionTuple : IntermediateTuple
+    public class ControlConditionSymbol : IntermediateSymbol
     {
-        public ControlConditionTuple() : base(TupleDefinitions.ControlCondition, null, null)
+        public ControlConditionSymbol() : base(SymbolDefinitions.ControlCondition, null, null)
         {
         }
 
-        public ControlConditionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ControlCondition, sourceLineNumber, id)
+        public ControlConditionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ControlCondition, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ControlConditionTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ControlConditionSymbolFields index] => this.Fields[(int)index];
 
         public string DialogRef
         {
-            get => (string)this.Fields[(int)ControlConditionTupleFields.DialogRef];
-            set => this.Set((int)ControlConditionTupleFields.DialogRef, value);
+            get => (string)this.Fields[(int)ControlConditionSymbolFields.DialogRef];
+            set => this.Set((int)ControlConditionSymbolFields.DialogRef, value);
         }
 
         public string ControlRef
         {
-            get => (string)this.Fields[(int)ControlConditionTupleFields.ControlRef];
-            set => this.Set((int)ControlConditionTupleFields.ControlRef, value);
+            get => (string)this.Fields[(int)ControlConditionSymbolFields.ControlRef];
+            set => this.Set((int)ControlConditionSymbolFields.ControlRef, value);
         }
 
         public string Action
         {
-            get => (string)this.Fields[(int)ControlConditionTupleFields.Action];
-            set => this.Set((int)ControlConditionTupleFields.Action, value);
+            get => (string)this.Fields[(int)ControlConditionSymbolFields.Action];
+            set => this.Set((int)ControlConditionSymbolFields.Action, value);
         }
 
         public string Condition
         {
-            get => (string)this.Fields[(int)ControlConditionTupleFields.Condition];
-            set => this.Set((int)ControlConditionTupleFields.Condition, value);
+            get => (string)this.Fields[(int)ControlConditionSymbolFields.Condition];
+            set => this.Set((int)ControlConditionSymbolFields.Condition, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ControlEventTuple.cs b/src/WixToolset.Data/Tuples/ControlEventTuple.cs
index 9c460353..3cf6da53 100644
--- a/src/WixToolset.Data/Tuples/ControlEventTuple.cs
+++ b/src/WixToolset.Data/Tuples/ControlEventTuple.cs
@@ -2,28 +2,28 @@
 
 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 ControlEvent = new IntermediateTupleDefinition(
-            TupleDefinitionType.ControlEvent,
+        public static readonly IntermediateSymbolDefinition ControlEvent = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.ControlEvent,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ControlEventTupleFields.DialogRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ControlEventTupleFields.ControlRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ControlEventTupleFields.Event), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ControlEventTupleFields.Argument), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ControlEventTupleFields.Condition), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ControlEventTupleFields.Ordering), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ControlEventSymbolFields.DialogRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlEventSymbolFields.ControlRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlEventSymbolFields.Event), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlEventSymbolFields.Argument), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlEventSymbolFields.Condition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ControlEventSymbolFields.Ordering), IntermediateFieldType.Number),
             },
-            typeof(ControlEventTuple));
+            typeof(ControlEventSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ControlEventTupleFields
+    public enum ControlEventSymbolFields
     {
         DialogRef,
         ControlRef,
@@ -33,52 +33,52 @@ namespace WixToolset.Data.Tuples
         Ordering,
     }
 
-    public class ControlEventTuple : IntermediateTuple
+    public class ControlEventSymbol : IntermediateSymbol
     {
-        public ControlEventTuple() : base(TupleDefinitions.ControlEvent, null, null)
+        public ControlEventSymbol() : base(SymbolDefinitions.ControlEvent, null, null)
         {
         }
 
-        public ControlEventTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ControlEvent, sourceLineNumber, id)
+        public ControlEventSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ControlEvent, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ControlEventTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ControlEventSymbolFields index] => this.Fields[(int)index];
 
         public string DialogRef
         {
-            get => (string)this.Fields[(int)ControlEventTupleFields.DialogRef];
-            set => this.Set((int)ControlEventTupleFields.DialogRef, value);
+            get => (string)this.Fields[(int)ControlEventSymbolFields.DialogRef];
+            set => this.Set((int)ControlEventSymbolFields.DialogRef, value);
         }
 
         public string ControlRef
         {
-            get => (string)this.Fields[(int)ControlEventTupleFields.ControlRef];
-            set => this.Set((int)ControlEventTupleFields.ControlRef, value);
+            get => (string)this.Fields[(int)ControlEventSymbolFields.ControlRef];
+            set => this.Set((int)ControlEventSymbolFields.ControlRef, value);
         }
 
         public string Event
         {
-            get => (string)this.Fields[(int)ControlEventTupleFields.Event];
-            set => this.Set((int)ControlEventTupleFields.Event, value);
+            get => (string)this.Fields[(int)ControlEventSymbolFields.Event];
+            set => this.Set((int)ControlEventSymbolFields.Event, value);
         }
 
         public string Argument
         {
-            get => (string)this.Fields[(int)ControlEventTupleFields.Argument];
-            set => this.Set((int)ControlEventTupleFields.Argument, value);
+            get => (string)this.Fields[(int)ControlEventSymbolFields.Argument];
+            set => this.Set((int)ControlEventSymbolFields.Argument, value);
         }
 
         public string Condition
         {
-            get => (string)this.Fields[(int)ControlEventTupleFields.Condition];
-            set => this.Set((int)ControlEventTupleFields.Condition, value);
+            get => (string)this.Fields[(int)ControlEventSymbolFields.Condition];
+            set => this.Set((int)ControlEventSymbolFields.Condition, value);
         }
 
         public int? Ordering
         {
-            get => (int?)this.Fields[(int)ControlEventTupleFields.Ordering];
-            set => this.Set((int)ControlEventTupleFields.Ordering, value);
+            get => (int?)this.Fields[(int)ControlEventSymbolFields.Ordering];
+            set => this.Set((int)ControlEventSymbolFields.Ordering, value);
         }
     }
 }
\ No newline at end of file
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
diff --git a/src/WixToolset.Data/Tuples/CreateFolderTuple.cs b/src/WixToolset.Data/Tuples/CreateFolderTuple.cs
index d9d4763e..2b282266 100644
--- a/src/WixToolset.Data/Tuples/CreateFolderTuple.cs
+++ b/src/WixToolset.Data/Tuples/CreateFolderTuple.cs
@@ -2,51 +2,51 @@
 
 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 CreateFolder = new IntermediateTupleDefinition(
-            TupleDefinitionType.CreateFolder,
+        public static readonly IntermediateSymbolDefinition CreateFolder = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.CreateFolder,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(CreateFolderTupleFields.DirectoryRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(CreateFolderTupleFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(CreateFolderSymbolFields.DirectoryRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(CreateFolderSymbolFields.ComponentRef), IntermediateFieldType.String),
             },
-            typeof(CreateFolderTuple));
+            typeof(CreateFolderSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum CreateFolderTupleFields
+    public enum CreateFolderSymbolFields
     {
         DirectoryRef,
         ComponentRef,
     }
 
-    public class CreateFolderTuple : IntermediateTuple
+    public class CreateFolderSymbol : IntermediateSymbol
     {
-        public CreateFolderTuple() : base(TupleDefinitions.CreateFolder, null, null)
+        public CreateFolderSymbol() : base(SymbolDefinitions.CreateFolder, null, null)
         {
         }
 
-        public CreateFolderTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.CreateFolder, sourceLineNumber, id)
+        public CreateFolderSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.CreateFolder, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[CreateFolderTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[CreateFolderSymbolFields index] => this.Fields[(int)index];
 
         public string DirectoryRef
         {
-            get => (string)this.Fields[(int)CreateFolderTupleFields.DirectoryRef];
-            set => this.Set((int)CreateFolderTupleFields.DirectoryRef, value);
+            get => (string)this.Fields[(int)CreateFolderSymbolFields.DirectoryRef];
+            set => this.Set((int)CreateFolderSymbolFields.DirectoryRef, value);
         }
 
         public string ComponentRef
         {
-            get => (string)this.Fields[(int)CreateFolderTupleFields.ComponentRef];
-            set => this.Set((int)CreateFolderTupleFields.ComponentRef, value);
+            get => (string)this.Fields[(int)CreateFolderSymbolFields.ComponentRef];
+            set => this.Set((int)CreateFolderSymbolFields.ComponentRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/CustomActionTuple.cs b/src/WixToolset.Data/Tuples/CustomActionTuple.cs
index b2b34df0..1180dab4 100644
--- a/src/WixToolset.Data/Tuples/CustomActionTuple.cs
+++ b/src/WixToolset.Data/Tuples/CustomActionTuple.cs
@@ -2,35 +2,35 @@
 
 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 CustomAction = new IntermediateTupleDefinition(
-            TupleDefinitionType.CustomAction,
+        public static readonly IntermediateSymbolDefinition CustomAction = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.CustomAction,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(CustomActionTupleFields.ExecutionType), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(CustomActionTupleFields.Source), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(CustomActionTupleFields.SourceType), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(CustomActionTupleFields.Target), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(CustomActionTupleFields.TargetType), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(CustomActionTupleFields.Async), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(CustomActionTupleFields.Hidden), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(CustomActionTupleFields.IgnoreResult), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(CustomActionTupleFields.Impersonate), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(CustomActionTupleFields.PatchUninstall), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(CustomActionTupleFields.TSAware), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(CustomActionTupleFields.Win64), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(CustomActionTupleFields.ScriptFile), IntermediateFieldType.Path),
+                new IntermediateFieldDefinition(nameof(CustomActionSymbolFields.ExecutionType), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(CustomActionSymbolFields.Source), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(CustomActionSymbolFields.SourceType), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(CustomActionSymbolFields.Target), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(CustomActionSymbolFields.TargetType), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(CustomActionSymbolFields.Async), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(CustomActionSymbolFields.Hidden), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(CustomActionSymbolFields.IgnoreResult), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(CustomActionSymbolFields.Impersonate), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(CustomActionSymbolFields.PatchUninstall), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(CustomActionSymbolFields.TSAware), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(CustomActionSymbolFields.Win64), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(CustomActionSymbolFields.ScriptFile), IntermediateFieldType.Path),
             },
-            typeof(CustomActionTuple));
+            typeof(CustomActionSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum CustomActionTupleFields
+    public enum CustomActionSymbolFields
     {
         ExecutionType,
         Source,
@@ -75,94 +75,94 @@ namespace WixToolset.Data.Tuples
         VBScript = 6,
     }
 
-    public class CustomActionTuple : IntermediateTuple
+    public class CustomActionSymbol : IntermediateSymbol
     {
-        public CustomActionTuple() : base(TupleDefinitions.CustomAction, null, null)
+        public CustomActionSymbol() : base(SymbolDefinitions.CustomAction, null, null)
         {
         }
 
-        public CustomActionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.CustomAction, sourceLineNumber, id)
+        public CustomActionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.CustomAction, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[CustomActionTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[CustomActionSymbolFields index] => this.Fields[(int)index];
 
         public CustomActionExecutionType ExecutionType
         {
-            get => (CustomActionExecutionType)this.Fields[(int)CustomActionTupleFields.ExecutionType].AsNumber();
-            set => this.Set((int)CustomActionTupleFields.ExecutionType, (int)value);
+            get => (CustomActionExecutionType)this.Fields[(int)CustomActionSymbolFields.ExecutionType].AsNumber();
+            set => this.Set((int)CustomActionSymbolFields.ExecutionType, (int)value);
         }
 
         public string Source
         {
-            get => (string)this.Fields[(int)CustomActionTupleFields.Source];
-            set => this.Set((int)CustomActionTupleFields.Source, value);
+            get => (string)this.Fields[(int)CustomActionSymbolFields.Source];
+            set => this.Set((int)CustomActionSymbolFields.Source, value);
         }
 
         public CustomActionSourceType SourceType
         {
-            get => (CustomActionSourceType)this.Fields[(int)CustomActionTupleFields.SourceType].AsNumber();
-            set => this.Set((int)CustomActionTupleFields.SourceType, (int)value);
+            get => (CustomActionSourceType)this.Fields[(int)CustomActionSymbolFields.SourceType].AsNumber();
+            set => this.Set((int)CustomActionSymbolFields.SourceType, (int)value);
         }
 
         public string Target
         {
-            get => (string)this.Fields[(int)CustomActionTupleFields.Target];
-            set => this.Set((int)CustomActionTupleFields.Target, value);
+            get => (string)this.Fields[(int)CustomActionSymbolFields.Target];
+            set => this.Set((int)CustomActionSymbolFields.Target, value);
         }
 
         public CustomActionTargetType TargetType
         {
-            get => (CustomActionTargetType)this.Fields[(int)CustomActionTupleFields.TargetType].AsNumber();
-            set => this.Set((int)CustomActionTupleFields.TargetType, (int)value);
+            get => (CustomActionTargetType)this.Fields[(int)CustomActionSymbolFields.TargetType].AsNumber();
+            set => this.Set((int)CustomActionSymbolFields.TargetType, (int)value);
         }
 
         public bool Async
         {
-            get => this.Fields[(int)CustomActionTupleFields.Async].AsBool();
-            set => this.Set((int)CustomActionTupleFields.Async, value);
+            get => this.Fields[(int)CustomActionSymbolFields.Async].AsBool();
+            set => this.Set((int)CustomActionSymbolFields.Async, value);
         }
 
         public bool Hidden
         {
-            get => this.Fields[(int)CustomActionTupleFields.Hidden].AsBool();
-            set => this.Set((int)CustomActionTupleFields.Hidden, value);
+            get => this.Fields[(int)CustomActionSymbolFields.Hidden].AsBool();
+            set => this.Set((int)CustomActionSymbolFields.Hidden, value);
         }
 
         public bool IgnoreResult
         {
-            get => this.Fields[(int)CustomActionTupleFields.IgnoreResult].AsBool();
-            set => this.Set((int)CustomActionTupleFields.IgnoreResult, value);
+            get => this.Fields[(int)CustomActionSymbolFields.IgnoreResult].AsBool();
+            set => this.Set((int)CustomActionSymbolFields.IgnoreResult, value);
         }
 
         public bool Impersonate
         {
-            get => this.Fields[(int)CustomActionTupleFields.Impersonate].AsBool();
-            set => this.Set((int)CustomActionTupleFields.Impersonate, value);
+            get => this.Fields[(int)CustomActionSymbolFields.Impersonate].AsBool();
+            set => this.Set((int)CustomActionSymbolFields.Impersonate, value);
         }
 
         public bool PatchUninstall
         {
-            get => this.Fields[(int)CustomActionTupleFields.PatchUninstall].AsBool();
-            set => this.Set((int)CustomActionTupleFields.PatchUninstall, value);
+            get => this.Fields[(int)CustomActionSymbolFields.PatchUninstall].AsBool();
+            set => this.Set((int)CustomActionSymbolFields.PatchUninstall, value);
         }
 
         public bool TSAware
         {
-            get => this.Fields[(int)CustomActionTupleFields.TSAware].AsBool();
-            set => this.Set((int)CustomActionTupleFields.TSAware, value);
+            get => this.Fields[(int)CustomActionSymbolFields.TSAware].AsBool();
+            set => this.Set((int)CustomActionSymbolFields.TSAware, value);
         }
 
         public bool Win64
         {
-            get => this.Fields[(int)CustomActionTupleFields.Win64].AsBool();
-            set => this.Set((int)CustomActionTupleFields.Win64, value);
+            get => this.Fields[(int)CustomActionSymbolFields.Win64].AsBool();
+            set => this.Set((int)CustomActionSymbolFields.Win64, value);
         }
 
         public IntermediateFieldPathValue ScriptFile
         {
-            get => this.Fields[(int)CustomActionTupleFields.ScriptFile].AsPath();
-            set => this.Set((int)CustomActionTupleFields.ScriptFile, value);
+            get => this.Fields[(int)CustomActionSymbolFields.ScriptFile].AsPath();
+            set => this.Set((int)CustomActionSymbolFields.ScriptFile, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/DialogTuple.cs b/src/WixToolset.Data/Tuples/DialogTuple.cs
index 492d2fb1..ee030405 100644
--- a/src/WixToolset.Data/Tuples/DialogTuple.cs
+++ b/src/WixToolset.Data/Tuples/DialogTuple.cs
@@ -2,41 +2,41 @@
 
 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 Dialog = new IntermediateTupleDefinition(
-            TupleDefinitionType.Dialog,
+        public static readonly IntermediateSymbolDefinition Dialog = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.Dialog,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(DialogTupleFields.HCentering), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(DialogTupleFields.VCentering), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(DialogTupleFields.Width), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(DialogTupleFields.Height), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(DialogTupleFields.CustomPalette), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(DialogTupleFields.ErrorDialog), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(DialogTupleFields.Visible), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(DialogTupleFields.Modal), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(DialogTupleFields.KeepModeless), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(DialogTupleFields.LeftScroll), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(DialogTupleFields.Minimize), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(DialogTupleFields.RightAligned), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(DialogTupleFields.RightToLeft), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(DialogTupleFields.SystemModal), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(DialogTupleFields.TrackDiskSpace), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(DialogTupleFields.Title), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(DialogTupleFields.FirstControlRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(DialogTupleFields.DefaultControlRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(DialogTupleFields.CancelControlRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DialogSymbolFields.HCentering), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(DialogSymbolFields.VCentering), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(DialogSymbolFields.Width), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(DialogSymbolFields.Height), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(DialogSymbolFields.CustomPalette), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(DialogSymbolFields.ErrorDialog), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(DialogSymbolFields.Visible), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(DialogSymbolFields.Modal), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(DialogSymbolFields.KeepModeless), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(DialogSymbolFields.LeftScroll), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(DialogSymbolFields.Minimize), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(DialogSymbolFields.RightAligned), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(DialogSymbolFields.RightToLeft), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(DialogSymbolFields.SystemModal), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(DialogSymbolFields.TrackDiskSpace), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(DialogSymbolFields.Title), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DialogSymbolFields.FirstControlRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DialogSymbolFields.DefaultControlRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DialogSymbolFields.CancelControlRef), IntermediateFieldType.String),
             },
-            typeof(DialogTuple));
+            typeof(DialogSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum DialogTupleFields
+    public enum DialogSymbolFields
     {
         HCentering,
         VCentering,
@@ -59,130 +59,130 @@ namespace WixToolset.Data.Tuples
         CancelControlRef,
     }
 
-    public class DialogTuple : IntermediateTuple
+    public class DialogSymbol : IntermediateSymbol
     {
-        public DialogTuple() : base(TupleDefinitions.Dialog, null, null)
+        public DialogSymbol() : base(SymbolDefinitions.Dialog, null, null)
         {
         }
 
-        public DialogTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Dialog, sourceLineNumber, id)
+        public DialogSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Dialog, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[DialogTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[DialogSymbolFields index] => this.Fields[(int)index];
 
         public int HCentering
         {
-            get => (int)this.Fields[(int)DialogTupleFields.HCentering];
-            set => this.Set((int)DialogTupleFields.HCentering, value);
+            get => (int)this.Fields[(int)DialogSymbolFields.HCentering];
+            set => this.Set((int)DialogSymbolFields.HCentering, value);
         }
 
         public int VCentering
         {
-            get => (int)this.Fields[(int)DialogTupleFields.VCentering];
-            set => this.Set((int)DialogTupleFields.VCentering, value);
+            get => (int)this.Fields[(int)DialogSymbolFields.VCentering];
+            set => this.Set((int)DialogSymbolFields.VCentering, value);
         }
 
         public int Width
         {
-            get => (int)this.Fields[(int)DialogTupleFields.Width];
-            set => this.Set((int)DialogTupleFields.Width, value);
+            get => (int)this.Fields[(int)DialogSymbolFields.Width];
+            set => this.Set((int)DialogSymbolFields.Width, value);
         }
 
         public int Height
         {
-            get => (int)this.Fields[(int)DialogTupleFields.Height];
-            set => this.Set((int)DialogTupleFields.Height, value);
+            get => (int)this.Fields[(int)DialogSymbolFields.Height];
+            set => this.Set((int)DialogSymbolFields.Height, value);
         }
 
         public bool CustomPalette
         {
-            get => this.Fields[(int)DialogTupleFields.CustomPalette].AsBool();
-            set => this.Set((int)DialogTupleFields.CustomPalette, value);
+            get => this.Fields[(int)DialogSymbolFields.CustomPalette].AsBool();
+            set => this.Set((int)DialogSymbolFields.CustomPalette, value);
         }
 
         public bool ErrorDialog
         {
-            get => this.Fields[(int)DialogTupleFields.ErrorDialog].AsBool();
-            set => this.Set((int)DialogTupleFields.ErrorDialog, value);
+            get => this.Fields[(int)DialogSymbolFields.ErrorDialog].AsBool();
+            set => this.Set((int)DialogSymbolFields.ErrorDialog, value);
         }
 
         public bool Visible
         {
-            get => this.Fields[(int)DialogTupleFields.Visible].AsBool();
-            set => this.Set((int)DialogTupleFields.Visible, value);
+            get => this.Fields[(int)DialogSymbolFields.Visible].AsBool();
+            set => this.Set((int)DialogSymbolFields.Visible, value);
         }
 
         public bool Modal
         {
-            get => this.Fields[(int)DialogTupleFields.Modal].AsBool();
-            set => this.Set((int)DialogTupleFields.Modal, value);
+            get => this.Fields[(int)DialogSymbolFields.Modal].AsBool();
+            set => this.Set((int)DialogSymbolFields.Modal, value);
         }
 
         public bool KeepModeless
         {
-            get => this.Fields[(int)DialogTupleFields.KeepModeless].AsBool();
-            set => this.Set((int)DialogTupleFields.KeepModeless, value);
+            get => this.Fields[(int)DialogSymbolFields.KeepModeless].AsBool();
+            set => this.Set((int)DialogSymbolFields.KeepModeless, value);
         }
 
         public bool LeftScroll
         {
-            get => this.Fields[(int)DialogTupleFields.LeftScroll].AsBool();
-            set => this.Set((int)DialogTupleFields.LeftScroll, value);
+            get => this.Fields[(int)DialogSymbolFields.LeftScroll].AsBool();
+            set => this.Set((int)DialogSymbolFields.LeftScroll, value);
         }
 
         public bool Minimize
         {
-            get => this.Fields[(int)DialogTupleFields.Minimize].AsBool();
-            set => this.Set((int)DialogTupleFields.Minimize, value);
+            get => this.Fields[(int)DialogSymbolFields.Minimize].AsBool();
+            set => this.Set((int)DialogSymbolFields.Minimize, value);
         }
 
         public bool RightAligned
         {
-            get => this.Fields[(int)DialogTupleFields.RightAligned].AsBool();
-            set => this.Set((int)DialogTupleFields.RightAligned, value);
+            get => this.Fields[(int)DialogSymbolFields.RightAligned].AsBool();
+            set => this.Set((int)DialogSymbolFields.RightAligned, value);
         }
 
         public bool RightToLeft
         {
-            get => this.Fields[(int)DialogTupleFields.RightToLeft].AsBool();
-            set => this.Set((int)DialogTupleFields.RightToLeft, value);
+            get => this.Fields[(int)DialogSymbolFields.RightToLeft].AsBool();
+            set => this.Set((int)DialogSymbolFields.RightToLeft, value);
         }
 
         public bool TrackDiskSpace
         {
-            get => this.Fields[(int)DialogTupleFields.TrackDiskSpace].AsBool();
-            set => this.Set((int)DialogTupleFields.TrackDiskSpace, value);
+            get => this.Fields[(int)DialogSymbolFields.TrackDiskSpace].AsBool();
+            set => this.Set((int)DialogSymbolFields.TrackDiskSpace, value);
         }
 
         public bool SystemModal
         {
-            get => this.Fields[(int)DialogTupleFields.SystemModal].AsBool();
-            set => this.Set((int)DialogTupleFields.SystemModal, value);
+            get => this.Fields[(int)DialogSymbolFields.SystemModal].AsBool();
+            set => this.Set((int)DialogSymbolFields.SystemModal, value);
         }
 
         public string Title
         {
-            get => (string)this.Fields[(int)DialogTupleFields.Title];
-            set => this.Set((int)DialogTupleFields.Title, value);
+            get => (string)this.Fields[(int)DialogSymbolFields.Title];
+            set => this.Set((int)DialogSymbolFields.Title, value);
         }
 
         public string FirstControlRef
         {
-            get => (string)this.Fields[(int)DialogTupleFields.FirstControlRef];
-            set => this.Set((int)DialogTupleFields.FirstControlRef, value);
+            get => (string)this.Fields[(int)DialogSymbolFields.FirstControlRef];
+            set => this.Set((int)DialogSymbolFields.FirstControlRef, value);
         }
 
         public string DefaultControlRef
         {
-            get => (string)this.Fields[(int)DialogTupleFields.DefaultControlRef];
-            set => this.Set((int)DialogTupleFields.DefaultControlRef, value);
+            get => (string)this.Fields[(int)DialogSymbolFields.DefaultControlRef];
+            set => this.Set((int)DialogSymbolFields.DefaultControlRef, value);
         }
 
         public string CancelControlRef
         {
-            get => (string)this.Fields[(int)DialogTupleFields.CancelControlRef];
-            set => this.Set((int)DialogTupleFields.CancelControlRef, value);
+            get => (string)this.Fields[(int)DialogSymbolFields.CancelControlRef];
+            set => this.Set((int)DialogSymbolFields.CancelControlRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/DirectoryTuple.cs b/src/WixToolset.Data/Tuples/DirectoryTuple.cs
index 51f559aa..209f5ca1 100644
--- a/src/WixToolset.Data/Tuples/DirectoryTuple.cs
+++ b/src/WixToolset.Data/Tuples/DirectoryTuple.cs
@@ -2,28 +2,28 @@
 
 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 Directory = new IntermediateTupleDefinition(
-            TupleDefinitionType.Directory,
+        public static readonly IntermediateSymbolDefinition Directory = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.Directory,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(DirectoryTupleFields.ParentDirectoryRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(DirectoryTupleFields.Name), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(DirectoryTupleFields.ShortName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(DirectoryTupleFields.SourceName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(DirectoryTupleFields.SourceShortName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(DirectoryTupleFields.ComponentGuidGenerationSeed), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DirectorySymbolFields.ParentDirectoryRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DirectorySymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DirectorySymbolFields.ShortName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DirectorySymbolFields.SourceName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DirectorySymbolFields.SourceShortName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DirectorySymbolFields.ComponentGuidGenerationSeed), IntermediateFieldType.String),
             },
-            typeof(DirectoryTuple));
+            typeof(DirectorySymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum DirectoryTupleFields
+    public enum DirectorySymbolFields
     {
         ParentDirectoryRef,
         Name,
@@ -33,52 +33,52 @@ namespace WixToolset.Data.Tuples
         ComponentGuidGenerationSeed,
     }
 
-    public class DirectoryTuple : IntermediateTuple
+    public class DirectorySymbol : IntermediateSymbol
     {
-        public DirectoryTuple() : base(TupleDefinitions.Directory, null, null)
+        public DirectorySymbol() : base(SymbolDefinitions.Directory, null, null)
         {
         }
 
-        public DirectoryTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Directory, sourceLineNumber, id)
+        public DirectorySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Directory, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[DirectoryTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[DirectorySymbolFields index] => this.Fields[(int)index];
 
         public string ParentDirectoryRef
         {
-            get => (string)this.Fields[(int)DirectoryTupleFields.ParentDirectoryRef];
-            set => this.Set((int)DirectoryTupleFields.ParentDirectoryRef, value);
+            get => (string)this.Fields[(int)DirectorySymbolFields.ParentDirectoryRef];
+            set => this.Set((int)DirectorySymbolFields.ParentDirectoryRef, value);
         }
 
         public string Name
         {
-            get => (string)this.Fields[(int)DirectoryTupleFields.Name];
-            set => this.Set((int)DirectoryTupleFields.Name, value);
+            get => (string)this.Fields[(int)DirectorySymbolFields.Name];
+            set => this.Set((int)DirectorySymbolFields.Name, value);
         }
 
         public string ShortName
         {
-            get => (string)this.Fields[(int)DirectoryTupleFields.ShortName];
-            set => this.Set((int)DirectoryTupleFields.ShortName, value);
+            get => (string)this.Fields[(int)DirectorySymbolFields.ShortName];
+            set => this.Set((int)DirectorySymbolFields.ShortName, value);
         }
 
         public string SourceName
         {
-            get => (string)this.Fields[(int)DirectoryTupleFields.SourceName];
-            set => this.Set((int)DirectoryTupleFields.SourceName, value);
+            get => (string)this.Fields[(int)DirectorySymbolFields.SourceName];
+            set => this.Set((int)DirectorySymbolFields.SourceName, value);
         }
 
         public string SourceShortName
         {
-            get => (string)this.Fields[(int)DirectoryTupleFields.SourceShortName];
-            set => this.Set((int)DirectoryTupleFields.SourceShortName, value);
+            get => (string)this.Fields[(int)DirectorySymbolFields.SourceShortName];
+            set => this.Set((int)DirectorySymbolFields.SourceShortName, value);
         }
 
         public string ComponentGuidGenerationSeed
         {
-            get => (string)this.Fields[(int)DirectoryTupleFields.ComponentGuidGenerationSeed];
-            set => this.Set((int)DirectoryTupleFields.ComponentGuidGenerationSeed, value);
+            get => (string)this.Fields[(int)DirectorySymbolFields.ComponentGuidGenerationSeed];
+            set => this.Set((int)DirectorySymbolFields.ComponentGuidGenerationSeed, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/DrLocatorTuple.cs b/src/WixToolset.Data/Tuples/DrLocatorTuple.cs
index 667ffda1..e403c61c 100644
--- a/src/WixToolset.Data/Tuples/DrLocatorTuple.cs
+++ b/src/WixToolset.Data/Tuples/DrLocatorTuple.cs
@@ -2,26 +2,26 @@
 
 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 DrLocator = new IntermediateTupleDefinition(
-            TupleDefinitionType.DrLocator,
+        public static readonly IntermediateSymbolDefinition DrLocator = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.DrLocator,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(DrLocatorTupleFields.SignatureRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(DrLocatorTupleFields.Parent), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(DrLocatorTupleFields.Path), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(DrLocatorTupleFields.Depth), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(DrLocatorSymbolFields.SignatureRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DrLocatorSymbolFields.Parent), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DrLocatorSymbolFields.Path), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DrLocatorSymbolFields.Depth), IntermediateFieldType.Number),
             },
-            typeof(DrLocatorTuple));
+            typeof(DrLocatorSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum DrLocatorTupleFields
+    public enum DrLocatorSymbolFields
     {
         SignatureRef,
         Parent,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
         Depth,
     }
 
-    public class DrLocatorTuple : IntermediateTuple
+    public class DrLocatorSymbol : IntermediateSymbol
     {
-        public DrLocatorTuple() : base(TupleDefinitions.DrLocator, null, null)
+        public DrLocatorSymbol() : base(SymbolDefinitions.DrLocator, null, null)
         {
         }
 
-        public DrLocatorTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.DrLocator, sourceLineNumber, id)
+        public DrLocatorSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.DrLocator, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[DrLocatorTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[DrLocatorSymbolFields index] => this.Fields[(int)index];
 
         public string SignatureRef
         {
-            get => (string)this.Fields[(int)DrLocatorTupleFields.SignatureRef];
-            set => this.Set((int)DrLocatorTupleFields.SignatureRef, value);
+            get => (string)this.Fields[(int)DrLocatorSymbolFields.SignatureRef];
+            set => this.Set((int)DrLocatorSymbolFields.SignatureRef, value);
         }
 
         public string Parent
         {
-            get => (string)this.Fields[(int)DrLocatorTupleFields.Parent];
-            set => this.Set((int)DrLocatorTupleFields.Parent, value);
+            get => (string)this.Fields[(int)DrLocatorSymbolFields.Parent];
+            set => this.Set((int)DrLocatorSymbolFields.Parent, value);
         }
 
         public string Path
         {
-            get => (string)this.Fields[(int)DrLocatorTupleFields.Path];
-            set => this.Set((int)DrLocatorTupleFields.Path, value);
+            get => (string)this.Fields[(int)DrLocatorSymbolFields.Path];
+            set => this.Set((int)DrLocatorSymbolFields.Path, value);
         }
 
         public int? Depth
         {
-            get => (int?)this.Fields[(int)DrLocatorTupleFields.Depth];
-            set => this.Set((int)DrLocatorTupleFields.Depth, value);
+            get => (int?)this.Fields[(int)DrLocatorSymbolFields.Depth];
+            set => this.Set((int)DrLocatorSymbolFields.Depth, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/DuplicateFileTuple.cs b/src/WixToolset.Data/Tuples/DuplicateFileTuple.cs
index 87220e80..1344ced4 100644
--- a/src/WixToolset.Data/Tuples/DuplicateFileTuple.cs
+++ b/src/WixToolset.Data/Tuples/DuplicateFileTuple.cs
@@ -2,26 +2,26 @@
 
 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 DuplicateFile = new IntermediateTupleDefinition(
-            TupleDefinitionType.DuplicateFile,
+        public static readonly IntermediateSymbolDefinition DuplicateFile = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.DuplicateFile,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.FileRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.DestinationName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(DuplicateFileTupleFields.DestinationFolder), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DuplicateFileSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DuplicateFileSymbolFields.FileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DuplicateFileSymbolFields.DestinationName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(DuplicateFileSymbolFields.DestinationFolder), IntermediateFieldType.String),
             },
-            typeof(DuplicateFileTuple));
+            typeof(DuplicateFileSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum DuplicateFileTupleFields
+    public enum DuplicateFileSymbolFields
     {
         ComponentRef,
         FileRef,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
         DestinationFolder,
     }
 
-    public class DuplicateFileTuple : IntermediateTuple
+    public class DuplicateFileSymbol : IntermediateSymbol
     {
-        public DuplicateFileTuple() : base(TupleDefinitions.DuplicateFile, null, null)
+        public DuplicateFileSymbol() : base(SymbolDefinitions.DuplicateFile, null, null)
         {
         }
 
-        public DuplicateFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.DuplicateFile, sourceLineNumber, id)
+        public DuplicateFileSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.DuplicateFile, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[DuplicateFileTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[DuplicateFileSymbolFields index] => this.Fields[(int)index];
 
         public string ComponentRef
         {
-            get => (string)this.Fields[(int)DuplicateFileTupleFields.ComponentRef];
-            set => this.Set((int)DuplicateFileTupleFields.ComponentRef, value);
+            get => (string)this.Fields[(int)DuplicateFileSymbolFields.ComponentRef];
+            set => this.Set((int)DuplicateFileSymbolFields.ComponentRef, value);
         }
 
         public string FileRef
         {
-            get => (string)this.Fields[(int)DuplicateFileTupleFields.FileRef];
-            set => this.Set((int)DuplicateFileTupleFields.FileRef, value);
+            get => (string)this.Fields[(int)DuplicateFileSymbolFields.FileRef];
+            set => this.Set((int)DuplicateFileSymbolFields.FileRef, value);
         }
 
         public string DestinationName
         {
-            get => (string)this.Fields[(int)DuplicateFileTupleFields.DestinationName];
-            set => this.Set((int)DuplicateFileTupleFields.DestinationName, value);
+            get => (string)this.Fields[(int)DuplicateFileSymbolFields.DestinationName];
+            set => this.Set((int)DuplicateFileSymbolFields.DestinationName, value);
         }
 
         public string DestinationFolder
         {
-            get => (string)this.Fields[(int)DuplicateFileTupleFields.DestinationFolder];
-            set => this.Set((int)DuplicateFileTupleFields.DestinationFolder, value);
+            get => (string)this.Fields[(int)DuplicateFileSymbolFields.DestinationFolder];
+            set => this.Set((int)DuplicateFileSymbolFields.DestinationFolder, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/EnvironmentTuple.cs b/src/WixToolset.Data/Tuples/EnvironmentTuple.cs
index 98c51f4d..3fe12d4b 100644
--- a/src/WixToolset.Data/Tuples/EnvironmentTuple.cs
+++ b/src/WixToolset.Data/Tuples/EnvironmentTuple.cs
@@ -2,30 +2,30 @@
 
 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 Environment = new IntermediateTupleDefinition(
-            TupleDefinitionType.Environment,
+        public static readonly IntermediateSymbolDefinition Environment = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.Environment,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(EnvironmentTupleFields.Name), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(EnvironmentTupleFields.Value), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(EnvironmentTupleFields.Separator), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(EnvironmentTupleFields.Action), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(EnvironmentTupleFields.Part), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(EnvironmentTupleFields.Permanent), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(EnvironmentTupleFields.System), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(EnvironmentTupleFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(EnvironmentSymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(EnvironmentSymbolFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(EnvironmentSymbolFields.Separator), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(EnvironmentSymbolFields.Action), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(EnvironmentSymbolFields.Part), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(EnvironmentSymbolFields.Permanent), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(EnvironmentSymbolFields.System), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(EnvironmentSymbolFields.ComponentRef), IntermediateFieldType.String),
             },
-            typeof(EnvironmentTuple));
+            typeof(EnvironmentSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum EnvironmentTupleFields
+    public enum EnvironmentSymbolFields
     {
         Name,
         Value,
@@ -51,64 +51,64 @@ namespace WixToolset.Data.Tuples
         Last
     }
 
-    public class EnvironmentTuple : IntermediateTuple
+    public class EnvironmentSymbol : IntermediateSymbol
     {
-        public EnvironmentTuple() : base(TupleDefinitions.Environment, null, null)
+        public EnvironmentSymbol() : base(SymbolDefinitions.Environment, null, null)
         {
         }
 
-        public EnvironmentTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Environment, sourceLineNumber, id)
+        public EnvironmentSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Environment, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[EnvironmentTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[EnvironmentSymbolFields index] => this.Fields[(int)index];
 
         public string Name
         {
-            get => (string)this.Fields[(int)EnvironmentTupleFields.Name];
-            set => this.Set((int)EnvironmentTupleFields.Name, value);
+            get => (string)this.Fields[(int)EnvironmentSymbolFields.Name];
+            set => this.Set((int)EnvironmentSymbolFields.Name, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)EnvironmentTupleFields.Value];
-            set => this.Set((int)EnvironmentTupleFields.Value, value);
+            get => (string)this.Fields[(int)EnvironmentSymbolFields.Value];
+            set => this.Set((int)EnvironmentSymbolFields.Value, value);
         }
 
         public string Separator
         {
-            get => (string)this.Fields[(int)EnvironmentTupleFields.Separator];
-            set => this.Set((int)EnvironmentTupleFields.Separator, value);
+            get => (string)this.Fields[(int)EnvironmentSymbolFields.Separator];
+            set => this.Set((int)EnvironmentSymbolFields.Separator, value);
         }
 
         public EnvironmentActionType? Action
         {
-            get => (EnvironmentActionType?)this.Fields[(int)EnvironmentTupleFields.Action].AsNullableNumber();
-            set => this.Set((int)EnvironmentTupleFields.Action, (int?)value);
+            get => (EnvironmentActionType?)this.Fields[(int)EnvironmentSymbolFields.Action].AsNullableNumber();
+            set => this.Set((int)EnvironmentSymbolFields.Action, (int?)value);
         }
 
         public EnvironmentPartType? Part
         {
-            get => (EnvironmentPartType?)this.Fields[(int)EnvironmentTupleFields.Part].AsNullableNumber();
-            set => this.Set((int)EnvironmentTupleFields.Part, (int?)value);
+            get => (EnvironmentPartType?)this.Fields[(int)EnvironmentSymbolFields.Part].AsNullableNumber();
+            set => this.Set((int)EnvironmentSymbolFields.Part, (int?)value);
         }
 
         public bool Permanent
         {
-            get => this.Fields[(int)EnvironmentTupleFields.Permanent].AsBool();
-            set => this.Set((int)EnvironmentTupleFields.Permanent, value);
+            get => this.Fields[(int)EnvironmentSymbolFields.Permanent].AsBool();
+            set => this.Set((int)EnvironmentSymbolFields.Permanent, value);
         }
 
         public bool System
         {
-            get => this.Fields[(int)EnvironmentTupleFields.System].AsBool();
-            set => this.Set((int)EnvironmentTupleFields.System, value);
+            get => this.Fields[(int)EnvironmentSymbolFields.System].AsBool();
+            set => this.Set((int)EnvironmentSymbolFields.System, value);
         }
 
         public string ComponentRef
         {
-            get => (string)this.Fields[(int)EnvironmentTupleFields.ComponentRef];
-            set => this.Set((int)EnvironmentTupleFields.ComponentRef, value);
+            get => (string)this.Fields[(int)EnvironmentSymbolFields.ComponentRef];
+            set => this.Set((int)EnvironmentSymbolFields.ComponentRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ErrorTuple.cs b/src/WixToolset.Data/Tuples/ErrorTuple.cs
index 89968283..d2994598 100644
--- a/src/WixToolset.Data/Tuples/ErrorTuple.cs
+++ b/src/WixToolset.Data/Tuples/ErrorTuple.cs
@@ -2,43 +2,43 @@
 
 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 Error = new IntermediateTupleDefinition(
-            TupleDefinitionType.Error,
+        public static readonly IntermediateSymbolDefinition Error = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.Error,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ErrorTupleFields.Message), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ErrorSymbolFields.Message), IntermediateFieldType.String),
             },
-            typeof(ErrorTuple));
+            typeof(ErrorSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ErrorTupleFields
+    public enum ErrorSymbolFields
     {
         Message,
     }
 
-    public class ErrorTuple : IntermediateTuple
+    public class ErrorSymbol : IntermediateSymbol
     {
-        public ErrorTuple() : base(TupleDefinitions.Error, null, null)
+        public ErrorSymbol() : base(SymbolDefinitions.Error, null, null)
         {
         }
 
-        public ErrorTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Error, sourceLineNumber, id)
+        public ErrorSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Error, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ErrorTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ErrorSymbolFields index] => this.Fields[(int)index];
 
         public string Message
         {
-            get => (string)this.Fields[(int)ErrorTupleFields.Message];
-            set => this.Set((int)ErrorTupleFields.Message, value);
+            get => (string)this.Fields[(int)ErrorSymbolFields.Message];
+            set => this.Set((int)ErrorSymbolFields.Message, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/EventMappingTuple.cs b/src/WixToolset.Data/Tuples/EventMappingTuple.cs
index d172d4ce..fec7be3b 100644
--- a/src/WixToolset.Data/Tuples/EventMappingTuple.cs
+++ b/src/WixToolset.Data/Tuples/EventMappingTuple.cs
@@ -2,26 +2,26 @@
 
 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 EventMapping = new IntermediateTupleDefinition(
-            TupleDefinitionType.EventMapping,
+        public static readonly IntermediateSymbolDefinition EventMapping = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.EventMapping,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(EventMappingTupleFields.DialogRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(EventMappingTupleFields.ControlRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(EventMappingTupleFields.Event), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(EventMappingTupleFields.Attribute), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(EventMappingSymbolFields.DialogRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(EventMappingSymbolFields.ControlRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(EventMappingSymbolFields.Event), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(EventMappingSymbolFields.Attribute), IntermediateFieldType.String),
             },
-            typeof(EventMappingTuple));
+            typeof(EventMappingSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum EventMappingTupleFields
+    public enum EventMappingSymbolFields
     {
         DialogRef,
         ControlRef,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
         Attribute,
     }
 
-    public class EventMappingTuple : IntermediateTuple
+    public class EventMappingSymbol : IntermediateSymbol
     {
-        public EventMappingTuple() : base(TupleDefinitions.EventMapping, null, null)
+        public EventMappingSymbol() : base(SymbolDefinitions.EventMapping, null, null)
         {
         }
 
-        public EventMappingTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.EventMapping, sourceLineNumber, id)
+        public EventMappingSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.EventMapping, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[EventMappingTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[EventMappingSymbolFields index] => this.Fields[(int)index];
 
         public string DialogRef
         {
-            get => (string)this.Fields[(int)EventMappingTupleFields.DialogRef];
-            set => this.Set((int)EventMappingTupleFields.DialogRef, value);
+            get => (string)this.Fields[(int)EventMappingSymbolFields.DialogRef];
+            set => this.Set((int)EventMappingSymbolFields.DialogRef, value);
         }
 
         public string ControlRef
         {
-            get => (string)this.Fields[(int)EventMappingTupleFields.ControlRef];
-            set => this.Set((int)EventMappingTupleFields.ControlRef, value);
+            get => (string)this.Fields[(int)EventMappingSymbolFields.ControlRef];
+            set => this.Set((int)EventMappingSymbolFields.ControlRef, value);
         }
 
         public string Event
         {
-            get => (string)this.Fields[(int)EventMappingTupleFields.Event];
-            set => this.Set((int)EventMappingTupleFields.Event, value);
+            get => (string)this.Fields[(int)EventMappingSymbolFields.Event];
+            set => this.Set((int)EventMappingSymbolFields.Event, value);
         }
 
         public string Attribute
         {
-            get => (string)this.Fields[(int)EventMappingTupleFields.Attribute];
-            set => this.Set((int)EventMappingTupleFields.Attribute, value);
+            get => (string)this.Fields[(int)EventMappingSymbolFields.Attribute];
+            set => this.Set((int)EventMappingSymbolFields.Attribute, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ExtensionTuple.cs b/src/WixToolset.Data/Tuples/ExtensionTuple.cs
index 8d817079..b8806971 100644
--- a/src/WixToolset.Data/Tuples/ExtensionTuple.cs
+++ b/src/WixToolset.Data/Tuples/ExtensionTuple.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 Extension = new IntermediateTupleDefinition(
-            TupleDefinitionType.Extension,
+        public static readonly IntermediateSymbolDefinition Extension = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.Extension,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ExtensionTupleFields.Extension), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ExtensionTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ExtensionTupleFields.ProgIdRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ExtensionTupleFields.MimeRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ExtensionTupleFields.FeatureRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExtensionSymbolFields.Extension), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExtensionSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExtensionSymbolFields.ProgIdRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExtensionSymbolFields.MimeRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExtensionSymbolFields.FeatureRef), IntermediateFieldType.String),
             },
-            typeof(ExtensionTuple));
+            typeof(ExtensionSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ExtensionTupleFields
+    public enum ExtensionSymbolFields
     {
         Extension,
         ComponentRef,
@@ -31,46 +31,46 @@ namespace WixToolset.Data.Tuples
         FeatureRef,
     }
 
-    public class ExtensionTuple : IntermediateTuple
+    public class ExtensionSymbol : IntermediateSymbol
     {
-        public ExtensionTuple() : base(TupleDefinitions.Extension, null, null)
+        public ExtensionSymbol() : base(SymbolDefinitions.Extension, null, null)
         {
         }
 
-        public ExtensionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Extension, sourceLineNumber, id)
+        public ExtensionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Extension, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ExtensionTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ExtensionSymbolFields index] => this.Fields[(int)index];
 
         public string Extension
         {
-            get => (string)this.Fields[(int)ExtensionTupleFields.Extension];
-            set => this.Set((int)ExtensionTupleFields.Extension, value);
+            get => (string)this.Fields[(int)ExtensionSymbolFields.Extension];
+            set => this.Set((int)ExtensionSymbolFields.Extension, value);
         }
 
         public string ComponentRef
         {
-            get => (string)this.Fields[(int)ExtensionTupleFields.ComponentRef];
-            set => this.Set((int)ExtensionTupleFields.ComponentRef, value);
+            get => (string)this.Fields[(int)ExtensionSymbolFields.ComponentRef];
+            set => this.Set((int)ExtensionSymbolFields.ComponentRef, value);
         }
 
         public string ProgIdRef
         {
-            get => (string)this.Fields[(int)ExtensionTupleFields.ProgIdRef];
-            set => this.Set((int)ExtensionTupleFields.ProgIdRef, value);
+            get => (string)this.Fields[(int)ExtensionSymbolFields.ProgIdRef];
+            set => this.Set((int)ExtensionSymbolFields.ProgIdRef, value);
         }
 
         public string MimeRef
         {
-            get => (string)this.Fields[(int)ExtensionTupleFields.MimeRef];
-            set => this.Set((int)ExtensionTupleFields.MimeRef, value);
+            get => (string)this.Fields[(int)ExtensionSymbolFields.MimeRef];
+            set => this.Set((int)ExtensionSymbolFields.MimeRef, value);
         }
 
         public string FeatureRef
         {
-            get => (string)this.Fields[(int)ExtensionTupleFields.FeatureRef];
-            set => this.Set((int)ExtensionTupleFields.FeatureRef, value);
+            get => (string)this.Fields[(int)ExtensionSymbolFields.FeatureRef];
+            set => this.Set((int)ExtensionSymbolFields.FeatureRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ExternalFilesTuple.cs b/src/WixToolset.Data/Tuples/ExternalFilesTuple.cs
index c3352c13..87888f0b 100644
--- a/src/WixToolset.Data/Tuples/ExternalFilesTuple.cs
+++ b/src/WixToolset.Data/Tuples/ExternalFilesTuple.cs
@@ -2,30 +2,30 @@
 
 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 ExternalFiles = new IntermediateTupleDefinition(
-            TupleDefinitionType.ExternalFiles,
+        public static readonly IntermediateSymbolDefinition ExternalFiles = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.ExternalFiles,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ExternalFilesTupleFields.Family), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ExternalFilesTupleFields.FTK), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ExternalFilesTupleFields.FilePath), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ExternalFilesTupleFields.SymbolPaths), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ExternalFilesTupleFields.IgnoreOffsets), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ExternalFilesTupleFields.IgnoreLengths), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ExternalFilesTupleFields.RetainOffsets), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ExternalFilesTupleFields.Order), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ExternalFilesSymbolFields.Family), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExternalFilesSymbolFields.FTK), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExternalFilesSymbolFields.FilePath), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExternalFilesSymbolFields.SymbolPaths), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExternalFilesSymbolFields.IgnoreOffsets), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExternalFilesSymbolFields.IgnoreLengths), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExternalFilesSymbolFields.RetainOffsets), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExternalFilesSymbolFields.Order), IntermediateFieldType.Number),
             },
-            typeof(ExternalFilesTuple));
+            typeof(ExternalFilesSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ExternalFilesTupleFields
+    public enum ExternalFilesSymbolFields
     {
         Family,
         FTK,
@@ -37,64 +37,64 @@ namespace WixToolset.Data.Tuples
         Order,
     }
 
-    public class ExternalFilesTuple : IntermediateTuple
+    public class ExternalFilesSymbol : IntermediateSymbol
     {
-        public ExternalFilesTuple() : base(TupleDefinitions.ExternalFiles, null, null)
+        public ExternalFilesSymbol() : base(SymbolDefinitions.ExternalFiles, null, null)
         {
         }
 
-        public ExternalFilesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ExternalFiles, sourceLineNumber, id)
+        public ExternalFilesSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ExternalFiles, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ExternalFilesTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ExternalFilesSymbolFields index] => this.Fields[(int)index];
 
         public string Family
         {
-            get => (string)this.Fields[(int)ExternalFilesTupleFields.Family];
-            set => this.Set((int)ExternalFilesTupleFields.Family, value);
+            get => (string)this.Fields[(int)ExternalFilesSymbolFields.Family];
+            set => this.Set((int)ExternalFilesSymbolFields.Family, value);
         }
 
         public string FTK
         {
-            get => (string)this.Fields[(int)ExternalFilesTupleFields.FTK];
-            set => this.Set((int)ExternalFilesTupleFields.FTK, value);
+            get => (string)this.Fields[(int)ExternalFilesSymbolFields.FTK];
+            set => this.Set((int)ExternalFilesSymbolFields.FTK, value);
         }
 
         public string FilePath
         {
-            get => (string)this.Fields[(int)ExternalFilesTupleFields.FilePath];
-            set => this.Set((int)ExternalFilesTupleFields.FilePath, value);
+            get => (string)this.Fields[(int)ExternalFilesSymbolFields.FilePath];
+            set => this.Set((int)ExternalFilesSymbolFields.FilePath, value);
         }
 
         public string SymbolPaths
         {
-            get => (string)this.Fields[(int)ExternalFilesTupleFields.SymbolPaths];
-            set => this.Set((int)ExternalFilesTupleFields.SymbolPaths, value);
+            get => (string)this.Fields[(int)ExternalFilesSymbolFields.SymbolPaths];
+            set => this.Set((int)ExternalFilesSymbolFields.SymbolPaths, value);
         }
 
         public string IgnoreOffsets
         {
-            get => (string)this.Fields[(int)ExternalFilesTupleFields.IgnoreOffsets];
-            set => this.Set((int)ExternalFilesTupleFields.IgnoreOffsets, value);
+            get => (string)this.Fields[(int)ExternalFilesSymbolFields.IgnoreOffsets];
+            set => this.Set((int)ExternalFilesSymbolFields.IgnoreOffsets, value);
         }
 
         public string IgnoreLengths
         {
-            get => (string)this.Fields[(int)ExternalFilesTupleFields.IgnoreLengths];
-            set => this.Set((int)ExternalFilesTupleFields.IgnoreLengths, value);
+            get => (string)this.Fields[(int)ExternalFilesSymbolFields.IgnoreLengths];
+            set => this.Set((int)ExternalFilesSymbolFields.IgnoreLengths, value);
         }
 
         public string RetainOffsets
         {
-            get => (string)this.Fields[(int)ExternalFilesTupleFields.RetainOffsets];
-            set => this.Set((int)ExternalFilesTupleFields.RetainOffsets, value);
+            get => (string)this.Fields[(int)ExternalFilesSymbolFields.RetainOffsets];
+            set => this.Set((int)ExternalFilesSymbolFields.RetainOffsets, value);
         }
 
         public int Order
         {
-            get => (int)this.Fields[(int)ExternalFilesTupleFields.Order];
-            set => this.Set((int)ExternalFilesTupleFields.Order, value);
+            get => (int)this.Fields[(int)ExternalFilesSymbolFields.Order];
+            set => this.Set((int)ExternalFilesSymbolFields.Order, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/FamilyFileRangesTuple.cs b/src/WixToolset.Data/Tuples/FamilyFileRangesTuple.cs
index ea2e1993..84cd5b4b 100644
--- a/src/WixToolset.Data/Tuples/FamilyFileRangesTuple.cs
+++ b/src/WixToolset.Data/Tuples/FamilyFileRangesTuple.cs
@@ -2,26 +2,26 @@
 
 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 FamilyFileRanges = new IntermediateTupleDefinition(
-            TupleDefinitionType.FamilyFileRanges,
+        public static readonly IntermediateSymbolDefinition FamilyFileRanges = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.FamilyFileRanges,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(FamilyFileRangesTupleFields.Family), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(FamilyFileRangesTupleFields.FTK), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(FamilyFileRangesTupleFields.RetainOffsets), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(FamilyFileRangesTupleFields.RetainLengths), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FamilyFileRangesSymbolFields.Family), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FamilyFileRangesSymbolFields.FTK), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FamilyFileRangesSymbolFields.RetainOffsets), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FamilyFileRangesSymbolFields.RetainLengths), IntermediateFieldType.String),
             },
-            typeof(FamilyFileRangesTuple));
+            typeof(FamilyFileRangesSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum FamilyFileRangesTupleFields
+    public enum FamilyFileRangesSymbolFields
     {
         Family,
         FTK,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
         RetainLengths,
     }
 
-    public class FamilyFileRangesTuple : IntermediateTuple
+    public class FamilyFileRangesSymbol : IntermediateSymbol
     {
-        public FamilyFileRangesTuple() : base(TupleDefinitions.FamilyFileRanges, null, null)
+        public FamilyFileRangesSymbol() : base(SymbolDefinitions.FamilyFileRanges, null, null)
         {
         }
 
-        public FamilyFileRangesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.FamilyFileRanges, sourceLineNumber, id)
+        public FamilyFileRangesSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.FamilyFileRanges, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[FamilyFileRangesTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[FamilyFileRangesSymbolFields index] => this.Fields[(int)index];
 
         public string Family
         {
-            get => (string)this.Fields[(int)FamilyFileRangesTupleFields.Family];
-            set => this.Set((int)FamilyFileRangesTupleFields.Family, value);
+            get => (string)this.Fields[(int)FamilyFileRangesSymbolFields.Family];
+            set => this.Set((int)FamilyFileRangesSymbolFields.Family, value);
         }
 
         public string FTK
         {
-            get => (string)this.Fields[(int)FamilyFileRangesTupleFields.FTK];
-            set => this.Set((int)FamilyFileRangesTupleFields.FTK, value);
+            get => (string)this.Fields[(int)FamilyFileRangesSymbolFields.FTK];
+            set => this.Set((int)FamilyFileRangesSymbolFields.FTK, value);
         }
 
         public string RetainOffsets
         {
-            get => (string)this.Fields[(int)FamilyFileRangesTupleFields.RetainOffsets];
-            set => this.Set((int)FamilyFileRangesTupleFields.RetainOffsets, value);
+            get => (string)this.Fields[(int)FamilyFileRangesSymbolFields.RetainOffsets];
+            set => this.Set((int)FamilyFileRangesSymbolFields.RetainOffsets, value);
         }
 
         public string RetainLengths
         {
-            get => (string)this.Fields[(int)FamilyFileRangesTupleFields.RetainLengths];
-            set => this.Set((int)FamilyFileRangesTupleFields.RetainLengths, value);
+            get => (string)this.Fields[(int)FamilyFileRangesSymbolFields.RetainLengths];
+            set => this.Set((int)FamilyFileRangesSymbolFields.RetainLengths, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/FeatureComponentsTuple.cs b/src/WixToolset.Data/Tuples/FeatureComponentsTuple.cs
index 1bda9c4c..af51daed 100644
--- a/src/WixToolset.Data/Tuples/FeatureComponentsTuple.cs
+++ b/src/WixToolset.Data/Tuples/FeatureComponentsTuple.cs
@@ -2,51 +2,51 @@
 
 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 FeatureComponents = new IntermediateTupleDefinition(
-            TupleDefinitionType.FeatureComponents,
+        public static readonly IntermediateSymbolDefinition FeatureComponents = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.FeatureComponents,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(FeatureComponentsTupleFields.FeatureRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(FeatureComponentsTupleFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FeatureComponentsSymbolFields.FeatureRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FeatureComponentsSymbolFields.ComponentRef), IntermediateFieldType.String),
             },
-            typeof(FeatureComponentsTuple));
+            typeof(FeatureComponentsSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum FeatureComponentsTupleFields
+    public enum FeatureComponentsSymbolFields
     {
         FeatureRef,
         ComponentRef,
     }
 
-    public class FeatureComponentsTuple : IntermediateTuple
+    public class FeatureComponentsSymbol : IntermediateSymbol
     {
-        public FeatureComponentsTuple() : base(TupleDefinitions.FeatureComponents, null, null)
+        public FeatureComponentsSymbol() : base(SymbolDefinitions.FeatureComponents, null, null)
         {
         }
 
-        public FeatureComponentsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.FeatureComponents, sourceLineNumber, id)
+        public FeatureComponentsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.FeatureComponents, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[FeatureComponentsTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[FeatureComponentsSymbolFields index] => this.Fields[(int)index];
 
         public string FeatureRef
         {
-            get => (string)this.Fields[(int)FeatureComponentsTupleFields.FeatureRef];
-            set => this.Set((int)FeatureComponentsTupleFields.FeatureRef, value);
+            get => (string)this.Fields[(int)FeatureComponentsSymbolFields.FeatureRef];
+            set => this.Set((int)FeatureComponentsSymbolFields.FeatureRef, value);
         }
 
         public string ComponentRef
         {
-            get => (string)this.Fields[(int)FeatureComponentsTupleFields.ComponentRef];
-            set => this.Set((int)FeatureComponentsTupleFields.ComponentRef, value);
+            get => (string)this.Fields[(int)FeatureComponentsSymbolFields.ComponentRef];
+            set => this.Set((int)FeatureComponentsSymbolFields.ComponentRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/FeatureTuple.cs b/src/WixToolset.Data/Tuples/FeatureTuple.cs
index b057d079..67972b63 100644
--- a/src/WixToolset.Data/Tuples/FeatureTuple.cs
+++ b/src/WixToolset.Data/Tuples/FeatureTuple.cs
@@ -2,32 +2,32 @@
 
 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 Feature = new IntermediateTupleDefinition(
-            TupleDefinitionType.Feature,
+        public static readonly IntermediateSymbolDefinition Feature = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.Feature,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(FeatureTupleFields.ParentFeatureRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(FeatureTupleFields.Title), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(FeatureTupleFields.Description), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(FeatureTupleFields.Display), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(FeatureTupleFields.Level), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(FeatureTupleFields.DirectoryRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(FeatureTupleFields.DisallowAbsent), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(FeatureTupleFields.DisallowAdvertise), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(FeatureTupleFields.InstallDefault), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(FeatureTupleFields.TypicalDefault), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(FeatureSymbolFields.ParentFeatureRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FeatureSymbolFields.Title), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FeatureSymbolFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FeatureSymbolFields.Display), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(FeatureSymbolFields.Level), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(FeatureSymbolFields.DirectoryRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FeatureSymbolFields.DisallowAbsent), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(FeatureSymbolFields.DisallowAdvertise), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(FeatureSymbolFields.InstallDefault), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(FeatureSymbolFields.TypicalDefault), IntermediateFieldType.Number),
             },
-            typeof(FeatureTuple));
+            typeof(FeatureSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum FeatureTupleFields
+    public enum FeatureSymbolFields
     {
         ParentFeatureRef,
         Title,
@@ -54,76 +54,76 @@ namespace WixToolset.Data.Tuples
         Advertise
     }
 
-    public class FeatureTuple : IntermediateTuple
+    public class FeatureSymbol : IntermediateSymbol
     {
-        public FeatureTuple() : base(TupleDefinitions.Feature, null, null)
+        public FeatureSymbol() : base(SymbolDefinitions.Feature, null, null)
         {
         }
 
-        public FeatureTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Feature, sourceLineNumber, id)
+        public FeatureSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Feature, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[FeatureTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[FeatureSymbolFields index] => this.Fields[(int)index];
 
         public string ParentFeatureRef
         {
-            get => (string)this.Fields[(int)FeatureTupleFields.ParentFeatureRef];
-            set => this.Set((int)FeatureTupleFields.ParentFeatureRef, value);
+            get => (string)this.Fields[(int)FeatureSymbolFields.ParentFeatureRef];
+            set => this.Set((int)FeatureSymbolFields.ParentFeatureRef, value);
         }
 
         public string Title
         {
-            get => (string)this.Fields[(int)FeatureTupleFields.Title];
-            set => this.Set((int)FeatureTupleFields.Title, value);
+            get => (string)this.Fields[(int)FeatureSymbolFields.Title];
+            set => this.Set((int)FeatureSymbolFields.Title, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)FeatureTupleFields.Description];
-            set => this.Set((int)FeatureTupleFields.Description, value);
+            get => (string)this.Fields[(int)FeatureSymbolFields.Description];
+            set => this.Set((int)FeatureSymbolFields.Description, value);
         }
 
         public int Display
         {
-            get => (int)this.Fields[(int)FeatureTupleFields.Display];
-            set => this.Set((int)FeatureTupleFields.Display, value);
+            get => (int)this.Fields[(int)FeatureSymbolFields.Display];
+            set => this.Set((int)FeatureSymbolFields.Display, value);
         }
 
         public int Level
         {
-            get => (int)this.Fields[(int)FeatureTupleFields.Level];
-            set => this.Set((int)FeatureTupleFields.Level, value);
+            get => (int)this.Fields[(int)FeatureSymbolFields.Level];
+            set => this.Set((int)FeatureSymbolFields.Level, value);
         }
 
         public string DirectoryRef
         {
-            get => (string)this.Fields[(int)FeatureTupleFields.DirectoryRef];
-            set => this.Set((int)FeatureTupleFields.DirectoryRef, value);
+            get => (string)this.Fields[(int)FeatureSymbolFields.DirectoryRef];
+            set => this.Set((int)FeatureSymbolFields.DirectoryRef, value);
         }
 
         public bool DisallowAbsent
         {
-            get => this.Fields[(int)FeatureTupleFields.DisallowAbsent].AsBool();
-            set => this.Set((int)FeatureTupleFields.DisallowAbsent, value);
+            get => this.Fields[(int)FeatureSymbolFields.DisallowAbsent].AsBool();
+            set => this.Set((int)FeatureSymbolFields.DisallowAbsent, value);
         }
 
         public bool DisallowAdvertise
         {
-            get => this.Fields[(int)FeatureTupleFields.DisallowAdvertise].AsBool();
-            set => this.Set((int)FeatureTupleFields.DisallowAdvertise, value);
+            get => this.Fields[(int)FeatureSymbolFields.DisallowAdvertise].AsBool();
+            set => this.Set((int)FeatureSymbolFields.DisallowAdvertise, value);
         }
 
         public FeatureInstallDefault InstallDefault
         {
-            get => (FeatureInstallDefault)this.Fields[(int)FeatureTupleFields.InstallDefault].AsNumber();
-            set => this.Set((int)FeatureTupleFields.InstallDefault, (int)value);
+            get => (FeatureInstallDefault)this.Fields[(int)FeatureSymbolFields.InstallDefault].AsNumber();
+            set => this.Set((int)FeatureSymbolFields.InstallDefault, (int)value);
         }
 
         public FeatureTypicalDefault TypicalDefault
         {
-            get => (FeatureTypicalDefault)this.Fields[(int)FeatureTupleFields.TypicalDefault].AsNumber();
-            set => this.Set((int)FeatureTupleFields.TypicalDefault, (int)value);
+            get => (FeatureTypicalDefault)this.Fields[(int)FeatureSymbolFields.TypicalDefault].AsNumber();
+            set => this.Set((int)FeatureSymbolFields.TypicalDefault, (int)value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/FileSFPCatalogTuple.cs b/src/WixToolset.Data/Tuples/FileSFPCatalogTuple.cs
index fcf77d70..3abf2915 100644
--- a/src/WixToolset.Data/Tuples/FileSFPCatalogTuple.cs
+++ b/src/WixToolset.Data/Tuples/FileSFPCatalogTuple.cs
@@ -2,51 +2,51 @@
 
 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 FileSFPCatalog = new IntermediateTupleDefinition(
-            TupleDefinitionType.FileSFPCatalog,
+        public static readonly IntermediateSymbolDefinition FileSFPCatalog = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.FileSFPCatalog,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(FileSFPCatalogTupleFields.FileRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(FileSFPCatalogTupleFields.SFPCatalogRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileSFPCatalogSymbolFields.FileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileSFPCatalogSymbolFields.SFPCatalogRef), IntermediateFieldType.String),
             },
-            typeof(FileSFPCatalogTuple));
+            typeof(FileSFPCatalogSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum FileSFPCatalogTupleFields
+    public enum FileSFPCatalogSymbolFields
     {
         FileRef,
         SFPCatalogRef,
     }
 
-    public class FileSFPCatalogTuple : IntermediateTuple
+    public class FileSFPCatalogSymbol : IntermediateSymbol
     {
-        public FileSFPCatalogTuple() : base(TupleDefinitions.FileSFPCatalog, null, null)
+        public FileSFPCatalogSymbol() : base(SymbolDefinitions.FileSFPCatalog, null, null)
         {
         }
 
-        public FileSFPCatalogTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.FileSFPCatalog, sourceLineNumber, id)
+        public FileSFPCatalogSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.FileSFPCatalog, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[FileSFPCatalogTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[FileSFPCatalogSymbolFields index] => this.Fields[(int)index];
 
         public string FileRef
         {
-            get => (string)this.Fields[(int)FileSFPCatalogTupleFields.FileRef];
-            set => this.Set((int)FileSFPCatalogTupleFields.FileRef, value);
+            get => (string)this.Fields[(int)FileSFPCatalogSymbolFields.FileRef];
+            set => this.Set((int)FileSFPCatalogSymbolFields.FileRef, value);
         }
 
         public string SFPCatalogRef
         {
-            get => (string)this.Fields[(int)FileSFPCatalogTupleFields.SFPCatalogRef];
-            set => this.Set((int)FileSFPCatalogTupleFields.SFPCatalogRef, value);
+            get => (string)this.Fields[(int)FileSFPCatalogSymbolFields.SFPCatalogRef];
+            set => this.Set((int)FileSFPCatalogSymbolFields.SFPCatalogRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/FileTuple.cs b/src/WixToolset.Data/Tuples/FileTuple.cs
index 95776257..7d1afdb7 100644
--- a/src/WixToolset.Data/Tuples/FileTuple.cs
+++ b/src/WixToolset.Data/Tuples/FileTuple.cs
@@ -2,50 +2,50 @@
 
 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 File = new IntermediateTupleDefinition(
-            TupleDefinitionType.File,
+        public static readonly IntermediateSymbolDefinition File = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.File,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(FileTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(FileTupleFields.Name), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(FileTupleFields.ShortName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(FileTupleFields.FileSize), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(FileTupleFields.Version), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(FileTupleFields.Language), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(FileTupleFields.Attributes), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(FileTupleFields.DirectoryRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(FileTupleFields.DiskId), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(FileTupleFields.Source), IntermediateFieldType.Path),
-
-                new IntermediateFieldDefinition(nameof(FileTupleFields.FontTitle), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(FileTupleFields.SelfRegCost), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(FileTupleFields.BindPath), IntermediateFieldType.String),
-
-                new IntermediateFieldDefinition(nameof(FileTupleFields.Sequence), IntermediateFieldType.Number),
-
-                new IntermediateFieldDefinition(nameof(FileTupleFields.PatchGroup), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(FileTupleFields.PatchAttributes), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(FileTupleFields.DeltaPatchHeaderSource), IntermediateFieldType.String),
-
-                new IntermediateFieldDefinition(nameof(FileTupleFields.RetainLengths), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(FileTupleFields.IgnoreOffsets), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(FileTupleFields.IgnoreLengths), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(FileTupleFields.RetainOffsets), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(FileTupleFields.SymbolPaths), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileSymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileSymbolFields.ShortName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileSymbolFields.FileSize), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(FileSymbolFields.Version), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileSymbolFields.Language), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileSymbolFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(FileSymbolFields.DirectoryRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileSymbolFields.DiskId), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(FileSymbolFields.Source), IntermediateFieldType.Path),
+
+                new IntermediateFieldDefinition(nameof(FileSymbolFields.FontTitle), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileSymbolFields.SelfRegCost), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(FileSymbolFields.BindPath), IntermediateFieldType.String),
+
+                new IntermediateFieldDefinition(nameof(FileSymbolFields.Sequence), IntermediateFieldType.Number),
+
+                new IntermediateFieldDefinition(nameof(FileSymbolFields.PatchGroup), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(FileSymbolFields.PatchAttributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(FileSymbolFields.DeltaPatchHeaderSource), IntermediateFieldType.String),
+
+                new IntermediateFieldDefinition(nameof(FileSymbolFields.RetainLengths), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileSymbolFields.IgnoreOffsets), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileSymbolFields.IgnoreLengths), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileSymbolFields.RetainOffsets), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(FileSymbolFields.SymbolPaths), IntermediateFieldType.String),
             },
-            typeof(FileTuple));
+            typeof(FileSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
     using System;
 
-    public enum FileTupleFields
+    public enum FileSymbolFields
     {
         ComponentRef,
         Name,
@@ -76,7 +76,7 @@ namespace WixToolset.Data.Tuples
     }
 
     [Flags]
-    public enum FileTupleAttributes : int
+    public enum FileSymbolAttributes : int
     {
         None = 0x0,
         ReadOnly = 0x1,
@@ -110,148 +110,148 @@ namespace WixToolset.Data.Tuples
         Defined = Ignore | IncludeWholeFile | AllowIgnoreOnError
     }
 
-    public class FileTuple : IntermediateTuple
+    public class FileSymbol : IntermediateSymbol
     {
-        public FileTuple() : base(TupleDefinitions.File, null, null)
+        public FileSymbol() : base(SymbolDefinitions.File, null, null)
         {
         }
 
-        public FileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.File, sourceLineNumber, id)
+        public FileSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.File, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[FileTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[FileSymbolFields index] => this.Fields[(int)index];
 
         public string ComponentRef
         {
-            get => (string)this.Fields[(int)FileTupleFields.ComponentRef];
-            set => this.Set((int)FileTupleFields.ComponentRef, value);
+            get => (string)this.Fields[(int)FileSymbolFields.ComponentRef];
+            set => this.Set((int)FileSymbolFields.ComponentRef, value);
         }
 
         public string Name
         {
-            get => (string)this.Fields[(int)FileTupleFields.Name];
-            set => this.Set((int)FileTupleFields.Name, value);
+            get => (string)this.Fields[(int)FileSymbolFields.Name];
+            set => this.Set((int)FileSymbolFields.Name, value);
         }
 
         public string ShortName
         {
-            get => (string)this.Fields[(int)FileTupleFields.ShortName];
-            set => this.Set((int)FileTupleFields.ShortName, value);
+            get => (string)this.Fields[(int)FileSymbolFields.ShortName];
+            set => this.Set((int)FileSymbolFields.ShortName, value);
         }
 
         public int FileSize
         {
-            get => (int)this.Fields[(int)FileTupleFields.FileSize];
-            set => this.Set((int)FileTupleFields.FileSize, value);
+            get => (int)this.Fields[(int)FileSymbolFields.FileSize];
+            set => this.Set((int)FileSymbolFields.FileSize, value);
         }
 
         public string Version
         {
-            get => (string)this.Fields[(int)FileTupleFields.Version];
-            set => this.Set((int)FileTupleFields.Version, value);
+            get => (string)this.Fields[(int)FileSymbolFields.Version];
+            set => this.Set((int)FileSymbolFields.Version, value);
         }
 
         public string Language
         {
-            get => (string)this.Fields[(int)FileTupleFields.Language];
-            set => this.Set((int)FileTupleFields.Language, value);
+            get => (string)this.Fields[(int)FileSymbolFields.Language];
+            set => this.Set((int)FileSymbolFields.Language, value);
         }
 
-        public FileTupleAttributes Attributes
+        public FileSymbolAttributes Attributes
         {
-            get => (FileTupleAttributes)this.Fields[(int)FileTupleFields.Attributes].AsNumber();
-            set => this.Set((int)FileTupleFields.Attributes, (int)value);
+            get => (FileSymbolAttributes)this.Fields[(int)FileSymbolFields.Attributes].AsNumber();
+            set => this.Set((int)FileSymbolFields.Attributes, (int)value);
         }
 
         public string DirectoryRef
         {
-            get => (string)this.Fields[(int)FileTupleFields.DirectoryRef];
-            set => this.Set((int)FileTupleFields.DirectoryRef, value);
+            get => (string)this.Fields[(int)FileSymbolFields.DirectoryRef];
+            set => this.Set((int)FileSymbolFields.DirectoryRef, value);
         }
 
         public int? DiskId
         {
-            get => (int?)this.Fields[(int)FileTupleFields.DiskId];
-            set => this.Set((int)FileTupleFields.DiskId, value);
+            get => (int?)this.Fields[(int)FileSymbolFields.DiskId];
+            set => this.Set((int)FileSymbolFields.DiskId, value);
         }
 
         public IntermediateFieldPathValue Source
         {
-            get => this.Fields[(int)FileTupleFields.Source].AsPath();
-            set => this.Set((int)FileTupleFields.Source, value);
+            get => this.Fields[(int)FileSymbolFields.Source].AsPath();
+            set => this.Set((int)FileSymbolFields.Source, value);
         }
 
         public string FontTitle
         {
-            get => (string)this.Fields[(int)FileTupleFields.FontTitle];
-            set => this.Set((int)FileTupleFields.FontTitle, value);
+            get => (string)this.Fields[(int)FileSymbolFields.FontTitle];
+            set => this.Set((int)FileSymbolFields.FontTitle, value);
         }
 
         public int? SelfRegCost
         {
-            get => (int?)this.Fields[(int)FileTupleFields.SelfRegCost];
-            set => this.Set((int)FileTupleFields.SelfRegCost, value);
+            get => (int?)this.Fields[(int)FileSymbolFields.SelfRegCost];
+            set => this.Set((int)FileSymbolFields.SelfRegCost, value);
         }
 
         public string BindPath
         {
-            get => (string)this.Fields[(int)FileTupleFields.BindPath];
-            set => this.Set((int)FileTupleFields.BindPath, value);
+            get => (string)this.Fields[(int)FileSymbolFields.BindPath];
+            set => this.Set((int)FileSymbolFields.BindPath, value);
         }
 
         public int Sequence
         {
-            get => (int)this.Fields[(int)FileTupleFields.Sequence];
-            set => this.Set((int)FileTupleFields.Sequence, value);
+            get => (int)this.Fields[(int)FileSymbolFields.Sequence];
+            set => this.Set((int)FileSymbolFields.Sequence, value);
         }
 
         public int? PatchGroup
         {
-            get => (int?)this.Fields[(int)FileTupleFields.PatchGroup];
-            set => this.Set((int)FileTupleFields.PatchGroup, value);
+            get => (int?)this.Fields[(int)FileSymbolFields.PatchGroup];
+            set => this.Set((int)FileSymbolFields.PatchGroup, value);
         }
 
         public PatchAttributeType? PatchAttributes
         {
-            get => (PatchAttributeType?)this.Fields[(int)FileTupleFields.PatchAttributes].AsNullableNumber();
-            set => this.Set((int)FileTupleFields.PatchAttributes, (int?)value);
+            get => (PatchAttributeType?)this.Fields[(int)FileSymbolFields.PatchAttributes].AsNullableNumber();
+            set => this.Set((int)FileSymbolFields.PatchAttributes, (int?)value);
         }
 
         public string DeltaPatchHeaderSource
         {
-            get => (string)this.Fields[(int)FileTupleFields.DeltaPatchHeaderSource];
-            set => this.Set((int)FileTupleFields.DeltaPatchHeaderSource, value);
+            get => (string)this.Fields[(int)FileSymbolFields.DeltaPatchHeaderSource];
+            set => this.Set((int)FileSymbolFields.DeltaPatchHeaderSource, value);
         }
 
         public string RetainLengths
         {
-            get => (string)this.Fields[(int)FileTupleFields.RetainLengths];
-            set => this.Set((int)FileTupleFields.RetainLengths, value);
+            get => (string)this.Fields[(int)FileSymbolFields.RetainLengths];
+            set => this.Set((int)FileSymbolFields.RetainLengths, value);
         }
 
         public string IgnoreOffsets
         {
-            get => (string)this.Fields[(int)FileTupleFields.IgnoreOffsets];
-            set => this.Set((int)FileTupleFields.IgnoreOffsets, value);
+            get => (string)this.Fields[(int)FileSymbolFields.IgnoreOffsets];
+            set => this.Set((int)FileSymbolFields.IgnoreOffsets, value);
         }
 
         public string IgnoreLengths
         {
-            get => (string)this.Fields[(int)FileTupleFields.IgnoreLengths];
-            set => this.Set((int)FileTupleFields.IgnoreLengths, value);
+            get => (string)this.Fields[(int)FileSymbolFields.IgnoreLengths];
+            set => this.Set((int)FileSymbolFields.IgnoreLengths, value);
         }
 
         public string RetainOffsets
         {
-            get => (string)this.Fields[(int)FileTupleFields.RetainOffsets];
-            set => this.Set((int)FileTupleFields.RetainOffsets, value);
+            get => (string)this.Fields[(int)FileSymbolFields.RetainOffsets];
+            set => this.Set((int)FileSymbolFields.RetainOffsets, value);
         }
 
         public string SymbolPaths
         {
-            get => (string)this.Fields[(int)FileTupleFields.SymbolPaths];
-            set => this.Set((int)FileTupleFields.SymbolPaths, value);
+            get => (string)this.Fields[(int)FileSymbolFields.SymbolPaths];
+            set => this.Set((int)FileSymbolFields.SymbolPaths, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/IconTuple.cs b/src/WixToolset.Data/Tuples/IconTuple.cs
index e9ed93b2..f3c825ec 100644
--- a/src/WixToolset.Data/Tuples/IconTuple.cs
+++ b/src/WixToolset.Data/Tuples/IconTuple.cs
@@ -2,43 +2,43 @@
 
 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 Icon = new IntermediateTupleDefinition(
-            TupleDefinitionType.Icon,
+        public static readonly IntermediateSymbolDefinition Icon = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.Icon,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(IconTupleFields.Data), IntermediateFieldType.Path),
+                new IntermediateFieldDefinition(nameof(IconSymbolFields.Data), IntermediateFieldType.Path),
             },
-            typeof(IconTuple));
+            typeof(IconSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum IconTupleFields
+    public enum IconSymbolFields
     {
         Data,
     }
 
-    public class IconTuple : IntermediateTuple
+    public class IconSymbol : IntermediateSymbol
     {
-        public IconTuple() : base(TupleDefinitions.Icon, null, null)
+        public IconSymbol() : base(SymbolDefinitions.Icon, null, null)
         {
         }
 
-        public IconTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Icon, sourceLineNumber, id)
+        public IconSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Icon, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[IconTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[IconSymbolFields index] => this.Fields[(int)index];
 
         public IntermediateFieldPathValue Data
         {
-            get => this.Fields[(int)IconTupleFields.Data].AsPath();
-            set => this.Set((int)IconTupleFields.Data, value);
+            get => this.Fields[(int)IconSymbolFields.Data].AsPath();
+            set => this.Set((int)IconSymbolFields.Data, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ImageFamiliesTuple.cs b/src/WixToolset.Data/Tuples/ImageFamiliesTuple.cs
index 4538b88c..090628ef 100644
--- a/src/WixToolset.Data/Tuples/ImageFamiliesTuple.cs
+++ b/src/WixToolset.Data/Tuples/ImageFamiliesTuple.cs
@@ -2,28 +2,28 @@
 
 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 ImageFamilies = new IntermediateTupleDefinition(
-            TupleDefinitionType.ImageFamilies,
+        public static readonly IntermediateSymbolDefinition ImageFamilies = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.ImageFamilies,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ImageFamiliesTupleFields.Family), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ImageFamiliesTupleFields.MediaSrcPropName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ImageFamiliesTupleFields.MediaDiskId), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ImageFamiliesTupleFields.FileSequenceStart), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ImageFamiliesTupleFields.DiskPrompt), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ImageFamiliesTupleFields.VolumeLabel), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ImageFamiliesSymbolFields.Family), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ImageFamiliesSymbolFields.MediaSrcPropName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ImageFamiliesSymbolFields.MediaDiskId), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ImageFamiliesSymbolFields.FileSequenceStart), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ImageFamiliesSymbolFields.DiskPrompt), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ImageFamiliesSymbolFields.VolumeLabel), IntermediateFieldType.String),
             },
-            typeof(ImageFamiliesTuple));
+            typeof(ImageFamiliesSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ImageFamiliesTupleFields
+    public enum ImageFamiliesSymbolFields
     {
         Family,
         MediaSrcPropName,
@@ -33,52 +33,52 @@ namespace WixToolset.Data.Tuples
         VolumeLabel,
     }
 
-    public class ImageFamiliesTuple : IntermediateTuple
+    public class ImageFamiliesSymbol : IntermediateSymbol
     {
-        public ImageFamiliesTuple() : base(TupleDefinitions.ImageFamilies, null, null)
+        public ImageFamiliesSymbol() : base(SymbolDefinitions.ImageFamilies, null, null)
         {
         }
 
-        public ImageFamiliesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ImageFamilies, sourceLineNumber, id)
+        public ImageFamiliesSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ImageFamilies, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ImageFamiliesTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ImageFamiliesSymbolFields index] => this.Fields[(int)index];
 
         public string Family
         {
-            get => (string)this.Fields[(int)ImageFamiliesTupleFields.Family];
-            set => this.Set((int)ImageFamiliesTupleFields.Family, value);
+            get => (string)this.Fields[(int)ImageFamiliesSymbolFields.Family];
+            set => this.Set((int)ImageFamiliesSymbolFields.Family, value);
         }
 
         public string MediaSrcPropName
         {
-            get => (string)this.Fields[(int)ImageFamiliesTupleFields.MediaSrcPropName];
-            set => this.Set((int)ImageFamiliesTupleFields.MediaSrcPropName, value);
+            get => (string)this.Fields[(int)ImageFamiliesSymbolFields.MediaSrcPropName];
+            set => this.Set((int)ImageFamiliesSymbolFields.MediaSrcPropName, value);
         }
 
         public int? MediaDiskId
         {
-            get => (int?)this.Fields[(int)ImageFamiliesTupleFields.MediaDiskId];
-            set => this.Set((int)ImageFamiliesTupleFields.MediaDiskId, value);
+            get => (int?)this.Fields[(int)ImageFamiliesSymbolFields.MediaDiskId];
+            set => this.Set((int)ImageFamiliesSymbolFields.MediaDiskId, value);
         }
 
         public int? FileSequenceStart
         {
-            get => (int?)this.Fields[(int)ImageFamiliesTupleFields.FileSequenceStart];
-            set => this.Set((int)ImageFamiliesTupleFields.FileSequenceStart, value);
+            get => (int?)this.Fields[(int)ImageFamiliesSymbolFields.FileSequenceStart];
+            set => this.Set((int)ImageFamiliesSymbolFields.FileSequenceStart, value);
         }
 
         public string DiskPrompt
         {
-            get => (string)this.Fields[(int)ImageFamiliesTupleFields.DiskPrompt];
-            set => this.Set((int)ImageFamiliesTupleFields.DiskPrompt, value);
+            get => (string)this.Fields[(int)ImageFamiliesSymbolFields.DiskPrompt];
+            set => this.Set((int)ImageFamiliesSymbolFields.DiskPrompt, value);
         }
 
         public string VolumeLabel
         {
-            get => (string)this.Fields[(int)ImageFamiliesTupleFields.VolumeLabel];
-            set => this.Set((int)ImageFamiliesTupleFields.VolumeLabel, value);
+            get => (string)this.Fields[(int)ImageFamiliesSymbolFields.VolumeLabel];
+            set => this.Set((int)ImageFamiliesSymbolFields.VolumeLabel, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/IniFileTuple.cs b/src/WixToolset.Data/Tuples/IniFileTuple.cs
index 6aaa98c6..e23f6039 100644
--- a/src/WixToolset.Data/Tuples/IniFileTuple.cs
+++ b/src/WixToolset.Data/Tuples/IniFileTuple.cs
@@ -2,29 +2,29 @@
 
 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 IniFile = new IntermediateTupleDefinition(
-            TupleDefinitionType.IniFile,
+        public static readonly IntermediateSymbolDefinition IniFile = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.IniFile,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(IniFileTupleFields.FileName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IniFileTupleFields.DirProperty), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IniFileTupleFields.Section), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IniFileTupleFields.Key), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IniFileTupleFields.Value), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IniFileTupleFields.Action), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IniFileTupleFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IniFileSymbolFields.FileName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IniFileSymbolFields.DirProperty), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IniFileSymbolFields.Section), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IniFileSymbolFields.Key), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IniFileSymbolFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IniFileSymbolFields.Action), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IniFileSymbolFields.ComponentRef), IntermediateFieldType.String),
             },
-            typeof(IniFileTuple));
+            typeof(IniFileSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum IniFileTupleFields
+    public enum IniFileSymbolFields
     {
         FileName,
         DirProperty,
@@ -35,58 +35,58 @@ namespace WixToolset.Data.Tuples
         ComponentRef,
     }
 
-    public class IniFileTuple : IntermediateTuple
+    public class IniFileSymbol : IntermediateSymbol
     {
-        public IniFileTuple() : base(TupleDefinitions.IniFile, null, null)
+        public IniFileSymbol() : base(SymbolDefinitions.IniFile, null, null)
         {
         }
 
-        public IniFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.IniFile, sourceLineNumber, id)
+        public IniFileSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.IniFile, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[IniFileTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[IniFileSymbolFields index] => this.Fields[(int)index];
 
         public string FileName
         {
-            get => (string)this.Fields[(int)IniFileTupleFields.FileName];
-            set => this.Set((int)IniFileTupleFields.FileName, value);
+            get => (string)this.Fields[(int)IniFileSymbolFields.FileName];
+            set => this.Set((int)IniFileSymbolFields.FileName, value);
         }
 
         public string DirProperty
         {
-            get => (string)this.Fields[(int)IniFileTupleFields.DirProperty];
-            set => this.Set((int)IniFileTupleFields.DirProperty, value);
+            get => (string)this.Fields[(int)IniFileSymbolFields.DirProperty];
+            set => this.Set((int)IniFileSymbolFields.DirProperty, value);
         }
 
         public string Section
         {
-            get => (string)this.Fields[(int)IniFileTupleFields.Section];
-            set => this.Set((int)IniFileTupleFields.Section, value);
+            get => (string)this.Fields[(int)IniFileSymbolFields.Section];
+            set => this.Set((int)IniFileSymbolFields.Section, value);
         }
 
         public string Key
         {
-            get => (string)this.Fields[(int)IniFileTupleFields.Key];
-            set => this.Set((int)IniFileTupleFields.Key, value);
+            get => (string)this.Fields[(int)IniFileSymbolFields.Key];
+            set => this.Set((int)IniFileSymbolFields.Key, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)IniFileTupleFields.Value];
-            set => this.Set((int)IniFileTupleFields.Value, value);
+            get => (string)this.Fields[(int)IniFileSymbolFields.Value];
+            set => this.Set((int)IniFileSymbolFields.Value, value);
         }
 
         public InifFileActionType Action
         {
-            get => (InifFileActionType)this.Fields[(int)IniFileTupleFields.Action]?.AsNumber();
-            set => this.Set((int)IniFileTupleFields.Action, (int)value);
+            get => (InifFileActionType)this.Fields[(int)IniFileSymbolFields.Action]?.AsNumber();
+            set => this.Set((int)IniFileSymbolFields.Action, (int)value);
         }
 
         public string ComponentRef
         {
-            get => (string)this.Fields[(int)IniFileTupleFields.ComponentRef];
-            set => this.Set((int)IniFileTupleFields.ComponentRef, value);
+            get => (string)this.Fields[(int)IniFileSymbolFields.ComponentRef];
+            set => this.Set((int)IniFileSymbolFields.ComponentRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/IniLocatorTuple.cs b/src/WixToolset.Data/Tuples/IniLocatorTuple.cs
index 1a52715d..64351681 100644
--- a/src/WixToolset.Data/Tuples/IniLocatorTuple.cs
+++ b/src/WixToolset.Data/Tuples/IniLocatorTuple.cs
@@ -2,28 +2,28 @@
 
 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 IniLocator = new IntermediateTupleDefinition(
-            TupleDefinitionType.IniLocator,
+        public static readonly IntermediateSymbolDefinition IniLocator = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.IniLocator,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(IniLocatorTupleFields.SignatureRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IniLocatorTupleFields.FileName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IniLocatorTupleFields.Section), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IniLocatorTupleFields.Key), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IniLocatorTupleFields.Field), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IniLocatorTupleFields.Type), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IniLocatorSymbolFields.SignatureRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IniLocatorSymbolFields.FileName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IniLocatorSymbolFields.Section), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IniLocatorSymbolFields.Key), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IniLocatorSymbolFields.Field), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IniLocatorSymbolFields.Type), IntermediateFieldType.Number),
             },
-            typeof(IniLocatorTuple));
+            typeof(IniLocatorSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum IniLocatorTupleFields
+    public enum IniLocatorSymbolFields
     {
         SignatureRef,
         FileName,
@@ -33,52 +33,52 @@ namespace WixToolset.Data.Tuples
         Type,
     }
 
-    public class IniLocatorTuple : IntermediateTuple
+    public class IniLocatorSymbol : IntermediateSymbol
     {
-        public IniLocatorTuple() : base(TupleDefinitions.IniLocator, null, null)
+        public IniLocatorSymbol() : base(SymbolDefinitions.IniLocator, null, null)
         {
         }
 
-        public IniLocatorTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.IniLocator, sourceLineNumber, id)
+        public IniLocatorSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.IniLocator, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[IniLocatorTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[IniLocatorSymbolFields index] => this.Fields[(int)index];
 
         public string SignatureRef
         {
-            get => (string)this.Fields[(int)IniLocatorTupleFields.SignatureRef];
-            set => this.Set((int)IniLocatorTupleFields.SignatureRef, value);
+            get => (string)this.Fields[(int)IniLocatorSymbolFields.SignatureRef];
+            set => this.Set((int)IniLocatorSymbolFields.SignatureRef, value);
         }
 
         public string FileName
         {
-            get => (string)this.Fields[(int)IniLocatorTupleFields.FileName];
-            set => this.Set((int)IniLocatorTupleFields.FileName, value);
+            get => (string)this.Fields[(int)IniLocatorSymbolFields.FileName];
+            set => this.Set((int)IniLocatorSymbolFields.FileName, value);
         }
 
         public string Section
         {
-            get => (string)this.Fields[(int)IniLocatorTupleFields.Section];
-            set => this.Set((int)IniLocatorTupleFields.Section, value);
+            get => (string)this.Fields[(int)IniLocatorSymbolFields.Section];
+            set => this.Set((int)IniLocatorSymbolFields.Section, value);
         }
 
         public string Key
         {
-            get => (string)this.Fields[(int)IniLocatorTupleFields.Key];
-            set => this.Set((int)IniLocatorTupleFields.Key, value);
+            get => (string)this.Fields[(int)IniLocatorSymbolFields.Key];
+            set => this.Set((int)IniLocatorSymbolFields.Key, value);
         }
 
         public int? Field
         {
-            get => (int?)this.Fields[(int)IniLocatorTupleFields.Field];
-            set => this.Set((int)IniLocatorTupleFields.Field, value);
+            get => (int?)this.Fields[(int)IniLocatorSymbolFields.Field];
+            set => this.Set((int)IniLocatorSymbolFields.Field, value);
         }
 
         public int? Type
         {
-            get => (int?)this.Fields[(int)IniLocatorTupleFields.Type];
-            set => this.Set((int)IniLocatorTupleFields.Type, value);
+            get => (int?)this.Fields[(int)IniLocatorSymbolFields.Type];
+            set => this.Set((int)IniLocatorSymbolFields.Type, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/InifFileActionType.cs b/src/WixToolset.Data/Tuples/InifFileActionType.cs
index 94172f47..8b642323 100644
--- a/src/WixToolset.Data/Tuples/InifFileActionType.cs
+++ b/src/WixToolset.Data/Tuples/InifFileActionType.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
     public enum InifFileActionType
     {
diff --git a/src/WixToolset.Data/Tuples/IsolatedComponentTuple.cs b/src/WixToolset.Data/Tuples/IsolatedComponentTuple.cs
index afd9891b..681f1030 100644
--- a/src/WixToolset.Data/Tuples/IsolatedComponentTuple.cs
+++ b/src/WixToolset.Data/Tuples/IsolatedComponentTuple.cs
@@ -2,51 +2,51 @@
 
 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 IsolatedComponent = new IntermediateTupleDefinition(
-            TupleDefinitionType.IsolatedComponent,
+        public static readonly IntermediateSymbolDefinition IsolatedComponent = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.IsolatedComponent,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(IsolatedComponentTupleFields.SharedComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IsolatedComponentTupleFields.ApplicationComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IsolatedComponentSymbolFields.SharedComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IsolatedComponentSymbolFields.ApplicationComponentRef), IntermediateFieldType.String),
             },
-            typeof(IsolatedComponentTuple));
+            typeof(IsolatedComponentSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum IsolatedComponentTupleFields
+    public enum IsolatedComponentSymbolFields
     {
         SharedComponentRef,
         ApplicationComponentRef,
     }
 
-    public class IsolatedComponentTuple : IntermediateTuple
+    public class IsolatedComponentSymbol : IntermediateSymbol
     {
-        public IsolatedComponentTuple() : base(TupleDefinitions.IsolatedComponent, null, null)
+        public IsolatedComponentSymbol() : base(SymbolDefinitions.IsolatedComponent, null, null)
         {
         }
 
-        public IsolatedComponentTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.IsolatedComponent, sourceLineNumber, id)
+        public IsolatedComponentSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.IsolatedComponent, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[IsolatedComponentTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[IsolatedComponentSymbolFields index] => this.Fields[(int)index];
 
         public string SharedComponentRef
         {
-            get => (string)this.Fields[(int)IsolatedComponentTupleFields.SharedComponentRef];
-            set => this.Set((int)IsolatedComponentTupleFields.SharedComponentRef, value);
+            get => (string)this.Fields[(int)IsolatedComponentSymbolFields.SharedComponentRef];
+            set => this.Set((int)IsolatedComponentSymbolFields.SharedComponentRef, value);
         }
 
         public string ApplicationComponentRef
         {
-            get => (string)this.Fields[(int)IsolatedComponentTupleFields.ApplicationComponentRef];
-            set => this.Set((int)IsolatedComponentTupleFields.ApplicationComponentRef, value);
+            get => (string)this.Fields[(int)IsolatedComponentSymbolFields.ApplicationComponentRef];
+            set => this.Set((int)IsolatedComponentSymbolFields.ApplicationComponentRef, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/LaunchConditionTuple.cs b/src/WixToolset.Data/Tuples/LaunchConditionTuple.cs
index c895ea35..a160f25f 100644
--- a/src/WixToolset.Data/Tuples/LaunchConditionTuple.cs
+++ b/src/WixToolset.Data/Tuples/LaunchConditionTuple.cs
@@ -2,51 +2,51 @@
 
 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 LaunchCondition = new IntermediateTupleDefinition(
-            TupleDefinitionType.LaunchCondition,
+        public static readonly IntermediateSymbolDefinition LaunchCondition = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.LaunchCondition,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(LaunchConditionTupleFields.Condition), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(LaunchConditionTupleFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(LaunchConditionSymbolFields.Condition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(LaunchConditionSymbolFields.Description), IntermediateFieldType.String),
             },
-            typeof(LaunchConditionTuple));
+            typeof(LaunchConditionSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum LaunchConditionTupleFields
+    public enum LaunchConditionSymbolFields
     {
         Condition,
         Description,
     }
 
-    public class LaunchConditionTuple : IntermediateTuple
+    public class LaunchConditionSymbol : IntermediateSymbol
     {
-        public LaunchConditionTuple() : base(TupleDefinitions.LaunchCondition, null, null)
+        public LaunchConditionSymbol() : base(SymbolDefinitions.LaunchCondition, null, null)
         {
         }
 
-        public LaunchConditionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.LaunchCondition, sourceLineNumber, id)
+        public LaunchConditionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.LaunchCondition, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[LaunchConditionTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[LaunchConditionSymbolFields index] => this.Fields[(int)index];
 
         public string Condition
         {
-            get => (string)this.Fields[(int)LaunchConditionTupleFields.Condition];
-            set => this.Set((int)LaunchConditionTupleFields.Condition, value);
+            get => (string)this.Fields[(int)LaunchConditionSymbolFields.Condition];
+            set => this.Set((int)LaunchConditionSymbolFields.Condition, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)LaunchConditionTupleFields.Description];
-            set => this.Set((int)LaunchConditionTupleFields.Description, value);
+            get => (string)this.Fields[(int)LaunchConditionSymbolFields.Description];
+            set => this.Set((int)LaunchConditionSymbolFields.Description, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ListBoxTuple.cs b/src/WixToolset.Data/Tuples/ListBoxTuple.cs
index c25f1728..174327d1 100644
--- a/src/WixToolset.Data/Tuples/ListBoxTuple.cs
+++ b/src/WixToolset.Data/Tuples/ListBoxTuple.cs
@@ -2,26 +2,26 @@
 
 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 ListBox = new IntermediateTupleDefinition(
-            TupleDefinitionType.ListBox,
+        public static readonly IntermediateSymbolDefinition ListBox = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.ListBox,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ListBoxTupleFields.Property), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ListBoxTupleFields.Order), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ListBoxTupleFields.Value), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ListBoxTupleFields.Text), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ListBoxSymbolFields.Property), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ListBoxSymbolFields.Order), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ListBoxSymbolFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ListBoxSymbolFields.Text), IntermediateFieldType.String),
             },
-            typeof(ListBoxTuple));
+            typeof(ListBoxSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ListBoxTupleFields
+    public enum ListBoxSymbolFields
     {
         Property,
         Order,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
         Text,
     }
 
-    public class ListBoxTuple : IntermediateTuple
+    public class ListBoxSymbol : IntermediateSymbol
     {
-        public ListBoxTuple() : base(TupleDefinitions.ListBox, null, null)
+        public ListBoxSymbol() : base(SymbolDefinitions.ListBox, null, null)
         {
         }
 
-        public ListBoxTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ListBox, sourceLineNumber, id)
+        public ListBoxSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ListBox, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ListBoxTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ListBoxSymbolFields index] => this.Fields[(int)index];
 
         public string Property
         {
-            get => (string)this.Fields[(int)ListBoxTupleFields.Property];
-            set => this.Set((int)ListBoxTupleFields.Property, value);
+            get => (string)this.Fields[(int)ListBoxSymbolFields.Property];
+            set => this.Set((int)ListBoxSymbolFields.Property, value);
         }
 
         public int Order
         {
-            get => (int)this.Fields[(int)ListBoxTupleFields.Order];
-            set => this.Set((int)ListBoxTupleFields.Order, value);
+            get => (int)this.Fields[(int)ListBoxSymbolFields.Order];
+            set => this.Set((int)ListBoxSymbolFields.Order, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)ListBoxTupleFields.Value];
-            set => this.Set((int)ListBoxTupleFields.Value, value);
+            get => (string)this.Fields[(int)ListBoxSymbolFields.Value];
+            set => this.Set((int)ListBoxSymbolFields.Value, value);
         }
 
         public string Text
         {
-            get => (string)this.Fields[(int)ListBoxTupleFields.Text];
-            set => this.Set((int)ListBoxTupleFields.Text, value);
+            get => (string)this.Fields[(int)ListBoxSymbolFields.Text];
+            set => this.Set((int)ListBoxSymbolFields.Text, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ListViewTuple.cs b/src/WixToolset.Data/Tuples/ListViewTuple.cs
index 80fbed83..09543ab1 100644
--- a/src/WixToolset.Data/Tuples/ListViewTuple.cs
+++ b/src/WixToolset.Data/Tuples/ListViewTuple.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 ListView = new IntermediateTupleDefinition(
-            TupleDefinitionType.ListView,
+        public static readonly IntermediateSymbolDefinition ListView = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.ListView,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ListViewTupleFields.Property), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ListViewTupleFields.Order), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ListViewTupleFields.Value), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ListViewTupleFields.Text), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ListViewTupleFields.BinaryRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ListViewSymbolFields.Property), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ListViewSymbolFields.Order), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ListViewSymbolFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ListViewSymbolFields.Text), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ListViewSymbolFields.BinaryRef), IntermediateFieldType.String),
             },
-            typeof(ListViewTuple));
+            typeof(ListViewSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ListViewTupleFields
+    public enum ListViewSymbolFields
     {
         Property,
         Order,
@@ -31,46 +31,46 @@ namespace WixToolset.Data.Tuples
         BinaryRef,
     }
 
-    public class ListViewTuple : IntermediateTuple
+    public class ListViewSymbol : IntermediateSymbol
     {
-        public ListViewTuple() : base(TupleDefinitions.ListView, null, null)
+        public ListViewSymbol() : base(SymbolDefinitions.ListView, null, null)
         {
         }
 
-        public ListViewTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ListView, sourceLineNumber, id)
+        public ListViewSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ListView, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ListViewTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ListViewSymbolFields index] => this.Fields[(int)index];
 
         public string Property
         {
-            get => (string)this.Fields[(int)ListViewTupleFields.Property];
-            set => this.Set((int)ListViewTupleFields.Property, value);
+            get => (string)this.Fields[(int)ListViewSymbolFields.Property];
+            set => this.Set((int)ListViewSymbolFields.Property, value);
         }
 
         public int Order
         {
-            get => (int)this.Fields[(int)ListViewTupleFields.Order];
-            set => this.Set((int)ListViewTupleFields.Order, value);
+            get => (int)this.Fields[(int)ListViewSymbolFields.Order];
+            set => this.Set((int)ListViewSymbolFields.Order, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)ListViewTupleFields.Value];
-            set => this.Set((int)ListViewTupleFields.Value, value);
+            get => (string)this.Fields[(int)ListViewSymbolFields.Value];
+            set => this.Set((int)ListViewSymbolFields.Value, value);
         }
 
         public string Text
         {
-            get => (string)this.Fields[(int)ListViewTupleFields.Text];
-            set => this.Set((int)ListViewTupleFields.Text, value);
+            get => (string)this.Fields[(int)ListViewSymbolFields.Text];
+            set => this.Set((int)ListViewSymbolFields.Text, value);
         }
 
         public string BinaryRef
         {
-            get => (string)this.Fields[(int)ListViewTupleFields.BinaryRef];
-            set => this.Set((int)ListViewTupleFields.BinaryRef, value);
+            get => (string)this.Fields[(int)ListViewSymbolFields.BinaryRef];
+            set => this.Set((int)ListViewSymbolFields.BinaryRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/LocatorType.cs b/src/WixToolset.Data/Tuples/LocatorType.cs
index 18f5ada0..6f136389 100644
--- a/src/WixToolset.Data/Tuples/LocatorType.cs
+++ b/src/WixToolset.Data/Tuples/LocatorType.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
     public enum LocatorType
     {
diff --git a/src/WixToolset.Data/Tuples/LockPermissionsTuple.cs b/src/WixToolset.Data/Tuples/LockPermissionsTuple.cs
index 33c1ad15..12562fd1 100644
--- a/src/WixToolset.Data/Tuples/LockPermissionsTuple.cs
+++ b/src/WixToolset.Data/Tuples/LockPermissionsTuple.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 LockPermissions = new IntermediateTupleDefinition(
-            TupleDefinitionType.LockPermissions,
+        public static readonly IntermediateSymbolDefinition LockPermissions = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.LockPermissions,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(LockPermissionsTupleFields.LockObject), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(LockPermissionsTupleFields.Table), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(LockPermissionsTupleFields.Domain), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(LockPermissionsTupleFields.User), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(LockPermissionsTupleFields.Permission), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(LockPermissionsSymbolFields.LockObject), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(LockPermissionsSymbolFields.Table), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(LockPermissionsSymbolFields.Domain), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(LockPermissionsSymbolFields.User), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(LockPermissionsSymbolFields.Permission), IntermediateFieldType.Number),
             },
-            typeof(LockPermissionsTuple));
+            typeof(LockPermissionsSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum LockPermissionsTupleFields
+    public enum LockPermissionsSymbolFields
     {
         LockObject,
         Table,
@@ -31,46 +31,46 @@ namespace WixToolset.Data.Tuples
         Permission,
     }
 
-    public class LockPermissionsTuple : IntermediateTuple
+    public class LockPermissionsSymbol : IntermediateSymbol
     {
-        public LockPermissionsTuple() : base(TupleDefinitions.LockPermissions, null, null)
+        public LockPermissionsSymbol() : base(SymbolDefinitions.LockPermissions, null, null)
         {
         }
 
-        public LockPermissionsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.LockPermissions, sourceLineNumber, id)
+        public LockPermissionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.LockPermissions, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[LockPermissionsTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[LockPermissionsSymbolFields index] => this.Fields[(int)index];
 
         public string LockObject
         {
-            get => (string)this.Fields[(int)LockPermissionsTupleFields.LockObject];
-            set => this.Set((int)LockPermissionsTupleFields.LockObject, value);
+            get => (string)this.Fields[(int)LockPermissionsSymbolFields.LockObject];
+            set => this.Set((int)LockPermissionsSymbolFields.LockObject, value);
         }
 
         public string Table
         {
-            get => (string)this.Fields[(int)LockPermissionsTupleFields.Table];
-            set => this.Set((int)LockPermissionsTupleFields.Table, value);
+            get => (string)this.Fields[(int)LockPermissionsSymbolFields.Table];
+            set => this.Set((int)LockPermissionsSymbolFields.Table, value);
         }
 
         public string Domain
         {
-            get => (string)this.Fields[(int)LockPermissionsTupleFields.Domain];
-            set => this.Set((int)LockPermissionsTupleFields.Domain, value);
+            get => (string)this.Fields[(int)LockPermissionsSymbolFields.Domain];
+            set => this.Set((int)LockPermissionsSymbolFields.Domain, value);
         }
 
         public string User
         {
-            get => (string)this.Fields[(int)LockPermissionsTupleFields.User];
-            set => this.Set((int)LockPermissionsTupleFields.User, value);
+            get => (string)this.Fields[(int)LockPermissionsSymbolFields.User];
+            set => this.Set((int)LockPermissionsSymbolFields.User, value);
         }
 
         public int? Permission
         {
-            get => (int?)this.Fields[(int)LockPermissionsTupleFields.Permission];
-            set => this.Set((int)LockPermissionsTupleFields.Permission, value);
+            get => (int?)this.Fields[(int)LockPermissionsSymbolFields.Permission];
+            set => this.Set((int)LockPermissionsSymbolFields.Permission, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MIMETuple.cs b/src/WixToolset.Data/Tuples/MIMETuple.cs
index 19eff883..f66d05b8 100644
--- a/src/WixToolset.Data/Tuples/MIMETuple.cs
+++ b/src/WixToolset.Data/Tuples/MIMETuple.cs
@@ -2,59 +2,59 @@
 
 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 MIME = new IntermediateTupleDefinition(
-            TupleDefinitionType.MIME,
+        public static readonly IntermediateSymbolDefinition MIME = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.MIME,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(MIMETupleFields.ContentType), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MIMETupleFields.ExtensionRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MIMETupleFields.CLSID), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MIMESymbolFields.ContentType), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MIMESymbolFields.ExtensionRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MIMESymbolFields.CLSID), IntermediateFieldType.String),
             },
-            typeof(MIMETuple));
+            typeof(MIMESymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum MIMETupleFields
+    public enum MIMESymbolFields
     {
         ContentType,
         ExtensionRef,
         CLSID,
     }
 
-    public class MIMETuple : IntermediateTuple
+    public class MIMESymbol : IntermediateSymbol
     {
-        public MIMETuple() : base(TupleDefinitions.MIME, null, null)
+        public MIMESymbol() : base(SymbolDefinitions.MIME, null, null)
         {
         }
 
-        public MIMETuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MIME, sourceLineNumber, id)
+        public MIMESymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MIME, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[MIMETupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[MIMESymbolFields index] => this.Fields[(int)index];
 
         public string ContentType
         {
-            get => (string)this.Fields[(int)MIMETupleFields.ContentType];
-            set => this.Set((int)MIMETupleFields.ContentType, value);
+            get => (string)this.Fields[(int)MIMESymbolFields.ContentType];
+            set => this.Set((int)MIMESymbolFields.ContentType, value);
         }
 
         public string ExtensionRef
         {
-            get => (string)this.Fields[(int)MIMETupleFields.ExtensionRef];
-            set => this.Set((int)MIMETupleFields.ExtensionRef, value);
+            get => (string)this.Fields[(int)MIMESymbolFields.ExtensionRef];
+            set => this.Set((int)MIMESymbolFields.ExtensionRef, value);
         }
 
         public string CLSID
         {
-            get => (string)this.Fields[(int)MIMETupleFields.CLSID];
-            set => this.Set((int)MIMETupleFields.CLSID, value);
+            get => (string)this.Fields[(int)MIMESymbolFields.CLSID];
+            set => this.Set((int)MIMESymbolFields.CLSID, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MediaTuple.cs b/src/WixToolset.Data/Tuples/MediaTuple.cs
index a9cbb034..f216cddc 100644
--- a/src/WixToolset.Data/Tuples/MediaTuple.cs
+++ b/src/WixToolset.Data/Tuples/MediaTuple.cs
@@ -2,30 +2,30 @@
 
 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 Media = new IntermediateTupleDefinition(
-            TupleDefinitionType.Media,
+        public static readonly IntermediateSymbolDefinition Media = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.Media,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(MediaTupleFields.DiskId), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(MediaTupleFields.LastSequence), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(MediaTupleFields.DiskPrompt), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MediaTupleFields.Cabinet), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MediaTupleFields.VolumeLabel), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MediaTupleFields.Source), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MediaTupleFields.CompressionLevel), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(MediaTupleFields.Layout), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MediaSymbolFields.DiskId), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MediaSymbolFields.LastSequence), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MediaSymbolFields.DiskPrompt), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MediaSymbolFields.Cabinet), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MediaSymbolFields.VolumeLabel), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MediaSymbolFields.Source), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MediaSymbolFields.CompressionLevel), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MediaSymbolFields.Layout), IntermediateFieldType.String),
             },
-            typeof(MediaTuple));
+            typeof(MediaSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum MediaTupleFields
+    public enum MediaSymbolFields
     {
         DiskId,
         LastSequence,
@@ -37,64 +37,64 @@ namespace WixToolset.Data.Tuples
         Layout,
     }
 
-    public class MediaTuple : IntermediateTuple
+    public class MediaSymbol : IntermediateSymbol
     {
-        public MediaTuple() : base(TupleDefinitions.Media, null, null)
+        public MediaSymbol() : base(SymbolDefinitions.Media, null, null)
         {
         }
 
-        public MediaTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Media, sourceLineNumber, id)
+        public MediaSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Media, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[MediaTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[MediaSymbolFields index] => this.Fields[(int)index];
 
         public int DiskId
         {
-            get => (int)this.Fields[(int)MediaTupleFields.DiskId];
-            set => this.Set((int)MediaTupleFields.DiskId, value);
+            get => (int)this.Fields[(int)MediaSymbolFields.DiskId];
+            set => this.Set((int)MediaSymbolFields.DiskId, value);
         }
 
         public int? LastSequence
         {
-            get => (int?)this.Fields[(int)MediaTupleFields.LastSequence];
-            set => this.Set((int)MediaTupleFields.LastSequence, value);
+            get => (int?)this.Fields[(int)MediaSymbolFields.LastSequence];
+            set => this.Set((int)MediaSymbolFields.LastSequence, value);
         }
 
         public string DiskPrompt
         {
-            get => (string)this.Fields[(int)MediaTupleFields.DiskPrompt];
-            set => this.Set((int)MediaTupleFields.DiskPrompt, value);
+            get => (string)this.Fields[(int)MediaSymbolFields.DiskPrompt];
+            set => this.Set((int)MediaSymbolFields.DiskPrompt, value);
         }
 
         public string Cabinet
         {
-            get => (string)this.Fields[(int)MediaTupleFields.Cabinet];
-            set => this.Set((int)MediaTupleFields.Cabinet, value);
+            get => (string)this.Fields[(int)MediaSymbolFields.Cabinet];
+            set => this.Set((int)MediaSymbolFields.Cabinet, value);
         }
 
         public string VolumeLabel
         {
-            get => (string)this.Fields[(int)MediaTupleFields.VolumeLabel];
-            set => this.Set((int)MediaTupleFields.VolumeLabel, value);
+            get => (string)this.Fields[(int)MediaSymbolFields.VolumeLabel];
+            set => this.Set((int)MediaSymbolFields.VolumeLabel, value);
         }
 
         public string Source
         {
-            get => (string)this.Fields[(int)MediaTupleFields.Source];
-            set => this.Set((int)MediaTupleFields.Source, value);
+            get => (string)this.Fields[(int)MediaSymbolFields.Source];
+            set => this.Set((int)MediaSymbolFields.Source, value);
         }
 
         public CompressionLevel? CompressionLevel
         {
-            get => (CompressionLevel?)this.Fields[(int)MediaTupleFields.CompressionLevel].AsNullableNumber();
-            set => this.Set((int)MediaTupleFields.CompressionLevel, (int?)value);
+            get => (CompressionLevel?)this.Fields[(int)MediaSymbolFields.CompressionLevel].AsNullableNumber();
+            set => this.Set((int)MediaSymbolFields.CompressionLevel, (int?)value);
         }
 
         public string Layout
         {
-            get => (string)this.Fields[(int)MediaTupleFields.Layout];
-            set => this.Set((int)MediaTupleFields.Layout, value);
+            get => (string)this.Fields[(int)MediaSymbolFields.Layout];
+            set => this.Set((int)MediaSymbolFields.Layout, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/ModuleComponentsTuple.cs b/src/WixToolset.Data/Tuples/ModuleComponentsTuple.cs
index 2b560b50..287819ab 100644
--- a/src/WixToolset.Data/Tuples/ModuleComponentsTuple.cs
+++ b/src/WixToolset.Data/Tuples/ModuleComponentsTuple.cs
@@ -2,59 +2,59 @@
 
 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 ModuleComponents = new IntermediateTupleDefinition(
-            TupleDefinitionType.ModuleComponents,
+        public static readonly IntermediateSymbolDefinition ModuleComponents = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.ModuleComponents,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ModuleComponentsTupleFields.Component), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ModuleComponentsTupleFields.ModuleID), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ModuleComponentsTupleFields.Language), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ModuleComponentsSymbolFields.Component), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleComponentsSymbolFields.ModuleID), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleComponentsSymbolFields.Language), IntermediateFieldType.Number),
             },
-            typeof(ModuleComponentsTuple));
+            typeof(ModuleComponentsSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ModuleComponentsTupleFields
+    public enum ModuleComponentsSymbolFields
     {
         Component,
         ModuleID,
         Language,
     }
 
-    public class ModuleComponentsTuple : IntermediateTuple
+    public class ModuleComponentsSymbol : IntermediateSymbol
     {
-        public ModuleComponentsTuple() : base(TupleDefinitions.ModuleComponents, null, null)
+        public ModuleComponentsSymbol() : base(SymbolDefinitions.ModuleComponents, null, null)
         {
         }
 
-        public ModuleComponentsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ModuleComponents, sourceLineNumber, id)
+        public ModuleComponentsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ModuleComponents, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ModuleComponentsTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ModuleComponentsSymbolFields index] => this.Fields[(int)index];
 
         public string Component
         {
-            get => (string)this.Fields[(int)ModuleComponentsTupleFields.Component];
-            set => this.Set((int)ModuleComponentsTupleFields.Component, value);
+            get => (string)this.Fields[(int)ModuleComponentsSymbolFields.Component];
+            set => this.Set((int)ModuleComponentsSymbolFields.Component, value);
         }
 
         public string ModuleID
         {
-            get => (string)this.Fields[(int)ModuleComponentsTupleFields.ModuleID];
-            set => this.Set((int)ModuleComponentsTupleFields.ModuleID, value);
+            get => (string)this.Fields[(int)ModuleComponentsSymbolFields.ModuleID];
+            set => this.Set((int)ModuleComponentsSymbolFields.ModuleID, value);
         }
 
         public int Language
         {
-            get => (int)this.Fields[(int)ModuleComponentsTupleFields.Language];
-            set => this.Set((int)ModuleComponentsTupleFields.Language, value);
+            get => (int)this.Fields[(int)ModuleComponentsSymbolFields.Language];
+            set => this.Set((int)ModuleComponentsSymbolFields.Language, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ModuleConfigurationTuple.cs b/src/WixToolset.Data/Tuples/ModuleConfigurationTuple.cs
index fd0cf365..8188dc87 100644
--- a/src/WixToolset.Data/Tuples/ModuleConfigurationTuple.cs
+++ b/src/WixToolset.Data/Tuples/ModuleConfigurationTuple.cs
@@ -2,32 +2,32 @@
 
 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 ModuleConfiguration = new IntermediateTupleDefinition(
-            TupleDefinitionType.ModuleConfiguration,
+        public static readonly IntermediateSymbolDefinition ModuleConfiguration = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.ModuleConfiguration,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ModuleConfigurationTupleFields.Format), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ModuleConfigurationTupleFields.Type), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ModuleConfigurationTupleFields.ContextData), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ModuleConfigurationTupleFields.DefaultValue), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ModuleConfigurationTupleFields.KeyNoOrphan), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(ModuleConfigurationTupleFields.NonNullable), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(ModuleConfigurationTupleFields.DisplayName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ModuleConfigurationTupleFields.Description), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ModuleConfigurationTupleFields.HelpLocation), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ModuleConfigurationTupleFields.HelpKeyword), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleConfigurationSymbolFields.Format), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ModuleConfigurationSymbolFields.Type), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleConfigurationSymbolFields.ContextData), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleConfigurationSymbolFields.DefaultValue), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleConfigurationSymbolFields.KeyNoOrphan), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ModuleConfigurationSymbolFields.NonNullable), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ModuleConfigurationSymbolFields.DisplayName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleConfigurationSymbolFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleConfigurationSymbolFields.HelpLocation), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleConfigurationSymbolFields.HelpKeyword), IntermediateFieldType.String),
             },
-            typeof(ModuleConfigurationTuple));
+            typeof(ModuleConfigurationSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ModuleConfigurationTupleFields
+    public enum ModuleConfigurationSymbolFields
     {
         Format,
         Type,
@@ -41,76 +41,76 @@ namespace WixToolset.Data.Tuples
         HelpKeyword,
     }
 
-    public class ModuleConfigurationTuple : IntermediateTuple
+    public class ModuleConfigurationSymbol : IntermediateSymbol
     {
-        public ModuleConfigurationTuple() : base(TupleDefinitions.ModuleConfiguration, null, null)
+        public ModuleConfigurationSymbol() : base(SymbolDefinitions.ModuleConfiguration, null, null)
         {
         }
 
-        public ModuleConfigurationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ModuleConfiguration, sourceLineNumber, id)
+        public ModuleConfigurationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ModuleConfiguration, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ModuleConfigurationTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ModuleConfigurationSymbolFields index] => this.Fields[(int)index];
 
         public int Format
         {
-            get => (int)this.Fields[(int)ModuleConfigurationTupleFields.Format];
-            set => this.Set((int)ModuleConfigurationTupleFields.Format, value);
+            get => (int)this.Fields[(int)ModuleConfigurationSymbolFields.Format];
+            set => this.Set((int)ModuleConfigurationSymbolFields.Format, value);
         }
 
         public string Type
         {
-            get => (string)this.Fields[(int)ModuleConfigurationTupleFields.Type];
-            set => this.Set((int)ModuleConfigurationTupleFields.Type, value);
+            get => (string)this.Fields[(int)ModuleConfigurationSymbolFields.Type];
+            set => this.Set((int)ModuleConfigurationSymbolFields.Type, value);
         }
 
         public string ContextData
         {
-            get => (string)this.Fields[(int)ModuleConfigurationTupleFields.ContextData];
-            set => this.Set((int)ModuleConfigurationTupleFields.ContextData, value);
+            get => (string)this.Fields[(int)ModuleConfigurationSymbolFields.ContextData];
+            set => this.Set((int)ModuleConfigurationSymbolFields.ContextData, value);
         }
 
         public string DefaultValue
         {
-            get => (string)this.Fields[(int)ModuleConfigurationTupleFields.DefaultValue];
-            set => this.Set((int)ModuleConfigurationTupleFields.DefaultValue, value);
+            get => (string)this.Fields[(int)ModuleConfigurationSymbolFields.DefaultValue];
+            set => this.Set((int)ModuleConfigurationSymbolFields.DefaultValue, value);
         }
 
         public bool KeyNoOrphan
         {
-            get => this.Fields[(int)ModuleConfigurationTupleFields.KeyNoOrphan].AsBool();
-            set => this.Set((int)ModuleConfigurationTupleFields.KeyNoOrphan, value);
+            get => this.Fields[(int)ModuleConfigurationSymbolFields.KeyNoOrphan].AsBool();
+            set => this.Set((int)ModuleConfigurationSymbolFields.KeyNoOrphan, value);
         }
 
         public bool NonNullable
         {
-            get => this.Fields[(int)ModuleConfigurationTupleFields.NonNullable].AsBool();
-            set => this.Set((int)ModuleConfigurationTupleFields.NonNullable, value);
+            get => this.Fields[(int)ModuleConfigurationSymbolFields.NonNullable].AsBool();
+            set => this.Set((int)ModuleConfigurationSymbolFields.NonNullable, value);
         }
 
         public string DisplayName
         {
-            get => (string)this.Fields[(int)ModuleConfigurationTupleFields.DisplayName];
-            set => this.Set((int)ModuleConfigurationTupleFields.DisplayName, value);
+            get => (string)this.Fields[(int)ModuleConfigurationSymbolFields.DisplayName];
+            set => this.Set((int)ModuleConfigurationSymbolFields.DisplayName, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)ModuleConfigurationTupleFields.Description];
-            set => this.Set((int)ModuleConfigurationTupleFields.Description, value);
+            get => (string)this.Fields[(int)ModuleConfigurationSymbolFields.Description];
+            set => this.Set((int)ModuleConfigurationSymbolFields.Description, value);
         }
 
         public string HelpLocation
         {
-            get => (string)this.Fields[(int)ModuleConfigurationTupleFields.HelpLocation];
-            set => this.Set((int)ModuleConfigurationTupleFields.HelpLocation, value);
+            get => (string)this.Fields[(int)ModuleConfigurationSymbolFields.HelpLocation];
+            set => this.Set((int)ModuleConfigurationSymbolFields.HelpLocation, value);
         }
 
         public string HelpKeyword
         {
-            get => (string)this.Fields[(int)ModuleConfigurationTupleFields.HelpKeyword];
-            set => this.Set((int)ModuleConfigurationTupleFields.HelpKeyword, value);
+            get => (string)this.Fields[(int)ModuleConfigurationSymbolFields.HelpKeyword];
+            set => this.Set((int)ModuleConfigurationSymbolFields.HelpKeyword, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ModuleDependencyTuple.cs b/src/WixToolset.Data/Tuples/ModuleDependencyTuple.cs
index 8c857d41..80d2d5f6 100644
--- a/src/WixToolset.Data/Tuples/ModuleDependencyTuple.cs
+++ b/src/WixToolset.Data/Tuples/ModuleDependencyTuple.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 ModuleDependency = new IntermediateTupleDefinition(
-            TupleDefinitionType.ModuleDependency,
+        public static readonly IntermediateSymbolDefinition ModuleDependency = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.ModuleDependency,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ModuleDependencyTupleFields.ModuleID), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ModuleDependencyTupleFields.ModuleLanguage), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ModuleDependencyTupleFields.RequiredID), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ModuleDependencyTupleFields.RequiredLanguage), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ModuleDependencyTupleFields.RequiredVersion), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleDependencySymbolFields.ModuleID), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleDependencySymbolFields.ModuleLanguage), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ModuleDependencySymbolFields.RequiredID), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleDependencySymbolFields.RequiredLanguage), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ModuleDependencySymbolFields.RequiredVersion), IntermediateFieldType.String),
             },
-            typeof(ModuleDependencyTuple));
+            typeof(ModuleDependencySymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ModuleDependencyTupleFields
+    public enum ModuleDependencySymbolFields
     {
         ModuleID,
         ModuleLanguage,
@@ -31,46 +31,46 @@ namespace WixToolset.Data.Tuples
         RequiredVersion,
     }
 
-    public class ModuleDependencyTuple : IntermediateTuple
+    public class ModuleDependencySymbol : IntermediateSymbol
     {
-        public ModuleDependencyTuple() : base(TupleDefinitions.ModuleDependency, null, null)
+        public ModuleDependencySymbol() : base(SymbolDefinitions.ModuleDependency, null, null)
         {
         }
 
-        public ModuleDependencyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ModuleDependency, sourceLineNumber, id)
+        public ModuleDependencySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ModuleDependency, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ModuleDependencyTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ModuleDependencySymbolFields index] => this.Fields[(int)index];
 
         public string ModuleID
         {
-            get => (string)this.Fields[(int)ModuleDependencyTupleFields.ModuleID];
-            set => this.Set((int)ModuleDependencyTupleFields.ModuleID, value);
+            get => (string)this.Fields[(int)ModuleDependencySymbolFields.ModuleID];
+            set => this.Set((int)ModuleDependencySymbolFields.ModuleID, value);
         }
 
         public int ModuleLanguage
         {
-            get => (int)this.Fields[(int)ModuleDependencyTupleFields.ModuleLanguage];
-            set => this.Set((int)ModuleDependencyTupleFields.ModuleLanguage, value);
+            get => (int)this.Fields[(int)ModuleDependencySymbolFields.ModuleLanguage];
+            set => this.Set((int)ModuleDependencySymbolFields.ModuleLanguage, value);
         }
 
         public string RequiredID
         {
-            get => (string)this.Fields[(int)ModuleDependencyTupleFields.RequiredID];
-            set => this.Set((int)ModuleDependencyTupleFields.RequiredID, value);
+            get => (string)this.Fields[(int)ModuleDependencySymbolFields.RequiredID];
+            set => this.Set((int)ModuleDependencySymbolFields.RequiredID, value);
         }
 
         public int RequiredLanguage
         {
-            get => (int)this.Fields[(int)ModuleDependencyTupleFields.RequiredLanguage];
-            set => this.Set((int)ModuleDependencyTupleFields.RequiredLanguage, value);
+            get => (int)this.Fields[(int)ModuleDependencySymbolFields.RequiredLanguage];
+            set => this.Set((int)ModuleDependencySymbolFields.RequiredLanguage, value);
         }
 
         public string RequiredVersion
         {
-            get => (string)this.Fields[(int)ModuleDependencyTupleFields.RequiredVersion];
-            set => this.Set((int)ModuleDependencyTupleFields.RequiredVersion, value);
+            get => (string)this.Fields[(int)ModuleDependencySymbolFields.RequiredVersion];
+            set => this.Set((int)ModuleDependencySymbolFields.RequiredVersion, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ModuleExclusionTuple.cs b/src/WixToolset.Data/Tuples/ModuleExclusionTuple.cs
index 98c5ac5e..0c45abfa 100644
--- a/src/WixToolset.Data/Tuples/ModuleExclusionTuple.cs
+++ b/src/WixToolset.Data/Tuples/ModuleExclusionTuple.cs
@@ -2,28 +2,28 @@
 
 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 ModuleExclusion = new IntermediateTupleDefinition(
-            TupleDefinitionType.ModuleExclusion,
+        public static readonly IntermediateSymbolDefinition ModuleExclusion = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.ModuleExclusion,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ModuleExclusionTupleFields.ModuleID), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ModuleExclusionTupleFields.ModuleLanguage), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ModuleExclusionTupleFields.ExcludedID), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ModuleExclusionTupleFields.ExcludedLanguage), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ModuleExclusionTupleFields.ExcludedMinVersion), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ModuleExclusionTupleFields.ExcludedMaxVersion), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleExclusionSymbolFields.ModuleID), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleExclusionSymbolFields.ModuleLanguage), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ModuleExclusionSymbolFields.ExcludedID), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleExclusionSymbolFields.ExcludedLanguage), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ModuleExclusionSymbolFields.ExcludedMinVersion), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleExclusionSymbolFields.ExcludedMaxVersion), IntermediateFieldType.String),
             },
-            typeof(ModuleExclusionTuple));
+            typeof(ModuleExclusionSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ModuleExclusionTupleFields
+    public enum ModuleExclusionSymbolFields
     {
         ModuleID,
         ModuleLanguage,
@@ -33,52 +33,52 @@ namespace WixToolset.Data.Tuples
         ExcludedMaxVersion,
     }
 
-    public class ModuleExclusionTuple : IntermediateTuple
+    public class ModuleExclusionSymbol : IntermediateSymbol
     {
-        public ModuleExclusionTuple() : base(TupleDefinitions.ModuleExclusion, null, null)
+        public ModuleExclusionSymbol() : base(SymbolDefinitions.ModuleExclusion, null, null)
         {
         }
 
-        public ModuleExclusionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ModuleExclusion, sourceLineNumber, id)
+        public ModuleExclusionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ModuleExclusion, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ModuleExclusionTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ModuleExclusionSymbolFields index] => this.Fields[(int)index];
 
         public string ModuleID
         {
-            get => (string)this.Fields[(int)ModuleExclusionTupleFields.ModuleID];
-            set => this.Set((int)ModuleExclusionTupleFields.ModuleID, value);
+            get => (string)this.Fields[(int)ModuleExclusionSymbolFields.ModuleID];
+            set => this.Set((int)ModuleExclusionSymbolFields.ModuleID, value);
         }
 
         public int ModuleLanguage
         {
-            get => (int)this.Fields[(int)ModuleExclusionTupleFields.ModuleLanguage];
-            set => this.Set((int)ModuleExclusionTupleFields.ModuleLanguage, value);
+            get => (int)this.Fields[(int)ModuleExclusionSymbolFields.ModuleLanguage];
+            set => this.Set((int)ModuleExclusionSymbolFields.ModuleLanguage, value);
         }
 
         public string ExcludedID
         {
-            get => (string)this.Fields[(int)ModuleExclusionTupleFields.ExcludedID];
-            set => this.Set((int)ModuleExclusionTupleFields.ExcludedID, value);
+            get => (string)this.Fields[(int)ModuleExclusionSymbolFields.ExcludedID];
+            set => this.Set((int)ModuleExclusionSymbolFields.ExcludedID, value);
         }
 
         public int ExcludedLanguage
         {
-            get => (int)this.Fields[(int)ModuleExclusionTupleFields.ExcludedLanguage];
-            set => this.Set((int)ModuleExclusionTupleFields.ExcludedLanguage, value);
+            get => (int)this.Fields[(int)ModuleExclusionSymbolFields.ExcludedLanguage];
+            set => this.Set((int)ModuleExclusionSymbolFields.ExcludedLanguage, value);
         }
 
         public string ExcludedMinVersion
         {
-            get => (string)this.Fields[(int)ModuleExclusionTupleFields.ExcludedMinVersion];
-            set => this.Set((int)ModuleExclusionTupleFields.ExcludedMinVersion, value);
+            get => (string)this.Fields[(int)ModuleExclusionSymbolFields.ExcludedMinVersion];
+            set => this.Set((int)ModuleExclusionSymbolFields.ExcludedMinVersion, value);
         }
 
         public string ExcludedMaxVersion
         {
-            get => (string)this.Fields[(int)ModuleExclusionTupleFields.ExcludedMaxVersion];
-            set => this.Set((int)ModuleExclusionTupleFields.ExcludedMaxVersion, value);
+            get => (string)this.Fields[(int)ModuleExclusionSymbolFields.ExcludedMaxVersion];
+            set => this.Set((int)ModuleExclusionSymbolFields.ExcludedMaxVersion, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ModuleIgnoreTableTuple.cs b/src/WixToolset.Data/Tuples/ModuleIgnoreTableTuple.cs
index d786b8d9..07302df8 100644
--- a/src/WixToolset.Data/Tuples/ModuleIgnoreTableTuple.cs
+++ b/src/WixToolset.Data/Tuples/ModuleIgnoreTableTuple.cs
@@ -2,35 +2,35 @@
 
 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 ModuleIgnoreTable = new IntermediateTupleDefinition(
-            TupleDefinitionType.ModuleIgnoreTable,
+        public static readonly IntermediateSymbolDefinition ModuleIgnoreTable = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.ModuleIgnoreTable,
             new IntermediateFieldDefinition[]
             {
             },
-            typeof(ModuleIgnoreTableTuple));
+            typeof(ModuleIgnoreTableSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ModuleIgnoreTableTupleFields
+    public enum ModuleIgnoreTableSymbolFields
     {
     }
 
-    public class ModuleIgnoreTableTuple : IntermediateTuple
+    public class ModuleIgnoreTableSymbol : IntermediateSymbol
     {
-        public ModuleIgnoreTableTuple() : base(TupleDefinitions.ModuleIgnoreTable, null, null)
+        public ModuleIgnoreTableSymbol() : base(SymbolDefinitions.ModuleIgnoreTable, null, null)
         {
         }
 
-        public ModuleIgnoreTableTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ModuleIgnoreTable, sourceLineNumber, id)
+        public ModuleIgnoreTableSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ModuleIgnoreTable, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ModuleIgnoreTableTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ModuleIgnoreTableSymbolFields index] => this.Fields[(int)index];
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ModuleSignatureTuple.cs b/src/WixToolset.Data/Tuples/ModuleSignatureTuple.cs
index 04db5f58..5f6ded09 100644
--- a/src/WixToolset.Data/Tuples/ModuleSignatureTuple.cs
+++ b/src/WixToolset.Data/Tuples/ModuleSignatureTuple.cs
@@ -2,59 +2,59 @@
 
 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 ModuleSignature = new IntermediateTupleDefinition(
-            TupleDefinitionType.ModuleSignature,
+        public static readonly IntermediateSymbolDefinition ModuleSignature = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.ModuleSignature,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ModuleSignatureTupleFields.ModuleID), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ModuleSignatureTupleFields.Language), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ModuleSignatureTupleFields.Version), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleSignatureSymbolFields.ModuleID), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleSignatureSymbolFields.Language), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ModuleSignatureSymbolFields.Version), IntermediateFieldType.String),
             },
-            typeof(ModuleSignatureTuple));
+            typeof(ModuleSignatureSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ModuleSignatureTupleFields
+    public enum ModuleSignatureSymbolFields
     {
         ModuleID,
         Language,
         Version,
     }
 
-    public class ModuleSignatureTuple : IntermediateTuple
+    public class ModuleSignatureSymbol : IntermediateSymbol
     {
-        public ModuleSignatureTuple() : base(TupleDefinitions.ModuleSignature, null, null)
+        public ModuleSignatureSymbol() : base(SymbolDefinitions.ModuleSignature, null, null)
         {
         }
 
-        public ModuleSignatureTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ModuleSignature, sourceLineNumber, id)
+        public ModuleSignatureSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ModuleSignature, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ModuleSignatureTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ModuleSignatureSymbolFields index] => this.Fields[(int)index];
 
         public string ModuleID
         {
-            get => (string)this.Fields[(int)ModuleSignatureTupleFields.ModuleID];
-            set => this.Set((int)ModuleSignatureTupleFields.ModuleID, value);
+            get => (string)this.Fields[(int)ModuleSignatureSymbolFields.ModuleID];
+            set => this.Set((int)ModuleSignatureSymbolFields.ModuleID, value);
         }
 
         public int Language
         {
-            get => (int)this.Fields[(int)ModuleSignatureTupleFields.Language];
-            set => this.Set((int)ModuleSignatureTupleFields.Language, value);
+            get => (int)this.Fields[(int)ModuleSignatureSymbolFields.Language];
+            set => this.Set((int)ModuleSignatureSymbolFields.Language, value);
         }
 
         public string Version
         {
-            get => (string)this.Fields[(int)ModuleSignatureTupleFields.Version];
-            set => this.Set((int)ModuleSignatureTupleFields.Version, value);
+            get => (string)this.Fields[(int)ModuleSignatureSymbolFields.Version];
+            set => this.Set((int)ModuleSignatureSymbolFields.Version, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ModuleSubstitutionTuple.cs b/src/WixToolset.Data/Tuples/ModuleSubstitutionTuple.cs
index 76033560..50d615b0 100644
--- a/src/WixToolset.Data/Tuples/ModuleSubstitutionTuple.cs
+++ b/src/WixToolset.Data/Tuples/ModuleSubstitutionTuple.cs
@@ -2,26 +2,26 @@
 
 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 ModuleSubstitution = new IntermediateTupleDefinition(
-            TupleDefinitionType.ModuleSubstitution,
+        public static readonly IntermediateSymbolDefinition ModuleSubstitution = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.ModuleSubstitution,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ModuleSubstitutionTupleFields.Table), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ModuleSubstitutionTupleFields.Row), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ModuleSubstitutionTupleFields.Column), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ModuleSubstitutionTupleFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleSubstitutionSymbolFields.Table), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleSubstitutionSymbolFields.Row), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleSubstitutionSymbolFields.Column), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ModuleSubstitutionSymbolFields.Value), IntermediateFieldType.String),
             },
-            typeof(ModuleSubstitutionTuple));
+            typeof(ModuleSubstitutionSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ModuleSubstitutionTupleFields
+    public enum ModuleSubstitutionSymbolFields
     {
         Table,
         Row,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
         Value,
     }
 
-    public class ModuleSubstitutionTuple : IntermediateTuple
+    public class ModuleSubstitutionSymbol : IntermediateSymbol
     {
-        public ModuleSubstitutionTuple() : base(TupleDefinitions.ModuleSubstitution, null, null)
+        public ModuleSubstitutionSymbol() : base(SymbolDefinitions.ModuleSubstitution, null, null)
         {
         }
 
-        public ModuleSubstitutionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ModuleSubstitution, sourceLineNumber, id)
+        public ModuleSubstitutionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ModuleSubstitution, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ModuleSubstitutionTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ModuleSubstitutionSymbolFields index] => this.Fields[(int)index];
 
         public string Table
         {
-            get => (string)this.Fields[(int)ModuleSubstitutionTupleFields.Table];
-            set => this.Set((int)ModuleSubstitutionTupleFields.Table, value);
+            get => (string)this.Fields[(int)ModuleSubstitutionSymbolFields.Table];
+            set => this.Set((int)ModuleSubstitutionSymbolFields.Table, value);
         }
 
         public string Row
         {
-            get => (string)this.Fields[(int)ModuleSubstitutionTupleFields.Row];
-            set => this.Set((int)ModuleSubstitutionTupleFields.Row, value);
+            get => (string)this.Fields[(int)ModuleSubstitutionSymbolFields.Row];
+            set => this.Set((int)ModuleSubstitutionSymbolFields.Row, value);
         }
 
         public string Column
         {
-            get => (string)this.Fields[(int)ModuleSubstitutionTupleFields.Column];
-            set => this.Set((int)ModuleSubstitutionTupleFields.Column, value);
+            get => (string)this.Fields[(int)ModuleSubstitutionSymbolFields.Column];
+            set => this.Set((int)ModuleSubstitutionSymbolFields.Column, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)ModuleSubstitutionTupleFields.Value];
-            set => this.Set((int)ModuleSubstitutionTupleFields.Value, value);
+            get => (string)this.Fields[(int)ModuleSubstitutionSymbolFields.Value];
+            set => this.Set((int)ModuleSubstitutionSymbolFields.Value, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MoveFileTuple.cs b/src/WixToolset.Data/Tuples/MoveFileTuple.cs
index 74fef167..84089965 100644
--- a/src/WixToolset.Data/Tuples/MoveFileTuple.cs
+++ b/src/WixToolset.Data/Tuples/MoveFileTuple.cs
@@ -2,28 +2,28 @@
 
 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 MoveFile = new IntermediateTupleDefinition(
-            TupleDefinitionType.MoveFile,
+        public static readonly IntermediateSymbolDefinition MoveFile = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.MoveFile,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(MoveFileTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MoveFileTupleFields.SourceName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MoveFileTupleFields.DestName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MoveFileTupleFields.SourceFolder), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MoveFileTupleFields.DestFolder), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MoveFileTupleFields.Delete), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(MoveFileSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MoveFileSymbolFields.SourceName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MoveFileSymbolFields.DestName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MoveFileSymbolFields.SourceFolder), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MoveFileSymbolFields.DestFolder), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MoveFileSymbolFields.Delete), IntermediateFieldType.Bool),
             },
-            typeof(MoveFileTuple));
+            typeof(MoveFileSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum MoveFileTupleFields
+    public enum MoveFileSymbolFields
     {
         ComponentRef,
         SourceName,
@@ -33,52 +33,52 @@ namespace WixToolset.Data.Tuples
         Delete,
     }
 
-    public class MoveFileTuple : IntermediateTuple
+    public class MoveFileSymbol : IntermediateSymbol
     {
-        public MoveFileTuple() : base(TupleDefinitions.MoveFile, null, null)
+        public MoveFileSymbol() : base(SymbolDefinitions.MoveFile, null, null)
         {
         }
 
-        public MoveFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MoveFile, sourceLineNumber, id)
+        public MoveFileSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MoveFile, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[MoveFileTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[MoveFileSymbolFields index] => this.Fields[(int)index];
 
         public string ComponentRef
         {
-            get => (string)this.Fields[(int)MoveFileTupleFields.ComponentRef];
-            set => this.Set((int)MoveFileTupleFields.ComponentRef, value);
+            get => (string)this.Fields[(int)MoveFileSymbolFields.ComponentRef];
+            set => this.Set((int)MoveFileSymbolFields.ComponentRef, value);
         }
 
         public string SourceName
         {
-            get => (string)this.Fields[(int)MoveFileTupleFields.SourceName];
-            set => this.Set((int)MoveFileTupleFields.SourceName, value);
+            get => (string)this.Fields[(int)MoveFileSymbolFields.SourceName];
+            set => this.Set((int)MoveFileSymbolFields.SourceName, value);
         }
 
         public string DestName
         {
-            get => (string)this.Fields[(int)MoveFileTupleFields.DestName];
-            set => this.Set((int)MoveFileTupleFields.DestName, value);
+            get => (string)this.Fields[(int)MoveFileSymbolFields.DestName];
+            set => this.Set((int)MoveFileSymbolFields.DestName, value);
         }
 
         public string SourceFolder
         {
-            get => (string)this.Fields[(int)MoveFileTupleFields.SourceFolder];
-            set => this.Set((int)MoveFileTupleFields.SourceFolder, value);
+            get => (string)this.Fields[(int)MoveFileSymbolFields.SourceFolder];
+            set => this.Set((int)MoveFileSymbolFields.SourceFolder, value);
         }
 
         public string DestFolder
         {
-            get => (string)this.Fields[(int)MoveFileTupleFields.DestFolder];
-            set => this.Set((int)MoveFileTupleFields.DestFolder, value);
+            get => (string)this.Fields[(int)MoveFileSymbolFields.DestFolder];
+            set => this.Set((int)MoveFileSymbolFields.DestFolder, value);
         }
 
         public bool Delete
         {
-            get => (bool)this.Fields[(int)MoveFileTupleFields.Delete];
-            set => this.Set((int)MoveFileTupleFields.Delete, value);
+            get => (bool)this.Fields[(int)MoveFileSymbolFields.Delete];
+            set => this.Set((int)MoveFileSymbolFields.Delete, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/MsiAssemblyNameTuple.cs b/src/WixToolset.Data/Tuples/MsiAssemblyNameTuple.cs
index 1f261446..99c9806d 100644
--- a/src/WixToolset.Data/Tuples/MsiAssemblyNameTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiAssemblyNameTuple.cs
@@ -2,59 +2,59 @@
 
 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 MsiAssemblyName = new IntermediateTupleDefinition(
-            TupleDefinitionType.MsiAssemblyName,
+        public static readonly IntermediateSymbolDefinition MsiAssemblyName = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.MsiAssemblyName,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(MsiAssemblyNameTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiAssemblyNameTupleFields.Name), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiAssemblyNameTupleFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiAssemblyNameSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiAssemblyNameSymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiAssemblyNameSymbolFields.Value), IntermediateFieldType.String),
             },
-            typeof(MsiAssemblyNameTuple));
+            typeof(MsiAssemblyNameSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum MsiAssemblyNameTupleFields
+    public enum MsiAssemblyNameSymbolFields
     {
         ComponentRef,
         Name,
         Value,
     }
 
-    public class MsiAssemblyNameTuple : IntermediateTuple
+    public class MsiAssemblyNameSymbol : IntermediateSymbol
     {
-        public MsiAssemblyNameTuple() : base(TupleDefinitions.MsiAssemblyName, null, null)
+        public MsiAssemblyNameSymbol() : base(SymbolDefinitions.MsiAssemblyName, null, null)
         {
         }
 
-        public MsiAssemblyNameTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiAssemblyName, sourceLineNumber, id)
+        public MsiAssemblyNameSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiAssemblyName, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[MsiAssemblyNameTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[MsiAssemblyNameSymbolFields index] => this.Fields[(int)index];
 
         public string ComponentRef
         {
-            get => (string)this.Fields[(int)MsiAssemblyNameTupleFields.ComponentRef];
-            set => this.Set((int)MsiAssemblyNameTupleFields.ComponentRef, value);
+            get => (string)this.Fields[(int)MsiAssemblyNameSymbolFields.ComponentRef];
+            set => this.Set((int)MsiAssemblyNameSymbolFields.ComponentRef, value);
         }
 
         public string Name
         {
-            get => (string)this.Fields[(int)MsiAssemblyNameTupleFields.Name];
-            set => this.Set((int)MsiAssemblyNameTupleFields.Name, value);
+            get => (string)this.Fields[(int)MsiAssemblyNameSymbolFields.Name];
+            set => this.Set((int)MsiAssemblyNameSymbolFields.Name, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)MsiAssemblyNameTupleFields.Value];
-            set => this.Set((int)MsiAssemblyNameTupleFields.Value, value);
+            get => (string)this.Fields[(int)MsiAssemblyNameSymbolFields.Value];
+            set => this.Set((int)MsiAssemblyNameSymbolFields.Value, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiDigitalCertificateTuple.cs b/src/WixToolset.Data/Tuples/MsiDigitalCertificateTuple.cs
index e4c0469b..febd51cc 100644
--- a/src/WixToolset.Data/Tuples/MsiDigitalCertificateTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiDigitalCertificateTuple.cs
@@ -2,43 +2,43 @@
 
 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 MsiDigitalCertificate = new IntermediateTupleDefinition(
-            TupleDefinitionType.MsiDigitalCertificate,
+        public static readonly IntermediateSymbolDefinition MsiDigitalCertificate = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.MsiDigitalCertificate,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(MsiDigitalCertificateTupleFields.CertData), IntermediateFieldType.Path),
+                new IntermediateFieldDefinition(nameof(MsiDigitalCertificateSymbolFields.CertData), IntermediateFieldType.Path),
             },
-            typeof(MsiDigitalCertificateTuple));
+            typeof(MsiDigitalCertificateSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum MsiDigitalCertificateTupleFields
+    public enum MsiDigitalCertificateSymbolFields
     {
         CertData,
     }
 
-    public class MsiDigitalCertificateTuple : IntermediateTuple
+    public class MsiDigitalCertificateSymbol : IntermediateSymbol
     {
-        public MsiDigitalCertificateTuple() : base(TupleDefinitions.MsiDigitalCertificate, null, null)
+        public MsiDigitalCertificateSymbol() : base(SymbolDefinitions.MsiDigitalCertificate, null, null)
         {
         }
 
-        public MsiDigitalCertificateTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiDigitalCertificate, sourceLineNumber, id)
+        public MsiDigitalCertificateSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiDigitalCertificate, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[MsiDigitalCertificateTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[MsiDigitalCertificateSymbolFields index] => this.Fields[(int)index];
 
         public string CertData
         {
-            get => (string)this.Fields[(int)MsiDigitalCertificateTupleFields.CertData];
-            set => this.Set((int)MsiDigitalCertificateTupleFields.CertData, value);
+            get => (string)this.Fields[(int)MsiDigitalCertificateSymbolFields.CertData];
+            set => this.Set((int)MsiDigitalCertificateSymbolFields.CertData, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiDigitalSignatureTuple.cs b/src/WixToolset.Data/Tuples/MsiDigitalSignatureTuple.cs
index eab762b0..560f3590 100644
--- a/src/WixToolset.Data/Tuples/MsiDigitalSignatureTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiDigitalSignatureTuple.cs
@@ -2,26 +2,26 @@
 
 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 MsiDigitalSignature = new IntermediateTupleDefinition(
-            TupleDefinitionType.MsiDigitalSignature,
+        public static readonly IntermediateSymbolDefinition MsiDigitalSignature = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.MsiDigitalSignature,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(MsiDigitalSignatureTupleFields.Table), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiDigitalSignatureTupleFields.SignObject), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiDigitalSignatureTupleFields.DigitalCertificateRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiDigitalSignatureTupleFields.Hash), IntermediateFieldType.Path),
+                new IntermediateFieldDefinition(nameof(MsiDigitalSignatureSymbolFields.Table), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiDigitalSignatureSymbolFields.SignObject), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiDigitalSignatureSymbolFields.DigitalCertificateRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiDigitalSignatureSymbolFields.Hash), IntermediateFieldType.Path),
             },
-            typeof(MsiDigitalSignatureTuple));
+            typeof(MsiDigitalSignatureSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum MsiDigitalSignatureTupleFields
+    public enum MsiDigitalSignatureSymbolFields
     {
         Table,
         SignObject,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
         Hash,
     }
 
-    public class MsiDigitalSignatureTuple : IntermediateTuple
+    public class MsiDigitalSignatureSymbol : IntermediateSymbol
     {
-        public MsiDigitalSignatureTuple() : base(TupleDefinitions.MsiDigitalSignature, null, null)
+        public MsiDigitalSignatureSymbol() : base(SymbolDefinitions.MsiDigitalSignature, null, null)
         {
         }
 
-        public MsiDigitalSignatureTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiDigitalSignature, sourceLineNumber, id)
+        public MsiDigitalSignatureSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiDigitalSignature, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[MsiDigitalSignatureTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[MsiDigitalSignatureSymbolFields index] => this.Fields[(int)index];
 
         public string Table
         {
-            get => (string)this.Fields[(int)MsiDigitalSignatureTupleFields.Table];
-            set => this.Set((int)MsiDigitalSignatureTupleFields.Table, value);
+            get => (string)this.Fields[(int)MsiDigitalSignatureSymbolFields.Table];
+            set => this.Set((int)MsiDigitalSignatureSymbolFields.Table, value);
         }
 
         public string SignObject
         {
-            get => (string)this.Fields[(int)MsiDigitalSignatureTupleFields.SignObject];
-            set => this.Set((int)MsiDigitalSignatureTupleFields.SignObject, value);
+            get => (string)this.Fields[(int)MsiDigitalSignatureSymbolFields.SignObject];
+            set => this.Set((int)MsiDigitalSignatureSymbolFields.SignObject, value);
         }
 
         public string DigitalCertificateRef
         {
-            get => (string)this.Fields[(int)MsiDigitalSignatureTupleFields.DigitalCertificateRef];
-            set => this.Set((int)MsiDigitalSignatureTupleFields.DigitalCertificateRef, value);
+            get => (string)this.Fields[(int)MsiDigitalSignatureSymbolFields.DigitalCertificateRef];
+            set => this.Set((int)MsiDigitalSignatureSymbolFields.DigitalCertificateRef, value);
         }
 
         public string Hash
         {
-            get => (string)this.Fields[(int)MsiDigitalSignatureTupleFields.Hash];
-            set => this.Set((int)MsiDigitalSignatureTupleFields.Hash, value);
+            get => (string)this.Fields[(int)MsiDigitalSignatureSymbolFields.Hash];
+            set => this.Set((int)MsiDigitalSignatureSymbolFields.Hash, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiEmbeddedChainerTuple.cs b/src/WixToolset.Data/Tuples/MsiEmbeddedChainerTuple.cs
index d1e49834..eeed1673 100644
--- a/src/WixToolset.Data/Tuples/MsiEmbeddedChainerTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiEmbeddedChainerTuple.cs
@@ -2,26 +2,26 @@
 
 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 MsiEmbeddedChainer = new IntermediateTupleDefinition(
-            TupleDefinitionType.MsiEmbeddedChainer,
+        public static readonly IntermediateSymbolDefinition MsiEmbeddedChainer = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.MsiEmbeddedChainer,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(MsiEmbeddedChainerTupleFields.Condition), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiEmbeddedChainerTupleFields.CommandLine), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiEmbeddedChainerTupleFields.Source), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiEmbeddedChainerTupleFields.Type), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MsiEmbeddedChainerSymbolFields.Condition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiEmbeddedChainerSymbolFields.CommandLine), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiEmbeddedChainerSymbolFields.Source), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiEmbeddedChainerSymbolFields.Type), IntermediateFieldType.Number),
             },
-            typeof(MsiEmbeddedChainerTuple));
+            typeof(MsiEmbeddedChainerSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum MsiEmbeddedChainerTupleFields
+    public enum MsiEmbeddedChainerSymbolFields
     {
         Condition,
         CommandLine,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
         Type,
     }
 
-    public class MsiEmbeddedChainerTuple : IntermediateTuple
+    public class MsiEmbeddedChainerSymbol : IntermediateSymbol
     {
-        public MsiEmbeddedChainerTuple() : base(TupleDefinitions.MsiEmbeddedChainer, null, null)
+        public MsiEmbeddedChainerSymbol() : base(SymbolDefinitions.MsiEmbeddedChainer, null, null)
         {
         }
 
-        public MsiEmbeddedChainerTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiEmbeddedChainer, sourceLineNumber, id)
+        public MsiEmbeddedChainerSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiEmbeddedChainer, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[MsiEmbeddedChainerTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[MsiEmbeddedChainerSymbolFields index] => this.Fields[(int)index];
 
         public string Condition
         {
-            get => (string)this.Fields[(int)MsiEmbeddedChainerTupleFields.Condition];
-            set => this.Set((int)MsiEmbeddedChainerTupleFields.Condition, value);
+            get => (string)this.Fields[(int)MsiEmbeddedChainerSymbolFields.Condition];
+            set => this.Set((int)MsiEmbeddedChainerSymbolFields.Condition, value);
         }
 
         public string CommandLine
         {
-            get => (string)this.Fields[(int)MsiEmbeddedChainerTupleFields.CommandLine];
-            set => this.Set((int)MsiEmbeddedChainerTupleFields.CommandLine, value);
+            get => (string)this.Fields[(int)MsiEmbeddedChainerSymbolFields.CommandLine];
+            set => this.Set((int)MsiEmbeddedChainerSymbolFields.CommandLine, value);
         }
 
         public string Source
         {
-            get => (string)this.Fields[(int)MsiEmbeddedChainerTupleFields.Source];
-            set => this.Set((int)MsiEmbeddedChainerTupleFields.Source, value);
+            get => (string)this.Fields[(int)MsiEmbeddedChainerSymbolFields.Source];
+            set => this.Set((int)MsiEmbeddedChainerSymbolFields.Source, value);
         }
 
         public int Type
         {
-            get => (int)this.Fields[(int)MsiEmbeddedChainerTupleFields.Type];
-            set => this.Set((int)MsiEmbeddedChainerTupleFields.Type, value);
+            get => (int)this.Fields[(int)MsiEmbeddedChainerSymbolFields.Type];
+            set => this.Set((int)MsiEmbeddedChainerSymbolFields.Type, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiEmbeddedUITuple.cs b/src/WixToolset.Data/Tuples/MsiEmbeddedUITuple.cs
index baedf56b..87c9481a 100644
--- a/src/WixToolset.Data/Tuples/MsiEmbeddedUITuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiEmbeddedUITuple.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 MsiEmbeddedUI = new IntermediateTupleDefinition(
-            TupleDefinitionType.MsiEmbeddedUI,
+        public static readonly IntermediateSymbolDefinition MsiEmbeddedUI = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.MsiEmbeddedUI,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(MsiEmbeddedUITupleFields.FileName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiEmbeddedUITupleFields.EntryPoint), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(MsiEmbeddedUITupleFields.SupportsBasicUI), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(MsiEmbeddedUITupleFields.MessageFilter), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(MsiEmbeddedUITupleFields.Source), IntermediateFieldType.Path),
+                new IntermediateFieldDefinition(nameof(MsiEmbeddedUISymbolFields.FileName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiEmbeddedUISymbolFields.EntryPoint), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(MsiEmbeddedUISymbolFields.SupportsBasicUI), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(MsiEmbeddedUISymbolFields.MessageFilter), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MsiEmbeddedUISymbolFields.Source), IntermediateFieldType.Path),
             },
-            typeof(MsiEmbeddedUITuple));
+            typeof(MsiEmbeddedUISymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum MsiEmbeddedUITupleFields
+    public enum MsiEmbeddedUISymbolFields
     {
         FileName,
         EntryPoint,
@@ -31,46 +31,46 @@ namespace WixToolset.Data.Tuples
         Source,
     }
 
-    public class MsiEmbeddedUITuple : IntermediateTuple
+    public class MsiEmbeddedUISymbol : IntermediateSymbol
     {
-        public MsiEmbeddedUITuple() : base(TupleDefinitions.MsiEmbeddedUI, null, null)
+        public MsiEmbeddedUISymbol() : base(SymbolDefinitions.MsiEmbeddedUI, null, null)
         {
         }
 
-        public MsiEmbeddedUITuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiEmbeddedUI, sourceLineNumber, id)
+        public MsiEmbeddedUISymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiEmbeddedUI, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[MsiEmbeddedUITupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[MsiEmbeddedUISymbolFields index] => this.Fields[(int)index];
 
         public string FileName
         {
-            get => (string)this.Fields[(int)MsiEmbeddedUITupleFields.FileName];
-            set => this.Set((int)MsiEmbeddedUITupleFields.FileName, value);
+            get => (string)this.Fields[(int)MsiEmbeddedUISymbolFields.FileName];
+            set => this.Set((int)MsiEmbeddedUISymbolFields.FileName, value);
         }
 
         public bool EntryPoint
         {
-            get => this.Fields[(int)MsiEmbeddedUITupleFields.EntryPoint].AsBool();
-            set => this.Set((int)MsiEmbeddedUITupleFields.EntryPoint, value);
+            get => this.Fields[(int)MsiEmbeddedUISymbolFields.EntryPoint].AsBool();
+            set => this.Set((int)MsiEmbeddedUISymbolFields.EntryPoint, value);
         }
 
         public bool SupportsBasicUI
         {
-            get => this.Fields[(int)MsiEmbeddedUITupleFields.SupportsBasicUI].AsBool();
-            set => this.Set((int)MsiEmbeddedUITupleFields.SupportsBasicUI, value);
+            get => this.Fields[(int)MsiEmbeddedUISymbolFields.SupportsBasicUI].AsBool();
+            set => this.Set((int)MsiEmbeddedUISymbolFields.SupportsBasicUI, value);
         }
 
         public int? MessageFilter
         {
-            get => (int?)this.Fields[(int)MsiEmbeddedUITupleFields.MessageFilter];
-            set => this.Set((int)MsiEmbeddedUITupleFields.MessageFilter, value);
+            get => (int?)this.Fields[(int)MsiEmbeddedUISymbolFields.MessageFilter];
+            set => this.Set((int)MsiEmbeddedUISymbolFields.MessageFilter, value);
         }
 
         public string Source
         {
-            get => (string)this.Fields[(int)MsiEmbeddedUITupleFields.Source];
-            set => this.Set((int)MsiEmbeddedUITupleFields.Source, value);
+            get => (string)this.Fields[(int)MsiEmbeddedUISymbolFields.Source];
+            set => this.Set((int)MsiEmbeddedUISymbolFields.Source, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/MsiFileHashTuple.cs b/src/WixToolset.Data/Tuples/MsiFileHashTuple.cs
index 10aa801d..bfec1c12 100644
--- a/src/WixToolset.Data/Tuples/MsiFileHashTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiFileHashTuple.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 MsiFileHash = new IntermediateTupleDefinition(
-            TupleDefinitionType.MsiFileHash,
+        public static readonly IntermediateSymbolDefinition MsiFileHash = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.MsiFileHash,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(MsiFileHashTupleFields.Options), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(MsiFileHashTupleFields.HashPart1), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(MsiFileHashTupleFields.HashPart2), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(MsiFileHashTupleFields.HashPart3), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(MsiFileHashTupleFields.HashPart4), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MsiFileHashSymbolFields.Options), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MsiFileHashSymbolFields.HashPart1), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MsiFileHashSymbolFields.HashPart2), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MsiFileHashSymbolFields.HashPart3), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MsiFileHashSymbolFields.HashPart4), IntermediateFieldType.Number),
             },
-            typeof(MsiFileHashTuple));
+            typeof(MsiFileHashSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum MsiFileHashTupleFields
+    public enum MsiFileHashSymbolFields
     {
         Options,
         HashPart1,
@@ -31,46 +31,46 @@ namespace WixToolset.Data.Tuples
         HashPart4,
     }
 
-    public class MsiFileHashTuple : IntermediateTuple
+    public class MsiFileHashSymbol : IntermediateSymbol
     {
-        public MsiFileHashTuple() : base(TupleDefinitions.MsiFileHash, null, null)
+        public MsiFileHashSymbol() : base(SymbolDefinitions.MsiFileHash, null, null)
         {
         }
 
-        public MsiFileHashTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiFileHash, sourceLineNumber, id)
+        public MsiFileHashSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiFileHash, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[MsiFileHashTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[MsiFileHashSymbolFields index] => this.Fields[(int)index];
 
         public int Options
         {
-            get => (int)this.Fields[(int)MsiFileHashTupleFields.Options];
-            set => this.Set((int)MsiFileHashTupleFields.Options, value);
+            get => (int)this.Fields[(int)MsiFileHashSymbolFields.Options];
+            set => this.Set((int)MsiFileHashSymbolFields.Options, value);
         }
 
         public int HashPart1
         {
-            get => (int)this.Fields[(int)MsiFileHashTupleFields.HashPart1];
-            set => this.Set((int)MsiFileHashTupleFields.HashPart1, value);
+            get => (int)this.Fields[(int)MsiFileHashSymbolFields.HashPart1];
+            set => this.Set((int)MsiFileHashSymbolFields.HashPart1, value);
         }
 
         public int HashPart2
         {
-            get => (int)this.Fields[(int)MsiFileHashTupleFields.HashPart2];
-            set => this.Set((int)MsiFileHashTupleFields.HashPart2, value);
+            get => (int)this.Fields[(int)MsiFileHashSymbolFields.HashPart2];
+            set => this.Set((int)MsiFileHashSymbolFields.HashPart2, value);
         }
 
         public int HashPart3
         {
-            get => (int)this.Fields[(int)MsiFileHashTupleFields.HashPart3];
-            set => this.Set((int)MsiFileHashTupleFields.HashPart3, value);
+            get => (int)this.Fields[(int)MsiFileHashSymbolFields.HashPart3];
+            set => this.Set((int)MsiFileHashSymbolFields.HashPart3, value);
         }
 
         public int HashPart4
         {
-            get => (int)this.Fields[(int)MsiFileHashTupleFields.HashPart4];
-            set => this.Set((int)MsiFileHashTupleFields.HashPart4, value);
+            get => (int)this.Fields[(int)MsiFileHashSymbolFields.HashPart4];
+            set => this.Set((int)MsiFileHashSymbolFields.HashPart4, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiLockPermissionsExTuple.cs b/src/WixToolset.Data/Tuples/MsiLockPermissionsExTuple.cs
index dfc39763..88e7d019 100644
--- a/src/WixToolset.Data/Tuples/MsiLockPermissionsExTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiLockPermissionsExTuple.cs
@@ -2,26 +2,26 @@
 
 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 MsiLockPermissionsEx = new IntermediateTupleDefinition(
-            TupleDefinitionType.MsiLockPermissionsEx,
+        public static readonly IntermediateSymbolDefinition MsiLockPermissionsEx = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.MsiLockPermissionsEx,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(MsiLockPermissionsExTupleFields.LockObject), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiLockPermissionsExTupleFields.Table), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiLockPermissionsExTupleFields.SDDLText), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiLockPermissionsExTupleFields.Condition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiLockPermissionsExSymbolFields.LockObject), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiLockPermissionsExSymbolFields.Table), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiLockPermissionsExSymbolFields.SDDLText), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiLockPermissionsExSymbolFields.Condition), IntermediateFieldType.String),
             },
-            typeof(MsiLockPermissionsExTuple));
+            typeof(MsiLockPermissionsExSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum MsiLockPermissionsExTupleFields
+    public enum MsiLockPermissionsExSymbolFields
     {
         LockObject,
         Table,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
         Condition,
     }
 
-    public class MsiLockPermissionsExTuple : IntermediateTuple
+    public class MsiLockPermissionsExSymbol : IntermediateSymbol
     {
-        public MsiLockPermissionsExTuple() : base(TupleDefinitions.MsiLockPermissionsEx, null, null)
+        public MsiLockPermissionsExSymbol() : base(SymbolDefinitions.MsiLockPermissionsEx, null, null)
         {
         }
 
-        public MsiLockPermissionsExTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiLockPermissionsEx, sourceLineNumber, id)
+        public MsiLockPermissionsExSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiLockPermissionsEx, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[MsiLockPermissionsExTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[MsiLockPermissionsExSymbolFields index] => this.Fields[(int)index];
 
         public string LockObject
         {
-            get => (string)this.Fields[(int)MsiLockPermissionsExTupleFields.LockObject];
-            set => this.Set((int)MsiLockPermissionsExTupleFields.LockObject, value);
+            get => (string)this.Fields[(int)MsiLockPermissionsExSymbolFields.LockObject];
+            set => this.Set((int)MsiLockPermissionsExSymbolFields.LockObject, value);
         }
 
         public string Table
         {
-            get => (string)this.Fields[(int)MsiLockPermissionsExTupleFields.Table];
-            set => this.Set((int)MsiLockPermissionsExTupleFields.Table, value);
+            get => (string)this.Fields[(int)MsiLockPermissionsExSymbolFields.Table];
+            set => this.Set((int)MsiLockPermissionsExSymbolFields.Table, value);
         }
 
         public string SDDLText
         {
-            get => (string)this.Fields[(int)MsiLockPermissionsExTupleFields.SDDLText];
-            set => this.Set((int)MsiLockPermissionsExTupleFields.SDDLText, value);
+            get => (string)this.Fields[(int)MsiLockPermissionsExSymbolFields.SDDLText];
+            set => this.Set((int)MsiLockPermissionsExSymbolFields.SDDLText, value);
         }
 
         public string Condition
         {
-            get => (string)this.Fields[(int)MsiLockPermissionsExTupleFields.Condition];
-            set => this.Set((int)MsiLockPermissionsExTupleFields.Condition, value);
+            get => (string)this.Fields[(int)MsiLockPermissionsExSymbolFields.Condition];
+            set => this.Set((int)MsiLockPermissionsExSymbolFields.Condition, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiPackageCertificateTuple.cs b/src/WixToolset.Data/Tuples/MsiPackageCertificateTuple.cs
index ccc7f94e..4a6774b1 100644
--- a/src/WixToolset.Data/Tuples/MsiPackageCertificateTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiPackageCertificateTuple.cs
@@ -2,51 +2,51 @@
 
 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 MsiPackageCertificate = new IntermediateTupleDefinition(
-            TupleDefinitionType.MsiPackageCertificate,
+        public static readonly IntermediateSymbolDefinition MsiPackageCertificate = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.MsiPackageCertificate,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(MsiPackageCertificateTupleFields.PackageCertificate), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiPackageCertificateTupleFields.DigitalCertificateRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPackageCertificateSymbolFields.PackageCertificate), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPackageCertificateSymbolFields.DigitalCertificateRef), IntermediateFieldType.String),
             },
-            typeof(MsiPackageCertificateTuple));
+            typeof(MsiPackageCertificateSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum MsiPackageCertificateTupleFields
+    public enum MsiPackageCertificateSymbolFields
     {
         PackageCertificate,
         DigitalCertificateRef,
     }
 
-    public class MsiPackageCertificateTuple : IntermediateTuple
+    public class MsiPackageCertificateSymbol : IntermediateSymbol
     {
-        public MsiPackageCertificateTuple() : base(TupleDefinitions.MsiPackageCertificate, null, null)
+        public MsiPackageCertificateSymbol() : base(SymbolDefinitions.MsiPackageCertificate, null, null)
         {
         }
 
-        public MsiPackageCertificateTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiPackageCertificate, sourceLineNumber, id)
+        public MsiPackageCertificateSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiPackageCertificate, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[MsiPackageCertificateTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[MsiPackageCertificateSymbolFields index] => this.Fields[(int)index];
 
         public string PackageCertificate
         {
-            get => (string)this.Fields[(int)MsiPackageCertificateTupleFields.PackageCertificate];
-            set => this.Set((int)MsiPackageCertificateTupleFields.PackageCertificate, value);
+            get => (string)this.Fields[(int)MsiPackageCertificateSymbolFields.PackageCertificate];
+            set => this.Set((int)MsiPackageCertificateSymbolFields.PackageCertificate, value);
         }
 
         public string DigitalCertificateRef
         {
-            get => (string)this.Fields[(int)MsiPackageCertificateTupleFields.DigitalCertificateRef];
-            set => this.Set((int)MsiPackageCertificateTupleFields.DigitalCertificateRef, value);
+            get => (string)this.Fields[(int)MsiPackageCertificateSymbolFields.DigitalCertificateRef];
+            set => this.Set((int)MsiPackageCertificateSymbolFields.DigitalCertificateRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiPatchCertificateTuple.cs b/src/WixToolset.Data/Tuples/MsiPatchCertificateTuple.cs
index 21cda4df..7d6ce24e 100644
--- a/src/WixToolset.Data/Tuples/MsiPatchCertificateTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiPatchCertificateTuple.cs
@@ -2,51 +2,51 @@
 
 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 MsiPatchCertificate = new IntermediateTupleDefinition(
-            TupleDefinitionType.MsiPatchCertificate,
+        public static readonly IntermediateSymbolDefinition MsiPatchCertificate = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.MsiPatchCertificate,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(MsiPatchCertificateTupleFields.PatchCertificate), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiPatchCertificateTupleFields.DigitalCertificateRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPatchCertificateSymbolFields.PatchCertificate), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPatchCertificateSymbolFields.DigitalCertificateRef), IntermediateFieldType.String),
             },
-            typeof(MsiPatchCertificateTuple));
+            typeof(MsiPatchCertificateSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum MsiPatchCertificateTupleFields
+    public enum MsiPatchCertificateSymbolFields
     {
         PatchCertificate,
         DigitalCertificateRef,
     }
 
-    public class MsiPatchCertificateTuple : IntermediateTuple
+    public class MsiPatchCertificateSymbol : IntermediateSymbol
     {
-        public MsiPatchCertificateTuple() : base(TupleDefinitions.MsiPatchCertificate, null, null)
+        public MsiPatchCertificateSymbol() : base(SymbolDefinitions.MsiPatchCertificate, null, null)
         {
         }
 
-        public MsiPatchCertificateTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiPatchCertificate, sourceLineNumber, id)
+        public MsiPatchCertificateSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiPatchCertificate, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[MsiPatchCertificateTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[MsiPatchCertificateSymbolFields index] => this.Fields[(int)index];
 
         public string PatchCertificate
         {
-            get => (string)this.Fields[(int)MsiPatchCertificateTupleFields.PatchCertificate];
-            set => this.Set((int)MsiPatchCertificateTupleFields.PatchCertificate, value);
+            get => (string)this.Fields[(int)MsiPatchCertificateSymbolFields.PatchCertificate];
+            set => this.Set((int)MsiPatchCertificateSymbolFields.PatchCertificate, value);
         }
 
         public string DigitalCertificateRef
         {
-            get => (string)this.Fields[(int)MsiPatchCertificateTupleFields.DigitalCertificateRef];
-            set => this.Set((int)MsiPatchCertificateTupleFields.DigitalCertificateRef, value);
+            get => (string)this.Fields[(int)MsiPatchCertificateSymbolFields.DigitalCertificateRef];
+            set => this.Set((int)MsiPatchCertificateSymbolFields.DigitalCertificateRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiPatchHeadersTuple.cs b/src/WixToolset.Data/Tuples/MsiPatchHeadersTuple.cs
index 3f7a8de2..0c68b164 100644
--- a/src/WixToolset.Data/Tuples/MsiPatchHeadersTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiPatchHeadersTuple.cs
@@ -2,51 +2,51 @@
 
 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 MsiPatchHeaders = new IntermediateTupleDefinition(
-            TupleDefinitionType.MsiPatchHeaders,
+        public static readonly IntermediateSymbolDefinition MsiPatchHeaders = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.MsiPatchHeaders,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(MsiPatchHeadersTupleFields.StreamRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiPatchHeadersTupleFields.Header), IntermediateFieldType.Path),
+                new IntermediateFieldDefinition(nameof(MsiPatchHeadersSymbolFields.StreamRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPatchHeadersSymbolFields.Header), IntermediateFieldType.Path),
             },
-            typeof(MsiPatchHeadersTuple));
+            typeof(MsiPatchHeadersSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum MsiPatchHeadersTupleFields
+    public enum MsiPatchHeadersSymbolFields
     {
         StreamRef,
         Header,
     }
 
-    public class MsiPatchHeadersTuple : IntermediateTuple
+    public class MsiPatchHeadersSymbol : IntermediateSymbol
     {
-        public MsiPatchHeadersTuple() : base(TupleDefinitions.MsiPatchHeaders, null, null)
+        public MsiPatchHeadersSymbol() : base(SymbolDefinitions.MsiPatchHeaders, null, null)
         {
         }
 
-        public MsiPatchHeadersTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiPatchHeaders, sourceLineNumber, id)
+        public MsiPatchHeadersSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiPatchHeaders, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[MsiPatchHeadersTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[MsiPatchHeadersSymbolFields index] => this.Fields[(int)index];
 
         public string StreamRef
         {
-            get => (string)this.Fields[(int)MsiPatchHeadersTupleFields.StreamRef];
-            set => this.Set((int)MsiPatchHeadersTupleFields.StreamRef, value);
+            get => (string)this.Fields[(int)MsiPatchHeadersSymbolFields.StreamRef];
+            set => this.Set((int)MsiPatchHeadersSymbolFields.StreamRef, value);
         }
 
         public string Header
         {
-            get => (string)this.Fields[(int)MsiPatchHeadersTupleFields.Header];
-            set => this.Set((int)MsiPatchHeadersTupleFields.Header, value);
+            get => (string)this.Fields[(int)MsiPatchHeadersSymbolFields.Header];
+            set => this.Set((int)MsiPatchHeadersSymbolFields.Header, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiPatchMetadataTuple.cs b/src/WixToolset.Data/Tuples/MsiPatchMetadataTuple.cs
index 91bdb6fd..682adbca 100644
--- a/src/WixToolset.Data/Tuples/MsiPatchMetadataTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiPatchMetadataTuple.cs
@@ -2,59 +2,59 @@
 
 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 MsiPatchMetadata = new IntermediateTupleDefinition(
-            TupleDefinitionType.MsiPatchMetadata,
+        public static readonly IntermediateSymbolDefinition MsiPatchMetadata = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.MsiPatchMetadata,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(MsiPatchMetadataTupleFields.Company), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiPatchMetadataTupleFields.Property), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiPatchMetadataTupleFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPatchMetadataSymbolFields.Company), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPatchMetadataSymbolFields.Property), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPatchMetadataSymbolFields.Value), IntermediateFieldType.String),
             },
-            typeof(MsiPatchMetadataTuple));
+            typeof(MsiPatchMetadataSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum MsiPatchMetadataTupleFields
+    public enum MsiPatchMetadataSymbolFields
     {
         Company,
         Property,
         Value,
     }
 
-    public class MsiPatchMetadataTuple : IntermediateTuple
+    public class MsiPatchMetadataSymbol : IntermediateSymbol
     {
-        public MsiPatchMetadataTuple() : base(TupleDefinitions.MsiPatchMetadata, null, null)
+        public MsiPatchMetadataSymbol() : base(SymbolDefinitions.MsiPatchMetadata, null, null)
         {
         }
 
-        public MsiPatchMetadataTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiPatchMetadata, sourceLineNumber, id)
+        public MsiPatchMetadataSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiPatchMetadata, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[MsiPatchMetadataTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[MsiPatchMetadataSymbolFields index] => this.Fields[(int)index];
 
         public string Company
         {
-            get => (string)this.Fields[(int)MsiPatchMetadataTupleFields.Company];
-            set => this.Set((int)MsiPatchMetadataTupleFields.Company, value);
+            get => (string)this.Fields[(int)MsiPatchMetadataSymbolFields.Company];
+            set => this.Set((int)MsiPatchMetadataSymbolFields.Company, value);
         }
 
         public string Property
         {
-            get => (string)this.Fields[(int)MsiPatchMetadataTupleFields.Property];
-            set => this.Set((int)MsiPatchMetadataTupleFields.Property, value);
+            get => (string)this.Fields[(int)MsiPatchMetadataSymbolFields.Property];
+            set => this.Set((int)MsiPatchMetadataSymbolFields.Property, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)MsiPatchMetadataTupleFields.Value];
-            set => this.Set((int)MsiPatchMetadataTupleFields.Value, value);
+            get => (string)this.Fields[(int)MsiPatchMetadataSymbolFields.Value];
+            set => this.Set((int)MsiPatchMetadataSymbolFields.Value, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiPatchOldAssemblyFileTuple.cs b/src/WixToolset.Data/Tuples/MsiPatchOldAssemblyFileTuple.cs
index 487dc714..75385ba8 100644
--- a/src/WixToolset.Data/Tuples/MsiPatchOldAssemblyFileTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiPatchOldAssemblyFileTuple.cs
@@ -2,51 +2,51 @@
 
 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 MsiPatchOldAssemblyFile = new IntermediateTupleDefinition(
-            TupleDefinitionType.MsiPatchOldAssemblyFile,
+        public static readonly IntermediateSymbolDefinition MsiPatchOldAssemblyFile = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.MsiPatchOldAssemblyFile,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyFileTupleFields.FileRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyFileTupleFields.AssemblyRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyFileSymbolFields.FileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyFileSymbolFields.AssemblyRef), IntermediateFieldType.String),
             },
-            typeof(MsiPatchOldAssemblyFileTuple));
+            typeof(MsiPatchOldAssemblyFileSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum MsiPatchOldAssemblyFileTupleFields
+    public enum MsiPatchOldAssemblyFileSymbolFields
     {
         FileRef,
         AssemblyRef,
     }
 
-    public class MsiPatchOldAssemblyFileTuple : IntermediateTuple
+    public class MsiPatchOldAssemblyFileSymbol : IntermediateSymbol
     {
-        public MsiPatchOldAssemblyFileTuple() : base(TupleDefinitions.MsiPatchOldAssemblyFile, null, null)
+        public MsiPatchOldAssemblyFileSymbol() : base(SymbolDefinitions.MsiPatchOldAssemblyFile, null, null)
         {
         }
 
-        public MsiPatchOldAssemblyFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiPatchOldAssemblyFile, sourceLineNumber, id)
+        public MsiPatchOldAssemblyFileSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiPatchOldAssemblyFile, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[MsiPatchOldAssemblyFileTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[MsiPatchOldAssemblyFileSymbolFields index] => this.Fields[(int)index];
 
         public string FileRef
         {
-            get => (string)this.Fields[(int)MsiPatchOldAssemblyFileTupleFields.FileRef];
-            set => this.Set((int)MsiPatchOldAssemblyFileTupleFields.FileRef, value);
+            get => (string)this.Fields[(int)MsiPatchOldAssemblyFileSymbolFields.FileRef];
+            set => this.Set((int)MsiPatchOldAssemblyFileSymbolFields.FileRef, value);
         }
 
         public string AssemblyRef
         {
-            get => (string)this.Fields[(int)MsiPatchOldAssemblyFileTupleFields.AssemblyRef];
-            set => this.Set((int)MsiPatchOldAssemblyFileTupleFields.AssemblyRef, value);
+            get => (string)this.Fields[(int)MsiPatchOldAssemblyFileSymbolFields.AssemblyRef];
+            set => this.Set((int)MsiPatchOldAssemblyFileSymbolFields.AssemblyRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiPatchOldAssemblyNameTuple.cs b/src/WixToolset.Data/Tuples/MsiPatchOldAssemblyNameTuple.cs
index 9e2b72e5..199f5ff7 100644
--- a/src/WixToolset.Data/Tuples/MsiPatchOldAssemblyNameTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiPatchOldAssemblyNameTuple.cs
@@ -2,59 +2,59 @@
 
 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 MsiPatchOldAssemblyName = new IntermediateTupleDefinition(
-            TupleDefinitionType.MsiPatchOldAssemblyName,
+        public static readonly IntermediateSymbolDefinition MsiPatchOldAssemblyName = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.MsiPatchOldAssemblyName,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyNameTupleFields.Assembly), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyNameTupleFields.Name), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyNameTupleFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyNameSymbolFields.Assembly), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyNameSymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPatchOldAssemblyNameSymbolFields.Value), IntermediateFieldType.String),
             },
-            typeof(MsiPatchOldAssemblyNameTuple));
+            typeof(MsiPatchOldAssemblyNameSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum MsiPatchOldAssemblyNameTupleFields
+    public enum MsiPatchOldAssemblyNameSymbolFields
     {
         Assembly,
         Name,
         Value,
     }
 
-    public class MsiPatchOldAssemblyNameTuple : IntermediateTuple
+    public class MsiPatchOldAssemblyNameSymbol : IntermediateSymbol
     {
-        public MsiPatchOldAssemblyNameTuple() : base(TupleDefinitions.MsiPatchOldAssemblyName, null, null)
+        public MsiPatchOldAssemblyNameSymbol() : base(SymbolDefinitions.MsiPatchOldAssemblyName, null, null)
         {
         }
 
-        public MsiPatchOldAssemblyNameTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiPatchOldAssemblyName, sourceLineNumber, id)
+        public MsiPatchOldAssemblyNameSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiPatchOldAssemblyName, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[MsiPatchOldAssemblyNameTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[MsiPatchOldAssemblyNameSymbolFields index] => this.Fields[(int)index];
 
         public string Assembly
         {
-            get => (string)this.Fields[(int)MsiPatchOldAssemblyNameTupleFields.Assembly];
-            set => this.Set((int)MsiPatchOldAssemblyNameTupleFields.Assembly, value);
+            get => (string)this.Fields[(int)MsiPatchOldAssemblyNameSymbolFields.Assembly];
+            set => this.Set((int)MsiPatchOldAssemblyNameSymbolFields.Assembly, value);
         }
 
         public string Name
         {
-            get => (string)this.Fields[(int)MsiPatchOldAssemblyNameTupleFields.Name];
-            set => this.Set((int)MsiPatchOldAssemblyNameTupleFields.Name, value);
+            get => (string)this.Fields[(int)MsiPatchOldAssemblyNameSymbolFields.Name];
+            set => this.Set((int)MsiPatchOldAssemblyNameSymbolFields.Name, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)MsiPatchOldAssemblyNameTupleFields.Value];
-            set => this.Set((int)MsiPatchOldAssemblyNameTupleFields.Value, value);
+            get => (string)this.Fields[(int)MsiPatchOldAssemblyNameSymbolFields.Value];
+            set => this.Set((int)MsiPatchOldAssemblyNameSymbolFields.Value, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiPatchSequenceTuple.cs b/src/WixToolset.Data/Tuples/MsiPatchSequenceTuple.cs
index 143e58a0..ac2b0dc4 100644
--- a/src/WixToolset.Data/Tuples/MsiPatchSequenceTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiPatchSequenceTuple.cs
@@ -2,26 +2,26 @@
 
 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 MsiPatchSequence = new IntermediateTupleDefinition(
-            TupleDefinitionType.MsiPatchSequence,
+        public static readonly IntermediateSymbolDefinition MsiPatchSequence = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.MsiPatchSequence,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(MsiPatchSequenceTupleFields.PatchFamily), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiPatchSequenceTupleFields.ProductCode), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiPatchSequenceTupleFields.Sequence), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiPatchSequenceTupleFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MsiPatchSequenceSymbolFields.PatchFamily), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPatchSequenceSymbolFields.ProductCode), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPatchSequenceSymbolFields.Sequence), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiPatchSequenceSymbolFields.Attributes), IntermediateFieldType.Number),
             },
-            typeof(MsiPatchSequenceTuple));
+            typeof(MsiPatchSequenceSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum MsiPatchSequenceTupleFields
+    public enum MsiPatchSequenceSymbolFields
     {
         PatchFamily,
         ProductCode,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
         Attributes,
     }
 
-    public class MsiPatchSequenceTuple : IntermediateTuple
+    public class MsiPatchSequenceSymbol : IntermediateSymbol
     {
-        public MsiPatchSequenceTuple() : base(TupleDefinitions.MsiPatchSequence, null, null)
+        public MsiPatchSequenceSymbol() : base(SymbolDefinitions.MsiPatchSequence, null, null)
         {
         }
 
-        public MsiPatchSequenceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiPatchSequence, sourceLineNumber, id)
+        public MsiPatchSequenceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiPatchSequence, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[MsiPatchSequenceTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[MsiPatchSequenceSymbolFields index] => this.Fields[(int)index];
 
         public string PatchFamily
         {
-            get => (string)this.Fields[(int)MsiPatchSequenceTupleFields.PatchFamily];
-            set => this.Set((int)MsiPatchSequenceTupleFields.PatchFamily, value);
+            get => (string)this.Fields[(int)MsiPatchSequenceSymbolFields.PatchFamily];
+            set => this.Set((int)MsiPatchSequenceSymbolFields.PatchFamily, value);
         }
 
         public string ProductCode
         {
-            get => (string)this.Fields[(int)MsiPatchSequenceTupleFields.ProductCode];
-            set => this.Set((int)MsiPatchSequenceTupleFields.ProductCode, value);
+            get => (string)this.Fields[(int)MsiPatchSequenceSymbolFields.ProductCode];
+            set => this.Set((int)MsiPatchSequenceSymbolFields.ProductCode, value);
         }
 
         public string Sequence
         {
-            get => (string)this.Fields[(int)MsiPatchSequenceTupleFields.Sequence];
-            set => this.Set((int)MsiPatchSequenceTupleFields.Sequence, value);
+            get => (string)this.Fields[(int)MsiPatchSequenceSymbolFields.Sequence];
+            set => this.Set((int)MsiPatchSequenceSymbolFields.Sequence, value);
         }
 
         public int? Attributes
         {
-            get => (int?)this.Fields[(int)MsiPatchSequenceTupleFields.Attributes];
-            set => this.Set((int)MsiPatchSequenceTupleFields.Attributes, value);
+            get => (int?)this.Fields[(int)MsiPatchSequenceSymbolFields.Attributes];
+            set => this.Set((int)MsiPatchSequenceSymbolFields.Attributes, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiServiceConfigFailureActionsTuple.cs b/src/WixToolset.Data/Tuples/MsiServiceConfigFailureActionsTuple.cs
index faf9069e..92ca4059 100644
--- a/src/WixToolset.Data/Tuples/MsiServiceConfigFailureActionsTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiServiceConfigFailureActionsTuple.cs
@@ -2,32 +2,32 @@
 
 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 MsiServiceConfigFailureActions = new IntermediateTupleDefinition(
-            TupleDefinitionType.MsiServiceConfigFailureActions,
+        public static readonly IntermediateSymbolDefinition MsiServiceConfigFailureActions = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.MsiServiceConfigFailureActions,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.Name), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.OnInstall), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.OnReinstall), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.OnUninstall), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.ResetPeriod), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.RebootMessage), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.Command), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.Actions), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.DelayActions), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsSymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsSymbolFields.OnInstall), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsSymbolFields.OnReinstall), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsSymbolFields.OnUninstall), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsSymbolFields.ResetPeriod), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsSymbolFields.RebootMessage), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsSymbolFields.Command), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsSymbolFields.Actions), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsSymbolFields.DelayActions), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsSymbolFields.ComponentRef), IntermediateFieldType.String),
             },
-            typeof(MsiServiceConfigFailureActionsTuple));
+            typeof(MsiServiceConfigFailureActionsSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum MsiServiceConfigFailureActionsTupleFields
+    public enum MsiServiceConfigFailureActionsSymbolFields
     {
         Name,
         OnInstall,
@@ -41,76 +41,76 @@ namespace WixToolset.Data.Tuples
         ComponentRef,
     }
 
-    public class MsiServiceConfigFailureActionsTuple : IntermediateTuple
+    public class MsiServiceConfigFailureActionsSymbol : IntermediateSymbol
     {
-        public MsiServiceConfigFailureActionsTuple() : base(TupleDefinitions.MsiServiceConfigFailureActions, null, null)
+        public MsiServiceConfigFailureActionsSymbol() : base(SymbolDefinitions.MsiServiceConfigFailureActions, null, null)
         {
         }
 
-        public MsiServiceConfigFailureActionsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiServiceConfigFailureActions, sourceLineNumber, id)
+        public MsiServiceConfigFailureActionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiServiceConfigFailureActions, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[MsiServiceConfigFailureActionsTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[MsiServiceConfigFailureActionsSymbolFields index] => this.Fields[(int)index];
 
         public string Name
         {
-            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.Name];
-            set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.Name, value);
+            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsSymbolFields.Name];
+            set => this.Set((int)MsiServiceConfigFailureActionsSymbolFields.Name, value);
         }
 
         public bool OnInstall
         {
-            get => this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.OnInstall].AsBool();
-            set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.OnInstall, value);
+            get => this.Fields[(int)MsiServiceConfigFailureActionsSymbolFields.OnInstall].AsBool();
+            set => this.Set((int)MsiServiceConfigFailureActionsSymbolFields.OnInstall, value);
         }
 
         public bool OnReinstall
         {
-            get => this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.OnReinstall].AsBool();
-            set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.OnReinstall, value);
+            get => this.Fields[(int)MsiServiceConfigFailureActionsSymbolFields.OnReinstall].AsBool();
+            set => this.Set((int)MsiServiceConfigFailureActionsSymbolFields.OnReinstall, value);
         }
 
         public bool OnUninstall
         {
-            get => this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.OnUninstall].AsBool();
-            set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.OnUninstall, value);
+            get => this.Fields[(int)MsiServiceConfigFailureActionsSymbolFields.OnUninstall].AsBool();
+            set => this.Set((int)MsiServiceConfigFailureActionsSymbolFields.OnUninstall, value);
         }
 
         public int? ResetPeriod
         {
-            get => (int?)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.ResetPeriod];
-            set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.ResetPeriod, value);
+            get => (int?)this.Fields[(int)MsiServiceConfigFailureActionsSymbolFields.ResetPeriod];
+            set => this.Set((int)MsiServiceConfigFailureActionsSymbolFields.ResetPeriod, value);
         }
 
         public string RebootMessage
         {
-            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.RebootMessage];
-            set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.RebootMessage, value);
+            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsSymbolFields.RebootMessage];
+            set => this.Set((int)MsiServiceConfigFailureActionsSymbolFields.RebootMessage, value);
         }
 
         public string Command
         {
-            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.Command];
-            set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.Command, value);
+            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsSymbolFields.Command];
+            set => this.Set((int)MsiServiceConfigFailureActionsSymbolFields.Command, value);
         }
 
         public string Actions
         {
-            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.Actions];
-            set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.Actions, value);
+            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsSymbolFields.Actions];
+            set => this.Set((int)MsiServiceConfigFailureActionsSymbolFields.Actions, value);
         }
 
         public string DelayActions
         {
-            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.DelayActions];
-            set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.DelayActions, value);
+            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsSymbolFields.DelayActions];
+            set => this.Set((int)MsiServiceConfigFailureActionsSymbolFields.DelayActions, value);
         }
 
         public string ComponentRef
         {
-            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsTupleFields.ComponentRef];
-            set => this.Set((int)MsiServiceConfigFailureActionsTupleFields.ComponentRef, value);
+            get => (string)this.Fields[(int)MsiServiceConfigFailureActionsSymbolFields.ComponentRef];
+            set => this.Set((int)MsiServiceConfigFailureActionsSymbolFields.ComponentRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiServiceConfigTuple.cs b/src/WixToolset.Data/Tuples/MsiServiceConfigTuple.cs
index 242098cd..9ad72d1e 100644
--- a/src/WixToolset.Data/Tuples/MsiServiceConfigTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiServiceConfigTuple.cs
@@ -2,29 +2,29 @@
 
 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 MsiServiceConfig = new IntermediateTupleDefinition(
-            TupleDefinitionType.MsiServiceConfig,
+        public static readonly IntermediateSymbolDefinition MsiServiceConfig = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.MsiServiceConfig,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(MsiServiceConfigTupleFields.Name), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.OnInstall), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.OnReinstall), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsTupleFields.OnUninstall), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(MsiServiceConfigTupleFields.ConfigType), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(MsiServiceConfigTupleFields.Argument), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiServiceConfigTupleFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigSymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsSymbolFields.OnInstall), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsSymbolFields.OnReinstall), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigFailureActionsSymbolFields.OnUninstall), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigSymbolFields.ConfigType), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigSymbolFields.Argument), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiServiceConfigSymbolFields.ComponentRef), IntermediateFieldType.String),
             },
-            typeof(MsiServiceConfigTuple));
+            typeof(MsiServiceConfigSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum MsiServiceConfigTupleFields
+    public enum MsiServiceConfigSymbolFields
     {
         Name,
         OnInstall,
@@ -44,58 +44,58 @@ namespace WixToolset.Data.Tuples
         PreshutdownInfo,
     }
 
-    public class MsiServiceConfigTuple : IntermediateTuple
+    public class MsiServiceConfigSymbol : IntermediateSymbol
     {
-        public MsiServiceConfigTuple() : base(TupleDefinitions.MsiServiceConfig, null, null)
+        public MsiServiceConfigSymbol() : base(SymbolDefinitions.MsiServiceConfig, null, null)
         {
         }
 
-        public MsiServiceConfigTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiServiceConfig, sourceLineNumber, id)
+        public MsiServiceConfigSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiServiceConfig, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[MsiServiceConfigTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[MsiServiceConfigSymbolFields index] => this.Fields[(int)index];
 
         public string Name
         {
-            get => (string)this.Fields[(int)MsiServiceConfigTupleFields.Name];
-            set => this.Set((int)MsiServiceConfigTupleFields.Name, value);
+            get => (string)this.Fields[(int)MsiServiceConfigSymbolFields.Name];
+            set => this.Set((int)MsiServiceConfigSymbolFields.Name, value);
         }
 
         public bool OnInstall
         {
-            get => this.Fields[(int)MsiServiceConfigTupleFields.OnInstall].AsBool();
-            set => this.Set((int)MsiServiceConfigTupleFields.OnInstall, value);
+            get => this.Fields[(int)MsiServiceConfigSymbolFields.OnInstall].AsBool();
+            set => this.Set((int)MsiServiceConfigSymbolFields.OnInstall, value);
         }
 
         public bool OnReinstall
         {
-            get => this.Fields[(int)MsiServiceConfigTupleFields.OnReinstall].AsBool();
-            set => this.Set((int)MsiServiceConfigTupleFields.OnReinstall, value);
+            get => this.Fields[(int)MsiServiceConfigSymbolFields.OnReinstall].AsBool();
+            set => this.Set((int)MsiServiceConfigSymbolFields.OnReinstall, value);
         }
 
         public bool OnUninstall
         {
-            get => this.Fields[(int)MsiServiceConfigTupleFields.OnUninstall].AsBool();
-            set => this.Set((int)MsiServiceConfigTupleFields.OnUninstall, value);
+            get => this.Fields[(int)MsiServiceConfigSymbolFields.OnUninstall].AsBool();
+            set => this.Set((int)MsiServiceConfigSymbolFields.OnUninstall, value);
         }
 
         public MsiServiceConfigType ConfigType
         {
-            get => (MsiServiceConfigType)this.Fields[(int)MsiServiceConfigTupleFields.ConfigType].AsNumber();
-            set => this.Set((int)MsiServiceConfigTupleFields.ConfigType, (int)value);
+            get => (MsiServiceConfigType)this.Fields[(int)MsiServiceConfigSymbolFields.ConfigType].AsNumber();
+            set => this.Set((int)MsiServiceConfigSymbolFields.ConfigType, (int)value);
         }
 
         public string Argument
         {
-            get => (string)this.Fields[(int)MsiServiceConfigTupleFields.Argument];
-            set => this.Set((int)MsiServiceConfigTupleFields.Argument, value);
+            get => (string)this.Fields[(int)MsiServiceConfigSymbolFields.Argument];
+            set => this.Set((int)MsiServiceConfigSymbolFields.Argument, value);
         }
 
         public string ComponentRef
         {
-            get => (string)this.Fields[(int)MsiServiceConfigTupleFields.ComponentRef];
-            set => this.Set((int)MsiServiceConfigTupleFields.ComponentRef, value);
+            get => (string)this.Fields[(int)MsiServiceConfigSymbolFields.ComponentRef];
+            set => this.Set((int)MsiServiceConfigSymbolFields.ComponentRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/MsiShortcutPropertyTuple.cs b/src/WixToolset.Data/Tuples/MsiShortcutPropertyTuple.cs
index 290f6f14..5d5a46e5 100644
--- a/src/WixToolset.Data/Tuples/MsiShortcutPropertyTuple.cs
+++ b/src/WixToolset.Data/Tuples/MsiShortcutPropertyTuple.cs
@@ -2,59 +2,59 @@
 
 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 MsiShortcutProperty = new IntermediateTupleDefinition(
-            TupleDefinitionType.MsiShortcutProperty,
+        public static readonly IntermediateSymbolDefinition MsiShortcutProperty = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.MsiShortcutProperty,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(MsiShortcutPropertyTupleFields.ShortcutRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiShortcutPropertyTupleFields.PropertyKey), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MsiShortcutPropertyTupleFields.PropVariantValue), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiShortcutPropertySymbolFields.ShortcutRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiShortcutPropertySymbolFields.PropertyKey), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MsiShortcutPropertySymbolFields.PropVariantValue), IntermediateFieldType.String),
             },
-            typeof(MsiShortcutPropertyTuple));
+            typeof(MsiShortcutPropertySymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum MsiShortcutPropertyTupleFields
+    public enum MsiShortcutPropertySymbolFields
     {
         ShortcutRef,
         PropertyKey,
         PropVariantValue,
     }
 
-    public class MsiShortcutPropertyTuple : IntermediateTuple
+    public class MsiShortcutPropertySymbol : IntermediateSymbol
     {
-        public MsiShortcutPropertyTuple() : base(TupleDefinitions.MsiShortcutProperty, null, null)
+        public MsiShortcutPropertySymbol() : base(SymbolDefinitions.MsiShortcutProperty, null, null)
         {
         }
 
-        public MsiShortcutPropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiShortcutProperty, sourceLineNumber, id)
+        public MsiShortcutPropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.MsiShortcutProperty, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[MsiShortcutPropertyTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[MsiShortcutPropertySymbolFields index] => this.Fields[(int)index];
 
         public string ShortcutRef
         {
-            get => (string)this.Fields[(int)MsiShortcutPropertyTupleFields.ShortcutRef];
-            set => this.Set((int)MsiShortcutPropertyTupleFields.ShortcutRef, value);
+            get => (string)this.Fields[(int)MsiShortcutPropertySymbolFields.ShortcutRef];
+            set => this.Set((int)MsiShortcutPropertySymbolFields.ShortcutRef, value);
         }
 
         public string PropertyKey
         {
-            get => (string)this.Fields[(int)MsiShortcutPropertyTupleFields.PropertyKey];
-            set => this.Set((int)MsiShortcutPropertyTupleFields.PropertyKey, value);
+            get => (string)this.Fields[(int)MsiShortcutPropertySymbolFields.PropertyKey];
+            set => this.Set((int)MsiShortcutPropertySymbolFields.PropertyKey, value);
         }
 
         public string PropVariantValue
         {
-            get => (string)this.Fields[(int)MsiShortcutPropertyTupleFields.PropVariantValue];
-            set => this.Set((int)MsiShortcutPropertyTupleFields.PropVariantValue, value);
+            get => (string)this.Fields[(int)MsiShortcutPropertySymbolFields.PropVariantValue];
+            set => this.Set((int)MsiShortcutPropertySymbolFields.PropVariantValue, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ODBCAttributeTuple.cs b/src/WixToolset.Data/Tuples/ODBCAttributeTuple.cs
index 42598df9..45ca6ed8 100644
--- a/src/WixToolset.Data/Tuples/ODBCAttributeTuple.cs
+++ b/src/WixToolset.Data/Tuples/ODBCAttributeTuple.cs
@@ -2,59 +2,59 @@
 
 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 ODBCAttribute = new IntermediateTupleDefinition(
-            TupleDefinitionType.ODBCAttribute,
+        public static readonly IntermediateSymbolDefinition ODBCAttribute = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.ODBCAttribute,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ODBCAttributeTupleFields.DriverRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ODBCAttributeTupleFields.Attribute), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ODBCAttributeTupleFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCAttributeSymbolFields.DriverRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCAttributeSymbolFields.Attribute), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCAttributeSymbolFields.Value), IntermediateFieldType.String),
             },
-            typeof(ODBCAttributeTuple));
+            typeof(ODBCAttributeSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ODBCAttributeTupleFields
+    public enum ODBCAttributeSymbolFields
     {
         DriverRef,
         Attribute,
         Value,
     }
 
-    public class ODBCAttributeTuple : IntermediateTuple
+    public class ODBCAttributeSymbol : IntermediateSymbol
     {
-        public ODBCAttributeTuple() : base(TupleDefinitions.ODBCAttribute, null, null)
+        public ODBCAttributeSymbol() : base(SymbolDefinitions.ODBCAttribute, null, null)
         {
         }
 
-        public ODBCAttributeTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ODBCAttribute, sourceLineNumber, id)
+        public ODBCAttributeSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ODBCAttribute, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ODBCAttributeTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ODBCAttributeSymbolFields index] => this.Fields[(int)index];
 
         public string DriverRef
         {
-            get => (string)this.Fields[(int)ODBCAttributeTupleFields.DriverRef];
-            set => this.Set((int)ODBCAttributeTupleFields.DriverRef, value);
+            get => (string)this.Fields[(int)ODBCAttributeSymbolFields.DriverRef];
+            set => this.Set((int)ODBCAttributeSymbolFields.DriverRef, value);
         }
 
         public string Attribute
         {
-            get => (string)this.Fields[(int)ODBCAttributeTupleFields.Attribute];
-            set => this.Set((int)ODBCAttributeTupleFields.Attribute, value);
+            get => (string)this.Fields[(int)ODBCAttributeSymbolFields.Attribute];
+            set => this.Set((int)ODBCAttributeSymbolFields.Attribute, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)ODBCAttributeTupleFields.Value];
-            set => this.Set((int)ODBCAttributeTupleFields.Value, value);
+            get => (string)this.Fields[(int)ODBCAttributeSymbolFields.Value];
+            set => this.Set((int)ODBCAttributeSymbolFields.Value, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ODBCDataSourceTuple.cs b/src/WixToolset.Data/Tuples/ODBCDataSourceTuple.cs
index 21a5ca9c..6af140bd 100644
--- a/src/WixToolset.Data/Tuples/ODBCDataSourceTuple.cs
+++ b/src/WixToolset.Data/Tuples/ODBCDataSourceTuple.cs
@@ -2,26 +2,26 @@
 
 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 ODBCDataSource = new IntermediateTupleDefinition(
-            TupleDefinitionType.ODBCDataSource,
+        public static readonly IntermediateSymbolDefinition ODBCDataSource = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.ODBCDataSource,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ODBCDataSourceTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ODBCDataSourceTupleFields.Description), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ODBCDataSourceTupleFields.DriverDescription), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ODBCDataSourceTupleFields.Registration), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ODBCDataSourceSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCDataSourceSymbolFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCDataSourceSymbolFields.DriverDescription), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCDataSourceSymbolFields.Registration), IntermediateFieldType.Number),
             },
-            typeof(ODBCDataSourceTuple));
+            typeof(ODBCDataSourceSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ODBCDataSourceTupleFields
+    public enum ODBCDataSourceSymbolFields
     {
         ComponentRef,
         Description,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
         Registration,
     }
 
-    public class ODBCDataSourceTuple : IntermediateTuple
+    public class ODBCDataSourceSymbol : IntermediateSymbol
     {
-        public ODBCDataSourceTuple() : base(TupleDefinitions.ODBCDataSource, null, null)
+        public ODBCDataSourceSymbol() : base(SymbolDefinitions.ODBCDataSource, null, null)
         {
         }
 
-        public ODBCDataSourceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ODBCDataSource, sourceLineNumber, id)
+        public ODBCDataSourceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ODBCDataSource, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ODBCDataSourceTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ODBCDataSourceSymbolFields index] => this.Fields[(int)index];
 
         public string ComponentRef
         {
-            get => (string)this.Fields[(int)ODBCDataSourceTupleFields.ComponentRef];
-            set => this.Set((int)ODBCDataSourceTupleFields.ComponentRef, value);
+            get => (string)this.Fields[(int)ODBCDataSourceSymbolFields.ComponentRef];
+            set => this.Set((int)ODBCDataSourceSymbolFields.ComponentRef, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)ODBCDataSourceTupleFields.Description];
-            set => this.Set((int)ODBCDataSourceTupleFields.Description, value);
+            get => (string)this.Fields[(int)ODBCDataSourceSymbolFields.Description];
+            set => this.Set((int)ODBCDataSourceSymbolFields.Description, value);
         }
 
         public string DriverDescription
         {
-            get => (string)this.Fields[(int)ODBCDataSourceTupleFields.DriverDescription];
-            set => this.Set((int)ODBCDataSourceTupleFields.DriverDescription, value);
+            get => (string)this.Fields[(int)ODBCDataSourceSymbolFields.DriverDescription];
+            set => this.Set((int)ODBCDataSourceSymbolFields.DriverDescription, value);
         }
 
         public int Registration
         {
-            get => (int)this.Fields[(int)ODBCDataSourceTupleFields.Registration];
-            set => this.Set((int)ODBCDataSourceTupleFields.Registration, value);
+            get => (int)this.Fields[(int)ODBCDataSourceSymbolFields.Registration];
+            set => this.Set((int)ODBCDataSourceSymbolFields.Registration, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/ODBCDriverTuple.cs b/src/WixToolset.Data/Tuples/ODBCDriverTuple.cs
index 79de70e5..b31cc4cb 100644
--- a/src/WixToolset.Data/Tuples/ODBCDriverTuple.cs
+++ b/src/WixToolset.Data/Tuples/ODBCDriverTuple.cs
@@ -2,26 +2,26 @@
 
 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 ODBCDriver = new IntermediateTupleDefinition(
-            TupleDefinitionType.ODBCDriver,
+        public static readonly IntermediateSymbolDefinition ODBCDriver = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.ODBCDriver,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.Description), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.FileRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ODBCDriverTupleFields.SetupFileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCDriverSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCDriverSymbolFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCDriverSymbolFields.FileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCDriverSymbolFields.SetupFileRef), IntermediateFieldType.String),
             },
-            typeof(ODBCDriverTuple));
+            typeof(ODBCDriverSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ODBCDriverTupleFields
+    public enum ODBCDriverSymbolFields
     {
         ComponentRef,
         Description,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
         SetupFileRef,
     }
 
-    public class ODBCDriverTuple : IntermediateTuple
+    public class ODBCDriverSymbol : IntermediateSymbol
     {
-        public ODBCDriverTuple() : base(TupleDefinitions.ODBCDriver, null, null)
+        public ODBCDriverSymbol() : base(SymbolDefinitions.ODBCDriver, null, null)
         {
         }
 
-        public ODBCDriverTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ODBCDriver, sourceLineNumber, id)
+        public ODBCDriverSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ODBCDriver, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ODBCDriverTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ODBCDriverSymbolFields index] => this.Fields[(int)index];
 
         public string ComponentRef
         {
-            get => (string)this.Fields[(int)ODBCDriverTupleFields.ComponentRef];
-            set => this.Set((int)ODBCDriverTupleFields.ComponentRef, value);
+            get => (string)this.Fields[(int)ODBCDriverSymbolFields.ComponentRef];
+            set => this.Set((int)ODBCDriverSymbolFields.ComponentRef, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)ODBCDriverTupleFields.Description];
-            set => this.Set((int)ODBCDriverTupleFields.Description, value);
+            get => (string)this.Fields[(int)ODBCDriverSymbolFields.Description];
+            set => this.Set((int)ODBCDriverSymbolFields.Description, value);
         }
 
         public string FileRef
         {
-            get => (string)this.Fields[(int)ODBCDriverTupleFields.FileRef];
-            set => this.Set((int)ODBCDriverTupleFields.FileRef, value);
+            get => (string)this.Fields[(int)ODBCDriverSymbolFields.FileRef];
+            set => this.Set((int)ODBCDriverSymbolFields.FileRef, value);
         }
 
         public string SetupFileRef
         {
-            get => (string)this.Fields[(int)ODBCDriverTupleFields.SetupFileRef];
-            set => this.Set((int)ODBCDriverTupleFields.SetupFileRef, value);
+            get => (string)this.Fields[(int)ODBCDriverSymbolFields.SetupFileRef];
+            set => this.Set((int)ODBCDriverSymbolFields.SetupFileRef, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/ODBCSourceAttributeTuple.cs b/src/WixToolset.Data/Tuples/ODBCSourceAttributeTuple.cs
index 62fba795..2e25a5f7 100644
--- a/src/WixToolset.Data/Tuples/ODBCSourceAttributeTuple.cs
+++ b/src/WixToolset.Data/Tuples/ODBCSourceAttributeTuple.cs
@@ -2,59 +2,59 @@
 
 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 ODBCSourceAttribute = new IntermediateTupleDefinition(
-            TupleDefinitionType.ODBCSourceAttribute,
+        public static readonly IntermediateSymbolDefinition ODBCSourceAttribute = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.ODBCSourceAttribute,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ODBCSourceAttributeTupleFields.DataSourceRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ODBCSourceAttributeTupleFields.Attribute), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ODBCSourceAttributeTupleFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCSourceAttributeSymbolFields.DataSourceRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCSourceAttributeSymbolFields.Attribute), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCSourceAttributeSymbolFields.Value), IntermediateFieldType.String),
             },
-            typeof(ODBCSourceAttributeTuple));
+            typeof(ODBCSourceAttributeSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ODBCSourceAttributeTupleFields
+    public enum ODBCSourceAttributeSymbolFields
     {
         DataSourceRef,
         Attribute,
         Value,
     }
 
-    public class ODBCSourceAttributeTuple : IntermediateTuple
+    public class ODBCSourceAttributeSymbol : IntermediateSymbol
     {
-        public ODBCSourceAttributeTuple() : base(TupleDefinitions.ODBCSourceAttribute, null, null)
+        public ODBCSourceAttributeSymbol() : base(SymbolDefinitions.ODBCSourceAttribute, null, null)
         {
         }
 
-        public ODBCSourceAttributeTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ODBCSourceAttribute, sourceLineNumber, id)
+        public ODBCSourceAttributeSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ODBCSourceAttribute, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ODBCSourceAttributeTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ODBCSourceAttributeSymbolFields index] => this.Fields[(int)index];
 
         public string DataSourceRef
         {
-            get => (string)this.Fields[(int)ODBCSourceAttributeTupleFields.DataSourceRef];
-            set => this.Set((int)ODBCSourceAttributeTupleFields.DataSourceRef, value);
+            get => (string)this.Fields[(int)ODBCSourceAttributeSymbolFields.DataSourceRef];
+            set => this.Set((int)ODBCSourceAttributeSymbolFields.DataSourceRef, value);
         }
 
         public string Attribute
         {
-            get => (string)this.Fields[(int)ODBCSourceAttributeTupleFields.Attribute];
-            set => this.Set((int)ODBCSourceAttributeTupleFields.Attribute, value);
+            get => (string)this.Fields[(int)ODBCSourceAttributeSymbolFields.Attribute];
+            set => this.Set((int)ODBCSourceAttributeSymbolFields.Attribute, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)ODBCSourceAttributeTupleFields.Value];
-            set => this.Set((int)ODBCSourceAttributeTupleFields.Value, value);
+            get => (string)this.Fields[(int)ODBCSourceAttributeSymbolFields.Value];
+            set => this.Set((int)ODBCSourceAttributeSymbolFields.Value, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ODBCTranslatorTuple.cs b/src/WixToolset.Data/Tuples/ODBCTranslatorTuple.cs
index 0662e3f8..c444b834 100644
--- a/src/WixToolset.Data/Tuples/ODBCTranslatorTuple.cs
+++ b/src/WixToolset.Data/Tuples/ODBCTranslatorTuple.cs
@@ -2,26 +2,26 @@
 
 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 ODBCTranslator = new IntermediateTupleDefinition(
-            TupleDefinitionType.ODBCTranslator,
+        public static readonly IntermediateSymbolDefinition ODBCTranslator = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.ODBCTranslator,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.Description), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.FileRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ODBCTranslatorTupleFields.SetupFileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCTranslatorSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCTranslatorSymbolFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCTranslatorSymbolFields.FileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ODBCTranslatorSymbolFields.SetupFileRef), IntermediateFieldType.String),
             },
-            typeof(ODBCTranslatorTuple));
+            typeof(ODBCTranslatorSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ODBCTranslatorTupleFields
+    public enum ODBCTranslatorSymbolFields
     {
         ComponentRef,
         Description,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
         SetupFileRef,
     }
 
-    public class ODBCTranslatorTuple : IntermediateTuple
+    public class ODBCTranslatorSymbol : IntermediateSymbol
     {
-        public ODBCTranslatorTuple() : base(TupleDefinitions.ODBCTranslator, null, null)
+        public ODBCTranslatorSymbol() : base(SymbolDefinitions.ODBCTranslator, null, null)
         {
         }
 
-        public ODBCTranslatorTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ODBCTranslator, sourceLineNumber, id)
+        public ODBCTranslatorSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ODBCTranslator, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ODBCTranslatorTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ODBCTranslatorSymbolFields index] => this.Fields[(int)index];
 
         public string ComponentRef
         {
-            get => (string)this.Fields[(int)ODBCTranslatorTupleFields.ComponentRef];
-            set => this.Set((int)ODBCTranslatorTupleFields.ComponentRef, value);
+            get => (string)this.Fields[(int)ODBCTranslatorSymbolFields.ComponentRef];
+            set => this.Set((int)ODBCTranslatorSymbolFields.ComponentRef, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)ODBCTranslatorTupleFields.Description];
-            set => this.Set((int)ODBCTranslatorTupleFields.Description, value);
+            get => (string)this.Fields[(int)ODBCTranslatorSymbolFields.Description];
+            set => this.Set((int)ODBCTranslatorSymbolFields.Description, value);
         }
 
         public string FileRef
         {
-            get => (string)this.Fields[(int)ODBCTranslatorTupleFields.FileRef];
-            set => this.Set((int)ODBCTranslatorTupleFields.FileRef, value);
+            get => (string)this.Fields[(int)ODBCTranslatorSymbolFields.FileRef];
+            set => this.Set((int)ODBCTranslatorSymbolFields.FileRef, value);
         }
 
         public string SetupFileRef
         {
-            get => (string)this.Fields[(int)ODBCTranslatorTupleFields.SetupFileRef];
-            set => this.Set((int)ODBCTranslatorTupleFields.SetupFileRef, value);
+            get => (string)this.Fields[(int)ODBCTranslatorSymbolFields.SetupFileRef];
+            set => this.Set((int)ODBCTranslatorSymbolFields.SetupFileRef, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/PatchMetadataTuple.cs b/src/WixToolset.Data/Tuples/PatchMetadataTuple.cs
index df6962b3..3f67aef7 100644
--- a/src/WixToolset.Data/Tuples/PatchMetadataTuple.cs
+++ b/src/WixToolset.Data/Tuples/PatchMetadataTuple.cs
@@ -2,59 +2,59 @@
 
 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 PatchMetadata = new IntermediateTupleDefinition(
-            TupleDefinitionType.PatchMetadata,
+        public static readonly IntermediateSymbolDefinition PatchMetadata = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.PatchMetadata,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(PatchMetadataTupleFields.Company), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(PatchMetadataTupleFields.Property), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(PatchMetadataTupleFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PatchMetadataSymbolFields.Company), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PatchMetadataSymbolFields.Property), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PatchMetadataSymbolFields.Value), IntermediateFieldType.String),
             },
-            typeof(PatchMetadataTuple));
+            typeof(PatchMetadataSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum PatchMetadataTupleFields
+    public enum PatchMetadataSymbolFields
     {
         Company,
         Property,
         Value,
     }
 
-    public class PatchMetadataTuple : IntermediateTuple
+    public class PatchMetadataSymbol : IntermediateSymbol
     {
-        public PatchMetadataTuple() : base(TupleDefinitions.PatchMetadata, null, null)
+        public PatchMetadataSymbol() : base(SymbolDefinitions.PatchMetadata, null, null)
         {
         }
 
-        public PatchMetadataTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.PatchMetadata, sourceLineNumber, id)
+        public PatchMetadataSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.PatchMetadata, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[PatchMetadataTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[PatchMetadataSymbolFields index] => this.Fields[(int)index];
 
         public string Company
         {
-            get => (string)this.Fields[(int)PatchMetadataTupleFields.Company];
-            set => this.Set((int)PatchMetadataTupleFields.Company, value);
+            get => (string)this.Fields[(int)PatchMetadataSymbolFields.Company];
+            set => this.Set((int)PatchMetadataSymbolFields.Company, value);
         }
 
         public string Property
         {
-            get => (string)this.Fields[(int)PatchMetadataTupleFields.Property];
-            set => this.Set((int)PatchMetadataTupleFields.Property, value);
+            get => (string)this.Fields[(int)PatchMetadataSymbolFields.Property];
+            set => this.Set((int)PatchMetadataSymbolFields.Property, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)PatchMetadataTupleFields.Value];
-            set => this.Set((int)PatchMetadataTupleFields.Value, value);
+            get => (string)this.Fields[(int)PatchMetadataSymbolFields.Value];
+            set => this.Set((int)PatchMetadataSymbolFields.Value, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/PatchPackageTuple.cs b/src/WixToolset.Data/Tuples/PatchPackageTuple.cs
index ee83dc72..0efdfd25 100644
--- a/src/WixToolset.Data/Tuples/PatchPackageTuple.cs
+++ b/src/WixToolset.Data/Tuples/PatchPackageTuple.cs
@@ -2,51 +2,51 @@
 
 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 PatchPackage = new IntermediateTupleDefinition(
-            TupleDefinitionType.PatchPackage,
+        public static readonly IntermediateSymbolDefinition PatchPackage = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.PatchPackage,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(PatchPackageTupleFields.PatchId), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(PatchPackageTupleFields.MediaDiskIdRef), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(PatchPackageSymbolFields.PatchId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PatchPackageSymbolFields.MediaDiskIdRef), IntermediateFieldType.Number),
             },
-            typeof(PatchPackageTuple));
+            typeof(PatchPackageSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum PatchPackageTupleFields
+    public enum PatchPackageSymbolFields
     {
         PatchId,
         MediaDiskIdRef,
     }
 
-    public class PatchPackageTuple : IntermediateTuple
+    public class PatchPackageSymbol : IntermediateSymbol
     {
-        public PatchPackageTuple() : base(TupleDefinitions.PatchPackage, null, null)
+        public PatchPackageSymbol() : base(SymbolDefinitions.PatchPackage, null, null)
         {
         }
 
-        public PatchPackageTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.PatchPackage, sourceLineNumber, id)
+        public PatchPackageSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.PatchPackage, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[PatchPackageTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[PatchPackageSymbolFields index] => this.Fields[(int)index];
 
         public string PatchId
         {
-            get => (string)this.Fields[(int)PatchPackageTupleFields.PatchId];
-            set => this.Set((int)PatchPackageTupleFields.PatchId, value);
+            get => (string)this.Fields[(int)PatchPackageSymbolFields.PatchId];
+            set => this.Set((int)PatchPackageSymbolFields.PatchId, value);
         }
 
         public int MediaDiskIdRef
         {
-            get => (int)this.Fields[(int)PatchPackageTupleFields.MediaDiskIdRef];
-            set => this.Set((int)PatchPackageTupleFields.MediaDiskIdRef, value);
+            get => (int)this.Fields[(int)PatchPackageSymbolFields.MediaDiskIdRef];
+            set => this.Set((int)PatchPackageSymbolFields.MediaDiskIdRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/PatchSequenceTuple.cs b/src/WixToolset.Data/Tuples/PatchSequenceTuple.cs
index f7036a05..a4cbca61 100644
--- a/src/WixToolset.Data/Tuples/PatchSequenceTuple.cs
+++ b/src/WixToolset.Data/Tuples/PatchSequenceTuple.cs
@@ -2,26 +2,26 @@
 
 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 PatchSequence = new IntermediateTupleDefinition(
-            TupleDefinitionType.PatchSequence,
+        public static readonly IntermediateSymbolDefinition PatchSequence = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.PatchSequence,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(PatchSequenceTupleFields.PatchFamily), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(PatchSequenceTupleFields.Target), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(PatchSequenceTupleFields.Sequence), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(PatchSequenceTupleFields.Supersede), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(PatchSequenceSymbolFields.PatchFamily), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PatchSequenceSymbolFields.Target), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PatchSequenceSymbolFields.Sequence), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PatchSequenceSymbolFields.Supersede), IntermediateFieldType.Number),
             },
-            typeof(PatchSequenceTuple));
+            typeof(PatchSequenceSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum PatchSequenceTupleFields
+    public enum PatchSequenceSymbolFields
     {
         PatchFamily,
         Target,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
         Supersede,
     }
 
-    public class PatchSequenceTuple : IntermediateTuple
+    public class PatchSequenceSymbol : IntermediateSymbol
     {
-        public PatchSequenceTuple() : base(TupleDefinitions.PatchSequence, null, null)
+        public PatchSequenceSymbol() : base(SymbolDefinitions.PatchSequence, null, null)
         {
         }
 
-        public PatchSequenceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.PatchSequence, sourceLineNumber, id)
+        public PatchSequenceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.PatchSequence, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[PatchSequenceTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[PatchSequenceSymbolFields index] => this.Fields[(int)index];
 
         public string PatchFamily
         {
-            get => (string)this.Fields[(int)PatchSequenceTupleFields.PatchFamily];
-            set => this.Set((int)PatchSequenceTupleFields.PatchFamily, value);
+            get => (string)this.Fields[(int)PatchSequenceSymbolFields.PatchFamily];
+            set => this.Set((int)PatchSequenceSymbolFields.PatchFamily, value);
         }
 
         public string Target
         {
-            get => (string)this.Fields[(int)PatchSequenceTupleFields.Target];
-            set => this.Set((int)PatchSequenceTupleFields.Target, value);
+            get => (string)this.Fields[(int)PatchSequenceSymbolFields.Target];
+            set => this.Set((int)PatchSequenceSymbolFields.Target, value);
         }
 
         public string Sequence
         {
-            get => (string)this.Fields[(int)PatchSequenceTupleFields.Sequence];
-            set => this.Set((int)PatchSequenceTupleFields.Sequence, value);
+            get => (string)this.Fields[(int)PatchSequenceSymbolFields.Sequence];
+            set => this.Set((int)PatchSequenceSymbolFields.Sequence, value);
         }
 
         public int? Supersede
         {
-            get => (int?)this.Fields[(int)PatchSequenceTupleFields.Supersede];
-            set => this.Set((int)PatchSequenceTupleFields.Supersede, value);
+            get => (int?)this.Fields[(int)PatchSequenceSymbolFields.Supersede];
+            set => this.Set((int)PatchSequenceSymbolFields.Supersede, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/PatchTuple.cs b/src/WixToolset.Data/Tuples/PatchTuple.cs
index 5548a215..31e68d76 100644
--- a/src/WixToolset.Data/Tuples/PatchTuple.cs
+++ b/src/WixToolset.Data/Tuples/PatchTuple.cs
@@ -2,28 +2,28 @@
 
 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 Patch = new IntermediateTupleDefinition(
-            TupleDefinitionType.Patch,
+        public static readonly IntermediateSymbolDefinition Patch = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.Patch,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(PatchTupleFields.FileRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(PatchTupleFields.Sequence), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(PatchTupleFields.PatchSize), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(PatchTupleFields.Attributes), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(PatchTupleFields.Header), IntermediateFieldType.Path),
-                new IntermediateFieldDefinition(nameof(PatchTupleFields.StreamRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PatchSymbolFields.FileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PatchSymbolFields.Sequence), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(PatchSymbolFields.PatchSize), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(PatchSymbolFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(PatchSymbolFields.Header), IntermediateFieldType.Path),
+                new IntermediateFieldDefinition(nameof(PatchSymbolFields.StreamRef), IntermediateFieldType.String),
             },
-            typeof(PatchTuple));
+            typeof(PatchSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum PatchTupleFields
+    public enum PatchSymbolFields
     {
         FileRef,
         Sequence,
@@ -33,52 +33,52 @@ namespace WixToolset.Data.Tuples
         StreamRef,
     }
 
-    public class PatchTuple : IntermediateTuple
+    public class PatchSymbol : IntermediateSymbol
     {
-        public PatchTuple() : base(TupleDefinitions.Patch, null, null)
+        public PatchSymbol() : base(SymbolDefinitions.Patch, null, null)
         {
         }
 
-        public PatchTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Patch, sourceLineNumber, id)
+        public PatchSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Patch, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[PatchTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[PatchSymbolFields index] => this.Fields[(int)index];
 
         public string FileRef
         {
-            get => (string)this.Fields[(int)PatchTupleFields.FileRef];
-            set => this.Set((int)PatchTupleFields.FileRef, value);
+            get => (string)this.Fields[(int)PatchSymbolFields.FileRef];
+            set => this.Set((int)PatchSymbolFields.FileRef, value);
         }
 
         public int Sequence
         {
-            get => (int)this.Fields[(int)PatchTupleFields.Sequence];
-            set => this.Set((int)PatchTupleFields.Sequence, value);
+            get => (int)this.Fields[(int)PatchSymbolFields.Sequence];
+            set => this.Set((int)PatchSymbolFields.Sequence, value);
         }
 
         public int PatchSize
         {
-            get => (int)this.Fields[(int)PatchTupleFields.PatchSize];
-            set => this.Set((int)PatchTupleFields.PatchSize, value);
+            get => (int)this.Fields[(int)PatchSymbolFields.PatchSize];
+            set => this.Set((int)PatchSymbolFields.PatchSize, value);
         }
 
         public int Attributes
         {
-            get => (int)this.Fields[(int)PatchTupleFields.Attributes];
-            set => this.Set((int)PatchTupleFields.Attributes, value);
+            get => (int)this.Fields[(int)PatchSymbolFields.Attributes];
+            set => this.Set((int)PatchSymbolFields.Attributes, value);
         }
 
         public string Header
         {
-            get => (string)this.Fields[(int)PatchTupleFields.Header];
-            set => this.Set((int)PatchTupleFields.Header, value);
+            get => (string)this.Fields[(int)PatchSymbolFields.Header];
+            set => this.Set((int)PatchSymbolFields.Header, value);
         }
 
         public string StreamRef
         {
-            get => (string)this.Fields[(int)PatchTupleFields.StreamRef];
-            set => this.Set((int)PatchTupleFields.StreamRef, value);
+            get => (string)this.Fields[(int)PatchSymbolFields.StreamRef];
+            set => this.Set((int)PatchSymbolFields.StreamRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ProgIdTuple.cs b/src/WixToolset.Data/Tuples/ProgIdTuple.cs
index 02f66a90..57ac758f 100644
--- a/src/WixToolset.Data/Tuples/ProgIdTuple.cs
+++ b/src/WixToolset.Data/Tuples/ProgIdTuple.cs
@@ -2,28 +2,28 @@
 
 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 ProgId = new IntermediateTupleDefinition(
-            TupleDefinitionType.ProgId,
+        public static readonly IntermediateSymbolDefinition ProgId = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.ProgId,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ProgIdTupleFields.ProgId), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ProgIdTupleFields.ParentProgIdRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ProgIdTupleFields.ClassRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ProgIdTupleFields.Description), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ProgIdTupleFields.IconRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ProgIdTupleFields.IconIndex), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ProgIdSymbolFields.ProgId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ProgIdSymbolFields.ParentProgIdRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ProgIdSymbolFields.ClassRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ProgIdSymbolFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ProgIdSymbolFields.IconRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ProgIdSymbolFields.IconIndex), IntermediateFieldType.Number),
             },
-            typeof(ProgIdTuple));
+            typeof(ProgIdSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ProgIdTupleFields
+    public enum ProgIdSymbolFields
     {
         ProgId,
         ParentProgIdRef,
@@ -33,52 +33,52 @@ namespace WixToolset.Data.Tuples
         IconIndex,
     }
 
-    public class ProgIdTuple : IntermediateTuple
+    public class ProgIdSymbol : IntermediateSymbol
     {
-        public ProgIdTuple() : base(TupleDefinitions.ProgId, null, null)
+        public ProgIdSymbol() : base(SymbolDefinitions.ProgId, null, null)
         {
         }
 
-        public ProgIdTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ProgId, sourceLineNumber, id)
+        public ProgIdSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ProgId, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ProgIdTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ProgIdSymbolFields index] => this.Fields[(int)index];
 
         public string ProgId
         {
-            get => (string)this.Fields[(int)ProgIdTupleFields.ProgId];
-            set => this.Set((int)ProgIdTupleFields.ProgId, value);
+            get => (string)this.Fields[(int)ProgIdSymbolFields.ProgId];
+            set => this.Set((int)ProgIdSymbolFields.ProgId, value);
         }
 
         public string ParentProgIdRef
         {
-            get => (string)this.Fields[(int)ProgIdTupleFields.ParentProgIdRef];
-            set => this.Set((int)ProgIdTupleFields.ParentProgIdRef, value);
+            get => (string)this.Fields[(int)ProgIdSymbolFields.ParentProgIdRef];
+            set => this.Set((int)ProgIdSymbolFields.ParentProgIdRef, value);
         }
 
         public string ClassRef
         {
-            get => (string)this.Fields[(int)ProgIdTupleFields.ClassRef];
-            set => this.Set((int)ProgIdTupleFields.ClassRef, value);
+            get => (string)this.Fields[(int)ProgIdSymbolFields.ClassRef];
+            set => this.Set((int)ProgIdSymbolFields.ClassRef, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)ProgIdTupleFields.Description];
-            set => this.Set((int)ProgIdTupleFields.Description, value);
+            get => (string)this.Fields[(int)ProgIdSymbolFields.Description];
+            set => this.Set((int)ProgIdSymbolFields.Description, value);
         }
 
         public string IconRef
         {
-            get => (string)this.Fields[(int)ProgIdTupleFields.IconRef];
-            set => this.Set((int)ProgIdTupleFields.IconRef, value);
+            get => (string)this.Fields[(int)ProgIdSymbolFields.IconRef];
+            set => this.Set((int)ProgIdSymbolFields.IconRef, value);
         }
 
         public int? IconIndex
         {
-            get => (int?)this.Fields[(int)ProgIdTupleFields.IconIndex];
-            set => this.Set((int)ProgIdTupleFields.IconIndex, value);
+            get => (int?)this.Fields[(int)ProgIdSymbolFields.IconIndex];
+            set => this.Set((int)ProgIdSymbolFields.IconIndex, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/PropertiesTuple.cs b/src/WixToolset.Data/Tuples/PropertiesTuple.cs
index aaccaa81..61059aa6 100644
--- a/src/WixToolset.Data/Tuples/PropertiesTuple.cs
+++ b/src/WixToolset.Data/Tuples/PropertiesTuple.cs
@@ -2,51 +2,51 @@
 
 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 Properties = new IntermediateTupleDefinition(
-            TupleDefinitionType.Properties,
+        public static readonly IntermediateSymbolDefinition Properties = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.Properties,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(PropertiesTupleFields.Name), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(PropertiesTupleFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PropertiesSymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PropertiesSymbolFields.Value), IntermediateFieldType.String),
             },
-            typeof(PropertiesTuple));
+            typeof(PropertiesSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum PropertiesTupleFields
+    public enum PropertiesSymbolFields
     {
         Name,
         Value,
     }
 
-    public class PropertiesTuple : IntermediateTuple
+    public class PropertiesSymbol : IntermediateSymbol
     {
-        public PropertiesTuple() : base(TupleDefinitions.Properties, null, null)
+        public PropertiesSymbol() : base(SymbolDefinitions.Properties, null, null)
         {
         }
 
-        public PropertiesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Properties, sourceLineNumber, id)
+        public PropertiesSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Properties, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[PropertiesTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[PropertiesSymbolFields index] => this.Fields[(int)index];
 
         public string Name
         {
-            get => (string)this.Fields[(int)PropertiesTupleFields.Name];
-            set => this.Set((int)PropertiesTupleFields.Name, value);
+            get => (string)this.Fields[(int)PropertiesSymbolFields.Name];
+            set => this.Set((int)PropertiesSymbolFields.Name, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)PropertiesTupleFields.Value];
-            set => this.Set((int)PropertiesTupleFields.Value, value);
+            get => (string)this.Fields[(int)PropertiesSymbolFields.Value];
+            set => this.Set((int)PropertiesSymbolFields.Value, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/PropertyTuple.cs b/src/WixToolset.Data/Tuples/PropertyTuple.cs
index e6a5ceae..b93d962a 100644
--- a/src/WixToolset.Data/Tuples/PropertyTuple.cs
+++ b/src/WixToolset.Data/Tuples/PropertyTuple.cs
@@ -2,43 +2,43 @@
 
 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 Property = new IntermediateTupleDefinition(
-            TupleDefinitionType.Property,
+        public static readonly IntermediateSymbolDefinition Property = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.Property,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(PropertyTupleFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PropertySymbolFields.Value), IntermediateFieldType.String),
             },
-            typeof(PropertyTuple));
+            typeof(PropertySymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum PropertyTupleFields
+    public enum PropertySymbolFields
     {
         Value,
     }
 
-    public class PropertyTuple : IntermediateTuple
+    public class PropertySymbol : IntermediateSymbol
     {
-        public PropertyTuple() : base(TupleDefinitions.Property, null, null)
+        public PropertySymbol() : base(SymbolDefinitions.Property, null, null)
         {
         }
 
-        public PropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Property, sourceLineNumber, id)
+        public PropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Property, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[PropertyTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[PropertySymbolFields index] => this.Fields[(int)index];
 
         public string Value
         {
-            get => (string)this.Fields[(int)PropertyTupleFields.Value];
-            set => this.Set((int)PropertyTupleFields.Value, value);
+            get => (string)this.Fields[(int)PropertySymbolFields.Value];
+            set => this.Set((int)PropertySymbolFields.Value, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ProvidesDependencyTuple.cs b/src/WixToolset.Data/Tuples/ProvidesDependencyTuple.cs
index a6337bdf..8d8cb02b 100644
--- a/src/WixToolset.Data/Tuples/ProvidesDependencyTuple.cs
+++ b/src/WixToolset.Data/Tuples/ProvidesDependencyTuple.cs
@@ -2,28 +2,28 @@
 
 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 ProvidesDependency = new IntermediateTupleDefinition(
-            TupleDefinitionType.ProvidesDependency,
+        public static readonly IntermediateSymbolDefinition ProvidesDependency = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.ProvidesDependency,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ProvidesDependencyTupleFields.PackageRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ProvidesDependencyTupleFields.Key), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ProvidesDependencyTupleFields.Version), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ProvidesDependencyTupleFields.DisplayName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ProvidesDependencyTupleFields.Attributes), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ProvidesDependencyTupleFields.Imported), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ProvidesDependencySymbolFields.PackageRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ProvidesDependencySymbolFields.Key), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ProvidesDependencySymbolFields.Version), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ProvidesDependencySymbolFields.DisplayName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ProvidesDependencySymbolFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ProvidesDependencySymbolFields.Imported), IntermediateFieldType.Bool),
             },
-            typeof(ProvidesDependencyTuple));
+            typeof(ProvidesDependencySymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ProvidesDependencyTupleFields
+    public enum ProvidesDependencySymbolFields
     {
         PackageRef,
         Key,
@@ -33,52 +33,52 @@ namespace WixToolset.Data.Tuples
         Imported,
     }
 
-    public class ProvidesDependencyTuple : IntermediateTuple
+    public class ProvidesDependencySymbol : IntermediateSymbol
     {
-        public ProvidesDependencyTuple() : base(TupleDefinitions.ProvidesDependency, null, null)
+        public ProvidesDependencySymbol() : base(SymbolDefinitions.ProvidesDependency, null, null)
         {
         }
 
-        public ProvidesDependencyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ProvidesDependency, sourceLineNumber, id)
+        public ProvidesDependencySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ProvidesDependency, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ProvidesDependencyTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ProvidesDependencySymbolFields index] => this.Fields[(int)index];
 
         public string PackageRef
         {
-            get => (string)this.Fields[(int)ProvidesDependencyTupleFields.PackageRef];
-            set => this.Set((int)ProvidesDependencyTupleFields.PackageRef, value);
+            get => (string)this.Fields[(int)ProvidesDependencySymbolFields.PackageRef];
+            set => this.Set((int)ProvidesDependencySymbolFields.PackageRef, value);
         }
 
         public string Key
         {
-            get => (string)this.Fields[(int)ProvidesDependencyTupleFields.Key];
-            set => this.Set((int)ProvidesDependencyTupleFields.Key, value);
+            get => (string)this.Fields[(int)ProvidesDependencySymbolFields.Key];
+            set => this.Set((int)ProvidesDependencySymbolFields.Key, value);
         }
 
         public string Version
         {
-            get => (string)this.Fields[(int)ProvidesDependencyTupleFields.Version];
-            set => this.Set((int)ProvidesDependencyTupleFields.Version, value);
+            get => (string)this.Fields[(int)ProvidesDependencySymbolFields.Version];
+            set => this.Set((int)ProvidesDependencySymbolFields.Version, value);
         }
 
         public string DisplayName
         {
-            get => (string)this.Fields[(int)ProvidesDependencyTupleFields.DisplayName];
-            set => this.Set((int)ProvidesDependencyTupleFields.DisplayName, value);
+            get => (string)this.Fields[(int)ProvidesDependencySymbolFields.DisplayName];
+            set => this.Set((int)ProvidesDependencySymbolFields.DisplayName, value);
         }
 
         public int? Attributes
         {
-            get => (int?)this.Fields[(int)ProvidesDependencyTupleFields.Attributes];
-            set => this.Set((int)ProvidesDependencyTupleFields.Attributes, value);
+            get => (int?)this.Fields[(int)ProvidesDependencySymbolFields.Attributes];
+            set => this.Set((int)ProvidesDependencySymbolFields.Attributes, value);
         }
 
         public bool Imported
         {
-            get => (bool)this.Fields[(int)ProvidesDependencyTupleFields.Imported];
-            set => this.Set((int)ProvidesDependencyTupleFields.Imported, value);
+            get => (bool)this.Fields[(int)ProvidesDependencySymbolFields.Imported];
+            set => this.Set((int)ProvidesDependencySymbolFields.Imported, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/PublishComponentTuple.cs b/src/WixToolset.Data/Tuples/PublishComponentTuple.cs
index 502988a3..3fb81801 100644
--- a/src/WixToolset.Data/Tuples/PublishComponentTuple.cs
+++ b/src/WixToolset.Data/Tuples/PublishComponentTuple.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 PublishComponent = new IntermediateTupleDefinition(
-            TupleDefinitionType.PublishComponent,
+        public static readonly IntermediateSymbolDefinition PublishComponent = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.PublishComponent,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(PublishComponentTupleFields.ComponentId), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(PublishComponentTupleFields.Qualifier), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(PublishComponentTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(PublishComponentTupleFields.AppData), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(PublishComponentTupleFields.FeatureRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PublishComponentSymbolFields.ComponentId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PublishComponentSymbolFields.Qualifier), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PublishComponentSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PublishComponentSymbolFields.AppData), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(PublishComponentSymbolFields.FeatureRef), IntermediateFieldType.String),
             },
-            typeof(PublishComponentTuple));
+            typeof(PublishComponentSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum PublishComponentTupleFields
+    public enum PublishComponentSymbolFields
     {
         ComponentId,
         Qualifier,
@@ -31,46 +31,46 @@ namespace WixToolset.Data.Tuples
         FeatureRef,
     }
 
-    public class PublishComponentTuple : IntermediateTuple
+    public class PublishComponentSymbol : IntermediateSymbol
     {
-        public PublishComponentTuple() : base(TupleDefinitions.PublishComponent, null, null)
+        public PublishComponentSymbol() : base(SymbolDefinitions.PublishComponent, null, null)
         {
         }
 
-        public PublishComponentTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.PublishComponent, sourceLineNumber, id)
+        public PublishComponentSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.PublishComponent, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[PublishComponentTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[PublishComponentSymbolFields index] => this.Fields[(int)index];
 
         public string ComponentId
         {
-            get => (string)this.Fields[(int)PublishComponentTupleFields.ComponentId];
-            set => this.Set((int)PublishComponentTupleFields.ComponentId, value);
+            get => (string)this.Fields[(int)PublishComponentSymbolFields.ComponentId];
+            set => this.Set((int)PublishComponentSymbolFields.ComponentId, value);
         }
 
         public string Qualifier
         {
-            get => (string)this.Fields[(int)PublishComponentTupleFields.Qualifier];
-            set => this.Set((int)PublishComponentTupleFields.Qualifier, value);
+            get => (string)this.Fields[(int)PublishComponentSymbolFields.Qualifier];
+            set => this.Set((int)PublishComponentSymbolFields.Qualifier, value);
         }
 
         public string ComponentRef
         {
-            get => (string)this.Fields[(int)PublishComponentTupleFields.ComponentRef];
-            set => this.Set((int)PublishComponentTupleFields.ComponentRef, value);
+            get => (string)this.Fields[(int)PublishComponentSymbolFields.ComponentRef];
+            set => this.Set((int)PublishComponentSymbolFields.ComponentRef, value);
         }
 
         public string AppData
         {
-            get => (string)this.Fields[(int)PublishComponentTupleFields.AppData];
-            set => this.Set((int)PublishComponentTupleFields.AppData, value);
+            get => (string)this.Fields[(int)PublishComponentSymbolFields.AppData];
+            set => this.Set((int)PublishComponentSymbolFields.AppData, value);
         }
 
         public string FeatureRef
         {
-            get => (string)this.Fields[(int)PublishComponentTupleFields.FeatureRef];
-            set => this.Set((int)PublishComponentTupleFields.FeatureRef, value);
+            get => (string)this.Fields[(int)PublishComponentSymbolFields.FeatureRef];
+            set => this.Set((int)PublishComponentSymbolFields.FeatureRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/RadioButtonTuple.cs b/src/WixToolset.Data/Tuples/RadioButtonTuple.cs
index 2fea402a..6a26e937 100644
--- a/src/WixToolset.Data/Tuples/RadioButtonTuple.cs
+++ b/src/WixToolset.Data/Tuples/RadioButtonTuple.cs
@@ -2,31 +2,31 @@
 
 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 RadioButton = new IntermediateTupleDefinition(
-            TupleDefinitionType.RadioButton,
+        public static readonly IntermediateSymbolDefinition RadioButton = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.RadioButton,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(RadioButtonTupleFields.Property), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(RadioButtonTupleFields.Order), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(RadioButtonTupleFields.Value), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(RadioButtonTupleFields.X), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(RadioButtonTupleFields.Y), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(RadioButtonTupleFields.Width), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(RadioButtonTupleFields.Height), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(RadioButtonTupleFields.Text), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(RadioButtonTupleFields.Help), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RadioButtonSymbolFields.Property), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RadioButtonSymbolFields.Order), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(RadioButtonSymbolFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RadioButtonSymbolFields.X), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(RadioButtonSymbolFields.Y), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(RadioButtonSymbolFields.Width), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(RadioButtonSymbolFields.Height), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(RadioButtonSymbolFields.Text), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RadioButtonSymbolFields.Help), IntermediateFieldType.String),
             },
-            typeof(RadioButtonTuple));
+            typeof(RadioButtonSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum RadioButtonTupleFields
+    public enum RadioButtonSymbolFields
     {
         Property,
         Order,
@@ -39,70 +39,70 @@ namespace WixToolset.Data.Tuples
         Help,
     }
 
-    public class RadioButtonTuple : IntermediateTuple
+    public class RadioButtonSymbol : IntermediateSymbol
     {
-        public RadioButtonTuple() : base(TupleDefinitions.RadioButton, null, null)
+        public RadioButtonSymbol() : base(SymbolDefinitions.RadioButton, null, null)
         {
         }
 
-        public RadioButtonTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.RadioButton, sourceLineNumber, id)
+        public RadioButtonSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.RadioButton, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[RadioButtonTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[RadioButtonSymbolFields index] => this.Fields[(int)index];
 
         public string Property
         {
-            get => (string)this.Fields[(int)RadioButtonTupleFields.Property];
-            set => this.Set((int)RadioButtonTupleFields.Property, value);
+            get => (string)this.Fields[(int)RadioButtonSymbolFields.Property];
+            set => this.Set((int)RadioButtonSymbolFields.Property, value);
         }
 
         public int Order
         {
-            get => (int)this.Fields[(int)RadioButtonTupleFields.Order];
-            set => this.Set((int)RadioButtonTupleFields.Order, value);
+            get => (int)this.Fields[(int)RadioButtonSymbolFields.Order];
+            set => this.Set((int)RadioButtonSymbolFields.Order, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)RadioButtonTupleFields.Value];
-            set => this.Set((int)RadioButtonTupleFields.Value, value);
+            get => (string)this.Fields[(int)RadioButtonSymbolFields.Value];
+            set => this.Set((int)RadioButtonSymbolFields.Value, value);
         }
 
         public int X
         {
-            get => (int)this.Fields[(int)RadioButtonTupleFields.X];
-            set => this.Set((int)RadioButtonTupleFields.X, value);
+            get => (int)this.Fields[(int)RadioButtonSymbolFields.X];
+            set => this.Set((int)RadioButtonSymbolFields.X, value);
         }
 
         public int Y
         {
-            get => (int)this.Fields[(int)RadioButtonTupleFields.Y];
-            set => this.Set((int)RadioButtonTupleFields.Y, value);
+            get => (int)this.Fields[(int)RadioButtonSymbolFields.Y];
+            set => this.Set((int)RadioButtonSymbolFields.Y, value);
         }
 
         public int Width
         {
-            get => (int)this.Fields[(int)RadioButtonTupleFields.Width];
-            set => this.Set((int)RadioButtonTupleFields.Width, value);
+            get => (int)this.Fields[(int)RadioButtonSymbolFields.Width];
+            set => this.Set((int)RadioButtonSymbolFields.Width, value);
         }
 
         public int Height
         {
-            get => (int)this.Fields[(int)RadioButtonTupleFields.Height];
-            set => this.Set((int)RadioButtonTupleFields.Height, value);
+            get => (int)this.Fields[(int)RadioButtonSymbolFields.Height];
+            set => this.Set((int)RadioButtonSymbolFields.Height, value);
         }
 
         public string Text
         {
-            get => (string)this.Fields[(int)RadioButtonTupleFields.Text];
-            set => this.Set((int)RadioButtonTupleFields.Text, value);
+            get => (string)this.Fields[(int)RadioButtonSymbolFields.Text];
+            set => this.Set((int)RadioButtonSymbolFields.Text, value);
         }
 
         public string Help
         {
-            get => (string)this.Fields[(int)RadioButtonTupleFields.Help];
-            set => this.Set((int)RadioButtonTupleFields.Help, value);
+            get => (string)this.Fields[(int)RadioButtonSymbolFields.Help];
+            set => this.Set((int)RadioButtonSymbolFields.Help, value);
         }
     }
 }
\ No newline at end of file
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);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/RegistryRootType.cs b/src/WixToolset.Data/Tuples/RegistryRootType.cs
index b037ca63..9f60727c 100644
--- a/src/WixToolset.Data/Tuples/RegistryRootType.cs
+++ b/src/WixToolset.Data/Tuples/RegistryRootType.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
     using System;
 
diff --git a/src/WixToolset.Data/Tuples/RegistryTuple.cs b/src/WixToolset.Data/Tuples/RegistryTuple.cs
index 152d1341..371bfe98 100644
--- a/src/WixToolset.Data/Tuples/RegistryTuple.cs
+++ b/src/WixToolset.Data/Tuples/RegistryTuple.cs
@@ -2,29 +2,29 @@
 
 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 Registry = new IntermediateTupleDefinition(
-            TupleDefinitionType.Registry,
+        public static readonly IntermediateSymbolDefinition Registry = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.Registry,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(RegistryTupleFields.Root), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(RegistryTupleFields.Key), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(RegistryTupleFields.Name), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(RegistryTupleFields.Value), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(RegistryTupleFields.ValueType), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(RegistryTupleFields.ValueAction), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(RegistryTupleFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RegistrySymbolFields.Root), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(RegistrySymbolFields.Key), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RegistrySymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RegistrySymbolFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RegistrySymbolFields.ValueType), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(RegistrySymbolFields.ValueAction), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(RegistrySymbolFields.ComponentRef), IntermediateFieldType.String),
             },
-            typeof(RegistryTuple));
+            typeof(RegistrySymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum RegistryTupleFields
+    public enum RegistrySymbolFields
     {
         Root,
         Key,
@@ -51,58 +51,58 @@ namespace WixToolset.Data.Tuples
         Prepend,
     }
 
-    public class RegistryTuple : IntermediateTuple
+    public class RegistrySymbol : IntermediateSymbol
     {
-        public RegistryTuple() : base(TupleDefinitions.Registry, null, null)
+        public RegistrySymbol() : base(SymbolDefinitions.Registry, null, null)
         {
         }
 
-        public RegistryTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Registry, sourceLineNumber, id)
+        public RegistrySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Registry, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[RegistryTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[RegistrySymbolFields index] => this.Fields[(int)index];
 
         public RegistryRootType Root
         {
-            get => (RegistryRootType)this.Fields[(int)RegistryTupleFields.Root].AsNumber();
-            set => this.Set((int)RegistryTupleFields.Root, (int)value);
+            get => (RegistryRootType)this.Fields[(int)RegistrySymbolFields.Root].AsNumber();
+            set => this.Set((int)RegistrySymbolFields.Root, (int)value);
         }
 
         public string Key
         {
-            get => (string)this.Fields[(int)RegistryTupleFields.Key];
-            set => this.Set((int)RegistryTupleFields.Key, value);
+            get => (string)this.Fields[(int)RegistrySymbolFields.Key];
+            set => this.Set((int)RegistrySymbolFields.Key, value);
         }
 
         public string Name
         {
-            get => (string)this.Fields[(int)RegistryTupleFields.Name];
-            set => this.Set((int)RegistryTupleFields.Name, value);
+            get => (string)this.Fields[(int)RegistrySymbolFields.Name];
+            set => this.Set((int)RegistrySymbolFields.Name, value);
         }
 
         public string Value
         {
-            get => this.Fields[(int)RegistryTupleFields.Value].AsString();
-            set => this.Set((int)RegistryTupleFields.Value, value);
+            get => this.Fields[(int)RegistrySymbolFields.Value].AsString();
+            set => this.Set((int)RegistrySymbolFields.Value, value);
         }
 
         public RegistryValueType ValueType
         {
-            get => (RegistryValueType)this.Fields[(int)RegistryTupleFields.ValueType].AsNumber();
-            set => this.Set((int)RegistryTupleFields.ValueType, (int)value);
+            get => (RegistryValueType)this.Fields[(int)RegistrySymbolFields.ValueType].AsNumber();
+            set => this.Set((int)RegistrySymbolFields.ValueType, (int)value);
         }
 
         public RegistryValueActionType ValueAction
         {
-            get => (RegistryValueActionType)this.Fields[(int)RegistryTupleFields.ValueAction].AsNumber();
-            set => this.Set((int)RegistryTupleFields.ValueAction, (int)value);
+            get => (RegistryValueActionType)this.Fields[(int)RegistrySymbolFields.ValueAction].AsNumber();
+            set => this.Set((int)RegistrySymbolFields.ValueAction, (int)value);
         }
 
         public string ComponentRef
         {
-            get => (string)this.Fields[(int)RegistryTupleFields.ComponentRef];
-            set => this.Set((int)RegistryTupleFields.ComponentRef, value);
+            get => (string)this.Fields[(int)RegistrySymbolFields.ComponentRef];
+            set => this.Set((int)RegistrySymbolFields.ComponentRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/RemoveFileTuple.cs b/src/WixToolset.Data/Tuples/RemoveFileTuple.cs
index d0b3268a..a1791e54 100644
--- a/src/WixToolset.Data/Tuples/RemoveFileTuple.cs
+++ b/src/WixToolset.Data/Tuples/RemoveFileTuple.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 RemoveFile = new IntermediateTupleDefinition(
-            TupleDefinitionType.RemoveFile,
+        public static readonly IntermediateSymbolDefinition RemoveFile = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.RemoveFile,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.FileName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.DirProperty), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.OnInstall), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(RemoveFileTupleFields.OnUninstall), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(RemoveFileSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RemoveFileSymbolFields.FileName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RemoveFileSymbolFields.DirProperty), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RemoveFileSymbolFields.OnInstall), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(RemoveFileSymbolFields.OnUninstall), IntermediateFieldType.Bool),
             },
-            typeof(RemoveFileTuple));
+            typeof(RemoveFileSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum RemoveFileTupleFields
+    public enum RemoveFileSymbolFields
     {
         ComponentRef,
         FileName,
@@ -31,46 +31,46 @@ namespace WixToolset.Data.Tuples
         OnUninstall,
     }
 
-    public class RemoveFileTuple : IntermediateTuple
+    public class RemoveFileSymbol : IntermediateSymbol
     {
-        public RemoveFileTuple() : base(TupleDefinitions.RemoveFile, null, null)
+        public RemoveFileSymbol() : base(SymbolDefinitions.RemoveFile, null, null)
         {
         }
 
-        public RemoveFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.RemoveFile, sourceLineNumber, id)
+        public RemoveFileSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.RemoveFile, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[RemoveFileTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[RemoveFileSymbolFields index] => this.Fields[(int)index];
 
         public string ComponentRef
         {
-            get => (string)this.Fields[(int)RemoveFileTupleFields.ComponentRef];
-            set => this.Set((int)RemoveFileTupleFields.ComponentRef, value);
+            get => (string)this.Fields[(int)RemoveFileSymbolFields.ComponentRef];
+            set => this.Set((int)RemoveFileSymbolFields.ComponentRef, value);
         }
 
         public string FileName
         {
-            get => (string)this.Fields[(int)RemoveFileTupleFields.FileName];
-            set => this.Set((int)RemoveFileTupleFields.FileName, value);
+            get => (string)this.Fields[(int)RemoveFileSymbolFields.FileName];
+            set => this.Set((int)RemoveFileSymbolFields.FileName, value);
         }
 
         public string DirProperty
         {
-            get => (string)this.Fields[(int)RemoveFileTupleFields.DirProperty];
-            set => this.Set((int)RemoveFileTupleFields.DirProperty, value);
+            get => (string)this.Fields[(int)RemoveFileSymbolFields.DirProperty];
+            set => this.Set((int)RemoveFileSymbolFields.DirProperty, value);
         }
 
         public bool? OnInstall
         {
-            get => (bool?)this.Fields[(int)RemoveFileTupleFields.OnInstall];
-            set => this.Set((int)RemoveFileTupleFields.OnInstall, value);
+            get => (bool?)this.Fields[(int)RemoveFileSymbolFields.OnInstall];
+            set => this.Set((int)RemoveFileSymbolFields.OnInstall, value);
         }
 
         public bool? OnUninstall
         {
-            get => (bool?)this.Fields[(int)RemoveFileTupleFields.OnUninstall];
-            set => this.Set((int)RemoveFileTupleFields.OnUninstall, value);
+            get => (bool?)this.Fields[(int)RemoveFileSymbolFields.OnUninstall];
+            set => this.Set((int)RemoveFileSymbolFields.OnUninstall, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/RemoveRegistryTuple.cs b/src/WixToolset.Data/Tuples/RemoveRegistryTuple.cs
index f4ec17bf..a797cd33 100644
--- a/src/WixToolset.Data/Tuples/RemoveRegistryTuple.cs
+++ b/src/WixToolset.Data/Tuples/RemoveRegistryTuple.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 RemoveRegistry = new IntermediateTupleDefinition(
-            TupleDefinitionType.RemoveRegistry,
+        public static readonly IntermediateSymbolDefinition RemoveRegistry = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.RemoveRegistry,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.Root), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.Key), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.Name), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.Action), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(RemoveRegistryTupleFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RemoveRegistrySymbolFields.Root), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(RemoveRegistrySymbolFields.Key), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RemoveRegistrySymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(RemoveRegistrySymbolFields.Action), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(RemoveRegistrySymbolFields.ComponentRef), IntermediateFieldType.String),
             },
-            typeof(RemoveRegistryTuple));
+            typeof(RemoveRegistrySymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum RemoveRegistryTupleFields
+    public enum RemoveRegistrySymbolFields
     {
         Root,
         Key,
@@ -37,46 +37,46 @@ namespace WixToolset.Data.Tuples
         RemoveOnUninstall
     };
 
-    public class RemoveRegistryTuple : IntermediateTuple
+    public class RemoveRegistrySymbol : IntermediateSymbol
     {
-        public RemoveRegistryTuple() : base(TupleDefinitions.RemoveRegistry, null, null)
+        public RemoveRegistrySymbol() : base(SymbolDefinitions.RemoveRegistry, null, null)
         {
         }
 
-        public RemoveRegistryTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.RemoveRegistry, sourceLineNumber, id)
+        public RemoveRegistrySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.RemoveRegistry, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[RemoveRegistryTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[RemoveRegistrySymbolFields index] => this.Fields[(int)index];
 
         public RegistryRootType Root
         {
-            get => (RegistryRootType)this.Fields[(int)RemoveRegistryTupleFields.Root].AsNumber();
-            set => this.Set((int)RemoveRegistryTupleFields.Root, (int)value);
+            get => (RegistryRootType)this.Fields[(int)RemoveRegistrySymbolFields.Root].AsNumber();
+            set => this.Set((int)RemoveRegistrySymbolFields.Root, (int)value);
         }
 
         public string Key
         {
-            get => (string)this.Fields[(int)RemoveRegistryTupleFields.Key];
-            set => this.Set((int)RemoveRegistryTupleFields.Key, value);
+            get => (string)this.Fields[(int)RemoveRegistrySymbolFields.Key];
+            set => this.Set((int)RemoveRegistrySymbolFields.Key, value);
         }
 
         public string Name
         {
-            get => (string)this.Fields[(int)RemoveRegistryTupleFields.Name];
-            set => this.Set((int)RemoveRegistryTupleFields.Name, value);
+            get => (string)this.Fields[(int)RemoveRegistrySymbolFields.Name];
+            set => this.Set((int)RemoveRegistrySymbolFields.Name, value);
         }
 
         public RemoveRegistryActionType Action
         {
-            get => (RemoveRegistryActionType)this.Fields[(int)RemoveRegistryTupleFields.Action].AsNumber();
-            set => this.Set((int)RemoveRegistryTupleFields.Action, (int)value);
+            get => (RemoveRegistryActionType)this.Fields[(int)RemoveRegistrySymbolFields.Action].AsNumber();
+            set => this.Set((int)RemoveRegistrySymbolFields.Action, (int)value);
         }
 
         public string ComponentRef
         {
-            get => (string)this.Fields[(int)RemoveRegistryTupleFields.ComponentRef];
-            set => this.Set((int)RemoveRegistryTupleFields.ComponentRef, value);
+            get => (string)this.Fields[(int)RemoveRegistrySymbolFields.ComponentRef];
+            set => this.Set((int)RemoveRegistrySymbolFields.ComponentRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ReserveCostTuple.cs b/src/WixToolset.Data/Tuples/ReserveCostTuple.cs
index dbbedb2e..b59dea2f 100644
--- a/src/WixToolset.Data/Tuples/ReserveCostTuple.cs
+++ b/src/WixToolset.Data/Tuples/ReserveCostTuple.cs
@@ -2,26 +2,26 @@
 
 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 ReserveCost = new IntermediateTupleDefinition(
-            TupleDefinitionType.ReserveCost,
+        public static readonly IntermediateSymbolDefinition ReserveCost = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.ReserveCost,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ReserveCostTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ReserveCostTupleFields.ReserveFolder), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ReserveCostTupleFields.ReserveLocal), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ReserveCostTupleFields.ReserveSource), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ReserveCostSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ReserveCostSymbolFields.ReserveFolder), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ReserveCostSymbolFields.ReserveLocal), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ReserveCostSymbolFields.ReserveSource), IntermediateFieldType.Number),
             },
-            typeof(ReserveCostTuple));
+            typeof(ReserveCostSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ReserveCostTupleFields
+    public enum ReserveCostSymbolFields
     {
         ComponentRef,
         ReserveFolder,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
         ReserveSource,
     }
 
-    public class ReserveCostTuple : IntermediateTuple
+    public class ReserveCostSymbol : IntermediateSymbol
     {
-        public ReserveCostTuple() : base(TupleDefinitions.ReserveCost, null, null)
+        public ReserveCostSymbol() : base(SymbolDefinitions.ReserveCost, null, null)
         {
         }
 
-        public ReserveCostTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ReserveCost, sourceLineNumber, id)
+        public ReserveCostSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ReserveCost, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ReserveCostTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ReserveCostSymbolFields index] => this.Fields[(int)index];
 
         public string ComponentRef
         {
-            get => (string)this.Fields[(int)ReserveCostTupleFields.ComponentRef];
-            set => this.Set((int)ReserveCostTupleFields.ComponentRef, value);
+            get => (string)this.Fields[(int)ReserveCostSymbolFields.ComponentRef];
+            set => this.Set((int)ReserveCostSymbolFields.ComponentRef, value);
         }
 
         public string ReserveFolder
         {
-            get => (string)this.Fields[(int)ReserveCostTupleFields.ReserveFolder];
-            set => this.Set((int)ReserveCostTupleFields.ReserveFolder, value);
+            get => (string)this.Fields[(int)ReserveCostSymbolFields.ReserveFolder];
+            set => this.Set((int)ReserveCostSymbolFields.ReserveFolder, value);
         }
 
         public int ReserveLocal
         {
-            get => (int)this.Fields[(int)ReserveCostTupleFields.ReserveLocal];
-            set => this.Set((int)ReserveCostTupleFields.ReserveLocal, value);
+            get => (int)this.Fields[(int)ReserveCostSymbolFields.ReserveLocal];
+            set => this.Set((int)ReserveCostSymbolFields.ReserveLocal, value);
         }
 
         public int ReserveSource
         {
-            get => (int)this.Fields[(int)ReserveCostTupleFields.ReserveSource];
-            set => this.Set((int)ReserveCostTupleFields.ReserveSource, value);
+            get => (int)this.Fields[(int)ReserveCostSymbolFields.ReserveSource];
+            set => this.Set((int)ReserveCostSymbolFields.ReserveSource, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/SFPCatalogTuple.cs b/src/WixToolset.Data/Tuples/SFPCatalogTuple.cs
index e80b5cf5..0d3f1558 100644
--- a/src/WixToolset.Data/Tuples/SFPCatalogTuple.cs
+++ b/src/WixToolset.Data/Tuples/SFPCatalogTuple.cs
@@ -2,59 +2,59 @@
 
 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 SFPCatalog = new IntermediateTupleDefinition(
-            TupleDefinitionType.SFPCatalog,
+        public static readonly IntermediateSymbolDefinition SFPCatalog = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.SFPCatalog,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(SFPCatalogTupleFields.SFPCatalog), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(SFPCatalogTupleFields.Catalog), IntermediateFieldType.Path),
-                new IntermediateFieldDefinition(nameof(SFPCatalogTupleFields.Dependency), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(SFPCatalogSymbolFields.SFPCatalog), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(SFPCatalogSymbolFields.Catalog), IntermediateFieldType.Path),
+                new IntermediateFieldDefinition(nameof(SFPCatalogSymbolFields.Dependency), IntermediateFieldType.String),
             },
-            typeof(SFPCatalogTuple));
+            typeof(SFPCatalogSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum SFPCatalogTupleFields
+    public enum SFPCatalogSymbolFields
     {
         SFPCatalog,
         Catalog,
         Dependency,
     }
 
-    public class SFPCatalogTuple : IntermediateTuple
+    public class SFPCatalogSymbol : IntermediateSymbol
     {
-        public SFPCatalogTuple() : base(TupleDefinitions.SFPCatalog, null, null)
+        public SFPCatalogSymbol() : base(SymbolDefinitions.SFPCatalog, null, null)
         {
         }
 
-        public SFPCatalogTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.SFPCatalog, sourceLineNumber, id)
+        public SFPCatalogSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.SFPCatalog, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[SFPCatalogTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[SFPCatalogSymbolFields index] => this.Fields[(int)index];
 
         public string SFPCatalog
         {
-            get => (string)this.Fields[(int)SFPCatalogTupleFields.SFPCatalog];
-            set => this.Set((int)SFPCatalogTupleFields.SFPCatalog, value);
+            get => (string)this.Fields[(int)SFPCatalogSymbolFields.SFPCatalog];
+            set => this.Set((int)SFPCatalogSymbolFields.SFPCatalog, value);
         }
 
         public string Catalog
         {
-            get => (string)this.Fields[(int)SFPCatalogTupleFields.Catalog];
-            set => this.Set((int)SFPCatalogTupleFields.Catalog, value);
+            get => (string)this.Fields[(int)SFPCatalogSymbolFields.Catalog];
+            set => this.Set((int)SFPCatalogSymbolFields.Catalog, value);
         }
 
         public string Dependency
         {
-            get => (string)this.Fields[(int)SFPCatalogTupleFields.Dependency];
-            set => this.Set((int)SFPCatalogTupleFields.Dependency, value);
+            get => (string)this.Fields[(int)SFPCatalogSymbolFields.Dependency];
+            set => this.Set((int)SFPCatalogSymbolFields.Dependency, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ServiceControlTuple.cs b/src/WixToolset.Data/Tuples/ServiceControlTuple.cs
index e34de0df..6e129681 100644
--- a/src/WixToolset.Data/Tuples/ServiceControlTuple.cs
+++ b/src/WixToolset.Data/Tuples/ServiceControlTuple.cs
@@ -2,32 +2,32 @@
 
 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 ServiceControl = new IntermediateTupleDefinition(
-            TupleDefinitionType.ServiceControl,
+        public static readonly IntermediateSymbolDefinition ServiceControl = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.ServiceControl,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.Name), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.InstallRemove), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.UninstallRemove), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.InstallStart), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.UninstallStart), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.InstallStop), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.UninstallStop), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.Arguments), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.Wait), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(ServiceControlTupleFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceControlSymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceControlSymbolFields.InstallRemove), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ServiceControlSymbolFields.UninstallRemove), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ServiceControlSymbolFields.InstallStart), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ServiceControlSymbolFields.UninstallStart), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ServiceControlSymbolFields.InstallStop), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ServiceControlSymbolFields.UninstallStop), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ServiceControlSymbolFields.Arguments), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceControlSymbolFields.Wait), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ServiceControlSymbolFields.ComponentRef), IntermediateFieldType.String),
             },
-            typeof(ServiceControlTuple));
+            typeof(ServiceControlSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ServiceControlTupleFields
+    public enum ServiceControlSymbolFields
     {
         Name,
         InstallRemove,
@@ -41,76 +41,76 @@ namespace WixToolset.Data.Tuples
         ComponentRef,
     }
 
-    public class ServiceControlTuple : IntermediateTuple
+    public class ServiceControlSymbol : IntermediateSymbol
     {
-        public ServiceControlTuple() : base(TupleDefinitions.ServiceControl, null, null)
+        public ServiceControlSymbol() : base(SymbolDefinitions.ServiceControl, null, null)
         {
         }
 
-        public ServiceControlTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ServiceControl, sourceLineNumber, id)
+        public ServiceControlSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ServiceControl, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ServiceControlTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ServiceControlSymbolFields index] => this.Fields[(int)index];
 
         public string Name
         {
-            get => (string)this.Fields[(int)ServiceControlTupleFields.Name];
-            set => this.Set((int)ServiceControlTupleFields.Name, value);
+            get => (string)this.Fields[(int)ServiceControlSymbolFields.Name];
+            set => this.Set((int)ServiceControlSymbolFields.Name, value);
         }
 
         public bool InstallRemove
         {
-            get => this.Fields[(int)ServiceControlTupleFields.InstallRemove].AsBool();
-            set => this.Set((int)ServiceControlTupleFields.InstallRemove, value);
+            get => this.Fields[(int)ServiceControlSymbolFields.InstallRemove].AsBool();
+            set => this.Set((int)ServiceControlSymbolFields.InstallRemove, value);
         }
 
         public bool UninstallRemove
         {
-            get => this.Fields[(int)ServiceControlTupleFields.UninstallRemove].AsBool();
-            set => this.Set((int)ServiceControlTupleFields.UninstallRemove, value);
+            get => this.Fields[(int)ServiceControlSymbolFields.UninstallRemove].AsBool();
+            set => this.Set((int)ServiceControlSymbolFields.UninstallRemove, value);
         }
 
         public bool InstallStart
         {
-            get => this.Fields[(int)ServiceControlTupleFields.InstallStart].AsBool();
-            set => this.Set((int)ServiceControlTupleFields.InstallStart, value);
+            get => this.Fields[(int)ServiceControlSymbolFields.InstallStart].AsBool();
+            set => this.Set((int)ServiceControlSymbolFields.InstallStart, value);
         }
 
         public bool UninstallStart
         {
-            get => this.Fields[(int)ServiceControlTupleFields.UninstallStart].AsBool();
-            set => this.Set((int)ServiceControlTupleFields.UninstallStart, value);
+            get => this.Fields[(int)ServiceControlSymbolFields.UninstallStart].AsBool();
+            set => this.Set((int)ServiceControlSymbolFields.UninstallStart, value);
         }
 
         public bool InstallStop
         {
-            get => this.Fields[(int)ServiceControlTupleFields.InstallStop].AsBool();
-            set => this.Set((int)ServiceControlTupleFields.InstallStop, value);
+            get => this.Fields[(int)ServiceControlSymbolFields.InstallStop].AsBool();
+            set => this.Set((int)ServiceControlSymbolFields.InstallStop, value);
         }
 
         public bool UninstallStop
         {
-            get => this.Fields[(int)ServiceControlTupleFields.UninstallStop].AsBool();
-            set => this.Set((int)ServiceControlTupleFields.UninstallStop, value);
+            get => this.Fields[(int)ServiceControlSymbolFields.UninstallStop].AsBool();
+            set => this.Set((int)ServiceControlSymbolFields.UninstallStop, value);
         }
 
         public string Arguments
         {
-            get => (string)this.Fields[(int)ServiceControlTupleFields.Arguments];
-            set => this.Set((int)ServiceControlTupleFields.Arguments, value);
+            get => (string)this.Fields[(int)ServiceControlSymbolFields.Arguments];
+            set => this.Set((int)ServiceControlSymbolFields.Arguments, value);
         }
 
         public bool? Wait
         {
-            get => this.Fields[(int)ServiceControlTupleFields.Wait].AsNullableBool();
-            set => this.Set((int)ServiceControlTupleFields.Wait, value);
+            get => this.Fields[(int)ServiceControlSymbolFields.Wait].AsNullableBool();
+            set => this.Set((int)ServiceControlSymbolFields.Wait, value);
         }
 
         public string ComponentRef
         {
-            get => (string)this.Fields[(int)ServiceControlTupleFields.ComponentRef];
-            set => this.Set((int)ServiceControlTupleFields.ComponentRef, value);
+            get => (string)this.Fields[(int)ServiceControlSymbolFields.ComponentRef];
+            set => this.Set((int)ServiceControlSymbolFields.ComponentRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ServiceInstallTuple.cs b/src/WixToolset.Data/Tuples/ServiceInstallTuple.cs
index 9bf9afd2..f7ec8dbf 100644
--- a/src/WixToolset.Data/Tuples/ServiceInstallTuple.cs
+++ b/src/WixToolset.Data/Tuples/ServiceInstallTuple.cs
@@ -2,36 +2,36 @@
 
 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 ServiceInstall = new IntermediateTupleDefinition(
-            TupleDefinitionType.ServiceInstall,
+        public static readonly IntermediateSymbolDefinition ServiceInstall = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.ServiceInstall,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Name), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.DisplayName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.ServiceType), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.StartType), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.ErrorControl), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.LoadOrderGroup), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Dependencies), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.StartName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Password), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Arguments), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Description), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Interactive), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(ServiceInstallTupleFields.Vital), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ServiceInstallSymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceInstallSymbolFields.DisplayName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceInstallSymbolFields.ServiceType), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ServiceInstallSymbolFields.StartType), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ServiceInstallSymbolFields.ErrorControl), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ServiceInstallSymbolFields.LoadOrderGroup), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceInstallSymbolFields.Dependencies), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceInstallSymbolFields.StartName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceInstallSymbolFields.Password), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceInstallSymbolFields.Arguments), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceInstallSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceInstallSymbolFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ServiceInstallSymbolFields.Interactive), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(ServiceInstallSymbolFields.Vital), IntermediateFieldType.Bool),
             },
-            typeof(ServiceInstallTuple));
+            typeof(ServiceInstallSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ServiceInstallTupleFields
+    public enum ServiceInstallSymbolFields
     {
         Name,
         DisplayName,
@@ -74,100 +74,100 @@ namespace WixToolset.Data.Tuples
         Critical = 3,
     }
 
-    public class ServiceInstallTuple : IntermediateTuple
+    public class ServiceInstallSymbol : IntermediateSymbol
     {
-        public ServiceInstallTuple() : base(TupleDefinitions.ServiceInstall, null, null)
+        public ServiceInstallSymbol() : base(SymbolDefinitions.ServiceInstall, null, null)
         {
         }
 
-        public ServiceInstallTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.ServiceInstall, sourceLineNumber, id)
+        public ServiceInstallSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.ServiceInstall, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ServiceInstallTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ServiceInstallSymbolFields index] => this.Fields[(int)index];
 
         public string Name
         {
-            get => (string)this.Fields[(int)ServiceInstallTupleFields.Name];
-            set => this.Set((int)ServiceInstallTupleFields.Name, value);
+            get => (string)this.Fields[(int)ServiceInstallSymbolFields.Name];
+            set => this.Set((int)ServiceInstallSymbolFields.Name, value);
         }
 
         public string DisplayName
         {
-            get => (string)this.Fields[(int)ServiceInstallTupleFields.DisplayName];
-            set => this.Set((int)ServiceInstallTupleFields.DisplayName, value);
+            get => (string)this.Fields[(int)ServiceInstallSymbolFields.DisplayName];
+            set => this.Set((int)ServiceInstallSymbolFields.DisplayName, value);
         }
 
         public ServiceType ServiceType
         {
-            get => (ServiceType)this.Fields[(int)ServiceInstallTupleFields.ServiceType].AsNumber();
-            set => this.Set((int)ServiceInstallTupleFields.ServiceType, (int)value);
+            get => (ServiceType)this.Fields[(int)ServiceInstallSymbolFields.ServiceType].AsNumber();
+            set => this.Set((int)ServiceInstallSymbolFields.ServiceType, (int)value);
         }
 
         public ServiceStartType StartType
         {
-            get => (ServiceStartType)this.Fields[(int)ServiceInstallTupleFields.StartType].AsNumber();
-            set => this.Set((int)ServiceInstallTupleFields.StartType, (int)value);
+            get => (ServiceStartType)this.Fields[(int)ServiceInstallSymbolFields.StartType].AsNumber();
+            set => this.Set((int)ServiceInstallSymbolFields.StartType, (int)value);
         }
 
         public ServiceErrorControl ErrorControl
         {
-            get => (ServiceErrorControl)this.Fields[(int)ServiceInstallTupleFields.ErrorControl].AsNumber();
-            set => this.Set((int)ServiceInstallTupleFields.ErrorControl, (int)value);
+            get => (ServiceErrorControl)this.Fields[(int)ServiceInstallSymbolFields.ErrorControl].AsNumber();
+            set => this.Set((int)ServiceInstallSymbolFields.ErrorControl, (int)value);
         }
 
         public string LoadOrderGroup
         {
-            get => (string)this.Fields[(int)ServiceInstallTupleFields.LoadOrderGroup];
-            set => this.Set((int)ServiceInstallTupleFields.LoadOrderGroup, value);
+            get => (string)this.Fields[(int)ServiceInstallSymbolFields.LoadOrderGroup];
+            set => this.Set((int)ServiceInstallSymbolFields.LoadOrderGroup, value);
         }
 
         public string Dependencies
         {
-            get => (string)this.Fields[(int)ServiceInstallTupleFields.Dependencies];
-            set => this.Set((int)ServiceInstallTupleFields.Dependencies, value);
+            get => (string)this.Fields[(int)ServiceInstallSymbolFields.Dependencies];
+            set => this.Set((int)ServiceInstallSymbolFields.Dependencies, value);
         }
 
         public string StartName
         {
-            get => (string)this.Fields[(int)ServiceInstallTupleFields.StartName];
-            set => this.Set((int)ServiceInstallTupleFields.StartName, value);
+            get => (string)this.Fields[(int)ServiceInstallSymbolFields.StartName];
+            set => this.Set((int)ServiceInstallSymbolFields.StartName, value);
         }
 
         public string Password
         {
-            get => (string)this.Fields[(int)ServiceInstallTupleFields.Password];
-            set => this.Set((int)ServiceInstallTupleFields.Password, value);
+            get => (string)this.Fields[(int)ServiceInstallSymbolFields.Password];
+            set => this.Set((int)ServiceInstallSymbolFields.Password, value);
         }
 
         public string Arguments
         {
-            get => (string)this.Fields[(int)ServiceInstallTupleFields.Arguments];
-            set => this.Set((int)ServiceInstallTupleFields.Arguments, value);
+            get => (string)this.Fields[(int)ServiceInstallSymbolFields.Arguments];
+            set => this.Set((int)ServiceInstallSymbolFields.Arguments, value);
         }
 
         public string ComponentRef
         {
-            get => (string)this.Fields[(int)ServiceInstallTupleFields.ComponentRef];
-            set => this.Set((int)ServiceInstallTupleFields.ComponentRef, value);
+            get => (string)this.Fields[(int)ServiceInstallSymbolFields.ComponentRef];
+            set => this.Set((int)ServiceInstallSymbolFields.ComponentRef, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)ServiceInstallTupleFields.Description];
-            set => this.Set((int)ServiceInstallTupleFields.Description, value);
+            get => (string)this.Fields[(int)ServiceInstallSymbolFields.Description];
+            set => this.Set((int)ServiceInstallSymbolFields.Description, value);
         }
 
         public bool Interactive
         {
-            get => this.Fields[(int)ServiceInstallTupleFields.Interactive].AsBool();
-            set => this.Set((int)ServiceInstallTupleFields.Interactive, value);
+            get => this.Fields[(int)ServiceInstallSymbolFields.Interactive].AsBool();
+            set => this.Set((int)ServiceInstallSymbolFields.Interactive, value);
         }
 
         public bool Vital
         {
-            get => this.Fields[(int)ServiceInstallTupleFields.Vital].AsBool();
-            set => this.Set((int)ServiceInstallTupleFields.Vital, value);
+            get => this.Fields[(int)ServiceInstallSymbolFields.Vital].AsBool();
+            set => this.Set((int)ServiceInstallSymbolFields.Vital, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/ShortcutTuple.cs b/src/WixToolset.Data/Tuples/ShortcutTuple.cs
index 66b98287..f32fe4af 100644
--- a/src/WixToolset.Data/Tuples/ShortcutTuple.cs
+++ b/src/WixToolset.Data/Tuples/ShortcutTuple.cs
@@ -2,38 +2,38 @@
 
 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 Shortcut = new IntermediateTupleDefinition(
-            TupleDefinitionType.Shortcut,
+        public static readonly IntermediateSymbolDefinition Shortcut = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.Shortcut,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.DirectoryRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Name), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.ShortName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Target), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Arguments), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Description), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Hotkey), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.IconRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.IconIndex), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.Show), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.WkDir), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.DisplayResourceDLL), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.DisplayResourceId), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.DescriptionResourceDLL), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(ShortcutTupleFields.DescriptionResourceId), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.DirectoryRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.ShortName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.Target), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.Arguments), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.Hotkey), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.IconRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.IconIndex), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.Show), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.WkDir), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.DisplayResourceDLL), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.DisplayResourceId), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.DescriptionResourceDLL), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ShortcutSymbolFields.DescriptionResourceId), IntermediateFieldType.Number),
             },
-            typeof(ShortcutTuple));
+            typeof(ShortcutSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum ShortcutTupleFields
+    public enum ShortcutSymbolFields
     {
         DirectoryRef,
         Name,
@@ -60,112 +60,112 @@ namespace WixToolset.Data.Tuples
         Minimized = 7
     }
 
-    public class ShortcutTuple : IntermediateTuple
+    public class ShortcutSymbol : IntermediateSymbol
     {
-        public ShortcutTuple() : base(TupleDefinitions.Shortcut, null, null)
+        public ShortcutSymbol() : base(SymbolDefinitions.Shortcut, null, null)
         {
         }
 
-        public ShortcutTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Shortcut, sourceLineNumber, id)
+        public ShortcutSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Shortcut, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ShortcutTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ShortcutSymbolFields index] => this.Fields[(int)index];
 
         public string DirectoryRef
         {
-            get => (string)this.Fields[(int)ShortcutTupleFields.DirectoryRef];
-            set => this.Set((int)ShortcutTupleFields.DirectoryRef, value);
+            get => (string)this.Fields[(int)ShortcutSymbolFields.DirectoryRef];
+            set => this.Set((int)ShortcutSymbolFields.DirectoryRef, value);
         }
 
         public string Name
         {
-            get => (string)this.Fields[(int)ShortcutTupleFields.Name];
-            set => this.Set((int)ShortcutTupleFields.Name, value);
+            get => (string)this.Fields[(int)ShortcutSymbolFields.Name];
+            set => this.Set((int)ShortcutSymbolFields.Name, value);
         }
 
         public string ShortName
         {
-            get => (string)this.Fields[(int)ShortcutTupleFields.ShortName];
-            set => this.Set((int)ShortcutTupleFields.ShortName, value);
+            get => (string)this.Fields[(int)ShortcutSymbolFields.ShortName];
+            set => this.Set((int)ShortcutSymbolFields.ShortName, value);
         }
 
         public string ComponentRef
         {
-            get => (string)this.Fields[(int)ShortcutTupleFields.ComponentRef];
-            set => this.Set((int)ShortcutTupleFields.ComponentRef, value);
+            get => (string)this.Fields[(int)ShortcutSymbolFields.ComponentRef];
+            set => this.Set((int)ShortcutSymbolFields.ComponentRef, value);
         }
 
         public string Target
         {
-            get => (string)this.Fields[(int)ShortcutTupleFields.Target];
-            set => this.Set((int)ShortcutTupleFields.Target, value);
+            get => (string)this.Fields[(int)ShortcutSymbolFields.Target];
+            set => this.Set((int)ShortcutSymbolFields.Target, value);
         }
 
         public string Arguments
         {
-            get => (string)this.Fields[(int)ShortcutTupleFields.Arguments];
-            set => this.Set((int)ShortcutTupleFields.Arguments, value);
+            get => (string)this.Fields[(int)ShortcutSymbolFields.Arguments];
+            set => this.Set((int)ShortcutSymbolFields.Arguments, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)ShortcutTupleFields.Description];
-            set => this.Set((int)ShortcutTupleFields.Description, value);
+            get => (string)this.Fields[(int)ShortcutSymbolFields.Description];
+            set => this.Set((int)ShortcutSymbolFields.Description, value);
         }
 
         public int? Hotkey
         {
-            get => this.Fields[(int)ShortcutTupleFields.Hotkey].AsNullableNumber();
-            set => this.Set((int)ShortcutTupleFields.Hotkey, value);
+            get => this.Fields[(int)ShortcutSymbolFields.Hotkey].AsNullableNumber();
+            set => this.Set((int)ShortcutSymbolFields.Hotkey, value);
         }
 
         public string IconRef
         {
-            get => (string)this.Fields[(int)ShortcutTupleFields.IconRef];
-            set => this.Set((int)ShortcutTupleFields.IconRef, value);
+            get => (string)this.Fields[(int)ShortcutSymbolFields.IconRef];
+            set => this.Set((int)ShortcutSymbolFields.IconRef, value);
         }
 
         public int? IconIndex
         {
-            get => this.Fields[(int)ShortcutTupleFields.IconIndex].AsNullableNumber();
-            set => this.Set((int)ShortcutTupleFields.IconIndex, value);
+            get => this.Fields[(int)ShortcutSymbolFields.IconIndex].AsNullableNumber();
+            set => this.Set((int)ShortcutSymbolFields.IconIndex, value);
         }
 
         public ShortcutShowType? Show
         {
-            get => (ShortcutShowType?)this.Fields[(int)ShortcutTupleFields.Show].AsNullableNumber();
-            set => this.Set((int)ShortcutTupleFields.Show, (int?)value);
+            get => (ShortcutShowType?)this.Fields[(int)ShortcutSymbolFields.Show].AsNullableNumber();
+            set => this.Set((int)ShortcutSymbolFields.Show, (int?)value);
         }
 
         public string WorkingDirectory
         {
-            get => (string)this.Fields[(int)ShortcutTupleFields.WkDir];
-            set => this.Set((int)ShortcutTupleFields.WkDir, value);
+            get => (string)this.Fields[(int)ShortcutSymbolFields.WkDir];
+            set => this.Set((int)ShortcutSymbolFields.WkDir, value);
         }
 
         public string DisplayResourceDll
         {
-            get => (string)this.Fields[(int)ShortcutTupleFields.DisplayResourceDLL];
-            set => this.Set((int)ShortcutTupleFields.DisplayResourceDLL, value);
+            get => (string)this.Fields[(int)ShortcutSymbolFields.DisplayResourceDLL];
+            set => this.Set((int)ShortcutSymbolFields.DisplayResourceDLL, value);
         }
 
         public int? DisplayResourceId
         {
-            get => this.Fields[(int)ShortcutTupleFields.DisplayResourceId].AsNullableNumber();
-            set => this.Set((int)ShortcutTupleFields.DisplayResourceId, value);
+            get => this.Fields[(int)ShortcutSymbolFields.DisplayResourceId].AsNullableNumber();
+            set => this.Set((int)ShortcutSymbolFields.DisplayResourceId, value);
         }
 
         public string DescriptionResourceDll
         {
-            get => (string)this.Fields[(int)ShortcutTupleFields.DescriptionResourceDLL];
-            set => this.Set((int)ShortcutTupleFields.DescriptionResourceDLL, value);
+            get => (string)this.Fields[(int)ShortcutSymbolFields.DescriptionResourceDLL];
+            set => this.Set((int)ShortcutSymbolFields.DescriptionResourceDLL, value);
         }
 
         public int? DescriptionResourceId
         {
-            get => this.Fields[(int)ShortcutTupleFields.DescriptionResourceId].AsNullableNumber();
-            set => this.Set((int)ShortcutTupleFields.DescriptionResourceId, value);
+            get => this.Fields[(int)ShortcutSymbolFields.DescriptionResourceId].AsNullableNumber();
+            set => this.Set((int)ShortcutSymbolFields.DescriptionResourceId, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/SignatureTuple.cs b/src/WixToolset.Data/Tuples/SignatureTuple.cs
index ed559f64..fc2ce088 100644
--- a/src/WixToolset.Data/Tuples/SignatureTuple.cs
+++ b/src/WixToolset.Data/Tuples/SignatureTuple.cs
@@ -2,30 +2,30 @@
 
 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 Signature = new IntermediateTupleDefinition(
-            TupleDefinitionType.Signature,
+        public static readonly IntermediateSymbolDefinition Signature = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.Signature,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(SignatureTupleFields.FileName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(SignatureTupleFields.MinVersion), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(SignatureTupleFields.MaxVersion), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(SignatureTupleFields.MinSize), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(SignatureTupleFields.MaxSize), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(SignatureTupleFields.MinDate), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(SignatureTupleFields.MaxDate), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(SignatureTupleFields.Languages), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(SignatureSymbolFields.FileName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(SignatureSymbolFields.MinVersion), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(SignatureSymbolFields.MaxVersion), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(SignatureSymbolFields.MinSize), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(SignatureSymbolFields.MaxSize), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(SignatureSymbolFields.MinDate), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(SignatureSymbolFields.MaxDate), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(SignatureSymbolFields.Languages), IntermediateFieldType.String),
             },
-            typeof(SignatureTuple));
+            typeof(SignatureSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum SignatureTupleFields
+    public enum SignatureSymbolFields
     {
         FileName,
         MinVersion,
@@ -37,64 +37,64 @@ namespace WixToolset.Data.Tuples
         Languages,
     }
 
-    public class SignatureTuple : IntermediateTuple
+    public class SignatureSymbol : IntermediateSymbol
     {
-        public SignatureTuple() : base(TupleDefinitions.Signature, null, null)
+        public SignatureSymbol() : base(SymbolDefinitions.Signature, null, null)
         {
         }
 
-        public SignatureTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Signature, sourceLineNumber, id)
+        public SignatureSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Signature, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[SignatureTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[SignatureSymbolFields index] => this.Fields[(int)index];
 
         public string FileName
         {
-            get => (string)this.Fields[(int)SignatureTupleFields.FileName];
-            set => this.Set((int)SignatureTupleFields.FileName, value);
+            get => (string)this.Fields[(int)SignatureSymbolFields.FileName];
+            set => this.Set((int)SignatureSymbolFields.FileName, value);
         }
 
         public string MinVersion
         {
-            get => (string)this.Fields[(int)SignatureTupleFields.MinVersion];
-            set => this.Set((int)SignatureTupleFields.MinVersion, value);
+            get => (string)this.Fields[(int)SignatureSymbolFields.MinVersion];
+            set => this.Set((int)SignatureSymbolFields.MinVersion, value);
         }
 
         public string MaxVersion
         {
-            get => (string)this.Fields[(int)SignatureTupleFields.MaxVersion];
-            set => this.Set((int)SignatureTupleFields.MaxVersion, value);
+            get => (string)this.Fields[(int)SignatureSymbolFields.MaxVersion];
+            set => this.Set((int)SignatureSymbolFields.MaxVersion, value);
         }
 
         public int? MinSize
         {
-            get => (int?)this.Fields[(int)SignatureTupleFields.MinSize];
-            set => this.Set((int)SignatureTupleFields.MinSize, value);
+            get => (int?)this.Fields[(int)SignatureSymbolFields.MinSize];
+            set => this.Set((int)SignatureSymbolFields.MinSize, value);
         }
 
         public int? MaxSize
         {
-            get => (int?)this.Fields[(int)SignatureTupleFields.MaxSize];
-            set => this.Set((int)SignatureTupleFields.MaxSize, value);
+            get => (int?)this.Fields[(int)SignatureSymbolFields.MaxSize];
+            set => this.Set((int)SignatureSymbolFields.MaxSize, value);
         }
 
         public int? MinDate
         {
-            get => (int?)this.Fields[(int)SignatureTupleFields.MinDate];
-            set => this.Set((int)SignatureTupleFields.MinDate, value);
+            get => (int?)this.Fields[(int)SignatureSymbolFields.MinDate];
+            set => this.Set((int)SignatureSymbolFields.MinDate, value);
         }
 
         public int? MaxDate
         {
-            get => (int?)this.Fields[(int)SignatureTupleFields.MaxDate];
-            set => this.Set((int)SignatureTupleFields.MaxDate, value);
+            get => (int?)this.Fields[(int)SignatureSymbolFields.MaxDate];
+            set => this.Set((int)SignatureSymbolFields.MaxDate, value);
         }
 
         public string Languages
         {
-            get => (string)this.Fields[(int)SignatureTupleFields.Languages];
-            set => this.Set((int)SignatureTupleFields.Languages, value);
+            get => (string)this.Fields[(int)SignatureSymbolFields.Languages];
+            set => this.Set((int)SignatureSymbolFields.Languages, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/SummaryInformationTuple.cs b/src/WixToolset.Data/Tuples/SummaryInformationTuple.cs
index d395d115..b3b233fe 100644
--- a/src/WixToolset.Data/Tuples/SummaryInformationTuple.cs
+++ b/src/WixToolset.Data/Tuples/SummaryInformationTuple.cs
@@ -2,24 +2,24 @@
 
 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 SummaryInformation = new IntermediateTupleDefinition(
-            TupleDefinitionType.SummaryInformation,
+        public static readonly IntermediateSymbolDefinition SummaryInformation = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.SummaryInformation,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(SummaryInformationTupleFields.PropertyId), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(SummaryInformationTupleFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(SummaryInformationSymbolFields.PropertyId), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(SummaryInformationSymbolFields.Value), IntermediateFieldType.String),
             },
-            typeof(SummaryInformationTuple));
+            typeof(SummaryInformationSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum SummaryInformationTupleFields
+    public enum SummaryInformationSymbolFields
     {
         PropertyId,
         Value,
@@ -75,28 +75,28 @@ namespace WixToolset.Data.Tuples
         Version31 = 5,
     }
 
-    public class SummaryInformationTuple : IntermediateTuple
+    public class SummaryInformationSymbol : IntermediateSymbol
     {
-        public SummaryInformationTuple() : base(TupleDefinitions.SummaryInformation, null, null)
+        public SummaryInformationSymbol() : base(SymbolDefinitions.SummaryInformation, null, null)
         {
         }
 
-        public SummaryInformationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.SummaryInformation, sourceLineNumber, id)
+        public SummaryInformationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.SummaryInformation, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[SummaryInformationTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[SummaryInformationSymbolFields index] => this.Fields[(int)index];
 
         public SummaryInformationType PropertyId
         {
-            get => (SummaryInformationType)this.Fields[(int)SummaryInformationTupleFields.PropertyId].AsNumber();
-            set => this.Set((int)SummaryInformationTupleFields.PropertyId, (int)value);
+            get => (SummaryInformationType)this.Fields[(int)SummaryInformationSymbolFields.PropertyId].AsNumber();
+            set => this.Set((int)SummaryInformationSymbolFields.PropertyId, (int)value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)SummaryInformationTupleFields.Value];
-            set => this.Set((int)SummaryInformationTupleFields.Value, value);
+            get => (string)this.Fields[(int)SummaryInformationSymbolFields.Value];
+            set => this.Set((int)SummaryInformationSymbolFields.Value, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/TargetFilesOptionalDataTuple.cs b/src/WixToolset.Data/Tuples/TargetFilesOptionalDataTuple.cs
index 4b40d4f2..66fdc30c 100644
--- a/src/WixToolset.Data/Tuples/TargetFilesOptionalDataTuple.cs
+++ b/src/WixToolset.Data/Tuples/TargetFilesOptionalDataTuple.cs
@@ -2,28 +2,28 @@
 
 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 TargetFilesOptionalData = new IntermediateTupleDefinition(
-            TupleDefinitionType.TargetFilesOptionalData,
+        public static readonly IntermediateSymbolDefinition TargetFilesOptionalData = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.TargetFilesOptionalData,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataTupleFields.Target), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataTupleFields.FTK), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataTupleFields.SymbolPaths), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataTupleFields.IgnoreOffsets), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataTupleFields.IgnoreLengths), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataTupleFields.RetainOffsets), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataSymbolFields.Target), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataSymbolFields.FTK), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataSymbolFields.SymbolPaths), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataSymbolFields.IgnoreOffsets), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataSymbolFields.IgnoreLengths), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TargetFilesOptionalDataSymbolFields.RetainOffsets), IntermediateFieldType.String),
             },
-            typeof(TargetFilesOptionalDataTuple));
+            typeof(TargetFilesOptionalDataSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum TargetFilesOptionalDataTupleFields
+    public enum TargetFilesOptionalDataSymbolFields
     {
         Target,
         FTK,
@@ -33,52 +33,52 @@ namespace WixToolset.Data.Tuples
         RetainOffsets,
     }
 
-    public class TargetFilesOptionalDataTuple : IntermediateTuple
+    public class TargetFilesOptionalDataSymbol : IntermediateSymbol
     {
-        public TargetFilesOptionalDataTuple() : base(TupleDefinitions.TargetFilesOptionalData, null, null)
+        public TargetFilesOptionalDataSymbol() : base(SymbolDefinitions.TargetFilesOptionalData, null, null)
         {
         }
 
-        public TargetFilesOptionalDataTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.TargetFilesOptionalData, sourceLineNumber, id)
+        public TargetFilesOptionalDataSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.TargetFilesOptionalData, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[TargetFilesOptionalDataTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[TargetFilesOptionalDataSymbolFields index] => this.Fields[(int)index];
 
         public string Target
         {
-            get => (string)this.Fields[(int)TargetFilesOptionalDataTupleFields.Target];
-            set => this.Set((int)TargetFilesOptionalDataTupleFields.Target, value);
+            get => (string)this.Fields[(int)TargetFilesOptionalDataSymbolFields.Target];
+            set => this.Set((int)TargetFilesOptionalDataSymbolFields.Target, value);
         }
 
         public string FTK
         {
-            get => (string)this.Fields[(int)TargetFilesOptionalDataTupleFields.FTK];
-            set => this.Set((int)TargetFilesOptionalDataTupleFields.FTK, value);
+            get => (string)this.Fields[(int)TargetFilesOptionalDataSymbolFields.FTK];
+            set => this.Set((int)TargetFilesOptionalDataSymbolFields.FTK, value);
         }
 
         public string SymbolPaths
         {
-            get => (string)this.Fields[(int)TargetFilesOptionalDataTupleFields.SymbolPaths];
-            set => this.Set((int)TargetFilesOptionalDataTupleFields.SymbolPaths, value);
+            get => (string)this.Fields[(int)TargetFilesOptionalDataSymbolFields.SymbolPaths];
+            set => this.Set((int)TargetFilesOptionalDataSymbolFields.SymbolPaths, value);
         }
 
         public string IgnoreOffsets
         {
-            get => (string)this.Fields[(int)TargetFilesOptionalDataTupleFields.IgnoreOffsets];
-            set => this.Set((int)TargetFilesOptionalDataTupleFields.IgnoreOffsets, value);
+            get => (string)this.Fields[(int)TargetFilesOptionalDataSymbolFields.IgnoreOffsets];
+            set => this.Set((int)TargetFilesOptionalDataSymbolFields.IgnoreOffsets, value);
         }
 
         public string IgnoreLengths
         {
-            get => (string)this.Fields[(int)TargetFilesOptionalDataTupleFields.IgnoreLengths];
-            set => this.Set((int)TargetFilesOptionalDataTupleFields.IgnoreLengths, value);
+            get => (string)this.Fields[(int)TargetFilesOptionalDataSymbolFields.IgnoreLengths];
+            set => this.Set((int)TargetFilesOptionalDataSymbolFields.IgnoreLengths, value);
         }
 
         public string RetainOffsets
         {
-            get => (string)this.Fields[(int)TargetFilesOptionalDataTupleFields.RetainOffsets];
-            set => this.Set((int)TargetFilesOptionalDataTupleFields.RetainOffsets, value);
+            get => (string)this.Fields[(int)TargetFilesOptionalDataSymbolFields.RetainOffsets];
+            set => this.Set((int)TargetFilesOptionalDataSymbolFields.RetainOffsets, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/TargetImagesTuple.cs b/src/WixToolset.Data/Tuples/TargetImagesTuple.cs
index 21920208..4748b1f3 100644
--- a/src/WixToolset.Data/Tuples/TargetImagesTuple.cs
+++ b/src/WixToolset.Data/Tuples/TargetImagesTuple.cs
@@ -2,29 +2,29 @@
 
 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 TargetImages = new IntermediateTupleDefinition(
-            TupleDefinitionType.TargetImages,
+        public static readonly IntermediateSymbolDefinition TargetImages = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.TargetImages,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(TargetImagesTupleFields.Target), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(TargetImagesTupleFields.MsiPath), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(TargetImagesTupleFields.SymbolPaths), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(TargetImagesTupleFields.Upgraded), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(TargetImagesTupleFields.Order), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(TargetImagesTupleFields.ProductValidateFlags), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(TargetImagesTupleFields.IgnoreMissingSrcFiles), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(TargetImagesSymbolFields.Target), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TargetImagesSymbolFields.MsiPath), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TargetImagesSymbolFields.SymbolPaths), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TargetImagesSymbolFields.Upgraded), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TargetImagesSymbolFields.Order), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(TargetImagesSymbolFields.ProductValidateFlags), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TargetImagesSymbolFields.IgnoreMissingSrcFiles), IntermediateFieldType.Bool),
             },
-            typeof(TargetImagesTuple));
+            typeof(TargetImagesSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum TargetImagesTupleFields
+    public enum TargetImagesSymbolFields
     {
         Target,
         MsiPath,
@@ -35,58 +35,58 @@ namespace WixToolset.Data.Tuples
         IgnoreMissingSrcFiles,
     }
 
-    public class TargetImagesTuple : IntermediateTuple
+    public class TargetImagesSymbol : IntermediateSymbol
     {
-        public TargetImagesTuple() : base(TupleDefinitions.TargetImages, null, null)
+        public TargetImagesSymbol() : base(SymbolDefinitions.TargetImages, null, null)
         {
         }
 
-        public TargetImagesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.TargetImages, sourceLineNumber, id)
+        public TargetImagesSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.TargetImages, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[TargetImagesTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[TargetImagesSymbolFields index] => this.Fields[(int)index];
 
         public string Target
         {
-            get => (string)this.Fields[(int)TargetImagesTupleFields.Target];
-            set => this.Set((int)TargetImagesTupleFields.Target, value);
+            get => (string)this.Fields[(int)TargetImagesSymbolFields.Target];
+            set => this.Set((int)TargetImagesSymbolFields.Target, value);
         }
 
         public string MsiPath
         {
-            get => (string)this.Fields[(int)TargetImagesTupleFields.MsiPath];
-            set => this.Set((int)TargetImagesTupleFields.MsiPath, value);
+            get => (string)this.Fields[(int)TargetImagesSymbolFields.MsiPath];
+            set => this.Set((int)TargetImagesSymbolFields.MsiPath, value);
         }
 
         public string SymbolPaths
         {
-            get => (string)this.Fields[(int)TargetImagesTupleFields.SymbolPaths];
-            set => this.Set((int)TargetImagesTupleFields.SymbolPaths, value);
+            get => (string)this.Fields[(int)TargetImagesSymbolFields.SymbolPaths];
+            set => this.Set((int)TargetImagesSymbolFields.SymbolPaths, value);
         }
 
         public string Upgraded
         {
-            get => (string)this.Fields[(int)TargetImagesTupleFields.Upgraded];
-            set => this.Set((int)TargetImagesTupleFields.Upgraded, value);
+            get => (string)this.Fields[(int)TargetImagesSymbolFields.Upgraded];
+            set => this.Set((int)TargetImagesSymbolFields.Upgraded, value);
         }
 
         public int Order
         {
-            get => (int)this.Fields[(int)TargetImagesTupleFields.Order];
-            set => this.Set((int)TargetImagesTupleFields.Order, value);
+            get => (int)this.Fields[(int)TargetImagesSymbolFields.Order];
+            set => this.Set((int)TargetImagesSymbolFields.Order, value);
         }
 
         public string ProductValidateFlags
         {
-            get => (string)this.Fields[(int)TargetImagesTupleFields.ProductValidateFlags];
-            set => this.Set((int)TargetImagesTupleFields.ProductValidateFlags, value);
+            get => (string)this.Fields[(int)TargetImagesSymbolFields.ProductValidateFlags];
+            set => this.Set((int)TargetImagesSymbolFields.ProductValidateFlags, value);
         }
 
         public bool IgnoreMissingSrcFiles
         {
-            get => (bool)this.Fields[(int)TargetImagesTupleFields.IgnoreMissingSrcFiles];
-            set => this.Set((int)TargetImagesTupleFields.IgnoreMissingSrcFiles, value);
+            get => (bool)this.Fields[(int)TargetImagesSymbolFields.IgnoreMissingSrcFiles];
+            set => this.Set((int)TargetImagesSymbolFields.IgnoreMissingSrcFiles, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/TextStyleTuple.cs b/src/WixToolset.Data/Tuples/TextStyleTuple.cs
index 3614808e..b07615bb 100644
--- a/src/WixToolset.Data/Tuples/TextStyleTuple.cs
+++ b/src/WixToolset.Data/Tuples/TextStyleTuple.cs
@@ -2,31 +2,31 @@
 
 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 TextStyle = new IntermediateTupleDefinition(
-            TupleDefinitionType.TextStyle,
+        public static readonly IntermediateSymbolDefinition TextStyle = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.TextStyle,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(TextStyleTupleFields.FaceName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(TextStyleTupleFields.Size), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(TextStyleTupleFields.Red), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(TextStyleTupleFields.Green), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(TextStyleTupleFields.Blue), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(TextStyleTupleFields.Bold), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(TextStyleTupleFields.Italic), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(TextStyleTupleFields.Strike), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(TextStyleTupleFields.Underline), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(TextStyleSymbolFields.FaceName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TextStyleSymbolFields.Size), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(TextStyleSymbolFields.Red), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(TextStyleSymbolFields.Green), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(TextStyleSymbolFields.Blue), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(TextStyleSymbolFields.Bold), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(TextStyleSymbolFields.Italic), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(TextStyleSymbolFields.Strike), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(TextStyleSymbolFields.Underline), IntermediateFieldType.Bool),
             },
-            typeof(TextStyleTuple));
+            typeof(TextStyleSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum TextStyleTupleFields
+    public enum TextStyleSymbolFields
     {
         FaceName,
         Size,
@@ -39,70 +39,70 @@ namespace WixToolset.Data.Tuples
         Underline,
     }
 
-    public class TextStyleTuple : IntermediateTuple
+    public class TextStyleSymbol : IntermediateSymbol
     {
-        public TextStyleTuple() : base(TupleDefinitions.TextStyle, null, null)
+        public TextStyleSymbol() : base(SymbolDefinitions.TextStyle, null, null)
         {
         }
 
-        public TextStyleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.TextStyle, sourceLineNumber, id)
+        public TextStyleSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.TextStyle, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[TextStyleTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[TextStyleSymbolFields index] => this.Fields[(int)index];
 
         public string FaceName
         {
-            get => (string)this.Fields[(int)TextStyleTupleFields.FaceName];
-            set => this.Set((int)TextStyleTupleFields.FaceName, value);
+            get => (string)this.Fields[(int)TextStyleSymbolFields.FaceName];
+            set => this.Set((int)TextStyleSymbolFields.FaceName, value);
         }
 
         public int Size
         {
-            get => (int)this.Fields[(int)TextStyleTupleFields.Size];
-            set => this.Set((int)TextStyleTupleFields.Size, value);
+            get => (int)this.Fields[(int)TextStyleSymbolFields.Size];
+            set => this.Set((int)TextStyleSymbolFields.Size, value);
         }
 
         public int? Red
         {
-            get => (int?)this.Fields[(int)TextStyleTupleFields.Red];
-            set => this.Set((int)TextStyleTupleFields.Red, value);
+            get => (int?)this.Fields[(int)TextStyleSymbolFields.Red];
+            set => this.Set((int)TextStyleSymbolFields.Red, value);
         }
 
         public int? Green
         {
-            get => (int?)this.Fields[(int)TextStyleTupleFields.Green];
-            set => this.Set((int)TextStyleTupleFields.Green, value);
+            get => (int?)this.Fields[(int)TextStyleSymbolFields.Green];
+            set => this.Set((int)TextStyleSymbolFields.Green, value);
         }
 
         public int? Blue
         {
-            get => (int?)this.Fields[(int)TextStyleTupleFields.Blue];
-            set => this.Set((int)TextStyleTupleFields.Blue, value);
+            get => (int?)this.Fields[(int)TextStyleSymbolFields.Blue];
+            set => this.Set((int)TextStyleSymbolFields.Blue, value);
         }
 
         public bool Bold
         {
-            get => (bool)this.Fields[(int)TextStyleTupleFields.Bold];
-            set => this.Set((int)TextStyleTupleFields.Bold, value);
+            get => (bool)this.Fields[(int)TextStyleSymbolFields.Bold];
+            set => this.Set((int)TextStyleSymbolFields.Bold, value);
         }
 
         public bool Italic
         {
-            get => (bool)this.Fields[(int)TextStyleTupleFields.Italic];
-            set => this.Set((int)TextStyleTupleFields.Italic, value);
+            get => (bool)this.Fields[(int)TextStyleSymbolFields.Italic];
+            set => this.Set((int)TextStyleSymbolFields.Italic, value);
         }
 
         public bool Strike
         {
-            get => (bool)this.Fields[(int)TextStyleTupleFields.Strike];
-            set => this.Set((int)TextStyleTupleFields.Strike, value);
+            get => (bool)this.Fields[(int)TextStyleSymbolFields.Strike];
+            set => this.Set((int)TextStyleSymbolFields.Strike, value);
         }
 
         public bool Underline
         {
-            get => (bool)this.Fields[(int)TextStyleTupleFields.Underline];
-            set => this.Set((int)TextStyleTupleFields.Underline, value);
+            get => (bool)this.Fields[(int)TextStyleSymbolFields.Underline];
+            set => this.Set((int)TextStyleSymbolFields.Underline, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/TransformsFlags.cs b/src/WixToolset.Data/Tuples/TransformsFlags.cs
index d3a6187c..90f22cb4 100644
--- a/src/WixToolset.Data/Tuples/TransformsFlags.cs
+++ b/src/WixToolset.Data/Tuples/TransformsFlags.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
     using System;
 
diff --git a/src/WixToolset.Data/Tuples/TupleDefinitions.cs b/src/WixToolset.Data/Tuples/TupleDefinitions.cs
index 10776b67..ea90ef7b 100644
--- a/src/WixToolset.Data/Tuples/TupleDefinitions.cs
+++ b/src/WixToolset.Data/Tuples/TupleDefinitions.cs
@@ -4,7 +4,7 @@ namespace WixToolset.Data
 {
     using System;
 
-    public enum TupleDefinitionType
+    public enum SymbolDefinitionType
     {
         SummaryInformation,
         ActionText,
@@ -185,13 +185,13 @@ namespace WixToolset.Data
         MustBeFromAnExtension,
     }
 
-    public static partial class TupleDefinitions
+    public static partial class SymbolDefinitions
     {
         public static readonly Version Version = new Version("4.0.0");
 
-        public static IntermediateTupleDefinition ByName(string name)
+        public static IntermediateSymbolDefinition ByName(string name)
         {
-            if (!Enum.TryParse(name, out TupleDefinitionType type) || type == TupleDefinitionType.MustBeFromAnExtension)
+            if (!Enum.TryParse(name, out SymbolDefinitionType type) || type == SymbolDefinitionType.MustBeFromAnExtension)
             {
                 return null;
             }
@@ -199,534 +199,534 @@ namespace WixToolset.Data
             return ByType(type);
         }
 
-        public static IntermediateTupleDefinition ByType(TupleDefinitionType type)
+        public static IntermediateSymbolDefinition ByType(SymbolDefinitionType type)
         {
             switch (type)
             {
-                case TupleDefinitionType.SummaryInformation:
-                    return TupleDefinitions.SummaryInformation;
+                case SymbolDefinitionType.SummaryInformation:
+                    return SymbolDefinitions.SummaryInformation;
 
-                case TupleDefinitionType.ActionText:
-                    return TupleDefinitions.ActionText;
+                case SymbolDefinitionType.ActionText:
+                    return SymbolDefinitions.ActionText;
 
-                case TupleDefinitionType.AppId:
-                    return TupleDefinitions.AppId;
+                case SymbolDefinitionType.AppId:
+                    return SymbolDefinitions.AppId;
 
-                case TupleDefinitionType.AppSearch:
-                    return TupleDefinitions.AppSearch;
+                case SymbolDefinitionType.AppSearch:
+                    return SymbolDefinitions.AppSearch;
 
-                case TupleDefinitionType.BBControl:
-                    return TupleDefinitions.BBControl;
+                case SymbolDefinitionType.BBControl:
+                    return SymbolDefinitions.BBControl;
 
-                case TupleDefinitionType.Billboard:
-                    return TupleDefinitions.Billboard;
+                case SymbolDefinitionType.Billboard:
+                    return SymbolDefinitions.Billboard;
 
-                case TupleDefinitionType.Binary:
-                    return TupleDefinitions.Binary;
+                case SymbolDefinitionType.Binary:
+                    return SymbolDefinitions.Binary;
 
-                case TupleDefinitionType.CCPSearch:
-                    return TupleDefinitions.CCPSearch;
+                case SymbolDefinitionType.CCPSearch:
+                    return SymbolDefinitions.CCPSearch;
 
-                case TupleDefinitionType.CheckBox:
-                    return TupleDefinitions.CheckBox;
+                case SymbolDefinitionType.CheckBox:
+                    return SymbolDefinitions.CheckBox;
 
-                case TupleDefinitionType.Class:
-                    return TupleDefinitions.Class;
+                case SymbolDefinitionType.Class:
+                    return SymbolDefinitions.Class;
 
-                case TupleDefinitionType.ComboBox:
-                    return TupleDefinitions.ComboBox;
+                case SymbolDefinitionType.ComboBox:
+                    return SymbolDefinitions.ComboBox;
 
-                case TupleDefinitionType.CompLocator:
-                    return TupleDefinitions.CompLocator;
+                case SymbolDefinitionType.CompLocator:
+                    return SymbolDefinitions.CompLocator;
 
-                case TupleDefinitionType.Complus:
-                    return TupleDefinitions.Complus;
+                case SymbolDefinitionType.Complus:
+                    return SymbolDefinitions.Complus;
 
-                case TupleDefinitionType.Component:
-                    return TupleDefinitions.Component;
+                case SymbolDefinitionType.Component:
+                    return SymbolDefinitions.Component;
 
-                case TupleDefinitionType.Condition:
-                    return TupleDefinitions.Condition;
+                case SymbolDefinitionType.Condition:
+                    return SymbolDefinitions.Condition;
 
-                case TupleDefinitionType.Control:
-                    return TupleDefinitions.Control;
+                case SymbolDefinitionType.Control:
+                    return SymbolDefinitions.Control;
 
-                case TupleDefinitionType.ControlCondition:
-                    return TupleDefinitions.ControlCondition;
+                case SymbolDefinitionType.ControlCondition:
+                    return SymbolDefinitions.ControlCondition;
 
-                case TupleDefinitionType.ControlEvent:
-                    return TupleDefinitions.ControlEvent;
+                case SymbolDefinitionType.ControlEvent:
+                    return SymbolDefinitions.ControlEvent;
 
-                case TupleDefinitionType.CreateFolder:
-                    return TupleDefinitions.CreateFolder;
+                case SymbolDefinitionType.CreateFolder:
+                    return SymbolDefinitions.CreateFolder;
 
-                case TupleDefinitionType.CustomAction:
-                    return TupleDefinitions.CustomAction;
+                case SymbolDefinitionType.CustomAction:
+                    return SymbolDefinitions.CustomAction;
 
-                case TupleDefinitionType.Dialog:
-                    return TupleDefinitions.Dialog;
+                case SymbolDefinitionType.Dialog:
+                    return SymbolDefinitions.Dialog;
 
-                case TupleDefinitionType.Directory:
-                    return TupleDefinitions.Directory;
+                case SymbolDefinitionType.Directory:
+                    return SymbolDefinitions.Directory;
 
-                case TupleDefinitionType.DrLocator:
-                    return TupleDefinitions.DrLocator;
+                case SymbolDefinitionType.DrLocator:
+                    return SymbolDefinitions.DrLocator;
 
-                case TupleDefinitionType.DuplicateFile:
-                    return TupleDefinitions.DuplicateFile;
+                case SymbolDefinitionType.DuplicateFile:
+                    return SymbolDefinitions.DuplicateFile;
 
-                case TupleDefinitionType.Environment:
-                    return TupleDefinitions.Environment;
+                case SymbolDefinitionType.Environment:
+                    return SymbolDefinitions.Environment;
 
-                case TupleDefinitionType.Error:
-                    return TupleDefinitions.Error;
+                case SymbolDefinitionType.Error:
+                    return SymbolDefinitions.Error;
 
-                case TupleDefinitionType.EventMapping:
-                    return TupleDefinitions.EventMapping;
+                case SymbolDefinitionType.EventMapping:
+                    return SymbolDefinitions.EventMapping;
 
-                case TupleDefinitionType.Extension:
-                    return TupleDefinitions.Extension;
+                case SymbolDefinitionType.Extension:
+                    return SymbolDefinitions.Extension;
 
-                case TupleDefinitionType.ExternalFiles:
-                    return TupleDefinitions.ExternalFiles;
+                case SymbolDefinitionType.ExternalFiles:
+                    return SymbolDefinitions.ExternalFiles;
 
-                case TupleDefinitionType.FamilyFileRanges:
-                    return TupleDefinitions.FamilyFileRanges;
+                case SymbolDefinitionType.FamilyFileRanges:
+                    return SymbolDefinitions.FamilyFileRanges;
 
-                case TupleDefinitionType.Feature:
-                    return TupleDefinitions.Feature;
+                case SymbolDefinitionType.Feature:
+                    return SymbolDefinitions.Feature;
 
-                case TupleDefinitionType.FeatureComponents:
-                    return TupleDefinitions.FeatureComponents;
+                case SymbolDefinitionType.FeatureComponents:
+                    return SymbolDefinitions.FeatureComponents;
 
-                case TupleDefinitionType.File:
-                    return TupleDefinitions.File;
+                case SymbolDefinitionType.File:
+                    return SymbolDefinitions.File;
 
-                case TupleDefinitionType.FileSFPCatalog:
-                    return TupleDefinitions.FileSFPCatalog;
+                case SymbolDefinitionType.FileSFPCatalog:
+                    return SymbolDefinitions.FileSFPCatalog;
 
-                case TupleDefinitionType.Icon:
-                    return TupleDefinitions.Icon;
+                case SymbolDefinitionType.Icon:
+                    return SymbolDefinitions.Icon;
 
-                case TupleDefinitionType.ImageFamilies:
-                    return TupleDefinitions.ImageFamilies;
+                case SymbolDefinitionType.ImageFamilies:
+                    return SymbolDefinitions.ImageFamilies;
 
-                case TupleDefinitionType.IniFile:
-                    return TupleDefinitions.IniFile;
+                case SymbolDefinitionType.IniFile:
+                    return SymbolDefinitions.IniFile;
 
-                case TupleDefinitionType.IniLocator:
-                    return TupleDefinitions.IniLocator;
+                case SymbolDefinitionType.IniLocator:
+                    return SymbolDefinitions.IniLocator;
 
-                case TupleDefinitionType.IsolatedComponent:
-                    return TupleDefinitions.IsolatedComponent;
+                case SymbolDefinitionType.IsolatedComponent:
+                    return SymbolDefinitions.IsolatedComponent;
 
-                case TupleDefinitionType.LaunchCondition:
-                    return TupleDefinitions.LaunchCondition;
+                case SymbolDefinitionType.LaunchCondition:
+                    return SymbolDefinitions.LaunchCondition;
 
-                case TupleDefinitionType.ListBox:
-                    return TupleDefinitions.ListBox;
+                case SymbolDefinitionType.ListBox:
+                    return SymbolDefinitions.ListBox;
 
-                case TupleDefinitionType.ListView:
-                    return TupleDefinitions.ListView;
+                case SymbolDefinitionType.ListView:
+                    return SymbolDefinitions.ListView;
 
-                case TupleDefinitionType.LockPermissions:
-                    return TupleDefinitions.LockPermissions;
+                case SymbolDefinitionType.LockPermissions:
+                    return SymbolDefinitions.LockPermissions;
 
-                case TupleDefinitionType.Media:
-                    return TupleDefinitions.Media;
+                case SymbolDefinitionType.Media:
+                    return SymbolDefinitions.Media;
 
-                case TupleDefinitionType.MIME:
-                    return TupleDefinitions.MIME;
+                case SymbolDefinitionType.MIME:
+                    return SymbolDefinitions.MIME;
 
-                case TupleDefinitionType.ModuleComponents:
-                    return TupleDefinitions.ModuleComponents;
+                case SymbolDefinitionType.ModuleComponents:
+                    return SymbolDefinitions.ModuleComponents;
 
-                case TupleDefinitionType.ModuleConfiguration:
-                    return TupleDefinitions.ModuleConfiguration;
+                case SymbolDefinitionType.ModuleConfiguration:
+                    return SymbolDefinitions.ModuleConfiguration;
 
-                case TupleDefinitionType.ModuleDependency:
-                    return TupleDefinitions.ModuleDependency;
+                case SymbolDefinitionType.ModuleDependency:
+                    return SymbolDefinitions.ModuleDependency;
 
-                case TupleDefinitionType.ModuleExclusion:
-                    return TupleDefinitions.ModuleExclusion;
+                case SymbolDefinitionType.ModuleExclusion:
+                    return SymbolDefinitions.ModuleExclusion;
 
-                case TupleDefinitionType.ModuleIgnoreTable:
-                    return TupleDefinitions.ModuleIgnoreTable;
+                case SymbolDefinitionType.ModuleIgnoreTable:
+                    return SymbolDefinitions.ModuleIgnoreTable;
 
-                case TupleDefinitionType.ModuleSignature:
-                    return TupleDefinitions.ModuleSignature;
+                case SymbolDefinitionType.ModuleSignature:
+                    return SymbolDefinitions.ModuleSignature;
 
-                case TupleDefinitionType.ModuleSubstitution:
-                    return TupleDefinitions.ModuleSubstitution;
+                case SymbolDefinitionType.ModuleSubstitution:
+                    return SymbolDefinitions.ModuleSubstitution;
 
-                case TupleDefinitionType.MoveFile:
-                    return TupleDefinitions.MoveFile;
+                case SymbolDefinitionType.MoveFile:
+                    return SymbolDefinitions.MoveFile;
 
-                case TupleDefinitionType.Assembly:
-                    return TupleDefinitions.Assembly;
+                case SymbolDefinitionType.Assembly:
+                    return SymbolDefinitions.Assembly;
 
-                case TupleDefinitionType.MsiAssemblyName:
-                    return TupleDefinitions.MsiAssemblyName;
+                case SymbolDefinitionType.MsiAssemblyName:
+                    return SymbolDefinitions.MsiAssemblyName;
 
-                case TupleDefinitionType.MsiDigitalCertificate:
-                    return TupleDefinitions.MsiDigitalCertificate;
+                case SymbolDefinitionType.MsiDigitalCertificate:
+                    return SymbolDefinitions.MsiDigitalCertificate;
 
-                case TupleDefinitionType.MsiDigitalSignature:
-                    return TupleDefinitions.MsiDigitalSignature;
+                case SymbolDefinitionType.MsiDigitalSignature:
+                    return SymbolDefinitions.MsiDigitalSignature;
 
-                case TupleDefinitionType.MsiEmbeddedChainer:
-                    return TupleDefinitions.MsiEmbeddedChainer;
+                case SymbolDefinitionType.MsiEmbeddedChainer:
+                    return SymbolDefinitions.MsiEmbeddedChainer;
 
-                case TupleDefinitionType.MsiEmbeddedUI:
-                    return TupleDefinitions.MsiEmbeddedUI;
+                case SymbolDefinitionType.MsiEmbeddedUI:
+                    return SymbolDefinitions.MsiEmbeddedUI;
 
-                case TupleDefinitionType.MsiFileHash:
-                    return TupleDefinitions.MsiFileHash;
+                case SymbolDefinitionType.MsiFileHash:
+                    return SymbolDefinitions.MsiFileHash;
 
-                case TupleDefinitionType.MsiLockPermissionsEx:
-                    return TupleDefinitions.MsiLockPermissionsEx;
+                case SymbolDefinitionType.MsiLockPermissionsEx:
+                    return SymbolDefinitions.MsiLockPermissionsEx;
 
-                case TupleDefinitionType.MsiPackageCertificate:
-                    return TupleDefinitions.MsiPackageCertificate;
+                case SymbolDefinitionType.MsiPackageCertificate:
+                    return SymbolDefinitions.MsiPackageCertificate;
 
-                case TupleDefinitionType.MsiPatchCertificate:
-                    return TupleDefinitions.MsiPatchCertificate;
+                case SymbolDefinitionType.MsiPatchCertificate:
+                    return SymbolDefinitions.MsiPatchCertificate;
 
-                case TupleDefinitionType.MsiPatchHeaders:
-                    return TupleDefinitions.MsiPatchHeaders;
+                case SymbolDefinitionType.MsiPatchHeaders:
+                    return SymbolDefinitions.MsiPatchHeaders;
 
-                case TupleDefinitionType.MsiPatchMetadata:
-                    return TupleDefinitions.MsiPatchMetadata;
+                case SymbolDefinitionType.MsiPatchMetadata:
+                    return SymbolDefinitions.MsiPatchMetadata;
 
-                case TupleDefinitionType.MsiPatchOldAssemblyFile:
-                    return TupleDefinitions.MsiPatchOldAssemblyFile;
+                case SymbolDefinitionType.MsiPatchOldAssemblyFile:
+                    return SymbolDefinitions.MsiPatchOldAssemblyFile;
 
-                case TupleDefinitionType.MsiPatchOldAssemblyName:
-                    return TupleDefinitions.MsiPatchOldAssemblyName;
+                case SymbolDefinitionType.MsiPatchOldAssemblyName:
+                    return SymbolDefinitions.MsiPatchOldAssemblyName;
 
-                case TupleDefinitionType.MsiPatchSequence:
-                    return TupleDefinitions.MsiPatchSequence;
+                case SymbolDefinitionType.MsiPatchSequence:
+                    return SymbolDefinitions.MsiPatchSequence;
 
-                case TupleDefinitionType.MsiServiceConfig:
-                    return TupleDefinitions.MsiServiceConfig;
+                case SymbolDefinitionType.MsiServiceConfig:
+                    return SymbolDefinitions.MsiServiceConfig;
 
-                case TupleDefinitionType.MsiServiceConfigFailureActions:
-                    return TupleDefinitions.MsiServiceConfigFailureActions;
+                case SymbolDefinitionType.MsiServiceConfigFailureActions:
+                    return SymbolDefinitions.MsiServiceConfigFailureActions;
 
-                case TupleDefinitionType.MsiShortcutProperty:
-                    return TupleDefinitions.MsiShortcutProperty;
+                case SymbolDefinitionType.MsiShortcutProperty:
+                    return SymbolDefinitions.MsiShortcutProperty;
 
-                case TupleDefinitionType.ODBCAttribute:
-                    return TupleDefinitions.ODBCAttribute;
+                case SymbolDefinitionType.ODBCAttribute:
+                    return SymbolDefinitions.ODBCAttribute;
 
-                case TupleDefinitionType.ODBCDataSource:
-                    return TupleDefinitions.ODBCDataSource;
+                case SymbolDefinitionType.ODBCDataSource:
+                    return SymbolDefinitions.ODBCDataSource;
 
-                case TupleDefinitionType.ODBCDriver:
-                    return TupleDefinitions.ODBCDriver;
+                case SymbolDefinitionType.ODBCDriver:
+                    return SymbolDefinitions.ODBCDriver;
 
-                case TupleDefinitionType.ODBCSourceAttribute:
-                    return TupleDefinitions.ODBCSourceAttribute;
+                case SymbolDefinitionType.ODBCSourceAttribute:
+                    return SymbolDefinitions.ODBCSourceAttribute;
 
-                case TupleDefinitionType.ODBCTranslator:
-                    return TupleDefinitions.ODBCTranslator;
+                case SymbolDefinitionType.ODBCTranslator:
+                    return SymbolDefinitions.ODBCTranslator;
 
-                case TupleDefinitionType.Patch:
-                    return TupleDefinitions.Patch;
+                case SymbolDefinitionType.Patch:
+                    return SymbolDefinitions.Patch;
 
-                case TupleDefinitionType.PatchMetadata:
-                    return TupleDefinitions.PatchMetadata;
+                case SymbolDefinitionType.PatchMetadata:
+                    return SymbolDefinitions.PatchMetadata;
 
-                case TupleDefinitionType.PatchPackage:
-                    return TupleDefinitions.PatchPackage;
+                case SymbolDefinitionType.PatchPackage:
+                    return SymbolDefinitions.PatchPackage;
 
-                case TupleDefinitionType.PatchSequence:
-                    return TupleDefinitions.PatchSequence;
+                case SymbolDefinitionType.PatchSequence:
+                    return SymbolDefinitions.PatchSequence;
 
-                case TupleDefinitionType.ProgId:
-                    return TupleDefinitions.ProgId;
+                case SymbolDefinitionType.ProgId:
+                    return SymbolDefinitions.ProgId;
 
-                case TupleDefinitionType.Properties:
-                    return TupleDefinitions.Properties;
+                case SymbolDefinitionType.Properties:
+                    return SymbolDefinitions.Properties;
 
-                case TupleDefinitionType.Property:
-                    return TupleDefinitions.Property;
+                case SymbolDefinitionType.Property:
+                    return SymbolDefinitions.Property;
 
-                case TupleDefinitionType.PublishComponent:
-                    return TupleDefinitions.PublishComponent;
+                case SymbolDefinitionType.PublishComponent:
+                    return SymbolDefinitions.PublishComponent;
 
-                case TupleDefinitionType.ProvidesDependency:
-                    return TupleDefinitions.ProvidesDependency;
+                case SymbolDefinitionType.ProvidesDependency:
+                    return SymbolDefinitions.ProvidesDependency;
 
-                case TupleDefinitionType.RadioButton:
-                    return TupleDefinitions.RadioButton;
+                case SymbolDefinitionType.RadioButton:
+                    return SymbolDefinitions.RadioButton;
 
-                case TupleDefinitionType.Registry:
-                    return TupleDefinitions.Registry;
+                case SymbolDefinitionType.Registry:
+                    return SymbolDefinitions.Registry;
 
-                case TupleDefinitionType.RegLocator:
-                    return TupleDefinitions.RegLocator;
+                case SymbolDefinitionType.RegLocator:
+                    return SymbolDefinitions.RegLocator;
 
-                case TupleDefinitionType.RemoveFile:
-                    return TupleDefinitions.RemoveFile;
+                case SymbolDefinitionType.RemoveFile:
+                    return SymbolDefinitions.RemoveFile;
 
-                case TupleDefinitionType.RemoveRegistry:
-                    return TupleDefinitions.RemoveRegistry;
+                case SymbolDefinitionType.RemoveRegistry:
+                    return SymbolDefinitions.RemoveRegistry;
 
-                case TupleDefinitionType.ReserveCost:
-                    return TupleDefinitions.ReserveCost;
+                case SymbolDefinitionType.ReserveCost:
+                    return SymbolDefinitions.ReserveCost;
 
-                case TupleDefinitionType.ServiceControl:
-                    return TupleDefinitions.ServiceControl;
+                case SymbolDefinitionType.ServiceControl:
+                    return SymbolDefinitions.ServiceControl;
 
-                case TupleDefinitionType.ServiceInstall:
-                    return TupleDefinitions.ServiceInstall;
+                case SymbolDefinitionType.ServiceInstall:
+                    return SymbolDefinitions.ServiceInstall;
 
-                case TupleDefinitionType.SFPCatalog:
-                    return TupleDefinitions.SFPCatalog;
+                case SymbolDefinitionType.SFPCatalog:
+                    return SymbolDefinitions.SFPCatalog;
 
-                case TupleDefinitionType.Shortcut:
-                    return TupleDefinitions.Shortcut;
+                case SymbolDefinitionType.Shortcut:
+                    return SymbolDefinitions.Shortcut;
 
-                case TupleDefinitionType.Signature:
-                    return TupleDefinitions.Signature;
+                case SymbolDefinitionType.Signature:
+                    return SymbolDefinitions.Signature;
 
-                case TupleDefinitionType.TargetFilesOptionalData:
-                    return TupleDefinitions.TargetFilesOptionalData;
+                case SymbolDefinitionType.TargetFilesOptionalData:
+                    return SymbolDefinitions.TargetFilesOptionalData;
 
-                case TupleDefinitionType.TargetImages:
-                    return TupleDefinitions.TargetImages;
+                case SymbolDefinitionType.TargetImages:
+                    return SymbolDefinitions.TargetImages;
 
-                case TupleDefinitionType.TextStyle:
-                    return TupleDefinitions.TextStyle;
+                case SymbolDefinitionType.TextStyle:
+                    return SymbolDefinitions.TextStyle;
 
-                case TupleDefinitionType.TypeLib:
-                    return TupleDefinitions.TypeLib;
+                case SymbolDefinitionType.TypeLib:
+                    return SymbolDefinitions.TypeLib;
 
-                case TupleDefinitionType.UIText:
-                    return TupleDefinitions.UIText;
+                case SymbolDefinitionType.UIText:
+                    return SymbolDefinitions.UIText;
 
-                case TupleDefinitionType.Upgrade:
-                    return TupleDefinitions.Upgrade;
+                case SymbolDefinitionType.Upgrade:
+                    return SymbolDefinitions.Upgrade;
 
-                case TupleDefinitionType.UpgradedFilesOptionalData:
-                    return TupleDefinitions.UpgradedFilesOptionalData;
+                case SymbolDefinitionType.UpgradedFilesOptionalData:
+                    return SymbolDefinitions.UpgradedFilesOptionalData;
 
-                case TupleDefinitionType.UpgradedFilesToIgnore:
-                    return TupleDefinitions.UpgradedFilesToIgnore;
+                case SymbolDefinitionType.UpgradedFilesToIgnore:
+                    return SymbolDefinitions.UpgradedFilesToIgnore;
 
-                case TupleDefinitionType.UpgradedImages:
-                    return TupleDefinitions.UpgradedImages;
+                case SymbolDefinitionType.UpgradedImages:
+                    return SymbolDefinitions.UpgradedImages;
 
-                case TupleDefinitionType.Verb:
-                    return TupleDefinitions.Verb;
+                case SymbolDefinitionType.Verb:
+                    return SymbolDefinitions.Verb;
 
-                case TupleDefinitionType.WixAction:
-                    return TupleDefinitions.WixAction;
+                case SymbolDefinitionType.WixAction:
+                    return SymbolDefinitions.WixAction;
 
-                case TupleDefinitionType.WixApprovedExeForElevation:
-                    return TupleDefinitions.WixApprovedExeForElevation;
+                case SymbolDefinitionType.WixApprovedExeForElevation:
+                    return SymbolDefinitions.WixApprovedExeForElevation;
 
-                case TupleDefinitionType.WixBindUpdatedFiles:
-                    return TupleDefinitions.WixBindUpdatedFiles;
+                case SymbolDefinitionType.WixBindUpdatedFiles:
+                    return SymbolDefinitions.WixBindUpdatedFiles;
 
-                case TupleDefinitionType.WixBootstrapperApplication:
-                    return TupleDefinitions.WixBootstrapperApplication;
+                case SymbolDefinitionType.WixBootstrapperApplication:
+                    return SymbolDefinitions.WixBootstrapperApplication;
 
-                case TupleDefinitionType.WixBuildInfo:
-                    return TupleDefinitions.WixBuildInfo;
+                case SymbolDefinitionType.WixBuildInfo:
+                    return SymbolDefinitions.WixBuildInfo;
 
-                case TupleDefinitionType.WixBundle:
-                    return TupleDefinitions.WixBundle;
+                case SymbolDefinitionType.WixBundle:
+                    return SymbolDefinitions.WixBundle;
 
-                case TupleDefinitionType.WixBundleCatalog:
-                    return TupleDefinitions.WixBundleCatalog;
+                case SymbolDefinitionType.WixBundleCatalog:
+                    return SymbolDefinitions.WixBundleCatalog;
 
-                case TupleDefinitionType.WixBundleContainer:
-                    return TupleDefinitions.WixBundleContainer;
+                case SymbolDefinitionType.WixBundleContainer:
+                    return SymbolDefinitions.WixBundleContainer;
 
-                case TupleDefinitionType.WixBundleCustomData:
-                    return TupleDefinitions.WixBundleCustomData;
+                case SymbolDefinitionType.WixBundleCustomData:
+                    return SymbolDefinitions.WixBundleCustomData;
 
-                case TupleDefinitionType.WixBundleCustomDataAttribute:
-                    return TupleDefinitions.WixBundleCustomDataAttribute;
+                case SymbolDefinitionType.WixBundleCustomDataAttribute:
+                    return SymbolDefinitions.WixBundleCustomDataAttribute;
 
-                case TupleDefinitionType.WixBundleCustomDataCell:
-                    return TupleDefinitions.WixBundleCustomDataCell;
+                case SymbolDefinitionType.WixBundleCustomDataCell:
+                    return SymbolDefinitions.WixBundleCustomDataCell;
 
-                case TupleDefinitionType.WixBundleExtension:
-                    return TupleDefinitions.WixBundleExtension;
+                case SymbolDefinitionType.WixBundleExtension:
+                    return SymbolDefinitions.WixBundleExtension;
 
-                case TupleDefinitionType.WixBundleExePackage:
-                    return TupleDefinitions.WixBundleExePackage;
+                case SymbolDefinitionType.WixBundleExePackage:
+                    return SymbolDefinitions.WixBundleExePackage;
 
-                case TupleDefinitionType.WixBundleMsiFeature:
-                    return TupleDefinitions.WixBundleMsiFeature;
+                case SymbolDefinitionType.WixBundleMsiFeature:
+                    return SymbolDefinitions.WixBundleMsiFeature;
 
-                case TupleDefinitionType.WixBundleMsiPackage:
-                    return TupleDefinitions.WixBundleMsiPackage;
+                case SymbolDefinitionType.WixBundleMsiPackage:
+                    return SymbolDefinitions.WixBundleMsiPackage;
 
-                case TupleDefinitionType.WixBundleMsiProperty:
-                    return TupleDefinitions.WixBundleMsiProperty;
+                case SymbolDefinitionType.WixBundleMsiProperty:
+                    return SymbolDefinitions.WixBundleMsiProperty;
 
-                case TupleDefinitionType.WixBundleMspPackage:
-                    return TupleDefinitions.WixBundleMspPackage;
+                case SymbolDefinitionType.WixBundleMspPackage:
+                    return SymbolDefinitions.WixBundleMspPackage;
 
-                case TupleDefinitionType.WixBundleMsuPackage:
-                    return TupleDefinitions.WixBundleMsuPackage;
+                case SymbolDefinitionType.WixBundleMsuPackage:
+                    return SymbolDefinitions.WixBundleMsuPackage;
 
-                case TupleDefinitionType.WixBundlePackage:
-                    return TupleDefinitions.WixBundlePackage;
+                case SymbolDefinitionType.WixBundlePackage:
+                    return SymbolDefinitions.WixBundlePackage;
 
-                case TupleDefinitionType.WixBundlePackageCommandLine:
-                    return TupleDefinitions.WixBundlePackageCommandLine;
+                case SymbolDefinitionType.WixBundlePackageCommandLine:
+                    return SymbolDefinitions.WixBundlePackageCommandLine;
 
-                case TupleDefinitionType.WixBundlePackageExitCode:
-                    return TupleDefinitions.WixBundlePackageExitCode;
+                case SymbolDefinitionType.WixBundlePackageExitCode:
+                    return SymbolDefinitions.WixBundlePackageExitCode;
 
-                case TupleDefinitionType.WixBundlePackageGroup:
-                    return TupleDefinitions.WixBundlePackageGroup;
+                case SymbolDefinitionType.WixBundlePackageGroup:
+                    return SymbolDefinitions.WixBundlePackageGroup;
 
-                case TupleDefinitionType.WixBundlePatchTargetCode:
-                    return TupleDefinitions.WixBundlePatchTargetCode;
+                case SymbolDefinitionType.WixBundlePatchTargetCode:
+                    return SymbolDefinitions.WixBundlePatchTargetCode;
 
-                case TupleDefinitionType.WixBundlePayload:
-                    return TupleDefinitions.WixBundlePayload;
+                case SymbolDefinitionType.WixBundlePayload:
+                    return SymbolDefinitions.WixBundlePayload;
 
-                case TupleDefinitionType.WixBundlePayloadGroup:
-                    return TupleDefinitions.WixBundlePayloadGroup;
+                case SymbolDefinitionType.WixBundlePayloadGroup:
+                    return SymbolDefinitions.WixBundlePayloadGroup;
 
-                case TupleDefinitionType.WixBundleRelatedPackage:
-                    return TupleDefinitions.WixBundleRelatedPackage;
+                case SymbolDefinitionType.WixBundleRelatedPackage:
+                    return SymbolDefinitions.WixBundleRelatedPackage;
 
-                case TupleDefinitionType.WixBundleRollbackBoundary:
-                    return TupleDefinitions.WixBundleRollbackBoundary;
+                case SymbolDefinitionType.WixBundleRollbackBoundary:
+                    return SymbolDefinitions.WixBundleRollbackBoundary;
 
-                case TupleDefinitionType.WixBundleSlipstreamMsp:
-                    return TupleDefinitions.WixBundleSlipstreamMsp;
+                case SymbolDefinitionType.WixBundleSlipstreamMsp:
+                    return SymbolDefinitions.WixBundleSlipstreamMsp;
 
-                case TupleDefinitionType.WixBundleUpdate:
-                    return TupleDefinitions.WixBundleUpdate;
+                case SymbolDefinitionType.WixBundleUpdate:
+                    return SymbolDefinitions.WixBundleUpdate;
 
-                case TupleDefinitionType.WixBundleVariable:
-                    return TupleDefinitions.WixBundleVariable;
+                case SymbolDefinitionType.WixBundleVariable:
+                    return SymbolDefinitions.WixBundleVariable;
 
-                case TupleDefinitionType.WixChain:
-                    return TupleDefinitions.WixChain;
+                case SymbolDefinitionType.WixChain:
+                    return SymbolDefinitions.WixChain;
 
-                case TupleDefinitionType.WixChainItem:
-                    return TupleDefinitions.WixChainItem;
+                case SymbolDefinitionType.WixChainItem:
+                    return SymbolDefinitions.WixChainItem;
 
-                case TupleDefinitionType.WixComplexReference:
-                    return TupleDefinitions.WixComplexReference;
+                case SymbolDefinitionType.WixComplexReference:
+                    return SymbolDefinitions.WixComplexReference;
 
-                case TupleDefinitionType.WixComponentGroup:
-                    return TupleDefinitions.WixComponentGroup;
+                case SymbolDefinitionType.WixComponentGroup:
+                    return SymbolDefinitions.WixComponentGroup;
 
-                case TupleDefinitionType.WixComponentSearch:
-                    return TupleDefinitions.WixComponentSearch;
+                case SymbolDefinitionType.WixComponentSearch:
+                    return SymbolDefinitions.WixComponentSearch;
 
-                case TupleDefinitionType.WixCustomTable:
-                    return TupleDefinitions.WixCustomTable;
+                case SymbolDefinitionType.WixCustomTable:
+                    return SymbolDefinitions.WixCustomTable;
 
-                case TupleDefinitionType.WixCustomTableCell:
-                    return TupleDefinitions.WixCustomTableCell;
+                case SymbolDefinitionType.WixCustomTableCell:
+                    return SymbolDefinitions.WixCustomTableCell;
 
-                case TupleDefinitionType.WixCustomTableColumn:
-                    return TupleDefinitions.WixCustomTableColumn;
+                case SymbolDefinitionType.WixCustomTableColumn:
+                    return SymbolDefinitions.WixCustomTableColumn;
 
-                case TupleDefinitionType.WixDeltaPatchFile:
-                    return TupleDefinitions.WixDeltaPatchFile;
+                case SymbolDefinitionType.WixDeltaPatchFile:
+                    return SymbolDefinitions.WixDeltaPatchFile;
 
-                case TupleDefinitionType.WixDeltaPatchSymbolPaths:
-                    return TupleDefinitions.WixDeltaPatchSymbolPaths;
+                case SymbolDefinitionType.WixDeltaPatchSymbolPaths:
+                    return SymbolDefinitions.WixDeltaPatchSymbolPaths;
 
-                case TupleDefinitionType.WixEnsureTable:
-                    return TupleDefinitions.WixEnsureTable;
+                case SymbolDefinitionType.WixEnsureTable:
+                    return SymbolDefinitions.WixEnsureTable;
 
-                case TupleDefinitionType.WixFeatureGroup:
-                    return TupleDefinitions.WixFeatureGroup;
+                case SymbolDefinitionType.WixFeatureGroup:
+                    return SymbolDefinitions.WixFeatureGroup;
 
-                case TupleDefinitionType.WixFeatureModules:
-                    return TupleDefinitions.WixFeatureModules;
+                case SymbolDefinitionType.WixFeatureModules:
+                    return SymbolDefinitions.WixFeatureModules;
 
-                case TupleDefinitionType.WixFileSearch:
-                    return TupleDefinitions.WixFileSearch;
+                case SymbolDefinitionType.WixFileSearch:
+                    return SymbolDefinitions.WixFileSearch;
 
-                case TupleDefinitionType.WixFragment:
-                    return TupleDefinitions.WixFragment;
+                case SymbolDefinitionType.WixFragment:
+                    return SymbolDefinitions.WixFragment;
 
-                case TupleDefinitionType.WixGroup:
-                    return TupleDefinitions.WixGroup;
+                case SymbolDefinitionType.WixGroup:
+                    return SymbolDefinitions.WixGroup;
 
-                case TupleDefinitionType.WixInstanceComponent:
-                    return TupleDefinitions.WixInstanceComponent;
+                case SymbolDefinitionType.WixInstanceComponent:
+                    return SymbolDefinitions.WixInstanceComponent;
 
-                case TupleDefinitionType.WixInstanceTransforms:
-                    return TupleDefinitions.WixInstanceTransforms;
+                case SymbolDefinitionType.WixInstanceTransforms:
+                    return SymbolDefinitions.WixInstanceTransforms;
 
-                case TupleDefinitionType.WixMediaTemplate:
-                    return TupleDefinitions.WixMediaTemplate;
+                case SymbolDefinitionType.WixMediaTemplate:
+                    return SymbolDefinitions.WixMediaTemplate;
 
-                case TupleDefinitionType.WixMerge:
-                    return TupleDefinitions.WixMerge;
+                case SymbolDefinitionType.WixMerge:
+                    return SymbolDefinitions.WixMerge;
 
-                case TupleDefinitionType.WixOrdering:
-                    return TupleDefinitions.WixOrdering;
+                case SymbolDefinitionType.WixOrdering:
+                    return SymbolDefinitions.WixOrdering;
 
-                case TupleDefinitionType.WixPatchBaseline:
-                    return TupleDefinitions.WixPatchBaseline;
+                case SymbolDefinitionType.WixPatchBaseline:
+                    return SymbolDefinitions.WixPatchBaseline;
 
-                case TupleDefinitionType.WixPatchFamilyGroup:
-                    return TupleDefinitions.WixPatchFamilyGroup;
+                case SymbolDefinitionType.WixPatchFamilyGroup:
+                    return SymbolDefinitions.WixPatchFamilyGroup;
 
-                case TupleDefinitionType.WixPatchId:
-                    return TupleDefinitions.WixPatchId;
+                case SymbolDefinitionType.WixPatchId:
+                    return SymbolDefinitions.WixPatchId;
 
-                case TupleDefinitionType.WixPatchRef:
-                    return TupleDefinitions.WixPatchRef;
+                case SymbolDefinitionType.WixPatchRef:
+                    return SymbolDefinitions.WixPatchRef;
 
-                case TupleDefinitionType.WixPatchTarget:
-                    return TupleDefinitions.WixPatchTarget;
+                case SymbolDefinitionType.WixPatchTarget:
+                    return SymbolDefinitions.WixPatchTarget;
 
-                case TupleDefinitionType.WixProductSearch:
-                    return TupleDefinitions.WixProductSearch;
+                case SymbolDefinitionType.WixProductSearch:
+                    return SymbolDefinitions.WixProductSearch;
 
-                case TupleDefinitionType.WixProperty:
-                    return TupleDefinitions.WixProperty;
+                case SymbolDefinitionType.WixProperty:
+                    return SymbolDefinitions.WixProperty;
 
-                case TupleDefinitionType.WixRegistrySearch:
-                    return TupleDefinitions.WixRegistrySearch;
+                case SymbolDefinitionType.WixRegistrySearch:
+                    return SymbolDefinitions.WixRegistrySearch;
 
-                case TupleDefinitionType.WixRelatedBundle:
-                    return TupleDefinitions.WixRelatedBundle;
+                case SymbolDefinitionType.WixRelatedBundle:
+                    return SymbolDefinitions.WixRelatedBundle;
 
-                case TupleDefinitionType.WixSearch:
-                    return TupleDefinitions.WixSearch;
+                case SymbolDefinitionType.WixSearch:
+                    return SymbolDefinitions.WixSearch;
 
-                case TupleDefinitionType.WixSearchRelation:
-                    return TupleDefinitions.WixSearchRelation;
+                case SymbolDefinitionType.WixSearchRelation:
+                    return SymbolDefinitions.WixSearchRelation;
 
-                case TupleDefinitionType.WixSetVariable:
-                    return TupleDefinitions.WixSetVariable;
+                case SymbolDefinitionType.WixSetVariable:
+                    return SymbolDefinitions.WixSetVariable;
 
-                case TupleDefinitionType.WixSimpleReference:
-                    return TupleDefinitions.WixSimpleReference;
+                case SymbolDefinitionType.WixSimpleReference:
+                    return SymbolDefinitions.WixSimpleReference;
 
-                case TupleDefinitionType.WixSuppressAction:
-                    return TupleDefinitions.WixSuppressAction;
+                case SymbolDefinitionType.WixSuppressAction:
+                    return SymbolDefinitions.WixSuppressAction;
 
-                case TupleDefinitionType.WixSuppressModularization:
-                    return TupleDefinitions.WixSuppressModularization;
+                case SymbolDefinitionType.WixSuppressModularization:
+                    return SymbolDefinitions.WixSuppressModularization;
 
-                case TupleDefinitionType.WixUI:
-                    return TupleDefinitions.WixUI;
+                case SymbolDefinitionType.WixUI:
+                    return SymbolDefinitions.WixUI;
 
-                case TupleDefinitionType.WixUpdateRegistration:
-                    return TupleDefinitions.WixUpdateRegistration;
+                case SymbolDefinitionType.WixUpdateRegistration:
+                    return SymbolDefinitions.WixUpdateRegistration;
 
-                case TupleDefinitionType.WixVariable:
-                    return TupleDefinitions.WixVariable;
+                case SymbolDefinitionType.WixVariable:
+                    return SymbolDefinitions.WixVariable;
 
                 default:
                     throw new ArgumentOutOfRangeException(nameof(type));
diff --git a/src/WixToolset.Data/Tuples/TypeLibTuple.cs b/src/WixToolset.Data/Tuples/TypeLibTuple.cs
index 071fe593..736ee292 100644
--- a/src/WixToolset.Data/Tuples/TypeLibTuple.cs
+++ b/src/WixToolset.Data/Tuples/TypeLibTuple.cs
@@ -2,30 +2,30 @@
 
 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 TypeLib = new IntermediateTupleDefinition(
-            TupleDefinitionType.TypeLib,
+        public static readonly IntermediateSymbolDefinition TypeLib = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.TypeLib,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(TypeLibTupleFields.LibId), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Language), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(TypeLibTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Version), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Description), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(TypeLibTupleFields.DirectoryRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(TypeLibTupleFields.FeatureRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(TypeLibTupleFields.Cost), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(TypeLibSymbolFields.LibId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TypeLibSymbolFields.Language), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(TypeLibSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TypeLibSymbolFields.Version), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(TypeLibSymbolFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TypeLibSymbolFields.DirectoryRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TypeLibSymbolFields.FeatureRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(TypeLibSymbolFields.Cost), IntermediateFieldType.Number),
             },
-            typeof(TypeLibTuple));
+            typeof(TypeLibSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum TypeLibTupleFields
+    public enum TypeLibSymbolFields
     {
         LibId,
         Language,
@@ -37,64 +37,64 @@ namespace WixToolset.Data.Tuples
         Cost,
     }
 
-    public class TypeLibTuple : IntermediateTuple
+    public class TypeLibSymbol : IntermediateSymbol
     {
-        public TypeLibTuple() : base(TupleDefinitions.TypeLib, null, null)
+        public TypeLibSymbol() : base(SymbolDefinitions.TypeLib, null, null)
         {
         }
 
-        public TypeLibTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.TypeLib, sourceLineNumber, id)
+        public TypeLibSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.TypeLib, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[TypeLibTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[TypeLibSymbolFields index] => this.Fields[(int)index];
 
         public string LibId
         {
-            get => (string)this.Fields[(int)TypeLibTupleFields.LibId];
-            set => this.Set((int)TypeLibTupleFields.LibId, value);
+            get => (string)this.Fields[(int)TypeLibSymbolFields.LibId];
+            set => this.Set((int)TypeLibSymbolFields.LibId, value);
         }
 
         public int Language
         {
-            get => (int)this.Fields[(int)TypeLibTupleFields.Language];
-            set => this.Set((int)TypeLibTupleFields.Language, value);
+            get => (int)this.Fields[(int)TypeLibSymbolFields.Language];
+            set => this.Set((int)TypeLibSymbolFields.Language, value);
         }
 
         public string ComponentRef
         {
-            get => (string)this.Fields[(int)TypeLibTupleFields.ComponentRef];
-            set => this.Set((int)TypeLibTupleFields.ComponentRef, value);
+            get => (string)this.Fields[(int)TypeLibSymbolFields.ComponentRef];
+            set => this.Set((int)TypeLibSymbolFields.ComponentRef, value);
         }
 
         public int? Version
         {
-            get => (int?)this.Fields[(int)TypeLibTupleFields.Version];
-            set => this.Set((int)TypeLibTupleFields.Version, value);
+            get => (int?)this.Fields[(int)TypeLibSymbolFields.Version];
+            set => this.Set((int)TypeLibSymbolFields.Version, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)TypeLibTupleFields.Description];
-            set => this.Set((int)TypeLibTupleFields.Description, value);
+            get => (string)this.Fields[(int)TypeLibSymbolFields.Description];
+            set => this.Set((int)TypeLibSymbolFields.Description, value);
         }
 
         public string DirectoryRef
         {
-            get => (string)this.Fields[(int)TypeLibTupleFields.DirectoryRef];
-            set => this.Set((int)TypeLibTupleFields.DirectoryRef, value);
+            get => (string)this.Fields[(int)TypeLibSymbolFields.DirectoryRef];
+            set => this.Set((int)TypeLibSymbolFields.DirectoryRef, value);
         }
 
         public string FeatureRef
         {
-            get => (string)this.Fields[(int)TypeLibTupleFields.FeatureRef];
-            set => this.Set((int)TypeLibTupleFields.FeatureRef, value);
+            get => (string)this.Fields[(int)TypeLibSymbolFields.FeatureRef];
+            set => this.Set((int)TypeLibSymbolFields.FeatureRef, value);
         }
 
         public int? Cost
         {
-            get => (int?)this.Fields[(int)TypeLibTupleFields.Cost];
-            set => this.Set((int)TypeLibTupleFields.Cost, value);
+            get => (int?)this.Fields[(int)TypeLibSymbolFields.Cost];
+            set => this.Set((int)TypeLibSymbolFields.Cost, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/UITextTuple.cs b/src/WixToolset.Data/Tuples/UITextTuple.cs
index fee04597..39b99398 100644
--- a/src/WixToolset.Data/Tuples/UITextTuple.cs
+++ b/src/WixToolset.Data/Tuples/UITextTuple.cs
@@ -2,43 +2,43 @@
 
 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 UIText = new IntermediateTupleDefinition(
-            TupleDefinitionType.UIText,
+        public static readonly IntermediateSymbolDefinition UIText = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.UIText,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(UITextTupleFields.Text), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UITextSymbolFields.Text), IntermediateFieldType.String),
             },
-            typeof(UITextTuple));
+            typeof(UITextSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum UITextTupleFields
+    public enum UITextSymbolFields
     {
         Text,
     }
 
-    public class UITextTuple : IntermediateTuple
+    public class UITextSymbol : IntermediateSymbol
     {
-        public UITextTuple() : base(TupleDefinitions.UIText, null, null)
+        public UITextSymbol() : base(SymbolDefinitions.UIText, null, null)
         {
         }
 
-        public UITextTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.UIText, sourceLineNumber, id)
+        public UITextSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.UIText, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[UITextTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[UITextSymbolFields index] => this.Fields[(int)index];
 
         public string Text
         {
-            get => (string)this.Fields[(int)UITextTupleFields.Text];
-            set => this.Set((int)UITextTupleFields.Text, value);
+            get => (string)this.Fields[(int)UITextSymbolFields.Text];
+            set => this.Set((int)UITextSymbolFields.Text, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/UpgradeTuple.cs b/src/WixToolset.Data/Tuples/UpgradeTuple.cs
index 03e5edd2..d8deee73 100644
--- a/src/WixToolset.Data/Tuples/UpgradeTuple.cs
+++ b/src/WixToolset.Data/Tuples/UpgradeTuple.cs
@@ -2,34 +2,34 @@
 
 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 Upgrade = new IntermediateTupleDefinition(
-            TupleDefinitionType.Upgrade,
+        public static readonly IntermediateSymbolDefinition Upgrade = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.Upgrade,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(UpgradeTupleFields.UpgradeCode), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(UpgradeTupleFields.VersionMin), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(UpgradeTupleFields.VersionMax), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(UpgradeTupleFields.Language), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(UpgradeTupleFields.ExcludeLanguages), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(UpgradeTupleFields.IgnoreRemoveFailures), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(UpgradeTupleFields.MigrateFeatures), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(UpgradeTupleFields.OnlyDetect), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(UpgradeTupleFields.VersionMaxInclusive), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(UpgradeTupleFields.VersionMinInclusive), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(UpgradeTupleFields.Remove), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(UpgradeTupleFields.ActionProperty), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradeSymbolFields.UpgradeCode), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradeSymbolFields.VersionMin), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradeSymbolFields.VersionMax), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradeSymbolFields.Language), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradeSymbolFields.ExcludeLanguages), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(UpgradeSymbolFields.IgnoreRemoveFailures), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(UpgradeSymbolFields.MigrateFeatures), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(UpgradeSymbolFields.OnlyDetect), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(UpgradeSymbolFields.VersionMaxInclusive), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(UpgradeSymbolFields.VersionMinInclusive), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(UpgradeSymbolFields.Remove), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradeSymbolFields.ActionProperty), IntermediateFieldType.String),
             },
-            typeof(UpgradeTuple));
+            typeof(UpgradeSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum UpgradeTupleFields
+    public enum UpgradeSymbolFields
     {
         UpgradeCode,
         VersionMin,
@@ -45,88 +45,88 @@ namespace WixToolset.Data.Tuples
         ActionProperty,
     }
 
-    public class UpgradeTuple : IntermediateTuple
+    public class UpgradeSymbol : IntermediateSymbol
     {
-        public UpgradeTuple() : base(TupleDefinitions.Upgrade, null, null)
+        public UpgradeSymbol() : base(SymbolDefinitions.Upgrade, null, null)
         {
         }
 
-        public UpgradeTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Upgrade, sourceLineNumber, id)
+        public UpgradeSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Upgrade, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[UpgradeTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[UpgradeSymbolFields index] => this.Fields[(int)index];
 
         public string UpgradeCode
         {
-            get => (string)this.Fields[(int)UpgradeTupleFields.UpgradeCode];
-            set => this.Set((int)UpgradeTupleFields.UpgradeCode, value);
+            get => (string)this.Fields[(int)UpgradeSymbolFields.UpgradeCode];
+            set => this.Set((int)UpgradeSymbolFields.UpgradeCode, value);
         }
 
         public string VersionMin
         {
-            get => (string)this.Fields[(int)UpgradeTupleFields.VersionMin];
-            set => this.Set((int)UpgradeTupleFields.VersionMin, value);
+            get => (string)this.Fields[(int)UpgradeSymbolFields.VersionMin];
+            set => this.Set((int)UpgradeSymbolFields.VersionMin, value);
         }
 
         public string VersionMax
         {
-            get => (string)this.Fields[(int)UpgradeTupleFields.VersionMax];
-            set => this.Set((int)UpgradeTupleFields.VersionMax, value);
+            get => (string)this.Fields[(int)UpgradeSymbolFields.VersionMax];
+            set => this.Set((int)UpgradeSymbolFields.VersionMax, value);
         }
 
         public string Language
         {
-            get => (string)this.Fields[(int)UpgradeTupleFields.Language];
-            set => this.Set((int)UpgradeTupleFields.Language, value);
+            get => (string)this.Fields[(int)UpgradeSymbolFields.Language];
+            set => this.Set((int)UpgradeSymbolFields.Language, value);
         }
 
         public bool ExcludeLanguages
         {
-            get => this.Fields[(int)UpgradeTupleFields.ExcludeLanguages].AsBool();
-            set => this.Set((int)UpgradeTupleFields.ExcludeLanguages, value);
+            get => this.Fields[(int)UpgradeSymbolFields.ExcludeLanguages].AsBool();
+            set => this.Set((int)UpgradeSymbolFields.ExcludeLanguages, value);
         }
 
         public bool IgnoreRemoveFailures
         {
-            get => this.Fields[(int)UpgradeTupleFields.IgnoreRemoveFailures].AsBool();
-            set => this.Set((int)UpgradeTupleFields.IgnoreRemoveFailures, value);
+            get => this.Fields[(int)UpgradeSymbolFields.IgnoreRemoveFailures].AsBool();
+            set => this.Set((int)UpgradeSymbolFields.IgnoreRemoveFailures, value);
         }
 
         public bool MigrateFeatures
         {
-            get => this.Fields[(int)UpgradeTupleFields.MigrateFeatures].AsBool();
-            set => this.Set((int)UpgradeTupleFields.MigrateFeatures, value);
+            get => this.Fields[(int)UpgradeSymbolFields.MigrateFeatures].AsBool();
+            set => this.Set((int)UpgradeSymbolFields.MigrateFeatures, value);
         }
 
         public bool OnlyDetect
         {
-            get => this.Fields[(int)UpgradeTupleFields.OnlyDetect].AsBool();
-            set => this.Set((int)UpgradeTupleFields.OnlyDetect, value);
+            get => this.Fields[(int)UpgradeSymbolFields.OnlyDetect].AsBool();
+            set => this.Set((int)UpgradeSymbolFields.OnlyDetect, value);
         }
 
         public bool VersionMaxInclusive
         {
-            get => this.Fields[(int)UpgradeTupleFields.VersionMaxInclusive].AsBool();
-            set => this.Set((int)UpgradeTupleFields.VersionMaxInclusive, value);
+            get => this.Fields[(int)UpgradeSymbolFields.VersionMaxInclusive].AsBool();
+            set => this.Set((int)UpgradeSymbolFields.VersionMaxInclusive, value);
         }
 
         public bool VersionMinInclusive
         {
-            get => this.Fields[(int)UpgradeTupleFields.VersionMinInclusive].AsBool();
-            set => this.Set((int)UpgradeTupleFields.VersionMinInclusive, value);
+            get => this.Fields[(int)UpgradeSymbolFields.VersionMinInclusive].AsBool();
+            set => this.Set((int)UpgradeSymbolFields.VersionMinInclusive, value);
         }
 
         public string Remove
         {
-            get => (string)this.Fields[(int)UpgradeTupleFields.Remove];
-            set => this.Set((int)UpgradeTupleFields.Remove, value);
+            get => (string)this.Fields[(int)UpgradeSymbolFields.Remove];
+            set => this.Set((int)UpgradeSymbolFields.Remove, value);
         }
 
         public string ActionProperty
         {
-            get => (string)this.Fields[(int)UpgradeTupleFields.ActionProperty];
-            set => this.Set((int)UpgradeTupleFields.ActionProperty, value);
+            get => (string)this.Fields[(int)UpgradeSymbolFields.ActionProperty];
+            set => this.Set((int)UpgradeSymbolFields.ActionProperty, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/UpgradedFilesOptionalDataTuple.cs b/src/WixToolset.Data/Tuples/UpgradedFilesOptionalDataTuple.cs
index 1b4769b3..9e669ec3 100644
--- a/src/WixToolset.Data/Tuples/UpgradedFilesOptionalDataTuple.cs
+++ b/src/WixToolset.Data/Tuples/UpgradedFilesOptionalDataTuple.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 UpgradedFilesOptionalData = new IntermediateTupleDefinition(
-            TupleDefinitionType.UpgradedFilesOptionalData,
+        public static readonly IntermediateSymbolDefinition UpgradedFilesOptionalData = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.UpgradedFilesOptionalData,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(UpgradedFilesOptionalDataTupleFields.Upgraded), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(UpgradedFilesOptionalDataTupleFields.FTK), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(UpgradedFilesOptionalDataTupleFields.SymbolPaths), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(UpgradedFilesOptionalDataTupleFields.AllowIgnoreOnPatchError), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(UpgradedFilesOptionalDataTupleFields.IncludeWholeFile), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(UpgradedFilesOptionalDataSymbolFields.Upgraded), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradedFilesOptionalDataSymbolFields.FTK), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradedFilesOptionalDataSymbolFields.SymbolPaths), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradedFilesOptionalDataSymbolFields.AllowIgnoreOnPatchError), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(UpgradedFilesOptionalDataSymbolFields.IncludeWholeFile), IntermediateFieldType.Bool),
             },
-            typeof(UpgradedFilesOptionalDataTuple));
+            typeof(UpgradedFilesOptionalDataSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum UpgradedFilesOptionalDataTupleFields
+    public enum UpgradedFilesOptionalDataSymbolFields
     {
         Upgraded,
         FTK,
@@ -31,46 +31,46 @@ namespace WixToolset.Data.Tuples
         IncludeWholeFile,
     }
 
-    public class UpgradedFilesOptionalDataTuple : IntermediateTuple
+    public class UpgradedFilesOptionalDataSymbol : IntermediateSymbol
     {
-        public UpgradedFilesOptionalDataTuple() : base(TupleDefinitions.UpgradedFilesOptionalData, null, null)
+        public UpgradedFilesOptionalDataSymbol() : base(SymbolDefinitions.UpgradedFilesOptionalData, null, null)
         {
         }
 
-        public UpgradedFilesOptionalDataTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.UpgradedFilesOptionalData, sourceLineNumber, id)
+        public UpgradedFilesOptionalDataSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.UpgradedFilesOptionalData, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[UpgradedFilesOptionalDataTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[UpgradedFilesOptionalDataSymbolFields index] => this.Fields[(int)index];
 
         public string Upgraded
         {
-            get => (string)this.Fields[(int)UpgradedFilesOptionalDataTupleFields.Upgraded];
-            set => this.Set((int)UpgradedFilesOptionalDataTupleFields.Upgraded, value);
+            get => (string)this.Fields[(int)UpgradedFilesOptionalDataSymbolFields.Upgraded];
+            set => this.Set((int)UpgradedFilesOptionalDataSymbolFields.Upgraded, value);
         }
 
         public string FTK
         {
-            get => (string)this.Fields[(int)UpgradedFilesOptionalDataTupleFields.FTK];
-            set => this.Set((int)UpgradedFilesOptionalDataTupleFields.FTK, value);
+            get => (string)this.Fields[(int)UpgradedFilesOptionalDataSymbolFields.FTK];
+            set => this.Set((int)UpgradedFilesOptionalDataSymbolFields.FTK, value);
         }
 
         public string SymbolPaths
         {
-            get => (string)this.Fields[(int)UpgradedFilesOptionalDataTupleFields.SymbolPaths];
-            set => this.Set((int)UpgradedFilesOptionalDataTupleFields.SymbolPaths, value);
+            get => (string)this.Fields[(int)UpgradedFilesOptionalDataSymbolFields.SymbolPaths];
+            set => this.Set((int)UpgradedFilesOptionalDataSymbolFields.SymbolPaths, value);
         }
 
         public bool? AllowIgnoreOnPatchError
         {
-            get => (bool?)this.Fields[(int)UpgradedFilesOptionalDataTupleFields.AllowIgnoreOnPatchError];
-            set => this.Set((int)UpgradedFilesOptionalDataTupleFields.AllowIgnoreOnPatchError, value);
+            get => (bool?)this.Fields[(int)UpgradedFilesOptionalDataSymbolFields.AllowIgnoreOnPatchError];
+            set => this.Set((int)UpgradedFilesOptionalDataSymbolFields.AllowIgnoreOnPatchError, value);
         }
 
         public bool? IncludeWholeFile
         {
-            get => (bool?)this.Fields[(int)UpgradedFilesOptionalDataTupleFields.IncludeWholeFile];
-            set => this.Set((int)UpgradedFilesOptionalDataTupleFields.IncludeWholeFile, value);
+            get => (bool?)this.Fields[(int)UpgradedFilesOptionalDataSymbolFields.IncludeWholeFile];
+            set => this.Set((int)UpgradedFilesOptionalDataSymbolFields.IncludeWholeFile, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/UpgradedFilesToIgnoreTuple.cs b/src/WixToolset.Data/Tuples/UpgradedFilesToIgnoreTuple.cs
index 95617c6f..e21af6a2 100644
--- a/src/WixToolset.Data/Tuples/UpgradedFilesToIgnoreTuple.cs
+++ b/src/WixToolset.Data/Tuples/UpgradedFilesToIgnoreTuple.cs
@@ -2,51 +2,51 @@
 
 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 UpgradedFilesToIgnore = new IntermediateTupleDefinition(
-            TupleDefinitionType.UpgradedFilesToIgnore,
+        public static readonly IntermediateSymbolDefinition UpgradedFilesToIgnore = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.UpgradedFilesToIgnore,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(UpgradedFilesToIgnoreTupleFields.Upgraded), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(UpgradedFilesToIgnoreTupleFields.FTK), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradedFilesToIgnoreSymbolFields.Upgraded), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradedFilesToIgnoreSymbolFields.FTK), IntermediateFieldType.String),
             },
-            typeof(UpgradedFilesToIgnoreTuple));
+            typeof(UpgradedFilesToIgnoreSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum UpgradedFilesToIgnoreTupleFields
+    public enum UpgradedFilesToIgnoreSymbolFields
     {
         Upgraded,
         FTK,
     }
 
-    public class UpgradedFilesToIgnoreTuple : IntermediateTuple
+    public class UpgradedFilesToIgnoreSymbol : IntermediateSymbol
     {
-        public UpgradedFilesToIgnoreTuple() : base(TupleDefinitions.UpgradedFilesToIgnore, null, null)
+        public UpgradedFilesToIgnoreSymbol() : base(SymbolDefinitions.UpgradedFilesToIgnore, null, null)
         {
         }
 
-        public UpgradedFilesToIgnoreTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.UpgradedFilesToIgnore, sourceLineNumber, id)
+        public UpgradedFilesToIgnoreSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.UpgradedFilesToIgnore, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[UpgradedFilesToIgnoreTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[UpgradedFilesToIgnoreSymbolFields index] => this.Fields[(int)index];
 
         public string Upgraded
         {
-            get => (string)this.Fields[(int)UpgradedFilesToIgnoreTupleFields.Upgraded];
-            set => this.Set((int)UpgradedFilesToIgnoreTupleFields.Upgraded, value);
+            get => (string)this.Fields[(int)UpgradedFilesToIgnoreSymbolFields.Upgraded];
+            set => this.Set((int)UpgradedFilesToIgnoreSymbolFields.Upgraded, value);
         }
 
         public string FTK
         {
-            get => (string)this.Fields[(int)UpgradedFilesToIgnoreTupleFields.FTK];
-            set => this.Set((int)UpgradedFilesToIgnoreTupleFields.FTK, value);
+            get => (string)this.Fields[(int)UpgradedFilesToIgnoreSymbolFields.FTK];
+            set => this.Set((int)UpgradedFilesToIgnoreSymbolFields.FTK, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/UpgradedImagesTuple.cs b/src/WixToolset.Data/Tuples/UpgradedImagesTuple.cs
index 856c27e2..28eae08a 100644
--- a/src/WixToolset.Data/Tuples/UpgradedImagesTuple.cs
+++ b/src/WixToolset.Data/Tuples/UpgradedImagesTuple.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 UpgradedImages = new IntermediateTupleDefinition(
-            TupleDefinitionType.UpgradedImages,
+        public static readonly IntermediateSymbolDefinition UpgradedImages = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.UpgradedImages,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(UpgradedImagesTupleFields.Upgraded), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(UpgradedImagesTupleFields.MsiPath), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(UpgradedImagesTupleFields.PatchMsiPath), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(UpgradedImagesTupleFields.SymbolPaths), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(UpgradedImagesTupleFields.Family), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradedImagesSymbolFields.Upgraded), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradedImagesSymbolFields.MsiPath), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradedImagesSymbolFields.PatchMsiPath), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradedImagesSymbolFields.SymbolPaths), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(UpgradedImagesSymbolFields.Family), IntermediateFieldType.String),
             },
-            typeof(UpgradedImagesTuple));
+            typeof(UpgradedImagesSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum UpgradedImagesTupleFields
+    public enum UpgradedImagesSymbolFields
     {
         Upgraded,
         MsiPath,
@@ -31,46 +31,46 @@ namespace WixToolset.Data.Tuples
         Family,
     }
 
-    public class UpgradedImagesTuple : IntermediateTuple
+    public class UpgradedImagesSymbol : IntermediateSymbol
     {
-        public UpgradedImagesTuple() : base(TupleDefinitions.UpgradedImages, null, null)
+        public UpgradedImagesSymbol() : base(SymbolDefinitions.UpgradedImages, null, null)
         {
         }
 
-        public UpgradedImagesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.UpgradedImages, sourceLineNumber, id)
+        public UpgradedImagesSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.UpgradedImages, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[UpgradedImagesTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[UpgradedImagesSymbolFields index] => this.Fields[(int)index];
 
         public string Upgraded
         {
-            get => (string)this.Fields[(int)UpgradedImagesTupleFields.Upgraded];
-            set => this.Set((int)UpgradedImagesTupleFields.Upgraded, value);
+            get => (string)this.Fields[(int)UpgradedImagesSymbolFields.Upgraded];
+            set => this.Set((int)UpgradedImagesSymbolFields.Upgraded, value);
         }
 
         public string MsiPath
         {
-            get => (string)this.Fields[(int)UpgradedImagesTupleFields.MsiPath];
-            set => this.Set((int)UpgradedImagesTupleFields.MsiPath, value);
+            get => (string)this.Fields[(int)UpgradedImagesSymbolFields.MsiPath];
+            set => this.Set((int)UpgradedImagesSymbolFields.MsiPath, value);
         }
 
         public string PatchMsiPath
         {
-            get => (string)this.Fields[(int)UpgradedImagesTupleFields.PatchMsiPath];
-            set => this.Set((int)UpgradedImagesTupleFields.PatchMsiPath, value);
+            get => (string)this.Fields[(int)UpgradedImagesSymbolFields.PatchMsiPath];
+            set => this.Set((int)UpgradedImagesSymbolFields.PatchMsiPath, value);
         }
 
         public string SymbolPaths
         {
-            get => (string)this.Fields[(int)UpgradedImagesTupleFields.SymbolPaths];
-            set => this.Set((int)UpgradedImagesTupleFields.SymbolPaths, value);
+            get => (string)this.Fields[(int)UpgradedImagesSymbolFields.SymbolPaths];
+            set => this.Set((int)UpgradedImagesSymbolFields.SymbolPaths, value);
         }
 
         public string Family
         {
-            get => (string)this.Fields[(int)UpgradedImagesTupleFields.Family];
-            set => this.Set((int)UpgradedImagesTupleFields.Family, value);
+            get => (string)this.Fields[(int)UpgradedImagesSymbolFields.Family];
+            set => this.Set((int)UpgradedImagesSymbolFields.Family, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/VerbTuple.cs b/src/WixToolset.Data/Tuples/VerbTuple.cs
index 7a257a3e..95f045d6 100644
--- a/src/WixToolset.Data/Tuples/VerbTuple.cs
+++ b/src/WixToolset.Data/Tuples/VerbTuple.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 Verb = new IntermediateTupleDefinition(
-            TupleDefinitionType.Verb,
+        public static readonly IntermediateSymbolDefinition Verb = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.Verb,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(VerbTupleFields.ExtensionRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(VerbTupleFields.Verb), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(VerbTupleFields.Sequence), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(VerbTupleFields.Command), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(VerbTupleFields.Argument), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(VerbSymbolFields.ExtensionRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(VerbSymbolFields.Verb), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(VerbSymbolFields.Sequence), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(VerbSymbolFields.Command), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(VerbSymbolFields.Argument), IntermediateFieldType.String),
             },
-            typeof(VerbTuple));
+            typeof(VerbSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum VerbTupleFields
+    public enum VerbSymbolFields
     {
         ExtensionRef,
         Verb,
@@ -31,46 +31,46 @@ namespace WixToolset.Data.Tuples
         Argument,
     }
 
-    public class VerbTuple : IntermediateTuple
+    public class VerbSymbol : IntermediateSymbol
     {
-        public VerbTuple() : base(TupleDefinitions.Verb, null, null)
+        public VerbSymbol() : base(SymbolDefinitions.Verb, null, null)
         {
         }
 
-        public VerbTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Verb, sourceLineNumber, id)
+        public VerbSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.Verb, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[VerbTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[VerbSymbolFields index] => this.Fields[(int)index];
 
         public string ExtensionRef
         {
-            get => (string)this.Fields[(int)VerbTupleFields.ExtensionRef];
-            set => this.Set((int)VerbTupleFields.ExtensionRef, value);
+            get => (string)this.Fields[(int)VerbSymbolFields.ExtensionRef];
+            set => this.Set((int)VerbSymbolFields.ExtensionRef, value);
         }
 
         public string Verb
         {
-            get => (string)this.Fields[(int)VerbTupleFields.Verb];
-            set => this.Set((int)VerbTupleFields.Verb, value);
+            get => (string)this.Fields[(int)VerbSymbolFields.Verb];
+            set => this.Set((int)VerbSymbolFields.Verb, value);
         }
 
         public int? Sequence
         {
-            get => (int?)this.Fields[(int)VerbTupleFields.Sequence];
-            set => this.Set((int)VerbTupleFields.Sequence, value);
+            get => (int?)this.Fields[(int)VerbSymbolFields.Sequence];
+            set => this.Set((int)VerbSymbolFields.Sequence, value);
         }
 
         public string Command
         {
-            get => (string)this.Fields[(int)VerbTupleFields.Command];
-            set => this.Set((int)VerbTupleFields.Command, value);
+            get => (string)this.Fields[(int)VerbSymbolFields.Command];
+            set => this.Set((int)VerbSymbolFields.Command, value);
         }
 
         public string Argument
         {
-            get => (string)this.Fields[(int)VerbTupleFields.Argument];
-            set => this.Set((int)VerbTupleFields.Argument, value);
+            get => (string)this.Fields[(int)VerbSymbolFields.Argument];
+            set => this.Set((int)VerbSymbolFields.Argument, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixActionTuple.cs b/src/WixToolset.Data/Tuples/WixActionTuple.cs
index 28a10698..a055d68f 100644
--- a/src/WixToolset.Data/Tuples/WixActionTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixActionTuple.cs
@@ -2,29 +2,29 @@
 
 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 WixAction = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixAction,
+        public static readonly IntermediateSymbolDefinition WixAction = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixAction,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixActionTupleFields.SequenceTable), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixActionTupleFields.Action), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixActionTupleFields.Condition), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixActionTupleFields.Sequence), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixActionTupleFields.Before), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixActionTupleFields.After), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixActionTupleFields.Overridable), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(WixActionSymbolFields.SequenceTable), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixActionSymbolFields.Action), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixActionSymbolFields.Condition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixActionSymbolFields.Sequence), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixActionSymbolFields.Before), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixActionSymbolFields.After), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixActionSymbolFields.Overridable), IntermediateFieldType.Bool),
             },
-            typeof(WixActionTuple));
+            typeof(WixActionSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixActionTupleFields
+    public enum WixActionSymbolFields
     {
         SequenceTable,
         Action,
@@ -44,58 +44,58 @@ namespace WixToolset.Data.Tuples
         InstallExecuteSequence
     }
 
-    public class WixActionTuple : IntermediateTuple
+    public class WixActionSymbol : IntermediateSymbol
     {
-        public WixActionTuple() : base(TupleDefinitions.WixAction, null, null)
+        public WixActionSymbol() : base(SymbolDefinitions.WixAction, null, null)
         {
         }
 
-        public WixActionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixAction, sourceLineNumber, id)
+        public WixActionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixAction, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixActionTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixActionSymbolFields index] => this.Fields[(int)index];
 
         public SequenceTable SequenceTable
         {
-            get => (SequenceTable)this.Fields[(int)WixActionTupleFields.SequenceTable].AsNumber();
-            set => this.Set((int)WixActionTupleFields.SequenceTable, (int)value);
+            get => (SequenceTable)this.Fields[(int)WixActionSymbolFields.SequenceTable].AsNumber();
+            set => this.Set((int)WixActionSymbolFields.SequenceTable, (int)value);
         }
 
         public string Action
         {
-            get => (string)this.Fields[(int)WixActionTupleFields.Action];
-            set => this.Set((int)WixActionTupleFields.Action, value);
+            get => (string)this.Fields[(int)WixActionSymbolFields.Action];
+            set => this.Set((int)WixActionSymbolFields.Action, value);
         }
 
         public string Condition
         {
-            get => (string)this.Fields[(int)WixActionTupleFields.Condition];
-            set => this.Set((int)WixActionTupleFields.Condition, value);
+            get => (string)this.Fields[(int)WixActionSymbolFields.Condition];
+            set => this.Set((int)WixActionSymbolFields.Condition, value);
         }
 
         public int? Sequence
         {
-            get => (int?)this.Fields[(int)WixActionTupleFields.Sequence];
-            set => this.Set((int)WixActionTupleFields.Sequence, value);
+            get => (int?)this.Fields[(int)WixActionSymbolFields.Sequence];
+            set => this.Set((int)WixActionSymbolFields.Sequence, value);
         }
 
         public string Before
         {
-            get => (string)this.Fields[(int)WixActionTupleFields.Before];
-            set => this.Set((int)WixActionTupleFields.Before, value);
+            get => (string)this.Fields[(int)WixActionSymbolFields.Before];
+            set => this.Set((int)WixActionSymbolFields.Before, value);
         }
 
         public string After
         {
-            get => (string)this.Fields[(int)WixActionTupleFields.After];
-            set => this.Set((int)WixActionTupleFields.After, value);
+            get => (string)this.Fields[(int)WixActionSymbolFields.After];
+            set => this.Set((int)WixActionSymbolFields.After, value);
         }
 
         public bool Overridable
         {
-            get => this.Fields[(int)WixActionTupleFields.Overridable].AsBool();
-            set => this.Set((int)WixActionTupleFields.Overridable, value);
+            get => this.Fields[(int)WixActionSymbolFields.Overridable].AsBool();
+            set => this.Set((int)WixActionSymbolFields.Overridable, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/WixApprovedExeForElevationTuple.cs b/src/WixToolset.Data/Tuples/WixApprovedExeForElevationTuple.cs
index 07fe838b..04c6e712 100644
--- a/src/WixToolset.Data/Tuples/WixApprovedExeForElevationTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixApprovedExeForElevationTuple.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 WixApprovedExeForElevation = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixApprovedExeForElevation,
+        public static readonly IntermediateSymbolDefinition WixApprovedExeForElevation = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixApprovedExeForElevation,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixApprovedExeForElevationTupleFields.Key), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixApprovedExeForElevationTupleFields.ValueName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixApprovedExeForElevationTupleFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixApprovedExeForElevationSymbolFields.Key), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixApprovedExeForElevationSymbolFields.ValueName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixApprovedExeForElevationSymbolFields.Attributes), IntermediateFieldType.Number),
             },
-            typeof(WixApprovedExeForElevationTuple));
+            typeof(WixApprovedExeForElevationSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
     using System;
 
-    public enum WixApprovedExeForElevationTupleFields
+    public enum WixApprovedExeForElevationSymbolFields
     {
         Key,
         ValueName,
@@ -36,34 +36,34 @@ namespace WixToolset.Data.Tuples
         Win64 = 0x1,
     }
 
-    public class WixApprovedExeForElevationTuple : IntermediateTuple
+    public class WixApprovedExeForElevationSymbol : IntermediateSymbol
     {
-        public WixApprovedExeForElevationTuple() : base(TupleDefinitions.WixApprovedExeForElevation, null, null)
+        public WixApprovedExeForElevationSymbol() : base(SymbolDefinitions.WixApprovedExeForElevation, null, null)
         {
         }
 
-        public WixApprovedExeForElevationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixApprovedExeForElevation, sourceLineNumber, id)
+        public WixApprovedExeForElevationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixApprovedExeForElevation, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixApprovedExeForElevationTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixApprovedExeForElevationSymbolFields index] => this.Fields[(int)index];
 
         public string Key
         {
-            get => (string)this.Fields[(int)WixApprovedExeForElevationTupleFields.Key];
-            set => this.Set((int)WixApprovedExeForElevationTupleFields.Key, value);
+            get => (string)this.Fields[(int)WixApprovedExeForElevationSymbolFields.Key];
+            set => this.Set((int)WixApprovedExeForElevationSymbolFields.Key, value);
         }
 
         public string ValueName
         {
-            get => (string)this.Fields[(int)WixApprovedExeForElevationTupleFields.ValueName];
-            set => this.Set((int)WixApprovedExeForElevationTupleFields.ValueName, value);
+            get => (string)this.Fields[(int)WixApprovedExeForElevationSymbolFields.ValueName];
+            set => this.Set((int)WixApprovedExeForElevationSymbolFields.ValueName, value);
         }
 
         public WixApprovedExeForElevationAttributes Attributes
         {
-            get => (WixApprovedExeForElevationAttributes)this.Fields[(int)WixApprovedExeForElevationTupleFields.Attributes].AsNumber();
-            set => this.Set((int)WixApprovedExeForElevationTupleFields.Attributes, (int)value);
+            get => (WixApprovedExeForElevationAttributes)this.Fields[(int)WixApprovedExeForElevationSymbolFields.Attributes].AsNumber();
+            set => this.Set((int)WixApprovedExeForElevationSymbolFields.Attributes, (int)value);
         }
 
         public bool Win64 => (this.Attributes & WixApprovedExeForElevationAttributes.Win64) == WixApprovedExeForElevationAttributes.Win64;
diff --git a/src/WixToolset.Data/Tuples/WixBindUpdatedFilesTuple.cs b/src/WixToolset.Data/Tuples/WixBindUpdatedFilesTuple.cs
index aca47b6c..03bdb69b 100644
--- a/src/WixToolset.Data/Tuples/WixBindUpdatedFilesTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBindUpdatedFilesTuple.cs
@@ -2,43 +2,43 @@
 
 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 WixBindUpdatedFiles = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixBindUpdatedFiles,
+        public static readonly IntermediateSymbolDefinition WixBindUpdatedFiles = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixBindUpdatedFiles,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBindUpdatedFilesTupleFields.FileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBindUpdatedFilesSymbolFields.FileRef), IntermediateFieldType.String),
             },
-            typeof(WixBindUpdatedFilesTuple));
+            typeof(WixBindUpdatedFilesSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixBindUpdatedFilesTupleFields
+    public enum WixBindUpdatedFilesSymbolFields
     {
         FileRef,
     }
 
-    public class WixBindUpdatedFilesTuple : IntermediateTuple
+    public class WixBindUpdatedFilesSymbol : IntermediateSymbol
     {
-        public WixBindUpdatedFilesTuple() : base(TupleDefinitions.WixBindUpdatedFiles, null, null)
+        public WixBindUpdatedFilesSymbol() : base(SymbolDefinitions.WixBindUpdatedFiles, null, null)
         {
         }
 
-        public WixBindUpdatedFilesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBindUpdatedFiles, sourceLineNumber, id)
+        public WixBindUpdatedFilesSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBindUpdatedFiles, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBindUpdatedFilesTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBindUpdatedFilesSymbolFields index] => this.Fields[(int)index];
 
         public string FileRef
         {
-            get => (string)this.Fields[(int)WixBindUpdatedFilesTupleFields.FileRef];
-            set => this.Set((int)WixBindUpdatedFilesTupleFields.FileRef, value);
+            get => (string)this.Fields[(int)WixBindUpdatedFilesSymbolFields.FileRef];
+            set => this.Set((int)WixBindUpdatedFilesSymbolFields.FileRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBootstrapperApplicationTuple.cs b/src/WixToolset.Data/Tuples/WixBootstrapperApplicationTuple.cs
index 84a74b17..3d7876fd 100644
--- a/src/WixToolset.Data/Tuples/WixBootstrapperApplicationTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBootstrapperApplicationTuple.cs
@@ -2,35 +2,35 @@
 
 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 WixBootstrapperApplication = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixBootstrapperApplication,
+        public static readonly IntermediateSymbolDefinition WixBootstrapperApplication = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixBootstrapperApplication,
             new IntermediateFieldDefinition[]
             {
             },
-            typeof(WixBootstrapperApplicationTuple));
+            typeof(WixBootstrapperApplicationSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixBootstrapperApplicationTupleFields
+    public enum WixBootstrapperApplicationSymbolFields
     {
     }
 
-    public class WixBootstrapperApplicationTuple : IntermediateTuple
+    public class WixBootstrapperApplicationSymbol : IntermediateSymbol
     {
-        public WixBootstrapperApplicationTuple() : base(TupleDefinitions.WixBootstrapperApplication, null, null)
+        public WixBootstrapperApplicationSymbol() : base(SymbolDefinitions.WixBootstrapperApplication, null, null)
         {
         }
 
-        public WixBootstrapperApplicationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBootstrapperApplication, sourceLineNumber, id)
+        public WixBootstrapperApplicationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBootstrapperApplication, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBootstrapperApplicationTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBootstrapperApplicationSymbolFields index] => this.Fields[(int)index];
     }
 }
diff --git a/src/WixToolset.Data/Tuples/WixBuildInfoTuple.cs b/src/WixToolset.Data/Tuples/WixBuildInfoTuple.cs
index 9abb999b..66e04d4b 100644
--- a/src/WixToolset.Data/Tuples/WixBuildInfoTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBuildInfoTuple.cs
@@ -2,26 +2,26 @@
 
 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 WixBuildInfo = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixBuildInfo,
+        public static readonly IntermediateSymbolDefinition WixBuildInfo = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixBuildInfo,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBuildInfoTupleFields.WixVersion), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBuildInfoTupleFields.WixOutputFile), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBuildInfoTupleFields.WixProjectFile), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBuildInfoTupleFields.WixPdbFile), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBuildInfoSymbolFields.WixVersion), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBuildInfoSymbolFields.WixOutputFile), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBuildInfoSymbolFields.WixProjectFile), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBuildInfoSymbolFields.WixPdbFile), IntermediateFieldType.String),
             },
-            typeof(WixBuildInfoTuple));
+            typeof(WixBuildInfoSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixBuildInfoTupleFields
+    public enum WixBuildInfoSymbolFields
     {
         WixVersion,
         WixOutputFile,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
         WixPdbFile,
     }
 
-    public class WixBuildInfoTuple : IntermediateTuple
+    public class WixBuildInfoSymbol : IntermediateSymbol
     {
-        public WixBuildInfoTuple() : base(TupleDefinitions.WixBuildInfo, null, null)
+        public WixBuildInfoSymbol() : base(SymbolDefinitions.WixBuildInfo, null, null)
         {
         }
 
-        public WixBuildInfoTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBuildInfo, sourceLineNumber, id)
+        public WixBuildInfoSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBuildInfo, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBuildInfoTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBuildInfoSymbolFields index] => this.Fields[(int)index];
 
         public string WixVersion
         {
-            get => (string)this.Fields[(int)WixBuildInfoTupleFields.WixVersion];
-            set => this.Set((int)WixBuildInfoTupleFields.WixVersion, value);
+            get => (string)this.Fields[(int)WixBuildInfoSymbolFields.WixVersion];
+            set => this.Set((int)WixBuildInfoSymbolFields.WixVersion, value);
         }
 
         public string WixOutputFile
         {
-            get => (string)this.Fields[(int)WixBuildInfoTupleFields.WixOutputFile];
-            set => this.Set((int)WixBuildInfoTupleFields.WixOutputFile, value);
+            get => (string)this.Fields[(int)WixBuildInfoSymbolFields.WixOutputFile];
+            set => this.Set((int)WixBuildInfoSymbolFields.WixOutputFile, value);
         }
 
         public string WixProjectFile
         {
-            get => (string)this.Fields[(int)WixBuildInfoTupleFields.WixProjectFile];
-            set => this.Set((int)WixBuildInfoTupleFields.WixProjectFile, value);
+            get => (string)this.Fields[(int)WixBuildInfoSymbolFields.WixProjectFile];
+            set => this.Set((int)WixBuildInfoSymbolFields.WixProjectFile, value);
         }
 
         public string WixPdbFile
         {
-            get => (string)this.Fields[(int)WixBuildInfoTupleFields.WixPdbFile];
-            set => this.Set((int)WixBuildInfoTupleFields.WixPdbFile, value);
+            get => (string)this.Fields[(int)WixBuildInfoSymbolFields.WixPdbFile];
+            set => this.Set((int)WixBuildInfoSymbolFields.WixPdbFile, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundleCatalogTuple.cs b/src/WixToolset.Data/Tuples/WixBundleCatalogTuple.cs
index 51c1306e..48415228 100644
--- a/src/WixToolset.Data/Tuples/WixBundleCatalogTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleCatalogTuple.cs
@@ -2,43 +2,43 @@
 
 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 WixBundleCatalog = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixBundleCatalog,
+        public static readonly IntermediateSymbolDefinition WixBundleCatalog = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixBundleCatalog,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundleCatalogTupleFields.PayloadRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleCatalogSymbolFields.PayloadRef), IntermediateFieldType.String),
             },
-            typeof(WixBundleCatalogTuple));
+            typeof(WixBundleCatalogSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixBundleCatalogTupleFields
+    public enum WixBundleCatalogSymbolFields
     {
         PayloadRef,
     }
 
-    public class WixBundleCatalogTuple : IntermediateTuple
+    public class WixBundleCatalogSymbol : IntermediateSymbol
     {
-        public WixBundleCatalogTuple() : base(TupleDefinitions.WixBundleCatalog, null, null)
+        public WixBundleCatalogSymbol() : base(SymbolDefinitions.WixBundleCatalog, null, null)
         {
         }
 
-        public WixBundleCatalogTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleCatalog, sourceLineNumber, id)
+        public WixBundleCatalogSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleCatalog, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBundleCatalogTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBundleCatalogSymbolFields index] => this.Fields[(int)index];
 
         public string PayloadRef
         {
-            get => (string)this.Fields[(int)WixBundleCatalogTupleFields.PayloadRef];
-            set => this.Set((int)WixBundleCatalogTupleFields.PayloadRef, value);
+            get => (string)this.Fields[(int)WixBundleCatalogSymbolFields.PayloadRef];
+            set => this.Set((int)WixBundleCatalogSymbolFields.PayloadRef, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/WixBundleContainerTuple.cs b/src/WixToolset.Data/Tuples/WixBundleContainerTuple.cs
index a0f64611..80beda0a 100644
--- a/src/WixToolset.Data/Tuples/WixBundleContainerTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleContainerTuple.cs
@@ -2,31 +2,31 @@
 
 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 WixBundleContainer = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixBundleContainer,
+        public static readonly IntermediateSymbolDefinition WixBundleContainer = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixBundleContainer,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.Name), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.Type), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.DownloadUrl), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.Size), IntermediateFieldType.LargeNumber),
-                new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.Hash), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.AttachedContainerIndex), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixBundleContainerTupleFields.WorkingPath), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleContainerSymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleContainerSymbolFields.Type), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleContainerSymbolFields.DownloadUrl), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleContainerSymbolFields.Size), IntermediateFieldType.LargeNumber),
+                new IntermediateFieldDefinition(nameof(WixBundleContainerSymbolFields.Hash), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleContainerSymbolFields.AttachedContainerIndex), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleContainerSymbolFields.WorkingPath), IntermediateFieldType.String),
             },
-            typeof(WixBundleContainerTuple));
+            typeof(WixBundleContainerSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
     using System;
 
-    public enum WixBundleContainerTupleFields
+    public enum WixBundleContainerSymbolFields
     {
         Name,
         Type,
@@ -46,58 +46,58 @@ namespace WixToolset.Data.Tuples
         Detached,
     }
 
-    public class WixBundleContainerTuple : IntermediateTuple
+    public class WixBundleContainerSymbol : IntermediateSymbol
     {
-        public WixBundleContainerTuple() : base(TupleDefinitions.WixBundleContainer, null, null)
+        public WixBundleContainerSymbol() : base(SymbolDefinitions.WixBundleContainer, null, null)
         {
         }
 
-        public WixBundleContainerTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleContainer, sourceLineNumber, id)
+        public WixBundleContainerSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleContainer, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBundleContainerTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBundleContainerSymbolFields index] => this.Fields[(int)index];
 
         public string Name
         {
-            get => (string)this.Fields[(int)WixBundleContainerTupleFields.Name];
-            set => this.Set((int)WixBundleContainerTupleFields.Name, value);
+            get => (string)this.Fields[(int)WixBundleContainerSymbolFields.Name];
+            set => this.Set((int)WixBundleContainerSymbolFields.Name, value);
         }
 
         public ContainerType Type
         {
-            get => (ContainerType)this.Fields[(int)WixBundleContainerTupleFields.Type].AsNumber();
-            set => this.Set((int)WixBundleContainerTupleFields.Type, (int)value);
+            get => (ContainerType)this.Fields[(int)WixBundleContainerSymbolFields.Type].AsNumber();
+            set => this.Set((int)WixBundleContainerSymbolFields.Type, (int)value);
         }
 
         public string DownloadUrl
         {
-            get => (string)this.Fields[(int)WixBundleContainerTupleFields.DownloadUrl];
-            set => this.Set((int)WixBundleContainerTupleFields.DownloadUrl, value);
+            get => (string)this.Fields[(int)WixBundleContainerSymbolFields.DownloadUrl];
+            set => this.Set((int)WixBundleContainerSymbolFields.DownloadUrl, value);
         }
 
         public long? Size
         {
-            get => (long?)this.Fields[(int)WixBundleContainerTupleFields.Size];
-            set => this.Set((int)WixBundleContainerTupleFields.Size, value);
+            get => (long?)this.Fields[(int)WixBundleContainerSymbolFields.Size];
+            set => this.Set((int)WixBundleContainerSymbolFields.Size, value);
         }
 
         public string Hash
         {
-            get => (string)this.Fields[(int)WixBundleContainerTupleFields.Hash];
-            set => this.Set((int)WixBundleContainerTupleFields.Hash, value);
+            get => (string)this.Fields[(int)WixBundleContainerSymbolFields.Hash];
+            set => this.Set((int)WixBundleContainerSymbolFields.Hash, value);
         }
 
         public int? AttachedContainerIndex
         {
-            get => (int?)this.Fields[(int)WixBundleContainerTupleFields.AttachedContainerIndex];
-            set => this.Set((int)WixBundleContainerTupleFields.AttachedContainerIndex, value);
+            get => (int?)this.Fields[(int)WixBundleContainerSymbolFields.AttachedContainerIndex];
+            set => this.Set((int)WixBundleContainerSymbolFields.AttachedContainerIndex, value);
         }
 
         public string WorkingPath
         {
-            get => (string)this.Fields[(int)WixBundleContainerTupleFields.WorkingPath];
-            set => this.Set((int)WixBundleContainerTupleFields.WorkingPath, value);
+            get => (string)this.Fields[(int)WixBundleContainerSymbolFields.WorkingPath];
+            set => this.Set((int)WixBundleContainerSymbolFields.WorkingPath, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/WixBundleCustomDataAttributeTuple.cs b/src/WixToolset.Data/Tuples/WixBundleCustomDataAttributeTuple.cs
index 9c27c9f4..c0a657ee 100644
--- a/src/WixToolset.Data/Tuples/WixBundleCustomDataAttributeTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleCustomDataAttributeTuple.cs
@@ -2,51 +2,51 @@
 
 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 WixBundleCustomDataAttribute = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixBundleCustomDataAttribute,
+        public static readonly IntermediateSymbolDefinition WixBundleCustomDataAttribute = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixBundleCustomDataAttribute,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundleCustomDataAttributeTupleFields.CustomDataRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleCustomDataAttributeTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleCustomDataAttributeSymbolFields.CustomDataRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleCustomDataAttributeSymbolFields.Name), IntermediateFieldType.String),
             },
-            typeof(WixBundleCustomDataAttributeTuple));
+            typeof(WixBundleCustomDataAttributeSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixBundleCustomDataAttributeTupleFields
+    public enum WixBundleCustomDataAttributeSymbolFields
     {
         CustomDataRef,
         Name,
     }
 
-    public class WixBundleCustomDataAttributeTuple : IntermediateTuple
+    public class WixBundleCustomDataAttributeSymbol : IntermediateSymbol
     {
-        public WixBundleCustomDataAttributeTuple() : base(TupleDefinitions.WixBundleCustomDataAttribute, null, null)
+        public WixBundleCustomDataAttributeSymbol() : base(SymbolDefinitions.WixBundleCustomDataAttribute, null, null)
         {
         }
 
-        public WixBundleCustomDataAttributeTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleCustomDataAttribute, sourceLineNumber, id)
+        public WixBundleCustomDataAttributeSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleCustomDataAttribute, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBundleCustomDataAttributeTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBundleCustomDataAttributeSymbolFields index] => this.Fields[(int)index];
 
         public string CustomDataRef
         {
-            get => (string)this.Fields[(int)WixBundleCustomDataAttributeTupleFields.CustomDataRef];
-            set => this.Set((int)WixBundleCustomDataAttributeTupleFields.CustomDataRef, value);
+            get => (string)this.Fields[(int)WixBundleCustomDataAttributeSymbolFields.CustomDataRef];
+            set => this.Set((int)WixBundleCustomDataAttributeSymbolFields.CustomDataRef, value);
         }
 
         public string Name
         {
-            get => (string)this.Fields[(int)WixBundleCustomDataAttributeTupleFields.Name];
-            set => this.Set((int)WixBundleCustomDataAttributeTupleFields.Name, value);
+            get => (string)this.Fields[(int)WixBundleCustomDataAttributeSymbolFields.Name];
+            set => this.Set((int)WixBundleCustomDataAttributeSymbolFields.Name, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/WixBundleCustomDataCellTuple.cs b/src/WixToolset.Data/Tuples/WixBundleCustomDataCellTuple.cs
index d488d6d0..0488969a 100644
--- a/src/WixToolset.Data/Tuples/WixBundleCustomDataCellTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleCustomDataCellTuple.cs
@@ -2,26 +2,26 @@
 
 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 WixBundleCustomDataCell = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixBundleCustomDataCell,
+        public static readonly IntermediateSymbolDefinition WixBundleCustomDataCell = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixBundleCustomDataCell,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundleCustomDataCellTupleFields.CustomDataRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleCustomDataCellTupleFields.AttributeRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleCustomDataCellTupleFields.ElementId), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleCustomDataCellTupleFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleCustomDataCellSymbolFields.CustomDataRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleCustomDataCellSymbolFields.AttributeRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleCustomDataCellSymbolFields.ElementId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleCustomDataCellSymbolFields.Value), IntermediateFieldType.String),
             },
-            typeof(WixBundleCustomDataCellTuple));
+            typeof(WixBundleCustomDataCellSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixBundleCustomDataCellTupleFields
+    public enum WixBundleCustomDataCellSymbolFields
     {
         CustomDataRef,
         AttributeRef,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
         Value,
     }
 
-    public class WixBundleCustomDataCellTuple : IntermediateTuple
+    public class WixBundleCustomDataCellSymbol : IntermediateSymbol
     {
-        public WixBundleCustomDataCellTuple() : base(TupleDefinitions.WixBundleCustomDataCell, null, null)
+        public WixBundleCustomDataCellSymbol() : base(SymbolDefinitions.WixBundleCustomDataCell, null, null)
         {
         }
 
-        public WixBundleCustomDataCellTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleCustomDataCell, sourceLineNumber, id)
+        public WixBundleCustomDataCellSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleCustomDataCell, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBundleCustomDataCellTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBundleCustomDataCellSymbolFields index] => this.Fields[(int)index];
 
         public string CustomDataRef
         {
-            get => (string)this.Fields[(int)WixBundleCustomDataCellTupleFields.CustomDataRef];
-            set => this.Set((int)WixBundleCustomDataCellTupleFields.CustomDataRef, value);
+            get => (string)this.Fields[(int)WixBundleCustomDataCellSymbolFields.CustomDataRef];
+            set => this.Set((int)WixBundleCustomDataCellSymbolFields.CustomDataRef, value);
         }
 
         public string AttributeRef
         {
-            get => (string)this.Fields[(int)WixBundleCustomDataCellTupleFields.AttributeRef];
-            set => this.Set((int)WixBundleCustomDataCellTupleFields.AttributeRef, value);
+            get => (string)this.Fields[(int)WixBundleCustomDataCellSymbolFields.AttributeRef];
+            set => this.Set((int)WixBundleCustomDataCellSymbolFields.AttributeRef, value);
         }
 
         public string ElementId
         {
-            get => (string)this.Fields[(int)WixBundleCustomDataCellTupleFields.ElementId];
-            set => this.Set((int)WixBundleCustomDataCellTupleFields.ElementId, value);
+            get => (string)this.Fields[(int)WixBundleCustomDataCellSymbolFields.ElementId];
+            set => this.Set((int)WixBundleCustomDataCellSymbolFields.ElementId, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)WixBundleCustomDataCellTupleFields.Value];
-            set => this.Set((int)WixBundleCustomDataCellTupleFields.Value, value);
+            get => (string)this.Fields[(int)WixBundleCustomDataCellSymbolFields.Value];
+            set => this.Set((int)WixBundleCustomDataCellSymbolFields.Value, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/WixBundleCustomDataTuple.cs b/src/WixToolset.Data/Tuples/WixBundleCustomDataTuple.cs
index d0878deb..0490f9f7 100644
--- a/src/WixToolset.Data/Tuples/WixBundleCustomDataTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleCustomDataTuple.cs
@@ -2,25 +2,25 @@
 
 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 WixBundleCustomData = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixBundleCustomData,
+        public static readonly IntermediateSymbolDefinition WixBundleCustomData = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixBundleCustomData,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundleCustomDataTupleFields.AttributeNames), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleCustomDataTupleFields.Type), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixBundleCustomDataTupleFields.BundleExtensionRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleCustomDataSymbolFields.AttributeNames), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleCustomDataSymbolFields.Type), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleCustomDataSymbolFields.BundleExtensionRef), IntermediateFieldType.String),
             },
-            typeof(WixBundleCustomDataTuple));
+            typeof(WixBundleCustomDataSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixBundleCustomDataTupleFields
+    public enum WixBundleCustomDataSymbolFields
     {
         AttributeNames,
         Type,
@@ -34,36 +34,36 @@ namespace WixToolset.Data.Tuples
         BundleExtension,
     }
 
-    public class WixBundleCustomDataTuple : IntermediateTuple
+    public class WixBundleCustomDataSymbol : IntermediateSymbol
     {
         public const char AttributeNamesSeparator = '\x85';
 
-        public WixBundleCustomDataTuple() : base(TupleDefinitions.WixBundleCustomData, null, null)
+        public WixBundleCustomDataSymbol() : base(SymbolDefinitions.WixBundleCustomData, null, null)
         {
         }
 
-        public WixBundleCustomDataTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleCustomData, sourceLineNumber, id)
+        public WixBundleCustomDataSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleCustomData, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBundleCustomDataTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBundleCustomDataSymbolFields index] => this.Fields[(int)index];
 
         public string AttributeNames
         {
-            get => (string)this.Fields[(int)WixBundleCustomDataTupleFields.AttributeNames];
-            set => this.Set((int)WixBundleCustomDataTupleFields.AttributeNames, value);
+            get => (string)this.Fields[(int)WixBundleCustomDataSymbolFields.AttributeNames];
+            set => this.Set((int)WixBundleCustomDataSymbolFields.AttributeNames, value);
         }
 
         public WixBundleCustomDataType Type
         {
-            get => (WixBundleCustomDataType)this.Fields[(int)WixBundleCustomDataTupleFields.Type].AsNumber();
-            set => this.Set((int)WixBundleCustomDataTupleFields.Type, (int)value);
+            get => (WixBundleCustomDataType)this.Fields[(int)WixBundleCustomDataSymbolFields.Type].AsNumber();
+            set => this.Set((int)WixBundleCustomDataSymbolFields.Type, (int)value);
         }
 
         public string BundleExtensionRef
         {
-            get => (string)this.Fields[(int)WixBundleCustomDataTupleFields.BundleExtensionRef];
-            set => this.Set((int)WixBundleCustomDataTupleFields.BundleExtensionRef, value);
+            get => (string)this.Fields[(int)WixBundleCustomDataSymbolFields.BundleExtensionRef];
+            set => this.Set((int)WixBundleCustomDataSymbolFields.BundleExtensionRef, value);
         }
 
         public string[] AttributeNamesSeparated => this.AttributeNames.Split(AttributeNamesSeparator);
diff --git a/src/WixToolset.Data/Tuples/WixBundleExePackageTuple.cs b/src/WixToolset.Data/Tuples/WixBundleExePackageTuple.cs
index e87de26d..8a8cff1b 100644
--- a/src/WixToolset.Data/Tuples/WixBundleExePackageTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleExePackageTuple.cs
@@ -2,30 +2,30 @@
 
 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 WixBundleExePackage = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixBundleExePackage,
+        public static readonly IntermediateSymbolDefinition WixBundleExePackage = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixBundleExePackage,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundleExePackageTupleFields.Attributes), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixBundleExePackageTupleFields.DetectCondition), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleExePackageTupleFields.InstallCommand), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleExePackageTupleFields.RepairCommand), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleExePackageTupleFields.UninstallCommand), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleExePackageTupleFields.ExeProtocol), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleExePackageSymbolFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleExePackageSymbolFields.DetectCondition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleExePackageSymbolFields.InstallCommand), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleExePackageSymbolFields.RepairCommand), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleExePackageSymbolFields.UninstallCommand), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleExePackageSymbolFields.ExeProtocol), IntermediateFieldType.String),
             },
-            typeof(WixBundleExePackageTuple));
+            typeof(WixBundleExePackageSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
     using System;
 
-    public enum WixBundleExePackageTupleFields
+    public enum WixBundleExePackageSymbolFields
     {
         Attributes,
         DetectCondition,
@@ -41,52 +41,52 @@ namespace WixToolset.Data.Tuples
         None = 0,
     }
 
-    public class WixBundleExePackageTuple : IntermediateTuple
+    public class WixBundleExePackageSymbol : IntermediateSymbol
     {
-        public WixBundleExePackageTuple() : base(TupleDefinitions.WixBundleExePackage, null, null)
+        public WixBundleExePackageSymbol() : base(SymbolDefinitions.WixBundleExePackage, null, null)
         {
         }
 
-        public WixBundleExePackageTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleExePackage, sourceLineNumber, id)
+        public WixBundleExePackageSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleExePackage, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBundleExePackageTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBundleExePackageSymbolFields index] => this.Fields[(int)index];
 
         public WixBundleExePackageAttributes Attributes
         {
-            get => (WixBundleExePackageAttributes)(int)this.Fields[(int)WixBundleExePackageTupleFields.Attributes];
-            set => this.Set((int)WixBundleExePackageTupleFields.Attributes, (int)value);
+            get => (WixBundleExePackageAttributes)(int)this.Fields[(int)WixBundleExePackageSymbolFields.Attributes];
+            set => this.Set((int)WixBundleExePackageSymbolFields.Attributes, (int)value);
         }
 
         public string DetectCondition
         {
-            get => (string)this.Fields[(int)WixBundleExePackageTupleFields.DetectCondition];
-            set => this.Set((int)WixBundleExePackageTupleFields.DetectCondition, value);
+            get => (string)this.Fields[(int)WixBundleExePackageSymbolFields.DetectCondition];
+            set => this.Set((int)WixBundleExePackageSymbolFields.DetectCondition, value);
         }
 
         public string InstallCommand
         {
-            get => (string)this.Fields[(int)WixBundleExePackageTupleFields.InstallCommand];
-            set => this.Set((int)WixBundleExePackageTupleFields.InstallCommand, value);
+            get => (string)this.Fields[(int)WixBundleExePackageSymbolFields.InstallCommand];
+            set => this.Set((int)WixBundleExePackageSymbolFields.InstallCommand, value);
         }
 
         public string RepairCommand
         {
-            get => (string)this.Fields[(int)WixBundleExePackageTupleFields.RepairCommand];
-            set => this.Set((int)WixBundleExePackageTupleFields.RepairCommand, value);
+            get => (string)this.Fields[(int)WixBundleExePackageSymbolFields.RepairCommand];
+            set => this.Set((int)WixBundleExePackageSymbolFields.RepairCommand, value);
         }
 
         public string UninstallCommand
         {
-            get => (string)this.Fields[(int)WixBundleExePackageTupleFields.UninstallCommand];
-            set => this.Set((int)WixBundleExePackageTupleFields.UninstallCommand, value);
+            get => (string)this.Fields[(int)WixBundleExePackageSymbolFields.UninstallCommand];
+            set => this.Set((int)WixBundleExePackageSymbolFields.UninstallCommand, value);
         }
 
         public string ExeProtocol
         {
-            get => (string)this.Fields[(int)WixBundleExePackageTupleFields.ExeProtocol];
-            set => this.Set((int)WixBundleExePackageTupleFields.ExeProtocol, value);
+            get => (string)this.Fields[(int)WixBundleExePackageSymbolFields.ExeProtocol];
+            set => this.Set((int)WixBundleExePackageSymbolFields.ExeProtocol, value);
         }
 
         public bool Repairable => !String.IsNullOrEmpty(this.RepairCommand);
diff --git a/src/WixToolset.Data/Tuples/WixBundleExtensionTuple.cs b/src/WixToolset.Data/Tuples/WixBundleExtensionTuple.cs
index 7df56963..8e6bea58 100644
--- a/src/WixToolset.Data/Tuples/WixBundleExtensionTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleExtensionTuple.cs
@@ -2,43 +2,43 @@
 
 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 WixBundleExtension = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixBundleExtension,
+        public static readonly IntermediateSymbolDefinition WixBundleExtension = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixBundleExtension,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundleExtensionTupleFields.PayloadRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleExtensionSymbolFields.PayloadRef), IntermediateFieldType.String),
             },
-            typeof(WixBundleExtensionTuple));
+            typeof(WixBundleExtensionSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixBundleExtensionTupleFields
+    public enum WixBundleExtensionSymbolFields
     {
         PayloadRef,
     }
 
-    public class WixBundleExtensionTuple : IntermediateTuple
+    public class WixBundleExtensionSymbol : IntermediateSymbol
     {
-        public WixBundleExtensionTuple() : base(TupleDefinitions.WixBundleExtension, null, null)
+        public WixBundleExtensionSymbol() : base(SymbolDefinitions.WixBundleExtension, null, null)
         {
         }
 
-        public WixBundleExtensionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleExtension, sourceLineNumber, id)
+        public WixBundleExtensionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleExtension, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBundleExtensionTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBundleExtensionSymbolFields index] => this.Fields[(int)index];
 
         public string PayloadRef
         {
-            get => (string)this.Fields[(int)WixBundleExtensionTupleFields.PayloadRef];
-            set => this.Set((int)WixBundleExtensionTupleFields.PayloadRef, value);
+            get => (string)this.Fields[(int)WixBundleExtensionSymbolFields.PayloadRef];
+            set => this.Set((int)WixBundleExtensionSymbolFields.PayloadRef, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/WixBundleMsiFeatureTuple.cs b/src/WixToolset.Data/Tuples/WixBundleMsiFeatureTuple.cs
index dab42529..f81da5b8 100644
--- a/src/WixToolset.Data/Tuples/WixBundleMsiFeatureTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleMsiFeatureTuple.cs
@@ -2,32 +2,32 @@
 
 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 WixBundleMsiFeature = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixBundleMsiFeature,
+        public static readonly IntermediateSymbolDefinition WixBundleMsiFeature = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixBundleMsiFeature,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.PackageRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Name), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Size), IntermediateFieldType.LargeNumber),
-                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Parent), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Title), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Description), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Display), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Level), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Directory), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureTupleFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureSymbolFields.PackageRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureSymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureSymbolFields.Size), IntermediateFieldType.LargeNumber),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureSymbolFields.Parent), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureSymbolFields.Title), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureSymbolFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureSymbolFields.Display), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureSymbolFields.Level), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureSymbolFields.Directory), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiFeatureSymbolFields.Attributes), IntermediateFieldType.Number),
             },
-            typeof(WixBundleMsiFeatureTuple));
+            typeof(WixBundleMsiFeatureSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixBundleMsiFeatureTupleFields
+    public enum WixBundleMsiFeatureSymbolFields
     {
         PackageRef,
         Name,
@@ -41,76 +41,76 @@ namespace WixToolset.Data.Tuples
         Attributes,
     }
 
-    public class WixBundleMsiFeatureTuple : IntermediateTuple
+    public class WixBundleMsiFeatureSymbol : IntermediateSymbol
     {
-        public WixBundleMsiFeatureTuple() : base(TupleDefinitions.WixBundleMsiFeature, null, null)
+        public WixBundleMsiFeatureSymbol() : base(SymbolDefinitions.WixBundleMsiFeature, null, null)
         {
         }
 
-        public WixBundleMsiFeatureTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleMsiFeature, sourceLineNumber, id)
+        public WixBundleMsiFeatureSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleMsiFeature, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBundleMsiFeatureTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBundleMsiFeatureSymbolFields index] => this.Fields[(int)index];
 
         public string PackageRef
         {
-            get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.PackageRef];
-            set => this.Set((int)WixBundleMsiFeatureTupleFields.PackageRef, value);
+            get => (string)this.Fields[(int)WixBundleMsiFeatureSymbolFields.PackageRef];
+            set => this.Set((int)WixBundleMsiFeatureSymbolFields.PackageRef, value);
         }
 
         public string Name
         {
-            get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.Name];
-            set => this.Set((int)WixBundleMsiFeatureTupleFields.Name, value);
+            get => (string)this.Fields[(int)WixBundleMsiFeatureSymbolFields.Name];
+            set => this.Set((int)WixBundleMsiFeatureSymbolFields.Name, value);
         }
 
         public long Size
         {
-            get => (long)this.Fields[(int)WixBundleMsiFeatureTupleFields.Size];
-            set => this.Set((int)WixBundleMsiFeatureTupleFields.Size, value);
+            get => (long)this.Fields[(int)WixBundleMsiFeatureSymbolFields.Size];
+            set => this.Set((int)WixBundleMsiFeatureSymbolFields.Size, value);
         }
 
         public string Parent
         {
-            get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.Parent];
-            set => this.Set((int)WixBundleMsiFeatureTupleFields.Parent, value);
+            get => (string)this.Fields[(int)WixBundleMsiFeatureSymbolFields.Parent];
+            set => this.Set((int)WixBundleMsiFeatureSymbolFields.Parent, value);
         }
 
         public string Title
         {
-            get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.Title];
-            set => this.Set((int)WixBundleMsiFeatureTupleFields.Title, value);
+            get => (string)this.Fields[(int)WixBundleMsiFeatureSymbolFields.Title];
+            set => this.Set((int)WixBundleMsiFeatureSymbolFields.Title, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.Description];
-            set => this.Set((int)WixBundleMsiFeatureTupleFields.Description, value);
+            get => (string)this.Fields[(int)WixBundleMsiFeatureSymbolFields.Description];
+            set => this.Set((int)WixBundleMsiFeatureSymbolFields.Description, value);
         }
 
         public int Display
         {
-            get => (int)this.Fields[(int)WixBundleMsiFeatureTupleFields.Display];
-            set => this.Set((int)WixBundleMsiFeatureTupleFields.Display, value);
+            get => (int)this.Fields[(int)WixBundleMsiFeatureSymbolFields.Display];
+            set => this.Set((int)WixBundleMsiFeatureSymbolFields.Display, value);
         }
 
         public int Level
         {
-            get => (int)this.Fields[(int)WixBundleMsiFeatureTupleFields.Level];
-            set => this.Set((int)WixBundleMsiFeatureTupleFields.Level, value);
+            get => (int)this.Fields[(int)WixBundleMsiFeatureSymbolFields.Level];
+            set => this.Set((int)WixBundleMsiFeatureSymbolFields.Level, value);
         }
 
         public string Directory
         {
-            get => (string)this.Fields[(int)WixBundleMsiFeatureTupleFields.Directory];
-            set => this.Set((int)WixBundleMsiFeatureTupleFields.Directory, value);
+            get => (string)this.Fields[(int)WixBundleMsiFeatureSymbolFields.Directory];
+            set => this.Set((int)WixBundleMsiFeatureSymbolFields.Directory, value);
         }
 
         public int Attributes
         {
-            get => (int)this.Fields[(int)WixBundleMsiFeatureTupleFields.Attributes];
-            set => this.Set((int)WixBundleMsiFeatureTupleFields.Attributes, value);
+            get => (int)this.Fields[(int)WixBundleMsiFeatureSymbolFields.Attributes];
+            set => this.Set((int)WixBundleMsiFeatureSymbolFields.Attributes, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/WixBundleMsiPackageTuple.cs b/src/WixToolset.Data/Tuples/WixBundleMsiPackageTuple.cs
index 163b56ae..21735f64 100644
--- a/src/WixToolset.Data/Tuples/WixBundleMsiPackageTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleMsiPackageTuple.cs
@@ -2,31 +2,31 @@
 
 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 WixBundleMsiPackage = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixBundleMsiPackage,
+        public static readonly IntermediateSymbolDefinition WixBundleMsiPackage = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixBundleMsiPackage,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.Attributes), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.ProductCode), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.UpgradeCode), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.ProductVersion), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.ProductLanguage), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.ProductName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleMsiPackageTupleFields.Manufacturer), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiPackageSymbolFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiPackageSymbolFields.ProductCode), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiPackageSymbolFields.UpgradeCode), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiPackageSymbolFields.ProductVersion), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiPackageSymbolFields.ProductLanguage), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiPackageSymbolFields.ProductName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiPackageSymbolFields.Manufacturer), IntermediateFieldType.String),
             },
-            typeof(WixBundleMsiPackageTuple));
+            typeof(WixBundleMsiPackageSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
     using System;
 
-    public enum WixBundleMsiPackageTupleFields
+    public enum WixBundleMsiPackageSymbolFields
     {
         Attributes,
         ProductCode,
@@ -44,58 +44,58 @@ namespace WixToolset.Data.Tuples
         ForcePerMachine = 0x2,
     }
 
-    public class WixBundleMsiPackageTuple : IntermediateTuple
+    public class WixBundleMsiPackageSymbol : IntermediateSymbol
     {
-        public WixBundleMsiPackageTuple() : base(TupleDefinitions.WixBundleMsiPackage, null, null)
+        public WixBundleMsiPackageSymbol() : base(SymbolDefinitions.WixBundleMsiPackage, null, null)
         {
         }
 
-        public WixBundleMsiPackageTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleMsiPackage, sourceLineNumber, id)
+        public WixBundleMsiPackageSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleMsiPackage, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBundleMsiPackageTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBundleMsiPackageSymbolFields index] => this.Fields[(int)index];
 
         public WixBundleMsiPackageAttributes Attributes
         {
-            get => (WixBundleMsiPackageAttributes)(int)this.Fields[(int)WixBundleMsiPackageTupleFields.Attributes];
-            set => this.Set((int)WixBundleMsiPackageTupleFields.Attributes, (int)value);
+            get => (WixBundleMsiPackageAttributes)(int)this.Fields[(int)WixBundleMsiPackageSymbolFields.Attributes];
+            set => this.Set((int)WixBundleMsiPackageSymbolFields.Attributes, (int)value);
         }
 
         public string ProductCode
         {
-            get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.ProductCode];
-            set => this.Set((int)WixBundleMsiPackageTupleFields.ProductCode, value);
+            get => (string)this.Fields[(int)WixBundleMsiPackageSymbolFields.ProductCode];
+            set => this.Set((int)WixBundleMsiPackageSymbolFields.ProductCode, value);
         }
 
         public string UpgradeCode
         {
-            get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.UpgradeCode];
-            set => this.Set((int)WixBundleMsiPackageTupleFields.UpgradeCode, value);
+            get => (string)this.Fields[(int)WixBundleMsiPackageSymbolFields.UpgradeCode];
+            set => this.Set((int)WixBundleMsiPackageSymbolFields.UpgradeCode, value);
         }
 
         public string ProductVersion
         {
-            get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.ProductVersion];
-            set => this.Set((int)WixBundleMsiPackageTupleFields.ProductVersion, value);
+            get => (string)this.Fields[(int)WixBundleMsiPackageSymbolFields.ProductVersion];
+            set => this.Set((int)WixBundleMsiPackageSymbolFields.ProductVersion, value);
         }
 
         public int ProductLanguage
         {
-            get => (int)this.Fields[(int)WixBundleMsiPackageTupleFields.ProductLanguage];
-            set => this.Set((int)WixBundleMsiPackageTupleFields.ProductLanguage, value);
+            get => (int)this.Fields[(int)WixBundleMsiPackageSymbolFields.ProductLanguage];
+            set => this.Set((int)WixBundleMsiPackageSymbolFields.ProductLanguage, value);
         }
 
         public string ProductName
         {
-            get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.ProductName];
-            set => this.Set((int)WixBundleMsiPackageTupleFields.ProductName, value);
+            get => (string)this.Fields[(int)WixBundleMsiPackageSymbolFields.ProductName];
+            set => this.Set((int)WixBundleMsiPackageSymbolFields.ProductName, value);
         }
 
         public string Manufacturer
         {
-            get => (string)this.Fields[(int)WixBundleMsiPackageTupleFields.Manufacturer];
-            set => this.Set((int)WixBundleMsiPackageTupleFields.Manufacturer, value);
+            get => (string)this.Fields[(int)WixBundleMsiPackageSymbolFields.Manufacturer];
+            set => this.Set((int)WixBundleMsiPackageSymbolFields.Manufacturer, value);
         }
 
         public bool EnableFeatureSelection => (this.Attributes & WixBundleMsiPackageAttributes.EnableFeatureSelection) == WixBundleMsiPackageAttributes.EnableFeatureSelection;
diff --git a/src/WixToolset.Data/Tuples/WixBundleMsiPropertyTuple.cs b/src/WixToolset.Data/Tuples/WixBundleMsiPropertyTuple.cs
index 80500f17..0d87f87d 100644
--- a/src/WixToolset.Data/Tuples/WixBundleMsiPropertyTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleMsiPropertyTuple.cs
@@ -2,26 +2,26 @@
 
 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 WixBundleMsiProperty = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixBundleMsiProperty,
+        public static readonly IntermediateSymbolDefinition WixBundleMsiProperty = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixBundleMsiProperty,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundleMsiPropertyTupleFields.PackageRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleMsiPropertyTupleFields.Name), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleMsiPropertyTupleFields.Value), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleMsiPropertyTupleFields.Condition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiPropertySymbolFields.PackageRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiPropertySymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiPropertySymbolFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsiPropertySymbolFields.Condition), IntermediateFieldType.String),
             },
-            typeof(WixBundleMsiPropertyTuple));
+            typeof(WixBundleMsiPropertySymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixBundleMsiPropertyTupleFields
+    public enum WixBundleMsiPropertySymbolFields
     {
         PackageRef,
         Name,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
         Condition,
     }
 
-    public class WixBundleMsiPropertyTuple : IntermediateTuple
+    public class WixBundleMsiPropertySymbol : IntermediateSymbol
     {
-        public WixBundleMsiPropertyTuple() : base(TupleDefinitions.WixBundleMsiProperty, null, null)
+        public WixBundleMsiPropertySymbol() : base(SymbolDefinitions.WixBundleMsiProperty, null, null)
         {
         }
 
-        public WixBundleMsiPropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleMsiProperty, sourceLineNumber, id)
+        public WixBundleMsiPropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleMsiProperty, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBundleMsiPropertyTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBundleMsiPropertySymbolFields index] => this.Fields[(int)index];
 
         public string PackageRef
         {
-            get => (string)this.Fields[(int)WixBundleMsiPropertyTupleFields.PackageRef];
-            set => this.Set((int)WixBundleMsiPropertyTupleFields.PackageRef, value);
+            get => (string)this.Fields[(int)WixBundleMsiPropertySymbolFields.PackageRef];
+            set => this.Set((int)WixBundleMsiPropertySymbolFields.PackageRef, value);
         }
 
         public string Name
         {
-            get => (string)this.Fields[(int)WixBundleMsiPropertyTupleFields.Name];
-            set => this.Set((int)WixBundleMsiPropertyTupleFields.Name, value);
+            get => (string)this.Fields[(int)WixBundleMsiPropertySymbolFields.Name];
+            set => this.Set((int)WixBundleMsiPropertySymbolFields.Name, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)WixBundleMsiPropertyTupleFields.Value];
-            set => this.Set((int)WixBundleMsiPropertyTupleFields.Value, value);
+            get => (string)this.Fields[(int)WixBundleMsiPropertySymbolFields.Value];
+            set => this.Set((int)WixBundleMsiPropertySymbolFields.Value, value);
         }
 
         public string Condition
         {
-            get => (string)this.Fields[(int)WixBundleMsiPropertyTupleFields.Condition];
-            set => this.Set((int)WixBundleMsiPropertyTupleFields.Condition, value);
+            get => (string)this.Fields[(int)WixBundleMsiPropertySymbolFields.Condition];
+            set => this.Set((int)WixBundleMsiPropertySymbolFields.Condition, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundleMspPackageTuple.cs b/src/WixToolset.Data/Tuples/WixBundleMspPackageTuple.cs
index 7e94ff25..3784c2ff 100644
--- a/src/WixToolset.Data/Tuples/WixBundleMspPackageTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleMspPackageTuple.cs
@@ -2,28 +2,28 @@
 
 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 WixBundleMspPackage = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixBundleMspPackage,
+        public static readonly IntermediateSymbolDefinition WixBundleMspPackage = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixBundleMspPackage,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundleMspPackageTupleFields.Attributes), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixBundleMspPackageTupleFields.PatchCode), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleMspPackageTupleFields.Manufacturer), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleMspPackageTupleFields.PatchXml), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMspPackageSymbolFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleMspPackageSymbolFields.PatchCode), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMspPackageSymbolFields.Manufacturer), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMspPackageSymbolFields.PatchXml), IntermediateFieldType.String),
             },
-            typeof(WixBundleMspPackageTuple));
+            typeof(WixBundleMspPackageSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
     using System;
 
-    public enum WixBundleMspPackageTupleFields
+    public enum WixBundleMspPackageSymbolFields
     {
         Attributes,
         PatchCode,
@@ -38,40 +38,40 @@ namespace WixToolset.Data.Tuples
         TargetUnspecified = 0x4,
     }
 
-    public class WixBundleMspPackageTuple : IntermediateTuple
+    public class WixBundleMspPackageSymbol : IntermediateSymbol
     {
-        public WixBundleMspPackageTuple() : base(TupleDefinitions.WixBundleMspPackage, null, null)
+        public WixBundleMspPackageSymbol() : base(SymbolDefinitions.WixBundleMspPackage, null, null)
         {
         }
 
-        public WixBundleMspPackageTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleMspPackage, sourceLineNumber, id)
+        public WixBundleMspPackageSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleMspPackage, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBundleMspPackageTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBundleMspPackageSymbolFields index] => this.Fields[(int)index];
 
         public WixBundleMspPackageAttributes Attributes
         {
-            get => (WixBundleMspPackageAttributes)(int)this.Fields[(int)WixBundleMspPackageTupleFields.Attributes];
-            set => this.Set((int)WixBundleMspPackageTupleFields.Attributes, (int)value);
+            get => (WixBundleMspPackageAttributes)(int)this.Fields[(int)WixBundleMspPackageSymbolFields.Attributes];
+            set => this.Set((int)WixBundleMspPackageSymbolFields.Attributes, (int)value);
         }
 
         public string PatchCode
         {
-            get => (string)this.Fields[(int)WixBundleMspPackageTupleFields.PatchCode];
-            set => this.Set((int)WixBundleMspPackageTupleFields.PatchCode, value);
+            get => (string)this.Fields[(int)WixBundleMspPackageSymbolFields.PatchCode];
+            set => this.Set((int)WixBundleMspPackageSymbolFields.PatchCode, value);
         }
 
         public string Manufacturer
         {
-            get => (string)this.Fields[(int)WixBundleMspPackageTupleFields.Manufacturer];
-            set => this.Set((int)WixBundleMspPackageTupleFields.Manufacturer, value);
+            get => (string)this.Fields[(int)WixBundleMspPackageSymbolFields.Manufacturer];
+            set => this.Set((int)WixBundleMspPackageSymbolFields.Manufacturer, value);
         }
 
         public string PatchXml
         {
-            get => (string)this.Fields[(int)WixBundleMspPackageTupleFields.PatchXml];
-            set => this.Set((int)WixBundleMspPackageTupleFields.PatchXml, value);
+            get => (string)this.Fields[(int)WixBundleMspPackageSymbolFields.PatchXml];
+            set => this.Set((int)WixBundleMspPackageSymbolFields.PatchXml, value);
         }
 
         public bool Slipstream => (this.Attributes & WixBundleMspPackageAttributes.Slipstream) == WixBundleMspPackageAttributes.Slipstream;
diff --git a/src/WixToolset.Data/Tuples/WixBundleMsuPackageTuple.cs b/src/WixToolset.Data/Tuples/WixBundleMsuPackageTuple.cs
index 5d5a4672..e52a9b2d 100644
--- a/src/WixToolset.Data/Tuples/WixBundleMsuPackageTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleMsuPackageTuple.cs
@@ -2,51 +2,51 @@
 
 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 WixBundleMsuPackage = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixBundleMsuPackage,
+        public static readonly IntermediateSymbolDefinition WixBundleMsuPackage = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixBundleMsuPackage,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundleMsuPackageTupleFields.DetectCondition), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleMsuPackageTupleFields.MsuKB), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsuPackageSymbolFields.DetectCondition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleMsuPackageSymbolFields.MsuKB), IntermediateFieldType.String),
             },
-            typeof(WixBundleMsuPackageTuple));
+            typeof(WixBundleMsuPackageSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixBundleMsuPackageTupleFields
+    public enum WixBundleMsuPackageSymbolFields
     {
         DetectCondition,
         MsuKB,
     }
 
-    public class WixBundleMsuPackageTuple : IntermediateTuple
+    public class WixBundleMsuPackageSymbol : IntermediateSymbol
     {
-        public WixBundleMsuPackageTuple() : base(TupleDefinitions.WixBundleMsuPackage, null, null)
+        public WixBundleMsuPackageSymbol() : base(SymbolDefinitions.WixBundleMsuPackage, null, null)
         {
         }
 
-        public WixBundleMsuPackageTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleMsuPackage, sourceLineNumber, id)
+        public WixBundleMsuPackageSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleMsuPackage, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBundleMsuPackageTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBundleMsuPackageSymbolFields index] => this.Fields[(int)index];
 
         public string DetectCondition
         {
-            get => (string)this.Fields[(int)WixBundleMsuPackageTupleFields.DetectCondition];
-            set => this.Set((int)WixBundleMsuPackageTupleFields.DetectCondition, value);
+            get => (string)this.Fields[(int)WixBundleMsuPackageSymbolFields.DetectCondition];
+            set => this.Set((int)WixBundleMsuPackageSymbolFields.DetectCondition, value);
         }
 
         public string MsuKB
         {
-            get => (string)this.Fields[(int)WixBundleMsuPackageTupleFields.MsuKB];
-            set => this.Set((int)WixBundleMsuPackageTupleFields.MsuKB, value);
+            get => (string)this.Fields[(int)WixBundleMsuPackageSymbolFields.MsuKB];
+            set => this.Set((int)WixBundleMsuPackageSymbolFields.MsuKB, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundlePackageCommandLineTuple.cs b/src/WixToolset.Data/Tuples/WixBundlePackageCommandLineTuple.cs
index 42bad1f0..7ef254a6 100644
--- a/src/WixToolset.Data/Tuples/WixBundlePackageCommandLineTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundlePackageCommandLineTuple.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 WixBundlePackageCommandLine = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixBundlePackageCommandLine,
+        public static readonly IntermediateSymbolDefinition WixBundlePackageCommandLine = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixBundlePackageCommandLine,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineTupleFields.WixBundlePackageRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineTupleFields.InstallArgument), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineTupleFields.UninstallArgument), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineTupleFields.RepairArgument), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineTupleFields.Condition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineSymbolFields.WixBundlePackageRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineSymbolFields.InstallArgument), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineSymbolFields.UninstallArgument), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineSymbolFields.RepairArgument), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageCommandLineSymbolFields.Condition), IntermediateFieldType.String),
             },
-            typeof(WixBundlePackageCommandLineTuple));
+            typeof(WixBundlePackageCommandLineSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixBundlePackageCommandLineTupleFields
+    public enum WixBundlePackageCommandLineSymbolFields
     {
         WixBundlePackageRef,
         InstallArgument,
@@ -31,46 +31,46 @@ namespace WixToolset.Data.Tuples
         Condition,
     }
 
-    public class WixBundlePackageCommandLineTuple : IntermediateTuple
+    public class WixBundlePackageCommandLineSymbol : IntermediateSymbol
     {
-        public WixBundlePackageCommandLineTuple() : base(TupleDefinitions.WixBundlePackageCommandLine, null, null)
+        public WixBundlePackageCommandLineSymbol() : base(SymbolDefinitions.WixBundlePackageCommandLine, null, null)
         {
         }
 
-        public WixBundlePackageCommandLineTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundlePackageCommandLine, sourceLineNumber, id)
+        public WixBundlePackageCommandLineSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundlePackageCommandLine, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBundlePackageCommandLineTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBundlePackageCommandLineSymbolFields index] => this.Fields[(int)index];
 
         public string WixBundlePackageRef
         {
-            get => (string)this.Fields[(int)WixBundlePackageCommandLineTupleFields.WixBundlePackageRef];
-            set => this.Set((int)WixBundlePackageCommandLineTupleFields.WixBundlePackageRef, value);
+            get => (string)this.Fields[(int)WixBundlePackageCommandLineSymbolFields.WixBundlePackageRef];
+            set => this.Set((int)WixBundlePackageCommandLineSymbolFields.WixBundlePackageRef, value);
         }
 
         public string InstallArgument
         {
-            get => (string)this.Fields[(int)WixBundlePackageCommandLineTupleFields.InstallArgument];
-            set => this.Set((int)WixBundlePackageCommandLineTupleFields.InstallArgument, value);
+            get => (string)this.Fields[(int)WixBundlePackageCommandLineSymbolFields.InstallArgument];
+            set => this.Set((int)WixBundlePackageCommandLineSymbolFields.InstallArgument, value);
         }
 
         public string UninstallArgument
         {
-            get => (string)this.Fields[(int)WixBundlePackageCommandLineTupleFields.UninstallArgument];
-            set => this.Set((int)WixBundlePackageCommandLineTupleFields.UninstallArgument, value);
+            get => (string)this.Fields[(int)WixBundlePackageCommandLineSymbolFields.UninstallArgument];
+            set => this.Set((int)WixBundlePackageCommandLineSymbolFields.UninstallArgument, value);
         }
 
         public string RepairArgument
         {
-            get => (string)this.Fields[(int)WixBundlePackageCommandLineTupleFields.RepairArgument];
-            set => this.Set((int)WixBundlePackageCommandLineTupleFields.RepairArgument, value);
+            get => (string)this.Fields[(int)WixBundlePackageCommandLineSymbolFields.RepairArgument];
+            set => this.Set((int)WixBundlePackageCommandLineSymbolFields.RepairArgument, value);
         }
 
         public string Condition
         {
-            get => (string)this.Fields[(int)WixBundlePackageCommandLineTupleFields.Condition];
-            set => this.Set((int)WixBundlePackageCommandLineTupleFields.Condition, value);
+            get => (string)this.Fields[(int)WixBundlePackageCommandLineSymbolFields.Condition];
+            set => this.Set((int)WixBundlePackageCommandLineSymbolFields.Condition, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundlePackageExitCodeTuple.cs b/src/WixToolset.Data/Tuples/WixBundlePackageExitCodeTuple.cs
index c585011d..d77d9d58 100644
--- a/src/WixToolset.Data/Tuples/WixBundlePackageExitCodeTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundlePackageExitCodeTuple.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 WixBundlePackageExitCode = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixBundlePackageExitCode,
+        public static readonly IntermediateSymbolDefinition WixBundlePackageExitCode = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixBundlePackageExitCode,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundlePackageExitCodeTupleFields.ChainPackageId), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePackageExitCodeTupleFields.Code), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixBundlePackageExitCodeTupleFields.Behavior), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageExitCodeSymbolFields.ChainPackageId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageExitCodeSymbolFields.Code), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageExitCodeSymbolFields.Behavior), IntermediateFieldType.String),
             },
-            typeof(WixBundlePackageExitCodeTuple));
+            typeof(WixBundlePackageExitCodeSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
     using System;
 
-    public enum WixBundlePackageExitCodeTupleFields
+    public enum WixBundlePackageExitCodeSymbolFields
     {
         ChainPackageId,
         Code,
@@ -38,34 +38,34 @@ namespace WixToolset.Data.Tuples
         ForceReboot,
     }
 
-    public class WixBundlePackageExitCodeTuple : IntermediateTuple
+    public class WixBundlePackageExitCodeSymbol : IntermediateSymbol
     {
-        public WixBundlePackageExitCodeTuple() : base(TupleDefinitions.WixBundlePackageExitCode, null, null)
+        public WixBundlePackageExitCodeSymbol() : base(SymbolDefinitions.WixBundlePackageExitCode, null, null)
         {
         }
 
-        public WixBundlePackageExitCodeTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundlePackageExitCode, sourceLineNumber, id)
+        public WixBundlePackageExitCodeSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundlePackageExitCode, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBundlePackageExitCodeTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBundlePackageExitCodeSymbolFields index] => this.Fields[(int)index];
 
         public string ChainPackageId
         {
-            get => (string)this.Fields[(int)WixBundlePackageExitCodeTupleFields.ChainPackageId];
-            set => this.Set((int)WixBundlePackageExitCodeTupleFields.ChainPackageId, value);
+            get => (string)this.Fields[(int)WixBundlePackageExitCodeSymbolFields.ChainPackageId];
+            set => this.Set((int)WixBundlePackageExitCodeSymbolFields.ChainPackageId, value);
         }
 
         public int? Code
         {
-            get => (int?)this.Fields[(int)WixBundlePackageExitCodeTupleFields.Code];
-            set => this.Set((int)WixBundlePackageExitCodeTupleFields.Code, value);
+            get => (int?)this.Fields[(int)WixBundlePackageExitCodeSymbolFields.Code];
+            set => this.Set((int)WixBundlePackageExitCodeSymbolFields.Code, value);
         }
 
         public ExitCodeBehaviorType Behavior
         {
-            get => Enum.TryParse((string)this.Fields[(int)WixBundlePackageExitCodeTupleFields.Behavior], true, out ExitCodeBehaviorType value) ? value : ExitCodeBehaviorType.NotSet;
-            set => this.Set((int)WixBundlePackageExitCodeTupleFields.Behavior, value.ToString());
+            get => Enum.TryParse((string)this.Fields[(int)WixBundlePackageExitCodeSymbolFields.Behavior], true, out ExitCodeBehaviorType value) ? value : ExitCodeBehaviorType.NotSet;
+            set => this.Set((int)WixBundlePackageExitCodeSymbolFields.Behavior, value.ToString());
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/WixBundlePackageGroupTuple.cs b/src/WixToolset.Data/Tuples/WixBundlePackageGroupTuple.cs
index ababd00e..a5e1943b 100644
--- a/src/WixToolset.Data/Tuples/WixBundlePackageGroupTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundlePackageGroupTuple.cs
@@ -2,35 +2,35 @@
 
 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 WixBundlePackageGroup = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixBundlePackageGroup,
+        public static readonly IntermediateSymbolDefinition WixBundlePackageGroup = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixBundlePackageGroup,
             new IntermediateFieldDefinition[]
             {
             },
-            typeof(WixBundlePackageGroupTuple));
+            typeof(WixBundlePackageGroupSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixBundlePackageGroupTupleFields
+    public enum WixBundlePackageGroupSymbolFields
     {
     }
 
-    public class WixBundlePackageGroupTuple : IntermediateTuple
+    public class WixBundlePackageGroupSymbol : IntermediateSymbol
     {
-        public WixBundlePackageGroupTuple() : base(TupleDefinitions.WixBundlePackageGroup, null, null)
+        public WixBundlePackageGroupSymbol() : base(SymbolDefinitions.WixBundlePackageGroup, null, null)
         {
         }
 
-        public WixBundlePackageGroupTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundlePackageGroup, sourceLineNumber, id)
+        public WixBundlePackageGroupSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundlePackageGroup, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBundlePackageGroupTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBundlePackageGroupSymbolFields index] => this.Fields[(int)index];
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundlePackageTuple.cs b/src/WixToolset.Data/Tuples/WixBundlePackageTuple.cs
index 6d248062..8f073900 100644
--- a/src/WixToolset.Data/Tuples/WixBundlePackageTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundlePackageTuple.cs
@@ -2,43 +2,43 @@
 
 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 WixBundlePackage = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixBundlePackage,
+        public static readonly IntermediateSymbolDefinition WixBundlePackage = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixBundlePackage,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Type), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.PayloadRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Attributes), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.InstallCondition), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Cache), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.CacheId), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Vital), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.PerMachine), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.LogPathVariable), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.RollbackLogPathVariable), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Size), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.InstallSize), IntermediateFieldType.LargeNumber),
-                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Version), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Language), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.DisplayName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Description), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.RollbackBoundaryRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.RollbackBoundaryBackwardRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePackageTupleFields.Win64), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.Type), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.PayloadRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.InstallCondition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.Cache), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.CacheId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.Vital), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.PerMachine), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.LogPathVariable), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.RollbackLogPathVariable), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.Size), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.InstallSize), IntermediateFieldType.LargeNumber),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.Version), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.Language), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.DisplayName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.RollbackBoundaryRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.RollbackBoundaryBackwardRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.Win64), IntermediateFieldType.Bool),
             },
-            typeof(WixBundlePackageTuple));
+            typeof(WixBundlePackageSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
     using System;
 
-    public enum WixBundlePackageTupleFields
+    public enum WixBundlePackageSymbolFields
     {
         Type,
         PayloadRef,
@@ -81,130 +81,130 @@ namespace WixToolset.Data.Tuples
         Win64 = 0x8,
     }
 
-    public class WixBundlePackageTuple : IntermediateTuple
+    public class WixBundlePackageSymbol : IntermediateSymbol
     {
-        public WixBundlePackageTuple() : base(TupleDefinitions.WixBundlePackage, null, null)
+        public WixBundlePackageSymbol() : base(SymbolDefinitions.WixBundlePackage, null, null)
         {
         }
 
-        public WixBundlePackageTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundlePackage, sourceLineNumber, id)
+        public WixBundlePackageSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundlePackage, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBundlePackageTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBundlePackageSymbolFields index] => this.Fields[(int)index];
 
         public WixBundlePackageType Type
         {
-            get => (WixBundlePackageType)Enum.Parse(typeof(WixBundlePackageType), (string)this.Fields[(int)WixBundlePackageTupleFields.Type], true);
-            set => this.Set((int)WixBundlePackageTupleFields.Type, value.ToString());
+            get => (WixBundlePackageType)Enum.Parse(typeof(WixBundlePackageType), (string)this.Fields[(int)WixBundlePackageSymbolFields.Type], true);
+            set => this.Set((int)WixBundlePackageSymbolFields.Type, value.ToString());
         }
 
         public string PayloadRef
         {
-            get => (string)this.Fields[(int)WixBundlePackageTupleFields.PayloadRef];
-            set => this.Set((int)WixBundlePackageTupleFields.PayloadRef, value);
+            get => (string)this.Fields[(int)WixBundlePackageSymbolFields.PayloadRef];
+            set => this.Set((int)WixBundlePackageSymbolFields.PayloadRef, value);
         }
 
         public WixBundlePackageAttributes Attributes
         {
-            get => (WixBundlePackageAttributes)(int)this.Fields[(int)WixBundlePackageTupleFields.Attributes];
-            set => this.Set((int)WixBundlePackageTupleFields.Attributes, (int)value);
+            get => (WixBundlePackageAttributes)(int)this.Fields[(int)WixBundlePackageSymbolFields.Attributes];
+            set => this.Set((int)WixBundlePackageSymbolFields.Attributes, (int)value);
         }
 
         public string InstallCondition
         {
-            get => (string)this.Fields[(int)WixBundlePackageTupleFields.InstallCondition];
-            set => this.Set((int)WixBundlePackageTupleFields.InstallCondition, value);
+            get => (string)this.Fields[(int)WixBundlePackageSymbolFields.InstallCondition];
+            set => this.Set((int)WixBundlePackageSymbolFields.InstallCondition, value);
         }
 
         public YesNoAlwaysType Cache
         {
-            get => Enum.TryParse((string)this.Fields[(int)WixBundlePackageTupleFields.Cache], true, out YesNoAlwaysType value) ? value : YesNoAlwaysType.NotSet;
-            set => this.Set((int)WixBundlePackageTupleFields.Cache, value.ToString().ToLowerInvariant());
+            get => Enum.TryParse((string)this.Fields[(int)WixBundlePackageSymbolFields.Cache], true, out YesNoAlwaysType value) ? value : YesNoAlwaysType.NotSet;
+            set => this.Set((int)WixBundlePackageSymbolFields.Cache, value.ToString().ToLowerInvariant());
         }
 
         public string CacheId
         {
-            get => (string)this.Fields[(int)WixBundlePackageTupleFields.CacheId];
-            set => this.Set((int)WixBundlePackageTupleFields.CacheId, value);
+            get => (string)this.Fields[(int)WixBundlePackageSymbolFields.CacheId];
+            set => this.Set((int)WixBundlePackageSymbolFields.CacheId, value);
         }
 
         public bool? Vital
         {
-            get => (bool?)this.Fields[(int)WixBundlePackageTupleFields.Vital];
-            set => this.Set((int)WixBundlePackageTupleFields.Vital, value);
+            get => (bool?)this.Fields[(int)WixBundlePackageSymbolFields.Vital];
+            set => this.Set((int)WixBundlePackageSymbolFields.Vital, value);
         }
 
         public YesNoDefaultType PerMachine
         {
-            get => Enum.TryParse((string)this.Fields[(int)WixBundlePackageTupleFields.PerMachine], true, out YesNoDefaultType value) ? value : YesNoDefaultType.NotSet;
-            set => this.Set((int)WixBundlePackageTupleFields.PerMachine, value.ToString().ToLowerInvariant());
+            get => Enum.TryParse((string)this.Fields[(int)WixBundlePackageSymbolFields.PerMachine], true, out YesNoDefaultType value) ? value : YesNoDefaultType.NotSet;
+            set => this.Set((int)WixBundlePackageSymbolFields.PerMachine, value.ToString().ToLowerInvariant());
         }
 
         public string LogPathVariable
         {
-            get => (string)this.Fields[(int)WixBundlePackageTupleFields.LogPathVariable];
-            set => this.Set((int)WixBundlePackageTupleFields.LogPathVariable, value);
+            get => (string)this.Fields[(int)WixBundlePackageSymbolFields.LogPathVariable];
+            set => this.Set((int)WixBundlePackageSymbolFields.LogPathVariable, value);
         }
 
         public string RollbackLogPathVariable
         {
-            get => (string)this.Fields[(int)WixBundlePackageTupleFields.RollbackLogPathVariable];
-            set => this.Set((int)WixBundlePackageTupleFields.RollbackLogPathVariable, value);
+            get => (string)this.Fields[(int)WixBundlePackageSymbolFields.RollbackLogPathVariable];
+            set => this.Set((int)WixBundlePackageSymbolFields.RollbackLogPathVariable, value);
         }
 
         public int Size
         {
-            get => (int)this.Fields[(int)WixBundlePackageTupleFields.Size];
-            set => this.Set((int)WixBundlePackageTupleFields.Size, value);
+            get => (int)this.Fields[(int)WixBundlePackageSymbolFields.Size];
+            set => this.Set((int)WixBundlePackageSymbolFields.Size, value);
         }
 
         public long? InstallSize
         {
-            get => (long?)this.Fields[(int)WixBundlePackageTupleFields.InstallSize];
-            set => this.Set((int)WixBundlePackageTupleFields.InstallSize, value);
+            get => (long?)this.Fields[(int)WixBundlePackageSymbolFields.InstallSize];
+            set => this.Set((int)WixBundlePackageSymbolFields.InstallSize, value);
         }
 
         public string Version
         {
-            get => (string)this.Fields[(int)WixBundlePackageTupleFields.Version];
-            set => this.Set((int)WixBundlePackageTupleFields.Version, value);
+            get => (string)this.Fields[(int)WixBundlePackageSymbolFields.Version];
+            set => this.Set((int)WixBundlePackageSymbolFields.Version, value);
         }
 
         public int? Language
         {
-            get => (int?)this.Fields[(int)WixBundlePackageTupleFields.Language];
-            set => this.Set((int)WixBundlePackageTupleFields.Language, value);
+            get => (int?)this.Fields[(int)WixBundlePackageSymbolFields.Language];
+            set => this.Set((int)WixBundlePackageSymbolFields.Language, value);
         }
 
         public string DisplayName
         {
-            get => (string)this.Fields[(int)WixBundlePackageTupleFields.DisplayName];
-            set => this.Set((int)WixBundlePackageTupleFields.DisplayName, value);
+            get => (string)this.Fields[(int)WixBundlePackageSymbolFields.DisplayName];
+            set => this.Set((int)WixBundlePackageSymbolFields.DisplayName, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)WixBundlePackageTupleFields.Description];
-            set => this.Set((int)WixBundlePackageTupleFields.Description, value);
+            get => (string)this.Fields[(int)WixBundlePackageSymbolFields.Description];
+            set => this.Set((int)WixBundlePackageSymbolFields.Description, value);
         }
 
         public string RollbackBoundaryRef
         {
-            get => (string)this.Fields[(int)WixBundlePackageTupleFields.RollbackBoundaryRef];
-            set => this.Set((int)WixBundlePackageTupleFields.RollbackBoundaryRef, value);
+            get => (string)this.Fields[(int)WixBundlePackageSymbolFields.RollbackBoundaryRef];
+            set => this.Set((int)WixBundlePackageSymbolFields.RollbackBoundaryRef, value);
         }
 
         public string RollbackBoundaryBackwardRef
         {
-            get => (string)this.Fields[(int)WixBundlePackageTupleFields.RollbackBoundaryBackwardRef];
-            set => this.Set((int)WixBundlePackageTupleFields.RollbackBoundaryBackwardRef, value);
+            get => (string)this.Fields[(int)WixBundlePackageSymbolFields.RollbackBoundaryBackwardRef];
+            set => this.Set((int)WixBundlePackageSymbolFields.RollbackBoundaryBackwardRef, value);
         }
 
         public bool Win64
         {
-            get => (bool)this.Fields[(int)WixBundlePackageTupleFields.Win64];
-            set => this.Set((int)WixBundlePackageTupleFields.Win64, value);
+            get => (bool)this.Fields[(int)WixBundlePackageSymbolFields.Win64];
+            set => this.Set((int)WixBundlePackageSymbolFields.Win64, value);
         }
 
         public bool Permanent => (this.Attributes & WixBundlePackageAttributes.Permanent) == WixBundlePackageAttributes.Permanent;
diff --git a/src/WixToolset.Data/Tuples/WixBundlePatchTargetCodeTuple.cs b/src/WixToolset.Data/Tuples/WixBundlePatchTargetCodeTuple.cs
index 56ca144f..b1aa9c77 100644
--- a/src/WixToolset.Data/Tuples/WixBundlePatchTargetCodeTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundlePatchTargetCodeTuple.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 WixBundlePatchTargetCode = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixBundlePatchTargetCode,
+        public static readonly IntermediateSymbolDefinition WixBundlePatchTargetCode = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixBundlePatchTargetCode,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundlePatchTargetCodeTupleFields.PackageRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePatchTargetCodeTupleFields.TargetCode), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePatchTargetCodeTupleFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundlePatchTargetCodeSymbolFields.PackageRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePatchTargetCodeSymbolFields.TargetCode), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePatchTargetCodeSymbolFields.Attributes), IntermediateFieldType.Number),
             },
-            typeof(WixBundlePatchTargetCodeTuple));
+            typeof(WixBundlePatchTargetCodeSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
     using System;
 
-    public enum WixBundlePatchTargetCodeTupleFields
+    public enum WixBundlePatchTargetCodeSymbolFields
     {
         PackageRef,
         TargetCode,
@@ -45,34 +45,34 @@ namespace WixToolset.Data.Tuples
         TargetsUpgradeCode = 2,
     }
 
-    public class WixBundlePatchTargetCodeTuple : IntermediateTuple
+    public class WixBundlePatchTargetCodeSymbol : IntermediateSymbol
     {
-        public WixBundlePatchTargetCodeTuple() : base(TupleDefinitions.WixBundlePatchTargetCode, null, null)
+        public WixBundlePatchTargetCodeSymbol() : base(SymbolDefinitions.WixBundlePatchTargetCode, null, null)
         {
         }
 
-        public WixBundlePatchTargetCodeTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundlePatchTargetCode, sourceLineNumber, id)
+        public WixBundlePatchTargetCodeSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundlePatchTargetCode, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBundlePatchTargetCodeTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBundlePatchTargetCodeSymbolFields index] => this.Fields[(int)index];
 
         public string PackageRef
         {
-            get => (string)this.Fields[(int)WixBundlePatchTargetCodeTupleFields.PackageRef];
-            set => this.Set((int)WixBundlePatchTargetCodeTupleFields.PackageRef, value);
+            get => (string)this.Fields[(int)WixBundlePatchTargetCodeSymbolFields.PackageRef];
+            set => this.Set((int)WixBundlePatchTargetCodeSymbolFields.PackageRef, value);
         }
 
         public string TargetCode
         {
-            get => (string)this.Fields[(int)WixBundlePatchTargetCodeTupleFields.TargetCode];
-            set => this.Set((int)WixBundlePatchTargetCodeTupleFields.TargetCode, value);
+            get => (string)this.Fields[(int)WixBundlePatchTargetCodeSymbolFields.TargetCode];
+            set => this.Set((int)WixBundlePatchTargetCodeSymbolFields.TargetCode, value);
         }
 
         public WixBundlePatchTargetCodeAttributes Attributes
         {
-            get => (WixBundlePatchTargetCodeAttributes)this.Fields[(int)WixBundlePatchTargetCodeTupleFields.Attributes].AsNumber();
-            set => this.Set((int)WixBundlePatchTargetCodeTupleFields.Attributes, (int)value);
+            get => (WixBundlePatchTargetCodeAttributes)this.Fields[(int)WixBundlePatchTargetCodeSymbolFields.Attributes].AsNumber();
+            set => this.Set((int)WixBundlePatchTargetCodeSymbolFields.Attributes, (int)value);
         }
 
         public bool TargetsProductCode => (this.Attributes & WixBundlePatchTargetCodeAttributes.TargetsProductCode) == WixBundlePatchTargetCodeAttributes.TargetsProductCode;
diff --git a/src/WixToolset.Data/Tuples/WixBundlePayloadGroupTuple.cs b/src/WixToolset.Data/Tuples/WixBundlePayloadGroupTuple.cs
index 9c177a47..c53f6e73 100644
--- a/src/WixToolset.Data/Tuples/WixBundlePayloadGroupTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundlePayloadGroupTuple.cs
@@ -2,35 +2,35 @@
 
 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 WixBundlePayloadGroup = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixBundlePayloadGroup,
+        public static readonly IntermediateSymbolDefinition WixBundlePayloadGroup = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixBundlePayloadGroup,
             new IntermediateFieldDefinition[]
             {
             },
-            typeof(WixBundlePayloadGroupTuple));
+            typeof(WixBundlePayloadGroupSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixBundlePayloadGroupTupleFields
+    public enum WixBundlePayloadGroupSymbolFields
     {
     }
 
-    public class WixBundlePayloadGroupTuple : IntermediateTuple
+    public class WixBundlePayloadGroupSymbol : IntermediateSymbol
     {
-        public WixBundlePayloadGroupTuple() : base(TupleDefinitions.WixBundlePayloadGroup, null, null)
+        public WixBundlePayloadGroupSymbol() : base(SymbolDefinitions.WixBundlePayloadGroup, null, null)
         {
         }
 
-        public WixBundlePayloadGroupTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundlePayloadGroup, sourceLineNumber, id)
+        public WixBundlePayloadGroupSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundlePayloadGroup, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBundlePayloadGroupTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBundlePayloadGroupSymbolFields index] => this.Fields[(int)index];
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundlePayloadTuple.cs b/src/WixToolset.Data/Tuples/WixBundlePayloadTuple.cs
index 6e3b1d70..94a02af8 100644
--- a/src/WixToolset.Data/Tuples/WixBundlePayloadTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundlePayloadTuple.cs
@@ -2,45 +2,45 @@
 
 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 WixBundlePayload = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixBundlePayload,
+        public static readonly IntermediateSymbolDefinition WixBundlePayload = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixBundlePayload,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Name), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.SourceFile), IntermediateFieldType.Path),
-                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.DownloadUrl), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Compressed), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.UnresolvedSourceFile), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.DisplayName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Description), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.EnableSignatureValidation), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.FileSize), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Version), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Hash), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.PublicKey), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Thumbprint), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.CatalogRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.ContainerRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.PackageRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.ContentFile), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.EmbeddedId), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.LayoutOnly), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.Packaging), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixBundlePayloadTupleFields.ParentPackagePayloadRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.SourceFile), IntermediateFieldType.Path),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.DownloadUrl), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Compressed), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.UnresolvedSourceFile), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.DisplayName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.EnableSignatureValidation), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.FileSize), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Version), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Hash), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.PublicKey), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Thumbprint), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.CatalogRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.ContainerRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.PackageRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.ContentFile), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.EmbeddedId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.LayoutOnly), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.Packaging), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundlePayloadSymbolFields.ParentPackagePayloadRef), IntermediateFieldType.String),
             },
-            typeof(WixBundlePayloadTuple));
+            typeof(WixBundlePayloadSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
     using System;
 
-    public enum WixBundlePayloadTupleFields
+    public enum WixBundlePayloadSymbolFields
     {
         Name,
         SourceFile,
@@ -65,142 +65,142 @@ namespace WixToolset.Data.Tuples
         ParentPackagePayloadRef,
     }
 
-    public class WixBundlePayloadTuple : IntermediateTuple
+    public class WixBundlePayloadSymbol : IntermediateSymbol
     {
-        public WixBundlePayloadTuple() : base(TupleDefinitions.WixBundlePayload, null, null)
+        public WixBundlePayloadSymbol() : base(SymbolDefinitions.WixBundlePayload, null, null)
         {
         }
 
-        public WixBundlePayloadTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundlePayload, sourceLineNumber, id)
+        public WixBundlePayloadSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundlePayload, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBundlePayloadTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBundlePayloadSymbolFields index] => this.Fields[(int)index];
 
         public string Name
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Name];
-            set => this.Set((int)WixBundlePayloadTupleFields.Name, value);
+            get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.Name];
+            set => this.Set((int)WixBundlePayloadSymbolFields.Name, value);
         }
 
         public IntermediateFieldPathValue SourceFile
         {
-            get => this.Fields[(int)WixBundlePayloadTupleFields.SourceFile].AsPath();
-            set => this.Set((int)WixBundlePayloadTupleFields.SourceFile, value);
+            get => this.Fields[(int)WixBundlePayloadSymbolFields.SourceFile].AsPath();
+            set => this.Set((int)WixBundlePayloadSymbolFields.SourceFile, value);
         }
 
         public string DownloadUrl
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.DownloadUrl];
-            set => this.Set((int)WixBundlePayloadTupleFields.DownloadUrl, value);
+            get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.DownloadUrl];
+            set => this.Set((int)WixBundlePayloadSymbolFields.DownloadUrl, value);
         }
 
         public bool? Compressed
         {
-            get => (bool?)this.Fields[(int)WixBundlePayloadTupleFields.Compressed];
-            set => this.Set((int)WixBundlePayloadTupleFields.Compressed, value);
+            get => (bool?)this.Fields[(int)WixBundlePayloadSymbolFields.Compressed];
+            set => this.Set((int)WixBundlePayloadSymbolFields.Compressed, value);
         }
 
         public string UnresolvedSourceFile
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.UnresolvedSourceFile];
-            set => this.Set((int)WixBundlePayloadTupleFields.UnresolvedSourceFile, value);
+            get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.UnresolvedSourceFile];
+            set => this.Set((int)WixBundlePayloadSymbolFields.UnresolvedSourceFile, value);
         }
 
         public string DisplayName
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.DisplayName];
-            set => this.Set((int)WixBundlePayloadTupleFields.DisplayName, value);
+            get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.DisplayName];
+            set => this.Set((int)WixBundlePayloadSymbolFields.DisplayName, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Description];
-            set => this.Set((int)WixBundlePayloadTupleFields.Description, value);
+            get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.Description];
+            set => this.Set((int)WixBundlePayloadSymbolFields.Description, value);
         }
 
         public bool EnableSignatureValidation
         {
-            get => (bool)this.Fields[(int)WixBundlePayloadTupleFields.EnableSignatureValidation];
-            set => this.Set((int)WixBundlePayloadTupleFields.EnableSignatureValidation, value);
+            get => (bool)this.Fields[(int)WixBundlePayloadSymbolFields.EnableSignatureValidation];
+            set => this.Set((int)WixBundlePayloadSymbolFields.EnableSignatureValidation, value);
         }
 
         public int? FileSize
         {
-            get => (int?)this.Fields[(int)WixBundlePayloadTupleFields.FileSize];
-            set => this.Set((int)WixBundlePayloadTupleFields.FileSize, value);
+            get => (int?)this.Fields[(int)WixBundlePayloadSymbolFields.FileSize];
+            set => this.Set((int)WixBundlePayloadSymbolFields.FileSize, value);
         }
 
         public string Version
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Version];
-            set => this.Set((int)WixBundlePayloadTupleFields.Version, value);
+            get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.Version];
+            set => this.Set((int)WixBundlePayloadSymbolFields.Version, value);
         }
 
         public string Hash
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Hash];
-            set => this.Set((int)WixBundlePayloadTupleFields.Hash, value);
+            get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.Hash];
+            set => this.Set((int)WixBundlePayloadSymbolFields.Hash, value);
         }
 
         public string PublicKey
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.PublicKey];
-            set => this.Set((int)WixBundlePayloadTupleFields.PublicKey, value);
+            get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.PublicKey];
+            set => this.Set((int)WixBundlePayloadSymbolFields.PublicKey, value);
         }
 
         public string Thumbprint
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.Thumbprint];
-            set => this.Set((int)WixBundlePayloadTupleFields.Thumbprint, value);
+            get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.Thumbprint];
+            set => this.Set((int)WixBundlePayloadSymbolFields.Thumbprint, value);
         }
 
         public string CatalogRef
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.CatalogRef];
-            set => this.Set((int)WixBundlePayloadTupleFields.CatalogRef, value);
+            get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.CatalogRef];
+            set => this.Set((int)WixBundlePayloadSymbolFields.CatalogRef, value);
         }
 
         public string ContainerRef
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.ContainerRef];
-            set => this.Set((int)WixBundlePayloadTupleFields.ContainerRef, value);
+            get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.ContainerRef];
+            set => this.Set((int)WixBundlePayloadSymbolFields.ContainerRef, value);
         }
 
         public string PackageRef
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.PackageRef];
-            set => this.Set((int)WixBundlePayloadTupleFields.PackageRef, value);
+            get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.PackageRef];
+            set => this.Set((int)WixBundlePayloadSymbolFields.PackageRef, value);
         }
 
         public bool ContentFile
         {
-            get => (bool)this.Fields[(int)WixBundlePayloadTupleFields.ContentFile];
-            set => this.Set((int)WixBundlePayloadTupleFields.ContentFile, value);
+            get => (bool)this.Fields[(int)WixBundlePayloadSymbolFields.ContentFile];
+            set => this.Set((int)WixBundlePayloadSymbolFields.ContentFile, value);
         }
 
         public string EmbeddedId
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.EmbeddedId];
-            set => this.Set((int)WixBundlePayloadTupleFields.EmbeddedId, value);
+            get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.EmbeddedId];
+            set => this.Set((int)WixBundlePayloadSymbolFields.EmbeddedId, value);
         }
 
         public bool LayoutOnly
         {
-            get => (bool)this.Fields[(int)WixBundlePayloadTupleFields.LayoutOnly];
-            set => this.Set((int)WixBundlePayloadTupleFields.LayoutOnly, value);
+            get => (bool)this.Fields[(int)WixBundlePayloadSymbolFields.LayoutOnly];
+            set => this.Set((int)WixBundlePayloadSymbolFields.LayoutOnly, value);
         }
 
         public PackagingType? Packaging
         {
-            get => (PackagingType?)this.Fields[(int)WixBundlePayloadTupleFields.Packaging].AsNumber();
-            set => this.Set((int)WixBundlePayloadTupleFields.Packaging, (int?)value);
+            get => (PackagingType?)this.Fields[(int)WixBundlePayloadSymbolFields.Packaging].AsNumber();
+            set => this.Set((int)WixBundlePayloadSymbolFields.Packaging, (int?)value);
         }
 
         public string ParentPackagePayloadRef
         {
-            get => (string)this.Fields[(int)WixBundlePayloadTupleFields.ParentPackagePayloadRef];
-            set => this.Set((int)WixBundlePayloadTupleFields.ParentPackagePayloadRef, value);
+            get => (string)this.Fields[(int)WixBundlePayloadSymbolFields.ParentPackagePayloadRef];
+            set => this.Set((int)WixBundlePayloadSymbolFields.ParentPackagePayloadRef, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/WixBundleRelatedPackageTuple.cs b/src/WixToolset.Data/Tuples/WixBundleRelatedPackageTuple.cs
index 0d5cb0fe..7bd67b7f 100644
--- a/src/WixToolset.Data/Tuples/WixBundleRelatedPackageTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleRelatedPackageTuple.cs
@@ -2,30 +2,30 @@
 
 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 WixBundleRelatedPackage = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixBundleRelatedPackage,
+        public static readonly IntermediateSymbolDefinition WixBundleRelatedPackage = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixBundleRelatedPackage,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageTupleFields.PackageRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageTupleFields.RelatedId), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageTupleFields.MinVersion), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageTupleFields.MaxVersion), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageTupleFields.Languages), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageTupleFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageSymbolFields.PackageRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageSymbolFields.RelatedId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageSymbolFields.MinVersion), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageSymbolFields.MaxVersion), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageSymbolFields.Languages), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleRelatedPackageSymbolFields.Attributes), IntermediateFieldType.Number),
             },
-            typeof(WixBundleRelatedPackageTuple));
+            typeof(WixBundleRelatedPackageSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
     using System;
 
-    public enum WixBundleRelatedPackageTupleFields
+    public enum WixBundleRelatedPackageSymbolFields
     {
         PackageRef,
         RelatedId,
@@ -45,52 +45,52 @@ namespace WixToolset.Data.Tuples
         LangInclusive = 0x8,
     }
 
-    public class WixBundleRelatedPackageTuple : IntermediateTuple
+    public class WixBundleRelatedPackageSymbol : IntermediateSymbol
     {
-        public WixBundleRelatedPackageTuple() : base(TupleDefinitions.WixBundleRelatedPackage, null, null)
+        public WixBundleRelatedPackageSymbol() : base(SymbolDefinitions.WixBundleRelatedPackage, null, null)
         {
         }
 
-        public WixBundleRelatedPackageTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleRelatedPackage, sourceLineNumber, id)
+        public WixBundleRelatedPackageSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleRelatedPackage, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBundleRelatedPackageTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBundleRelatedPackageSymbolFields index] => this.Fields[(int)index];
 
         public string PackageRef
         {
-            get => (string)this.Fields[(int)WixBundleRelatedPackageTupleFields.PackageRef];
-            set => this.Set((int)WixBundleRelatedPackageTupleFields.PackageRef, value);
+            get => (string)this.Fields[(int)WixBundleRelatedPackageSymbolFields.PackageRef];
+            set => this.Set((int)WixBundleRelatedPackageSymbolFields.PackageRef, value);
         }
 
         public string RelatedId
         {
-            get => (string)this.Fields[(int)WixBundleRelatedPackageTupleFields.RelatedId];
-            set => this.Set((int)WixBundleRelatedPackageTupleFields.RelatedId, value);
+            get => (string)this.Fields[(int)WixBundleRelatedPackageSymbolFields.RelatedId];
+            set => this.Set((int)WixBundleRelatedPackageSymbolFields.RelatedId, value);
         }
 
         public string MinVersion
         {
-            get => (string)this.Fields[(int)WixBundleRelatedPackageTupleFields.MinVersion];
-            set => this.Set((int)WixBundleRelatedPackageTupleFields.MinVersion, value);
+            get => (string)this.Fields[(int)WixBundleRelatedPackageSymbolFields.MinVersion];
+            set => this.Set((int)WixBundleRelatedPackageSymbolFields.MinVersion, value);
         }
 
         public string MaxVersion
         {
-            get => (string)this.Fields[(int)WixBundleRelatedPackageTupleFields.MaxVersion];
-            set => this.Set((int)WixBundleRelatedPackageTupleFields.MaxVersion, value);
+            get => (string)this.Fields[(int)WixBundleRelatedPackageSymbolFields.MaxVersion];
+            set => this.Set((int)WixBundleRelatedPackageSymbolFields.MaxVersion, value);
         }
 
         public string Languages
         {
-            get => (string)this.Fields[(int)WixBundleRelatedPackageTupleFields.Languages];
-            set => this.Set((int)WixBundleRelatedPackageTupleFields.Languages, value);
+            get => (string)this.Fields[(int)WixBundleRelatedPackageSymbolFields.Languages];
+            set => this.Set((int)WixBundleRelatedPackageSymbolFields.Languages, value);
         }
 
         public WixBundleRelatedPackageAttributes Attributes
         {
-            get => (WixBundleRelatedPackageAttributes)this.Fields[(int)WixBundleRelatedPackageTupleFields.Attributes].AsNumber();
-            set => this.Set((int)WixBundleRelatedPackageTupleFields.Attributes, (int)value);
+            get => (WixBundleRelatedPackageAttributes)this.Fields[(int)WixBundleRelatedPackageSymbolFields.Attributes].AsNumber();
+            set => this.Set((int)WixBundleRelatedPackageSymbolFields.Attributes, (int)value);
         }
 
         public bool MinInclusive => (this.Attributes & WixBundleRelatedPackageAttributes.MinInclusive) == WixBundleRelatedPackageAttributes.MinInclusive;
diff --git a/src/WixToolset.Data/Tuples/WixBundleRollbackBoundaryTuple.cs b/src/WixToolset.Data/Tuples/WixBundleRollbackBoundaryTuple.cs
index 648787f9..e54e898e 100644
--- a/src/WixToolset.Data/Tuples/WixBundleRollbackBoundaryTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleRollbackBoundaryTuple.cs
@@ -2,51 +2,51 @@
 
 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 WixBundleRollbackBoundary = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixBundleRollbackBoundary,
+        public static readonly IntermediateSymbolDefinition WixBundleRollbackBoundary = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixBundleRollbackBoundary,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundleRollbackBoundaryTupleFields.Vital), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixBundleRollbackBoundaryTupleFields.Transaction), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleRollbackBoundarySymbolFields.Vital), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleRollbackBoundarySymbolFields.Transaction), IntermediateFieldType.Number),
             },
-            typeof(WixBundleRollbackBoundaryTuple));
+            typeof(WixBundleRollbackBoundarySymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixBundleRollbackBoundaryTupleFields
+    public enum WixBundleRollbackBoundarySymbolFields
     {
         Vital,
         Transaction,
     }
 
-    public class WixBundleRollbackBoundaryTuple : IntermediateTuple
+    public class WixBundleRollbackBoundarySymbol : IntermediateSymbol
     {
-        public WixBundleRollbackBoundaryTuple() : base(TupleDefinitions.WixBundleRollbackBoundary, null, null)
+        public WixBundleRollbackBoundarySymbol() : base(SymbolDefinitions.WixBundleRollbackBoundary, null, null)
         {
         }
 
-        public WixBundleRollbackBoundaryTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleRollbackBoundary, sourceLineNumber, id)
+        public WixBundleRollbackBoundarySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleRollbackBoundary, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBundleRollbackBoundaryTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBundleRollbackBoundarySymbolFields index] => this.Fields[(int)index];
 
         public bool? Vital
         {
-            get => (bool?)this.Fields[(int)WixBundleRollbackBoundaryTupleFields.Vital];
-            set => this.Set((int)WixBundleRollbackBoundaryTupleFields.Vital, value);
+            get => (bool?)this.Fields[(int)WixBundleRollbackBoundarySymbolFields.Vital];
+            set => this.Set((int)WixBundleRollbackBoundarySymbolFields.Vital, value);
         }
 
         public bool? Transaction
         {
-            get => (bool?)this.Fields[(int)WixBundleRollbackBoundaryTupleFields.Transaction];
-            set => this.Set((int)WixBundleRollbackBoundaryTupleFields.Transaction, value);
+            get => (bool?)this.Fields[(int)WixBundleRollbackBoundarySymbolFields.Transaction];
+            set => this.Set((int)WixBundleRollbackBoundarySymbolFields.Transaction, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundleSlipstreamMspTuple.cs b/src/WixToolset.Data/Tuples/WixBundleSlipstreamMspTuple.cs
index bfe8c6e1..d8e9db3f 100644
--- a/src/WixToolset.Data/Tuples/WixBundleSlipstreamMspTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleSlipstreamMspTuple.cs
@@ -2,51 +2,51 @@
 
 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 WixBundleSlipstreamMsp = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixBundleSlipstreamMsp,
+        public static readonly IntermediateSymbolDefinition WixBundleSlipstreamMsp = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixBundleSlipstreamMsp,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundleSlipstreamMspTupleFields.TargetPackageRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleSlipstreamMspTupleFields.MspPackageRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleSlipstreamMspSymbolFields.TargetPackageRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleSlipstreamMspSymbolFields.MspPackageRef), IntermediateFieldType.String),
             },
-            typeof(WixBundleSlipstreamMspTuple));
+            typeof(WixBundleSlipstreamMspSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixBundleSlipstreamMspTupleFields
+    public enum WixBundleSlipstreamMspSymbolFields
     {
         TargetPackageRef,
         MspPackageRef,
     }
 
-    public class WixBundleSlipstreamMspTuple : IntermediateTuple
+    public class WixBundleSlipstreamMspSymbol : IntermediateSymbol
     {
-        public WixBundleSlipstreamMspTuple() : base(TupleDefinitions.WixBundleSlipstreamMsp, null, null)
+        public WixBundleSlipstreamMspSymbol() : base(SymbolDefinitions.WixBundleSlipstreamMsp, null, null)
         {
         }
 
-        public WixBundleSlipstreamMspTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleSlipstreamMsp, sourceLineNumber, id)
+        public WixBundleSlipstreamMspSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleSlipstreamMsp, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBundleSlipstreamMspTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBundleSlipstreamMspSymbolFields index] => this.Fields[(int)index];
 
         public string TargetPackageRef
         {
-            get => (string)this.Fields[(int)WixBundleSlipstreamMspTupleFields.TargetPackageRef];
-            set => this.Set((int)WixBundleSlipstreamMspTupleFields.TargetPackageRef, value);
+            get => (string)this.Fields[(int)WixBundleSlipstreamMspSymbolFields.TargetPackageRef];
+            set => this.Set((int)WixBundleSlipstreamMspSymbolFields.TargetPackageRef, value);
         }
 
         public string MspPackageRef
         {
-            get => (string)this.Fields[(int)WixBundleSlipstreamMspTupleFields.MspPackageRef];
-            set => this.Set((int)WixBundleSlipstreamMspTupleFields.MspPackageRef, value);
+            get => (string)this.Fields[(int)WixBundleSlipstreamMspSymbolFields.MspPackageRef];
+            set => this.Set((int)WixBundleSlipstreamMspSymbolFields.MspPackageRef, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/WixBundleTuple.cs b/src/WixToolset.Data/Tuples/WixBundleTuple.cs
index 01318d0c..8cad5c36 100644
--- a/src/WixToolset.Data/Tuples/WixBundleTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleTuple.cs
@@ -2,46 +2,46 @@
 
 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 WixBundle = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixBundle,
+        public static readonly IntermediateSymbolDefinition WixBundle = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixBundle,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.UpgradeCode), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.Version), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.Copyright), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.Name), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.Manufacturer), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.Attributes), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.AboutUrl), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.HelpUrl), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.HelpTelephone), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.UpdateUrl), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.Compressed), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.LogPathVariable), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.LogPrefix), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.LogExtension), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.IconSourceFile), IntermediateFieldType.Path),
-                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.SplashScreenSourceFile), IntermediateFieldType.Path),
-                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.Condition), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.Tag), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.Platform), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.ParentName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.BundleId), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleTupleFields.ProviderKey), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.UpgradeCode), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.Version), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.Copyright), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.Manufacturer), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.AboutUrl), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.HelpUrl), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.HelpTelephone), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.UpdateUrl), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.Compressed), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.LogPathVariable), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.LogPrefix), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.LogExtension), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.IconSourceFile), IntermediateFieldType.Path),
+                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.SplashScreenSourceFile), IntermediateFieldType.Path),
+                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.Condition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.Tag), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.Platform), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.ParentName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.BundleId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.ProviderKey), IntermediateFieldType.String),
             },
-            typeof(WixBundleTuple));
+            typeof(WixBundleSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
     using System;
 
-    public enum WixBundleTupleFields
+    public enum WixBundleSymbolFields
     {
         UpgradeCode,
         Version,
@@ -77,148 +77,148 @@ namespace WixToolset.Data.Tuples
         PerMachine = 0x8,
     }
 
-    public class WixBundleTuple : IntermediateTuple
+    public class WixBundleSymbol : IntermediateSymbol
     {
-        public WixBundleTuple() : base(TupleDefinitions.WixBundle, null, null)
+        public WixBundleSymbol() : base(SymbolDefinitions.WixBundle, null, null)
         {
         }
 
-        public WixBundleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundle, sourceLineNumber, id)
+        public WixBundleSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundle, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBundleTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBundleSymbolFields index] => this.Fields[(int)index];
 
         public string UpgradeCode
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.UpgradeCode];
-            set => this.Set((int)WixBundleTupleFields.UpgradeCode, value);
+            get => (string)this.Fields[(int)WixBundleSymbolFields.UpgradeCode];
+            set => this.Set((int)WixBundleSymbolFields.UpgradeCode, value);
         }
 
         public string Version
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.Version];
-            set => this.Set((int)WixBundleTupleFields.Version, value);
+            get => (string)this.Fields[(int)WixBundleSymbolFields.Version];
+            set => this.Set((int)WixBundleSymbolFields.Version, value);
         }
 
         public string Copyright
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.Copyright];
-            set => this.Set((int)WixBundleTupleFields.Copyright, value);
+            get => (string)this.Fields[(int)WixBundleSymbolFields.Copyright];
+            set => this.Set((int)WixBundleSymbolFields.Copyright, value);
         }
 
         public string Name
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.Name];
-            set => this.Set((int)WixBundleTupleFields.Name, value);
+            get => (string)this.Fields[(int)WixBundleSymbolFields.Name];
+            set => this.Set((int)WixBundleSymbolFields.Name, value);
         }
 
         public string Manufacturer
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.Manufacturer];
-            set => this.Set((int)WixBundleTupleFields.Manufacturer, value);
+            get => (string)this.Fields[(int)WixBundleSymbolFields.Manufacturer];
+            set => this.Set((int)WixBundleSymbolFields.Manufacturer, value);
         }
 
         public WixBundleAttributes Attributes
         {
-            get => (WixBundleAttributes)this.Fields[(int)WixBundleTupleFields.Attributes].AsNumber();
-            set => this.Set((int)WixBundleTupleFields.Attributes, (int)value);
+            get => (WixBundleAttributes)this.Fields[(int)WixBundleSymbolFields.Attributes].AsNumber();
+            set => this.Set((int)WixBundleSymbolFields.Attributes, (int)value);
         }
 
         public string AboutUrl
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.AboutUrl];
-            set => this.Set((int)WixBundleTupleFields.AboutUrl, value);
+            get => (string)this.Fields[(int)WixBundleSymbolFields.AboutUrl];
+            set => this.Set((int)WixBundleSymbolFields.AboutUrl, value);
         }
 
         public string HelpTelephone
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.HelpTelephone];
-            set => this.Set((int)WixBundleTupleFields.HelpTelephone, value);
+            get => (string)this.Fields[(int)WixBundleSymbolFields.HelpTelephone];
+            set => this.Set((int)WixBundleSymbolFields.HelpTelephone, value);
         }
 
         public string HelpUrl
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.HelpUrl];
-            set => this.Set((int)WixBundleTupleFields.HelpUrl, value);
+            get => (string)this.Fields[(int)WixBundleSymbolFields.HelpUrl];
+            set => this.Set((int)WixBundleSymbolFields.HelpUrl, value);
         }
 
         public string UpdateUrl
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.UpdateUrl];
-            set => this.Set((int)WixBundleTupleFields.UpdateUrl, value);
+            get => (string)this.Fields[(int)WixBundleSymbolFields.UpdateUrl];
+            set => this.Set((int)WixBundleSymbolFields.UpdateUrl, value);
         }
 
         public bool? Compressed
         {
-            get => (bool?)this.Fields[(int)WixBundleTupleFields.Compressed];
-            set => this.Set((int)WixBundleTupleFields.Compressed, value);
+            get => (bool?)this.Fields[(int)WixBundleSymbolFields.Compressed];
+            set => this.Set((int)WixBundleSymbolFields.Compressed, value);
         }
 
         public string LogPathVariable
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.LogPathVariable];
-            set => this.Set((int)WixBundleTupleFields.LogPathVariable, value);
+            get => (string)this.Fields[(int)WixBundleSymbolFields.LogPathVariable];
+            set => this.Set((int)WixBundleSymbolFields.LogPathVariable, value);
         }
 
         public string LogPrefix
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.LogPrefix];
-            set => this.Set((int)WixBundleTupleFields.LogPrefix, value);
+            get => (string)this.Fields[(int)WixBundleSymbolFields.LogPrefix];
+            set => this.Set((int)WixBundleSymbolFields.LogPrefix, value);
         }
 
         public string LogExtension
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.LogExtension];
-            set => this.Set((int)WixBundleTupleFields.LogExtension, value);
+            get => (string)this.Fields[(int)WixBundleSymbolFields.LogExtension];
+            set => this.Set((int)WixBundleSymbolFields.LogExtension, value);
         }
 
         public string IconSourceFile
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.IconSourceFile];
-            set => this.Set((int)WixBundleTupleFields.IconSourceFile, value);
+            get => (string)this.Fields[(int)WixBundleSymbolFields.IconSourceFile];
+            set => this.Set((int)WixBundleSymbolFields.IconSourceFile, value);
         }
 
         public string SplashScreenSourceFile
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.SplashScreenSourceFile];
-            set => this.Set((int)WixBundleTupleFields.SplashScreenSourceFile, value);
+            get => (string)this.Fields[(int)WixBundleSymbolFields.SplashScreenSourceFile];
+            set => this.Set((int)WixBundleSymbolFields.SplashScreenSourceFile, value);
         }
 
         public string Condition
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.Condition];
-            set => this.Set((int)WixBundleTupleFields.Condition, value);
+            get => (string)this.Fields[(int)WixBundleSymbolFields.Condition];
+            set => this.Set((int)WixBundleSymbolFields.Condition, value);
         }
 
         public string Tag
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.Tag];
-            set => this.Set((int)WixBundleTupleFields.Tag, value);
+            get => (string)this.Fields[(int)WixBundleSymbolFields.Tag];
+            set => this.Set((int)WixBundleSymbolFields.Tag, value);
         }
 
         public Platform Platform
         {
-            get => (Platform)this.Fields[(int)WixBundleTupleFields.Platform].AsNumber();
-            set => this.Set((int)WixBundleTupleFields.Platform, (int)value);
+            get => (Platform)this.Fields[(int)WixBundleSymbolFields.Platform].AsNumber();
+            set => this.Set((int)WixBundleSymbolFields.Platform, (int)value);
         }
 
         public string ParentName
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.ParentName];
-            set => this.Set((int)WixBundleTupleFields.ParentName, value);
+            get => (string)this.Fields[(int)WixBundleSymbolFields.ParentName];
+            set => this.Set((int)WixBundleSymbolFields.ParentName, value);
         }
 
         public string BundleId
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.BundleId];
-            set => this.Set((int)WixBundleTupleFields.BundleId, value);
+            get => (string)this.Fields[(int)WixBundleSymbolFields.BundleId];
+            set => this.Set((int)WixBundleSymbolFields.BundleId, value);
         }
 
         public string ProviderKey
         {
-            get => (string)this.Fields[(int)WixBundleTupleFields.ProviderKey];
-            set => this.Set((int)WixBundleTupleFields.ProviderKey, value);
+            get => (string)this.Fields[(int)WixBundleSymbolFields.ProviderKey];
+            set => this.Set((int)WixBundleSymbolFields.ProviderKey, value);
         }
 
         public PackagingType DefaultPackagingType => (this.Compressed.HasValue && !this.Compressed.Value) ? PackagingType.External : PackagingType.Embedded;
diff --git a/src/WixToolset.Data/Tuples/WixBundleUpdateTuple.cs b/src/WixToolset.Data/Tuples/WixBundleUpdateTuple.cs
index 08ca5d6e..d27bbc32 100644
--- a/src/WixToolset.Data/Tuples/WixBundleUpdateTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleUpdateTuple.cs
@@ -2,51 +2,51 @@
 
 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 WixBundleUpdate = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixBundleUpdate,
+        public static readonly IntermediateSymbolDefinition WixBundleUpdate = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixBundleUpdate,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundleUpdateTupleFields.Location), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleUpdateTupleFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleUpdateSymbolFields.Location), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleUpdateSymbolFields.Attributes), IntermediateFieldType.Number),
             },
-            typeof(WixBundleUpdateTuple));
+            typeof(WixBundleUpdateSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixBundleUpdateTupleFields
+    public enum WixBundleUpdateSymbolFields
     {
         Location,
         Attributes,
     }
 
-    public class WixBundleUpdateTuple : IntermediateTuple
+    public class WixBundleUpdateSymbol : IntermediateSymbol
     {
-        public WixBundleUpdateTuple() : base(TupleDefinitions.WixBundleUpdate, null, null)
+        public WixBundleUpdateSymbol() : base(SymbolDefinitions.WixBundleUpdate, null, null)
         {
         }
 
-        public WixBundleUpdateTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleUpdate, sourceLineNumber, id)
+        public WixBundleUpdateSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleUpdate, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBundleUpdateTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBundleUpdateSymbolFields index] => this.Fields[(int)index];
 
         public string Location
         {
-            get => (string)this.Fields[(int)WixBundleUpdateTupleFields.Location];
-            set => this.Set((int)WixBundleUpdateTupleFields.Location, value);
+            get => (string)this.Fields[(int)WixBundleUpdateSymbolFields.Location];
+            set => this.Set((int)WixBundleUpdateSymbolFields.Location, value);
         }
 
         public int Attributes
         {
-            get => (int)this.Fields[(int)WixBundleUpdateTupleFields.Attributes];
-            set => this.Set((int)WixBundleUpdateTupleFields.Attributes, value);
+            get => (int)this.Fields[(int)WixBundleUpdateSymbolFields.Attributes];
+            set => this.Set((int)WixBundleUpdateSymbolFields.Attributes, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixBundleVariableTuple.cs b/src/WixToolset.Data/Tuples/WixBundleVariableTuple.cs
index d7d74657..85cf2798 100644
--- a/src/WixToolset.Data/Tuples/WixBundleVariableTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixBundleVariableTuple.cs
@@ -2,26 +2,26 @@
 
 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 WixBundleVariable = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixBundleVariable,
+        public static readonly IntermediateSymbolDefinition WixBundleVariable = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixBundleVariable,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBundleVariableTupleFields.Value), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleVariableTupleFields.Type), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleVariableTupleFields.Hidden), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(WixBundleVariableTupleFields.Persisted), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(WixBundleVariableSymbolFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleVariableSymbolFields.Type), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleVariableSymbolFields.Hidden), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(WixBundleVariableSymbolFields.Persisted), IntermediateFieldType.Bool),
             },
-            typeof(WixBundleVariableTuple));
+            typeof(WixBundleVariableSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixBundleVariableTupleFields
+    public enum WixBundleVariableSymbolFields
     {
         Value,
         Type,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
         Persisted,
     }
 
-    public class WixBundleVariableTuple : IntermediateTuple
+    public class WixBundleVariableSymbol : IntermediateSymbol
     {
-        public WixBundleVariableTuple() : base(TupleDefinitions.WixBundleVariable, null, null)
+        public WixBundleVariableSymbol() : base(SymbolDefinitions.WixBundleVariable, null, null)
         {
         }
 
-        public WixBundleVariableTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixBundleVariable, sourceLineNumber, id)
+        public WixBundleVariableSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixBundleVariable, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBundleVariableTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBundleVariableSymbolFields index] => this.Fields[(int)index];
 
         public string Value
         {
-            get => (string)this.Fields[(int)WixBundleVariableTupleFields.Value];
-            set => this.Set((int)WixBundleVariableTupleFields.Value, value);
+            get => (string)this.Fields[(int)WixBundleVariableSymbolFields.Value];
+            set => this.Set((int)WixBundleVariableSymbolFields.Value, value);
         }
 
         public string Type
         {
-            get => (string)this.Fields[(int)WixBundleVariableTupleFields.Type];
-            set => this.Set((int)WixBundleVariableTupleFields.Type, value);
+            get => (string)this.Fields[(int)WixBundleVariableSymbolFields.Type];
+            set => this.Set((int)WixBundleVariableSymbolFields.Type, value);
         }
 
         public bool Hidden
         {
-            get => (bool)this.Fields[(int)WixBundleVariableTupleFields.Hidden];
-            set => this.Set((int)WixBundleVariableTupleFields.Hidden, value);
+            get => (bool)this.Fields[(int)WixBundleVariableSymbolFields.Hidden];
+            set => this.Set((int)WixBundleVariableSymbolFields.Hidden, value);
         }
 
         public bool Persisted
         {
-            get => (bool)this.Fields[(int)WixBundleVariableTupleFields.Persisted];
-            set => this.Set((int)WixBundleVariableTupleFields.Persisted, value);
+            get => (bool)this.Fields[(int)WixBundleVariableSymbolFields.Persisted];
+            set => this.Set((int)WixBundleVariableSymbolFields.Persisted, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/WixChainItemTuple.cs b/src/WixToolset.Data/Tuples/WixChainItemTuple.cs
index 6c0633e0..c657678c 100644
--- a/src/WixToolset.Data/Tuples/WixChainItemTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixChainItemTuple.cs
@@ -2,35 +2,35 @@
 
 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 WixChainItem = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixChainItem,
+        public static readonly IntermediateSymbolDefinition WixChainItem = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixChainItem,
             new IntermediateFieldDefinition[]
             {
             },
-            typeof(WixChainItemTuple));
+            typeof(WixChainItemSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixChainItemTupleFields
+    public enum WixChainItemSymbolFields
     {
     }
 
-    public class WixChainItemTuple : IntermediateTuple
+    public class WixChainItemSymbol : IntermediateSymbol
     {
-        public WixChainItemTuple() : base(TupleDefinitions.WixChainItem, null, null)
+        public WixChainItemSymbol() : base(SymbolDefinitions.WixChainItem, null, null)
         {
         }
 
-        public WixChainItemTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixChainItem, sourceLineNumber, id)
+        public WixChainItemSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixChainItem, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixChainItemTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixChainItemSymbolFields index] => this.Fields[(int)index];
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixChainTuple.cs b/src/WixToolset.Data/Tuples/WixChainTuple.cs
index 9343ead1..8ec5fc63 100644
--- a/src/WixToolset.Data/Tuples/WixChainTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixChainTuple.cs
@@ -2,25 +2,25 @@
 
 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 WixChain = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixChain,
+        public static readonly IntermediateSymbolDefinition WixChain = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixChain,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixChainTupleFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixChainSymbolFields.Attributes), IntermediateFieldType.Number),
             },
-            typeof(WixChainTuple));
+            typeof(WixChainSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
     using System;
 
-    public enum WixChainTupleFields
+    public enum WixChainSymbolFields
     {
         Attributes,
     }
@@ -34,22 +34,22 @@ namespace WixToolset.Data.Tuples
         ParallelCache = 0x4,
     }
 
-    public class WixChainTuple : IntermediateTuple
+    public class WixChainSymbol : IntermediateSymbol
     {
-        public WixChainTuple() : base(TupleDefinitions.WixChain, null, null)
+        public WixChainSymbol() : base(SymbolDefinitions.WixChain, null, null)
         {
         }
 
-        public WixChainTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixChain, sourceLineNumber, id)
+        public WixChainSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixChain, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixChainTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixChainSymbolFields index] => this.Fields[(int)index];
 
         public WixChainAttributes Attributes
         {
-            get => (WixChainAttributes)(int)this.Fields[(int)WixChainTupleFields.Attributes];
-            set => this.Set((int)WixChainTupleFields.Attributes, (int)value);
+            get => (WixChainAttributes)(int)this.Fields[(int)WixChainSymbolFields.Attributes];
+            set => this.Set((int)WixChainSymbolFields.Attributes, (int)value);
         }
 
         public bool DisableRollback => (this.Attributes & WixChainAttributes.DisableRollback) == WixChainAttributes.DisableRollback;
diff --git a/src/WixToolset.Data/Tuples/WixComplexReferenceTuple.cs b/src/WixToolset.Data/Tuples/WixComplexReferenceTuple.cs
index 3d573f7a..89365605 100644
--- a/src/WixToolset.Data/Tuples/WixComplexReferenceTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixComplexReferenceTuple.cs
@@ -2,30 +2,30 @@
 
 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 WixComplexReference = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixComplexReference,
+        public static readonly IntermediateSymbolDefinition WixComplexReference = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixComplexReference,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixComplexReferenceTupleFields.Parent), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixComplexReferenceTupleFields.ParentAttributes), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixComplexReferenceTupleFields.ParentLanguage), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixComplexReferenceTupleFields.Child), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixComplexReferenceTupleFields.ChildAttributes), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixComplexReferenceTupleFields.Attributes), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(WixComplexReferenceSymbolFields.Parent), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixComplexReferenceSymbolFields.ParentAttributes), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixComplexReferenceSymbolFields.ParentLanguage), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixComplexReferenceSymbolFields.Child), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixComplexReferenceSymbolFields.ChildAttributes), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixComplexReferenceSymbolFields.Attributes), IntermediateFieldType.Bool),
             },
-            typeof(WixComplexReferenceTuple));
+            typeof(WixComplexReferenceSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
     using System;
 
-    public enum WixComplexReferenceTupleFields
+    public enum WixComplexReferenceSymbolFields
     {
         Parent,
         ParentAttributes,
@@ -35,52 +35,52 @@ namespace WixToolset.Data.Tuples
         Attributes,
     }
 
-    public class WixComplexReferenceTuple : IntermediateTuple
+    public class WixComplexReferenceSymbol : IntermediateSymbol
     {
-        public WixComplexReferenceTuple() : base(TupleDefinitions.WixComplexReference, null, null)
+        public WixComplexReferenceSymbol() : base(SymbolDefinitions.WixComplexReference, null, null)
         {
         }
 
-        public WixComplexReferenceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixComplexReference, sourceLineNumber, id)
+        public WixComplexReferenceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixComplexReference, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixComplexReferenceTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixComplexReferenceSymbolFields index] => this.Fields[(int)index];
 
         public string Parent
         {
-            get => (string)this.Fields[(int)WixComplexReferenceTupleFields.Parent];
-            set => this.Set((int)WixComplexReferenceTupleFields.Parent, value);
+            get => (string)this.Fields[(int)WixComplexReferenceSymbolFields.Parent];
+            set => this.Set((int)WixComplexReferenceSymbolFields.Parent, value);
         }
 
         public ComplexReferenceParentType ParentType
         {
-            get => (ComplexReferenceParentType)Enum.Parse(typeof(ComplexReferenceParentType), (string)this.Fields[(int)WixComplexReferenceTupleFields.ParentAttributes], true);
-            set => this.Set((int)WixComplexReferenceTupleFields.ParentAttributes, value.ToString());
+            get => (ComplexReferenceParentType)Enum.Parse(typeof(ComplexReferenceParentType), (string)this.Fields[(int)WixComplexReferenceSymbolFields.ParentAttributes], true);
+            set => this.Set((int)WixComplexReferenceSymbolFields.ParentAttributes, value.ToString());
         }
 
         public string ParentLanguage
         {
-            get => (string)this.Fields[(int)WixComplexReferenceTupleFields.ParentLanguage];
-            set => this.Set((int)WixComplexReferenceTupleFields.ParentLanguage, value);
+            get => (string)this.Fields[(int)WixComplexReferenceSymbolFields.ParentLanguage];
+            set => this.Set((int)WixComplexReferenceSymbolFields.ParentLanguage, value);
         }
 
         public string Child
         {
-            get => (string)this.Fields[(int)WixComplexReferenceTupleFields.Child];
-            set => this.Set((int)WixComplexReferenceTupleFields.Child, value);
+            get => (string)this.Fields[(int)WixComplexReferenceSymbolFields.Child];
+            set => this.Set((int)WixComplexReferenceSymbolFields.Child, value);
         }
 
         public ComplexReferenceChildType ChildType
         {
-            get => (ComplexReferenceChildType)Enum.Parse(typeof(ComplexReferenceChildType), (string)this.Fields[(int)WixComplexReferenceTupleFields.ChildAttributes], true);
-            set => this.Set((int)WixComplexReferenceTupleFields.ChildAttributes, value.ToString());
+            get => (ComplexReferenceChildType)Enum.Parse(typeof(ComplexReferenceChildType), (string)this.Fields[(int)WixComplexReferenceSymbolFields.ChildAttributes], true);
+            set => this.Set((int)WixComplexReferenceSymbolFields.ChildAttributes, value.ToString());
         }
 
         public bool IsPrimary
         {
-            get => (bool)this.Fields[(int)WixComplexReferenceTupleFields.Attributes];
-            set => this.Set((int)WixComplexReferenceTupleFields.Attributes, value);
+            get => (bool)this.Fields[(int)WixComplexReferenceSymbolFields.Attributes];
+            set => this.Set((int)WixComplexReferenceSymbolFields.Attributes, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixComponentGroupTuple.cs b/src/WixToolset.Data/Tuples/WixComponentGroupTuple.cs
index 1209790f..4dd5a3b5 100644
--- a/src/WixToolset.Data/Tuples/WixComponentGroupTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixComponentGroupTuple.cs
@@ -2,43 +2,43 @@
 
 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 WixComponentGroup = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixComponentGroup,
+        public static readonly IntermediateSymbolDefinition WixComponentGroup = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixComponentGroup,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixComponentGroupTupleFields.WixComponentGroup), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixComponentGroupSymbolFields.WixComponentGroup), IntermediateFieldType.String),
             },
-            typeof(WixComponentGroupTuple));
+            typeof(WixComponentGroupSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixComponentGroupTupleFields
+    public enum WixComponentGroupSymbolFields
     {
         WixComponentGroup,
     }
 
-    public class WixComponentGroupTuple : IntermediateTuple
+    public class WixComponentGroupSymbol : IntermediateSymbol
     {
-        public WixComponentGroupTuple() : base(TupleDefinitions.WixComponentGroup, null, null)
+        public WixComponentGroupSymbol() : base(SymbolDefinitions.WixComponentGroup, null, null)
         {
         }
 
-        public WixComponentGroupTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixComponentGroup, sourceLineNumber, id)
+        public WixComponentGroupSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixComponentGroup, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixComponentGroupTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixComponentGroupSymbolFields index] => this.Fields[(int)index];
 
         public string WixComponentGroup
         {
-            get => (string)this.Fields[(int)WixComponentGroupTupleFields.WixComponentGroup];
-            set => this.Set((int)WixComponentGroupTupleFields.WixComponentGroup, value);
+            get => (string)this.Fields[(int)WixComponentGroupSymbolFields.WixComponentGroup];
+            set => this.Set((int)WixComponentGroupSymbolFields.WixComponentGroup, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixComponentSearchTuple.cs b/src/WixToolset.Data/Tuples/WixComponentSearchTuple.cs
index de6f47b9..63f7179f 100644
--- a/src/WixToolset.Data/Tuples/WixComponentSearchTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixComponentSearchTuple.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 WixComponentSearch = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixComponentSearch,
+        public static readonly IntermediateSymbolDefinition WixComponentSearch = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixComponentSearch,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixComponentSearchTupleFields.Guid), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixComponentSearchTupleFields.ProductCode), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixComponentSearchTupleFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixComponentSearchSymbolFields.Guid), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixComponentSearchSymbolFields.ProductCode), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixComponentSearchSymbolFields.Attributes), IntermediateFieldType.Number),
             },
-            typeof(WixComponentSearchTuple));
+            typeof(WixComponentSearchSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
     using System;
 
-    public enum WixComponentSearchTupleFields
+    public enum WixComponentSearchSymbolFields
     {
         Guid,
         ProductCode,
@@ -37,34 +37,34 @@ namespace WixToolset.Data.Tuples
         WantDirectory = 0x4,
     }
 
-    public class WixComponentSearchTuple : IntermediateTuple
+    public class WixComponentSearchSymbol : IntermediateSymbol
     {
-        public WixComponentSearchTuple() : base(TupleDefinitions.WixComponentSearch, null, null)
+        public WixComponentSearchSymbol() : base(SymbolDefinitions.WixComponentSearch, null, null)
         {
         }
 
-        public WixComponentSearchTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixComponentSearch, sourceLineNumber, id)
+        public WixComponentSearchSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixComponentSearch, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixComponentSearchTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixComponentSearchSymbolFields index] => this.Fields[(int)index];
 
         public string Guid
         {
-            get => (string)this.Fields[(int)WixComponentSearchTupleFields.Guid];
-            set => this.Set((int)WixComponentSearchTupleFields.Guid, value);
+            get => (string)this.Fields[(int)WixComponentSearchSymbolFields.Guid];
+            set => this.Set((int)WixComponentSearchSymbolFields.Guid, value);
         }
 
         public string ProductCode
         {
-            get => (string)this.Fields[(int)WixComponentSearchTupleFields.ProductCode];
-            set => this.Set((int)WixComponentSearchTupleFields.ProductCode, value);
+            get => (string)this.Fields[(int)WixComponentSearchSymbolFields.ProductCode];
+            set => this.Set((int)WixComponentSearchSymbolFields.ProductCode, value);
         }
 
         public WixComponentSearchAttributes Attributes
         {
-            get => (WixComponentSearchAttributes)this.Fields[(int)WixComponentSearchTupleFields.Attributes].AsNumber();
-            set => this.Set((int)WixComponentSearchTupleFields.Attributes, (int)value);
+            get => (WixComponentSearchAttributes)this.Fields[(int)WixComponentSearchSymbolFields.Attributes].AsNumber();
+            set => this.Set((int)WixComponentSearchSymbolFields.Attributes, (int)value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/WixCustomTableCellTuple.cs b/src/WixToolset.Data/Tuples/WixCustomTableCellTuple.cs
index 18be675e..b45cda43 100644
--- a/src/WixToolset.Data/Tuples/WixCustomTableCellTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixCustomTableCellTuple.cs
@@ -2,26 +2,26 @@
 
 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 WixCustomTableCell = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixCustomTableCell,
+        public static readonly IntermediateSymbolDefinition WixCustomTableCell = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixCustomTableCell,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixCustomTableCellTupleFields.TableRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixCustomTableCellTupleFields.ColumnRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixCustomTableCellTupleFields.RowId), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixCustomTableCellTupleFields.Data), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixCustomTableCellSymbolFields.TableRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixCustomTableCellSymbolFields.ColumnRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixCustomTableCellSymbolFields.RowId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixCustomTableCellSymbolFields.Data), IntermediateFieldType.String),
             },
-            typeof(WixCustomTableCellTuple));
+            typeof(WixCustomTableCellSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixCustomTableCellTupleFields
+    public enum WixCustomTableCellSymbolFields
     {
         TableRef,
         ColumnRef,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
         Data,
     }
 
-    public class WixCustomTableCellTuple : IntermediateTuple
+    public class WixCustomTableCellSymbol : IntermediateSymbol
     {
-        public WixCustomTableCellTuple() : base(TupleDefinitions.WixCustomTableCell, null, null)
+        public WixCustomTableCellSymbol() : base(SymbolDefinitions.WixCustomTableCell, null, null)
         {
         }
 
-        public WixCustomTableCellTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixCustomTableCell, sourceLineNumber, id)
+        public WixCustomTableCellSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixCustomTableCell, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixCustomTableCellTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixCustomTableCellSymbolFields index] => this.Fields[(int)index];
 
         public string TableRef
         {
-            get => (string)this.Fields[(int)WixCustomTableCellTupleFields.TableRef];
-            set => this.Set((int)WixCustomTableCellTupleFields.TableRef, value);
+            get => (string)this.Fields[(int)WixCustomTableCellSymbolFields.TableRef];
+            set => this.Set((int)WixCustomTableCellSymbolFields.TableRef, value);
         }
 
         public string ColumnRef
         {
-            get => (string)this.Fields[(int)WixCustomTableCellTupleFields.ColumnRef];
-            set => this.Set((int)WixCustomTableCellTupleFields.ColumnRef, value);
+            get => (string)this.Fields[(int)WixCustomTableCellSymbolFields.ColumnRef];
+            set => this.Set((int)WixCustomTableCellSymbolFields.ColumnRef, value);
         }
 
         public string RowId
         {
-            get => (string)this.Fields[(int)WixCustomTableCellTupleFields.RowId];
-            set => this.Set((int)WixCustomTableCellTupleFields.RowId, value);
+            get => (string)this.Fields[(int)WixCustomTableCellSymbolFields.RowId];
+            set => this.Set((int)WixCustomTableCellSymbolFields.RowId, value);
         }
 
         public string Data
         {
-            get => (string)this.Fields[(int)WixCustomTableCellTupleFields.Data];
-            set => this.Set((int)WixCustomTableCellTupleFields.Data, value);
+            get => (string)this.Fields[(int)WixCustomTableCellSymbolFields.Data];
+            set => this.Set((int)WixCustomTableCellSymbolFields.Data, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/WixCustomTableColumnTuple.cs b/src/WixToolset.Data/Tuples/WixCustomTableColumnTuple.cs
index 8f3cf571..9ae2a904 100644
--- a/src/WixToolset.Data/Tuples/WixCustomTableColumnTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixCustomTableColumnTuple.cs
@@ -2,37 +2,37 @@
 
 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 WixCustomTableColumn = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixCustomTableColumn,
+        public static readonly IntermediateSymbolDefinition WixCustomTableColumn = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixCustomTableColumn,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixCustomTableColumnTupleFields.TableRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixCustomTableColumnTupleFields.Name), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixCustomTableColumnTupleFields.Type), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixCustomTableColumnTupleFields.Attributes), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixCustomTableColumnTupleFields.Width), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixCustomTableColumnTupleFields.MinValue), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixCustomTableColumnTupleFields.MaxValue), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixCustomTableColumnTupleFields.KeyTable), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixCustomTableColumnTupleFields.KeyColumn), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixCustomTableColumnTupleFields.Category), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixCustomTableColumnTupleFields.Set), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixCustomTableColumnTupleFields.Description), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixCustomTableColumnTupleFields.Modularize), IntermediateFieldType.Number)
+                new IntermediateFieldDefinition(nameof(WixCustomTableColumnSymbolFields.TableRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixCustomTableColumnSymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixCustomTableColumnSymbolFields.Type), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixCustomTableColumnSymbolFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixCustomTableColumnSymbolFields.Width), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixCustomTableColumnSymbolFields.MinValue), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixCustomTableColumnSymbolFields.MaxValue), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixCustomTableColumnSymbolFields.KeyTable), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixCustomTableColumnSymbolFields.KeyColumn), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixCustomTableColumnSymbolFields.Category), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixCustomTableColumnSymbolFields.Set), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixCustomTableColumnSymbolFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixCustomTableColumnSymbolFields.Modularize), IntermediateFieldType.Number)
             },
-            typeof(WixCustomTableColumnTuple));
+            typeof(WixCustomTableColumnSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
     using System;
 
-    public enum WixCustomTableColumnTupleFields
+    public enum WixCustomTableColumnSymbolFields
     {
         TableRef,
         Name,
@@ -50,7 +50,7 @@ namespace WixToolset.Data.Tuples
     }
 
     [Flags]
-    public enum WixCustomTableColumnTupleAttributes
+    public enum WixCustomTableColumnSymbolAttributes
     {
         None = 0x0,
         PrimaryKey = 0x1,
@@ -102,102 +102,102 @@ namespace WixToolset.Data.Tuples
         SemicolonDelimited,
     }
 
-    public class WixCustomTableColumnTuple : IntermediateTuple
+    public class WixCustomTableColumnSymbol : IntermediateSymbol
     {
-        public WixCustomTableColumnTuple() : base(TupleDefinitions.WixCustomTableColumn, null, null)
+        public WixCustomTableColumnSymbol() : base(SymbolDefinitions.WixCustomTableColumn, null, null)
         {
         }
 
-        public WixCustomTableColumnTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixCustomTableColumn, sourceLineNumber, id)
+        public WixCustomTableColumnSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixCustomTableColumn, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixCustomTableColumnTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixCustomTableColumnSymbolFields index] => this.Fields[(int)index];
 
         public string TableRef
         {
-            get => (string)this.Fields[(int)WixCustomTableColumnTupleFields.TableRef];
-            set => this.Set((int)WixCustomTableColumnTupleFields.TableRef, value);
+            get => (string)this.Fields[(int)WixCustomTableColumnSymbolFields.TableRef];
+            set => this.Set((int)WixCustomTableColumnSymbolFields.TableRef, value);
         }
 
         public string Name
         {
-            get => (string)this.Fields[(int)WixCustomTableColumnTupleFields.Name];
-            set => this.Set((int)WixCustomTableColumnTupleFields.Name, value);
+            get => (string)this.Fields[(int)WixCustomTableColumnSymbolFields.Name];
+            set => this.Set((int)WixCustomTableColumnSymbolFields.Name, value);
         }
 
         public IntermediateFieldType Type
         {
-            get => (IntermediateFieldType)this.Fields[(int)WixCustomTableColumnTupleFields.Type].AsNumber();
-            set => this.Set((int)WixCustomTableColumnTupleFields.Type, (int)value);
+            get => (IntermediateFieldType)this.Fields[(int)WixCustomTableColumnSymbolFields.Type].AsNumber();
+            set => this.Set((int)WixCustomTableColumnSymbolFields.Type, (int)value);
         }
 
-        public WixCustomTableColumnTupleAttributes Attributes
+        public WixCustomTableColumnSymbolAttributes Attributes
         {
-            get => (WixCustomTableColumnTupleAttributes)this.Fields[(int)WixCustomTableColumnTupleFields.Attributes].AsNumber();
-            set => this.Set((int)WixCustomTableColumnTupleFields.Attributes, (int)value);
+            get => (WixCustomTableColumnSymbolAttributes)this.Fields[(int)WixCustomTableColumnSymbolFields.Attributes].AsNumber();
+            set => this.Set((int)WixCustomTableColumnSymbolFields.Attributes, (int)value);
         }
 
         public int Width
         {
-            get => (int)this.Fields[(int)WixCustomTableColumnTupleFields.Width];
-            set => this.Set((int)WixCustomTableColumnTupleFields.Width, value);
+            get => (int)this.Fields[(int)WixCustomTableColumnSymbolFields.Width];
+            set => this.Set((int)WixCustomTableColumnSymbolFields.Width, value);
         }
 
         public long? MinValue
         {
-            get => (long?)this.Fields[(int)WixCustomTableColumnTupleFields.MinValue];
-            set => this.Set((int)WixCustomTableColumnTupleFields.MinValue, value);
+            get => (long?)this.Fields[(int)WixCustomTableColumnSymbolFields.MinValue];
+            set => this.Set((int)WixCustomTableColumnSymbolFields.MinValue, value);
         }
 
         public long? MaxValue
         {
-            get => (long?)this.Fields[(int)WixCustomTableColumnTupleFields.MaxValue];
-            set => this.Set((int)WixCustomTableColumnTupleFields.MaxValue, value);
+            get => (long?)this.Fields[(int)WixCustomTableColumnSymbolFields.MaxValue];
+            set => this.Set((int)WixCustomTableColumnSymbolFields.MaxValue, value);
         }
 
         public string KeyTable
         {
-            get => (string)this.Fields[(int)WixCustomTableColumnTupleFields.KeyTable];
-            set => this.Set((int)WixCustomTableColumnTupleFields.KeyTable, value);
+            get => (string)this.Fields[(int)WixCustomTableColumnSymbolFields.KeyTable];
+            set => this.Set((int)WixCustomTableColumnSymbolFields.KeyTable, value);
         }
 
         public int? KeyColumn
         {
-            get => (int?)this.Fields[(int)WixCustomTableColumnTupleFields.KeyColumn];
-            set => this.Set((int)WixCustomTableColumnTupleFields.KeyColumn, value);
+            get => (int?)this.Fields[(int)WixCustomTableColumnSymbolFields.KeyColumn];
+            set => this.Set((int)WixCustomTableColumnSymbolFields.KeyColumn, value);
         }
 
         public WixCustomTableColumnCategoryType? Category
         {
-            get => (WixCustomTableColumnCategoryType?)this.Fields[(int)WixCustomTableColumnTupleFields.Category].AsNullableNumber();
-            set => this.Set((int)WixCustomTableColumnTupleFields.Category, (int?)value);
+            get => (WixCustomTableColumnCategoryType?)this.Fields[(int)WixCustomTableColumnSymbolFields.Category].AsNullableNumber();
+            set => this.Set((int)WixCustomTableColumnSymbolFields.Category, (int?)value);
         }
 
         public string Set
         {
-            get => (string)this.Fields[(int)WixCustomTableColumnTupleFields.Set];
-            set => this.Set((int)WixCustomTableColumnTupleFields.Set, value);
+            get => (string)this.Fields[(int)WixCustomTableColumnSymbolFields.Set];
+            set => this.Set((int)WixCustomTableColumnSymbolFields.Set, value);
         }
 
         public string Description
         {
-            get => (string)this.Fields[(int)WixCustomTableColumnTupleFields.Description];
-            set => this.Set((int)WixCustomTableColumnTupleFields.Description, value);
+            get => (string)this.Fields[(int)WixCustomTableColumnSymbolFields.Description];
+            set => this.Set((int)WixCustomTableColumnSymbolFields.Description, value);
         }
 
         public WixCustomTableColumnModularizeType? Modularize
         {
-            get => (WixCustomTableColumnModularizeType?)this.Fields[(int)WixCustomTableColumnTupleFields.Modularize].AsNullableNumber();
-            set => this.Set((int)WixCustomTableColumnTupleFields.Modularize, (int?)value);
+            get => (WixCustomTableColumnModularizeType?)this.Fields[(int)WixCustomTableColumnSymbolFields.Modularize].AsNullableNumber();
+            set => this.Set((int)WixCustomTableColumnSymbolFields.Modularize, (int?)value);
         }
 
-        public bool PrimaryKey => (this.Attributes & WixCustomTableColumnTupleAttributes.PrimaryKey) == WixCustomTableColumnTupleAttributes.PrimaryKey;
+        public bool PrimaryKey => (this.Attributes & WixCustomTableColumnSymbolAttributes.PrimaryKey) == WixCustomTableColumnSymbolAttributes.PrimaryKey;
 
-        public bool Localizable => (this.Attributes & WixCustomTableColumnTupleAttributes.Localizable) == WixCustomTableColumnTupleAttributes.Localizable;
+        public bool Localizable => (this.Attributes & WixCustomTableColumnSymbolAttributes.Localizable) == WixCustomTableColumnSymbolAttributes.Localizable;
 
-        public bool Nullable => (this.Attributes & WixCustomTableColumnTupleAttributes.Nullable) == WixCustomTableColumnTupleAttributes.Nullable;
+        public bool Nullable => (this.Attributes & WixCustomTableColumnSymbolAttributes.Nullable) == WixCustomTableColumnSymbolAttributes.Nullable;
 
-        public bool Unreal => (this.Attributes & WixCustomTableColumnTupleAttributes.Unreal) == WixCustomTableColumnTupleAttributes.Unreal;
+        public bool Unreal => (this.Attributes & WixCustomTableColumnSymbolAttributes.Unreal) == WixCustomTableColumnSymbolAttributes.Unreal;
     }
 }
diff --git a/src/WixToolset.Data/Tuples/WixCustomTableTuple.cs b/src/WixToolset.Data/Tuples/WixCustomTableTuple.cs
index b0d12a63..af731443 100644
--- a/src/WixToolset.Data/Tuples/WixCustomTableTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixCustomTableTuple.cs
@@ -2,53 +2,53 @@
 
 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 WixCustomTable = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixCustomTable,
+        public static readonly IntermediateSymbolDefinition WixCustomTable = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixCustomTable,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.ColumnNames), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.Unreal), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(WixCustomTableSymbolFields.ColumnNames), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixCustomTableSymbolFields.Unreal), IntermediateFieldType.Bool),
             },
-            typeof(WixCustomTableTuple));
+            typeof(WixCustomTableSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixCustomTableTupleFields
+    public enum WixCustomTableSymbolFields
     {
         ColumnNames,
         Unreal,
     }
 
-    public class WixCustomTableTuple : IntermediateTuple
+    public class WixCustomTableSymbol : IntermediateSymbol
     {
         public const char ColumnNamesSeparator = '\x85';
 
-        public WixCustomTableTuple() : base(TupleDefinitions.WixCustomTable, null, null)
+        public WixCustomTableSymbol() : base(SymbolDefinitions.WixCustomTable, null, null)
         {
         }
 
-        public WixCustomTableTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixCustomTable, sourceLineNumber, id)
+        public WixCustomTableSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixCustomTable, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixCustomTableTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixCustomTableSymbolFields index] => this.Fields[(int)index];
 
         public string ColumnNames
         {
-            get => (string)this.Fields[(int)WixCustomTableTupleFields.ColumnNames];
-            set => this.Set((int)WixCustomTableTupleFields.ColumnNames, value);
+            get => (string)this.Fields[(int)WixCustomTableSymbolFields.ColumnNames];
+            set => this.Set((int)WixCustomTableSymbolFields.ColumnNames, value);
         }
 
         public bool Unreal
         {
-            get => (bool)this.Fields[(int)WixCustomTableTupleFields.Unreal];
-            set => this.Set((int)WixCustomTableTupleFields.Unreal, value);
+            get => (bool)this.Fields[(int)WixCustomTableSymbolFields.Unreal];
+            set => this.Set((int)WixCustomTableSymbolFields.Unreal, value);
         }
 
         public string[] ColumnNamesSeparated => this.ColumnNames.Split(ColumnNamesSeparator);
diff --git a/src/WixToolset.Data/Tuples/WixDeltaPatchFileTuple.cs b/src/WixToolset.Data/Tuples/WixDeltaPatchFileTuple.cs
index 4f90bb7c..77203b03 100644
--- a/src/WixToolset.Data/Tuples/WixDeltaPatchFileTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixDeltaPatchFileTuple.cs
@@ -2,28 +2,28 @@
 
 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 WixDeltaPatchFile = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixDeltaPatchFile,
+        public static readonly IntermediateSymbolDefinition WixDeltaPatchFile = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixDeltaPatchFile,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixDeltaPatchFileTupleFields.FileRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixDeltaPatchFileTupleFields.RetainLengths), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixDeltaPatchFileTupleFields.IgnoreOffsets), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixDeltaPatchFileTupleFields.IgnoreLengths), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixDeltaPatchFileTupleFields.RetainOffsets), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixDeltaPatchFileTupleFields.SymbolPaths), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixDeltaPatchFileSymbolFields.FileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixDeltaPatchFileSymbolFields.RetainLengths), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixDeltaPatchFileSymbolFields.IgnoreOffsets), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixDeltaPatchFileSymbolFields.IgnoreLengths), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixDeltaPatchFileSymbolFields.RetainOffsets), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixDeltaPatchFileSymbolFields.SymbolPaths), IntermediateFieldType.String),
             },
-            typeof(WixDeltaPatchFileTuple));
+            typeof(WixDeltaPatchFileSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixDeltaPatchFileTupleFields
+    public enum WixDeltaPatchFileSymbolFields
     {
         FileRef,
         RetainLengths,
@@ -33,52 +33,52 @@ namespace WixToolset.Data.Tuples
         SymbolPaths,
     }
 
-    public class WixDeltaPatchFileTuple : IntermediateTuple
+    public class WixDeltaPatchFileSymbol : IntermediateSymbol
     {
-        public WixDeltaPatchFileTuple() : base(TupleDefinitions.WixDeltaPatchFile, null, null)
+        public WixDeltaPatchFileSymbol() : base(SymbolDefinitions.WixDeltaPatchFile, null, null)
         {
         }
 
-        public WixDeltaPatchFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixDeltaPatchFile, sourceLineNumber, id)
+        public WixDeltaPatchFileSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixDeltaPatchFile, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixDeltaPatchFileTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixDeltaPatchFileSymbolFields index] => this.Fields[(int)index];
 
         public string FileRef
         {
-            get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.FileRef];
-            set => this.Set((int)WixDeltaPatchFileTupleFields.FileRef, value);
+            get => (string)this.Fields[(int)WixDeltaPatchFileSymbolFields.FileRef];
+            set => this.Set((int)WixDeltaPatchFileSymbolFields.FileRef, value);
         }
 
         public string RetainLengths
         {
-            get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.RetainLengths];
-            set => this.Set((int)WixDeltaPatchFileTupleFields.RetainLengths, value);
+            get => (string)this.Fields[(int)WixDeltaPatchFileSymbolFields.RetainLengths];
+            set => this.Set((int)WixDeltaPatchFileSymbolFields.RetainLengths, value);
         }
 
         public string IgnoreOffsets
         {
-            get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.IgnoreOffsets];
-            set => this.Set((int)WixDeltaPatchFileTupleFields.IgnoreOffsets, value);
+            get => (string)this.Fields[(int)WixDeltaPatchFileSymbolFields.IgnoreOffsets];
+            set => this.Set((int)WixDeltaPatchFileSymbolFields.IgnoreOffsets, value);
         }
 
         public string IgnoreLengths
         {
-            get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.IgnoreLengths];
-            set => this.Set((int)WixDeltaPatchFileTupleFields.IgnoreLengths, value);
+            get => (string)this.Fields[(int)WixDeltaPatchFileSymbolFields.IgnoreLengths];
+            set => this.Set((int)WixDeltaPatchFileSymbolFields.IgnoreLengths, value);
         }
 
         public string RetainOffsets
         {
-            get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.RetainOffsets];
-            set => this.Set((int)WixDeltaPatchFileTupleFields.RetainOffsets, value);
+            get => (string)this.Fields[(int)WixDeltaPatchFileSymbolFields.RetainOffsets];
+            set => this.Set((int)WixDeltaPatchFileSymbolFields.RetainOffsets, value);
         }
 
         public string SymbolPaths
         {
-            get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.SymbolPaths];
-            set => this.Set((int)WixDeltaPatchFileTupleFields.SymbolPaths, value);
+            get => (string)this.Fields[(int)WixDeltaPatchFileSymbolFields.SymbolPaths];
+            set => this.Set((int)WixDeltaPatchFileSymbolFields.SymbolPaths, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixDeltaPatchSymbolPathsTuple.cs b/src/WixToolset.Data/Tuples/WixDeltaPatchSymbolPathsTuple.cs
index 29acf111..6e50d07f 100644
--- a/src/WixToolset.Data/Tuples/WixDeltaPatchSymbolPathsTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixDeltaPatchSymbolPathsTuple.cs
@@ -4,25 +4,25 @@ using System;
 
 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 WixDeltaPatchSymbolPaths = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixDeltaPatchSymbolPaths,
+        public static readonly IntermediateSymbolDefinition WixDeltaPatchSymbolPaths = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixDeltaPatchSymbolPaths,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixDeltaPatchSymbolPathsTupleFields.SymbolType), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixDeltaPatchSymbolPathsTupleFields.SymbolId), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixDeltaPatchSymbolPathsTupleFields.SymbolPaths), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixDeltaPatchSymbolPathsSymbolFields.SymbolType), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixDeltaPatchSymbolPathsSymbolFields.SymbolId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixDeltaPatchSymbolPathsSymbolFields.SymbolPaths), IntermediateFieldType.String),
             },
-            typeof(WixDeltaPatchSymbolPathsTuple));
+            typeof(WixDeltaPatchSymbolPathsSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixDeltaPatchSymbolPathsTupleFields
+    public enum WixDeltaPatchSymbolPathsSymbolFields
     {
         SymbolType,
         SymbolId,
@@ -42,34 +42,34 @@ namespace WixToolset.Data.Tuples
         Product
     };
 
-    public class WixDeltaPatchSymbolPathsTuple : IntermediateTuple
+    public class WixDeltaPatchSymbolPathsSymbol : IntermediateSymbol
     {
-        public WixDeltaPatchSymbolPathsTuple() : base(TupleDefinitions.WixDeltaPatchSymbolPaths, null, null)
+        public WixDeltaPatchSymbolPathsSymbol() : base(SymbolDefinitions.WixDeltaPatchSymbolPaths, null, null)
         {
         }
 
-        public WixDeltaPatchSymbolPathsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixDeltaPatchSymbolPaths, sourceLineNumber, id)
+        public WixDeltaPatchSymbolPathsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixDeltaPatchSymbolPaths, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixDeltaPatchSymbolPathsTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixDeltaPatchSymbolPathsSymbolFields index] => this.Fields[(int)index];
 
         public SymbolPathType SymbolType
         {
-            get => (SymbolPathType)this.Fields[(int)WixDeltaPatchSymbolPathsTupleFields.SymbolType].AsNumber();
-            set => this.Set((int)WixDeltaPatchSymbolPathsTupleFields.SymbolType, (int)value);
+            get => (SymbolPathType)this.Fields[(int)WixDeltaPatchSymbolPathsSymbolFields.SymbolType].AsNumber();
+            set => this.Set((int)WixDeltaPatchSymbolPathsSymbolFields.SymbolType, (int)value);
         }
 
         public string SymbolId
         {
-            get => (string)this.Fields[(int)WixDeltaPatchSymbolPathsTupleFields.SymbolId];
-            set => this.Set((int)WixDeltaPatchSymbolPathsTupleFields.SymbolId, value);
+            get => (string)this.Fields[(int)WixDeltaPatchSymbolPathsSymbolFields.SymbolId];
+            set => this.Set((int)WixDeltaPatchSymbolPathsSymbolFields.SymbolId, value);
         }
 
         public string SymbolPaths
         {
-            get => (string)this.Fields[(int)WixDeltaPatchSymbolPathsTupleFields.SymbolPaths];
-            set => this.Set((int)WixDeltaPatchSymbolPathsTupleFields.SymbolPaths, value);
+            get => (string)this.Fields[(int)WixDeltaPatchSymbolPathsSymbolFields.SymbolPaths];
+            set => this.Set((int)WixDeltaPatchSymbolPathsSymbolFields.SymbolPaths, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixDependencyProviderTuple.cs b/src/WixToolset.Data/Tuples/WixDependencyProviderTuple.cs
index 1953594e..3ede1097 100644
--- a/src/WixToolset.Data/Tuples/WixDependencyProviderTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixDependencyProviderTuple.cs
@@ -2,30 +2,30 @@
 
 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 WixDependencyProvider = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixDependencyProvider.ToString(),
+        public static readonly IntermediateSymbolDefinition WixDependencyProvider = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixDependencyProvider.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixDependencyProviderTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixDependencyProviderTupleFields.ProviderKey), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixDependencyProviderTupleFields.Version), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixDependencyProviderTupleFields.DisplayName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixDependencyProviderTupleFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixDependencyProviderSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixDependencyProviderSymbolFields.ProviderKey), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixDependencyProviderSymbolFields.Version), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixDependencyProviderSymbolFields.DisplayName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixDependencyProviderSymbolFields.Attributes), IntermediateFieldType.Number),
             },
-            typeof(WixDependencyProviderTuple));
+            typeof(WixDependencyProviderSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
     using System;
     using WixToolset.Data;
 
-    public enum WixDependencyProviderTupleFields
+    public enum WixDependencyProviderSymbolFields
     {
         ComponentRef,
         ProviderKey,
@@ -40,46 +40,46 @@ namespace WixToolset.Data.Tuples
         ProvidesAttributesBundle = 0x10000
     }
 
-    public class WixDependencyProviderTuple : IntermediateTuple
+    public class WixDependencyProviderSymbol : IntermediateSymbol
     {
-        public WixDependencyProviderTuple() : base(TupleDefinitions.WixDependencyProvider, null, null)
+        public WixDependencyProviderSymbol() : base(SymbolDefinitions.WixDependencyProvider, null, null)
         {
         }
 
-        public WixDependencyProviderTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixDependencyProvider, sourceLineNumber, id)
+        public WixDependencyProviderSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixDependencyProvider, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixDependencyProviderTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixDependencyProviderSymbolFields index] => this.Fields[(int)index];
 
         public string ComponentRef
         {
-            get => this.Fields[(int)WixDependencyProviderTupleFields.ComponentRef].AsString();
-            set => this.Set((int)WixDependencyProviderTupleFields.ComponentRef, value);
+            get => this.Fields[(int)WixDependencyProviderSymbolFields.ComponentRef].AsString();
+            set => this.Set((int)WixDependencyProviderSymbolFields.ComponentRef, value);
         }
 
         public string ProviderKey
         {
-            get => this.Fields[(int)WixDependencyProviderTupleFields.ProviderKey].AsString();
-            set => this.Set((int)WixDependencyProviderTupleFields.ProviderKey, value);
+            get => this.Fields[(int)WixDependencyProviderSymbolFields.ProviderKey].AsString();
+            set => this.Set((int)WixDependencyProviderSymbolFields.ProviderKey, value);
         }
 
         public string Version
         {
-            get => this.Fields[(int)WixDependencyProviderTupleFields.Version].AsString();
-            set => this.Set((int)WixDependencyProviderTupleFields.Version, value);
+            get => this.Fields[(int)WixDependencyProviderSymbolFields.Version].AsString();
+            set => this.Set((int)WixDependencyProviderSymbolFields.Version, value);
         }
 
         public string DisplayName
         {
-            get => this.Fields[(int)WixDependencyProviderTupleFields.DisplayName].AsString();
-            set => this.Set((int)WixDependencyProviderTupleFields.DisplayName, value);
+            get => this.Fields[(int)WixDependencyProviderSymbolFields.DisplayName].AsString();
+            set => this.Set((int)WixDependencyProviderSymbolFields.DisplayName, value);
         }
 
         public WixDependencyProviderAttributes Attributes
         {
-            get => (WixDependencyProviderAttributes)(int)this.Fields[(int)WixDependencyProviderTupleFields.Attributes];
-            set => this.Set((int)WixDependencyProviderTupleFields.Attributes, (int)value);
+            get => (WixDependencyProviderAttributes)(int)this.Fields[(int)WixDependencyProviderSymbolFields.Attributes];
+            set => this.Set((int)WixDependencyProviderSymbolFields.Attributes, (int)value);
         }
 
         public bool Bundle => (this.Attributes & WixDependencyProviderAttributes.ProvidesAttributesBundle) == WixDependencyProviderAttributes.ProvidesAttributesBundle;
diff --git a/src/WixToolset.Data/Tuples/WixEnsureTableTuple.cs b/src/WixToolset.Data/Tuples/WixEnsureTableTuple.cs
index cd47c0fd..d13063b7 100644
--- a/src/WixToolset.Data/Tuples/WixEnsureTableTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixEnsureTableTuple.cs
@@ -2,43 +2,43 @@
 
 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 WixEnsureTable = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixEnsureTable,
+        public static readonly IntermediateSymbolDefinition WixEnsureTable = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixEnsureTable,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixEnsureTableTupleFields.Table), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixEnsureTableSymbolFields.Table), IntermediateFieldType.String),
             },
-            typeof(WixEnsureTableTuple));
+            typeof(WixEnsureTableSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixEnsureTableTupleFields
+    public enum WixEnsureTableSymbolFields
     {
         Table,
     }
 
-    public class WixEnsureTableTuple : IntermediateTuple
+    public class WixEnsureTableSymbol : IntermediateSymbol
     {
-        public WixEnsureTableTuple() : base(TupleDefinitions.WixEnsureTable, null, null)
+        public WixEnsureTableSymbol() : base(SymbolDefinitions.WixEnsureTable, null, null)
         {
         }
 
-        public WixEnsureTableTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixEnsureTable, sourceLineNumber, id)
+        public WixEnsureTableSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixEnsureTable, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixEnsureTableTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixEnsureTableSymbolFields index] => this.Fields[(int)index];
 
         public string Table
         {
-            get => (string)this.Fields[(int)WixEnsureTableTupleFields.Table];
-            set => this.Set((int)WixEnsureTableTupleFields.Table, value);
+            get => (string)this.Fields[(int)WixEnsureTableSymbolFields.Table];
+            set => this.Set((int)WixEnsureTableSymbolFields.Table, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixFeatureGroupTuple.cs b/src/WixToolset.Data/Tuples/WixFeatureGroupTuple.cs
index 481bb193..ac002bb6 100644
--- a/src/WixToolset.Data/Tuples/WixFeatureGroupTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixFeatureGroupTuple.cs
@@ -2,35 +2,35 @@
 
 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 WixFeatureGroup = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixFeatureGroup,
+        public static readonly IntermediateSymbolDefinition WixFeatureGroup = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixFeatureGroup,
             new IntermediateFieldDefinition[]
             {
             },
-            typeof(WixFeatureGroupTuple));
+            typeof(WixFeatureGroupSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixFeatureGroupTupleFields
+    public enum WixFeatureGroupSymbolFields
     {
     }
 
-    public class WixFeatureGroupTuple : IntermediateTuple
+    public class WixFeatureGroupSymbol : IntermediateSymbol
     {
-        public WixFeatureGroupTuple() : base(TupleDefinitions.WixFeatureGroup, null, null)
+        public WixFeatureGroupSymbol() : base(SymbolDefinitions.WixFeatureGroup, null, null)
         {
         }
 
-        public WixFeatureGroupTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixFeatureGroup, sourceLineNumber, id)
+        public WixFeatureGroupSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixFeatureGroup, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixFeatureGroupTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixFeatureGroupSymbolFields index] => this.Fields[(int)index];
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixFeatureModulesTuple.cs b/src/WixToolset.Data/Tuples/WixFeatureModulesTuple.cs
index cce7d190..b8b3d4b9 100644
--- a/src/WixToolset.Data/Tuples/WixFeatureModulesTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixFeatureModulesTuple.cs
@@ -2,51 +2,51 @@
 
 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 WixFeatureModules = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixFeatureModules,
+        public static readonly IntermediateSymbolDefinition WixFeatureModules = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixFeatureModules,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixFeatureModulesTupleFields.FeatureRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixFeatureModulesTupleFields.WixMergeRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixFeatureModulesSymbolFields.FeatureRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixFeatureModulesSymbolFields.WixMergeRef), IntermediateFieldType.String),
             },
-            typeof(WixFeatureModulesTuple));
+            typeof(WixFeatureModulesSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixFeatureModulesTupleFields
+    public enum WixFeatureModulesSymbolFields
     {
         FeatureRef,
         WixMergeRef,
     }
 
-    public class WixFeatureModulesTuple : IntermediateTuple
+    public class WixFeatureModulesSymbol : IntermediateSymbol
     {
-        public WixFeatureModulesTuple() : base(TupleDefinitions.WixFeatureModules, null, null)
+        public WixFeatureModulesSymbol() : base(SymbolDefinitions.WixFeatureModules, null, null)
         {
         }
 
-        public WixFeatureModulesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixFeatureModules, sourceLineNumber, id)
+        public WixFeatureModulesSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixFeatureModules, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixFeatureModulesTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixFeatureModulesSymbolFields index] => this.Fields[(int)index];
 
         public string FeatureRef
         {
-            get => (string)this.Fields[(int)WixFeatureModulesTupleFields.FeatureRef];
-            set => this.Set((int)WixFeatureModulesTupleFields.FeatureRef, value);
+            get => (string)this.Fields[(int)WixFeatureModulesSymbolFields.FeatureRef];
+            set => this.Set((int)WixFeatureModulesSymbolFields.FeatureRef, value);
         }
 
         public string WixMergeRef
         {
-            get => (string)this.Fields[(int)WixFeatureModulesTupleFields.WixMergeRef];
-            set => this.Set((int)WixFeatureModulesTupleFields.WixMergeRef, value);
+            get => (string)this.Fields[(int)WixFeatureModulesSymbolFields.WixMergeRef];
+            set => this.Set((int)WixFeatureModulesSymbolFields.WixMergeRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixFileSearchTuple.cs b/src/WixToolset.Data/Tuples/WixFileSearchTuple.cs
index 033aca21..027605c7 100644
--- a/src/WixToolset.Data/Tuples/WixFileSearchTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixFileSearchTuple.cs
@@ -2,33 +2,33 @@
 
 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 WixFileSearch = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixFileSearch,
+        public static readonly IntermediateSymbolDefinition WixFileSearch = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixFileSearch,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.Path), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.MinVersion), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.MaxVersion), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.MinSize), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.MaxSize), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.MinDate), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.MaxDate), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.Languages), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixFileSearchTupleFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixFileSearchSymbolFields.Path), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixFileSearchSymbolFields.MinVersion), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixFileSearchSymbolFields.MaxVersion), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixFileSearchSymbolFields.MinSize), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixFileSearchSymbolFields.MaxSize), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixFileSearchSymbolFields.MinDate), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixFileSearchSymbolFields.MaxDate), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixFileSearchSymbolFields.Languages), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixFileSearchSymbolFields.Attributes), IntermediateFieldType.Number),
             },
-            typeof(WixFileSearchTuple));
+            typeof(WixFileSearchSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
     using System;
 
-    public enum WixFileSearchTupleFields
+    public enum WixFileSearchSymbolFields
     {
         Path,
         MinVersion,
@@ -56,70 +56,70 @@ namespace WixToolset.Data.Tuples
         IsDirectory = 0x200,
     }
 
-    public class WixFileSearchTuple : IntermediateTuple
+    public class WixFileSearchSymbol : IntermediateSymbol
     {
-        public WixFileSearchTuple() : base(TupleDefinitions.WixFileSearch, null, null)
+        public WixFileSearchSymbol() : base(SymbolDefinitions.WixFileSearch, null, null)
         {
         }
 
-        public WixFileSearchTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixFileSearch, sourceLineNumber, id)
+        public WixFileSearchSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixFileSearch, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixFileSearchTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixFileSearchSymbolFields index] => this.Fields[(int)index];
 
         public string Path
         {
-            get => (string)this.Fields[(int)WixFileSearchTupleFields.Path];
-            set => this.Set((int)WixFileSearchTupleFields.Path, value);
+            get => (string)this.Fields[(int)WixFileSearchSymbolFields.Path];
+            set => this.Set((int)WixFileSearchSymbolFields.Path, value);
         }
 
         public string MinVersion
         {
-            get => (string)this.Fields[(int)WixFileSearchTupleFields.MinVersion];
-            set => this.Set((int)WixFileSearchTupleFields.MinVersion, value);
+            get => (string)this.Fields[(int)WixFileSearchSymbolFields.MinVersion];
+            set => this.Set((int)WixFileSearchSymbolFields.MinVersion, value);
         }
 
         public string MaxVersion
         {
-            get => (string)this.Fields[(int)WixFileSearchTupleFields.MaxVersion];
-            set => this.Set((int)WixFileSearchTupleFields.MaxVersion, value);
+            get => (string)this.Fields[(int)WixFileSearchSymbolFields.MaxVersion];
+            set => this.Set((int)WixFileSearchSymbolFields.MaxVersion, value);
         }
 
         public int? MinSize
         {
-            get => (int?)this.Fields[(int)WixFileSearchTupleFields.MinSize];
-            set => this.Set((int)WixFileSearchTupleFields.MinSize, value);
+            get => (int?)this.Fields[(int)WixFileSearchSymbolFields.MinSize];
+            set => this.Set((int)WixFileSearchSymbolFields.MinSize, value);
         }
 
         public int? MaxSize
         {
-            get => (int?)this.Fields[(int)WixFileSearchTupleFields.MaxSize];
-            set => this.Set((int)WixFileSearchTupleFields.MaxSize, value);
+            get => (int?)this.Fields[(int)WixFileSearchSymbolFields.MaxSize];
+            set => this.Set((int)WixFileSearchSymbolFields.MaxSize, value);
         }
 
         public int? MinDate
         {
-            get => (int?)this.Fields[(int)WixFileSearchTupleFields.MinDate];
-            set => this.Set((int)WixFileSearchTupleFields.MinDate, value);
+            get => (int?)this.Fields[(int)WixFileSearchSymbolFields.MinDate];
+            set => this.Set((int)WixFileSearchSymbolFields.MinDate, value);
         }
 
         public int? MaxDate
         {
-            get => (int?)this.Fields[(int)WixFileSearchTupleFields.MaxDate];
-            set => this.Set((int)WixFileSearchTupleFields.MaxDate, value);
+            get => (int?)this.Fields[(int)WixFileSearchSymbolFields.MaxDate];
+            set => this.Set((int)WixFileSearchSymbolFields.MaxDate, value);
         }
 
         public string Languages
         {
-            get => (string)this.Fields[(int)WixFileSearchTupleFields.Languages];
-            set => this.Set((int)WixFileSearchTupleFields.Languages, value);
+            get => (string)this.Fields[(int)WixFileSearchSymbolFields.Languages];
+            set => this.Set((int)WixFileSearchSymbolFields.Languages, value);
         }
 
         public WixFileSearchAttributes Attributes
         {
-            get => (WixFileSearchAttributes)this.Fields[(int)WixFileSearchTupleFields.Attributes].AsNumber();
-            set => this.Set((int)WixFileSearchTupleFields.Attributes, (int)value);
+            get => (WixFileSearchAttributes)this.Fields[(int)WixFileSearchSymbolFields.Attributes].AsNumber();
+            set => this.Set((int)WixFileSearchSymbolFields.Attributes, (int)value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/WixFragmentTuple.cs b/src/WixToolset.Data/Tuples/WixFragmentTuple.cs
index cda7534d..9c31b79c 100644
--- a/src/WixToolset.Data/Tuples/WixFragmentTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixFragmentTuple.cs
@@ -2,35 +2,35 @@
 
 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 WixFragment = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixFragment,
+        public static readonly IntermediateSymbolDefinition WixFragment = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixFragment,
             new IntermediateFieldDefinition[]
             {
             },
-            typeof(WixFragmentTuple));
+            typeof(WixFragmentSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixFragmentTupleFields
+    public enum WixFragmentSymbolFields
     {
     }
 
-    public class WixFragmentTuple : IntermediateTuple
+    public class WixFragmentSymbol : IntermediateSymbol
     {
-        public WixFragmentTuple() : base(TupleDefinitions.WixFragment, null, null)
+        public WixFragmentSymbol() : base(SymbolDefinitions.WixFragment, null, null)
         {
         }
 
-        public WixFragmentTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixFragment, sourceLineNumber, id)
+        public WixFragmentSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixFragment, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixFragmentTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixFragmentSymbolFields index] => this.Fields[(int)index];
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixGroupTuple.cs b/src/WixToolset.Data/Tuples/WixGroupTuple.cs
index f6487d55..b9720890 100644
--- a/src/WixToolset.Data/Tuples/WixGroupTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixGroupTuple.cs
@@ -2,28 +2,28 @@
 
 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 WixGroup = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixGroup,
+        public static readonly IntermediateSymbolDefinition WixGroup = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixGroup,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixGroupTupleFields.ParentId), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixGroupTupleFields.ParentType), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixGroupTupleFields.ChildId), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixGroupTupleFields.ChildType), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixGroupSymbolFields.ParentId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixGroupSymbolFields.ParentType), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixGroupSymbolFields.ChildId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixGroupSymbolFields.ChildType), IntermediateFieldType.String),
             },
-            typeof(WixGroupTuple));
+            typeof(WixGroupSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
     using System;
 
-    public enum WixGroupTupleFields
+    public enum WixGroupSymbolFields
     {
         ParentId,
         ParentType,
@@ -31,40 +31,40 @@ namespace WixToolset.Data.Tuples
         ChildType,
     }
 
-    public class WixGroupTuple : IntermediateTuple
+    public class WixGroupSymbol : IntermediateSymbol
     {
-        public WixGroupTuple() : base(TupleDefinitions.WixGroup, null, null)
+        public WixGroupSymbol() : base(SymbolDefinitions.WixGroup, null, null)
         {
         }
 
-        public WixGroupTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixGroup, sourceLineNumber, id)
+        public WixGroupSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixGroup, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixGroupTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixGroupSymbolFields index] => this.Fields[(int)index];
 
         public string ParentId
         {
-            get => (string)this.Fields[(int)WixGroupTupleFields.ParentId];
-            set => this.Set((int)WixGroupTupleFields.ParentId, value);
+            get => (string)this.Fields[(int)WixGroupSymbolFields.ParentId];
+            set => this.Set((int)WixGroupSymbolFields.ParentId, value);
         }
 
         public ComplexReferenceParentType ParentType
         {
-            get => (ComplexReferenceParentType)Enum.Parse(typeof(ComplexReferenceParentType), (string)this.Fields[(int)WixGroupTupleFields.ParentType], true);
-            set => this.Set((int)WixGroupTupleFields.ParentType, value.ToString());
+            get => (ComplexReferenceParentType)Enum.Parse(typeof(ComplexReferenceParentType), (string)this.Fields[(int)WixGroupSymbolFields.ParentType], true);
+            set => this.Set((int)WixGroupSymbolFields.ParentType, value.ToString());
         }
 
         public string ChildId
         {
-            get => (string)this.Fields[(int)WixGroupTupleFields.ChildId];
-            set => this.Set((int)WixGroupTupleFields.ChildId, value);
+            get => (string)this.Fields[(int)WixGroupSymbolFields.ChildId];
+            set => this.Set((int)WixGroupSymbolFields.ChildId, value);
         }
 
         public ComplexReferenceChildType ChildType
         {
-            get => (ComplexReferenceChildType)Enum.Parse(typeof(ComplexReferenceChildType), (string)this.Fields[(int)WixGroupTupleFields.ChildType], true);
-            set => this.Set((int)WixGroupTupleFields.ChildType, value.ToString());
+            get => (ComplexReferenceChildType)Enum.Parse(typeof(ComplexReferenceChildType), (string)this.Fields[(int)WixGroupSymbolFields.ChildType], true);
+            set => this.Set((int)WixGroupSymbolFields.ChildType, value.ToString());
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixInstanceComponentTuple.cs b/src/WixToolset.Data/Tuples/WixInstanceComponentTuple.cs
index c7530abf..c9e4470c 100644
--- a/src/WixToolset.Data/Tuples/WixInstanceComponentTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixInstanceComponentTuple.cs
@@ -2,43 +2,43 @@
 
 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 WixInstanceComponent = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixInstanceComponent,
+        public static readonly IntermediateSymbolDefinition WixInstanceComponent = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixInstanceComponent,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixInstanceComponentTupleFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixInstanceComponentSymbolFields.ComponentRef), IntermediateFieldType.String),
             },
-            typeof(WixInstanceComponentTuple));
+            typeof(WixInstanceComponentSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixInstanceComponentTupleFields
+    public enum WixInstanceComponentSymbolFields
     {
         ComponentRef,
     }
 
-    public class WixInstanceComponentTuple : IntermediateTuple
+    public class WixInstanceComponentSymbol : IntermediateSymbol
     {
-        public WixInstanceComponentTuple() : base(TupleDefinitions.WixInstanceComponent, null, null)
+        public WixInstanceComponentSymbol() : base(SymbolDefinitions.WixInstanceComponent, null, null)
         {
         }
 
-        public WixInstanceComponentTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixInstanceComponent, sourceLineNumber, id)
+        public WixInstanceComponentSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixInstanceComponent, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixInstanceComponentTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixInstanceComponentSymbolFields index] => this.Fields[(int)index];
 
         public string ComponentRef
         {
-            get => (string)this.Fields[(int)WixInstanceComponentTupleFields.ComponentRef];
-            set => this.Set((int)WixInstanceComponentTupleFields.ComponentRef, value);
+            get => (string)this.Fields[(int)WixInstanceComponentSymbolFields.ComponentRef];
+            set => this.Set((int)WixInstanceComponentSymbolFields.ComponentRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixInstanceTransformsTuple.cs b/src/WixToolset.Data/Tuples/WixInstanceTransformsTuple.cs
index efcaa7b9..3a58cb31 100644
--- a/src/WixToolset.Data/Tuples/WixInstanceTransformsTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixInstanceTransformsTuple.cs
@@ -2,26 +2,26 @@
 
 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 WixInstanceTransforms = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixInstanceTransforms,
+        public static readonly IntermediateSymbolDefinition WixInstanceTransforms = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixInstanceTransforms,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixInstanceTransformsTupleFields.PropertyId), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixInstanceTransformsTupleFields.ProductCode), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixInstanceTransformsTupleFields.ProductName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixInstanceTransformsTupleFields.UpgradeCode), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixInstanceTransformsSymbolFields.PropertyId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixInstanceTransformsSymbolFields.ProductCode), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixInstanceTransformsSymbolFields.ProductName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixInstanceTransformsSymbolFields.UpgradeCode), IntermediateFieldType.String),
             },
-            typeof(WixInstanceTransformsTuple));
+            typeof(WixInstanceTransformsSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixInstanceTransformsTupleFields
+    public enum WixInstanceTransformsSymbolFields
     {
         PropertyId,
         ProductCode,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
         UpgradeCode,
     }
 
-    public class WixInstanceTransformsTuple : IntermediateTuple
+    public class WixInstanceTransformsSymbol : IntermediateSymbol
     {
-        public WixInstanceTransformsTuple() : base(TupleDefinitions.WixInstanceTransforms, null, null)
+        public WixInstanceTransformsSymbol() : base(SymbolDefinitions.WixInstanceTransforms, null, null)
         {
         }
 
-        public WixInstanceTransformsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixInstanceTransforms, sourceLineNumber, id)
+        public WixInstanceTransformsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixInstanceTransforms, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixInstanceTransformsTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixInstanceTransformsSymbolFields index] => this.Fields[(int)index];
 
         public string PropertyId
         {
-            get => (string)this.Fields[(int)WixInstanceTransformsTupleFields.PropertyId];
-            set => this.Set((int)WixInstanceTransformsTupleFields.PropertyId, value);
+            get => (string)this.Fields[(int)WixInstanceTransformsSymbolFields.PropertyId];
+            set => this.Set((int)WixInstanceTransformsSymbolFields.PropertyId, value);
         }
 
         public string ProductCode
         {
-            get => (string)this.Fields[(int)WixInstanceTransformsTupleFields.ProductCode];
-            set => this.Set((int)WixInstanceTransformsTupleFields.ProductCode, value);
+            get => (string)this.Fields[(int)WixInstanceTransformsSymbolFields.ProductCode];
+            set => this.Set((int)WixInstanceTransformsSymbolFields.ProductCode, value);
         }
 
         public string ProductName
         {
-            get => (string)this.Fields[(int)WixInstanceTransformsTupleFields.ProductName];
-            set => this.Set((int)WixInstanceTransformsTupleFields.ProductName, value);
+            get => (string)this.Fields[(int)WixInstanceTransformsSymbolFields.ProductName];
+            set => this.Set((int)WixInstanceTransformsSymbolFields.ProductName, value);
         }
 
         public string UpgradeCode
         {
-            get => (string)this.Fields[(int)WixInstanceTransformsTupleFields.UpgradeCode];
-            set => this.Set((int)WixInstanceTransformsTupleFields.UpgradeCode, value);
+            get => (string)this.Fields[(int)WixInstanceTransformsSymbolFields.UpgradeCode];
+            set => this.Set((int)WixInstanceTransformsSymbolFields.UpgradeCode, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/WixMediaTemplateTuple.cs b/src/WixToolset.Data/Tuples/WixMediaTemplateTuple.cs
index c0cc13ac..28695b3e 100644
--- a/src/WixToolset.Data/Tuples/WixMediaTemplateTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixMediaTemplateTuple.cs
@@ -2,30 +2,30 @@
 
 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 WixMediaTemplate = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixMediaTemplate,
+        public static readonly IntermediateSymbolDefinition WixMediaTemplate = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixMediaTemplate,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixMediaTemplateTupleFields.CabinetTemplate), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixMediaTemplateTupleFields.CompressionLevel), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixMediaTemplateTupleFields.DiskPrompt), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixMediaTemplateTupleFields.VolumeLabel), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixMediaTemplateTupleFields.MaximumUncompressedMediaSize), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixMediaTemplateTupleFields.MaximumCabinetSizeForLargeFileSplitting), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixMediaTemplateSymbolFields.CabinetTemplate), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixMediaTemplateSymbolFields.CompressionLevel), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixMediaTemplateSymbolFields.DiskPrompt), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixMediaTemplateSymbolFields.VolumeLabel), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixMediaTemplateSymbolFields.MaximumUncompressedMediaSize), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixMediaTemplateSymbolFields.MaximumCabinetSizeForLargeFileSplitting), IntermediateFieldType.Number),
             },
-            typeof(WixMediaTemplateTuple));
+            typeof(WixMediaTemplateSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
     using System;
 
-    public enum WixMediaTemplateTupleFields
+    public enum WixMediaTemplateSymbolFields
     {
         CabinetTemplate,
         CompressionLevel,
@@ -35,52 +35,52 @@ namespace WixToolset.Data.Tuples
         MaximumCabinetSizeForLargeFileSplitting,
     }
 
-    public class WixMediaTemplateTuple : IntermediateTuple
+    public class WixMediaTemplateSymbol : IntermediateSymbol
     {
-        public WixMediaTemplateTuple() : base(TupleDefinitions.WixMediaTemplate, null, null)
+        public WixMediaTemplateSymbol() : base(SymbolDefinitions.WixMediaTemplate, null, null)
         {
         }
 
-        public WixMediaTemplateTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixMediaTemplate, sourceLineNumber, id)
+        public WixMediaTemplateSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixMediaTemplate, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixMediaTemplateTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixMediaTemplateSymbolFields index] => this.Fields[(int)index];
 
         public string CabinetTemplate
         {
-            get => (string)this.Fields[(int)WixMediaTemplateTupleFields.CabinetTemplate];
-            set => this.Set((int)WixMediaTemplateTupleFields.CabinetTemplate, value);
+            get => (string)this.Fields[(int)WixMediaTemplateSymbolFields.CabinetTemplate];
+            set => this.Set((int)WixMediaTemplateSymbolFields.CabinetTemplate, value);
         }
 
         public CompressionLevel? CompressionLevel
         {
-            get => (CompressionLevel?)this.Fields[(int)WixMediaTemplateTupleFields.CompressionLevel].AsNullableNumber();
-            set => this.Set((int)WixMediaTemplateTupleFields.CompressionLevel, (int?)value);
+            get => (CompressionLevel?)this.Fields[(int)WixMediaTemplateSymbolFields.CompressionLevel].AsNullableNumber();
+            set => this.Set((int)WixMediaTemplateSymbolFields.CompressionLevel, (int?)value);
         }
 
         public string DiskPrompt
         {
-            get => (string)this.Fields[(int)WixMediaTemplateTupleFields.DiskPrompt];
-            set => this.Set((int)WixMediaTemplateTupleFields.DiskPrompt, value);
+            get => (string)this.Fields[(int)WixMediaTemplateSymbolFields.DiskPrompt];
+            set => this.Set((int)WixMediaTemplateSymbolFields.DiskPrompt, value);
         }
 
         public string VolumeLabel
         {
-            get => (string)this.Fields[(int)WixMediaTemplateTupleFields.VolumeLabel];
-            set => this.Set((int)WixMediaTemplateTupleFields.VolumeLabel, value);
+            get => (string)this.Fields[(int)WixMediaTemplateSymbolFields.VolumeLabel];
+            set => this.Set((int)WixMediaTemplateSymbolFields.VolumeLabel, value);
         }
 
         public int? MaximumUncompressedMediaSize
         {
-            get => (int?)this.Fields[(int)WixMediaTemplateTupleFields.MaximumUncompressedMediaSize];
-            set => this.Set((int)WixMediaTemplateTupleFields.MaximumUncompressedMediaSize, value);
+            get => (int?)this.Fields[(int)WixMediaTemplateSymbolFields.MaximumUncompressedMediaSize];
+            set => this.Set((int)WixMediaTemplateSymbolFields.MaximumUncompressedMediaSize, value);
         }
 
         public int? MaximumCabinetSizeForLargeFileSplitting
         {
-            get => (int?)this.Fields[(int)WixMediaTemplateTupleFields.MaximumCabinetSizeForLargeFileSplitting];
-            set => this.Set((int)WixMediaTemplateTupleFields.MaximumCabinetSizeForLargeFileSplitting, value);
+            get => (int?)this.Fields[(int)WixMediaTemplateSymbolFields.MaximumCabinetSizeForLargeFileSplitting];
+            set => this.Set((int)WixMediaTemplateSymbolFields.MaximumCabinetSizeForLargeFileSplitting, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixMergeTuple.cs b/src/WixToolset.Data/Tuples/WixMergeTuple.cs
index daa0649f..d066fa8e 100644
--- a/src/WixToolset.Data/Tuples/WixMergeTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixMergeTuple.cs
@@ -2,29 +2,29 @@
 
 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 WixMerge = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixMerge,
+        public static readonly IntermediateSymbolDefinition WixMerge = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixMerge,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixMergeTupleFields.Language), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixMergeTupleFields.DirectoryRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixMergeTupleFields.SourceFile), IntermediateFieldType.Path),
-                new IntermediateFieldDefinition(nameof(WixMergeTupleFields.DiskId), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixMergeTupleFields.FileAttributes), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixMergeTupleFields.ConfigurationData), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixMergeTupleFields.FeatureRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixMergeSymbolFields.Language), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixMergeSymbolFields.DirectoryRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixMergeSymbolFields.SourceFile), IntermediateFieldType.Path),
+                new IntermediateFieldDefinition(nameof(WixMergeSymbolFields.DiskId), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixMergeSymbolFields.FileAttributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixMergeSymbolFields.ConfigurationData), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixMergeSymbolFields.FeatureRef), IntermediateFieldType.String),
             },
-            typeof(WixMergeTuple));
+            typeof(WixMergeSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixMergeTupleFields
+    public enum WixMergeSymbolFields
     {
         Language,
         DirectoryRef,
@@ -35,58 +35,58 @@ namespace WixToolset.Data.Tuples
         FeatureRef,
     }
 
-    public class WixMergeTuple : IntermediateTuple
+    public class WixMergeSymbol : IntermediateSymbol
     {
-        public WixMergeTuple() : base(TupleDefinitions.WixMerge, null, null)
+        public WixMergeSymbol() : base(SymbolDefinitions.WixMerge, null, null)
         {
         }
 
-        public WixMergeTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixMerge, sourceLineNumber, id)
+        public WixMergeSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixMerge, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixMergeTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixMergeSymbolFields index] => this.Fields[(int)index];
 
         public int Language
         {
-            get => (int)this.Fields[(int)WixMergeTupleFields.Language];
-            set => this.Set((int)WixMergeTupleFields.Language, value);
+            get => (int)this.Fields[(int)WixMergeSymbolFields.Language];
+            set => this.Set((int)WixMergeSymbolFields.Language, value);
         }
 
         public string DirectoryRef
         {
-            get => (string)this.Fields[(int)WixMergeTupleFields.DirectoryRef];
-            set => this.Set((int)WixMergeTupleFields.DirectoryRef, value);
+            get => (string)this.Fields[(int)WixMergeSymbolFields.DirectoryRef];
+            set => this.Set((int)WixMergeSymbolFields.DirectoryRef, value);
         }
 
         public string SourceFile
         {
-            get => (string)this.Fields[(int)WixMergeTupleFields.SourceFile];
-            set => this.Set((int)WixMergeTupleFields.SourceFile, value);
+            get => (string)this.Fields[(int)WixMergeSymbolFields.SourceFile];
+            set => this.Set((int)WixMergeSymbolFields.SourceFile, value);
         }
 
         public int DiskId
         {
-            get => (int)this.Fields[(int)WixMergeTupleFields.DiskId];
-            set => this.Set((int)WixMergeTupleFields.DiskId, value);
+            get => (int)this.Fields[(int)WixMergeSymbolFields.DiskId];
+            set => this.Set((int)WixMergeSymbolFields.DiskId, value);
         }
 
-        public FileTupleAttributes FileAttributes
+        public FileSymbolAttributes FileAttributes
         {
-            get => (FileTupleAttributes)this.Fields[(int)WixMergeTupleFields.FileAttributes].AsNumber();
-            set => this.Set((int)WixMergeTupleFields.FileAttributes, (int)value);
+            get => (FileSymbolAttributes)this.Fields[(int)WixMergeSymbolFields.FileAttributes].AsNumber();
+            set => this.Set((int)WixMergeSymbolFields.FileAttributes, (int)value);
         }
 
         public string ConfigurationData
         {
-            get => (string)this.Fields[(int)WixMergeTupleFields.ConfigurationData];
-            set => this.Set((int)WixMergeTupleFields.ConfigurationData, value);
+            get => (string)this.Fields[(int)WixMergeSymbolFields.ConfigurationData];
+            set => this.Set((int)WixMergeSymbolFields.ConfigurationData, value);
         }
 
         public string FeatureRef
         {
-            get => (string)this.Fields[(int)WixMergeTupleFields.FeatureRef];
-            set => this.Set((int)WixMergeTupleFields.FeatureRef, value);
+            get => (string)this.Fields[(int)WixMergeSymbolFields.FeatureRef];
+            set => this.Set((int)WixMergeSymbolFields.FeatureRef, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/WixOrderingTuple.cs b/src/WixToolset.Data/Tuples/WixOrderingTuple.cs
index 8d9df513..5e6dc980 100644
--- a/src/WixToolset.Data/Tuples/WixOrderingTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixOrderingTuple.cs
@@ -2,26 +2,26 @@
 
 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 WixOrdering = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixOrdering,
+        public static readonly IntermediateSymbolDefinition WixOrdering = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixOrdering,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixOrderingTupleFields.ItemType), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixOrderingTupleFields.ItemIdRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixOrderingTupleFields.DependsOnType), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixOrderingTupleFields.DependsOnIdRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixOrderingSymbolFields.ItemType), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixOrderingSymbolFields.ItemIdRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixOrderingSymbolFields.DependsOnType), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixOrderingSymbolFields.DependsOnIdRef), IntermediateFieldType.String),
             },
-            typeof(WixOrderingTuple));
+            typeof(WixOrderingSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixOrderingTupleFields
+    public enum WixOrderingSymbolFields
     {
         ItemType,
         ItemIdRef,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
         DependsOnIdRef,
     }
 
-    public class WixOrderingTuple : IntermediateTuple
+    public class WixOrderingSymbol : IntermediateSymbol
     {
-        public WixOrderingTuple() : base(TupleDefinitions.WixOrdering, null, null)
+        public WixOrderingSymbol() : base(SymbolDefinitions.WixOrdering, null, null)
         {
         }
 
-        public WixOrderingTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixOrdering, sourceLineNumber, id)
+        public WixOrderingSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixOrdering, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixOrderingTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixOrderingSymbolFields index] => this.Fields[(int)index];
 
         public ComplexReferenceChildType ItemType
         {
-            get => (ComplexReferenceChildType)this.Fields[(int)WixOrderingTupleFields.ItemType].AsNumber();
-            set => this.Set((int)WixOrderingTupleFields.ItemType, (int)value);
+            get => (ComplexReferenceChildType)this.Fields[(int)WixOrderingSymbolFields.ItemType].AsNumber();
+            set => this.Set((int)WixOrderingSymbolFields.ItemType, (int)value);
         }
 
         public string ItemIdRef
         {
-            get => (string)this.Fields[(int)WixOrderingTupleFields.ItemIdRef];
-            set => this.Set((int)WixOrderingTupleFields.ItemIdRef, value);
+            get => (string)this.Fields[(int)WixOrderingSymbolFields.ItemIdRef];
+            set => this.Set((int)WixOrderingSymbolFields.ItemIdRef, value);
         }
 
         public ComplexReferenceChildType DependsOnType
         {
-            get => (ComplexReferenceChildType)this.Fields[(int)WixOrderingTupleFields.DependsOnType].AsNumber();
-            set => this.Set((int)WixOrderingTupleFields.DependsOnType, (int)value);
+            get => (ComplexReferenceChildType)this.Fields[(int)WixOrderingSymbolFields.DependsOnType].AsNumber();
+            set => this.Set((int)WixOrderingSymbolFields.DependsOnType, (int)value);
         }
 
         public string DependsOnIdRef
         {
-            get => (string)this.Fields[(int)WixOrderingTupleFields.DependsOnIdRef];
-            set => this.Set((int)WixOrderingTupleFields.DependsOnIdRef, value);
+            get => (string)this.Fields[(int)WixOrderingSymbolFields.DependsOnIdRef];
+            set => this.Set((int)WixOrderingSymbolFields.DependsOnIdRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixPatchBaselineTuple.cs b/src/WixToolset.Data/Tuples/WixPatchBaselineTuple.cs
index 7358e66e..d7295424 100644
--- a/src/WixToolset.Data/Tuples/WixPatchBaselineTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixPatchBaselineTuple.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 WixPatchBaseline = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixPatchBaseline,
+        public static readonly IntermediateSymbolDefinition WixPatchBaseline = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixPatchBaseline,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixPatchBaselineTupleFields.DiskId), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixPatchBaselineTupleFields.ValidationFlags), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixPatchBaselineTupleFields.BaselineFile), IntermediateFieldType.Path),
-                new IntermediateFieldDefinition(nameof(WixPatchBaselineTupleFields.UpdateFile), IntermediateFieldType.Path),
-                new IntermediateFieldDefinition(nameof(WixPatchBaselineTupleFields.TransformFile), IntermediateFieldType.Path),
+                new IntermediateFieldDefinition(nameof(WixPatchBaselineSymbolFields.DiskId), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixPatchBaselineSymbolFields.ValidationFlags), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixPatchBaselineSymbolFields.BaselineFile), IntermediateFieldType.Path),
+                new IntermediateFieldDefinition(nameof(WixPatchBaselineSymbolFields.UpdateFile), IntermediateFieldType.Path),
+                new IntermediateFieldDefinition(nameof(WixPatchBaselineSymbolFields.TransformFile), IntermediateFieldType.Path),
             },
-            typeof(WixPatchBaselineTuple));
+            typeof(WixPatchBaselineSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixPatchBaselineTupleFields
+    public enum WixPatchBaselineSymbolFields
     {
         DiskId,
         ValidationFlags,
@@ -31,46 +31,46 @@ namespace WixToolset.Data.Tuples
         TransformFile,
     }
 
-    public class WixPatchBaselineTuple : IntermediateTuple
+    public class WixPatchBaselineSymbol : IntermediateSymbol
     {
-        public WixPatchBaselineTuple() : base(TupleDefinitions.WixPatchBaseline, null, null)
+        public WixPatchBaselineSymbol() : base(SymbolDefinitions.WixPatchBaseline, null, null)
         {
         }
 
-        public WixPatchBaselineTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixPatchBaseline, sourceLineNumber, id)
+        public WixPatchBaselineSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixPatchBaseline, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixPatchBaselineTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixPatchBaselineSymbolFields index] => this.Fields[(int)index];
 
         public int DiskId
         {
-            get => (int)this.Fields[(int)WixPatchBaselineTupleFields.DiskId];
-            set => this.Set((int)WixPatchBaselineTupleFields.DiskId, value);
+            get => (int)this.Fields[(int)WixPatchBaselineSymbolFields.DiskId];
+            set => this.Set((int)WixPatchBaselineSymbolFields.DiskId, value);
         }
 
         public TransformFlags ValidationFlags
         {
-            get => (TransformFlags)this.Fields[(int)WixPatchBaselineTupleFields.ValidationFlags].AsNumber();
-            set => this.Set((int)WixPatchBaselineTupleFields.ValidationFlags, (int)value);
+            get => (TransformFlags)this.Fields[(int)WixPatchBaselineSymbolFields.ValidationFlags].AsNumber();
+            set => this.Set((int)WixPatchBaselineSymbolFields.ValidationFlags, (int)value);
         }
 
         public IntermediateFieldPathValue BaselineFile
         {
-            get => this.Fields[(int)WixPatchBaselineTupleFields.BaselineFile].AsPath();
-            set => this.Set((int)WixPatchBaselineTupleFields.BaselineFile, value);
+            get => this.Fields[(int)WixPatchBaselineSymbolFields.BaselineFile].AsPath();
+            set => this.Set((int)WixPatchBaselineSymbolFields.BaselineFile, value);
         }
 
         public IntermediateFieldPathValue UpdateFile
         {
-            get => this.Fields[(int)WixPatchBaselineTupleFields.UpdateFile].AsPath();
-            set => this.Set((int)WixPatchBaselineTupleFields.UpdateFile, value);
+            get => this.Fields[(int)WixPatchBaselineSymbolFields.UpdateFile].AsPath();
+            set => this.Set((int)WixPatchBaselineSymbolFields.UpdateFile, value);
         }
 
         public IntermediateFieldPathValue TransformFile
         {
-            get => this.Fields[(int)WixPatchBaselineTupleFields.TransformFile].AsPath();
-            set => this.Set((int)WixPatchBaselineTupleFields.TransformFile, value);
+            get => this.Fields[(int)WixPatchBaselineSymbolFields.TransformFile].AsPath();
+            set => this.Set((int)WixPatchBaselineSymbolFields.TransformFile, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/WixPatchFamilyGroupTuple.cs b/src/WixToolset.Data/Tuples/WixPatchFamilyGroupTuple.cs
index d6df55bd..3ab34f1f 100644
--- a/src/WixToolset.Data/Tuples/WixPatchFamilyGroupTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixPatchFamilyGroupTuple.cs
@@ -2,43 +2,43 @@
 
 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 WixPatchFamilyGroup = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixPatchFamilyGroup,
+        public static readonly IntermediateSymbolDefinition WixPatchFamilyGroup = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixPatchFamilyGroup,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixPatchFamilyGroupTupleFields.WixPatchFamilyGroup), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPatchFamilyGroupSymbolFields.WixPatchFamilyGroup), IntermediateFieldType.String),
             },
-            typeof(WixPatchFamilyGroupTuple));
+            typeof(WixPatchFamilyGroupSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixPatchFamilyGroupTupleFields
+    public enum WixPatchFamilyGroupSymbolFields
     {
         WixPatchFamilyGroup,
     }
 
-    public class WixPatchFamilyGroupTuple : IntermediateTuple
+    public class WixPatchFamilyGroupSymbol : IntermediateSymbol
     {
-        public WixPatchFamilyGroupTuple() : base(TupleDefinitions.WixPatchFamilyGroup, null, null)
+        public WixPatchFamilyGroupSymbol() : base(SymbolDefinitions.WixPatchFamilyGroup, null, null)
         {
         }
 
-        public WixPatchFamilyGroupTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixPatchFamilyGroup, sourceLineNumber, id)
+        public WixPatchFamilyGroupSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixPatchFamilyGroup, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixPatchFamilyGroupTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixPatchFamilyGroupSymbolFields index] => this.Fields[(int)index];
 
         public string WixPatchFamilyGroup
         {
-            get => (string)this.Fields[(int)WixPatchFamilyGroupTupleFields.WixPatchFamilyGroup];
-            set => this.Set((int)WixPatchFamilyGroupTupleFields.WixPatchFamilyGroup, value);
+            get => (string)this.Fields[(int)WixPatchFamilyGroupSymbolFields.WixPatchFamilyGroup];
+            set => this.Set((int)WixPatchFamilyGroupSymbolFields.WixPatchFamilyGroup, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixPatchIdTuple.cs b/src/WixToolset.Data/Tuples/WixPatchIdTuple.cs
index 6e6fb2ae..c4f4324d 100644
--- a/src/WixToolset.Data/Tuples/WixPatchIdTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixPatchIdTuple.cs
@@ -2,59 +2,59 @@
 
 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 WixPatchId = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixPatchId,
+        public static readonly IntermediateSymbolDefinition WixPatchId = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixPatchId,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixPatchIdTupleFields.ClientPatchId), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixPatchIdTupleFields.OptimizePatchSizeForLargeFiles), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(WixPatchIdTupleFields.ApiPatchingSymbolFlags), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixPatchIdSymbolFields.ClientPatchId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPatchIdSymbolFields.OptimizePatchSizeForLargeFiles), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(WixPatchIdSymbolFields.ApiPatchingSymbolFlags), IntermediateFieldType.Number),
             },
-            typeof(WixPatchIdTuple));
+            typeof(WixPatchIdSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixPatchIdTupleFields
+    public enum WixPatchIdSymbolFields
     {
         ClientPatchId,
         OptimizePatchSizeForLargeFiles,
         ApiPatchingSymbolFlags,
     }
 
-    public class WixPatchIdTuple : IntermediateTuple
+    public class WixPatchIdSymbol : IntermediateSymbol
     {
-        public WixPatchIdTuple() : base(TupleDefinitions.WixPatchId, null, null)
+        public WixPatchIdSymbol() : base(SymbolDefinitions.WixPatchId, null, null)
         {
         }
 
-        public WixPatchIdTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixPatchId, sourceLineNumber, id)
+        public WixPatchIdSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixPatchId, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixPatchIdTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixPatchIdSymbolFields index] => this.Fields[(int)index];
 
         public string ClientPatchId
         {
-            get => (string)this.Fields[(int)WixPatchIdTupleFields.ClientPatchId];
-            set => this.Set((int)WixPatchIdTupleFields.ClientPatchId, value);
+            get => (string)this.Fields[(int)WixPatchIdSymbolFields.ClientPatchId];
+            set => this.Set((int)WixPatchIdSymbolFields.ClientPatchId, value);
         }
 
         public bool? OptimizePatchSizeForLargeFiles
         {
-            get => (bool?)this.Fields[(int)WixPatchIdTupleFields.OptimizePatchSizeForLargeFiles];
-            set => this.Set((int)WixPatchIdTupleFields.OptimizePatchSizeForLargeFiles, value);
+            get => (bool?)this.Fields[(int)WixPatchIdSymbolFields.OptimizePatchSizeForLargeFiles];
+            set => this.Set((int)WixPatchIdSymbolFields.OptimizePatchSizeForLargeFiles, value);
         }
 
         public int? ApiPatchingSymbolFlags
         {
-            get => (int?)this.Fields[(int)WixPatchIdTupleFields.ApiPatchingSymbolFlags];
-            set => this.Set((int)WixPatchIdTupleFields.ApiPatchingSymbolFlags, value);
+            get => (int?)this.Fields[(int)WixPatchIdSymbolFields.ApiPatchingSymbolFlags];
+            set => this.Set((int)WixPatchIdSymbolFields.ApiPatchingSymbolFlags, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixPatchRefTuple.cs b/src/WixToolset.Data/Tuples/WixPatchRefTuple.cs
index fa357566..66257d84 100644
--- a/src/WixToolset.Data/Tuples/WixPatchRefTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixPatchRefTuple.cs
@@ -2,51 +2,51 @@
 
 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 WixPatchRef = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixPatchRef,
+        public static readonly IntermediateSymbolDefinition WixPatchRef = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixPatchRef,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixPatchRefTupleFields.Table), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixPatchRefTupleFields.PrimaryKeys), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPatchRefSymbolFields.Table), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPatchRefSymbolFields.PrimaryKeys), IntermediateFieldType.String),
             },
-            typeof(WixPatchRefTuple));
+            typeof(WixPatchRefSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixPatchRefTupleFields
+    public enum WixPatchRefSymbolFields
     {
         Table,
         PrimaryKeys,
     }
 
-    public class WixPatchRefTuple : IntermediateTuple
+    public class WixPatchRefSymbol : IntermediateSymbol
     {
-        public WixPatchRefTuple() : base(TupleDefinitions.WixPatchRef, null, null)
+        public WixPatchRefSymbol() : base(SymbolDefinitions.WixPatchRef, null, null)
         {
         }
 
-        public WixPatchRefTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixPatchRef, sourceLineNumber, id)
+        public WixPatchRefSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixPatchRef, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixPatchRefTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixPatchRefSymbolFields index] => this.Fields[(int)index];
 
         public string Table
         {
-            get => (string)this.Fields[(int)WixPatchRefTupleFields.Table];
-            set => this.Set((int)WixPatchRefTupleFields.Table, value);
+            get => (string)this.Fields[(int)WixPatchRefSymbolFields.Table];
+            set => this.Set((int)WixPatchRefSymbolFields.Table, value);
         }
 
         public string PrimaryKeys
         {
-            get => (string)this.Fields[(int)WixPatchRefTupleFields.PrimaryKeys];
-            set => this.Set((int)WixPatchRefTupleFields.PrimaryKeys, value);
+            get => (string)this.Fields[(int)WixPatchRefSymbolFields.PrimaryKeys];
+            set => this.Set((int)WixPatchRefSymbolFields.PrimaryKeys, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixPatchTargetTuple.cs b/src/WixToolset.Data/Tuples/WixPatchTargetTuple.cs
index c0d7a095..e8c01c26 100644
--- a/src/WixToolset.Data/Tuples/WixPatchTargetTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixPatchTargetTuple.cs
@@ -2,43 +2,43 @@
 
 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 WixPatchTarget = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixPatchTarget,
+        public static readonly IntermediateSymbolDefinition WixPatchTarget = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixPatchTarget,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixPatchTargetTupleFields.ProductCode), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPatchTargetSymbolFields.ProductCode), IntermediateFieldType.String),
             },
-            typeof(WixPatchTargetTuple));
+            typeof(WixPatchTargetSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixPatchTargetTupleFields
+    public enum WixPatchTargetSymbolFields
     {
         ProductCode,
     }
 
-    public class WixPatchTargetTuple : IntermediateTuple
+    public class WixPatchTargetSymbol : IntermediateSymbol
     {
-        public WixPatchTargetTuple() : base(TupleDefinitions.WixPatchTarget, null, null)
+        public WixPatchTargetSymbol() : base(SymbolDefinitions.WixPatchTarget, null, null)
         {
         }
 
-        public WixPatchTargetTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixPatchTarget, sourceLineNumber, id)
+        public WixPatchTargetSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixPatchTarget, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixPatchTargetTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixPatchTargetSymbolFields index] => this.Fields[(int)index];
 
         public string ProductCode
         {
-            get => (string)this.Fields[(int)WixPatchTargetTupleFields.ProductCode];
-            set => this.Set((int)WixPatchTargetTupleFields.ProductCode, value);
+            get => (string)this.Fields[(int)WixPatchTargetSymbolFields.ProductCode];
+            set => this.Set((int)WixPatchTargetSymbolFields.ProductCode, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixProductSearchTuple.cs b/src/WixToolset.Data/Tuples/WixProductSearchTuple.cs
index 22e96365..f8a17b64 100644
--- a/src/WixToolset.Data/Tuples/WixProductSearchTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixProductSearchTuple.cs
@@ -2,26 +2,26 @@
 
 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 WixProductSearch = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixProductSearch,
+        public static readonly IntermediateSymbolDefinition WixProductSearch = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixProductSearch,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixProductSearchTupleFields.Guid), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixProductSearchTupleFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixProductSearchSymbolFields.Guid), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixProductSearchSymbolFields.Attributes), IntermediateFieldType.Number),
             },
-            typeof(WixProductSearchTuple));
+            typeof(WixProductSearchSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
     using System;
 
-    public enum WixProductSearchTupleFields
+    public enum WixProductSearchSymbolFields
     {
         Guid,
         Attributes,
@@ -37,28 +37,28 @@ namespace WixToolset.Data.Tuples
         UpgradeCode = 0x10,
     }
 
-    public class WixProductSearchTuple : IntermediateTuple
+    public class WixProductSearchSymbol : IntermediateSymbol
     {
-        public WixProductSearchTuple() : base(TupleDefinitions.WixProductSearch, null, null)
+        public WixProductSearchSymbol() : base(SymbolDefinitions.WixProductSearch, null, null)
         {
         }
 
-        public WixProductSearchTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixProductSearch, sourceLineNumber, id)
+        public WixProductSearchSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixProductSearch, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixProductSearchTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixProductSearchSymbolFields index] => this.Fields[(int)index];
 
         public string Guid
         {
-            get => (string)this.Fields[(int)WixProductSearchTupleFields.Guid];
-            set => this.Set((int)WixProductSearchTupleFields.Guid, value);
+            get => (string)this.Fields[(int)WixProductSearchSymbolFields.Guid];
+            set => this.Set((int)WixProductSearchSymbolFields.Guid, value);
         }
 
         public WixProductSearchAttributes Attributes
         {
-            get => (WixProductSearchAttributes)this.Fields[(int)WixProductSearchTupleFields.Attributes].AsNumber();
-            set => this.Set((int)WixProductSearchTupleFields.Attributes, (int)value);
+            get => (WixProductSearchAttributes)this.Fields[(int)WixProductSearchSymbolFields.Attributes].AsNumber();
+            set => this.Set((int)WixProductSearchSymbolFields.Attributes, (int)value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/WixPropertyTuple.cs b/src/WixToolset.Data/Tuples/WixPropertyTuple.cs
index abadd947..17cf59ce 100644
--- a/src/WixToolset.Data/Tuples/WixPropertyTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixPropertyTuple.cs
@@ -2,26 +2,26 @@
 
 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 WixProperty = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixProperty,
+        public static readonly IntermediateSymbolDefinition WixProperty = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixProperty,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixPropertyTupleFields.PropertyRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixPropertyTupleFields.Admin), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(WixPropertyTupleFields.Hidden), IntermediateFieldType.Bool),
-                new IntermediateFieldDefinition(nameof(WixPropertyTupleFields.Secure), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(WixPropertySymbolFields.PropertyRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPropertySymbolFields.Admin), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(WixPropertySymbolFields.Hidden), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(WixPropertySymbolFields.Secure), IntermediateFieldType.Bool),
             },
-            typeof(WixPropertyTuple));
+            typeof(WixPropertySymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixPropertyTupleFields
+    public enum WixPropertySymbolFields
     {
         PropertyRef,
         Admin,
@@ -29,40 +29,40 @@ namespace WixToolset.Data.Tuples
         Secure,
     }
 
-    public class WixPropertyTuple : IntermediateTuple
+    public class WixPropertySymbol : IntermediateSymbol
     {
-        public WixPropertyTuple() : base(TupleDefinitions.WixProperty, null, null)
+        public WixPropertySymbol() : base(SymbolDefinitions.WixProperty, null, null)
         {
         }
 
-        public WixPropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixProperty, sourceLineNumber, id)
+        public WixPropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixProperty, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixPropertyTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixPropertySymbolFields index] => this.Fields[(int)index];
 
         public string PropertyRef
         {
-            get => (string)this.Fields[(int)WixPropertyTupleFields.PropertyRef];
-            set => this.Set((int)WixPropertyTupleFields.PropertyRef, value);
+            get => (string)this.Fields[(int)WixPropertySymbolFields.PropertyRef];
+            set => this.Set((int)WixPropertySymbolFields.PropertyRef, value);
         }
 
         public bool Admin
         {
-            get => (bool)this.Fields[(int)WixPropertyTupleFields.Admin];
-            set => this.Set((int)WixPropertyTupleFields.Admin, value);
+            get => (bool)this.Fields[(int)WixPropertySymbolFields.Admin];
+            set => this.Set((int)WixPropertySymbolFields.Admin, value);
         }
 
         public bool Hidden
         {
-            get => (bool)this.Fields[(int)WixPropertyTupleFields.Hidden];
-            set => this.Set((int)WixPropertyTupleFields.Hidden, value);
+            get => (bool)this.Fields[(int)WixPropertySymbolFields.Hidden];
+            set => this.Set((int)WixPropertySymbolFields.Hidden, value);
         }
 
         public bool Secure
         {
-            get => (bool)this.Fields[(int)WixPropertyTupleFields.Secure];
-            set => this.Set((int)WixPropertyTupleFields.Secure, value);
+            get => (bool)this.Fields[(int)WixPropertySymbolFields.Secure];
+            set => this.Set((int)WixPropertySymbolFields.Secure, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixRegistrySearchTuple.cs b/src/WixToolset.Data/Tuples/WixRegistrySearchTuple.cs
index 6bf43a00..dffa8410 100644
--- a/src/WixToolset.Data/Tuples/WixRegistrySearchTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixRegistrySearchTuple.cs
@@ -2,28 +2,28 @@
 
 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 WixRegistrySearch = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixRegistrySearch,
+        public static readonly IntermediateSymbolDefinition WixRegistrySearch = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixRegistrySearch,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixRegistrySearchTupleFields.Root), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixRegistrySearchTupleFields.Key), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixRegistrySearchTupleFields.Value), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixRegistrySearchTupleFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixRegistrySearchSymbolFields.Root), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixRegistrySearchSymbolFields.Key), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixRegistrySearchSymbolFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixRegistrySearchSymbolFields.Attributes), IntermediateFieldType.Number),
             },
-            typeof(WixRegistrySearchTuple));
+            typeof(WixRegistrySearchSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
     using System;
 
-    public enum WixRegistrySearchTupleFields
+    public enum WixRegistrySearchSymbolFields
     {
         Root,
         Key,
@@ -42,40 +42,40 @@ namespace WixToolset.Data.Tuples
         Win64 = 0x20,
     }
 
-    public class WixRegistrySearchTuple : IntermediateTuple
+    public class WixRegistrySearchSymbol : IntermediateSymbol
     {
-        public WixRegistrySearchTuple() : base(TupleDefinitions.WixRegistrySearch, null, null)
+        public WixRegistrySearchSymbol() : base(SymbolDefinitions.WixRegistrySearch, null, null)
         {
         }
 
-        public WixRegistrySearchTuple(SourceLineNumber sourceLineNumber , Identifier id = null) : base(TupleDefinitions.WixRegistrySearch, sourceLineNumber, id)
+        public WixRegistrySearchSymbol(SourceLineNumber sourceLineNumber , Identifier id = null) : base(SymbolDefinitions.WixRegistrySearch, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixRegistrySearchTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixRegistrySearchSymbolFields index] => this.Fields[(int)index];
 
         public RegistryRootType Root
         {
-            get => (RegistryRootType)this.Fields[(int)WixRegistrySearchTupleFields.Root].AsNumber();
-            set => this.Set((int)WixRegistrySearchTupleFields.Root, (int)value);
+            get => (RegistryRootType)this.Fields[(int)WixRegistrySearchSymbolFields.Root].AsNumber();
+            set => this.Set((int)WixRegistrySearchSymbolFields.Root, (int)value);
         }
 
         public string Key
         {
-            get => (string)this.Fields[(int)WixRegistrySearchTupleFields.Key];
-            set => this.Set((int)WixRegistrySearchTupleFields.Key, value);
+            get => (string)this.Fields[(int)WixRegistrySearchSymbolFields.Key];
+            set => this.Set((int)WixRegistrySearchSymbolFields.Key, value);
         }
 
         public string Value
         {
-            get => (string)this.Fields[(int)WixRegistrySearchTupleFields.Value];
-            set => this.Set((int)WixRegistrySearchTupleFields.Value, value);
+            get => (string)this.Fields[(int)WixRegistrySearchSymbolFields.Value];
+            set => this.Set((int)WixRegistrySearchSymbolFields.Value, value);
         }
 
         public WixRegistrySearchAttributes Attributes
         {
-            get => (WixRegistrySearchAttributes)this.Fields[(int)WixRegistrySearchTupleFields.Attributes].AsNumber();
-            set => this.Set((int)WixRegistrySearchTupleFields.Attributes, (int)value);
+            get => (WixRegistrySearchAttributes)this.Fields[(int)WixRegistrySearchSymbolFields.Attributes].AsNumber();
+            set => this.Set((int)WixRegistrySearchSymbolFields.Attributes, (int)value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/WixRelatedBundleTuple.cs b/src/WixToolset.Data/Tuples/WixRelatedBundleTuple.cs
index a7a2cf92..dc544e29 100644
--- a/src/WixToolset.Data/Tuples/WixRelatedBundleTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixRelatedBundleTuple.cs
@@ -2,24 +2,24 @@
 
 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 WixRelatedBundle = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixRelatedBundle,
+        public static readonly IntermediateSymbolDefinition WixRelatedBundle = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixRelatedBundle,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixRelatedBundleTupleFields.BundleId), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixRelatedBundleTupleFields.Action), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixRelatedBundleSymbolFields.BundleId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixRelatedBundleSymbolFields.Action), IntermediateFieldType.Number),
             },
-            typeof(WixRelatedBundleTuple));
+            typeof(WixRelatedBundleSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixRelatedBundleTupleFields
+    public enum WixRelatedBundleSymbolFields
     {
         BundleId,
         Action,
@@ -33,28 +33,28 @@ namespace WixToolset.Data.Tuples
         Patch
     }
 
-    public class WixRelatedBundleTuple : IntermediateTuple
+    public class WixRelatedBundleSymbol : IntermediateSymbol
     {
-        public WixRelatedBundleTuple() : base(TupleDefinitions.WixRelatedBundle, null, null)
+        public WixRelatedBundleSymbol() : base(SymbolDefinitions.WixRelatedBundle, null, null)
         {
         }
 
-        public WixRelatedBundleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixRelatedBundle, sourceLineNumber, id)
+        public WixRelatedBundleSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixRelatedBundle, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixRelatedBundleTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixRelatedBundleSymbolFields index] => this.Fields[(int)index];
 
         public string BundleId
         {
-            get => (string)this.Fields[(int)WixRelatedBundleTupleFields.BundleId];
-            set => this.Set((int)WixRelatedBundleTupleFields.BundleId, value);
+            get => (string)this.Fields[(int)WixRelatedBundleSymbolFields.BundleId];
+            set => this.Set((int)WixRelatedBundleSymbolFields.BundleId, value);
         }
 
         public RelatedBundleActionType Action
         {
-            get => (RelatedBundleActionType)this.Fields[(int)WixRelatedBundleTupleFields.Action].AsNumber();
-            set => this.Set((int)WixRelatedBundleTupleFields.Action, (int)value);
+            get => (RelatedBundleActionType)this.Fields[(int)WixRelatedBundleSymbolFields.Action].AsNumber();
+            set => this.Set((int)WixRelatedBundleSymbolFields.Action, (int)value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixSearchRelationTuple.cs b/src/WixToolset.Data/Tuples/WixSearchRelationTuple.cs
index 559a41fa..6b47833a 100644
--- a/src/WixToolset.Data/Tuples/WixSearchRelationTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixSearchRelationTuple.cs
@@ -2,51 +2,51 @@
 
 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 WixSearchRelation = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixSearchRelation,
+        public static readonly IntermediateSymbolDefinition WixSearchRelation = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixSearchRelation,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixSearchRelationTupleFields.ParentSearchRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixSearchRelationTupleFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixSearchRelationSymbolFields.ParentSearchRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixSearchRelationSymbolFields.Attributes), IntermediateFieldType.Number),
             },
-            typeof(WixSearchRelationTuple));
+            typeof(WixSearchRelationSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixSearchRelationTupleFields
+    public enum WixSearchRelationSymbolFields
     {
         ParentSearchRef,
         Attributes,
     }
 
-    public class WixSearchRelationTuple : IntermediateTuple
+    public class WixSearchRelationSymbol : IntermediateSymbol
     {
-        public WixSearchRelationTuple() : base(TupleDefinitions.WixSearchRelation, null, null)
+        public WixSearchRelationSymbol() : base(SymbolDefinitions.WixSearchRelation, null, null)
         {
         }
 
-        public WixSearchRelationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixSearchRelation, sourceLineNumber, id)
+        public WixSearchRelationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixSearchRelation, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixSearchRelationTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixSearchRelationSymbolFields index] => this.Fields[(int)index];
 
         public string ParentSearchRef
         {
-            get => (string)this.Fields[(int)WixSearchRelationTupleFields.ParentSearchRef];
-            set => this.Set((int)WixSearchRelationTupleFields.ParentSearchRef, value);
+            get => (string)this.Fields[(int)WixSearchRelationSymbolFields.ParentSearchRef];
+            set => this.Set((int)WixSearchRelationSymbolFields.ParentSearchRef, value);
         }
 
         public int Attributes
         {
-            get => (int)this.Fields[(int)WixSearchRelationTupleFields.Attributes];
-            set => this.Set((int)WixSearchRelationTupleFields.Attributes, value);
+            get => (int)this.Fields[(int)WixSearchRelationSymbolFields.Attributes];
+            set => this.Set((int)WixSearchRelationSymbolFields.Attributes, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixSearchTuple.cs b/src/WixToolset.Data/Tuples/WixSearchTuple.cs
index 6f58f62e..2d6a927c 100644
--- a/src/WixToolset.Data/Tuples/WixSearchTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixSearchTuple.cs
@@ -2,59 +2,59 @@
 
 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 WixSearch = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixSearch,
+        public static readonly IntermediateSymbolDefinition WixSearch = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixSearch,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixSearchTupleFields.Variable), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixSearchTupleFields.Condition), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixSearchTupleFields.BundleExtensionRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixSearchSymbolFields.Variable), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixSearchSymbolFields.Condition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixSearchSymbolFields.BundleExtensionRef), IntermediateFieldType.String),
             },
-            typeof(WixSearchTuple));
+            typeof(WixSearchSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixSearchTupleFields
+    public enum WixSearchSymbolFields
     {
         Variable,
         Condition,
         BundleExtensionRef,
     }
 
-    public class WixSearchTuple : IntermediateTuple
+    public class WixSearchSymbol : IntermediateSymbol
     {
-        public WixSearchTuple() : base(TupleDefinitions.WixSearch, null, null)
+        public WixSearchSymbol() : base(SymbolDefinitions.WixSearch, null, null)
         {
         }
 
-        public WixSearchTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixSearch, sourceLineNumber, id)
+        public WixSearchSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixSearch, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixSearchTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixSearchSymbolFields index] => this.Fields[(int)index];
 
         public string Variable
         {
-            get => (string)this.Fields[(int)WixSearchTupleFields.Variable];
-            set => this.Set((int)WixSearchTupleFields.Variable, value);
+            get => (string)this.Fields[(int)WixSearchSymbolFields.Variable];
+            set => this.Set((int)WixSearchSymbolFields.Variable, value);
         }
 
         public string Condition
         {
-            get => (string)this.Fields[(int)WixSearchTupleFields.Condition];
-            set => this.Set((int)WixSearchTupleFields.Condition, value);
+            get => (string)this.Fields[(int)WixSearchSymbolFields.Condition];
+            set => this.Set((int)WixSearchSymbolFields.Condition, value);
         }
 
         public string BundleExtensionRef
         {
-            get => (string)this.Fields[(int)WixSearchTupleFields.BundleExtensionRef];
-            set => this.Set((int)WixSearchTupleFields.BundleExtensionRef, value);
+            get => (string)this.Fields[(int)WixSearchSymbolFields.BundleExtensionRef];
+            set => this.Set((int)WixSearchSymbolFields.BundleExtensionRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixSetVariableTuple.cs b/src/WixToolset.Data/Tuples/WixSetVariableTuple.cs
index 6c1e9908..503c328b 100644
--- a/src/WixToolset.Data/Tuples/WixSetVariableTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixSetVariableTuple.cs
@@ -2,51 +2,51 @@
 
 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 WixSetVariable = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixSetVariable,
+        public static readonly IntermediateSymbolDefinition WixSetVariable = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixSetVariable,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixSetVariableTupleFields.Value), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixSetVariableTupleFields.Type), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixSetVariableSymbolFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixSetVariableSymbolFields.Type), IntermediateFieldType.String),
             },
-            typeof(WixSetVariableTuple));
+            typeof(WixSetVariableSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixSetVariableTupleFields
+    public enum WixSetVariableSymbolFields
     {
         Value,
         Type,
     }
 
-    public class WixSetVariableTuple : IntermediateTuple
+    public class WixSetVariableSymbol : IntermediateSymbol
     {
-        public WixSetVariableTuple() : base(TupleDefinitions.WixSetVariable, null, null)
+        public WixSetVariableSymbol() : base(SymbolDefinitions.WixSetVariable, null, null)
         {
         }
 
-        public WixSetVariableTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixSetVariable, sourceLineNumber, id)
+        public WixSetVariableSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixSetVariable, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixSetVariableTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixSetVariableSymbolFields index] => this.Fields[(int)index];
 
         public string Value
         {
-            get => (string)this.Fields[(int)WixSetVariableTupleFields.Value];
-            set => this.Set((int)WixSetVariableTupleFields.Value, value);
+            get => (string)this.Fields[(int)WixSetVariableSymbolFields.Value];
+            set => this.Set((int)WixSetVariableSymbolFields.Value, value);
         }
 
         public string Type
         {
-            get => (string)this.Fields[(int)WixSetVariableTupleFields.Type];
-            set => this.Set((int)WixSetVariableTupleFields.Type, value);
+            get => (string)this.Fields[(int)WixSetVariableSymbolFields.Type];
+            set => this.Set((int)WixSetVariableSymbolFields.Type, value);
         }
     }
 }
diff --git a/src/WixToolset.Data/Tuples/WixSimpleReferenceTuple.cs b/src/WixToolset.Data/Tuples/WixSimpleReferenceTuple.cs
index abc53b3a..1091b715 100644
--- a/src/WixToolset.Data/Tuples/WixSimpleReferenceTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixSimpleReferenceTuple.cs
@@ -2,55 +2,55 @@
 
 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 WixSimpleReference = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixSimpleReference,
+        public static readonly IntermediateSymbolDefinition WixSimpleReference = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixSimpleReference,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixSimpleReferenceTupleFields.Table), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixSimpleReferenceTupleFields.PrimaryKeys), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixSimpleReferenceSymbolFields.Table), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixSimpleReferenceSymbolFields.PrimaryKeys), IntermediateFieldType.String),
             },
-            typeof(WixSimpleReferenceTuple));
+            typeof(WixSimpleReferenceSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
     using System;
     using System.Diagnostics;
 
-    public enum WixSimpleReferenceTupleFields
+    public enum WixSimpleReferenceSymbolFields
     {
         Table,
         PrimaryKeys,
     }
 
     [DebuggerDisplay("{SymbolicName}")]
-    public class WixSimpleReferenceTuple : IntermediateTuple
+    public class WixSimpleReferenceSymbol : IntermediateSymbol
     {
-        public WixSimpleReferenceTuple() : base(TupleDefinitions.WixSimpleReference, null, null)
+        public WixSimpleReferenceSymbol() : base(SymbolDefinitions.WixSimpleReference, null, null)
         {
         }
 
-        public WixSimpleReferenceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixSimpleReference, sourceLineNumber, id)
+        public WixSimpleReferenceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixSimpleReference, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixSimpleReferenceTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixSimpleReferenceSymbolFields index] => this.Fields[(int)index];
 
         public string Table
         {
-            get => (string)this.Fields[(int)WixSimpleReferenceTupleFields.Table];
-            set => this.Set((int)WixSimpleReferenceTupleFields.Table, value);
+            get => (string)this.Fields[(int)WixSimpleReferenceSymbolFields.Table];
+            set => this.Set((int)WixSimpleReferenceSymbolFields.Table, value);
         }
 
         public string PrimaryKeys
         {
-            get => (string)this.Fields[(int)WixSimpleReferenceTupleFields.PrimaryKeys];
-            set => this.Set((int)WixSimpleReferenceTupleFields.PrimaryKeys, value);
+            get => (string)this.Fields[(int)WixSimpleReferenceSymbolFields.PrimaryKeys];
+            set => this.Set((int)WixSimpleReferenceSymbolFields.PrimaryKeys, value);
         }
 
         /// <summary>
diff --git a/src/WixToolset.Data/Tuples/WixSuppressActionTuple.cs b/src/WixToolset.Data/Tuples/WixSuppressActionTuple.cs
index 70bda370..f99246f0 100644
--- a/src/WixToolset.Data/Tuples/WixSuppressActionTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixSuppressActionTuple.cs
@@ -2,53 +2,53 @@
 
 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 WixSuppressAction = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixSuppressAction,
+        public static readonly IntermediateSymbolDefinition WixSuppressAction = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixSuppressAction,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixSuppressActionTupleFields.SequenceTable), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixSuppressActionTupleFields.Action), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixSuppressActionSymbolFields.SequenceTable), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixSuppressActionSymbolFields.Action), IntermediateFieldType.String),
             },
-            typeof(WixSuppressActionTuple));
+            typeof(WixSuppressActionSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
     using System;
 
-    public enum WixSuppressActionTupleFields
+    public enum WixSuppressActionSymbolFields
     {
         SequenceTable,
         Action,
     }
 
-    public class WixSuppressActionTuple : IntermediateTuple
+    public class WixSuppressActionSymbol : IntermediateSymbol
     {
-        public WixSuppressActionTuple() : base(TupleDefinitions.WixSuppressAction, null, null)
+        public WixSuppressActionSymbol() : base(SymbolDefinitions.WixSuppressAction, null, null)
         {
         }
 
-        public WixSuppressActionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixSuppressAction, sourceLineNumber, id)
+        public WixSuppressActionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixSuppressAction, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixSuppressActionTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixSuppressActionSymbolFields index] => this.Fields[(int)index];
 
         public SequenceTable SequenceTable
         {
-            get => (SequenceTable)Enum.Parse(typeof(SequenceTable), (string)this.Fields[(int)WixSuppressActionTupleFields.SequenceTable]);
-            set => this.Set((int)WixSuppressActionTupleFields.SequenceTable, value.ToString());
+            get => (SequenceTable)Enum.Parse(typeof(SequenceTable), (string)this.Fields[(int)WixSuppressActionSymbolFields.SequenceTable]);
+            set => this.Set((int)WixSuppressActionSymbolFields.SequenceTable, value.ToString());
         }
 
         public string Action
         {
-            get => (string)this.Fields[(int)WixSuppressActionTupleFields.Action];
-            set => this.Set((int)WixSuppressActionTupleFields.Action, value);
+            get => (string)this.Fields[(int)WixSuppressActionSymbolFields.Action];
+            set => this.Set((int)WixSuppressActionSymbolFields.Action, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixSuppressModularizationTuple.cs b/src/WixToolset.Data/Tuples/WixSuppressModularizationTuple.cs
index 9c6c8468..1bdffd5e 100644
--- a/src/WixToolset.Data/Tuples/WixSuppressModularizationTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixSuppressModularizationTuple.cs
@@ -2,35 +2,35 @@
 
 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 WixSuppressModularization = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixSuppressModularization,
+        public static readonly IntermediateSymbolDefinition WixSuppressModularization = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixSuppressModularization,
             new IntermediateFieldDefinition[]
             {
             },
-            typeof(WixSuppressModularizationTuple));
+            typeof(WixSuppressModularizationSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixSuppressModularizationTupleFields
+    public enum WixSuppressModularizationSymbolFields
     {
     }
 
-    public class WixSuppressModularizationTuple : IntermediateTuple
+    public class WixSuppressModularizationSymbol : IntermediateSymbol
     {
-        public WixSuppressModularizationTuple() : base(TupleDefinitions.WixSuppressModularization, null, null)
+        public WixSuppressModularizationSymbol() : base(SymbolDefinitions.WixSuppressModularization, null, null)
         {
         }
 
-        public WixSuppressModularizationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixSuppressModularization, sourceLineNumber, id)
+        public WixSuppressModularizationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixSuppressModularization, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixSuppressModularizationTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixSuppressModularizationSymbolFields index] => this.Fields[(int)index];
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixUITuple.cs b/src/WixToolset.Data/Tuples/WixUITuple.cs
index 23312096..f1254952 100644
--- a/src/WixToolset.Data/Tuples/WixUITuple.cs
+++ b/src/WixToolset.Data/Tuples/WixUITuple.cs
@@ -2,35 +2,35 @@
 
 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 WixUI = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixUI,
+        public static readonly IntermediateSymbolDefinition WixUI = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixUI,
             new IntermediateFieldDefinition[]
             {
             },
-            typeof(WixUITuple));
+            typeof(WixUISymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixUITupleFields
+    public enum WixUISymbolFields
     {
     }
 
-    public class WixUITuple : IntermediateTuple
+    public class WixUISymbol : IntermediateSymbol
     {
-        public WixUITuple() : base(TupleDefinitions.WixUI, null, null)
+        public WixUISymbol() : base(SymbolDefinitions.WixUI, null, null)
         {
         }
 
-        public WixUITuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixUI, sourceLineNumber, id)
+        public WixUISymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixUI, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixUITupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixUISymbolFields index] => this.Fields[(int)index];
     }
 }
diff --git a/src/WixToolset.Data/Tuples/WixUpdateRegistrationTuple.cs b/src/WixToolset.Data/Tuples/WixUpdateRegistrationTuple.cs
index 93a59cce..1320dfd5 100644
--- a/src/WixToolset.Data/Tuples/WixUpdateRegistrationTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixUpdateRegistrationTuple.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 WixUpdateRegistration = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixUpdateRegistration,
+        public static readonly IntermediateSymbolDefinition WixUpdateRegistration = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixUpdateRegistration,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixUpdateRegistrationTupleFields.Manufacturer), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixUpdateRegistrationTupleFields.Department), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixUpdateRegistrationTupleFields.ProductFamily), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixUpdateRegistrationTupleFields.Name), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixUpdateRegistrationTupleFields.Classification), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixUpdateRegistrationSymbolFields.Manufacturer), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixUpdateRegistrationSymbolFields.Department), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixUpdateRegistrationSymbolFields.ProductFamily), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixUpdateRegistrationSymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixUpdateRegistrationSymbolFields.Classification), IntermediateFieldType.String),
             },
-            typeof(WixUpdateRegistrationTuple));
+            typeof(WixUpdateRegistrationSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixUpdateRegistrationTupleFields
+    public enum WixUpdateRegistrationSymbolFields
     {
         Manufacturer,
         Department,
@@ -31,46 +31,46 @@ namespace WixToolset.Data.Tuples
         Classification,
     }
 
-    public class WixUpdateRegistrationTuple : IntermediateTuple
+    public class WixUpdateRegistrationSymbol : IntermediateSymbol
     {
-        public WixUpdateRegistrationTuple() : base(TupleDefinitions.WixUpdateRegistration, null, null)
+        public WixUpdateRegistrationSymbol() : base(SymbolDefinitions.WixUpdateRegistration, null, null)
         {
         }
 
-        public WixUpdateRegistrationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixUpdateRegistration, sourceLineNumber, id)
+        public WixUpdateRegistrationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixUpdateRegistration, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixUpdateRegistrationTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixUpdateRegistrationSymbolFields index] => this.Fields[(int)index];
 
         public string Manufacturer
         {
-            get => (string)this.Fields[(int)WixUpdateRegistrationTupleFields.Manufacturer];
-            set => this.Set((int)WixUpdateRegistrationTupleFields.Manufacturer, value);
+            get => (string)this.Fields[(int)WixUpdateRegistrationSymbolFields.Manufacturer];
+            set => this.Set((int)WixUpdateRegistrationSymbolFields.Manufacturer, value);
         }
 
         public string Department
         {
-            get => (string)this.Fields[(int)WixUpdateRegistrationTupleFields.Department];
-            set => this.Set((int)WixUpdateRegistrationTupleFields.Department, value);
+            get => (string)this.Fields[(int)WixUpdateRegistrationSymbolFields.Department];
+            set => this.Set((int)WixUpdateRegistrationSymbolFields.Department, value);
         }
 
         public string ProductFamily
         {
-            get => (string)this.Fields[(int)WixUpdateRegistrationTupleFields.ProductFamily];
-            set => this.Set((int)WixUpdateRegistrationTupleFields.ProductFamily, value);
+            get => (string)this.Fields[(int)WixUpdateRegistrationSymbolFields.ProductFamily];
+            set => this.Set((int)WixUpdateRegistrationSymbolFields.ProductFamily, value);
         }
 
         public string Name
         {
-            get => (string)this.Fields[(int)WixUpdateRegistrationTupleFields.Name];
-            set => this.Set((int)WixUpdateRegistrationTupleFields.Name, value);
+            get => (string)this.Fields[(int)WixUpdateRegistrationSymbolFields.Name];
+            set => this.Set((int)WixUpdateRegistrationSymbolFields.Name, value);
         }
 
         public string Classification
         {
-            get => (string)this.Fields[(int)WixUpdateRegistrationTupleFields.Classification];
-            set => this.Set((int)WixUpdateRegistrationTupleFields.Classification, value);
+            get => (string)this.Fields[(int)WixUpdateRegistrationSymbolFields.Classification];
+            set => this.Set((int)WixUpdateRegistrationSymbolFields.Classification, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Data/Tuples/WixVariableTuple.cs b/src/WixToolset.Data/Tuples/WixVariableTuple.cs
index 08508d08..0a56dcbf 100644
--- a/src/WixToolset.Data/Tuples/WixVariableTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixVariableTuple.cs
@@ -2,51 +2,51 @@
 
 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 WixVariable = new IntermediateTupleDefinition(
-            TupleDefinitionType.WixVariable,
+        public static readonly IntermediateSymbolDefinition WixVariable = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixVariable,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixVariableTupleFields.Value), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixVariableTupleFields.Overridable), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(WixVariableSymbolFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixVariableSymbolFields.Overridable), IntermediateFieldType.Bool),
             },
-            typeof(WixVariableTuple));
+            typeof(WixVariableSymbol));
     }
 }
 
-namespace WixToolset.Data.Tuples
+namespace WixToolset.Data.Symbols
 {
-    public enum WixVariableTupleFields
+    public enum WixVariableSymbolFields
     {
         Value,
         Overridable,
     }
 
-    public class WixVariableTuple : IntermediateTuple
+    public class WixVariableSymbol : IntermediateSymbol
     {
-        public WixVariableTuple() : base(TupleDefinitions.WixVariable, null, null)
+        public WixVariableSymbol() : base(SymbolDefinitions.WixVariable, null, null)
         {
         }
 
-        public WixVariableTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixVariable, sourceLineNumber, id)
+        public WixVariableSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixVariable, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixVariableTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixVariableSymbolFields index] => this.Fields[(int)index];
 
         public string Value
         {
-            get => (string)this.Fields[(int)WixVariableTupleFields.Value];
-            set => this.Set((int)WixVariableTupleFields.Value, value);
+            get => (string)this.Fields[(int)WixVariableSymbolFields.Value];
+            set => this.Set((int)WixVariableSymbolFields.Value, value);
         }
 
         public bool Overridable
         {
-            get => (bool)this.Fields[(int)WixVariableTupleFields.Overridable];
-            set => this.Set((int)WixVariableTupleFields.Overridable, value);
+            get => (bool)this.Fields[(int)WixVariableSymbolFields.Overridable];
+            set => this.Set((int)WixVariableSymbolFields.Overridable, value);
         }
     }
 }