9 files changed, 166 insertions, 166 deletions

diff --git a/src/wixext/Tuples/BalTupleDefinitions.cs b/src/wixext/Tuples/BalTupleDefinitions.cs
index 08e7ba2a..90865621 100644
--- a/src/wixext/Tuples/BalTupleDefinitions.cs
+++ b/src/wixext/Tuples/BalTupleDefinitions.cs
@@ -6,7 +6,7 @@ namespace WixToolset.Bal
     using WixToolset.Data;
     using WixToolset.Data.Burn;
 
-    public enum BalTupleDefinitionType
+    public enum BalSymbolDefinitionType
     {
         WixBalBAFactoryAssembly,
         WixBalBAFunctions,
@@ -18,13 +18,13 @@ namespace WixToolset.Bal
         WixStdbaOverridableVariable,
     }
 
-    public static partial class BalTupleDefinitions
+    public static partial class BalSymbolDefinitions
     {
         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 BalTupleDefinitionType type))
+            if (!Enum.TryParse(name, out BalSymbolDefinitionType type))
             {
                 return null;
             }
@@ -32,49 +32,49 @@ namespace WixToolset.Bal
             return ByType(type);
         }
 
-        public static IntermediateTupleDefinition ByType(BalTupleDefinitionType type)
+        public static IntermediateSymbolDefinition ByType(BalSymbolDefinitionType type)
         {
             switch (type)
             {
-                case BalTupleDefinitionType.WixBalBAFactoryAssembly:
-                    return BalTupleDefinitions.WixBalBAFactoryAssembly;
+                case BalSymbolDefinitionType.WixBalBAFactoryAssembly:
+                    return BalSymbolDefinitions.WixBalBAFactoryAssembly;
 
-                case BalTupleDefinitionType.WixBalBAFunctions:
-                    return BalTupleDefinitions.WixBalBAFunctions;
+                case BalSymbolDefinitionType.WixBalBAFunctions:
+                    return BalSymbolDefinitions.WixBalBAFunctions;
 
-                case BalTupleDefinitionType.WixBalCondition:
-                    return BalTupleDefinitions.WixBalCondition;
+                case BalSymbolDefinitionType.WixBalCondition:
+                    return BalSymbolDefinitions.WixBalCondition;
 
-                case BalTupleDefinitionType.WixBalPackageInfo:
-                    return BalTupleDefinitions.WixBalPackageInfo;
+                case BalSymbolDefinitionType.WixBalPackageInfo:
+                    return BalSymbolDefinitions.WixBalPackageInfo;
 
-                case BalTupleDefinitionType.WixDncOptions:
-                    return BalTupleDefinitions.WixDncOptions;
+                case BalSymbolDefinitionType.WixDncOptions:
+                    return BalSymbolDefinitions.WixDncOptions;
 
-                case BalTupleDefinitionType.WixMbaPrereqInformation:
-                    return BalTupleDefinitions.WixMbaPrereqInformation;
+                case BalSymbolDefinitionType.WixMbaPrereqInformation:
+                    return BalSymbolDefinitions.WixMbaPrereqInformation;
 
-                case BalTupleDefinitionType.WixStdbaOptions:
-                    return BalTupleDefinitions.WixStdbaOptions;
+                case BalSymbolDefinitionType.WixStdbaOptions:
+                    return BalSymbolDefinitions.WixStdbaOptions;
 
-                case BalTupleDefinitionType.WixStdbaOverridableVariable:
-                    return BalTupleDefinitions.WixStdbaOverridableVariable;
+                case BalSymbolDefinitionType.WixStdbaOverridableVariable:
+                    return BalSymbolDefinitions.WixStdbaOverridableVariable;
 
                 default:
                     throw new ArgumentOutOfRangeException(nameof(type));
             }
         }
 
-        static BalTupleDefinitions()
+        static BalSymbolDefinitions()
         {
-            WixBalBAFactoryAssembly.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag);
-            WixBalBAFunctions.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag);
-            WixBalCondition.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag);
-            WixBalPackageInfo.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag);
-            WixDncOptions.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag);
-            WixMbaPrereqInformation.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag);
-            WixStdbaOptions.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag);
-            WixStdbaOverridableVariable.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag);
+            WixBalBAFactoryAssembly.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
+            WixBalBAFunctions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
+            WixBalCondition.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
+            WixBalPackageInfo.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
+            WixDncOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
+            WixMbaPrereqInformation.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
+            WixStdbaOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
+            WixStdbaOverridableVariable.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
         }
     }
 }
