The Great Tuple to Symbol Rename (tm)

16 files changed, 158 insertions, 158 deletions

diff --git a/src/test/Example.Extension/ExampleCompilerExtension.cs b/src/test/Example.Extension/ExampleCompilerExtension.cs
index 0005b1d5..5b8d4b3f 100644
--- a/src/test/Example.Extension/ExampleCompilerExtension.cs
+++ b/src/test/Example.Extension/ExampleCompilerExtension.cs
@@ -92,8 +92,8 @@ namespace Example.Extension
 
             if (!this.Messaging.EncounteredError)
             {
-                var tuple = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "Example", id);
-                tuple.Set(0, value);
+                var symbol = this.ParseHelper.CreateSymbol(section, sourceLineNumbers, "Example", id);
+                symbol.Set(0, value);
             }
         }
 
@@ -152,12 +152,12 @@ namespace Example.Extension
 
             if (!this.Messaging.EncounteredError)
             {
-                this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, this.BundleExtensionId);
+                this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, this.BundleExtensionId);
             }
 
             if (!this.Messaging.EncounteredError)
             {
-                var tuple = section.AddTuple(new ExampleSearchTuple(sourceLineNumbers, id)
+                var symbol = section.AddSymbol(new ExampleSearchSymbol(sourceLineNumbers, id)
                 {
                     SearchFor = searchFor,
                 });
@@ -176,7 +176,7 @@ namespace Example.Extension
                     {
                         case "Id":
                             var refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ExampleTupleDefinitions.ExampleSearch, refId);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, ExampleSymbolDefinitions.ExampleSearch, refId);
                             break;
                         default:
                             this.ParseHelper.UnexpectedAttribute(element, attrib);
diff --git a/src/test/Example.Extension/ExampleExtensionData.cs b/src/test/Example.Extension/ExampleExtensionData.cs
index 2ba94397..91d60eb9 100644
--- a/src/test/Example.Extension/ExampleExtensionData.cs
+++ b/src/test/Example.Extension/ExampleExtensionData.cs
@@ -9,15 +9,15 @@ namespace Example.Extension
     {
         public string DefaultCulture => null;
 
-        public Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions)
+        public Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions)
         {
-            return Intermediate.Load(typeof(ExampleExtensionData).Assembly, "Example.Extension.Example.wixlib", tupleDefinitions);
+            return Intermediate.Load(typeof(ExampleExtensionData).Assembly, "Example.Extension.Example.wixlib", symbolDefinitions);
         }
 
-        public bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition)
+        public bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition)
         {
-            tupleDefinition = ExampleTupleDefinitions.ByName(name);
-            return tupleDefinition != null;
+            symbolDefinition = ExampleSymbolDefinitions.ByName(name);
+            return symbolDefinition != null;
         }
     }
 }
\ No newline at end of file
diff --git a/src/test/Example.Extension/ExampleSearchTuple.cs b/src/test/Example.Extension/ExampleSearchTuple.cs
index 353ef158..40a39292 100644
--- a/src/test/Example.Extension/ExampleSearchTuple.cs
+++ b/src/test/Example.Extension/ExampleSearchTuple.cs
@@ -4,27 +4,27 @@ namespace Example.Extension
 {
     using WixToolset.Data;
 
-    public enum ExampleSearchTupleFields
+    public enum ExampleSearchSymbolFields
     {
         SearchFor,
     }
 
-    public class ExampleSearchTuple : IntermediateTuple
+    public class ExampleSearchSymbol : IntermediateSymbol
     {
-        public ExampleSearchTuple() : base(ExampleTupleDefinitions.ExampleSearch, null, null)
+        public ExampleSearchSymbol() : base(ExampleSymbolDefinitions.ExampleSearch, null, null)
         {
         }
 
-        public ExampleSearchTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ExampleTupleDefinitions.ExampleSearch, sourceLineNumber, id)
+        public ExampleSearchSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ExampleSymbolDefinitions.ExampleSearch, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ExampleTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ExampleSymbolFields index] => this.Fields[(int)index];
 
         public string SearchFor
         {
-            get => this.Fields[(int)ExampleSearchTupleFields.SearchFor]?.AsString();
-            set => this.Set((int)ExampleSearchTupleFields.SearchFor, value);
+            get => this.Fields[(int)ExampleSearchSymbolFields.SearchFor]?.AsString();
+            set => this.Set((int)ExampleSearchSymbolFields.SearchFor, value);
         }
     }
 }
