1 files changed, 42 insertions, 42 deletions

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");
                 }