diff --git a/src/wixext/Tuples/WixBalBAFactoryAssemblyTuple.cs b/src/wixext/Tuples/WixBalBAFactoryAssemblyTuple.cs
index e33ea562..0423a52f 100644
--- a/src/wixext/Tuples/WixBalBAFactoryAssemblyTuple.cs
+++ b/src/wixext/Tuples/WixBalBAFactoryAssemblyTuple.cs
@@ -3,45 +3,45 @@
 namespace WixToolset.Bal
 {
     using WixToolset.Data;
-    using WixToolset.Bal.Tuples;
+    using WixToolset.Bal.Symbols;
 
-    public static partial class BalTupleDefinitions
+    public static partial class BalSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition WixBalBAFactoryAssembly = new IntermediateTupleDefinition(
-            BalTupleDefinitionType.WixBalBAFactoryAssembly.ToString(),
+        public static readonly IntermediateSymbolDefinition WixBalBAFactoryAssembly = new IntermediateSymbolDefinition(
+            BalSymbolDefinitionType.WixBalBAFactoryAssembly.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBalBAFactoryTupleFields.PayloadId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBalBAFactorySymbolFields.PayloadId), IntermediateFieldType.String),
             },
-            typeof(WixBalBAFactoryAssemblyTuple));
+            typeof(WixBalBAFactoryAssemblySymbol));
     }
 }
 
-namespace WixToolset.Bal.Tuples
+namespace WixToolset.Bal.Symbols
 {
     using WixToolset.Data;
 
-    public enum WixBalBAFactoryTupleFields
+    public enum WixBalBAFactorySymbolFields
     {
         PayloadId,
     }
 
-    public class WixBalBAFactoryAssemblyTuple : IntermediateTuple
+    public class WixBalBAFactoryAssemblySymbol : IntermediateSymbol
     {
-        public WixBalBAFactoryAssemblyTuple() : base(BalTupleDefinitions.WixBalBAFactoryAssembly, null, null)
+        public WixBalBAFactoryAssemblySymbol() : base(BalSymbolDefinitions.WixBalBAFactoryAssembly, null, null)
         {
         }
 
-        public WixBalBAFactoryAssemblyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixBalBAFactoryAssembly, sourceLineNumber, id)
+        public WixBalBAFactoryAssemblySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalBAFactoryAssembly, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBalBAFactoryTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBalBAFactorySymbolFields index] => this.Fields[(int)index];
 
         public string PayloadId
         {
-            get => this.Fields[(int)WixBalBAFactoryTupleFields.PayloadId].AsString();
-            set => this.Set((int)WixBalBAFactoryTupleFields.PayloadId, value);
+            get => this.Fields[(int)WixBalBAFactorySymbolFields.PayloadId].AsString();
+            set => this.Set((int)WixBalBAFactorySymbolFields.PayloadId, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/WixBalBAFunctionsTuple.cs b/src/wixext/Tuples/WixBalBAFunctionsTuple.cs
index f753f239..19c7602d 100644
--- a/src/wixext/Tuples/WixBalBAFunctionsTuple.cs
+++ b/src/wixext/Tuples/WixBalBAFunctionsTuple.cs
@@ -3,45 +3,45 @@
 namespace WixToolset.Bal
 {
     using WixToolset.Data;
-    using WixToolset.Bal.Tuples;
+    using WixToolset.Bal.Symbols;
 
-    public static partial class BalTupleDefinitions
+    public static partial class BalSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition WixBalBAFunctions = new IntermediateTupleDefinition(
-            BalTupleDefinitionType.WixBalBAFunctions.ToString(),
+        public static readonly IntermediateSymbolDefinition WixBalBAFunctions = new IntermediateSymbolDefinition(
+            BalSymbolDefinitionType.WixBalBAFunctions.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBalBAFunctionsTupleFields.PayloadId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBalBAFunctionsSymbolFields.PayloadId), IntermediateFieldType.String),
             },
-            typeof(WixBalBAFunctionsTuple));
+            typeof(WixBalBAFunctionsSymbol));
     }
 }
 