diff --git a/src/test/Example.Extension/ExampleTableDefinitions.cs b/src/test/Example.Extension/ExampleTableDefinitions.cs
index 4901cc09..a2b81698 100644
--- a/src/test/Example.Extension/ExampleTableDefinitions.cs
+++ b/src/test/Example.Extension/ExampleTableDefinitions.cs
@@ -8,14 +8,14 @@ namespace Example.Extension
     {
         public static readonly TableDefinition ExampleTable = new TableDefinition(
             "Wix4Example",
-            ExampleTupleDefinitions.Example,
+            ExampleSymbolDefinitions.Example,
             new[]
             {
                 new ColumnDefinition("Example", ColumnType.String, 72, true, false, ColumnCategory.Identifier),
                 new ColumnDefinition("Value", ColumnType.String, 0, false, false, ColumnCategory.Formatted),
             },
             strongRowType: typeof(ExampleRow),
-            tupleIdIsPrimaryKey: true
+            symbolIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition NotInAll = new TableDefinition(
@@ -26,7 +26,7 @@ namespace Example.Extension
                 new ColumnDefinition("Example", ColumnType.String, 72, true, false, ColumnCategory.Identifier),
                 new ColumnDefinition("Value", ColumnType.String, 0, false, false, ColumnCategory.Formatted),
             },
-            tupleIdIsPrimaryKey: true
+            symbolIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition[] All = new[] { ExampleTable };
diff --git a/src/test/Example.Extension/ExampleTuple.cs b/src/test/Example.Extension/ExampleTuple.cs
index f2bcb925..314087e9 100644
--- a/src/test/Example.Extension/ExampleTuple.cs
+++ b/src/test/Example.Extension/ExampleTuple.cs
@@ -4,27 +4,27 @@ namespace Example.Extension
 {
     using WixToolset.Data;
 
-    public enum ExampleTupleFields
+    public enum ExampleSymbolFields
     {
         Value,
     }
 
-    public class ExampleTuple : IntermediateTuple
+    public class ExampleSymbol : IntermediateSymbol
     {
-        public ExampleTuple() : base(ExampleTupleDefinitions.Example, null, null)
+        public ExampleSymbol() : base(ExampleSymbolDefinitions.Example, null, null)
         {
         }
 
-        public ExampleTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ExampleTupleDefinitions.Example, sourceLineNumber, id)
+        public ExampleSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(ExampleSymbolDefinitions.Example, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[ExampleTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[ExampleSymbolFields index] => this.Fields[(int)index];
 
         public string Value
         {
-            get => this.Fields[(int)ExampleTupleFields.Value]?.AsString();
-            set => this.Set((int)ExampleTupleFields.Value, value);
+            get => this.Fields[(int)ExampleSymbolFields.Value]?.AsString();
+            set => this.Set((int)ExampleSymbolFields.Value, value);
         }
     }
 }
diff --git a/src/test/Example.Extension/ExampleTupleDefinitions.cs b/src/test/Example.Extension/ExampleTupleDefinitions.cs
index 446c2c45..f13d716d 100644
--- a/src/test/Example.Extension/ExampleTupleDefinitions.cs
+++ b/src/test/Example.Extension/ExampleTupleDefinitions.cs
@@ -6,58 +6,58 @@ namespace Example.Extension
     using WixToolset.Data;
     using WixToolset.Data.Burn;
 
-    public enum ExampleTupleDefinitionType
+    public enum ExampleSymbolDefinitionType
     {
         Example,
         ExampleSearch,
     }
 
-    public static class ExampleTupleDefinitions
+    public static class ExampleSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition Example = new IntermediateTupleDefinition(
-            ExampleTupleDefinitionType.Example.ToString(),
+        public static readonly IntermediateSymbolDefinition Example = new IntermediateSymbolDefinition(
+            ExampleSymbolDefinitionType.Example.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ExampleTupleFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExampleSymbolFields.Value), IntermediateFieldType.String),
             },
-            typeof(ExampleTuple));
+            typeof(ExampleSymbol));
 
-        public static readonly IntermediateTupleDefinition ExampleSearch = new IntermediateTupleDefinition(
-            ExampleTupleDefinitionType.ExampleSearch.ToString(),
+        public static readonly IntermediateSymbolDefinition ExampleSearch = new IntermediateSymbolDefinition(
+            ExampleSymbolDefinitionType.ExampleSearch.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ExampleSearchTupleFields.SearchFor), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ExampleSearchSymbolFields.SearchFor), IntermediateFieldType.String),
             },
-            typeof(ExampleSearchTuple));
+            typeof(ExampleSearchSymbol));
 
-        static ExampleTupleDefinitions()
+        static ExampleSymbolDefinitions()
         {
-            ExampleSearch.AddTag(BurnConstants.BundleExtensionSearchTupleDefinitionTag);
+            ExampleSearch.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag);
         }
 
-        public static bool TryGetTupleType(string name, out ExampleTupleDefinitionType type)
+        public static bool TryGetSymbolType(string name, out ExampleSymbolDefinitionType type)
         {
             return Enum.TryParse(name, out type);
         }
 
-        public static IntermediateTupleDefinition ByName(string name)
+        public static IntermediateSymbolDefinition ByName(string name)
         {
-            if (!TryGetTupleType(name, out var type))
+            if (!TryGetSymbolType(name, out var type))
             {
                 return null;
             }
             return ByType(type);
         }
 
