25 files changed, 671 insertions, 671 deletions

diff --git a/src/WixToolset.Core.Burn/Bind/BaseSearchFacade.cs b/src/WixToolset.Core.Burn/Bind/BaseSearchFacade.cs
index d00c5778..0da78797 100644
--- a/src/WixToolset.Core.Burn/Bind/BaseSearchFacade.cs
+++ b/src/WixToolset.Core.Burn/Bind/BaseSearchFacade.cs
@@ -4,23 +4,23 @@ namespace WixToolset.Core.Burn
 {
     using System;
     using System.Xml;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
 
     internal abstract class BaseSearchFacade : ISearchFacade
     {
-        protected WixSearchTuple SearchTuple { get; set; }
+        protected WixSearchSymbol SearchSymbol { get; set; }
 
         public virtual void WriteXml(XmlTextWriter writer)
         {
-            writer.WriteAttributeString("Id", this.SearchTuple.Id.Id);
-            writer.WriteAttributeString("Variable", this.SearchTuple.Variable);
-            if (!String.IsNullOrEmpty(this.SearchTuple.Condition))
+            writer.WriteAttributeString("Id", this.SearchSymbol.Id.Id);
+            writer.WriteAttributeString("Variable", this.SearchSymbol.Variable);
+            if (!String.IsNullOrEmpty(this.SearchSymbol.Condition))
             {
-                writer.WriteAttributeString("Condition", this.SearchTuple.Condition);
+                writer.WriteAttributeString("Condition", this.SearchSymbol.Condition);
             }
-            if (!String.IsNullOrEmpty(this.SearchTuple.BundleExtensionRef))
+            if (!String.IsNullOrEmpty(this.SearchSymbol.BundleExtensionRef))
             {
-                writer.WriteAttributeString("ExtensionId", this.SearchTuple.BundleExtensionRef);
+                writer.WriteAttributeString("ExtensionId", this.SearchSymbol.BundleExtensionRef);
             }
         }
     }
diff --git a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
index 943625ec..a64bdcc1 100644
--- a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
+++ b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
@@ -13,7 +13,7 @@ namespace WixToolset.Core.Burn
     using WixToolset.Core.Burn.Bundles;
     using WixToolset.Data;
     using WixToolset.Data.Burn;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
     using WixToolset.Extensibility;
     using WixToolset.Extensibility.Data;
     using WixToolset.Extensibility.Services;
@@ -88,28 +88,28 @@ namespace WixToolset.Core.Burn
             // We shouldn't really get past the linker phase if there are
             // no group items... that means that there's no UX, no Chain,
             // *and* no Containers!
-            var chainPackageTuples = this.GetRequiredTuples<WixBundlePackageTuple>();
+            var chainPackageSymbols = this.GetRequiredSymbols<WixBundlePackageSymbol>();
 
-            var wixGroupTuples = this.GetRequiredTuples<WixGroupTuple>();
+            var wixGroupSymbols = this.GetRequiredSymbols<WixGroupSymbol>();
 
             // Ensure there is one and only one row in the WixBundle table.
             // The compiler and linker behavior should have colluded to get
             // this behavior.
-            var bundleTuple = this.GetSingleTuple<WixBundleTuple>();
+            var bundleSymbol = this.GetSingleSymbol<WixBundleSymbol>();
 
-            bundleTuple.ProviderKey = bundleTuple.BundleId = Guid.NewGuid().ToString("B").ToUpperInvariant();
+            bundleSymbol.ProviderKey = bundleSymbol.BundleId = Guid.NewGuid().ToString("B").ToUpperInvariant();
 
-            bundleTuple.Attributes |= WixBundleAttributes.PerMachine; // default to per-machine but the first-per user package wil flip the bundle per-user.
+            bundleSymbol.Attributes |= WixBundleAttributes.PerMachine; // default to per-machine but the first-per user package wil flip the bundle per-user.
 
             // Ensure there is one and only one row in the WixBootstrapperApplication table.
             // The compiler and linker behavior should have colluded to get
             // this behavior.
-            var bundleApplicationTuple = this.GetSingleTuple<WixBootstrapperApplicationTuple>();
+            var bundleApplicationSymbol = this.GetSingleSymbol<WixBootstrapperApplicationSymbol>();
 
             // Ensure there is one and only one row in the WixChain table.
             // The compiler and linker behavior should have colluded to get
             // this behavior.
-            var chainTuple = this.GetSingleTuple<WixChainTuple>();
+            var chainSymbol = this.GetSingleSymbol<WixChainSymbol>();
 
             if (this.Messaging.EncounteredError)
             {
@@ -122,7 +122,7 @@ namespace WixToolset.Core.Burn
             var orderSearchesCommand = new OrderSearchesCommand(this.Messaging, section);
             orderSearchesCommand.Execute();
             var orderedSearches = orderSearchesCommand.OrderedSearchFacades;
-            var extensionSearchTuplesById = orderSearchesCommand.ExtensionSearchTuplesByExtensionId;
+            var extensionSearchSymbolsById = orderSearchesCommand.ExtensionSearchSymbolsByExtensionId;
 
             // Extract files that come from binary .wixlibs and WixExtensions (this does not extract files from merge modules).
             {
@@ -133,29 +133,29 @@ namespace WixToolset.Core.Burn
             }
 
             // Get the explicit payloads.
-            var payloadTuples = section.Tuples.OfType<WixBundlePayloadTuple>().ToDictionary(t => t.Id.Id);
+            var payloadSymbols = section.Symbols.OfType<WixBundlePayloadSymbol>().ToDictionary(t => t.Id.Id);
 
             // Update explicitly authored payloads with their parent package and container (as appropriate)
             // to make it easier to gather the payloads later.
-            foreach (var groupTuple in wixGroupTuples)
+            foreach (var groupSymbol in wixGroupSymbols)
             {
-                if (ComplexReferenceChildType.Payload == groupTuple.ChildType)
+                if (ComplexReferenceChildType.Payload == groupSymbol.ChildType)
                 {
-                    var payloadTuple = payloadTuples[groupTuple.ChildId];
+                    var payloadSymbol = payloadSymbols[groupSymbol.ChildId];
 
-                    if (ComplexReferenceParentType.Package == groupTuple.ParentType)
+                    if (ComplexReferenceParentType.Package == groupSymbol.ParentType)
                     {
-                        Debug.Assert(String.IsNullOrEmpty(payloadTuple.PackageRef));
-                        payloadTuple.PackageRef = groupTuple.ParentId;
+                        Debug.Assert(String.IsNullOrEmpty(payloadSymbol.PackageRef));
+                        payloadSymbol.PackageRef = groupSymbol.ParentId;
                     }
-                    else if (ComplexReferenceParentType.Container == groupTuple.ParentType)
+                    else if (ComplexReferenceParentType.Container == groupSymbol.ParentType)
                     {
-                        Debug.Assert(String.IsNullOrEmpty(payloadTuple.ContainerRef));
-                        payloadTuple.ContainerRef = groupTuple.ParentId;
+                        Debug.Assert(String.IsNullOrEmpty(payloadSymbol.ContainerRef));
+                        payloadSymbol.ContainerRef = groupSymbol.ParentId;
                     }
-                    else if (ComplexReferenceParentType.Layout == groupTuple.ParentType)
+                    else if (ComplexReferenceParentType.Layout == groupSymbol.ParentType)
                     {
-                        payloadTuple.LayoutOnly = true;
+                        payloadSymbol.LayoutOnly = true;
                     }
                 }
             }
@@ -165,44 +165,44 @@ namespace WixToolset.Core.Burn
             // Process the explicitly authored payloads.
             ISet<string> processedPayloads;
             {
-                var command = new ProcessPayloadsCommand(this.ServiceProvider, this.BackendHelper, payloadTuples.Values, bundleTuple.DefaultPackagingType, layoutDirectory);
+                var command = new ProcessPayloadsCommand(this.ServiceProvider, this.BackendHelper, payloadSymbols.Values, bundleSymbol.DefaultPackagingType, layoutDirectory);
                 command.Execute();
 
                 fileTransfers.AddRange(command.FileTransfers);
                 trackedFiles.AddRange(command.TrackedFiles);
 
-                processedPayloads = new HashSet<string>(payloadTuples.Keys);
+                processedPayloads = new HashSet<string>(payloadSymbols.Keys);
             }
 
             IDictionary<string, PackageFacade> facades;
             {
-                var command = new GetPackageFacadesCommand(chainPackageTuples, section);
+                var command = new GetPackageFacadesCommand(chainPackageSymbols, section);
                 command.Execute();
 
                 facades = command.PackageFacades;
             }
 
-            // Process each package facade. Note this is likely to add payloads and other tuples so
+            // Process each package facade. Note this is likely to add payloads and other symbols so
             // note that any indexes created above may be out of date now.
             foreach (var facade in facades.Values)
             {
-                switch (facade.PackageTuple.Type)
+                switch (facade.PackageSymbol.Type)
                 {
                 case WixBundlePackageType.Exe:
                 {
-                    var command = new ProcessExePackageCommand(facade, payloadTuples);
+                    var command = new ProcessExePackageCommand(facade, payloadSymbols);
                     command.Execute();
                 }
                 break;
 
                 case WixBundlePackageType.Msi:
                 {
-                    var command = new ProcessMsiPackageCommand(this.ServiceProvider, this.BackendExtensions, section, facade, payloadTuples);
+                    var command = new ProcessMsiPackageCommand(this.ServiceProvider, this.BackendExtensions, section, facade, payloadSymbols);
                     command.Execute();
 
                     if (null != variableCache)
                     {
-                        var msiPackage = (WixBundleMsiPackageTuple)facade.SpecificPackageTuple;
+                        var msiPackage = (WixBundleMsiPackageSymbol)facade.SpecificPackageSymbol;
                         variableCache.Add(String.Concat("packageLanguage.", facade.PackageId), msiPackage.ProductLanguage.ToString());
 
                         if (null != msiPackage.Manufacturer)
@@ -215,14 +215,14 @@ namespace WixToolset.Core.Burn
 
                 case WixBundlePackageType.Msp:
                 {
-                    var command = new ProcessMspPackageCommand(this.Messaging, section, facade, payloadTuples);
+                    var command = new ProcessMspPackageCommand(this.Messaging, section, facade, payloadSymbols);
                     command.Execute();
                 }
                 break;
 
                 case WixBundlePackageType.Msu:
                 {
-                    var command = new ProcessMsuPackageCommand(facade, payloadTuples);
+                    var command = new ProcessMsuPackageCommand(facade, payloadSymbols);
                     command.Execute();
                 }
                 break;
@@ -230,7 +230,7 @@ namespace WixToolset.Core.Burn
 
                 if (null != variableCache)
                 {
-                    BindBundleCommand.PopulatePackageVariableCache(facade.PackageTuple, variableCache);
+                    BindBundleCommand.PopulatePackageVariableCache(facade.PackageSymbol, variableCache);
                 }
             }
 
@@ -241,13 +241,13 @@ namespace WixToolset.Core.Burn
 
             // Reindex the payloads now that all the payloads (minus the manifest payloads that will be created later)
             // are present.
-            payloadTuples = section.Tuples.OfType<WixBundlePayloadTuple>().ToDictionary(t => t.Id.Id);
+            payloadSymbols = section.Symbols.OfType<WixBundlePayloadSymbol>().ToDictionary(t => t.Id.Id);
 
             // Process the payloads that were added by processing the packages.
             {
-                var toProcess = payloadTuples.Values.Where(r => !processedPayloads.Contains(r.Id.Id)).ToList();
+                var toProcess = payloadSymbols.Values.Where(r => !processedPayloads.Contains(r.Id.Id)).ToList();
 
-                var command = new ProcessPayloadsCommand(this.ServiceProvider, this.BackendHelper, toProcess, bundleTuple.DefaultPackagingType, layoutDirectory);
+                var command = new ProcessPayloadsCommand(this.ServiceProvider, this.BackendHelper, toProcess, bundleSymbol.DefaultPackagingType, layoutDirectory);
                 command.Execute();
 
                 fileTransfers.AddRange(command.FileTransfers);
@@ -258,34 +258,34 @@ namespace WixToolset.Core.Burn
 
             // Set the package metadata from the payloads now that we have the complete payload information.
             {
-                var payloadsByPackageId = payloadTuples.Values.ToLookup(p => p.PackageRef);
+                var payloadsByPackageId = payloadSymbols.Values.ToLookup(p => p.PackageRef);
 
                 foreach (var facade in facades.Values)
                 {
-                    facade.PackageTuple.Size = 0;
+                    facade.PackageSymbol.Size = 0;
 
                     var packagePayloads = payloadsByPackageId[facade.PackageId];
 
                     foreach (var payload in packagePayloads)
                     {
-                        facade.PackageTuple.Size += payload.FileSize.Value;
+                        facade.PackageSymbol.Size += payload.FileSize.Value;
                     }
 
-                    if (!facade.PackageTuple.InstallSize.HasValue)
+                    if (!facade.PackageSymbol.InstallSize.HasValue)
                     {
-                        facade.PackageTuple.InstallSize = facade.PackageTuple.Size;
+                        facade.PackageSymbol.InstallSize = facade.PackageSymbol.Size;
                     }
 
-                    var packagePayload = payloadTuples[facade.PackageTuple.PayloadRef];
+                    var packagePayload = payloadSymbols[facade.PackageSymbol.PayloadRef];
 
-                    if (String.IsNullOrEmpty(facade.PackageTuple.Description))
+                    if (String.IsNullOrEmpty(facade.PackageSymbol.Description))
                     {
-                        facade.PackageTuple.Description = packagePayload.Description;
+                        facade.PackageSymbol.Description = packagePayload.Description;
                     }
 
-                    if (String.IsNullOrEmpty(facade.PackageTuple.DisplayName))
+                    if (String.IsNullOrEmpty(facade.PackageSymbol.DisplayName))
                     {
-                        facade.PackageTuple.DisplayName = packagePayload.DisplayName;
+                        facade.PackageSymbol.DisplayName = packagePayload.DisplayName;
                     }
                 }
             }
@@ -293,7 +293,7 @@ namespace WixToolset.Core.Burn
             // Give the UX payloads their embedded IDs...
             var uxPayloadIndex = 0;
             {
-                foreach (var payload in payloadTuples.Values.Where(p => BurnConstants.BurnUXContainerName == p.ContainerRef))
+                foreach (var payload in payloadSymbols.Values.Where(p => BurnConstants.BurnUXContainerName == p.ContainerRef))
                 {
                     // In theory, UX payloads could be embedded in the UX CAB, external to the bundle EXE, or even
                     // downloaded. The current engine requires the UX to be fully present before any downloading starts,
@@ -317,7 +317,7 @@ namespace WixToolset.Core.Burn
 
                 // Give the embedded payloads without an embedded id yet an embedded id.
                 var payloadIndex = 0;
-                foreach (var payload in payloadTuples.Values)
+                foreach (var payload in payloadSymbols.Values)
                 {
                     Debug.Assert(PackagingType.Unknown != payload.Packaging);
 
@@ -341,11 +341,11 @@ namespace WixToolset.Core.Burn
             }
 
             // If catalog files exist, non-embedded payloads should validate with the catalogs.
-            var catalogs = section.Tuples.OfType<WixBundleCatalogTuple>().ToList();
+            var catalogs = section.Symbols.OfType<WixBundleCatalogSymbol>().ToList();
 
             if (catalogs.Count > 0)
             {
-                var command = new VerifyPayloadsWithCatalogCommand(this.Messaging, catalogs, payloadTuples.Values);
+                var command = new VerifyPayloadsWithCatalogCommand(this.Messaging, catalogs, payloadSymbols.Values);
                 command.Execute();
             }
 
@@ -355,12 +355,12 @@ namespace WixToolset.Core.Burn
             }
 
             IEnumerable<PackageFacade> orderedFacades;
-            IEnumerable<WixBundleRollbackBoundaryTuple> boundaries;
+            IEnumerable<WixBundleRollbackBoundarySymbol> boundaries;
             {
-                var groupTuples = section.Tuples.OfType<WixGroupTuple>();
-                var boundaryTuplesById = section.Tuples.OfType<WixBundleRollbackBoundaryTuple>().ToDictionary(b => b.Id.Id);
+                var groupSymbols = section.Symbols.OfType<WixGroupSymbol>();
+                var boundarySymbolsById = section.Symbols.OfType<WixBundleRollbackBoundarySymbol>().ToDictionary(b => b.Id.Id);
 
-                var command = new OrderPackagesAndRollbackBoundariesCommand(this.Messaging, groupTuples, boundaryTuplesById, facades);
+                var command = new OrderPackagesAndRollbackBoundariesCommand(this.Messaging, groupSymbols, boundarySymbolsById, facades);
                 command.Execute();
 
                 orderedFacades = command.OrderedPackageFacades;
@@ -374,24 +374,24 @@ namespace WixToolset.Core.Burn
                 resolveDelayedFieldsCommand.Execute();
             }
 
-            Dictionary<string, ProvidesDependencyTuple> dependencyTuplesByKey;
+            Dictionary<string, ProvidesDependencySymbol> dependencySymbolsByKey;
             {
                 var command = new ProcessDependencyProvidersCommand(this.Messaging, section, facades);
                 command.Execute();
 
                 if (!String.IsNullOrEmpty(command.BundleProviderKey))
                 {
-                    bundleTuple.ProviderKey = command.BundleProviderKey; // set the overridable bundle provider key.
+                    bundleSymbol.ProviderKey = command.BundleProviderKey; // set the overridable bundle provider key.
                 }
-                dependencyTuplesByKey = command.DependencyTuplesByKey;
+                dependencySymbolsByKey = command.DependencySymbolsByKey;
             }
 
             // Update the bundle per-machine/per-user scope based on the chained packages.
-            this.ResolveBundleInstallScope(section, bundleTuple, orderedFacades);
+            this.ResolveBundleInstallScope(section, bundleSymbol, orderedFacades);
 
             // Generate data for all manifests.
             {
-                var command = new GenerateManifestDataFromIRCommand(this.Messaging, section, this.BackendExtensions, this.InternalBurnBackendHelper, extensionSearchTuplesById);
+                var command = new GenerateManifestDataFromIRCommand(this.Messaging, section, this.BackendExtensions, this.InternalBurnBackendHelper, extensionSearchSymbolsById);
                 command.Execute();
             }
 
@@ -409,12 +409,12 @@ namespace WixToolset.Core.Burn
             // Generate the core-defined BA manifest tables...
             string baManifestPath;
             {
-                var command = new CreateBootstrapperApplicationManifestCommand(section, bundleTuple, orderedFacades, uxPayloadIndex, payloadTuples, this.IntermediateFolder, this.InternalBurnBackendHelper);
+                var command = new CreateBootstrapperApplicationManifestCommand(section, bundleSymbol, orderedFacades, uxPayloadIndex, payloadSymbols, this.IntermediateFolder, this.InternalBurnBackendHelper);
                 command.Execute();
 
                 var baManifestPayload = command.BootstrapperApplicationManifestPayloadRow;
                 baManifestPath = command.OutputPath;
-                payloadTuples.Add(baManifestPayload.Id.Id, baManifestPayload);
+                payloadSymbols.Add(baManifestPayload.Id.Id, baManifestPayload);
                 ++uxPayloadIndex;
 
                 trackedFiles.Add(this.BackendHelper.TrackFile(baManifestPath, TrackedFileType.Temporary));
@@ -423,12 +423,12 @@ namespace WixToolset.Core.Burn
             // Generate the bundle extension manifest...
             string bextManifestPath;
             {
-                var command = new CreateBundleExtensionManifestCommand(section, bundleTuple, uxPayloadIndex, this.IntermediateFolder, this.InternalBurnBackendHelper);
+                var command = new CreateBundleExtensionManifestCommand(section, bundleSymbol, uxPayloadIndex, this.IntermediateFolder, this.InternalBurnBackendHelper);
                 command.Execute();
 
                 var bextManifestPayload = command.BundleExtensionManifestPayloadRow;
                 bextManifestPath = command.OutputPath;
-                payloadTuples.Add(bextManifestPayload.Id.Id, bextManifestPayload);
+                payloadSymbols.Add(bextManifestPayload.Id.Id, bextManifestPayload);
                 ++uxPayloadIndex;
 
                 trackedFiles.Add(this.BackendHelper.TrackFile(bextManifestPath, TrackedFileType.Temporary));
@@ -436,11 +436,11 @@ namespace WixToolset.Core.Burn
 
             // Create all the containers except the UX container first so the manifest (that goes in the UX container)
             // can contain all size and hash information about the non-UX containers.
-            WixBundleContainerTuple uxContainer;
-            IEnumerable<WixBundlePayloadTuple> uxPayloads;
-            IEnumerable<WixBundleContainerTuple> containers;
+            WixBundleContainerSymbol uxContainer;
+            IEnumerable<WixBundlePayloadSymbol> uxPayloads;
+            IEnumerable<WixBundleContainerSymbol> containers;
             {
-                var command = new CreateNonUXContainers(this.BackendHelper, section, bundleApplicationTuple, payloadTuples, this.IntermediateFolder, layoutDirectory, this.DefaultCompressionLevel);
+                var command = new CreateNonUXContainers(this.BackendHelper, section, bundleApplicationSymbol, payloadSymbols, this.IntermediateFolder, layoutDirectory, this.DefaultCompressionLevel);
                 command.Execute();
 
                 fileTransfers.AddRange(command.FileTransfers);
@@ -450,13 +450,13 @@ namespace WixToolset.Core.Burn
                 uxPayloads = command.UXContainerPayloads;
                 containers = command.Containers;
             }
-            
+
             // Create the bundle manifest.
             string manifestPath;
             {
                 var executableName = Path.GetFileName(this.OutputPath);
 
-                var command = new CreateBurnManifestCommand(this.Messaging, this.BackendExtensions, executableName, section, bundleTuple, containers, chainTuple, orderedFacades, boundaries, uxPayloads, payloadTuples, orderedSearches, catalogs, this.IntermediateFolder);
+                var command = new CreateBurnManifestCommand(this.Messaging, this.BackendExtensions, executableName, section, bundleSymbol, containers, chainSymbol, orderedFacades, boundaries, uxPayloads, payloadSymbols, orderedSearches, catalogs, this.IntermediateFolder);
                 command.Execute();
 
                 manifestPath = command.OutputPath;
@@ -475,7 +475,7 @@ namespace WixToolset.Core.Burn
             }
 
             {
-                var command = new CreateBundleExeCommand(this.Messaging, this.BackendHelper, this.IntermediateFolder, this.OutputPath, bundleTuple, uxContainer, containers);
+                var command = new CreateBundleExeCommand(this.Messaging, this.BackendHelper, this.IntermediateFolder, this.OutputPath, bundleSymbol, uxContainer, containers);
                 command.Execute();
 
                 fileTransfers.Add(command.Transfer);
@@ -483,7 +483,7 @@ namespace WixToolset.Core.Burn
             }
 
 #if TODO // does this need to come back, or do they only need to be in TrackedFiles?
-            this.ContentFilePaths = payloadTuples.Values.Where(p => p.ContentFile).Select(p => p.FullFileName).ToList();
+            this.ContentFilePaths = payloadSymbols.Values.Where(p => p.ContentFile).Select(p => p.FullFileName).ToList();
 #endif
             this.FileTransfers = fileTransfers;
             this.TrackedFiles = trackedFiles;
@@ -522,7 +522,7 @@ namespace WixToolset.Core.Burn
         /// </summary>
         /// <param name="package">The package with properties to cache.</param>
         /// <param name="variableCache">The property cache.</param>
-        private static void PopulatePackageVariableCache(WixBundlePackageTuple package, IDictionary<string, string> variableCache)
+        private static void PopulatePackageVariableCache(WixBundlePackageSymbol package, IDictionary<string, string> variableCache)
         {
             var id = package.Id.Id;
 
@@ -533,17 +533,17 @@ namespace WixToolset.Core.Burn
             variableCache.Add(String.Concat("packageVersion.", id), package.Version);
         }
 
-        private void ResolveBundleInstallScope(IntermediateSection section, WixBundleTuple bundleTuple, IEnumerable<PackageFacade> facades)
+        private void ResolveBundleInstallScope(IntermediateSection section, WixBundleSymbol bundleSymbol, IEnumerable<PackageFacade> facades)
         {
-            var dependencyTuplesById = section.Tuples.OfType<ProvidesDependencyTuple>().ToDictionary(t => t.Id.Id);
+            var dependencySymbolsById = section.Symbols.OfType<ProvidesDependencySymbol>().ToDictionary(t => t.Id.Id);
 
             foreach (var facade in facades)
             {
-                if (bundleTuple.PerMachine && YesNoDefaultType.No == facade.PackageTuple.PerMachine)
+                if (bundleSymbol.PerMachine && YesNoDefaultType.No == facade.PackageSymbol.PerMachine)
                 {
-                    this.Messaging.Write(VerboseMessages.SwitchingToPerUserPackage(facade.PackageTuple.SourceLineNumbers, facade.PackageId));
+                    this.Messaging.Write(VerboseMessages.SwitchingToPerUserPackage(facade.PackageSymbol.SourceLineNumbers, facade.PackageId));
 
-                    bundleTuple.Attributes &= ~WixBundleAttributes.PerMachine;
+                    bundleSymbol.Attributes &= ~WixBundleAttributes.PerMachine;
                     break;
                 }
             }
@@ -551,45 +551,45 @@ namespace WixToolset.Core.Burn
             foreach (var facade in facades)
             {
                 // Update package scope from bundle scope if default.
-                if (YesNoDefaultType.Default == facade.PackageTuple.PerMachine)
+                if (YesNoDefaultType.Default == facade.PackageSymbol.PerMachine)
                 {
-                    facade.PackageTuple.PerMachine = bundleTuple.PerMachine ? YesNoDefaultType.Yes : YesNoDefaultType.No;
+                    facade.PackageSymbol.PerMachine = bundleSymbol.PerMachine ? YesNoDefaultType.Yes : YesNoDefaultType.No;
                 }
 
                 // We will only register packages in the same scope as the bundle. Warn if any packages with providers
                 // are in a different scope and not permanent (permanents typically don't need a ref-count).
-                if (!bundleTuple.PerMachine &&
-                    YesNoDefaultType.Yes == facade.PackageTuple.PerMachine &&
-                    !facade.PackageTuple.Permanent &&
-                    dependencyTuplesById.ContainsKey(facade.PackageId))
+                if (!bundleSymbol.PerMachine &&
+                    YesNoDefaultType.Yes == facade.PackageSymbol.PerMachine &&
+                    !facade.PackageSymbol.Permanent &&
+                    dependencySymbolsById.ContainsKey(facade.PackageId))
                 {
-                    this.Messaging.Write(WarningMessages.NoPerMachineDependencies(facade.PackageTuple.SourceLineNumbers, facade.PackageId));
+                    this.Messaging.Write(WarningMessages.NoPerMachineDependencies(facade.PackageSymbol.SourceLineNumbers, facade.PackageId));
                 }
             }
         }
 
-        private IEnumerable<T> GetRequiredTuples<T>() where T : IntermediateTuple
+        private IEnumerable<T> GetRequiredSymbols<T>() where T : IntermediateSymbol
         {
-            var tuples = this.Output.Sections.Single().Tuples.OfType<T>().ToList();
+            var symbols = this.Output.Sections.Single().Symbols.OfType<T>().ToList();
 
-            if (0 == tuples.Count)
+            if (0 == symbols.Count)
             {
                 throw new WixException(ErrorMessages.MissingBundleInformation(nameof(T)));
             }
 
-            return tuples;
+            return symbols;
         }
 
-        private T GetSingleTuple<T>() where T : IntermediateTuple
+        private T GetSingleSymbol<T>() where T : IntermediateSymbol
         {
-            var tuples = this.Output.Sections.Single().Tuples.OfType<T>().ToList();
+            var symbols = this.Output.Sections.Single().Symbols.OfType<T>().ToList();
 
-            if (1 != tuples.Count)
+            if (1 != symbols.Count)
             {
                 throw new WixException(ErrorMessages.MissingBundleInformation(nameof(T)));
             }
 
-            return tuples[0];
+            return symbols[0];
         }
     }
 }
diff --git a/src/WixToolset.Core.Burn/Bind/ExtensionSearchFacade.cs b/src/WixToolset.Core.Burn/Bind/ExtensionSearchFacade.cs
index 6a830a28..773250d7 100644
--- a/src/WixToolset.Core.Burn/Bind/ExtensionSearchFacade.cs
+++ b/src/WixToolset.Core.Burn/Bind/ExtensionSearchFacade.cs
@@ -3,13 +3,13 @@
 namespace WixToolset.Core.Burn
 {
     using System.Xml;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
 
     internal class ExtensionSearchFacade : BaseSearchFacade
     {
-        public ExtensionSearchFacade(WixSearchTuple searchTuple)
+        public ExtensionSearchFacade(WixSearchSymbol searchSymbol)
         {
-            this.SearchTuple = searchTuple;
+            this.SearchSymbol = searchSymbol;
         }
 
         public override void WriteXml(XmlTextWriter writer)
diff --git a/src/WixToolset.Core.Burn/Bind/GenerateManifestDataFromIRCommand.cs b/src/WixToolset.Core.Burn/Bind/GenerateManifestDataFromIRCommand.cs
index c20abadb..29768dff 100644
--- a/src/WixToolset.Core.Burn/Bind/GenerateManifestDataFromIRCommand.cs
+++ b/src/WixToolset.Core.Burn/Bind/GenerateManifestDataFromIRCommand.cs
@@ -10,26 +10,26 @@ namespace WixToolset.Core.Burn.Bind
     using WixToolset.Core.Burn.Bundles;
     using WixToolset.Core.Burn.ExtensibilityServices;
     using WixToolset.Data;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
     using WixToolset.Extensibility;
     using WixToolset.Extensibility.Services;
 
     internal class GenerateManifestDataFromIRCommand
     {
-        public GenerateManifestDataFromIRCommand(IMessaging messaging, IntermediateSection section, IEnumerable<IBurnBackendExtension> backendExtensions, IBurnBackendHelper backendHelper, IDictionary<string, IList<IntermediateTuple>> extensionSearchTuplesById)
+        public GenerateManifestDataFromIRCommand(IMessaging messaging, IntermediateSection section, IEnumerable<IBurnBackendExtension> backendExtensions, IBurnBackendHelper backendHelper, IDictionary<string, IList<IntermediateSymbol>> extensionSearchSymbolsById)
         {
             this.Messaging = messaging;
             this.Section = section;
             this.BackendExtensions = backendExtensions;
             this.BackendHelper = backendHelper;
-            this.ExtensionSearchTuplesById = extensionSearchTuplesById;
+            this.ExtensionSearchSymbolsById = extensionSearchSymbolsById;
         }
 
         private IEnumerable<IBurnBackendExtension> BackendExtensions { get; }
 
         private IBurnBackendHelper BackendHelper { get; }
 
-        private IDictionary<string, IList<IntermediateTuple>> ExtensionSearchTuplesById { get; }
+        private IDictionary<string, IList<IntermediateSymbol>> ExtensionSearchSymbolsById { get; }
 
         private IMessaging Messaging { get; }
 
@@ -37,108 +37,108 @@ namespace WixToolset.Core.Burn.Bind
 
         public void Execute()
         {
-            var tuples = this.Section.Tuples.ToList();
-            var cellsByCustomDataAndElementId = new Dictionary<string, List<WixBundleCustomDataCellTuple>>();
-            var customDataById = new Dictionary<string, WixBundleCustomDataTuple>();
+            var symbols = this.Section.Symbols.ToList();
+            var cellsByCustomDataAndElementId = new Dictionary<string, List<WixBundleCustomDataCellSymbol>>();
+            var customDataById = new Dictionary<string, WixBundleCustomDataSymbol>();
 
-            foreach (var kvp in this.ExtensionSearchTuplesById)
+            foreach (var kvp in this.ExtensionSearchSymbolsById)
             {
                 var extensionId = kvp.Key;
-                var extensionSearchTuples = kvp.Value;
-                foreach (var extensionSearchTuple in extensionSearchTuples)
+                var extensionSearchSymbols = kvp.Value;
+                foreach (var extensionSearchSymbol in extensionSearchSymbols)
                 {
-                    this.BackendHelper.AddBundleExtensionData(extensionId, extensionSearchTuple, tupleIdIsIdAttribute: true);
-                    tuples.Remove(extensionSearchTuple);
+                    this.BackendHelper.AddBundleExtensionData(extensionId, extensionSearchSymbol, symbolIdIsIdAttribute: true);
+                    symbols.Remove(extensionSearchSymbol);
                 }
             }
 
-            foreach (var tuple in tuples)
+            foreach (var symbol in symbols)
             {
-                var unknownTuple = false;
-                switch (tuple.Definition.Type)
+                var unknownSymbol = false;
+                switch (symbol.Definition.Type)
                 {
-                    // Tuples used internally and are not added to a data manifest.
-                    case TupleDefinitionType.ProvidesDependency:
-                    case TupleDefinitionType.WixApprovedExeForElevation:
-                    case TupleDefinitionType.WixBootstrapperApplication:
-                    case TupleDefinitionType.WixBundle:
-                    case TupleDefinitionType.WixBundleCatalog:
-                    case TupleDefinitionType.WixBundleContainer:
-                    case TupleDefinitionType.WixBundleCustomDataAttribute:
-                    case TupleDefinitionType.WixBundleExePackage:
-                    case TupleDefinitionType.WixBundleExtension:
-                    case TupleDefinitionType.WixBundleMsiFeature:
-                    case TupleDefinitionType.WixBundleMsiPackage:
-                    case TupleDefinitionType.WixBundleMsiProperty:
-                    case TupleDefinitionType.WixBundleMspPackage:
-                    case TupleDefinitionType.WixBundleMsuPackage:
-                    case TupleDefinitionType.WixBundlePackage:
-                    case TupleDefinitionType.WixBundlePackageCommandLine:
-                    case TupleDefinitionType.WixBundlePackageExitCode:
-                    case TupleDefinitionType.WixBundlePackageGroup:
-                    case TupleDefinitionType.WixBundlePatchTargetCode:
-                    case TupleDefinitionType.WixBundlePayload:
-                    case TupleDefinitionType.WixBundlePayloadGroup:
-                    case TupleDefinitionType.WixBundleRelatedPackage:
-                    case TupleDefinitionType.WixBundleRollbackBoundary:
-                    case TupleDefinitionType.WixBundleSlipstreamMsp:
-                    case TupleDefinitionType.WixBundleUpdate:
-                    case TupleDefinitionType.WixBundleVariable:
-                    case TupleDefinitionType.WixBuildInfo:
-                    case TupleDefinitionType.WixChain:
-                    case TupleDefinitionType.WixComponentSearch:
-                    case TupleDefinitionType.WixDependencyProvider:
-                    case TupleDefinitionType.WixFileSearch:
-                    case TupleDefinitionType.WixGroup:
-                    case TupleDefinitionType.WixProductSearch:
-                    case TupleDefinitionType.WixRegistrySearch:
-                    case TupleDefinitionType.WixRelatedBundle:
-                    case TupleDefinitionType.WixSearch:
-                    case TupleDefinitionType.WixSearchRelation:
-                    case TupleDefinitionType.WixSetVariable:
-                    case TupleDefinitionType.WixUpdateRegistration:
+                    // Symbols used internally and are not added to a data manifest.
+                    case SymbolDefinitionType.ProvidesDependency:
+                    case SymbolDefinitionType.WixApprovedExeForElevation:
+                    case SymbolDefinitionType.WixBootstrapperApplication:
+                    case SymbolDefinitionType.WixBundle:
+                    case SymbolDefinitionType.WixBundleCatalog:
+                    case SymbolDefinitionType.WixBundleContainer:
+                    case SymbolDefinitionType.WixBundleCustomDataAttribute:
+                    case SymbolDefinitionType.WixBundleExePackage:
+                    case SymbolDefinitionType.WixBundleExtension:
+                    case SymbolDefinitionType.WixBundleMsiFeature:
+                    case SymbolDefinitionType.WixBundleMsiPackage:
+                    case SymbolDefinitionType.WixBundleMsiProperty:
+                    case SymbolDefinitionType.WixBundleMspPackage:
+                    case SymbolDefinitionType.WixBundleMsuPackage:
+                    case SymbolDefinitionType.WixBundlePackage:
+                    case SymbolDefinitionType.WixBundlePackageCommandLine:
+                    case SymbolDefinitionType.WixBundlePackageExitCode:
+                    case SymbolDefinitionType.WixBundlePackageGroup:
+                    case SymbolDefinitionType.WixBundlePatchTargetCode:
+                    case SymbolDefinitionType.WixBundlePayload:
+                    case SymbolDefinitionType.WixBundlePayloadGroup:
+                    case SymbolDefinitionType.WixBundleRelatedPackage:
+                    case SymbolDefinitionType.WixBundleRollbackBoundary:
+                    case SymbolDefinitionType.WixBundleSlipstreamMsp:
+                    case SymbolDefinitionType.WixBundleUpdate:
+                    case SymbolDefinitionType.WixBundleVariable:
+                    case SymbolDefinitionType.WixBuildInfo:
+                    case SymbolDefinitionType.WixChain:
+                    case SymbolDefinitionType.WixComponentSearch:
+                    case SymbolDefinitionType.WixDependencyProvider:
+                    case SymbolDefinitionType.WixFileSearch:
+                    case SymbolDefinitionType.WixGroup:
+                    case SymbolDefinitionType.WixProductSearch:
+                    case SymbolDefinitionType.WixRegistrySearch:
+                    case SymbolDefinitionType.WixRelatedBundle:
+                    case SymbolDefinitionType.WixSearch:
+                    case SymbolDefinitionType.WixSearchRelation:
+                    case SymbolDefinitionType.WixSetVariable:
+                    case SymbolDefinitionType.WixUpdateRegistration:
                         break;
 
-                    // Tuples used before binding.
-                    case TupleDefinitionType.WixComplexReference:
-                    case TupleDefinitionType.WixOrdering:
-                    case TupleDefinitionType.WixSimpleReference:
-                    case TupleDefinitionType.WixVariable:
+                    // Symbols used before binding.
+                    case SymbolDefinitionType.WixComplexReference:
+                    case SymbolDefinitionType.WixOrdering:
+                    case SymbolDefinitionType.WixSimpleReference:
+                    case SymbolDefinitionType.WixVariable:
                         break;
 
-                    // Tuples to investigate:
-                    case TupleDefinitionType.WixChainItem:
+                    // Symbols to investigate:
+                    case SymbolDefinitionType.WixChainItem:
                         break;
 
-                    case TupleDefinitionType.WixBundleCustomData:
-                        unknownTuple = !this.IndexBundleCustomDataTuple((WixBundleCustomDataTuple)tuple, customDataById);
+                    case SymbolDefinitionType.WixBundleCustomData:
+                        unknownSymbol = !this.IndexBundleCustomDataSymbol((WixBundleCustomDataSymbol)symbol, customDataById);
                         break;
 
-                    case TupleDefinitionType.WixBundleCustomDataCell:
-                        this.IndexBundleCustomDataCellTuple((WixBundleCustomDataCellTuple)tuple, cellsByCustomDataAndElementId);
+                    case SymbolDefinitionType.WixBundleCustomDataCell:
+                        this.IndexBundleCustomDataCellSymbol((WixBundleCustomDataCellSymbol)symbol, cellsByCustomDataAndElementId);
                         break;
 
-                    case TupleDefinitionType.MustBeFromAnExtension:
-                        unknownTuple = !this.AddTupleFromExtension(tuple);
+                    case SymbolDefinitionType.MustBeFromAnExtension:
+                        unknownSymbol = !this.AddSymbolFromExtension(symbol);
                         break;
 
                     default:
-                        unknownTuple = true;
+                        unknownSymbol = true;
                         break;
                 }
 
-                if (unknownTuple)
+                if (unknownSymbol)
                 {
-                    this.Messaging.Write(WarningMessages.TupleNotTranslatedToOutput(tuple));
+                    this.Messaging.Write(WarningMessages.SymbolNotTranslatedToOutput(symbol));
                 }
             }
 
-            this.AddIndexedCellTuples(customDataById, cellsByCustomDataAndElementId);
+            this.AddIndexedCellSymbols(customDataById, cellsByCustomDataAndElementId);
         }
 
-        private bool IndexBundleCustomDataTuple(WixBundleCustomDataTuple wixBundleCustomDataTuple, Dictionary<string, WixBundleCustomDataTuple> customDataById)
+        private bool IndexBundleCustomDataSymbol(WixBundleCustomDataSymbol wixBundleCustomDataSymbol, Dictionary<string, WixBundleCustomDataSymbol> customDataById)
         {
-            switch (wixBundleCustomDataTuple.Type)
+            switch (wixBundleCustomDataSymbol.Type)
             {
                 case WixBundleCustomDataType.BootstrapperApplication:
                 case WixBundleCustomDataType.BundleExtension:
@@ -147,38 +147,38 @@ namespace WixToolset.Core.Burn.Bind
                     return false;
             }
 
-            var customDataId = wixBundleCustomDataTuple.Id.Id;
-            customDataById.Add(customDataId, wixBundleCustomDataTuple);
+            var customDataId = wixBundleCustomDataSymbol.Id.Id;
+            customDataById.Add(customDataId, wixBundleCustomDataSymbol);
             return true;
         }
 
-        private void IndexBundleCustomDataCellTuple(WixBundleCustomDataCellTuple wixBundleCustomDataCellTuple, Dictionary<string, List<WixBundleCustomDataCellTuple>> cellsByCustomDataAndElementId)
+        private void IndexBundleCustomDataCellSymbol(WixBundleCustomDataCellSymbol wixBundleCustomDataCellSymbol, Dictionary<string, List<WixBundleCustomDataCellSymbol>> cellsByCustomDataAndElementId)
         {
-            var tableAndRowId = wixBundleCustomDataCellTuple.CustomDataRef + "/" + wixBundleCustomDataCellTuple.ElementId;
+            var tableAndRowId = wixBundleCustomDataCellSymbol.CustomDataRef + "/" + wixBundleCustomDataCellSymbol.ElementId;
             if (!cellsByCustomDataAndElementId.TryGetValue(tableAndRowId, out var cells))
             {
-                cells = new List<WixBundleCustomDataCellTuple>();
+                cells = new List<WixBundleCustomDataCellSymbol>();
                 cellsByCustomDataAndElementId.Add(tableAndRowId, cells);
             }
 
-            cells.Add(wixBundleCustomDataCellTuple);
+            cells.Add(wixBundleCustomDataCellSymbol);
         }
 
-        private void AddIndexedCellTuples(Dictionary<string, WixBundleCustomDataTuple> customDataById, Dictionary<string, List<WixBundleCustomDataCellTuple>> cellsByCustomDataAndElementId)
+        private void AddIndexedCellSymbols(Dictionary<string, WixBundleCustomDataSymbol> customDataById, Dictionary<string, List<WixBundleCustomDataCellSymbol>> cellsByCustomDataAndElementId)
         {
             foreach (var elementValues in cellsByCustomDataAndElementId.Values)
             {
                 var elementName = elementValues[0].CustomDataRef;
-                var customDataTuple = customDataById[elementName];
+                var customDataSymbol = customDataById[elementName];
 
-                var attributeNames = customDataTuple.AttributeNamesSeparated;
+                var attributeNames = customDataSymbol.AttributeNamesSeparated;
 
                 var elementValuesByAttribute = elementValues.ToDictionary(t => t.AttributeRef, t => t.Value);
 
                 var sb = new StringBuilder();
                 using (var writer = XmlWriter.Create(sb, BurnBackendHelper.WriterSettings))
                 {
-                    switch (customDataTuple.Type)
+                    switch (customDataSymbol.Type)
                     {
                         case WixBundleCustomDataType.BootstrapperApplication:
                             writer.WriteStartElement(elementName, BurnCommon.BADataNamespace);
@@ -202,13 +202,13 @@ namespace WixToolset.Core.Burn.Bind
                     writer.WriteEndElement();
                 }
 
-                switch (customDataTuple.Type)
+                switch (customDataSymbol.Type)
                 {
                     case WixBundleCustomDataType.BootstrapperApplication:
                         this.BackendHelper.AddBootstrapperApplicationData(sb.ToString());
                         break;
                     case WixBundleCustomDataType.BundleExtension:
-                        this.BackendHelper.AddBundleExtensionData(customDataTuple.BundleExtensionRef, sb.ToString());
+                        this.BackendHelper.AddBundleExtensionData(customDataSymbol.BundleExtensionRef, sb.ToString());
                         break;
                     default:
                         throw new NotImplementedException();
@@ -216,11 +216,11 @@ namespace WixToolset.Core.Burn.Bind
             }
         }
 
-        private bool AddTupleFromExtension(IntermediateTuple tuple)
+        private bool AddSymbolFromExtension(IntermediateSymbol symbol)
         {
             foreach (var extension in this.BackendExtensions)
             {
-                if (extension.TryAddTupleToDataManifest(this.Section, tuple))
+                if (extension.TryAddSymbolToDataManifest(this.Section, symbol))
                 {
                     return true;
                 }
diff --git a/src/WixToolset.Core.Burn/Bind/LegacySearchFacade.cs b/src/WixToolset.Core.Burn/Bind/LegacySearchFacade.cs
index 0a80760d..24d6f542 100644
--- a/src/WixToolset.Core.Burn/Bind/LegacySearchFacade.cs
+++ b/src/WixToolset.Core.Burn/Bind/LegacySearchFacade.cs
@@ -5,17 +5,17 @@ namespace WixToolset.Core.Burn
     using System;
     using System.Xml;
     using WixToolset.Data;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
 
     internal class LegacySearchFacade : BaseSearchFacade
     {
-        public LegacySearchFacade(WixSearchTuple searchTuple, IntermediateTuple searchSpecificTuple)
+        public LegacySearchFacade(WixSearchSymbol searchSymbol, IntermediateSymbol searchSpecificSymbol)
         {
-            this.SearchTuple = searchTuple;
-            this.SearchSpecificTuple = searchSpecificTuple;
+            this.SearchSymbol = searchSymbol;
+            this.SearchSpecificSymbol = searchSpecificSymbol;
         }
 
-        public IntermediateTuple SearchSpecificTuple { get; }
+        public IntermediateSymbol SearchSpecificSymbol { get; }
 
         /// <summary>
         /// Generates Burn manifest and ParameterInfo-style markup a search.
@@ -23,45 +23,45 @@ namespace WixToolset.Core.Burn
         /// <param name="writer"></param>
         public override void WriteXml(XmlTextWriter writer)
         {
-            switch (this.SearchSpecificTuple)
+            switch (this.SearchSpecificSymbol)
             {
-                case WixComponentSearchTuple tuple:
-                    this.WriteComponentSearchXml(writer, tuple);
+                case WixComponentSearchSymbol symbol:
+                    this.WriteComponentSearchXml(writer, symbol);
                     break;
-                case WixFileSearchTuple tuple:
-                    this.WriteFileSearchXml(writer, tuple);
+                case WixFileSearchSymbol symbol:
+                    this.WriteFileSearchXml(writer, symbol);
                     break;
-                case WixProductSearchTuple tuple:
-                    this.WriteProductSearchXml(writer, tuple);
+                case WixProductSearchSymbol symbol:
+                    this.WriteProductSearchXml(writer, symbol);
                     break;
-                case WixRegistrySearchTuple tuple:
-                    this.WriteRegistrySearchXml(writer, tuple);
+                case WixRegistrySearchSymbol symbol:
+                    this.WriteRegistrySearchXml(writer, symbol);
                     break;
             }
         }
 
-        private void WriteComponentSearchXml(XmlTextWriter writer, WixComponentSearchTuple searchTuple)
+        private void WriteComponentSearchXml(XmlTextWriter writer, WixComponentSearchSymbol searchSymbol)
         {
             writer.WriteStartElement("MsiComponentSearch");
 
             base.WriteXml(writer);
 
-            writer.WriteAttributeString("ComponentId", searchTuple.Guid);
+            writer.WriteAttributeString("ComponentId", searchSymbol.Guid);
 
-            if (!String.IsNullOrEmpty(searchTuple.ProductCode))
+            if (!String.IsNullOrEmpty(searchSymbol.ProductCode))
             {
-                writer.WriteAttributeString("ProductCode", searchTuple.ProductCode);
+                writer.WriteAttributeString("ProductCode", searchSymbol.ProductCode);
             }
 
-            if (0 != (searchTuple.Attributes & WixComponentSearchAttributes.KeyPath))
+            if (0 != (searchSymbol.Attributes & WixComponentSearchAttributes.KeyPath))
             {
                 writer.WriteAttributeString("Type", "keyPath");
             }
-            else if (0 != (searchTuple.Attributes & WixComponentSearchAttributes.State))
+            else if (0 != (searchSymbol.Attributes & WixComponentSearchAttributes.State))
             {
                 writer.WriteAttributeString("Type", "state");
             }
-            else if (0 != (searchTuple.Attributes & WixComponentSearchAttributes.WantDirectory))
+            else if (0 != (searchSymbol.Attributes & WixComponentSearchAttributes.WantDirectory))
             {
                 writer.WriteAttributeString("Type", "directory");
             }
@@ -69,18 +69,18 @@ namespace WixToolset.Core.Burn
             writer.WriteEndElement();
         }
 
-        private void WriteFileSearchXml(XmlTextWriter writer, WixFileSearchTuple searchTuple)
+        private void WriteFileSearchXml(XmlTextWriter writer, WixFileSearchSymbol searchSymbol)
         {
-            writer.WriteStartElement((0 == (searchTuple.Attributes & WixFileSearchAttributes.IsDirectory)) ? "FileSearch" : "DirectorySearch");
+            writer.WriteStartElement((0 == (searchSymbol.Attributes & WixFileSearchAttributes.IsDirectory)) ? "FileSearch" : "DirectorySearch");
 
             base.WriteXml(writer);
 
-            writer.WriteAttributeString("Path", searchTuple.Path);
-            if (WixFileSearchAttributes.WantExists == (searchTuple.Attributes & WixFileSearchAttributes.WantExists))
+            writer.WriteAttributeString("Path", searchSymbol.Path);
+            if (WixFileSearchAttributes.WantExists == (searchSymbol.Attributes & WixFileSearchAttributes.WantExists))
             {
                 writer.WriteAttributeString("Type", "exists");
             }
-            else if (WixFileSearchAttributes.WantVersion == (searchTuple.Attributes & WixFileSearchAttributes.WantVersion))
+            else if (WixFileSearchAttributes.WantVersion == (searchSymbol.Attributes & WixFileSearchAttributes.WantVersion))
             {
                 // Can never get here for DirectorySearch.
                 writer.WriteAttributeString("Type", "version");
@@ -92,34 +92,34 @@ namespace WixToolset.Core.Burn
             writer.WriteEndElement();
         }
 
-        private void WriteProductSearchXml(XmlTextWriter writer, WixProductSearchTuple tuple)
+        private void WriteProductSearchXml(XmlTextWriter writer, WixProductSearchSymbol symbol)
         {
             writer.WriteStartElement("MsiProductSearch");
 
             base.WriteXml(writer);
 
-            if (0 != (tuple.Attributes & WixProductSearchAttributes.UpgradeCode))
+            if (0 != (symbol.Attributes & WixProductSearchAttributes.UpgradeCode))
             {
-                writer.WriteAttributeString("UpgradeCode", tuple.Guid);
+                writer.WriteAttributeString("UpgradeCode", symbol.Guid);
             }
             else
             {
-                writer.WriteAttributeString("ProductCode", tuple.Guid);
+                writer.WriteAttributeString("ProductCode", symbol.Guid);
             }
 
-            if (0 != (tuple.Attributes & WixProductSearchAttributes.Version))
+            if (0 != (symbol.Attributes & WixProductSearchAttributes.Version))
             {
                 writer.WriteAttributeString("Type", "version");
             }
-            else if (0 != (tuple.Attributes & WixProductSearchAttributes.Language))
+            else if (0 != (symbol.Attributes & WixProductSearchAttributes.Language))
             {
                 writer.WriteAttributeString("Type", "language");
             }
-            else if (0 != (tuple.Attributes & WixProductSearchAttributes.State))
+            else if (0 != (symbol.Attributes & WixProductSearchAttributes.State))
             {
                 writer.WriteAttributeString("Type", "state");
             }
-            else if (0 != (tuple.Attributes & WixProductSearchAttributes.Assignment))
+            else if (0 != (symbol.Attributes & WixProductSearchAttributes.Assignment))
             {
                 writer.WriteAttributeString("Type", "assignment");
             }
@@ -127,13 +127,13 @@ namespace WixToolset.Core.Burn
             writer.WriteEndElement();
         }
 
-        private void WriteRegistrySearchXml(XmlTextWriter writer, WixRegistrySearchTuple tuple)
+        private void WriteRegistrySearchXml(XmlTextWriter writer, WixRegistrySearchSymbol symbol)
         {
             writer.WriteStartElement("RegistrySearch");
 
             base.WriteXml(writer);
 
-            switch (tuple.Root)
+            switch (symbol.Root)
             {
                 case RegistryRootType.ClassesRoot:
                     writer.WriteAttributeString("Root", "HKCR");
@@ -149,25 +149,25 @@ namespace WixToolset.Core.Burn
                     break;
             }
 
-            writer.WriteAttributeString("Key", tuple.Key);
+            writer.WriteAttributeString("Key", symbol.Key);
 
-            if (!String.IsNullOrEmpty(tuple.Value))
+            if (!String.IsNullOrEmpty(symbol.Value))
             {
-                writer.WriteAttributeString("Value", tuple.Value);
+                writer.WriteAttributeString("Value", symbol.Value);
             }
 
-            var existenceOnly = 0 != (tuple.Attributes & WixRegistrySearchAttributes.WantExists);
+            var existenceOnly = 0 != (symbol.Attributes & WixRegistrySearchAttributes.WantExists);
 
             writer.WriteAttributeString("Type", existenceOnly ? "exists" : "value");
 
-            if (0 != (tuple.Attributes & WixRegistrySearchAttributes.Win64))
+            if (0 != (symbol.Attributes & WixRegistrySearchAttributes.Win64))
             {
                 writer.WriteAttributeString("Win64", "yes");
             }
 
             if (!existenceOnly)
             {
-                if (0 != (tuple.Attributes & WixRegistrySearchAttributes.ExpandEnvironmentVariables))
+                if (0 != (symbol.Attributes & WixRegistrySearchAttributes.ExpandEnvironmentVariables))
                 {
                     writer.WriteAttributeString("ExpandEnvironment", "yes");
                 }
diff --git a/src/WixToolset.Core.Burn/Bind/ProcessDependencyProvidersCommand.cs b/src/WixToolset.Core.Burn/Bind/ProcessDependencyProvidersCommand.cs
index e228b296..29815203 100644
--- a/src/WixToolset.Core.Burn/Bind/ProcessDependencyProvidersCommand.cs
+++ b/src/WixToolset.Core.Burn/Bind/ProcessDependencyProvidersCommand.cs
@@ -8,7 +8,7 @@ namespace WixToolset.Core.Burn.Bind
     using WixToolset.Data;
     using WixToolset.Core.Burn.Bundles;
     using WixToolset.Extensibility.Services;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
 
     internal class ProcessDependencyProvidersCommand
     {
@@ -22,7 +22,7 @@ namespace WixToolset.Core.Burn.Bind
 
         public string BundleProviderKey { get; private set; }
 
-        public Dictionary<string, ProvidesDependencyTuple> DependencyTuplesByKey { get; private set; }
+        public Dictionary<string, ProvidesDependencySymbol> DependencySymbolsByKey { get; private set; }
 
         private IMessaging Messaging { get; }
 
@@ -38,42 +38,42 @@ namespace WixToolset.Core.Burn.Bind
         /// </summary>
         public void Execute()
         {
-            var wixDependencyProviderTuples = this.Section.Tuples.OfType<WixDependencyProviderTuple>();
+            var wixDependencyProviderSymbols = this.Section.Symbols.OfType<WixDependencyProviderSymbol>();
 
-            foreach (var wixDependencyProviderTuple in wixDependencyProviderTuples)
+            foreach (var wixDependencyProviderSymbol in wixDependencyProviderSymbols)
             {
                 // Sets the provider key for the bundle, if it is not set already.
                 if (String.IsNullOrEmpty(this.BundleProviderKey))
                 {
-                    if (wixDependencyProviderTuple.Bundle)
+                    if (wixDependencyProviderSymbol.Bundle)
                     {
-                        this.BundleProviderKey = wixDependencyProviderTuple.ProviderKey;
+                        this.BundleProviderKey = wixDependencyProviderSymbol.ProviderKey;
                     }
                 }
 
                 // Import any authored dependencies. These may merge with imported provides from MSI packages.
-                var packageId = wixDependencyProviderTuple.Id.Id;
+                var packageId = wixDependencyProviderSymbol.Id.Id;
 
                 if (this.Facades.TryGetValue(packageId, out var facade))
                 {
-                    var dependency = this.Section.AddTuple(new ProvidesDependencyTuple(wixDependencyProviderTuple.SourceLineNumbers, wixDependencyProviderTuple.Id)
+                    var dependency = this.Section.AddSymbol(new ProvidesDependencySymbol(wixDependencyProviderSymbol.SourceLineNumbers, wixDependencyProviderSymbol.Id)
                     {
                         PackageRef = packageId,
-                        Key = wixDependencyProviderTuple.ProviderKey,
-                        Version = wixDependencyProviderTuple.Version,
-                        DisplayName = wixDependencyProviderTuple.DisplayName,
-                        Attributes = (int)wixDependencyProviderTuple.Attributes
+                        Key = wixDependencyProviderSymbol.ProviderKey,
+                        Version = wixDependencyProviderSymbol.Version,
+                        DisplayName = wixDependencyProviderSymbol.DisplayName,
+                        Attributes = (int)wixDependencyProviderSymbol.Attributes
                     });
 
                     if (String.IsNullOrEmpty(dependency.Key))
                     {
-                        switch (facade.SpecificPackageTuple)
+                        switch (facade.SpecificPackageSymbol)
                         {
                             // The WixDependencyExtension allows an empty Key for MSIs and MSPs.
-                            case WixBundleMsiPackageTuple msiPackage:
+                            case WixBundleMsiPackageSymbol msiPackage:
                                 dependency.Key = msiPackage.ProductCode;
                                 break;
-                            case WixBundleMspPackageTuple mspPackage:
+                            case WixBundleMspPackageSymbol mspPackage:
                                 dependency.Key = mspPackage.PatchCode;
                                 break;
                         }
@@ -81,7 +81,7 @@ namespace WixToolset.Core.Burn.Bind
 
                     if (String.IsNullOrEmpty(dependency.Version))
                     {
-                        dependency.Version = facade.PackageTuple.Version;
+                        dependency.Version = facade.PackageSymbol.Version;
                     }
 
                     // If the version is still missing, a version could not be harvested from the package and was not authored.
@@ -92,55 +92,55 @@ namespace WixToolset.Core.Burn.Bind
 
                     if (String.IsNullOrEmpty(dependency.DisplayName))
                     {
-                        dependency.DisplayName = facade.PackageTuple.DisplayName;
+                        dependency.DisplayName = facade.PackageSymbol.DisplayName;
                     }
                 }
             }
 
-            this.DependencyTuplesByKey = this.GetDependencyTuplesByKey();
+            this.DependencySymbolsByKey = this.GetDependencySymbolsByKey();
 
             // Generate providers for MSI and MSP packages that still do not have providers.
             foreach (var facade in this.Facades.Values)
             {
                 string key = null;
 
-                //if (WixBundlePackageType.Msi == facade.PackageTuple.Type)
-                if (facade.SpecificPackageTuple is WixBundleMsiPackageTuple msiPackage)
+                //if (WixBundlePackageType.Msi == facade.PackageSymbol.Type)
+                if (facade.SpecificPackageSymbol is WixBundleMsiPackageSymbol msiPackage)
                 {
-                    //var msiPackage = (WixBundleMsiPackageTuple)facade.SpecificPackageTuple;
+                    //var msiPackage = (WixBundleMsiPackageSymbol)facade.SpecificPackageSymbol;
                     key = msiPackage.ProductCode;
                 }
-                //else if (WixBundlePackageType.Msp == facade.PackageTuple.Type)
-                else if (facade.SpecificPackageTuple is WixBundleMspPackageTuple mspPackage)
+                //else if (WixBundlePackageType.Msp == facade.PackageSymbol.Type)
+                else if (facade.SpecificPackageSymbol is WixBundleMspPackageSymbol mspPackage)
                 {
-                    //var mspPackage = (WixBundleMspPackageTuple)facade.SpecificPackageTuple;
+                    //var mspPackage = (WixBundleMspPackageSymbol)facade.SpecificPackageSymbol;
                     key = mspPackage.PatchCode;
                 }
 
-                if (!String.IsNullOrEmpty(key) && !this.DependencyTuplesByKey.ContainsKey(key))
+                if (!String.IsNullOrEmpty(key) && !this.DependencySymbolsByKey.ContainsKey(key))
                 {
-                    var dependency = this.Section.AddTuple(new ProvidesDependencyTuple(facade.PackageTuple.SourceLineNumbers, facade.PackageTuple.Id)
+                    var dependency = this.Section.AddSymbol(new ProvidesDependencySymbol(facade.PackageSymbol.SourceLineNumbers, facade.PackageSymbol.Id)
                     {
                         PackageRef = facade.PackageId,
                         Key = key,
-                        Version = facade.PackageTuple.Version,
-                        DisplayName = facade.PackageTuple.DisplayName
+                        Version = facade.PackageSymbol.Version,
+                        DisplayName = facade.PackageSymbol.DisplayName
                     });
 
-                    this.DependencyTuplesByKey.Add(dependency.Key, dependency);
+                    this.DependencySymbolsByKey.Add(dependency.Key, dependency);
                 }
             }
         }
 
-        private Dictionary<string, ProvidesDependencyTuple> GetDependencyTuplesByKey()
+        private Dictionary<string, ProvidesDependencySymbol> GetDependencySymbolsByKey()
         {
-            var dependencyTuplesByKey = new Dictionary<string, ProvidesDependencyTuple>();
+            var dependencySymbolsByKey = new Dictionary<string, ProvidesDependencySymbol>();
 
-            var dependencyTuples = this.Section.Tuples.OfType<ProvidesDependencyTuple>();
+            var dependencySymbols = this.Section.Symbols.OfType<ProvidesDependencySymbol>();
 
-            foreach (var dependency in dependencyTuples)
+            foreach (var dependency in dependencySymbols)
             {
-                if (dependencyTuplesByKey.TryGetValue(dependency.Key, out var collision))
+                if (dependencySymbolsByKey.TryGetValue(dependency.Key, out var collision))
                 {
                     // If not a perfect dependency collision, display an error.
                     if (dependency.Key != collision.Key ||
@@ -152,11 +152,11 @@ namespace WixToolset.Core.Burn.Bind
                 }
                 else
                 {
-                    dependencyTuplesByKey.Add(dependency.Key, dependency);
+                    dependencySymbolsByKey.Add(dependency.Key, dependency);
                 }
             }
 
-            return dependencyTuplesByKey;
+            return dependencySymbolsByKey;
         }
     }
 }
diff --git a/src/WixToolset.Core.Burn/Bind/SetVariableSearchFacade.cs b/src/WixToolset.Core.Burn/Bind/SetVariableSearchFacade.cs
index 0fe60422..fb6f72dd 100644
--- a/src/WixToolset.Core.Burn/Bind/SetVariableSearchFacade.cs
+++ b/src/WixToolset.Core.Burn/Bind/SetVariableSearchFacade.cs
@@ -3,17 +3,17 @@
 namespace WixToolset.Core.Burn
 {
     using System.Xml;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
 
     internal class SetVariableSearchFacade : BaseSearchFacade
     {
-        public SetVariableSearchFacade(WixSearchTuple searchTuple, WixSetVariableTuple setVariableTuple)
+        public SetVariableSearchFacade(WixSearchSymbol searchSymbol, WixSetVariableSymbol setVariableSymbol)
         {
-            this.SearchTuple = searchTuple;
-            this.SetVariableTuple = setVariableTuple;
+            this.SearchSymbol = searchSymbol;
+            this.SetVariableSymbol = setVariableSymbol;
         }
 
-        private WixSetVariableTuple SetVariableTuple { get; }
+        private WixSetVariableSymbol SetVariableSymbol { get; }
 
         public override void WriteXml(XmlTextWriter writer)
         {
@@ -21,10 +21,10 @@ namespace WixToolset.Core.Burn
 
             base.WriteXml(writer);
 
-            if (this.SetVariableTuple.Type != null)
+            if (this.SetVariableSymbol.Type != null)
             {
-                writer.WriteAttributeString("Value", this.SetVariableTuple.Value);
-                writer.WriteAttributeString("Type", this.SetVariableTuple.Type);
+                writer.WriteAttributeString("Value", this.SetVariableSymbol.Value);
+                writer.WriteAttributeString("Type", this.SetVariableSymbol.Type);
             }
 
             writer.WriteEndElement();
diff --git a/src/WixToolset.Core.Burn/Bundles/AutomaticallySlipstreamPatchesCommand.cs b/src/WixToolset.Core.Burn/Bundles/AutomaticallySlipstreamPatchesCommand.cs
index 6e08c68e..30edf7de 100644
--- a/src/WixToolset.Core.Burn/Bundles/AutomaticallySlipstreamPatchesCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/AutomaticallySlipstreamPatchesCommand.cs
@@ -7,7 +7,7 @@ namespace WixToolset.Core.Burn.Bundles
     using System.Diagnostics;
     using System.Linq;
     using WixToolset.Data;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
 
     internal class AutomaticallySlipstreamPatchesCommand
     {
@@ -23,42 +23,42 @@ namespace WixToolset.Core.Burn.Bundles
 
         public void Execute()
         {
-            var msiPackages = new List<WixBundleMsiPackageTuple>();
-            var targetsProductCode = new Dictionary<string, List<WixBundlePatchTargetCodeTuple>>();
-            var targetsUpgradeCode = new Dictionary<string, List<WixBundlePatchTargetCodeTuple>>();
+            var msiPackages = new List<WixBundleMsiPackageSymbol>();
+            var targetsProductCode = new Dictionary<string, List<WixBundlePatchTargetCodeSymbol>>();
+            var targetsUpgradeCode = new Dictionary<string, List<WixBundlePatchTargetCodeSymbol>>();
 
             foreach (var facade in this.PackageFacades)
             {
                 // Keep track of all MSI packages.
-                if (facade.SpecificPackageTuple is WixBundleMsiPackageTuple msiPackage)
+                if (facade.SpecificPackageSymbol is WixBundleMsiPackageSymbol msiPackage)
                 {
                     msiPackages.Add(msiPackage);
                 }
-                else if (facade.SpecificPackageTuple is WixBundleMspPackageTuple mspPackage && mspPackage.Slipstream)
+                else if (facade.SpecificPackageSymbol is WixBundleMspPackageSymbol mspPackage && mspPackage.Slipstream)
                 {
-                    var patchTargetCodeTuples = this.Section.Tuples
-                        .OfType<WixBundlePatchTargetCodeTuple>()
+                    var patchTargetCodeSymbols = this.Section.Symbols
+                        .OfType<WixBundlePatchTargetCodeSymbol>()
                         .Where(r => r.PackageRef == facade.PackageId);
 
                     // Index target ProductCodes and UpgradeCodes for slipstreamed MSPs.
-                    foreach (var tuple in patchTargetCodeTuples)
+                    foreach (var symbol in patchTargetCodeSymbols)
                     {
-                        if (tuple.TargetsProductCode)
+                        if (symbol.TargetsProductCode)
                         {
-                            if (!targetsProductCode.TryGetValue(tuple.TargetCode, out var tuples))
+                            if (!targetsProductCode.TryGetValue(symbol.TargetCode, out var symbols))
                             {
-                                tuples = new List<WixBundlePatchTargetCodeTuple>();
-                                targetsProductCode.Add(tuple.TargetCode, tuples);
+                                symbols = new List<WixBundlePatchTargetCodeSymbol>();
+                                targetsProductCode.Add(symbol.TargetCode, symbols);
                             }
 
-                            tuples.Add(tuple);
+                            symbols.Add(symbol);
                         }
-                        else if (tuple.TargetsUpgradeCode)
+                        else if (symbol.TargetsUpgradeCode)
                         {
-                            if (!targetsUpgradeCode.TryGetValue(tuple.TargetCode, out var tuples))
+                            if (!targetsUpgradeCode.TryGetValue(symbol.TargetCode, out var symbols))
                             {
-                                tuples = new List<WixBundlePatchTargetCodeTuple>();
-                                targetsUpgradeCode.Add(tuple.TargetCode, tuples);
+                                symbols = new List<WixBundlePatchTargetCodeSymbol>();
+                                targetsUpgradeCode.Add(symbol.TargetCode, symbols);
                             }
                         }
                     }
@@ -70,39 +70,39 @@ namespace WixToolset.Core.Burn.Bundles
             // Loop through the MSI and slipstream patches targeting it.
             foreach (var msi in msiPackages)
             {
-                if (targetsProductCode.TryGetValue(msi.ProductCode, out var tuples))
+                if (targetsProductCode.TryGetValue(msi.ProductCode, out var symbols))
                 {
-                    foreach (var tuple in tuples)
+                    foreach (var symbol in symbols)
                     {
-                        Debug.Assert(tuple.TargetsProductCode);
-                        Debug.Assert(!tuple.TargetsUpgradeCode);
+                        Debug.Assert(symbol.TargetsProductCode);
+                        Debug.Assert(!symbol.TargetsUpgradeCode);
 
-                        this.TryAddSlipstreamTuple(slipstreamMspIds, msi, tuple);
+                        this.TryAddSlipstreamSymbol(slipstreamMspIds, msi, symbol);
                     }
                 }
 
-                if (!String.IsNullOrEmpty(msi.UpgradeCode) && targetsUpgradeCode.TryGetValue(msi.UpgradeCode, out tuples))
+                if (!String.IsNullOrEmpty(msi.UpgradeCode) && targetsUpgradeCode.TryGetValue(msi.UpgradeCode, out symbols))
                 {
-                    foreach (var tuple in tuples)
+                    foreach (var symbol in symbols)
                     {
-                        Debug.Assert(!tuple.TargetsProductCode);
-                        Debug.Assert(tuple.TargetsUpgradeCode);
+                        Debug.Assert(!symbol.TargetsProductCode);
+                        Debug.Assert(symbol.TargetsUpgradeCode);
 
-                        this.TryAddSlipstreamTuple(slipstreamMspIds, msi, tuple);
+                        this.TryAddSlipstreamSymbol(slipstreamMspIds, msi, symbol);
                     }
 
-                    tuples = null;
+                    symbols = null;
                 }
             }
         }
 
-        private bool TryAddSlipstreamTuple(HashSet<string> slipstreamMspIds, WixBundleMsiPackageTuple msiPackage, WixBundlePatchTargetCodeTuple patchTargetCode)
+        private bool TryAddSlipstreamSymbol(HashSet<string> slipstreamMspIds, WixBundleMsiPackageSymbol msiPackage, WixBundlePatchTargetCodeSymbol patchTargetCode)
         {
             var id = new Identifier(AccessModifier.Private, msiPackage.Id.Id, patchTargetCode.PackageRef);
 
             if (slipstreamMspIds.Add(id.Id))
             {
-                this.Section.AddTuple(new WixBundleSlipstreamMspTuple(patchTargetCode.SourceLineNumbers)
+                this.Section.AddSymbol(new WixBundleSlipstreamMspSymbol(patchTargetCode.SourceLineNumbers)
                 {
                     TargetPackageRef = msiPackage.Id.Id,
                     MspPackageRef = patchTargetCode.PackageRef,
diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs
index 4468fee5..b4648d18 100644
--- a/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs
@@ -11,24 +11,24 @@ namespace WixToolset.Core.Burn.Bundles
     using System.Xml;
     using WixToolset.Data;
     using WixToolset.Data.Burn;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
 
     internal class CreateBootstrapperApplicationManifestCommand
     {
-        public CreateBootstrapperApplicationManifestCommand(IntermediateSection section, WixBundleTuple bundleTuple, IEnumerable<PackageFacade> chainPackages, int lastUXPayloadIndex, Dictionary<string, WixBundlePayloadTuple> payloadTuples, string intermediateFolder, IInternalBurnBackendHelper internalBurnBackendHelper)
+        public CreateBootstrapperApplicationManifestCommand(IntermediateSection section, WixBundleSymbol bundleSymbol, IEnumerable<PackageFacade> chainPackages, int lastUXPayloadIndex, Dictionary<string, WixBundlePayloadSymbol> payloadSymbols, string intermediateFolder, IInternalBurnBackendHelper internalBurnBackendHelper)
         {
             this.Section = section;
-            this.BundleTuple = bundleTuple;
+            this.BundleSymbol = bundleSymbol;
             this.ChainPackages = chainPackages;
             this.LastUXPayloadIndex = lastUXPayloadIndex;
-            this.Payloads = payloadTuples;
+            this.Payloads = payloadSymbols;
             this.IntermediateFolder = intermediateFolder;
             this.InternalBurnBackendHelper = internalBurnBackendHelper;
         }
 
         private IntermediateSection Section { get; }
 
-        private WixBundleTuple BundleTuple { get; }
+        private WixBundleSymbol BundleSymbol { get; }
 
         private IEnumerable<PackageFacade> ChainPackages { get; }
 
@@ -36,11 +36,11 @@ namespace WixToolset.Core.Burn.Bundles
 
         private int LastUXPayloadIndex { get; }
 
-        private Dictionary<string, WixBundlePayloadTuple> Payloads { get; }
+        private Dictionary<string, WixBundlePayloadSymbol> Payloads { get; }
 
         private string IntermediateFolder { get; }
 
-        public WixBundlePayloadTuple BootstrapperApplicationManifestPayloadRow { get; private set; }
+        public WixBundlePayloadSymbol BootstrapperApplicationManifestPayloadRow { get; private set; }
 
         public string OutputPath { get; private set; }
 
@@ -84,12 +84,12 @@ namespace WixToolset.Core.Burn.Bundles
         {
             writer.WriteStartElement("WixBundleProperties");
 
-            writer.WriteAttributeString("DisplayName", this.BundleTuple.Name);
-            writer.WriteAttributeString("LogPathVariable", this.BundleTuple.LogPathVariable);
-            writer.WriteAttributeString("Compressed", this.BundleTuple.Compressed == true ? "yes" : "no");
-            writer.WriteAttributeString("Id", this.BundleTuple.BundleId.ToUpperInvariant());
-            writer.WriteAttributeString("UpgradeCode", this.BundleTuple.UpgradeCode);
-            writer.WriteAttributeString("PerMachine", this.BundleTuple.PerMachine ? "yes" : "no");
+            writer.WriteAttributeString("DisplayName", this.BundleSymbol.Name);
+            writer.WriteAttributeString("LogPathVariable", this.BundleSymbol.LogPathVariable);
+            writer.WriteAttributeString("Compressed", this.BundleSymbol.Compressed == true ? "yes" : "no");
+            writer.WriteAttributeString("Id", this.BundleSymbol.BundleId.ToUpperInvariant());
+            writer.WriteAttributeString("UpgradeCode", this.BundleSymbol.UpgradeCode);
+            writer.WriteAttributeString("PerMachine", this.BundleSymbol.PerMachine ? "yes" : "no");
 
             writer.WriteEndElement();
         }
@@ -98,35 +98,35 @@ namespace WixToolset.Core.Burn.Bundles
         {
             foreach (var package in this.ChainPackages)
             {
-                var packagePayload = this.Payloads[package.PackageTuple.PayloadRef];
+                var packagePayload = this.Payloads[package.PackageSymbol.PayloadRef];
 
-                var size = package.PackageTuple.Size.ToString(CultureInfo.InvariantCulture);
+                var size = package.PackageSymbol.Size.ToString(CultureInfo.InvariantCulture);
 
                 writer.WriteStartElement("WixPackageProperties");
 
                 writer.WriteAttributeString("Package", package.PackageId);
-                writer.WriteAttributeString("Vital", package.PackageTuple.Vital == true ? "yes" : "no");
+                writer.WriteAttributeString("Vital", package.PackageSymbol.Vital == true ? "yes" : "no");
 
-                if (!String.IsNullOrEmpty(package.PackageTuple.DisplayName))
+                if (!String.IsNullOrEmpty(package.PackageSymbol.DisplayName))
                 {
-                    writer.WriteAttributeString("DisplayName", package.PackageTuple.DisplayName);
+                    writer.WriteAttributeString("DisplayName", package.PackageSymbol.DisplayName);
                 }
 
-                if (!String.IsNullOrEmpty(package.PackageTuple.Description))
+                if (!String.IsNullOrEmpty(package.PackageSymbol.Description))
                 {
-                    writer.WriteAttributeString("Description", package.PackageTuple.Description);
+                    writer.WriteAttributeString("Description", package.PackageSymbol.Description);
                 }
 
                 writer.WriteAttributeString("DownloadSize", size);
                 writer.WriteAttributeString("PackageSize", size);
-                writer.WriteAttributeString("InstalledSize", package.PackageTuple.InstallSize?.ToString(CultureInfo.InvariantCulture) ?? size);
-                writer.WriteAttributeString("PackageType", package.PackageTuple.Type.ToString());
-                writer.WriteAttributeString("Permanent", package.PackageTuple.Permanent ? "yes" : "no");
-                writer.WriteAttributeString("LogPathVariable", package.PackageTuple.LogPathVariable);
-                writer.WriteAttributeString("RollbackLogPathVariable", package.PackageTuple.RollbackLogPathVariable);
+                writer.WriteAttributeString("InstalledSize", package.PackageSymbol.InstallSize?.ToString(CultureInfo.InvariantCulture) ?? size);
+                writer.WriteAttributeString("PackageType", package.PackageSymbol.Type.ToString());
+                writer.WriteAttributeString("Permanent", package.PackageSymbol.Permanent ? "yes" : "no");
+                writer.WriteAttributeString("LogPathVariable", package.PackageSymbol.LogPathVariable);
+                writer.WriteAttributeString("RollbackLogPathVariable", package.PackageSymbol.RollbackLogPathVariable);
                 writer.WriteAttributeString("Compressed", packagePayload.Compressed == true ? "yes" : "no");
 
-                if (package.SpecificPackageTuple is WixBundleMsiPackageTuple msiPackage)
+                if (package.SpecificPackageSymbol is WixBundleMsiPackageSymbol msiPackage)
                 {
                     if (!String.IsNullOrEmpty(msiPackage.ProductCode))
                     {
@@ -138,7 +138,7 @@ namespace WixToolset.Core.Burn.Bundles
                         writer.WriteAttributeString("UpgradeCode", msiPackage.UpgradeCode);
                     }
                 }
-                else if (package.SpecificPackageTuple is WixBundleMspPackageTuple mspPackage)
+                else if (package.SpecificPackageSymbol is WixBundleMspPackageSymbol mspPackage)
                 {
                     if (!String.IsNullOrEmpty(mspPackage.PatchCode))
                     {
@@ -146,17 +146,17 @@ namespace WixToolset.Core.Burn.Bundles
                     }
                 }
 
-                if (!String.IsNullOrEmpty(package.PackageTuple.Version))
+                if (!String.IsNullOrEmpty(package.PackageSymbol.Version))
                 {
-                    writer.WriteAttributeString("Version", package.PackageTuple.Version);
+                    writer.WriteAttributeString("Version", package.PackageSymbol.Version);
                 }
 
-                if (!String.IsNullOrEmpty(package.PackageTuple.InstallCondition))
+                if (!String.IsNullOrEmpty(package.PackageSymbol.InstallCondition))
                 {
-                    writer.WriteAttributeString("InstallCondition", package.PackageTuple.InstallCondition);
+                    writer.WriteAttributeString("InstallCondition", package.PackageSymbol.InstallCondition);
                 }
 
-                switch (package.PackageTuple.Cache)
+                switch (package.PackageSymbol.Cache)
                 {
                     case YesNoAlwaysType.No:
                         writer.WriteAttributeString("Cache", "no");
@@ -175,35 +175,35 @@ namespace WixToolset.Core.Burn.Bundles
 
         private void WriteFeatureInfo(XmlTextWriter writer)
         {
-            var featureTuples = this.Section.Tuples.OfType<WixBundleMsiFeatureTuple>();
+            var featureSymbols = this.Section.Symbols.OfType<WixBundleMsiFeatureSymbol>();
 
-            foreach (var featureTuple in featureTuples)
+            foreach (var featureSymbol in featureSymbols)
             {
                 writer.WriteStartElement("WixPackageFeatureInfo");
 
-                writer.WriteAttributeString("Package", featureTuple.PackageRef);
-                writer.WriteAttributeString("Feature", featureTuple.Name);
-                writer.WriteAttributeString("Size", featureTuple.Size.ToString(CultureInfo.InvariantCulture));
+                writer.WriteAttributeString("Package", featureSymbol.PackageRef);
+                writer.WriteAttributeString("Feature", featureSymbol.Name);
+                writer.WriteAttributeString("Size", featureSymbol.Size.ToString(CultureInfo.InvariantCulture));
 
-                if (!String.IsNullOrEmpty(featureTuple.Parent))
+                if (!String.IsNullOrEmpty(featureSymbol.Parent))
                 {
-                    writer.WriteAttributeString("Parent", featureTuple.Parent);
+                    writer.WriteAttributeString("Parent", featureSymbol.Parent);
                 }
 
-                if (!String.IsNullOrEmpty(featureTuple.Title))
+                if (!String.IsNullOrEmpty(featureSymbol.Title))
                 {
-                    writer.WriteAttributeString("Title", featureTuple.Title);
+                    writer.WriteAttributeString("Title", featureSymbol.Title);
                 }
 
-                if (!String.IsNullOrEmpty(featureTuple.Description))
+                if (!String.IsNullOrEmpty(featureSymbol.Description))
                 {
-                    writer.WriteAttributeString("Description", featureTuple.Description);
+                    writer.WriteAttributeString("Description", featureSymbol.Description);
                 }
 
-                writer.WriteAttributeString("Display", featureTuple.Display.ToString(CultureInfo.InvariantCulture));
-                writer.WriteAttributeString("Level", featureTuple.Level.ToString(CultureInfo.InvariantCulture));
-                writer.WriteAttributeString("Directory", featureTuple.Directory);
-                writer.WriteAttributeString("Attributes", featureTuple.Attributes.ToString(CultureInfo.InvariantCulture));
+                writer.WriteAttributeString("Display", featureSymbol.Display.ToString(CultureInfo.InvariantCulture));
+                writer.WriteAttributeString("Level", featureSymbol.Level.ToString(CultureInfo.InvariantCulture));
+                writer.WriteAttributeString("Directory", featureSymbol.Directory);
+                writer.WriteAttributeString("Attributes", featureSymbol.Attributes.ToString(CultureInfo.InvariantCulture));
 
                 writer.WriteEndElement();
             }
@@ -211,43 +211,43 @@ namespace WixToolset.Core.Burn.Bundles
 
         private void WritePayloadInfo(XmlTextWriter writer)
         {
-            var payloadTuples = this.Section.Tuples.OfType<WixBundlePayloadTuple>();
+            var payloadSymbols = this.Section.Symbols.OfType<WixBundlePayloadSymbol>();
 
-            foreach (var payloadTuple in payloadTuples)
+            foreach (var payloadSymbol in payloadSymbols)
             {
                 writer.WriteStartElement("WixPayloadProperties");
 
-                writer.WriteAttributeString("Payload", payloadTuple.Id.Id);
+                writer.WriteAttributeString("Payload", payloadSymbol.Id.Id);
 
-                if (!String.IsNullOrEmpty(payloadTuple.PackageRef))
+                if (!String.IsNullOrEmpty(payloadSymbol.PackageRef))
                 {
-                    writer.WriteAttributeString("Package", payloadTuple.PackageRef);
+                    writer.WriteAttributeString("Package", payloadSymbol.PackageRef);
                 }
 
-                if (!String.IsNullOrEmpty(payloadTuple.ContainerRef))
+                if (!String.IsNullOrEmpty(payloadSymbol.ContainerRef))
                 {
-                    writer.WriteAttributeString("Container", payloadTuple.ContainerRef);
+                    writer.WriteAttributeString("Container", payloadSymbol.ContainerRef);
                 }
 
-                writer.WriteAttributeString("Name", payloadTuple.Name);
-                writer.WriteAttributeString("Size", payloadTuple.FileSize.Value.ToString(CultureInfo.InvariantCulture));
+                writer.WriteAttributeString("Name", payloadSymbol.Name);
+                writer.WriteAttributeString("Size", payloadSymbol.FileSize.Value.ToString(CultureInfo.InvariantCulture));
 
-                if (!String.IsNullOrEmpty(payloadTuple.DownloadUrl))
+                if (!String.IsNullOrEmpty(payloadSymbol.DownloadUrl))
                 {
-                    writer.WriteAttributeString("DownloadUrl", payloadTuple.DownloadUrl);
+                    writer.WriteAttributeString("DownloadUrl", payloadSymbol.DownloadUrl);
                 }
 
-                writer.WriteAttributeString("LayoutOnly", payloadTuple.LayoutOnly ? "yes" : "no");
+                writer.WriteAttributeString("LayoutOnly", payloadSymbol.LayoutOnly ? "yes" : "no");
 
                 writer.WriteEndElement();
             }
         }
 
-        private WixBundlePayloadTuple CreateBootstrapperApplicationManifestPayloadRow(string baManifestPath)
+        private WixBundlePayloadSymbol CreateBootstrapperApplicationManifestPayloadRow(string baManifestPath)
         {
             var generatedId = Common.GenerateIdentifier("ux", BurnCommon.BADataFileName);
 
-            var tuple = this.Section.AddTuple(new WixBundlePayloadTuple(this.BundleTuple.SourceLineNumbers, new Identifier(AccessModifier.Private, generatedId))
+            var symbol = this.Section.AddSymbol(new WixBundlePayloadSymbol(this.BundleSymbol.SourceLineNumbers, new Identifier(AccessModifier.Private, generatedId))
             {
                 Name = BurnCommon.BADataFileName,
                 SourceFile = new IntermediateFieldPathValue { Path = baManifestPath },
@@ -260,11 +260,11 @@ namespace WixToolset.Core.Burn.Bundles
 
             var fileInfo = new FileInfo(baManifestPath);
 
-            tuple.FileSize = (int)fileInfo.Length;
+            symbol.FileSize = (int)fileInfo.Length;
 
-            tuple.Hash = BundleHashAlgorithm.Hash(fileInfo);
+            symbol.Hash = BundleHashAlgorithm.Hash(fileInfo);
 
-            return tuple;
+            return symbol;
         }
     }
 }
diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs
index 03102d5e..3cf6e0aa 100644
--- a/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs
@@ -8,19 +8,19 @@ namespace WixToolset.Core.Burn.Bundles
     using System.Reflection;
     using WixToolset.Data;
     using WixToolset.Data.Burn;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
     using WixToolset.Extensibility.Data;
     using WixToolset.Extensibility.Services;
 
     internal class CreateBundleExeCommand
     {
-        public CreateBundleExeCommand(IMessaging messaging, IBackendHelper backendHelper, string intermediateFolder, string outputPath, WixBundleTuple bundleTuple, WixBundleContainerTuple uxContainer, IEnumerable<WixBundleContainerTuple> containers)
+        public CreateBundleExeCommand(IMessaging messaging, IBackendHelper backendHelper, string intermediateFolder, string outputPath, WixBundleSymbol bundleSymbol, WixBundleContainerSymbol uxContainer, IEnumerable<WixBundleContainerSymbol> containers)
         {
             this.Messaging = messaging;
             this.BackendHelper = backendHelper;
             this.IntermediateFolder = intermediateFolder;
             this.OutputPath = outputPath;
-            this.BundleTuple = bundleTuple;
+            this.BundleSymbol = bundleSymbol;
             this.UXContainer = uxContainer;
             this.Containers = containers;
         }
@@ -35,11 +35,11 @@ namespace WixToolset.Core.Burn.Bundles
 
         private string OutputPath { get; }
 
-        private WixBundleTuple BundleTuple { get; }
+        private WixBundleSymbol BundleSymbol { get; }
 
-        private WixBundleContainerTuple UXContainer { get; }
+        private WixBundleContainerSymbol UXContainer { get; }
 
-        private IEnumerable<WixBundleContainerTuple> Containers { get; }
+        private IEnumerable<WixBundleContainerSymbol> Containers { get; }
 
         public void Execute()
         {
@@ -47,7 +47,7 @@ namespace WixToolset.Core.Burn.Bundles
 
             // Copy the burn.exe to a writable location then mark it to be moved to its final build location.
 
-            var stubPlatform = this.BundleTuple.Platform.ToString();
+            var stubPlatform = this.BundleSymbol.Platform.ToString();
             var stubFile = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), stubPlatform, "burn.exe");
 
             var bundleTempPath = Path.Combine(this.IntermediateFolder, bundleFilename);
@@ -59,19 +59,19 @@ namespace WixToolset.Core.Burn.Bundles
                 this.Messaging.Write(ErrorMessages.InsecureBundleFilename(bundleFilename));
             }
 
-            this.Transfer = this.BackendHelper.CreateFileTransfer(bundleTempPath, this.OutputPath, true, this.BundleTuple.SourceLineNumbers);
+            this.Transfer = this.BackendHelper.CreateFileTransfer(bundleTempPath, this.OutputPath, true, this.BundleSymbol.SourceLineNumbers);
 
             File.Copy(stubFile, bundleTempPath, true);
             File.SetAttributes(bundleTempPath, FileAttributes.Normal);
 
-            this.UpdateBurnResources(bundleTempPath, this.OutputPath, this.BundleTuple);
+            this.UpdateBurnResources(bundleTempPath, this.OutputPath, this.BundleSymbol);
 
             // Update the .wixburn section to point to at the UX and attached container(s) then attach the containers
             // if they should be attached.
             using (var writer = BurnWriter.Open(this.Messaging, bundleTempPath))
             {
                 var burnStubFile = new FileInfo(bundleTempPath);
-                writer.InitializeBundleSectionData(burnStubFile.Length, this.BundleTuple.BundleId);
+                writer.InitializeBundleSectionData(burnStubFile.Length, this.BundleSymbol.BundleId);
 
                 // Always attach the UX container first
                 writer.AppendContainer(this.UXContainer.WorkingPath, BurnWriter.Container.UX);
@@ -91,7 +91,7 @@ namespace WixToolset.Core.Burn.Bundles
             }
         }
 
-        private void UpdateBurnResources(string bundleTempPath, string outputPath, WixBundleTuple bundleInfo)
+        private void UpdateBurnResources(string bundleTempPath, string outputPath, WixBundleSymbol bundleInfo)
         {
             var resources = new Dtf.Resources.ResourceCollection();
             var version = new Dtf.Resources.VersionResource("#1", 1033);
diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBundleExtensionManifestCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBundleExtensionManifestCommand.cs
index f7acd54c..74ccd895 100644
--- a/src/WixToolset.Core.Burn/Bundles/CreateBundleExtensionManifestCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/CreateBundleExtensionManifestCommand.cs
@@ -9,14 +9,14 @@ namespace WixToolset.Core.Burn.Bundles
     using System.Xml;
     using WixToolset.Data;
     using WixToolset.Data.Burn;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
 
     internal class CreateBundleExtensionManifestCommand
     {
-        public CreateBundleExtensionManifestCommand(IntermediateSection section, WixBundleTuple bundleTuple, int lastUXPayloadIndex, string intermediateFolder, IInternalBurnBackendHelper internalBurnBackendHelper)
+        public CreateBundleExtensionManifestCommand(IntermediateSection section, WixBundleSymbol bundleSymbol, int lastUXPayloadIndex, string intermediateFolder, IInternalBurnBackendHelper internalBurnBackendHelper)
         {
             this.Section = section;
-            this.BundleTuple = bundleTuple;
+            this.BundleSymbol = bundleSymbol;
             this.LastUXPayloadIndex = lastUXPayloadIndex;
             this.IntermediateFolder = intermediateFolder;
             this.InternalBurnBackendHelper = internalBurnBackendHelper;
@@ -24,7 +24,7 @@ namespace WixToolset.Core.Burn.Bundles
 
         private IntermediateSection Section { get; }
 
-        private WixBundleTuple BundleTuple { get; }
+        private WixBundleSymbol BundleSymbol { get; }
 
         private IInternalBurnBackendHelper InternalBurnBackendHelper { get; }
 
@@ -32,7 +32,7 @@ namespace WixToolset.Core.Burn.Bundles
 
         private string IntermediateFolder { get; }
 
-        public WixBundlePayloadTuple BundleExtensionManifestPayloadRow { get; private set; }
+        public WixBundlePayloadSymbol BundleExtensionManifestPayloadRow { get; private set; }
 
         public string OutputPath { get; private set; }
 
@@ -64,11 +64,11 @@ namespace WixToolset.Core.Burn.Bundles
             return path;
         }
 
-        private WixBundlePayloadTuple CreateBundleExtensionManifestPayloadRow(string bextManifestPath)
+        private WixBundlePayloadSymbol CreateBundleExtensionManifestPayloadRow(string bextManifestPath)
         {
             var generatedId = Common.GenerateIdentifier("ux", BurnCommon.BundleExtensionDataFileName);
 
-            var tuple = this.Section.AddTuple(new WixBundlePayloadTuple(this.BundleTuple.SourceLineNumbers, new Identifier(AccessModifier.Private, generatedId))
+            var symbol = this.Section.AddSymbol(new WixBundlePayloadSymbol(this.BundleSymbol.SourceLineNumbers, new Identifier(AccessModifier.Private, generatedId))
             {
                 Name = BurnCommon.BundleExtensionDataFileName,
                 SourceFile = new IntermediateFieldPathValue { Path = bextManifestPath },
@@ -81,11 +81,11 @@ namespace WixToolset.Core.Burn.Bundles
 
             var fileInfo = new FileInfo(bextManifestPath);
 
-            tuple.FileSize = (int)fileInfo.Length;
+            symbol.FileSize = (int)fileInfo.Length;
 
-            tuple.Hash = BundleHashAlgorithm.Hash(fileInfo);
+            symbol.Hash = BundleHashAlgorithm.Hash(fileInfo);
 
-            return tuple;
+            return symbol;
         }
     }
 }
diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
index 9453c7e3..05b15ab6 100644
--- a/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
@@ -12,20 +12,20 @@ namespace WixToolset.Core.Burn.Bundles
     using System.Xml;
     using WixToolset.Data;
     using WixToolset.Data.Burn;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
     using WixToolset.Extensibility;
     using WixToolset.Extensibility.Services;
 
     internal class CreateBurnManifestCommand
     {
-        public CreateBurnManifestCommand(IMessaging messaging, IEnumerable<IBurnBackendExtension> backendExtensions, string executableName, IntermediateSection section, WixBundleTuple bundleTuple, IEnumerable<WixBundleContainerTuple> containers, WixChainTuple chainTuple, IEnumerable<PackageFacade> orderedPackages, IEnumerable<WixBundleRollbackBoundaryTuple> boundaries, IEnumerable<WixBundlePayloadTuple> uxPayloads, Dictionary<string, WixBundlePayloadTuple> allPayloadsById, IEnumerable<ISearchFacade> orderedSearches, IEnumerable<WixBundleCatalogTuple> catalogs, string intermediateFolder)
+        public CreateBurnManifestCommand(IMessaging messaging, IEnumerable<IBurnBackendExtension> backendExtensions, string executableName, IntermediateSection section, WixBundleSymbol bundleSymbol, IEnumerable<WixBundleContainerSymbol> containers, WixChainSymbol chainSymbol, IEnumerable<PackageFacade> orderedPackages, IEnumerable<WixBundleRollbackBoundarySymbol> boundaries, IEnumerable<WixBundlePayloadSymbol> uxPayloads, Dictionary<string, WixBundlePayloadSymbol> allPayloadsById, IEnumerable<ISearchFacade> orderedSearches, IEnumerable<WixBundleCatalogSymbol> catalogs, string intermediateFolder)
         {
             this.Messaging = messaging;
             this.BackendExtensions = backendExtensions;
             this.ExecutableName = executableName;
             this.Section = section;
-            this.BundleTuple = bundleTuple;
-            this.Chain = chainTuple;
+            this.BundleSymbol = bundleSymbol;
+            this.Chain = chainSymbol;
             this.Containers = containers;
             this.OrderedPackages = orderedPackages;
             this.RollbackBoundaries = boundaries;
@@ -46,23 +46,23 @@ namespace WixToolset.Core.Burn.Bundles
 
         private IntermediateSection Section { get; }
 
-        private WixBundleTuple BundleTuple { get; }
+        private WixBundleSymbol BundleSymbol { get; }
 
-        private WixChainTuple Chain { get; }
+        private WixChainSymbol Chain { get; }
 
-        private IEnumerable<WixBundleRollbackBoundaryTuple> RollbackBoundaries { get; }
+        private IEnumerable<WixBundleRollbackBoundarySymbol> RollbackBoundaries { get; }
 
         private IEnumerable<PackageFacade> OrderedPackages { get; }
 
         private IEnumerable<ISearchFacade> OrderedSearches { get; }
 
-        private Dictionary<string, WixBundlePayloadTuple> Payloads { get; }
+        private Dictionary<string, WixBundlePayloadSymbol> Payloads { get; }
 
-        private IEnumerable<WixBundleContainerTuple> Containers { get; }
+        private IEnumerable<WixBundleContainerSymbol> Containers { get; }
 
-        private IEnumerable<WixBundlePayloadTuple> UXContainerPayloads { get; }
+        private IEnumerable<WixBundlePayloadSymbol> UXContainerPayloads { get; }
 
-        private IEnumerable<WixBundleCatalogTuple> Catalogs { get; }
+        private IEnumerable<WixBundleCatalogSymbol> Catalogs { get; }
 
         private string IntermediateFolder { get; }
 
@@ -77,32 +77,32 @@ namespace WixToolset.Core.Burn.Bundles
                 writer.WriteStartElement("BurnManifest", BurnCommon.BurnNamespace);
 
                 // Write the condition, if there is one
-                if (null != this.BundleTuple.Condition)
+                if (null != this.BundleSymbol.Condition)
                 {
-                    writer.WriteElementString("Condition", this.BundleTuple.Condition);
+                    writer.WriteElementString("Condition", this.BundleSymbol.Condition);
                 }
 
                 // Write the log element if default logging wasn't disabled.
-                if (!String.IsNullOrEmpty(this.BundleTuple.LogPrefix))
+                if (!String.IsNullOrEmpty(this.BundleSymbol.LogPrefix))
                 {
                     writer.WriteStartElement("Log");
-                    if (!String.IsNullOrEmpty(this.BundleTuple.LogPathVariable))
+                    if (!String.IsNullOrEmpty(this.BundleSymbol.LogPathVariable))
                     {
-                        writer.WriteAttributeString("PathVariable", this.BundleTuple.LogPathVariable);
+                        writer.WriteAttributeString("PathVariable", this.BundleSymbol.LogPathVariable);
                     }
-                    writer.WriteAttributeString("Prefix", this.BundleTuple.LogPrefix);
-                    writer.WriteAttributeString("Extension", this.BundleTuple.LogExtension);
+                    writer.WriteAttributeString("Prefix", this.BundleSymbol.LogPrefix);
+                    writer.WriteAttributeString("Extension", this.BundleSymbol.LogExtension);
                     writer.WriteEndElement();
                 }
 
 
                 // Get update if specified.
-                var updateTuple = this.Section.Tuples.OfType<WixBundleUpdateTuple>().FirstOrDefault();
+                var updateSymbol = this.Section.Symbols.OfType<WixBundleUpdateSymbol>().FirstOrDefault();
 
-                if (null != updateTuple)
+                if (null != updateSymbol)
                 {
                     writer.WriteStartElement("Update");
-                    writer.WriteAttributeString("Location", updateTuple.Location);
+                    writer.WriteAttributeString("Location", updateSymbol.Location);
                     writer.WriteEndElement(); // </Update>
                 }
 
@@ -110,7 +110,7 @@ namespace WixToolset.Core.Burn.Bundles
 
                 // For the related bundles with duplicated identifiers the second instance is ignored (i.e. the Duplicates
                 // enumeration in the index row list is not used).
-                var relatedBundles = this.Section.Tuples.OfType<WixRelatedBundleTuple>();
+                var relatedBundles = this.Section.Symbols.OfType<WixRelatedBundleSymbol>();
                 var distinctRelatedBundles = new HashSet<string>();
 
                 foreach (var relatedBundle in relatedBundles)
@@ -125,7 +125,7 @@ namespace WixToolset.Core.Burn.Bundles
                 }
 
                 // Write the variables
-                var variables = this.Section.Tuples.OfType<WixBundleVariableTuple>();
+                var variables = this.Section.Symbols.OfType<WixBundleVariableSymbol>();
 
                 foreach (var variable in variables)
                 {
@@ -149,7 +149,7 @@ namespace WixToolset.Core.Burn.Bundles
 
                 // write the UX element
                 writer.WriteStartElement("UX");
-                if (!String.IsNullOrEmpty(this.BundleTuple.SplashScreenSourceFile))
+                if (!String.IsNullOrEmpty(this.BundleSymbol.SplashScreenSourceFile))
                 {
                     writer.WriteAttributeString("SplashScreen", "yes");
                 }
@@ -214,66 +214,66 @@ namespace WixToolset.Core.Burn.Bundles
                 // Write the registration information...
                 writer.WriteStartElement("Registration");
 
-                writer.WriteAttributeString("Id", this.BundleTuple.BundleId);
+                writer.WriteAttributeString("Id", this.BundleSymbol.BundleId);
                 writer.WriteAttributeString("ExecutableName", this.ExecutableName);
-                writer.WriteAttributeString("PerMachine", this.BundleTuple.PerMachine ? "yes" : "no");
-                writer.WriteAttributeString("Tag", this.BundleTuple.Tag);
-                writer.WriteAttributeString("Version", this.BundleTuple.Version);
-                writer.WriteAttributeString("ProviderKey", this.BundleTuple.ProviderKey);
+                writer.WriteAttributeString("PerMachine", this.BundleSymbol.PerMachine ? "yes" : "no");
+                writer.WriteAttributeString("Tag", this.BundleSymbol.Tag);
+                writer.WriteAttributeString("Version", this.BundleSymbol.Version);
+                writer.WriteAttributeString("ProviderKey", this.BundleSymbol.ProviderKey);
 
                 writer.WriteStartElement("Arp");
-                writer.WriteAttributeString("Register", (this.BundleTuple.DisableModify || this.BundleTuple.SingleChangeUninstallButton) && this.BundleTuple.DisableRemove ? "no" : "yes"); // do not register if disabled modify and remove.
-                writer.WriteAttributeString("DisplayName", this.BundleTuple.Name);
-                writer.WriteAttributeString("DisplayVersion", this.BundleTuple.Version);
+                writer.WriteAttributeString("Register", (this.BundleSymbol.DisableModify || this.BundleSymbol.SingleChangeUninstallButton) && this.BundleSymbol.DisableRemove ? "no" : "yes"); // do not register if disabled modify and remove.
+                writer.WriteAttributeString("DisplayName", this.BundleSymbol.Name);
+                writer.WriteAttributeString("DisplayVersion", this.BundleSymbol.Version);
 
-                if (!String.IsNullOrEmpty(this.BundleTuple.Manufacturer))
+                if (!String.IsNullOrEmpty(this.BundleSymbol.Manufacturer))
                 {
-                    writer.WriteAttributeString("Publisher", this.BundleTuple.Manufacturer);
+                    writer.WriteAttributeString("Publisher", this.BundleSymbol.Manufacturer);
                 }
 
-                if (!String.IsNullOrEmpty(this.BundleTuple.HelpUrl))
+                if (!String.IsNullOrEmpty(this.BundleSymbol.HelpUrl))
                 {
-                    writer.WriteAttributeString("HelpLink", this.BundleTuple.HelpUrl);
+                    writer.WriteAttributeString("HelpLink", this.BundleSymbol.HelpUrl);
                 }
 
-                if (!String.IsNullOrEmpty(this.BundleTuple.HelpTelephone))
+                if (!String.IsNullOrEmpty(this.BundleSymbol.HelpTelephone))
                 {
-                    writer.WriteAttributeString("HelpTelephone", this.BundleTuple.HelpTelephone);
+                    writer.WriteAttributeString("HelpTelephone", this.BundleSymbol.HelpTelephone);
                 }
 
-                if (!String.IsNullOrEmpty(this.BundleTuple.AboutUrl))
+                if (!String.IsNullOrEmpty(this.BundleSymbol.AboutUrl))
                 {
-                    writer.WriteAttributeString("AboutUrl", this.BundleTuple.AboutUrl);
+                    writer.WriteAttributeString("AboutUrl", this.BundleSymbol.AboutUrl);
                 }
 
-                if (!String.IsNullOrEmpty(this.BundleTuple.UpdateUrl))
+                if (!String.IsNullOrEmpty(this.BundleSymbol.UpdateUrl))
                 {
-                    writer.WriteAttributeString("UpdateUrl", this.BundleTuple.UpdateUrl);
+                    writer.WriteAttributeString("UpdateUrl", this.BundleSymbol.UpdateUrl);
                 }
 
-                if (!String.IsNullOrEmpty(this.BundleTuple.ParentName))
+                if (!String.IsNullOrEmpty(this.BundleSymbol.ParentName))
                 {
-                    writer.WriteAttributeString("ParentDisplayName", this.BundleTuple.ParentName);
+                    writer.WriteAttributeString("ParentDisplayName", this.BundleSymbol.ParentName);
                 }
 
-                if (this.BundleTuple.DisableModify)
+                if (this.BundleSymbol.DisableModify)
                 {
                     writer.WriteAttributeString("DisableModify", "yes");
                 }
 
-                if (this.BundleTuple.DisableRemove)
+                if (this.BundleSymbol.DisableRemove)
                 {
                     writer.WriteAttributeString("DisableRemove", "yes");
                 }
 
-                if (this.BundleTuple.SingleChangeUninstallButton)
+                if (this.BundleSymbol.SingleChangeUninstallButton)
                 {
                     writer.WriteAttributeString("DisableModify", "button");
                 }
                 writer.WriteEndElement(); // </Arp>
 
                 // Get update registration if specified.
-                var updateRegistrationInfo = this.Section.Tuples.OfType<WixUpdateRegistrationTuple>().FirstOrDefault();
+                var updateRegistrationInfo = this.Section.Symbols.OfType<WixUpdateRegistrationSymbol>().FirstOrDefault();
 
                 if (null != updateRegistrationInfo)
                 {
@@ -327,28 +327,28 @@ namespace WixToolset.Core.Burn.Bundles
                 }
 
                 // Index a few tables by package.
-                var targetCodesByPatch = this.Section.Tuples.OfType<WixBundlePatchTargetCodeTuple>().ToLookup(r => r.PackageRef);
-                var msiFeaturesByPackage = this.Section.Tuples.OfType<WixBundleMsiFeatureTuple>().ToLookup(r => r.PackageRef);
-                var msiPropertiesByPackage = this.Section.Tuples.OfType<WixBundleMsiPropertyTuple>().ToLookup(r => r.PackageRef);
+                var targetCodesByPatch = this.Section.Symbols.OfType<WixBundlePatchTargetCodeSymbol>().ToLookup(r => r.PackageRef);
+                var msiFeaturesByPackage = this.Section.Symbols.OfType<WixBundleMsiFeatureSymbol>().ToLookup(r => r.PackageRef);
+                var msiPropertiesByPackage = this.Section.Symbols.OfType<WixBundleMsiPropertySymbol>().ToLookup(r => r.PackageRef);
                 var payloadsByPackage = this.Payloads.Values.ToLookup(p => p.PackageRef);
-                var relatedPackagesByPackage = this.Section.Tuples.OfType<WixBundleRelatedPackageTuple>().ToLookup(r => r.PackageRef);
-                var slipstreamMspsByPackage = this.Section.Tuples.OfType<WixBundleSlipstreamMspTuple>().ToLookup(r => r.MspPackageRef);
-                var exitCodesByPackage = this.Section.Tuples.OfType<WixBundlePackageExitCodeTuple>().ToLookup(r => r.ChainPackageId);
-                var commandLinesByPackage = this.Section.Tuples.OfType<WixBundlePackageCommandLineTuple>().ToLookup(r => r.WixBundlePackageRef);
+                var relatedPackagesByPackage = this.Section.Symbols.OfType<WixBundleRelatedPackageSymbol>().ToLookup(r => r.PackageRef);
+                var slipstreamMspsByPackage = this.Section.Symbols.OfType<WixBundleSlipstreamMspSymbol>().ToLookup(r => r.MspPackageRef);
+                var exitCodesByPackage = this.Section.Symbols.OfType<WixBundlePackageExitCodeSymbol>().ToLookup(r => r.ChainPackageId);
+                var commandLinesByPackage = this.Section.Symbols.OfType<WixBundlePackageCommandLineSymbol>().ToLookup(r => r.WixBundlePackageRef);
 
-                var dependenciesByPackage = this.Section.Tuples.OfType<ProvidesDependencyTuple>().ToLookup(p => p.PackageRef);
+                var dependenciesByPackage = this.Section.Symbols.OfType<ProvidesDependencySymbol>().ToLookup(p => p.PackageRef);
 
 
                 // Build up the list of target codes from all the MSPs in the chain.
-                var targetCodes = new List<WixBundlePatchTargetCodeTuple>();
+                var targetCodes = new List<WixBundlePatchTargetCodeSymbol>();
 
                 foreach (var package in this.OrderedPackages)
                 {
-                    writer.WriteStartElement(String.Format(CultureInfo.InvariantCulture, "{0}Package", package.PackageTuple.Type));
+                    writer.WriteStartElement(String.Format(CultureInfo.InvariantCulture, "{0}Package", package.PackageSymbol.Type));
 
                     writer.WriteAttributeString("Id", package.PackageId);
 
-                    switch (package.PackageTuple.Cache)
+                    switch (package.PackageSymbol.Cache)
                     {
                         case YesNoAlwaysType.No:
                             writer.WriteAttributeString("Cache", "no");
@@ -361,39 +361,39 @@ namespace WixToolset.Core.Burn.Bundles
                             break;
                     }
 
-                    writer.WriteAttributeString("CacheId", package.PackageTuple.CacheId);
-                    writer.WriteAttributeString("InstallSize", Convert.ToString(package.PackageTuple.InstallSize));
-                    writer.WriteAttributeString("Size", Convert.ToString(package.PackageTuple.Size));
-                    writer.WriteAttributeString("PerMachine", YesNoDefaultType.Yes == package.PackageTuple.PerMachine ? "yes" : "no");
-                    writer.WriteAttributeString("Permanent", package.PackageTuple.Permanent ? "yes" : "no");
-                    writer.WriteAttributeString("Vital", package.PackageTuple.Vital == false ? "no" : "yes");
+                    writer.WriteAttributeString("CacheId", package.PackageSymbol.CacheId);
+                    writer.WriteAttributeString("InstallSize", Convert.ToString(package.PackageSymbol.InstallSize));
+                    writer.WriteAttributeString("Size", Convert.ToString(package.PackageSymbol.Size));
+                    writer.WriteAttributeString("PerMachine", YesNoDefaultType.Yes == package.PackageSymbol.PerMachine ? "yes" : "no");
+                    writer.WriteAttributeString("Permanent", package.PackageSymbol.Permanent ? "yes" : "no");
+                    writer.WriteAttributeString("Vital", package.PackageSymbol.Vital == false ? "no" : "yes");
 
-                    if (null != package.PackageTuple.RollbackBoundaryRef)
+                    if (null != package.PackageSymbol.RollbackBoundaryRef)
                     {
-                        writer.WriteAttributeString("RollbackBoundaryForward", package.PackageTuple.RollbackBoundaryRef);
+                        writer.WriteAttributeString("RollbackBoundaryForward", package.PackageSymbol.RollbackBoundaryRef);
                     }
 
-                    if (!String.IsNullOrEmpty(package.PackageTuple.RollbackBoundaryBackwardRef))
+                    if (!String.IsNullOrEmpty(package.PackageSymbol.RollbackBoundaryBackwardRef))
                     {
-                        writer.WriteAttributeString("RollbackBoundaryBackward", package.PackageTuple.RollbackBoundaryBackwardRef);
+                        writer.WriteAttributeString("RollbackBoundaryBackward", package.PackageSymbol.RollbackBoundaryBackwardRef);
                     }
 
-                    if (!String.IsNullOrEmpty(package.PackageTuple.LogPathVariable))
+                    if (!String.IsNullOrEmpty(package.PackageSymbol.LogPathVariable))
                     {
-                        writer.WriteAttributeString("LogPathVariable", package.PackageTuple.LogPathVariable);
+                        writer.WriteAttributeString("LogPathVariable", package.PackageSymbol.LogPathVariable);
                     }
 
-                    if (!String.IsNullOrEmpty(package.PackageTuple.RollbackLogPathVariable))
+                    if (!String.IsNullOrEmpty(package.PackageSymbol.RollbackLogPathVariable))
                     {
-                        writer.WriteAttributeString("RollbackLogPathVariable", package.PackageTuple.RollbackLogPathVariable);
+                        writer.WriteAttributeString("RollbackLogPathVariable", package.PackageSymbol.RollbackLogPathVariable);
                     }
 
-                    if (!String.IsNullOrEmpty(package.PackageTuple.InstallCondition))
+                    if (!String.IsNullOrEmpty(package.PackageSymbol.InstallCondition))
                     {
-                        writer.WriteAttributeString("InstallCondition", package.PackageTuple.InstallCondition);
+                        writer.WriteAttributeString("InstallCondition", package.PackageSymbol.InstallCondition);
                     }
 
-                    if (package.SpecificPackageTuple is WixBundleExePackageTuple exePackage) // EXE
+                    if (package.SpecificPackageSymbol is WixBundleExePackageSymbol exePackage) // EXE
                     {
                         writer.WriteAttributeString("DetectCondition", exePackage.DetectCondition);
                         writer.WriteAttributeString("InstallArguments", exePackage.InstallCommand);
@@ -405,7 +405,7 @@ namespace WixToolset.Core.Burn.Bundles
                             writer.WriteAttributeString("Protocol", exePackage.ExeProtocol);
                         }
                     }
-                    else if (package.SpecificPackageTuple is WixBundleMsiPackageTuple msiPackage) // MSI
+                    else if (package.SpecificPackageSymbol is WixBundleMsiPackageSymbol msiPackage) // MSI
                     {
                         writer.WriteAttributeString("ProductCode", msiPackage.ProductCode);
                         writer.WriteAttributeString("Language", msiPackage.ProductLanguage.ToString(CultureInfo.InvariantCulture));
@@ -415,7 +415,7 @@ namespace WixToolset.Core.Burn.Bundles
                             writer.WriteAttributeString("UpgradeCode", msiPackage.UpgradeCode);
                         }
                     }
-                    else if (package.SpecificPackageTuple is WixBundleMspPackageTuple mspPackage) // MSP
+                    else if (package.SpecificPackageSymbol is WixBundleMspPackageSymbol mspPackage) // MSP
                     {
                         writer.WriteAttributeString("PatchCode", mspPackage.PatchCode);
                         writer.WriteAttributeString("PatchXml", mspPackage.PatchXml);
@@ -436,7 +436,7 @@ namespace WixToolset.Core.Burn.Bundles
                             }
                         }
                     }
-                    else if (package.SpecificPackageTuple is WixBundleMsuPackageTuple msuPackage) // MSU
+                    else if (package.SpecificPackageSymbol is WixBundleMsuPackageSymbol msuPackage) // MSU
                     {
                         writer.WriteAttributeString("DetectCondition", msuPackage.DetectCondition);
                         writer.WriteAttributeString("KB", msuPackage.MsuKB);
@@ -567,14 +567,14 @@ namespace WixToolset.Core.Burn.Bundles
 
                     // Write any contained Payloads with the PackagePayload being first
                     writer.WriteStartElement("PayloadRef");
-                    writer.WriteAttributeString("Id", package.PackageTuple.PayloadRef);
+                    writer.WriteAttributeString("Id", package.PackageSymbol.PayloadRef);
                     writer.WriteEndElement();
 
                     var packagePayloads = payloadsByPackage[package.PackageId];
 
                     foreach (var payload in packagePayloads)
                     {
-                        if (payload.Id.Id != package.PackageTuple.PayloadRef)
+                        if (payload.Id.Id != package.PackageSymbol.PayloadRef)
                         {
                             writer.WriteStartElement("PayloadRef");
                             writer.WriteAttributeString("Id", payload.Id.Id);
@@ -598,7 +598,7 @@ namespace WixToolset.Core.Burn.Bundles
                 }
 
                 // Write the ApprovedExeForElevation elements.
-                var approvedExesForElevation = this.Section.Tuples.OfType<WixApprovedExeForElevationTuple>();
+                var approvedExesForElevation = this.Section.Symbols.OfType<WixApprovedExeForElevationSymbol>();
 
                 foreach (var approvedExeForElevation in approvedExesForElevation)
                 {
@@ -620,7 +620,7 @@ namespace WixToolset.Core.Burn.Bundles
                 }
 
                 // Write the BundleExtension elements.
-                var bundleExtensions = this.Section.Tuples.OfType<WixBundleExtensionTuple>();
+                var bundleExtensions = this.Section.Symbols.OfType<WixBundleExtensionSymbol>();
 
                 foreach (var bundleExtension in bundleExtensions)
                 {
@@ -635,7 +635,7 @@ namespace WixToolset.Core.Burn.Bundles
             }
         }
 
-        private void WriteBurnManifestContainerAttributes(XmlTextWriter writer, string executableName, WixBundleContainerTuple container)
+        private void WriteBurnManifestContainerAttributes(XmlTextWriter writer, string executableName, WixBundleContainerSymbol container)
         {
             writer.WriteAttributeString("Id", container.Id.Id);
             writer.WriteAttributeString("FileSize", container.Size.Value.ToString(CultureInfo.InvariantCulture));
@@ -669,7 +669,7 @@ namespace WixToolset.Core.Burn.Bundles
             }
         }
 
-        private void WriteBurnManifestPayloadAttributes(XmlTextWriter writer, WixBundlePayloadTuple payload, bool embeddedOnly, Dictionary<string, WixBundlePayloadTuple> allPayloads)
+        private void WriteBurnManifestPayloadAttributes(XmlTextWriter writer, WixBundlePayloadSymbol payload, bool embeddedOnly, Dictionary<string, WixBundlePayloadSymbol> allPayloads)
         {
             Debug.Assert(!embeddedOnly || PackagingType.Embedded == payload.Packaging);
 
diff --git a/src/WixToolset.Core.Burn/Bundles/CreateContainerCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateContainerCommand.cs
index 937721a6..a23a116b 100644
--- a/src/WixToolset.Core.Burn/Bundles/CreateContainerCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/CreateContainerCommand.cs
@@ -8,21 +8,21 @@ namespace WixToolset.Core.Burn.Bundles
     using System.Linq;
     using WixToolset.Core.Native;
     using WixToolset.Data;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
 
     /// <summary>
     /// Creates cabinet files.
     /// </summary>
     internal class CreateContainerCommand
     {
-        public CreateContainerCommand(IEnumerable<WixBundlePayloadTuple> payloads, string outputPath, CompressionLevel? compressionLevel)
+        public CreateContainerCommand(IEnumerable<WixBundlePayloadSymbol> payloads, string outputPath, CompressionLevel? compressionLevel)
         {
             this.Payloads = payloads;
             this.OutputPath = outputPath;
             this.CompressionLevel = compressionLevel;
         }
 
-        public CreateContainerCommand(string manifestPath, IEnumerable<WixBundlePayloadTuple> payloads, string outputPath, CompressionLevel? compressionLevel)
+        public CreateContainerCommand(string manifestPath, IEnumerable<WixBundlePayloadSymbol> payloads, string outputPath, CompressionLevel? compressionLevel)
         {
             this.ManifestFile = manifestPath;
             this.Payloads = payloads;
@@ -36,7 +36,7 @@ namespace WixToolset.Core.Burn.Bundles
 
         private string OutputPath { get; }
 
-        private IEnumerable<WixBundlePayloadTuple> Payloads { get; }
+        private IEnumerable<WixBundlePayloadSymbol> Payloads { get; }
 
         public string Hash { get; private set; }
 
diff --git a/src/WixToolset.Core.Burn/Bundles/CreateNonUXContainers.cs b/src/WixToolset.Core.Burn/Bundles/CreateNonUXContainers.cs
index babac5e2..3e54013a 100644
--- a/src/WixToolset.Core.Burn/Bundles/CreateNonUXContainers.cs
+++ b/src/WixToolset.Core.Burn/Bundles/CreateNonUXContainers.cs
@@ -8,18 +8,18 @@ namespace WixToolset.Core.Burn.Bundles
     using System.Linq;
     using WixToolset.Data;
     using WixToolset.Data.Burn;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
     using WixToolset.Extensibility.Data;
     using WixToolset.Extensibility.Services;
 
     internal class CreateNonUXContainers
     {
-        public CreateNonUXContainers(IBackendHelper backendHelper, IntermediateSection section, WixBootstrapperApplicationTuple bootstrapperApplicationTuple, Dictionary<string, WixBundlePayloadTuple> payloadTuples, string intermediateFolder, string layoutFolder, CompressionLevel? defaultCompressionLevel)
+        public CreateNonUXContainers(IBackendHelper backendHelper, IntermediateSection section, WixBootstrapperApplicationSymbol bootstrapperApplicationSymbol, Dictionary<string, WixBundlePayloadSymbol> payloadSymbols, string intermediateFolder, string layoutFolder, CompressionLevel? defaultCompressionLevel)
         {
             this.BackendHelper = backendHelper;
             this.Section = section;
-            this.BootstrapperApplicationTuple = bootstrapperApplicationTuple;
-            this.PayloadTuples = payloadTuples;
+            this.BootstrapperApplicationSymbol = bootstrapperApplicationSymbol;
+            this.PayloadSymbols = payloadSymbols;
             this.IntermediateFolder = intermediateFolder;
             this.LayoutFolder = layoutFolder;
             this.DefaultCompressionLevel = defaultCompressionLevel;
@@ -29,19 +29,19 @@ namespace WixToolset.Core.Burn.Bundles
 
         public IEnumerable<ITrackedFile> TrackedFiles { get; private set; }
 
-        public WixBundleContainerTuple UXContainer { get; set; }
+        public WixBundleContainerSymbol UXContainer { get; set; }
 
-        public IEnumerable<WixBundlePayloadTuple> UXContainerPayloads { get; private set; }
+        public IEnumerable<WixBundlePayloadSymbol> UXContainerPayloads { get; private set; }
 
-        public IEnumerable<WixBundleContainerTuple> Containers { get; private set; }
+        public IEnumerable<WixBundleContainerSymbol> Containers { get; private set; }
 
         private IBackendHelper BackendHelper { get; }
 
         private IntermediateSection Section { get; }
 
-        private WixBootstrapperApplicationTuple BootstrapperApplicationTuple { get; }
+        private WixBootstrapperApplicationSymbol BootstrapperApplicationSymbol { get; }
 
-        private Dictionary<string, WixBundlePayloadTuple> PayloadTuples { get; }
+        private Dictionary<string, WixBundlePayloadSymbol> PayloadSymbols { get; }
 
         private string IntermediateFolder { get; }
 
@@ -53,15 +53,15 @@ namespace WixToolset.Core.Burn.Bundles
         {
             var fileTransfers = new List<IFileTransfer>();
             var trackedFiles = new List<ITrackedFile>();
-            var uxPayloadTuples = new List<WixBundlePayloadTuple>();
+            var uxPayloadSymbols = new List<WixBundlePayloadSymbol>();
 
             var attachedContainerIndex = 1; // count starts at one because UX container is "0".
 
-            var containerTuples = this.Section.Tuples.OfType<WixBundleContainerTuple>().ToList();
+            var containerSymbols = this.Section.Symbols.OfType<WixBundleContainerSymbol>().ToList();
 
-            var payloadsByContainer = this.PayloadTuples.Values.ToLookup(p => p.ContainerRef);
+            var payloadsByContainer = this.PayloadSymbols.Values.ToLookup(p => p.ContainerRef);
 
-            foreach (var container in containerTuples)
+            foreach (var container in containerSymbols)
             {
                 var containerId = container.Id.Id;
 
@@ -83,17 +83,17 @@ namespace WixToolset.Core.Burn.Bundles
 
                     // Gather the list of UX payloads but ensure the BootstrapperApplication Payload is the first
                     // in the list since that is the Payload that Burn attempts to load.
-                    var baPayloadId = this.BootstrapperApplicationTuple.Id.Id;
+                    var baPayloadId = this.BootstrapperApplicationSymbol.Id.Id;
 
                     foreach (var uxPayload in containerPayloads)
                     {
                         if (uxPayload.Id.Id == baPayloadId)
                         {
-                            uxPayloadTuples.Insert(0, uxPayload);
+                            uxPayloadSymbols.Insert(0, uxPayload);
                         }
                         else
                         {
-                            uxPayloadTuples.Add(uxPayload);
+                            uxPayloadSymbols.Add(uxPayload);
                         }
                     }
                 }
@@ -120,13 +120,13 @@ namespace WixToolset.Core.Burn.Bundles
                 }
             }
 
-            this.Containers = containerTuples;
-            this.UXContainerPayloads = uxPayloadTuples;
+            this.Containers = containerSymbols;
+            this.UXContainerPayloads = uxPayloadSymbols;
             this.FileTransfers = fileTransfers;
             this.TrackedFiles = trackedFiles;
         }
 
-        private void CreateContainer(WixBundleContainerTuple container, IEnumerable<WixBundlePayloadTuple> containerPayloads)
+        private void CreateContainer(WixBundleContainerSymbol container, IEnumerable<WixBundlePayloadSymbol> containerPayloads)
         {
             var command = new CreateContainerCommand(containerPayloads, container.WorkingPath, this.DefaultCompressionLevel);
             command.Execute();
diff --git a/src/WixToolset.Core.Burn/Bundles/GetPackageFacadesCommand.cs b/src/WixToolset.Core.Burn/Bundles/GetPackageFacadesCommand.cs
index 71e4cfea..24d1e8d8 100644
--- a/src/WixToolset.Core.Burn/Bundles/GetPackageFacadesCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/GetPackageFacadesCommand.cs
@@ -5,17 +5,17 @@ namespace WixToolset.Core.Burn.Bundles
     using System.Collections.Generic;
     using System.Linq;
     using WixToolset.Data;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
 
     internal class GetPackageFacadesCommand
     {
-        public GetPackageFacadesCommand(IEnumerable<WixBundlePackageTuple> chainPackageTuples, IntermediateSection section)
+        public GetPackageFacadesCommand(IEnumerable<WixBundlePackageSymbol> chainPackageSymbols, IntermediateSection section)
         {
-            this.ChainPackageTuples = chainPackageTuples;
+            this.ChainPackageSymbols = chainPackageSymbols;
             this.Section = section;
         }
 
-        private IEnumerable<WixBundlePackageTuple> ChainPackageTuples { get; }
+        private IEnumerable<WixBundlePackageSymbol> ChainPackageSymbols { get; }
 
         private IntermediateSection Section { get; }
 
@@ -23,14 +23,14 @@ namespace WixToolset.Core.Burn.Bundles
 
         public void Execute()
         {
-            var exePackages = this.Section.Tuples.OfType<WixBundleExePackageTuple>().ToDictionary(t => t.Id.Id);
-            var msiPackages = this.Section.Tuples.OfType<WixBundleMsiPackageTuple>().ToDictionary(t => t.Id.Id);
-            var mspPackages = this.Section.Tuples.OfType<WixBundleMspPackageTuple>().ToDictionary(t => t.Id.Id);
-            var msuPackages = this.Section.Tuples.OfType<WixBundleMsuPackageTuple>().ToDictionary(t => t.Id.Id);
+            var exePackages = this.Section.Symbols.OfType<WixBundleExePackageSymbol>().ToDictionary(t => t.Id.Id);
+            var msiPackages = this.Section.Symbols.OfType<WixBundleMsiPackageSymbol>().ToDictionary(t => t.Id.Id);
+            var mspPackages = this.Section.Symbols.OfType<WixBundleMspPackageSymbol>().ToDictionary(t => t.Id.Id);
+            var msuPackages = this.Section.Symbols.OfType<WixBundleMsuPackageSymbol>().ToDictionary(t => t.Id.Id);
 
             var facades = new Dictionary<string, PackageFacade>();
 
-            foreach (var package in this.ChainPackageTuples)
+            foreach (var package in this.ChainPackageSymbols)
             {
                 var id = package.Id.Id;
                 switch (package.Type)
diff --git a/src/WixToolset.Core.Burn/Bundles/OrderPackagesAndRollbackBoundariesCommand.cs b/src/WixToolset.Core.Burn/Bundles/OrderPackagesAndRollbackBoundariesCommand.cs
index 8ead0952..9e27d5a3 100644
--- a/src/WixToolset.Core.Burn/Bundles/OrderPackagesAndRollbackBoundariesCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/OrderPackagesAndRollbackBoundariesCommand.cs
@@ -5,35 +5,35 @@ namespace WixToolset.Core.Burn.Bundles
     using System;
     using System.Collections.Generic;
     using WixToolset.Data;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
     using WixToolset.Extensibility.Services;
 
     internal class OrderPackagesAndRollbackBoundariesCommand
     {
-        public OrderPackagesAndRollbackBoundariesCommand(IMessaging messaging, IEnumerable<WixGroupTuple> groupTuples, Dictionary<string, WixBundleRollbackBoundaryTuple> boundaryTuples, IDictionary<string, PackageFacade> packageFacades)
+        public OrderPackagesAndRollbackBoundariesCommand(IMessaging messaging, IEnumerable<WixGroupSymbol> groupSymbols, Dictionary<string, WixBundleRollbackBoundarySymbol> boundarySymbols, IDictionary<string, PackageFacade> packageFacades)
         {
             this.Messaging = messaging;
-            this.GroupTuples = groupTuples;
-            this.Boundaries = boundaryTuples;
+            this.GroupSymbols = groupSymbols;
+            this.Boundaries = boundarySymbols;
             this.PackageFacades = packageFacades;
         }
 
         private IMessaging Messaging { get; }
 
-        public IEnumerable<WixGroupTuple> GroupTuples { get; }
+        public IEnumerable<WixGroupSymbol> GroupSymbols { get; }
 
-        public Dictionary<string, WixBundleRollbackBoundaryTuple> Boundaries { get; }
+        public Dictionary<string, WixBundleRollbackBoundarySymbol> Boundaries { get; }
 
         public IDictionary<string, PackageFacade> PackageFacades { get; }
 
         public IEnumerable<PackageFacade> OrderedPackageFacades { get; private set; }
 
-        public IEnumerable<WixBundleRollbackBoundaryTuple> UsedRollbackBoundaries { get; private set; }
+        public IEnumerable<WixBundleRollbackBoundarySymbol> UsedRollbackBoundaries { get; private set; }
 
         public void Execute()
         {
             var orderedFacades = new List<PackageFacade>();
-            var usedBoundaries = new List<WixBundleRollbackBoundaryTuple>();
+            var usedBoundaries = new List<WixBundleRollbackBoundarySymbol>();
 
             // Process the chain of packages to add them in the correct order
             // and assign the forward rollback boundaries as appropriate. Remember
@@ -44,41 +44,41 @@ namespace WixToolset.Core.Burn.Bundles
             // We handle uninstall (aka: backwards) rollback boundaries after
             // we get these install/repair (aka: forward) rollback boundaries
             // defined.
-            WixBundleRollbackBoundaryTuple previousRollbackBoundary = null;
-            WixBundleRollbackBoundaryTuple lastRollbackBoundary = null;
+            WixBundleRollbackBoundarySymbol previousRollbackBoundary = null;
+            WixBundleRollbackBoundarySymbol lastRollbackBoundary = null;
             var boundaryHadX86Package = false;
 
-            foreach (var groupTuple in this.GroupTuples)
+            foreach (var groupSymbol in this.GroupSymbols)
             {
-                if (ComplexReferenceChildType.Package == groupTuple.ChildType && ComplexReferenceParentType.PackageGroup == groupTuple.ParentType && "WixChain" == groupTuple.ParentId)
+                if (ComplexReferenceChildType.Package == groupSymbol.ChildType && ComplexReferenceParentType.PackageGroup == groupSymbol.ParentType && "WixChain" == groupSymbol.ParentId)
                 {
-                    if (this.PackageFacades.TryGetValue(groupTuple.ChildId, out var facade))
+                    if (this.PackageFacades.TryGetValue(groupSymbol.ChildId, out var facade))
                     {
                         if (null != previousRollbackBoundary)
                         {
                             usedBoundaries.Add(previousRollbackBoundary);
-                            facade.PackageTuple.RollbackBoundaryRef = previousRollbackBoundary.Id.Id;
+                            facade.PackageSymbol.RollbackBoundaryRef = previousRollbackBoundary.Id.Id;
                             previousRollbackBoundary = null;
 
-                            boundaryHadX86Package = facade.PackageTuple.Win64;
+                            boundaryHadX86Package = facade.PackageSymbol.Win64;
                         }
 
                         // Error if MSI transaction has x86 package preceding x64 packages
                         if ((lastRollbackBoundary != null)
                             && lastRollbackBoundary.Transaction == true
-                            && boundaryHadX86Package 
-                            && facade.PackageTuple.Win64)
+                            && boundaryHadX86Package
+                            && facade.PackageSymbol.Win64)
                         {
                             this.Messaging.Write(ErrorMessages.MsiTransactionX86BeforeX64(lastRollbackBoundary.SourceLineNumbers));
                         }
-                        boundaryHadX86Package |= facade.PackageTuple.Win64;
+                        boundaryHadX86Package |= facade.PackageSymbol.Win64;
 
                         orderedFacades.Add(facade);
                     }
                     else // must be a rollback boundary.
                     {
                         // Discard the next rollback boundary if we have a previously defined boundary.
-                        var nextRollbackBoundary = this.Boundaries[groupTuple.ChildId];
+                        var nextRollbackBoundary = this.Boundaries[groupSymbol.ChildId];
                         if (null != previousRollbackBoundary)
                         {
                             this.Messaging.Write(WarningMessages.DiscardedRollbackBoundary(nextRollbackBoundary.SourceLineNumbers, nextRollbackBoundary.Id.Id));
@@ -131,14 +131,14 @@ namespace WixToolset.Core.Burn.Bundles
 
             foreach (PackageFacade package in orderedFacades)
             {
-                if (null != package.PackageTuple.RollbackBoundaryRef)
+                if (null != package.PackageSymbol.RollbackBoundaryRef)
                 {
                     if (null != previousFacade)
                     {
-                        previousFacade.PackageTuple.RollbackBoundaryBackwardRef = previousRollbackBoundaryId;
+                        previousFacade.PackageSymbol.RollbackBoundaryBackwardRef = previousRollbackBoundaryId;
                     }
 
-                    previousRollbackBoundaryId = package.PackageTuple.RollbackBoundaryRef;
+                    previousRollbackBoundaryId = package.PackageSymbol.RollbackBoundaryRef;
                 }
 
                 previousFacade = package;
@@ -146,7 +146,7 @@ namespace WixToolset.Core.Burn.Bundles
 
             if (!String.IsNullOrEmpty(previousRollbackBoundaryId) && null != previousFacade)
             {
-                previousFacade.PackageTuple.RollbackBoundaryBackwardRef = previousRollbackBoundaryId;
+                previousFacade.PackageSymbol.RollbackBoundaryBackwardRef = previousRollbackBoundaryId;
             }
 
             this.OrderedPackageFacades = orderedFacades;
diff --git a/src/WixToolset.Core.Burn/Bundles/OrderSearchesCommand.cs b/src/WixToolset.Core.Burn/Bundles/OrderSearchesCommand.cs
index 874258bf..dcb4733e 100644
--- a/src/WixToolset.Core.Burn/Bundles/OrderSearchesCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/OrderSearchesCommand.cs
@@ -8,7 +8,7 @@ namespace WixToolset.Core.Burn.Bundles
     using System.Linq;
     using WixToolset.Data;
     using WixToolset.Data.Burn;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
     using WixToolset.Extensibility.Services;
 
     internal class OrderSearchesCommand
@@ -23,32 +23,32 @@ namespace WixToolset.Core.Burn.Bundles
 
         private IntermediateSection Section { get; }
 
-        public IDictionary<string, IList<IntermediateTuple>> ExtensionSearchTuplesByExtensionId { get; private set; }
+        public IDictionary<string, IList<IntermediateSymbol>> ExtensionSearchSymbolsByExtensionId { get; private set; }
 
         public IList<ISearchFacade> OrderedSearchFacades { get; private set; }
 
         public void Execute()
         {
-            this.ExtensionSearchTuplesByExtensionId = new Dictionary<string, IList<IntermediateTuple>>();
+            this.ExtensionSearchSymbolsByExtensionId = new Dictionary<string, IList<IntermediateSymbol>>();
             this.OrderedSearchFacades = new List<ISearchFacade>();
 
-            var searchRelationTuples = this.Section.Tuples.OfType<WixSearchRelationTuple>().ToList();
-            var searchTuples = this.Section.Tuples.OfType<WixSearchTuple>().ToList();
-            if (searchTuples.Count == 0)
+            var searchRelationSymbols = this.Section.Symbols.OfType<WixSearchRelationSymbol>().ToList();
+            var searchSymbols = this.Section.Symbols.OfType<WixSearchSymbol>().ToList();
+            if (searchSymbols.Count == 0)
             {
                 // nothing to do!
                 return;
             }
 
-            var tupleDictionary = searchTuples.ToDictionary(t => t.Id.Id);
+            var symbolDictionary = searchSymbols.ToDictionary(t => t.Id.Id);
 
             var constraints = new Constraints();
-            if (searchRelationTuples.Count > 0)
+            if (searchRelationSymbols.Count > 0)
             {
                 // add relational info to our data...
-                foreach (var searchRelationTuple in searchRelationTuples)
+                foreach (var searchRelationSymbol in searchRelationSymbols)
                 {
-                    constraints.AddConstraint(searchRelationTuple.Id.Id, searchRelationTuple.ParentSearchRef);
+                    constraints.AddConstraint(searchRelationSymbol.Id.Id, searchRelationSymbol.ParentSearchRef);
                 }
             }
 
@@ -67,10 +67,10 @@ namespace WixToolset.Core.Burn.Bundles
             // lexicographically at each step to ensure a deterministic ordering
             // based on 'after' dependencies and ID.
             var sorter = new TopologicalSort();
-            var sortedIds = sorter.Sort(tupleDictionary.Keys, constraints);
+            var sortedIds = sorter.Sort(symbolDictionary.Keys, constraints);
 
             // Now, create the search facades with the searches in order...
-            this.OrderSearches(sortedIds, tupleDictionary);
+            this.OrderSearches(sortedIds, symbolDictionary);
         }
 
         /// <summary>
@@ -313,49 +313,49 @@ namespace WixToolset.Core.Burn.Bundles
             }
         }
 
-        private void OrderSearches(List<string> sortedIds, Dictionary<string, WixSearchTuple> searchTupleDictionary)
+        private void OrderSearches(List<string> sortedIds, Dictionary<string, WixSearchSymbol> searchSymbolDictionary)
         {
             // TODO: Although the WixSearch tables are defined in the Util extension,
             // the Bundle Binder has to know all about them. We hope to revisit all
             // of this in the 4.0 timeframe.
-            var legacySearchesById = this.Section.Tuples
-                .Where(t => t.Definition.Type == TupleDefinitionType.WixComponentSearch ||
-                       t.Definition.Type == TupleDefinitionType.WixFileSearch ||
-                       t.Definition.Type == TupleDefinitionType.WixProductSearch ||
-                       t.Definition.Type == TupleDefinitionType.WixRegistrySearch)
+            var legacySearchesById = this.Section.Symbols
+                .Where(t => t.Definition.Type == SymbolDefinitionType.WixComponentSearch ||
+                       t.Definition.Type == SymbolDefinitionType.WixFileSearch ||
+                       t.Definition.Type == SymbolDefinitionType.WixProductSearch ||
+                       t.Definition.Type == SymbolDefinitionType.WixRegistrySearch)
                 .ToDictionary(t => t.Id.Id);
-            var setVariablesById = this.Section.Tuples
-                .OfType<WixSetVariableTuple>()
+            var setVariablesById = this.Section.Symbols
+                .OfType<WixSetVariableSymbol>()
                 .ToDictionary(t => t.Id.Id);
-            var extensionSearchesById = this.Section.Tuples
-                .Where(t => t.Definition.HasTag(BurnConstants.BundleExtensionSearchTupleDefinitionTag))
+            var extensionSearchesById = this.Section.Symbols
+                .Where(t => t.Definition.HasTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag))
                 .ToDictionary(t => t.Id.Id);
 
             foreach (var searchId in sortedIds)
             {
-                var searchTuple = searchTupleDictionary[searchId];
-                if (legacySearchesById.TryGetValue(searchId, out var specificSearchTuple))
+                var searchSymbol = searchSymbolDictionary[searchId];
+                if (legacySearchesById.TryGetValue(searchId, out var specificSearchSymbol))
                 {
-                    this.OrderedSearchFacades.Add(new LegacySearchFacade(searchTuple, specificSearchTuple));
+                    this.OrderedSearchFacades.Add(new LegacySearchFacade(searchSymbol, specificSearchSymbol));
                 }
-                else if (setVariablesById.TryGetValue(searchId, out var setVariableTuple))
+                else if (setVariablesById.TryGetValue(searchId, out var setVariableSymbol))
                 {
-                    this.OrderedSearchFacades.Add(new SetVariableSearchFacade(searchTuple, setVariableTuple));
+                    this.OrderedSearchFacades.Add(new SetVariableSearchFacade(searchSymbol, setVariableSymbol));
                 }
-                else if (extensionSearchesById.TryGetValue(searchId, out var extensionSearchTuple))
+                else if (extensionSearchesById.TryGetValue(searchId, out var extensionSearchSymbol))
                 {
-                    this.OrderedSearchFacades.Add(new ExtensionSearchFacade(searchTuple));
+                    this.OrderedSearchFacades.Add(new ExtensionSearchFacade(searchSymbol));
 
-                    if (!this.ExtensionSearchTuplesByExtensionId.TryGetValue(searchTuple.BundleExtensionRef, out var extensionSearchTuples))
+                    if (!this.ExtensionSearchSymbolsByExtensionId.TryGetValue(searchSymbol.BundleExtensionRef, out var extensionSearchSymbols))
                     {
-                        extensionSearchTuples = new List<IntermediateTuple>();
-                        this.ExtensionSearchTuplesByExtensionId[searchTuple.BundleExtensionRef] = extensionSearchTuples;
+                        extensionSearchSymbols = new List<IntermediateSymbol>();
+                        this.ExtensionSearchSymbolsByExtensionId[searchSymbol.BundleExtensionRef] = extensionSearchSymbols;
                     }
-                    extensionSearchTuples.Add(extensionSearchTuple);
+                    extensionSearchSymbols.Add(extensionSearchSymbol);
                 }
                 else
                 {
-                    this.Messaging.Write(ErrorMessages.MissingBundleSearch(searchTuple.SourceLineNumbers, searchId));
+                    this.Messaging.Write(ErrorMessages.MissingBundleSearch(searchSymbol.SourceLineNumbers, searchId));
                 }
             }
         }
diff --git a/src/WixToolset.Core.Burn/Bundles/PackageFacade.cs b/src/WixToolset.Core.Burn/Bundles/PackageFacade.cs
index 8b1711a1..471262de 100644
--- a/src/WixToolset.Core.Burn/Bundles/PackageFacade.cs
+++ b/src/WixToolset.Core.Burn/Bundles/PackageFacade.cs
@@ -4,22 +4,22 @@ namespace WixToolset.Core.Burn.Bundles
 {
     using System.Diagnostics;
     using WixToolset.Data;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
 
     internal class PackageFacade
     {
-        public PackageFacade(WixBundlePackageTuple packageTuple, IntermediateTuple specificPackageTuple)
+        public PackageFacade(WixBundlePackageSymbol packageSymbol, IntermediateSymbol specificPackageSymbol)
         {
-            Debug.Assert(packageTuple.Id.Id == specificPackageTuple.Id.Id);
+            Debug.Assert(packageSymbol.Id.Id == specificPackageSymbol.Id.Id);
 
-            this.PackageTuple = packageTuple;
-            this.SpecificPackageTuple = specificPackageTuple;
+            this.PackageSymbol = packageSymbol;
+            this.SpecificPackageSymbol = specificPackageSymbol;
         }
 
-        public string PackageId => this.PackageTuple.Id.Id;
+        public string PackageId => this.PackageSymbol.Id.Id;
 
-        public WixBundlePackageTuple PackageTuple { get; }
+        public WixBundlePackageSymbol PackageSymbol { get; }
 
-        public IntermediateTuple SpecificPackageTuple { get; }
+        public IntermediateSymbol SpecificPackageSymbol { get; }
     }
 }
diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessExePackageCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessExePackageCommand.cs
index 56254a06..8d8ea986 100644
--- a/src/WixToolset.Core.Burn/Bundles/ProcessExePackageCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/ProcessExePackageCommand.cs
@@ -4,20 +4,20 @@ namespace WixToolset.Core.Burn.Bundles
 {
     using System;
     using System.Collections.Generic;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
 
     /// <summary>
     /// Initializes package state from the Exe contents.
     /// </summary>
     internal class ProcessExePackageCommand
     {
-        public ProcessExePackageCommand(PackageFacade facade, Dictionary<string, WixBundlePayloadTuple> payloadTuples)
+        public ProcessExePackageCommand(PackageFacade facade, Dictionary<string, WixBundlePayloadSymbol> payloadSymbols)
         {
-            this.AuthoredPayloads = payloadTuples;
+            this.AuthoredPayloads = payloadSymbols;
             this.Facade = facade;
         }
 
-        public Dictionary<string, WixBundlePayloadTuple> AuthoredPayloads { get; }
+        public Dictionary<string, WixBundlePayloadSymbol> AuthoredPayloads { get; }
 
         public PackageFacade Facade { get; }
 
@@ -26,14 +26,14 @@ namespace WixToolset.Core.Burn.Bundles
         /// </summary>
         public void Execute()
         {
-            var packagePayload = this.AuthoredPayloads[this.Facade.PackageTuple.PayloadRef];
+            var packagePayload = this.AuthoredPayloads[this.Facade.PackageSymbol.PayloadRef];
 
-            if (String.IsNullOrEmpty(this.Facade.PackageTuple.CacheId))
+            if (String.IsNullOrEmpty(this.Facade.PackageSymbol.CacheId))
             {
-                this.Facade.PackageTuple.CacheId = packagePayload.Hash;
+                this.Facade.PackageSymbol.CacheId = packagePayload.Hash;
             }
 
-            this.Facade.PackageTuple.Version = packagePayload.Version;
+            this.Facade.PackageSymbol.Version = packagePayload.Version;
         }
     }
 }
diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
index 0754fbc6..3eb97ee6 100644
--- a/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
@@ -12,7 +12,7 @@ namespace WixToolset.Core.Burn.Bundles
     using WixToolset.Extensibility;
     using Dtf = WixToolset.Dtf.WindowsInstaller;
     using WixToolset.Extensibility.Services;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
     using WixToolset.Data.WindowsInstaller;
     using WixToolset.Extensibility.Data;
 
@@ -23,7 +23,7 @@ namespace WixToolset.Core.Burn.Bundles
     {
         private const string PropertySqlFormat = "SELECT `Value` FROM `Property` WHERE `Property` = '{0}'";
 
-        public ProcessMsiPackageCommand(IWixToolsetServiceProvider serviceProvider, IEnumerable<IBurnBackendExtension> backendExtensions, IntermediateSection section, PackageFacade facade, Dictionary<string, WixBundlePayloadTuple> payloadTuples)
+        public ProcessMsiPackageCommand(IWixToolsetServiceProvider serviceProvider, IEnumerable<IBurnBackendExtension> backendExtensions, IntermediateSection section, PackageFacade facade, Dictionary<string, WixBundlePayloadSymbol> payloadSymbols)
         {
             this.Messaging = serviceProvider.GetService<IMessaging>();
             this.BackendHelper = serviceProvider.GetService<IBackendHelper>();
@@ -31,7 +31,7 @@ namespace WixToolset.Core.Burn.Bundles
 
             this.BackendExtensions = backendExtensions;
 
-            this.AuthoredPayloads = payloadTuples;
+            this.AuthoredPayloads = payloadSymbols;
             this.Section = section;
             this.Facade = facade;
         }
@@ -44,7 +44,7 @@ namespace WixToolset.Core.Burn.Bundles
 
         private IEnumerable<IBurnBackendExtension> BackendExtensions { get; }
 
-        private Dictionary<string, WixBundlePayloadTuple> AuthoredPayloads { get; }
+        private Dictionary<string, WixBundlePayloadSymbol> AuthoredPayloads { get; }
 
         private PackageFacade Facade { get; }
 
@@ -55,9 +55,9 @@ namespace WixToolset.Core.Burn.Bundles
         /// </summary>
         public void Execute()
         {
-            var packagePayload = this.AuthoredPayloads[this.Facade.PackageTuple.PayloadRef];
+            var packagePayload = this.AuthoredPayloads[this.Facade.PackageSymbol.PayloadRef];
 
-            var msiPackage = (WixBundleMsiPackageTuple)this.Facade.SpecificPackageTuple;
+            var msiPackage = (WixBundleMsiPackageSymbol)this.Facade.SpecificPackageSymbol;
 
             var sourcePath = packagePayload.SourceFile.Path;
             var longNamesInImage = false;
@@ -82,8 +82,8 @@ namespace WixToolset.Core.Burn.Bundles
                     var perMachine = (0 == (sumInfo.WordCount & 8));
                     var x64 = (sumInfo.Template.Contains("x64") || sumInfo.Template.Contains("Intel64"));
 
-                    this.Facade.PackageTuple.PerMachine = perMachine ? YesNoDefaultType.Yes : YesNoDefaultType.No;
-                    this.Facade.PackageTuple.Win64 = x64;
+                    this.Facade.PackageSymbol.PerMachine = perMachine ? YesNoDefaultType.Yes : YesNoDefaultType.No;
+                    this.Facade.PackageSymbol.Win64 = x64;
                 }
 
                 using (var db = new Dtf.Database(sourcePath))
@@ -111,33 +111,33 @@ namespace WixToolset.Core.Burn.Bundles
 
                         if (!String.IsNullOrEmpty(version) && Common.IsValidModuleOrBundleVersion(version))
                         {
-                            this.Messaging.Write(WarningMessages.VersionTruncated(this.Facade.PackageTuple.SourceLineNumbers, msiPackage.ProductVersion, sourcePath, version));
+                            this.Messaging.Write(WarningMessages.VersionTruncated(this.Facade.PackageSymbol.SourceLineNumbers, msiPackage.ProductVersion, sourcePath, version));
                             msiPackage.ProductVersion = version;
                         }
                         else
                         {
-                            this.Messaging.Write(ErrorMessages.InvalidProductVersion(this.Facade.PackageTuple.SourceLineNumbers, msiPackage.ProductVersion, sourcePath));
+                            this.Messaging.Write(ErrorMessages.InvalidProductVersion(this.Facade.PackageSymbol.SourceLineNumbers, msiPackage.ProductVersion, sourcePath));
                         }
                     }
 
-                    if (String.IsNullOrEmpty(this.Facade.PackageTuple.CacheId))
+                    if (String.IsNullOrEmpty(this.Facade.PackageSymbol.CacheId))
                     {
-                        this.Facade.PackageTuple.CacheId = String.Format("{0}v{1}", msiPackage.ProductCode, msiPackage.ProductVersion);
+                        this.Facade.PackageSymbol.CacheId = String.Format("{0}v{1}", msiPackage.ProductCode, msiPackage.ProductVersion);
                     }
 
-                    if (String.IsNullOrEmpty(this.Facade.PackageTuple.DisplayName))
+                    if (String.IsNullOrEmpty(this.Facade.PackageSymbol.DisplayName))
                     {
-                        this.Facade.PackageTuple.DisplayName = ProcessMsiPackageCommand.GetProperty(db, "ProductName");
+                        this.Facade.PackageSymbol.DisplayName = ProcessMsiPackageCommand.GetProperty(db, "ProductName");
                     }
 
-                    if (String.IsNullOrEmpty(this.Facade.PackageTuple.Description))
+                    if (String.IsNullOrEmpty(this.Facade.PackageSymbol.Description))
                     {
-                        this.Facade.PackageTuple.Description = ProcessMsiPackageCommand.GetProperty(db, "ARPCOMMENTS");
+                        this.Facade.PackageSymbol.Description = ProcessMsiPackageCommand.GetProperty(db, "ARPCOMMENTS");
                     }
 
-                    if (String.IsNullOrEmpty(this.Facade.PackageTuple.Version))
+                    if (String.IsNullOrEmpty(this.Facade.PackageSymbol.Version))
                     {
-                        this.Facade.PackageTuple.Version = msiPackage.ProductVersion;
+                        this.Facade.PackageSymbol.Version = msiPackage.ProductVersion;
                     }
 
                     var payloadNames = this.GetPayloadTargetNames(packagePayload.Id.Id);
@@ -168,7 +168,7 @@ namespace WixToolset.Core.Burn.Bundles
 
                     // Add all external files as package payloads and calculate the total install size as the rollup of
                     // File table's sizes.
-                    this.Facade.PackageTuple.InstallSize = this.ImportExternalFileAsPayloadsAndReturnInstallSize(db, packagePayload, longNamesInImage, compressed, payloadNames);
+                    this.Facade.PackageSymbol.InstallSize = this.ImportExternalFileAsPayloadsAndReturnInstallSize(db, packagePayload, longNamesInImage, compressed, payloadNames);
 
                     // Add all dependency providers from the MSI.
                     this.ImportDependencyProviders(msiPackage, db);
@@ -176,13 +176,13 @@ namespace WixToolset.Core.Burn.Bundles
             }
             catch (Dtf.InstallerException e)
             {
-                this.Messaging.Write(ErrorMessages.UnableToReadPackageInformation(this.Facade.PackageTuple.SourceLineNumbers, sourcePath, e.Message));
+                this.Messaging.Write(ErrorMessages.UnableToReadPackageInformation(this.Facade.PackageSymbol.SourceLineNumbers, sourcePath, e.Message));
             }
         }
 
         private ISet<string> GetPayloadTargetNames(string packageId)
         {
-            var payloadNames = this.Section.Tuples.OfType<WixBundlePayloadTuple>()
+            var payloadNames = this.Section.Symbols.OfType<WixBundlePayloadSymbol>()
                 .Where(p => p.PackageRef == packageId)
                 .Select(p => p.Name);
 
@@ -191,21 +191,21 @@ namespace WixToolset.Core.Burn.Bundles
 
         private ISet<string> GetMsiPropertyNames(string packageId)
         {
-            var properties = this.Section.Tuples.OfType<WixBundleMsiPropertyTuple>()
+            var properties = this.Section.Symbols.OfType<WixBundleMsiPropertySymbol>()
                 .Where(p => p.Id.Id == packageId)
                 .Select(p => p.Name);
 
             return new HashSet<string>(properties, StringComparer.Ordinal);
         }
 
-        private void SetPerMachineAppropriately(Dtf.Database db, WixBundleMsiPackageTuple msiPackage, string sourcePath)
+        private void SetPerMachineAppropriately(Dtf.Database db, WixBundleMsiPackageSymbol msiPackage, string sourcePath)
         {
             if (msiPackage.ForcePerMachine)
             {
-                if (YesNoDefaultType.No == this.Facade.PackageTuple.PerMachine)
+                if (YesNoDefaultType.No == this.Facade.PackageSymbol.PerMachine)
                 {
-                    this.Messaging.Write(WarningMessages.PerUserButForcingPerMachine(this.Facade.PackageTuple.SourceLineNumbers, sourcePath));
-                    this.Facade.PackageTuple.PerMachine = YesNoDefaultType.Yes; // ensure that we think the package is per-machine.
+                    this.Messaging.Write(WarningMessages.PerUserButForcingPerMachine(this.Facade.PackageSymbol.SourceLineNumbers, sourcePath));
+                    this.Facade.PackageSymbol.PerMachine = YesNoDefaultType.Yes; // ensure that we think the package is per-machine.
                 }
 
                 // Force ALLUSERS=1 via the MSI command-line.
@@ -218,34 +218,34 @@ namespace WixToolset.Core.Burn.Bundles
                 if (String.IsNullOrEmpty(allusers))
                 {
                     // Not forced per-machine and no ALLUSERS property, flip back to per-user.
-                    if (YesNoDefaultType.Yes == this.Facade.PackageTuple.PerMachine)
+                    if (YesNoDefaultType.Yes == this.Facade.PackageSymbol.PerMachine)
                     {
-                        this.Messaging.Write(WarningMessages.ImplicitlyPerUser(this.Facade.PackageTuple.SourceLineNumbers, sourcePath));
-                        this.Facade.PackageTuple.PerMachine = YesNoDefaultType.No;
+                        this.Messaging.Write(WarningMessages.ImplicitlyPerUser(this.Facade.PackageSymbol.SourceLineNumbers, sourcePath));
+                        this.Facade.PackageSymbol.PerMachine = YesNoDefaultType.No;
                     }
                 }
                 else if (allusers.Equals("1", StringComparison.Ordinal))
                 {
-                    if (YesNoDefaultType.No == this.Facade.PackageTuple.PerMachine)
+                    if (YesNoDefaultType.No == this.Facade.PackageSymbol.PerMachine)
                     {
-                        this.Messaging.Write(ErrorMessages.PerUserButAllUsersEquals1(this.Facade.PackageTuple.SourceLineNumbers, sourcePath));
+                        this.Messaging.Write(ErrorMessages.PerUserButAllUsersEquals1(this.Facade.PackageSymbol.SourceLineNumbers, sourcePath));
                     }
                 }
                 else if (allusers.Equals("2", StringComparison.Ordinal))
                 {
-                    this.Messaging.Write(WarningMessages.DiscouragedAllUsersValue(this.Facade.PackageTuple.SourceLineNumbers, sourcePath, (YesNoDefaultType.Yes == this.Facade.PackageTuple.PerMachine) ? "machine" : "user"));
+                    this.Messaging.Write(WarningMessages.DiscouragedAllUsersValue(this.Facade.PackageSymbol.SourceLineNumbers, sourcePath, (YesNoDefaultType.Yes == this.Facade.PackageSymbol.PerMachine) ? "machine" : "user"));
                 }
                 else
                 {
-                    this.Messaging.Write(ErrorMessages.UnsupportedAllUsersValue(this.Facade.PackageTuple.SourceLineNumbers, sourcePath, allusers));
+                    this.Messaging.Write(ErrorMessages.UnsupportedAllUsersValue(this.Facade.PackageSymbol.SourceLineNumbers, sourcePath, allusers));
                 }
             }
         }
 
-        private void SetPackageVisibility(Dtf.Database db, WixBundleMsiPackageTuple msiPackage, ISet<string> msiPropertyNames)
+        private void SetPackageVisibility(Dtf.Database db, WixBundleMsiPackageSymbol msiPackage, ISet<string> msiPropertyNames)
         {
             var alreadyVisible = !ProcessMsiPackageCommand.HasProperty(db, "ARPSYSTEMCOMPONENT");
-            var visible = (this.Facade.PackageTuple.Attributes & WixBundlePackageAttributes.Visible) == WixBundlePackageAttributes.Visible;
+            var visible = (this.Facade.PackageSymbol.Attributes & WixBundlePackageAttributes.Visible) == WixBundlePackageAttributes.Visible;
 
             // If not already set to the correct visibility.
             if (alreadyVisible != visible)
@@ -283,7 +283,7 @@ namespace WixToolset.Core.Burn.Bundles
                             attributes |= (recordAttributes & WindowsInstallerConstants.MsidbUpgradeAttributesVersionMaxInclusive) == WindowsInstallerConstants.MsidbUpgradeAttributesVersionMaxInclusive ? WixBundleRelatedPackageAttributes.MaxInclusive : 0;
                             attributes |= (recordAttributes & WindowsInstallerConstants.MsidbUpgradeAttributesLanguagesExclusive) == WindowsInstallerConstants.MsidbUpgradeAttributesLanguagesExclusive ? WixBundleRelatedPackageAttributes.LangInclusive : 0;
 
-                            this.Section.AddTuple(new WixBundleRelatedPackageTuple(this.Facade.PackageTuple.SourceLineNumbers)
+                            this.Section.AddSymbol(new WixBundleRelatedPackageSymbol(this.Facade.PackageSymbol.SourceLineNumbers)
                             {
                                 PackageRef = this.Facade.PackageId,
                                 RelatedId = record.GetString(1),
@@ -358,7 +358,7 @@ namespace WixToolset.Core.Burn.Bundles
                                         }
                                     }
 
-                                    this.Section.AddTuple(new WixBundleMsiFeatureTuple(this.Facade.PackageTuple.SourceLineNumbers, new Identifier(AccessModifier.Private, this.Facade.PackageId, featureName))
+                                    this.Section.AddSymbol(new WixBundleMsiFeatureSymbol(this.Facade.PackageSymbol.SourceLineNumbers, new Identifier(AccessModifier.Private, this.Facade.PackageId, featureName))
                                     {
                                         PackageRef = this.Facade.PackageId,
                                         Name = featureName,
@@ -379,7 +379,7 @@ namespace WixToolset.Core.Burn.Bundles
             }
         }
 
-        private void ImportExternalCabinetAsPayloads(Dtf.Database db, WixBundlePayloadTuple packagePayload, ISet<string> payloadNames)
+        private void ImportExternalCabinetAsPayloads(Dtf.Database db, WixBundlePayloadSymbol packagePayload, ISet<string> payloadNames)
         {
             if (db.Tables.Contains("Media"))
             {
@@ -395,9 +395,9 @@ namespace WixToolset.Core.Burn.Bundles
                         if (!payloadNames.Contains(cabinetName))
                         {
                             var generatedId = Common.GenerateIdentifier("cab", packagePayload.Id.Id, cabinet);
-                            var payloadSourceFile = this.ResolveRelatedFile(packagePayload.SourceFile.Path, packagePayload.UnresolvedSourceFile, cabinet, "Cabinet", this.Facade.PackageTuple.SourceLineNumbers, BindStage.Normal);
+                            var payloadSourceFile = this.ResolveRelatedFile(packagePayload.SourceFile.Path, packagePayload.UnresolvedSourceFile, cabinet, "Cabinet", this.Facade.PackageSymbol.SourceLineNumbers, BindStage.Normal);
 
-                            this.Section.AddTuple(new WixBundlePayloadTuple(this.Facade.PackageTuple.SourceLineNumbers, new Identifier(AccessModifier.Private, generatedId))
+                            this.Section.AddSymbol(new WixBundlePayloadSymbol(this.Facade.PackageSymbol.SourceLineNumbers, new Identifier(AccessModifier.Private, generatedId))
                             {
                                 Name = cabinetName,
                                 SourceFile = new IntermediateFieldPathValue { Path = payloadSourceFile },
@@ -416,7 +416,7 @@ namespace WixToolset.Core.Burn.Bundles
             }
         }
 
-        private long ImportExternalFileAsPayloadsAndReturnInstallSize(Dtf.Database db, WixBundlePayloadTuple packagePayload, bool longNamesInImage, bool compressed, ISet<string> payloadNames)
+        private long ImportExternalFileAsPayloadsAndReturnInstallSize(Dtf.Database db, WixBundlePayloadSymbol packagePayload, bool longNamesInImage, bool compressed, ISet<string> payloadNames)
         {
             long size = 0;
 
@@ -473,9 +473,9 @@ namespace WixToolset.Core.Burn.Bundles
                                 if (!payloadNames.Contains(name))
                                 {
                                     var generatedId = Common.GenerateIdentifier("f", packagePayload.Id.Id, record.GetString(2));
-                                    var payloadSourceFile = this.ResolveRelatedFile(packagePayload.SourceFile.Path, packagePayload.UnresolvedSourceFile, fileSourcePath, "File", this.Facade.PackageTuple.SourceLineNumbers, BindStage.Normal);
+                                    var payloadSourceFile = this.ResolveRelatedFile(packagePayload.SourceFile.Path, packagePayload.UnresolvedSourceFile, fileSourcePath, "File", this.Facade.PackageSymbol.SourceLineNumbers, BindStage.Normal);
 
-                                    this.Section.AddTuple(new WixBundlePayloadTuple(this.Facade.PackageTuple.SourceLineNumbers, new Identifier(AccessModifier.Private, generatedId))
+                                    this.Section.AddSymbol(new WixBundlePayloadSymbol(this.Facade.PackageSymbol.SourceLineNumbers, new Identifier(AccessModifier.Private, generatedId))
                                     {
                                         Name = name,
                                         SourceFile = new IntermediateFieldPathValue { Path = payloadSourceFile },
@@ -500,9 +500,9 @@ namespace WixToolset.Core.Burn.Bundles
             return size;
         }
 
-        private void AddMsiProperty(WixBundleMsiPackageTuple msiPackage, string name, string value)
+        private void AddMsiProperty(WixBundleMsiPackageSymbol msiPackage, string name, string value)
         {
-            this.Section.AddTuple(new WixBundleMsiPropertyTuple(msiPackage.SourceLineNumbers, new Identifier(AccessModifier.Private, msiPackage.Id.Id, name))
+            this.Section.AddSymbol(new WixBundleMsiPropertySymbol(msiPackage.SourceLineNumbers, new Identifier(AccessModifier.Private, msiPackage.Id.Id, name))
             {
                 PackageRef = msiPackage.Id.Id,
                 Name = name,
@@ -510,7 +510,7 @@ namespace WixToolset.Core.Burn.Bundles
             });
         }
 
-        private void ImportDependencyProviders(WixBundleMsiPackageTuple msiPackage, Dtf.Database db)
+        private void ImportDependencyProviders(WixBundleMsiPackageSymbol msiPackage, Dtf.Database db)
         {
             if (db.Tables.Contains("WixDependencyProvider"))
             {
@@ -529,12 +529,12 @@ namespace WixToolset.Core.Burn.Bundles
                             }
 
                             // Import the provider key and attributes.
-                            this.Section.AddTuple(new ProvidesDependencyTuple(msiPackage.SourceLineNumbers)
+                            this.Section.AddSymbol(new ProvidesDependencySymbol(msiPackage.SourceLineNumbers)
                             {
                                 PackageRef = msiPackage.Id.Id,
                                 Key = record.GetString(1),
                                 Version = record.GetString(2) ?? msiPackage.ProductVersion,
-                                DisplayName = record.GetString(3) ?? this.Facade.PackageTuple.DisplayName,
+                                DisplayName = record.GetString(3) ?? this.Facade.PackageSymbol.DisplayName,
                                 Attributes = record.GetInteger(4),
                                 Imported = true
                             });
diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessMspPackageCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessMspPackageCommand.cs
index 5acffe33..f528ce20 100644
--- a/src/WixToolset.Core.Burn/Bundles/ProcessMspPackageCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/ProcessMspPackageCommand.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Core.Burn.Bundles
     using System.Text;
     using System.Xml;
     using WixToolset.Data;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
     using WixToolset.Extensibility.Services;
     using Dtf = WixToolset.Dtf.WindowsInstaller;
 
@@ -22,18 +22,18 @@ namespace WixToolset.Core.Burn.Bundles
         private const string PatchMetadataFormat = "SELECT `Value` FROM `MsiPatchMetadata` WHERE `Property` = '{0}'";
         private static readonly Encoding XmlOutputEncoding = new UTF8Encoding(false);
 
-        public ProcessMspPackageCommand(IMessaging messaging, IntermediateSection section, PackageFacade facade, Dictionary<string, WixBundlePayloadTuple> payloadTuples)
+        public ProcessMspPackageCommand(IMessaging messaging, IntermediateSection section, PackageFacade facade, Dictionary<string, WixBundlePayloadSymbol> payloadSymbols)
         {
             this.Messaging = messaging;
 
-            this.AuthoredPayloads = payloadTuples;
+            this.AuthoredPayloads = payloadSymbols;
             this.Section = section;
             this.Facade = facade;
         }
 
         public IMessaging Messaging { get; }
 
-        public Dictionary<string, WixBundlePayloadTuple> AuthoredPayloads { private get; set; }
+        public Dictionary<string, WixBundlePayloadSymbol> AuthoredPayloads { private get; set; }
 
         public PackageFacade Facade { private get; set; }
 
@@ -44,9 +44,9 @@ namespace WixToolset.Core.Burn.Bundles
         /// </summary>
         public void Execute()
         {
-            var packagePayload = this.AuthoredPayloads[this.Facade.PackageTuple.PayloadRef];
+            var packagePayload = this.AuthoredPayloads[this.Facade.PackageSymbol.PayloadRef];
 
-            var mspPackage = (WixBundleMspPackageTuple)this.Facade.SpecificPackageTuple;
+            var mspPackage = (WixBundleMspPackageSymbol)this.Facade.SpecificPackageSymbol;
 
             var sourcePath = packagePayload.SourceFile.Path;
 
@@ -60,14 +60,14 @@ namespace WixToolset.Core.Burn.Bundles
 
                 using (var db = new Dtf.Database(sourcePath))
                 {
-                    if (String.IsNullOrEmpty(this.Facade.PackageTuple.DisplayName))
+                    if (String.IsNullOrEmpty(this.Facade.PackageSymbol.DisplayName))
                     {
-                        this.Facade.PackageTuple.DisplayName = ProcessMspPackageCommand.GetPatchMetadataProperty(db, "DisplayName");
+                        this.Facade.PackageSymbol.DisplayName = ProcessMspPackageCommand.GetPatchMetadataProperty(db, "DisplayName");
                     }
 
-                    if (String.IsNullOrEmpty(this.Facade.PackageTuple.Description))
+                    if (String.IsNullOrEmpty(this.Facade.PackageSymbol.Description))
                     {
-                        this.Facade.PackageTuple.Description = ProcessMspPackageCommand.GetPatchMetadataProperty(db, "Description");
+                        this.Facade.PackageSymbol.Description = ProcessMspPackageCommand.GetPatchMetadataProperty(db, "Description");
                     }
 
                     mspPackage.Manufacturer = ProcessMspPackageCommand.GetPatchMetadataProperty(db, "ManufacturerName");
@@ -81,13 +81,13 @@ namespace WixToolset.Core.Burn.Bundles
                 return;
             }
 
-            if (String.IsNullOrEmpty(this.Facade.PackageTuple.CacheId))
+            if (String.IsNullOrEmpty(this.Facade.PackageSymbol.CacheId))
             {
-                this.Facade.PackageTuple.CacheId = mspPackage.PatchCode;
+                this.Facade.PackageSymbol.CacheId = mspPackage.PatchCode;
             }
         }
 
-        private void ProcessPatchXml(WixBundlePayloadTuple packagePayload, WixBundleMspPackageTuple mspPackage, string sourcePath)
+        private void ProcessPatchXml(WixBundlePayloadSymbol packagePayload, WixBundleMspPackageSymbol mspPackage, string sourcePath)
         {
             var uniqueTargetCodes = new HashSet<string>();
 
@@ -127,7 +127,7 @@ namespace WixToolset.Core.Burn.Bundles
 
                 if (uniqueTargetCodes.Add(targetCode))
                 {
-                    this.Section.AddTuple(new WixBundlePatchTargetCodeTuple(packagePayload.SourceLineNumbers)
+                    this.Section.AddSymbol(new WixBundlePatchTargetCodeSymbol(packagePayload.SourceLineNumbers)
                     {
                         PackageRef = packagePayload.Id.Id,
                         TargetCode = targetCode,
diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessMsuPackageCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessMsuPackageCommand.cs
index 6a39f42f..af4ab3a8 100644
--- a/src/WixToolset.Core.Burn/Bundles/ProcessMsuPackageCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/ProcessMsuPackageCommand.cs
@@ -5,33 +5,33 @@ namespace WixToolset.Core.Burn.Bundles
     using System;
     using System.Collections.Generic;
     using WixToolset.Data;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
 
     /// <summary>
     /// Processes the Msu packages to add properties and payloads from the Msu packages.
     /// </summary>
     internal class ProcessMsuPackageCommand
     {
-        public ProcessMsuPackageCommand(PackageFacade facade, Dictionary<string, WixBundlePayloadTuple> payloadTuples)
+        public ProcessMsuPackageCommand(PackageFacade facade, Dictionary<string, WixBundlePayloadSymbol> payloadSymbols)
         {
-            this.AuthoredPayloads = payloadTuples;
+            this.AuthoredPayloads = payloadSymbols;
             this.Facade = facade;
         }
 
-        public Dictionary<string, WixBundlePayloadTuple> AuthoredPayloads { private get; set; }
+        public Dictionary<string, WixBundlePayloadSymbol> AuthoredPayloads { private get; set; }
 
         public PackageFacade Facade { private get; set; }
 
         public void Execute()
         {
-            var packagePayload = this.AuthoredPayloads[this.Facade.PackageTuple.PayloadRef];
+            var packagePayload = this.AuthoredPayloads[this.Facade.PackageSymbol.PayloadRef];
 
-            if (String.IsNullOrEmpty(this.Facade.PackageTuple.CacheId))
+            if (String.IsNullOrEmpty(this.Facade.PackageSymbol.CacheId))
             {
-                this.Facade.PackageTuple.CacheId = packagePayload.Hash;
+                this.Facade.PackageSymbol.CacheId = packagePayload.Hash;
             }
 
-            this.Facade.PackageTuple.PerMachine = YesNoDefaultType.Yes; // MSUs are always per-machine.
+            this.Facade.PackageSymbol.PerMachine = YesNoDefaultType.Yes; // MSUs are always per-machine.
         }
     }
 }
diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs
index 7f3a2501..475b04b8 100644
--- a/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs
@@ -11,7 +11,7 @@ namespace WixToolset.Core.Burn.Bundles
     using System.Text;
     using WixToolset.Data;
     using WixToolset.Data.Burn;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
     using WixToolset.Extensibility.Data;
     using WixToolset.Extensibility.Services;
 
@@ -19,7 +19,7 @@ namespace WixToolset.Core.Burn.Bundles
     {
         private static readonly Version EmptyVersion = new Version(0, 0, 0, 0);
 
-        public ProcessPayloadsCommand(IWixToolsetServiceProvider serviceProvider, IBackendHelper backendHelper, IEnumerable<WixBundlePayloadTuple> payloads, PackagingType defaultPackaging, string layoutDirectory)
+        public ProcessPayloadsCommand(IWixToolsetServiceProvider serviceProvider, IBackendHelper backendHelper, IEnumerable<WixBundlePayloadSymbol> payloads, PackagingType defaultPackaging, string layoutDirectory)
         {
             this.Messaging = serviceProvider.GetService<IMessaging>();
 
@@ -37,7 +37,7 @@ namespace WixToolset.Core.Burn.Bundles
 
         private IBackendHelper BackendHelper { get; }
 
-        private IEnumerable<WixBundlePayloadTuple> Payloads { get; }
+        private IEnumerable<WixBundlePayloadSymbol> Payloads { get; }
 
         private PackagingType DefaultPackaging { get; }
 
@@ -92,7 +92,7 @@ namespace WixToolset.Core.Burn.Bundles
             this.TrackedFiles = trackedFiles;
         }
 
-        private void UpdatePayloadPackagingType(WixBundlePayloadTuple payload)
+        private void UpdatePayloadPackagingType(WixBundlePayloadSymbol payload)
         {
             if (!payload.Packaging.HasValue || PackagingType.Unknown == payload.Packaging)
             {
@@ -118,7 +118,7 @@ namespace WixToolset.Core.Burn.Bundles
             }
         }
 
-        private void UpdatePayloadFileInformation(WixBundlePayloadTuple payload, IntermediateFieldPathValue sourceFile)
+        private void UpdatePayloadFileInformation(WixBundlePayloadSymbol payload, IntermediateFieldPathValue sourceFile)
         {
             var fileInfo = new FileInfo(sourceFile.Path);
 
@@ -165,7 +165,7 @@ namespace WixToolset.Core.Burn.Bundles
             }
         }
 
-        private void UpdatePayloadVersionInformation(WixBundlePayloadTuple payload, IntermediateFieldPathValue sourceFile)
+        private void UpdatePayloadVersionInformation(WixBundlePayloadSymbol payload, IntermediateFieldPathValue sourceFile)
         {
             var versionInfo = FileVersionInfo.GetVersionInfo(sourceFile.Path);
 
diff --git a/src/WixToolset.Core.Burn/Bundles/VerifyPayloadsWithCatalogCommand.cs b/src/WixToolset.Core.Burn/Bundles/VerifyPayloadsWithCatalogCommand.cs
index 2b17f985..e7c97ea7 100644
--- a/src/WixToolset.Core.Burn/Bundles/VerifyPayloadsWithCatalogCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/VerifyPayloadsWithCatalogCommand.cs
@@ -9,12 +9,12 @@ namespace WixToolset.Core.Burn.Bundles
     using System.Runtime.InteropServices;
     using System.Text;
     using WixToolset.Data;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
     using WixToolset.Extensibility.Services;
 
     internal class VerifyPayloadsWithCatalogCommand
     {
-        public VerifyPayloadsWithCatalogCommand(IMessaging messaging, IEnumerable<WixBundleCatalogTuple> catalogs, IEnumerable<WixBundlePayloadTuple> payloads)
+        public VerifyPayloadsWithCatalogCommand(IMessaging messaging, IEnumerable<WixBundleCatalogSymbol> catalogs, IEnumerable<WixBundlePayloadSymbol> payloads)
         {
             this.Messaging = messaging;
             this.Catalogs = catalogs;
@@ -23,9 +23,9 @@ namespace WixToolset.Core.Burn.Bundles
 
         private IMessaging Messaging { get; }
 
-        private IEnumerable<WixBundleCatalogTuple> Catalogs { get; }
+        private IEnumerable<WixBundleCatalogSymbol> Catalogs { get; }
 
-        private IEnumerable<WixBundlePayloadTuple> Payloads { get; }
+        private IEnumerable<WixBundlePayloadSymbol> Payloads { get; }
 
         public void Execute()
         {
diff --git a/src/WixToolset.Core.Burn/ExtensibilityServices/BurnBackendHelper.cs b/src/WixToolset.Core.Burn/ExtensibilityServices/BurnBackendHelper.cs
index 10ac9931..7d3acff9 100644
--- a/src/WixToolset.Core.Burn/ExtensibilityServices/BurnBackendHelper.cs
+++ b/src/WixToolset.Core.Burn/ExtensibilityServices/BurnBackendHelper.cs
@@ -24,9 +24,9 @@ namespace WixToolset.Core.Burn.ExtensibilityServices
             this.BootstrapperApplicationManifestData.AddXml(xml);
         }
 
-        public void AddBootstrapperApplicationData(IntermediateTuple tuple, bool tupleIdIsIdAttribute = false)
+        public void AddBootstrapperApplicationData(IntermediateSymbol symbol, bool symbolIdIsIdAttribute = false)
         {
-            this.BootstrapperApplicationManifestData.AddTuple(tuple, tupleIdIsIdAttribute, BurnCommon.BADataNamespace);
+            this.BootstrapperApplicationManifestData.AddSymbol(symbol, symbolIdIsIdAttribute, BurnCommon.BADataNamespace);
         }
 
         public void AddBundleExtensionData(string extensionId, string xml)
@@ -35,10 +35,10 @@ namespace WixToolset.Core.Burn.ExtensibilityServices
             manifestData.AddXml(xml);
         }
 
-        public void AddBundleExtensionData(string extensionId, IntermediateTuple tuple, bool tupleIdIsIdAttribute = false)
+        public void AddBundleExtensionData(string extensionId, IntermediateSymbol symbol, bool symbolIdIsIdAttribute = false)
         {
             var manifestData = this.GetBundleExtensionManifestData(extensionId);
-            manifestData.AddTuple(tuple, tupleIdIsIdAttribute, BurnCommon.BundleExtensionDataNamespace);
+            manifestData.AddSymbol(symbol, symbolIdIsIdAttribute, BurnCommon.BundleExtensionDataNamespace);
         }
 
         public void WriteBootstrapperApplicationData(XmlWriter writer)
@@ -90,21 +90,21 @@ namespace WixToolset.Core.Burn.ExtensibilityServices
 
             private StringBuilder Builder { get; }
 
-            public void AddTuple(IntermediateTuple tuple, bool tupleIdIsIdAttribute, string ns)
+            public void AddSymbol(IntermediateSymbol symbol, bool symbolIdIsIdAttribute, string ns)
             {
                 // There might be a more efficient way to do this,
                 // but this is an easy way to ensure we're creating valid XML.
                 var sb = new StringBuilder();
                 using (var writer = XmlWriter.Create(sb, WriterSettings))
                 {
-                    writer.WriteStartElement(tuple.Definition.Name, ns);
+                    writer.WriteStartElement(symbol.Definition.Name, ns);
 
-                    if (tupleIdIsIdAttribute && tuple.Id != null)
+                    if (symbolIdIsIdAttribute && symbol.Id != null)
                     {
-                        writer.WriteAttributeString("Id", tuple.Id.Id);
+                        writer.WriteAttributeString("Id", symbol.Id.Id);
                     }
 
-                    foreach (var field in tuple.Fields)
+                    foreach (var field in symbol.Fields)
                     {
                         if (!field.IsNull())
                         {