-namespace WixToolset.Bal.Tuples
+namespace WixToolset.Bal.Symbols
 {
     using WixToolset.Data;
 
-    public enum WixBalBAFunctionsTupleFields
+    public enum WixBalBAFunctionsSymbolFields
     {
         PayloadId,
     }
 
-    public class WixBalBAFunctionsTuple : IntermediateTuple
+    public class WixBalBAFunctionsSymbol : IntermediateSymbol
     {
-        public WixBalBAFunctionsTuple() : base(BalTupleDefinitions.WixBalBAFunctions, null, null)
+        public WixBalBAFunctionsSymbol() : base(BalSymbolDefinitions.WixBalBAFunctions, null, null)
         {
         }
 
-        public WixBalBAFunctionsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixBalBAFunctions, sourceLineNumber, id)
+        public WixBalBAFunctionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalBAFunctions, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBalBAFunctionsTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBalBAFunctionsSymbolFields index] => this.Fields[(int)index];
 
         public string PayloadId
         {
-            get => this.Fields[(int)WixBalBAFunctionsTupleFields.PayloadId].AsString();
-            set => this.Set((int)WixBalBAFunctionsTupleFields.PayloadId, value);
+            get => this.Fields[(int)WixBalBAFunctionsSymbolFields.PayloadId].AsString();
+            set => this.Set((int)WixBalBAFunctionsSymbolFields.PayloadId, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/WixBalConditionTuple.cs b/src/wixext/Tuples/WixBalConditionTuple.cs
index 4c0ddd1d..c2527fbc 100644
--- a/src/wixext/Tuples/WixBalConditionTuple.cs
+++ b/src/wixext/Tuples/WixBalConditionTuple.cs
@@ -3,53 +3,53 @@
 namespace WixToolset.Bal
 {
     using WixToolset.Data;
-    using WixToolset.Bal.Tuples;
+    using WixToolset.Bal.Symbols;
 
-    public static partial class BalTupleDefinitions
+    public static partial class BalSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition WixBalCondition = new IntermediateTupleDefinition(
-            BalTupleDefinitionType.WixBalCondition.ToString(),
+        public static readonly IntermediateSymbolDefinition WixBalCondition = new IntermediateSymbolDefinition(
+            BalSymbolDefinitionType.WixBalCondition.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBalConditionTupleFields.Condition), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBalConditionTupleFields.Message), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBalConditionSymbolFields.Condition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBalConditionSymbolFields.Message), IntermediateFieldType.String),
             },
-            typeof(WixBalConditionTuple));
+            typeof(WixBalConditionSymbol));
     }
 }
 
-namespace WixToolset.Bal.Tuples
+namespace WixToolset.Bal.Symbols
 {
     using WixToolset.Data;
 
-    public enum WixBalConditionTupleFields
+    public enum WixBalConditionSymbolFields
     {
         Condition,
         Message,
     }
 
-    public class WixBalConditionTuple : IntermediateTuple
+    public class WixBalConditionSymbol : IntermediateSymbol
     {
-        public WixBalConditionTuple() : base(BalTupleDefinitions.WixBalCondition, null, null)
+        public WixBalConditionSymbol() : base(BalSymbolDefinitions.WixBalCondition, null, null)
         {
         }
 
-        public WixBalConditionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixBalCondition, sourceLineNumber, id)
+        public WixBalConditionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalCondition, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBalConditionTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBalConditionSymbolFields index] => this.Fields[(int)index];
 
         public string Condition
         {
-            get => this.Fields[(int)WixBalConditionTupleFields.Condition].AsString();
-            set => this.Set((int)WixBalConditionTupleFields.Condition, value);
+            get => this.Fields[(int)WixBalConditionSymbolFields.Condition].AsString();
+            set => this.Set((int)WixBalConditionSymbolFields.Condition, value);
         }
 
         public string Message
         {
-            get => this.Fields[(int)WixBalConditionTupleFields.Message].AsString();
-            set => this.Set((int)WixBalConditionTupleFields.Message, value);
+            get => this.Fields[(int)WixBalConditionSymbolFields.Message].AsString();
+            set => this.Set((int)WixBalConditionSymbolFields.Message, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/WixBalPackageInfoTuple.cs b/src/wixext/Tuples/WixBalPackageInfoTuple.cs
index 32be3105..b09cb191 100644
--- a/src/wixext/Tuples/WixBalPackageInfoTuple.cs
+++ b/src/wixext/Tuples/WixBalPackageInfoTuple.cs
@@ -3,53 +3,53 @@
 namespace WixToolset.Bal
 {
     using WixToolset.Data;
-    using WixToolset.Bal.Tuples;
+    using WixToolset.Bal.Symbols;
 
-    public static partial class BalTupleDefinitions
+    public static partial class BalSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition WixBalPackageInfo = new IntermediateTupleDefinition(
-            BalTupleDefinitionType.WixBalPackageInfo.ToString(),
+        public static readonly IntermediateSymbolDefinition WixBalPackageInfo = new IntermediateSymbolDefinition(
+            BalSymbolDefinitionType.WixBalPackageInfo.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixBalPackageInfoTupleFields.PackageId), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBalPackageInfoTupleFields.DisplayInternalUICondition), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBalPackageInfoSymbolFields.PackageId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBalPackageInfoSymbolFields.DisplayInternalUICondition), IntermediateFieldType.String),
             },