-        public static IntermediateTupleDefinition ByType(ExampleTupleDefinitionType type)
+        public static IntermediateSymbolDefinition ByType(ExampleSymbolDefinitionType type)
         {
             switch (type)
             {
-                case ExampleTupleDefinitionType.Example:
-                    return ExampleTupleDefinitions.Example;
+                case ExampleSymbolDefinitionType.Example:
+                    return ExampleSymbolDefinitions.Example;
 
-                case ExampleTupleDefinitionType.ExampleSearch:
-                    return ExampleTupleDefinitions.ExampleSearch;
+                case ExampleSymbolDefinitionType.ExampleSearch:
+                    return ExampleSymbolDefinitions.ExampleSearch;
 
                 default:
                     throw new ArgumentOutOfRangeException(nameof(type));
diff --git a/src/test/Example.Extension/ExampleWindowsInstallerBackendExtension.cs b/src/test/Example.Extension/ExampleWindowsInstallerBackendExtension.cs
index 4ce4635f..2c108d96 100644
--- a/src/test/Example.Extension/ExampleWindowsInstallerBackendExtension.cs
+++ b/src/test/Example.Extension/ExampleWindowsInstallerBackendExtension.cs
@@ -11,23 +11,23 @@ namespace Example.Extension
     {
         public override IEnumerable<TableDefinition> TableDefinitions => ExampleTableDefinitions.All;
 
-        public override bool TryAddTupleToOutput(IntermediateSection section, IntermediateTuple tuple, WindowsInstallerData output, TableDefinitionCollection tableDefinitions)
+        public override bool TryAddSymbolToOutput(IntermediateSection section, IntermediateSymbol symbol, WindowsInstallerData output, TableDefinitionCollection tableDefinitions)
         {
-            if (ExampleTupleDefinitions.TryGetTupleType(tuple.Definition.Name, out var tupleType))
+            if (ExampleSymbolDefinitions.TryGetSymbolType(symbol.Definition.Name, out var symbolType))
             {
-                switch (tupleType)
+                switch (symbolType)
                 {
-                    case ExampleTupleDefinitionType.Example:
+                    case ExampleSymbolDefinitionType.Example:
                         {
-                            var row = (ExampleRow)this.BackendHelper.CreateRow(section, tuple, output, ExampleTableDefinitions.ExampleTable);
-                            row.Example = tuple.Id.Id;
-                            row.Value = tuple[0].AsString();
+                            var row = (ExampleRow)this.BackendHelper.CreateRow(section, symbol, output, ExampleTableDefinitions.ExampleTable);
+                            row.Example = symbol.Id.Id;
+                            row.Value = symbol[0].AsString();
                         }
                         return true;
                 }
             }
 
-            return base.TryAddTupleToOutput(section, tuple, output, tableDefinitions);
+            return base.TryAddSymbolToOutput(section, symbol, output, tableDefinitions);
         }
     }
 }
diff --git a/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs b/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
index b86e67ff..cf57eae1 100644
--- a/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
@@ -12,7 +12,7 @@ namespace WixToolsetTest.CoreIntegration
     using WixToolset.Core.TestPackage;
     using WixToolset.Data;
     using WixToolset.Data.Burn;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
     using Xunit;
 
     public class BundleFixture
@@ -81,14 +81,14 @@ namespace WixToolsetTest.CoreIntegration
                     var intermediate = Intermediate.Load(wixOutput);
                     var section = intermediate.Sections.Single();
 
-                    var bundleTuple = section.Tuples.OfType<WixBundleTuple>().Single();
-                    Assert.Equal("1.0.0.0", bundleTuple.Version);
+                    var bundleSymbol = section.Symbols.OfType<WixBundleSymbol>().Single();
+                    Assert.Equal("1.0.0.0", bundleSymbol.Version);
 
-                    var previousVersion = bundleTuple.Fields[(int)WixBundleTupleFields.Version].PreviousValue;
+                    var previousVersion = bundleSymbol.Fields[(int)WixBundleSymbolFields.Version].PreviousValue;
                     Assert.Equal("!(bind.packageVersion.test.msi)", previousVersion.AsString());
 
-                    var msiTuple = section.Tuples.OfType<WixBundlePackageTuple>().Single();
-                    Assert.Equal("test.msi", msiTuple.Id.Id);
+                    var msiSymbol = section.Symbols.OfType<WixBundlePackageSymbol>().Single();
+                    Assert.Equal("test.msi", msiSymbol.Id.Id);
 
                     var extractResult = BundleExtractor.ExtractBAContainer(null, exePath, baFolderPath, extractFolderPath);
                     extractResult.AssertSuccess();
@@ -111,7 +111,7 @@ namespace WixToolsetTest.CoreIntegration
 
                     var registrationElements = extractResult.SelectManifestNodes("/burn:BurnManifest/burn:Registration");
                     var registrationElement = (XmlNode)Assert.Single(registrationElements);
-                    Assert.Equal($"<Registration Id='{bundleTuple.BundleId}' ExecutableName='test.exe' PerMachine='yes' Tag='' Version='1.0.0.0' ProviderKey='{bundleTuple.BundleId}'>" +
+                    Assert.Equal($"<Registration Id='{bundleSymbol.BundleId}' ExecutableName='test.exe' PerMachine='yes' Tag='' Version='1.0.0.0' ProviderKey='{bundleSymbol.BundleId}'>" +
                         "<Arp Register='yes' DisplayName='~TestBundle' DisplayVersion='1.0.0.0' Publisher='Example Corporation' />" +
                         "</Registration>", registrationElement.GetTestXml());
                 }
diff --git a/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs
index bad7f3ef..ff0c3258 100644
--- a/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs
@@ -9,7 +9,7 @@ namespace WixToolsetTest.CoreIntegration
     using WixBuildTools.TestSupport;
     using WixToolset.Core.TestPackage;
     using WixToolset.Data;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
     using Xunit;
 
     public class ExtensionFixture
@@ -58,11 +58,11 @@ namespace WixToolsetTest.CoreIntegration
                 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\extest.wixpdb"));
                 var section = intermediate.Sections.Single();
 
-                var fileTuple = section.Tuples.OfType<FileTuple>().Single();
-                Assert.Equal(Path.Combine(folder, @"data\example.txt"), fileTuple[FileTupleFields.Source].AsPath().Path);
-                Assert.Equal(@"example.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path);
+                var fileSymbol = section.Symbols.OfType<FileSymbol>().Single();
+                Assert.Equal(Path.Combine(folder, @"data\example.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path);
+                Assert.Equal(@"example.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path);
 
-                var example = section.Tuples.Where(t => t.Definition.Type == TupleDefinitionType.MustBeFromAnExtension).Single();
+                var example = section.Symbols.Where(t => t.Definition.Type == SymbolDefinitionType.MustBeFromAnExtension).Single();
                 Assert.Equal("Foo", example.Id?.Id);
                 Assert.Equal("Bar", example[0].AsString());
             }
@@ -96,7 +96,7 @@ namespace WixToolsetTest.CoreIntegration
                 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\extest.wixpdb"));
                 var section = intermediate.Sections.Single();
 
-                var property = section.Tuples.OfType<PropertyTuple>().Where(p => p.Id.Id == "ExampleProperty").Single();
+                var property = section.Symbols.OfType<PropertySymbol>().Where(p => p.Id.Id == "ExampleProperty").Single();
                 Assert.Equal("ExampleProperty", property.Id.Id);
                 Assert.Equal("test", property.Value);
             }
@@ -111,7 +111,7 @@ namespace WixToolsetTest.CoreIntegration
             {
                 var intermediateFolder = fs.GetFolder();
 
-                var exception = Assert.Throws<WixException>(() => 
+                var exception = Assert.Throws<WixException>(() =>
                     WixRunner.Execute(new[]
                     {
                         "build",
diff --git a/src/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs b/src/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs
index 97e6bde9..5e08ca58 100644
--- a/src/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs
@@ -9,7 +9,7 @@ namespace WixToolsetTest.CoreIntegration
     using WixToolset.Core;
     using WixToolset.Core.TestPackage;
     using WixToolset.Data;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
     using WixToolset.Extensibility.Data;
     using WixToolset.Extensibility.Services;
     using Xunit;
@@ -27,12 +27,12 @@ namespace WixToolsetTest.CoreIntegration
             var messaging = serviceProvider.GetService<IMessaging>();
             messaging.SetListener(listener);
 
-            var creator = serviceProvider.GetService<ITupleDefinitionCreator>();
+            var creator = serviceProvider.GetService<ISymbolDefinitionCreator>();
             var context = serviceProvider.GetService<ILinkContext>();
             context.Extensions = Enumerable.Empty<WixToolset.Extensibility.ILinkerExtension>();
             context.ExtensionData = Enumerable.Empty<WixToolset.Extensibility.IExtensionData>();
             context.Intermediates = new[] { intermediate1, intermediate2 };
-            context.TupleDefinitionCreator = creator;
+            context.SymbolDefinitionCreator = creator;
 
             var linker = serviceProvider.GetService<ILinker>();
             linker.Link(context);
@@ -72,10 +72,10 @@ namespace WixToolsetTest.CoreIntegration
                 var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
                 var section = intermediate.Sections.Single();
 
-                var actions = section.Tuples.OfType<WixActionTuple>().Where(wat => wat.Action.StartsWith("Set")).ToList();
+                var actions = section.Symbols.OfType<WixActionSymbol>().Where(wat => wat.Action.StartsWith("Set")).ToList();
                 Assert.Equal(2, actions.Count);
-                //Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[WixFileTupleFields.Source].AsPath().Path);
-                //Assert.Equal(@"test.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path);
+                //Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[WixFileSymbolFields.Source].AsPath().Path);
+                //Assert.Equal(@"test.txt", wixFile[WixFileSymbolFields.Source].PreviousValue.AsPath().Path);
             }
         }
     }
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs
index fbfebc5b..740d58c7 100644
--- a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs
@@ -9,7 +9,7 @@ namespace WixToolsetTest.CoreIntegration
     using WixBuildTools.TestSupport;
     using WixToolset.Core.TestPackage;
     using WixToolset.Data;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
     using WixToolset.Data.WindowsInstaller;
     using Xunit;
 
@@ -51,9 +51,9 @@ namespace WixToolsetTest.CoreIntegration
 
                 var section = intermediate.Sections.Single();
 
-                var fileTuple = section.Tuples.OfType<FileTuple>().First();
-                Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path);
-                Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path);
+                var fileSymbol = section.Symbols.OfType<FileSymbol>().First();
+                Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path);
+                Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path);
             }
         }
 