-            typeof(WixBalPackageInfoTuple));
+            typeof(WixBalPackageInfoSymbol));
     }
 }
 
-namespace WixToolset.Bal.Tuples
+namespace WixToolset.Bal.Symbols
 {
     using WixToolset.Data;
 
-    public enum WixBalPackageInfoTupleFields
+    public enum WixBalPackageInfoSymbolFields
     {
         PackageId,
         DisplayInternalUICondition,
     }
 
-    public class WixBalPackageInfoTuple : IntermediateTuple
+    public class WixBalPackageInfoSymbol : IntermediateSymbol
     {
-        public WixBalPackageInfoTuple() : base(BalTupleDefinitions.WixBalPackageInfo, null, null)
+        public WixBalPackageInfoSymbol() : base(BalSymbolDefinitions.WixBalPackageInfo, null, null)
         {
         }
 
-        public WixBalPackageInfoTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixBalPackageInfo, sourceLineNumber, id)
+        public WixBalPackageInfoSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalPackageInfo, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixBalPackageInfoTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixBalPackageInfoSymbolFields index] => this.Fields[(int)index];
 
         public string PackageId
         {
-            get => this.Fields[(int)WixBalPackageInfoTupleFields.PackageId].AsString();
-            set => this.Set((int)WixBalPackageInfoTupleFields.PackageId, value);
+            get => this.Fields[(int)WixBalPackageInfoSymbolFields.PackageId].AsString();
+            set => this.Set((int)WixBalPackageInfoSymbolFields.PackageId, value);
         }
 
         public string DisplayInternalUICondition
         {
-            get => this.Fields[(int)WixBalPackageInfoTupleFields.DisplayInternalUICondition].AsString();
-            set => this.Set((int)WixBalPackageInfoTupleFields.DisplayInternalUICondition, value);
+            get => this.Fields[(int)WixBalPackageInfoSymbolFields.DisplayInternalUICondition].AsString();
+            set => this.Set((int)WixBalPackageInfoSymbolFields.DisplayInternalUICondition, value);
         }
     }
 }
diff --git a/src/wixext/Tuples/WixDncOptionsTuple.cs b/src/wixext/Tuples/WixDncOptionsTuple.cs
index 8a36879b..b9a41c21 100644
--- a/src/wixext/Tuples/WixDncOptionsTuple.cs
+++ b/src/wixext/Tuples/WixDncOptionsTuple.cs
@@ -3,45 +3,45 @@
 namespace WixToolset.Bal
 {
     using WixToolset.Data;
-    using WixToolset.Bal.Tuples;
+    using WixToolset.Bal.Symbols;
 
-    public static partial class BalTupleDefinitions
+    public static partial class BalSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition WixDncOptions = new IntermediateTupleDefinition(
-            BalTupleDefinitionType.WixDncOptions.ToString(),
+        public static readonly IntermediateSymbolDefinition WixDncOptions = new IntermediateSymbolDefinition(
+            BalSymbolDefinitionType.WixDncOptions.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixDncOptionsTupleFields.SelfContainedDeployment), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixDncOptionsSymbolFields.SelfContainedDeployment), IntermediateFieldType.Number),
             },
-            typeof(WixDncOptionsTuple));
+            typeof(WixDncOptionsSymbol));
     }
 }
 