@@ -86,9 +86,9 @@ namespace WixToolsetTest.CoreIntegration
                 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"));
                 var section = intermediate.Sections.Single();
 
-                var fileTuple = section.Tuples.OfType<FileTuple>().Single();
-                Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path);
-                Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path);
+                var fileSymbol = section.Symbols.OfType<FileSymbol>().Single();
+                Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path);
+                Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path);
             }
         }
 
@@ -244,14 +244,14 @@ namespace WixToolsetTest.CoreIntegration
                 var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
                 var section = intermediate.Sections.Single();
 
-                var errors = section.Tuples.OfType<ErrorTuple>().ToDictionary(t => t.Id.Id);
+                var errors = section.Symbols.OfType<ErrorSymbol>().ToDictionary(t => t.Id.Id);
                 Assert.Equal("Category 55 Emergency Doomsday Crisis", errors["1234"].Message.Trim());
                 Assert.Equal(" ", errors["5678"].Message);
 
-                var customAction1 = section.Tuples.OfType<CustomActionTuple>().Where(t => t.Id.Id == "CanWeReferenceAnError_YesWeCan").Single();
+                var customAction1 = section.Symbols.OfType<CustomActionSymbol>().Where(t => t.Id.Id == "CanWeReferenceAnError_YesWeCan").Single();
                 Assert.Equal("1234", customAction1.Target);
 
-                var customAction2 = section.Tuples.OfType<CustomActionTuple>().Where(t => t.Id.Id == "TextErrorsWorkOKToo").Single();
+                var customAction2 = section.Symbols.OfType<CustomActionSymbol>().Where(t => t.Id.Id == "TextErrorsWorkOKToo").Single();
                 Assert.Equal("If you see this, something went wrong.", customAction2.Target);
             }
         }
@@ -353,10 +353,10 @@ namespace WixToolsetTest.CoreIntegration
                 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"));
                 var section = intermediate.Sections.Single();
 
-                var fileTuple = section.Tuples.OfType<FileTuple>().Single();
-                Assert.Equal("filyIq8rqcxxf903Hsn5K9L0SWV73g", fileTuple.Id.Id);
-                Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path);
-                Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path);
+                var fileSymbol = section.Symbols.OfType<FileSymbol>().Single();
+                Assert.Equal("filyIq8rqcxxf903Hsn5K9L0SWV73g", fileSymbol.Id.Id);
+                Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path);
+                Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path);
 
                 var data = WindowsInstallerData.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"));
                 var fileRows = data.Tables["File"].Rows;
@@ -405,15 +405,15 @@ namespace WixToolsetTest.CoreIntegration
                 var intermediate = Intermediate.Load(pdbPath);
                 var section = intermediate.Sections.Single();
 
-                var upgradeTuple = section.Tuples.OfType<UpgradeTuple>().Single();
-                Assert.False(upgradeTuple.ExcludeLanguages);
-                Assert.True(upgradeTuple.IgnoreRemoveFailures);
-                Assert.False(upgradeTuple.VersionMaxInclusive);
-                Assert.True(upgradeTuple.VersionMinInclusive);
-                Assert.Equal("13.0.0", upgradeTuple.VersionMax);
-                Assert.Equal("12.0.0", upgradeTuple.VersionMin);
-                Assert.False(upgradeTuple.OnlyDetect);
-                Assert.Equal("BLAHBLAHBLAH", upgradeTuple.ActionProperty);
+                var upgradeSymbol = section.Symbols.OfType<UpgradeSymbol>().Single();
+                Assert.False(upgradeSymbol.ExcludeLanguages);
+                Assert.True(upgradeSymbol.IgnoreRemoveFailures);
+                Assert.False(upgradeSymbol.VersionMaxInclusive);
+                Assert.True(upgradeSymbol.VersionMinInclusive);
+                Assert.Equal("13.0.0", upgradeSymbol.VersionMax);
+                Assert.Equal("12.0.0", upgradeSymbol.VersionMin);
+                Assert.False(upgradeSymbol.OnlyDetect);
+                Assert.Equal("BLAHBLAHBLAH", upgradeSymbol.ActionProperty);
 
                 var pdb = WindowsInstallerData.Load(pdbPath, suppressVersionCheck: false);
                 var secureProperties = pdb.Tables["Property"].Rows.Where(row => row.GetKey() == "SecureCustomProperties").Single();
@@ -581,9 +581,9 @@ namespace WixToolsetTest.CoreIntegration
                 var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
                 var section = intermediate.Sections.Single();
 
-                var fileTuple = section.Tuples.OfType<FileTuple>().Single();
-                Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path);
-                Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path);
+                var fileSymbol = section.Symbols.OfType<FileSymbol>().Single();
+                Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path);
+                Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path);
             }
         }
 
@@ -617,11 +617,11 @@ namespace WixToolsetTest.CoreIntegration
                 var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
                 var section = intermediate.Sections.Single();
 
-                var fileTuple = section.Tuples.OfType<FileTuple>().Single();
-                Assert.Equal(Path.Combine(folder, @"data\candle.exe"), fileTuple[FileTupleFields.Source].AsPath().Path);
-                Assert.Equal(@"candle.exe", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path);
+                var fileSymbol = section.Symbols.OfType<FileSymbol>().Single();
+                Assert.Equal(Path.Combine(folder, @"data\candle.exe"), fileSymbol[FileSymbolFields.Source].AsPath().Path);
+                Assert.Equal(@"candle.exe", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path);
 