-namespace WixToolset.Bal.Tuples
+namespace WixToolset.Bal.Symbols
 {
     using WixToolset.Data;
 
-    public enum WixDncOptionsTupleFields
+    public enum WixDncOptionsSymbolFields
     {
         SelfContainedDeployment,
     }
 
-    public class WixDncOptionsTuple : IntermediateTuple
+    public class WixDncOptionsSymbol : IntermediateSymbol
     {
-        public WixDncOptionsTuple() : base(BalTupleDefinitions.WixDncOptions, null, null)
+        public WixDncOptionsSymbol() : base(BalSymbolDefinitions.WixDncOptions, null, null)
         {
         }
 
-        public WixDncOptionsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixDncOptions, sourceLineNumber, id)
+        public WixDncOptionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixDncOptions, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixDncOptionsTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixDncOptionsSymbolFields index] => this.Fields[(int)index];
 
         public int SelfContainedDeployment
         {
-            get => this.Fields[(int)WixDncOptionsTupleFields.SelfContainedDeployment].AsNumber();
-            set => this.Set((int)WixDncOptionsTupleFields.SelfContainedDeployment, value);
+            get => this.Fields[(int)WixDncOptionsSymbolFields.SelfContainedDeployment].AsNumber();
+            set => this.Set((int)WixDncOptionsSymbolFields.SelfContainedDeployment, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/WixMbaPrereqInformationTuple.cs b/src/wixext/Tuples/WixMbaPrereqInformationTuple.cs
index bcbe9f84..e4d78da0 100644
--- a/src/wixext/Tuples/WixMbaPrereqInformationTuple.cs
+++ b/src/wixext/Tuples/WixMbaPrereqInformationTuple.cs
@@ -3,61 +3,61 @@
 namespace WixToolset.Bal
 {
     using WixToolset.Data;
-    using WixToolset.Bal.Tuples;
+    using WixToolset.Bal.Symbols;
 
-    public static partial class BalTupleDefinitions
+    public static partial class BalSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition WixMbaPrereqInformation = new IntermediateTupleDefinition(
-            BalTupleDefinitionType.WixMbaPrereqInformation.ToString(),
+        public static readonly IntermediateSymbolDefinition WixMbaPrereqInformation = new IntermediateSymbolDefinition(
+            BalSymbolDefinitionType.WixMbaPrereqInformation.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationTupleFields.PackageId), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationTupleFields.LicenseFile), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationTupleFields.LicenseUrl), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationSymbolFields.PackageId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationSymbolFields.LicenseFile), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationSymbolFields.LicenseUrl), IntermediateFieldType.String),
             },
-            typeof(WixMbaPrereqInformationTuple));
+            typeof(WixMbaPrereqInformationSymbol));
     }
 }
 