-                var msiAssemblyNameTuples = section.Tuples.OfType<MsiAssemblyNameTuple>();
+                var msiAssemblyNameSymbols = section.Symbols.OfType<MsiAssemblyNameSymbol>();
                 Assert.Equal(new[]
                 {
                     "culture",
@@ -630,7 +630,7 @@ namespace WixToolsetTest.CoreIntegration
                     "processorArchitecture",
                     "publicKeyToken",
                     "version"
-                }, msiAssemblyNameTuples.OrderBy(a => a.Name).Select(a => a.Name).ToArray());
+                }, msiAssemblyNameSymbols.OrderBy(a => a.Name).Select(a => a.Name).ToArray());
 
                 Assert.Equal(new[]
                 {
@@ -640,7 +640,7 @@ namespace WixToolsetTest.CoreIntegration
                     "x86",
                     "256B3414DFA97718",
                     "3.0.0.0"
-                }, msiAssemblyNameTuples.OrderBy(a => a.Name).Select(a => a.Value).ToArray());
+                }, msiAssemblyNameSymbols.OrderBy(a => a.Name).Select(a => a.Value).ToArray());
             }
         }
 
@@ -671,7 +671,7 @@ namespace WixToolsetTest.CoreIntegration
                 var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
                 var section = intermediate.Sections.Single();
 
-                var platformSummary = section.Tuples.OfType<SummaryInformationTuple>().Single(s => s.PropertyId == SummaryInformationType.PlatformAndLanguage);
+                var platformSummary = section.Symbols.OfType<SummaryInformationSymbol>().Single(s => s.PropertyId == SummaryInformationType.PlatformAndLanguage);
                 Assert.Equal("x64;1033", platformSummary.Value);
             }
         }
@@ -704,12 +704,12 @@ namespace WixToolsetTest.CoreIntegration
                 var section = intermediate.Sections.Single();
 
                 // Only one component is shared.
-                var sharedComponentTuples = section.Tuples.OfType<ComponentTuple>();
-                Assert.Equal(1, sharedComponentTuples.Sum(t => t.Shared ? 1 : 0));
+                var sharedComponentSymbols = section.Symbols.OfType<ComponentSymbol>();
+                Assert.Equal(1, sharedComponentSymbols.Sum(t => t.Shared ? 1 : 0));
 
                 // And it is this one.
-                var sharedComponentTuple = sharedComponentTuples.Single(t => t.Id.Id == "Shared.dll");
-                Assert.True(sharedComponentTuple.Shared);
+                var sharedComponentSymbol = sharedComponentSymbols.Single(t => t.Id.Id == "Shared.dll");
+                Assert.True(sharedComponentSymbol.Shared);
             }
         }
 
@@ -775,7 +775,7 @@ namespace WixToolsetTest.CoreIntegration
                 var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"));
                 var section = intermediate.Sections.Single();
 
-                var progids = section.Tuples.OfType<ProgIdTuple>().OrderBy(tuple => tuple.ProgId).ToList();
+                var progids = section.Symbols.OfType<ProgIdSymbol>().OrderBy(symbol => symbol.ProgId).ToList();
                 Assert.Equal(new[]
                 {
                     "Foo.File.hol",
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
index c78b0c29..078a33d5 100644
--- a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
@@ -9,7 +9,7 @@ namespace WixToolsetTest.CoreIntegration
     using WixBuildTools.TestSupport;
     using WixToolset.Core.TestPackage;
     using WixToolset.Data;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
     using WixToolset.Data.WindowsInstaller;
     using Xunit;
 
@@ -1074,7 +1074,7 @@ namespace WixToolsetTest.CoreIntegration
 
                 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"));
                 var section = intermediate.Sections.Single();
-                Assert.Empty(section.Tuples.OfType<FileTuple>());
+                Assert.Empty(section.Symbols.OfType<FileSymbol>());
 
                 var data = WindowsInstallerData.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"));
                 Assert.Null(data.Tables["File"]);
diff --git a/src/test/WixToolsetTest.CoreIntegration/ParseFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ParseFixture.cs
index afb93041..83f74a47 100644
--- a/src/test/WixToolsetTest.CoreIntegration/ParseFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/ParseFixture.cs
@@ -5,7 +5,7 @@ namespace WixToolsetTest.CoreIntegration
     using System.Linq;
     using WixToolset.Core;
     using WixToolset.Data;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
     using WixToolset.Extensibility.Data;
     using WixToolset.Extensibility.Services;
     using Xunit;
@@ -25,7 +25,7 @@ namespace WixToolsetTest.CoreIntegration
             parseHelper.CreateCustomActionReference(null, section, "CustomAction", Platform.X64, CustomActionPlatforms.X86 | CustomActionPlatforms.ARM);
             parseHelper.CreateCustomActionReference(null, section, "CustomAction", Platform.X64, CustomActionPlatforms.X86 | CustomActionPlatforms.X64);
 
-            var simpleReferences = section.Tuples.OfType<WixSimpleReferenceTuple>();
+            var simpleReferences = section.Symbols.OfType<WixSimpleReferenceSymbol>();
             Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:Wix4CustomAction32_X86").FirstOrDefault());
             Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:Wix4CustomArmAction_X86").FirstOrDefault());
             Assert.NotNull(simpleReferences.Where(t => t.SymbolicName == "CustomAction:Wix4CustomArmAction_A64").FirstOrDefault());
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs b/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs
index 25067830..942f253f 100644
--- a/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs
@@ -8,7 +8,7 @@ namespace WixToolsetTest.CoreIntegration
     using WixBuildTools.TestSupport;
     using WixToolset.Core.TestPackage;
     using WixToolset.Data;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
     using Example.Extension;
     using Xunit;
 
@@ -62,9 +62,9 @@ namespace WixToolsetTest.CoreIntegration
 
                 var section = intermediate.Sections.Single();
 
-                var fileTuple = section.Tuples.OfType<FileTuple>().First();
-                Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path);
-                Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path);
+                var fileSymbol = section.Symbols.OfType<FileSymbol>().First();
+                Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path);
+                Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path);
             }
         }
 
@@ -132,14 +132,14 @@ namespace WixToolsetTest.CoreIntegration
                 var section = intermediate.Sections.Single();
 
                 {
-                    var fileTuple = section.Tuples.OfType<FileTuple>().Single();
-                    Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path);
-                    Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path);
+                    var fileSymbol = section.Symbols.OfType<FileSymbol>().Single();
+                    Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path);
+                    Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path);
                 }
 
                 {
-                    var binary = section.Tuples.OfType<BinaryTuple>().Single();
-                    var path = binary[BinaryTupleFields.Data].AsPath().Path;
+                    var binary = section.Symbols.OfType<BinarySymbol>().Single();
+                    var path = binary[BinarySymbolFields.Data].AsPath().Path;
                     Assert.StartsWith(Path.Combine(baseFolder, @"obj\Example.Extension"), path);
                     Assert.EndsWith(@"wix-ir\example.txt", path);
                     Assert.Equal(@"BinFromWir", binary.Id.Id);
@@ -187,14 +187,14 @@ namespace WixToolsetTest.CoreIntegration
                 var section = intermediate.Sections.Single();
 
                 {
-                    var fileTuple = section.Tuples.OfType<FileTuple>().Single();
-                    Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path);
-                    Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path);
+                    var fileSymbol = section.Symbols.OfType<FileSymbol>().Single();
+                    Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path);
+                    Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path);
                 }
 
                 {
-                    var binary = section.Tuples.OfType<BinaryTuple>().Single();
-                    var path = binary[BinaryTupleFields.Data].AsPath().Path;
+                    var binary = section.Symbols.OfType<BinarySymbol>().Single();
+                    var path = binary[BinarySymbolFields.Data].AsPath().Path;
                     Assert.StartsWith(Path.Combine(baseFolder, @"obj\test"), path);
                     Assert.EndsWith(@"wix-ir\example.txt", path);
                     Assert.Equal(@"BinFromWir", binary.Id.Id);
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs b/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
index 63771248..6ae2c0b8 100644
--- a/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs
@@ -9,7 +9,7 @@ namespace WixToolsetTest.CoreIntegration
     using WixBuildTools.TestSupport;
     using WixToolset.Core.TestPackage;
     using WixToolset.Data;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
     using Xunit;
 
     public class WixlibFixture
@@ -80,11 +80,11 @@ namespace WixToolsetTest.CoreIntegration
                 result.AssertSuccess();
 
                 var wixlib = Intermediate.Load(wixlibPath);
-                var binaryTuples = wixlib.Sections.SelectMany(s => s.Tuples).OfType<BinaryTuple>().ToList();
-                Assert.Equal(3, binaryTuples.Count);
-                Assert.Single(binaryTuples.Where(t => t.Data.Path == "wix-ir/foo.dll"));
-                Assert.Single(binaryTuples.Where(t => t.Data.Path == "wix-ir/foo.dll-1"));
-                Assert.Single(binaryTuples.Where(t => t.Data.Path == "wix-ir/foo.dll-2"));
+                var binarySymbols = wixlib.Sections.SelectMany(s => s.Symbols).OfType<BinarySymbol>().ToList();
+                Assert.Equal(3, binarySymbols.Count);
+                Assert.Single(binarySymbols.Where(t => t.Data.Path == "wix-ir/foo.dll"));
+                Assert.Single(binarySymbols.Where(t => t.Data.Path == "wix-ir/foo.dll-1"));
+                Assert.Single(binarySymbols.Where(t => t.Data.Path == "wix-ir/foo.dll-2"));
             }
         }
 
@@ -138,9 +138,9 @@ namespace WixToolsetTest.CoreIntegration
 
                 var section = intermediate.Sections.Single();
 
-                var wixFile = section.Tuples.OfType<FileTuple>().First();
-                Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[FileTupleFields.Source].AsPath().Path);
-                Assert.Equal(@"test.txt", wixFile[FileTupleFields.Source].PreviousValue.AsPath().Path);
+                var wixFile = section.Symbols.OfType<FileSymbol>().First();
+                Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[FileSymbolFields.Source].AsPath().Path);
+                Assert.Equal(@"test.txt", wixFile[FileSymbolFields.Source].PreviousValue.AsPath().Path);
             }
         }
 
@@ -183,11 +183,11 @@ namespace WixToolsetTest.CoreIntegration
                 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"));
                 var section = intermediate.Sections.Single();
 