-namespace WixToolset.Bal.Tuples
+namespace WixToolset.Bal.Symbols
 {
     using WixToolset.Data;
 
-    public enum WixMbaPrereqInformationTupleFields
+    public enum WixMbaPrereqInformationSymbolFields
     {
         PackageId,
         LicenseFile,
         LicenseUrl,
     }
 
-    public class WixMbaPrereqInformationTuple : IntermediateTuple
+    public class WixMbaPrereqInformationSymbol : IntermediateSymbol
     {
-        public WixMbaPrereqInformationTuple() : base(BalTupleDefinitions.WixMbaPrereqInformation, null, null)
+        public WixMbaPrereqInformationSymbol() : base(BalSymbolDefinitions.WixMbaPrereqInformation, null, null)
         {
         }
 
-        public WixMbaPrereqInformationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixMbaPrereqInformation, sourceLineNumber, id)
+        public WixMbaPrereqInformationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixMbaPrereqInformation, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixMbaPrereqInformationTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixMbaPrereqInformationSymbolFields index] => this.Fields[(int)index];
 
         public string PackageId
         {
-            get => this.Fields[(int)WixMbaPrereqInformationTupleFields.PackageId].AsString();
-            set => this.Set((int)WixMbaPrereqInformationTupleFields.PackageId, value);
+            get => this.Fields[(int)WixMbaPrereqInformationSymbolFields.PackageId].AsString();
+            set => this.Set((int)WixMbaPrereqInformationSymbolFields.PackageId, value);
         }
 
         public string LicenseFile
         {
-            get => this.Fields[(int)WixMbaPrereqInformationTupleFields.LicenseFile].AsString();
-            set => this.Set((int)WixMbaPrereqInformationTupleFields.LicenseFile, value);
+            get => this.Fields[(int)WixMbaPrereqInformationSymbolFields.LicenseFile].AsString();
+            set => this.Set((int)WixMbaPrereqInformationSymbolFields.LicenseFile, value);
         }
 
         public string LicenseUrl
         {
-            get => this.Fields[(int)WixMbaPrereqInformationTupleFields.LicenseUrl].AsString();
-            set => this.Set((int)WixMbaPrereqInformationTupleFields.LicenseUrl, value);
+            get => this.Fields[(int)WixMbaPrereqInformationSymbolFields.LicenseUrl].AsString();
+            set => this.Set((int)WixMbaPrereqInformationSymbolFields.LicenseUrl, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/WixStdbaOptionsTuple.cs b/src/wixext/Tuples/WixStdbaOptionsTuple.cs
index d930eb47..cb2694da 100644
--- a/src/wixext/Tuples/WixStdbaOptionsTuple.cs
+++ b/src/wixext/Tuples/WixStdbaOptionsTuple.cs
@@ -3,29 +3,29 @@
 namespace WixToolset.Bal
 {
     using WixToolset.Data;
-    using WixToolset.Bal.Tuples;
+    using WixToolset.Bal.Symbols;
 
-    public static partial class BalTupleDefinitions
+    public static partial class BalSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition WixStdbaOptions = new IntermediateTupleDefinition(
-            BalTupleDefinitionType.WixStdbaOptions.ToString(),
+        public static readonly IntermediateSymbolDefinition WixStdbaOptions = new IntermediateSymbolDefinition(
+            BalSymbolDefinitionType.WixStdbaOptions.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixStdbaOptionsTupleFields.SuppressOptionsUI), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixStdbaOptionsTupleFields.SuppressDowngradeFailure), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixStdbaOptionsTupleFields.SuppressRepair), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixStdbaOptionsTupleFields.ShowVersion), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixStdbaOptionsTupleFields.SupportCacheOnly), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SuppressOptionsUI), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SuppressDowngradeFailure), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SuppressRepair), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.ShowVersion), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SupportCacheOnly), IntermediateFieldType.Number),
             },
-            typeof(WixStdbaOptionsTuple));
+            typeof(WixStdbaOptionsSymbol));
     }
 }
 