-                var fileTuple = section.Tuples.OfType<FileTuple>().Single();
-                Assert.Equal(Path.Combine(folder, @"data\example.txt"), fileTuple[FileTupleFields.Source].AsPath().Path);
-                Assert.Equal(@"example.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path);
+                var fileSymbol = section.Symbols.OfType<FileSymbol>().Single();
+                Assert.Equal(Path.Combine(folder, @"data\example.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path);
+                Assert.Equal(@"example.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path);
 
-                var example = section.Tuples.Where(t => t.Definition.Type == TupleDefinitionType.MustBeFromAnExtension).Single();
+                var example = section.Symbols.Where(t => t.Definition.Type == SymbolDefinitionType.MustBeFromAnExtension).Single();
                 Assert.Equal("Foo", example.Id?.Id);
                 Assert.Equal("Bar", example[0].AsString());
             }
@@ -244,13 +244,13 @@ namespace WixToolsetTest.CoreIntegration
                 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"));
                 var section = intermediate.Sections.Single();
 
-                var fileTuples = section.Tuples.OfType<FileTuple>().OrderBy(t => Path.GetFileName(t.Source.Path)).ToArray();
-                Assert.Equal(Path.Combine(folder, @"data\example.txt"), fileTuples[0][FileTupleFields.Source].AsPath().Path);
-                Assert.Equal(@"example.txt", fileTuples[0][FileTupleFields.Source].PreviousValue.AsPath().Path);
-                Assert.Equal(Path.Combine(folder, @"data\other.txt"), fileTuples[1][FileTupleFields.Source].AsPath().Path);
-                Assert.Equal(@"other.txt", fileTuples[1][FileTupleFields.Source].PreviousValue.AsPath().Path);
+                var fileSymbols = section.Symbols.OfType<FileSymbol>().OrderBy(t => Path.GetFileName(t.Source.Path)).ToArray();
+                Assert.Equal(Path.Combine(folder, @"data\example.txt"), fileSymbols[0][FileSymbolFields.Source].AsPath().Path);
+                Assert.Equal(@"example.txt", fileSymbols[0][FileSymbolFields.Source].PreviousValue.AsPath().Path);
+                Assert.Equal(Path.Combine(folder, @"data\other.txt"), fileSymbols[1][FileSymbolFields.Source].AsPath().Path);
+                Assert.Equal(@"other.txt", fileSymbols[1][FileSymbolFields.Source].PreviousValue.AsPath().Path);
 
-                var examples = section.Tuples.Where(t => t.Definition.Type == TupleDefinitionType.MustBeFromAnExtension).ToArray();
+                var examples = section.Symbols.Where(t => t.Definition.Type == SymbolDefinitionType.MustBeFromAnExtension).ToArray();
                 Assert.Equal(new string[] { "Foo", "Other" }, examples.Select(t => t.Id?.Id).ToArray());
                 Assert.Equal(new[] { "Bar", "Value" }, examples.Select(t => t[0].AsString()).ToArray());
             }
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixlibQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/WixlibQueryFixture.cs
index 7f9b9686..57351b27 100644
--- a/src/test/WixToolsetTest.CoreIntegration/WixlibQueryFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/WixlibQueryFixture.cs
@@ -7,7 +7,7 @@ namespace WixToolsetTest.CoreIntegration
     using WixBuildTools.TestSupport;
     using WixToolset.Core.TestPackage;
     using WixToolset.Data;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
     using Xunit;
 
     public class WixlibQueryFixture
@@ -34,9 +34,9 @@ namespace WixToolsetTest.CoreIntegration
                 result.AssertSuccess();
 
                 var intermediate = Intermediate.Load(wixlibPath);
-                var allTuples = intermediate.Sections.SelectMany(s => s.Tuples);
-                var wixSimpleRefTuples = allTuples.OfType<WixSimpleReferenceTuple>();
-                var repRef = wixSimpleRefTuples.Where(t => t.Table == "WixAction" &&
+                var allSymbols = intermediate.Sections.SelectMany(s => s.Symbols);
+                var wixSimpleRefSymbols = allSymbols.OfType<WixSimpleReferenceSymbol>();
+                var repRef = wixSimpleRefSymbols.Where(t => t.Table == "WixAction" &&
                                                            t.PrimaryKeys == "InstallExecuteSequence/RemoveExistingProducts")
                                                .SingleOrDefault();
                 Assert.NotNull(repRef);
@@ -65,12 +65,12 @@ namespace WixToolsetTest.CoreIntegration
                 result.AssertSuccess();
 
                 var intermediate = Intermediate.Load(wixlibPath);
-                var allTuples = intermediate.Sections.SelectMany(s => s.Tuples);
-                var typeLibTuple = allTuples.OfType<TypeLibTuple>()
+                var allSymbols = intermediate.Sections.SelectMany(s => s.Symbols);
+                var typeLibSymbol = allSymbols.OfType<TypeLibSymbol>()
                                             .SingleOrDefault();
-                Assert.NotNull(typeLibTuple);
+                Assert.NotNull(typeLibSymbol);
 
-                var fields = typeLibTuple.Fields.Select(field => field?.Type == IntermediateFieldType.Bool
+                var fields = typeLibSymbol.Fields.Select(field => field?.Type == IntermediateFieldType.Bool
                                                         ? field.AsNullableNumber()?.ToString()
                                                         : field?.AsString())
                                                 .ToList();