-namespace WixToolset.Bal.Tuples
+namespace WixToolset.Bal.Symbols
 {
     using WixToolset.Data;
 
-    public enum WixStdbaOptionsTupleFields
+    public enum WixStdbaOptionsSymbolFields
     {
         SuppressOptionsUI,
         SuppressDowngradeFailure,
@@ -34,46 +34,46 @@ namespace WixToolset.Bal.Tuples
         SupportCacheOnly,
     }
 
-    public class WixStdbaOptionsTuple : IntermediateTuple
+    public class WixStdbaOptionsSymbol : IntermediateSymbol
     {
-        public WixStdbaOptionsTuple() : base(BalTupleDefinitions.WixStdbaOptions, null, null)
+        public WixStdbaOptionsSymbol() : base(BalSymbolDefinitions.WixStdbaOptions, null, null)
         {
         }
 
-        public WixStdbaOptionsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixStdbaOptions, sourceLineNumber, id)
+        public WixStdbaOptionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixStdbaOptions, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixStdbaOptionsTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixStdbaOptionsSymbolFields index] => this.Fields[(int)index];
 
         public int SuppressOptionsUI
         {
-            get => this.Fields[(int)WixStdbaOptionsTupleFields.SuppressOptionsUI].AsNumber();
-            set => this.Set((int)WixStdbaOptionsTupleFields.SuppressOptionsUI, value);
+            get => this.Fields[(int)WixStdbaOptionsSymbolFields.SuppressOptionsUI].AsNumber();
+            set => this.Set((int)WixStdbaOptionsSymbolFields.SuppressOptionsUI, value);
         }
 
         public int SuppressDowngradeFailure
         {
-            get => this.Fields[(int)WixStdbaOptionsTupleFields.SuppressDowngradeFailure].AsNumber();
-            set => this.Set((int)WixStdbaOptionsTupleFields.SuppressDowngradeFailure, value);
+            get => this.Fields[(int)WixStdbaOptionsSymbolFields.SuppressDowngradeFailure].AsNumber();
+            set => this.Set((int)WixStdbaOptionsSymbolFields.SuppressDowngradeFailure, value);
         }
 
         public int SuppressRepair
         {
-            get => this.Fields[(int)WixStdbaOptionsTupleFields.SuppressRepair].AsNumber();
-            set => this.Set((int)WixStdbaOptionsTupleFields.SuppressRepair, value);
+            get => this.Fields[(int)WixStdbaOptionsSymbolFields.SuppressRepair].AsNumber();
+            set => this.Set((int)WixStdbaOptionsSymbolFields.SuppressRepair, value);
         }
 
         public int ShowVersion
         {
-            get => this.Fields[(int)WixStdbaOptionsTupleFields.ShowVersion].AsNumber();
-            set => this.Set((int)WixStdbaOptionsTupleFields.ShowVersion, value);
+            get => this.Fields[(int)WixStdbaOptionsSymbolFields.ShowVersion].AsNumber();
+            set => this.Set((int)WixStdbaOptionsSymbolFields.ShowVersion, value);
         }
 
         public int SupportCacheOnly
         {
-            get => this.Fields[(int)WixStdbaOptionsTupleFields.SupportCacheOnly].AsNumber();
-            set => this.Set((int)WixStdbaOptionsTupleFields.SupportCacheOnly, value);
+            get => this.Fields[(int)WixStdbaOptionsSymbolFields.SupportCacheOnly].AsNumber();
+            set => this.Set((int)WixStdbaOptionsSymbolFields.SupportCacheOnly, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/WixStdbaOverridableVariableTuple.cs b/src/wixext/Tuples/WixStdbaOverridableVariableTuple.cs
index 3ba982ea..1d84d1aa 100644
--- a/src/wixext/Tuples/WixStdbaOverridableVariableTuple.cs
+++ b/src/wixext/Tuples/WixStdbaOverridableVariableTuple.cs
@@ -3,45 +3,45 @@
 namespace WixToolset.Bal
 {
     using WixToolset.Data;
-    using WixToolset.Bal.Tuples;
+    using WixToolset.Bal.Symbols;
 
-    public static partial class BalTupleDefinitions
+    public static partial class BalSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition WixStdbaOverridableVariable = new IntermediateTupleDefinition(
-            BalTupleDefinitionType.WixStdbaOverridableVariable.ToString(),
+        public static readonly IntermediateSymbolDefinition WixStdbaOverridableVariable = new IntermediateSymbolDefinition(
+            BalSymbolDefinitionType.WixStdbaOverridableVariable.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixStdbaOverridableVariableTupleFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixStdbaOverridableVariableSymbolFields.Name), IntermediateFieldType.String),
             },
-            typeof(WixStdbaOverridableVariableTuple));
+            typeof(WixStdbaOverridableVariableSymbol));
     }
 }
 
-namespace WixToolset.Bal.Tuples
+namespace WixToolset.Bal.Symbols
 {
     using WixToolset.Data;
 
-    public enum WixStdbaOverridableVariableTupleFields
+    public enum WixStdbaOverridableVariableSymbolFields
     {
         Name,
     }
 
-    public class WixStdbaOverridableVariableTuple : IntermediateTuple
+    public class WixStdbaOverridableVariableSymbol : IntermediateSymbol
     {
-        public WixStdbaOverridableVariableTuple() : base(BalTupleDefinitions.WixStdbaOverridableVariable, null, null)
+        public WixStdbaOverridableVariableSymbol() : base(BalSymbolDefinitions.WixStdbaOverridableVariable, null, null)
         {
         }
 
-        public WixStdbaOverridableVariableTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixStdbaOverridableVariable, sourceLineNumber, id)
+        public WixStdbaOverridableVariableSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixStdbaOverridableVariable, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[WixStdbaOverridableVariableTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[WixStdbaOverridableVariableSymbolFields index] => this.Fields[(int)index];
 
         public string Name
         {
-            get => this.Fields[(int)WixStdbaOverridableVariableTupleFields.Name].AsString();
-            set => this.Set((int)WixStdbaOverridableVariableTupleFields.Name, value);
+            get => this.Fields[(int)WixStdbaOverridableVariableSymbolFields.Name].AsString();
+            set => this.Set((int)WixStdbaOverridableVariableSymbolFields.Name, value);
         }
     }
 }
\ No newline at end of file