The Great Tuple to Symbol Rename (tm)

15 files changed, 97 insertions, 97 deletions

diff --git a/src/WixToolset.Extensibility/BaseBurnBackendExtension.cs b/src/WixToolset.Extensibility/BaseBurnBackendExtension.cs
index 524f1de8..99bf5e71 100644
--- a/src/WixToolset.Extensibility/BaseBurnBackendExtension.cs
+++ b/src/WixToolset.Extensibility/BaseBurnBackendExtension.cs
@@ -27,9 +27,9 @@ namespace WixToolset.Extensibility
         protected IBurnBackendHelper BackendHelper { get; private set; }
 
         /// <summary>
-        /// Optional tuple definitions.
+        /// Optional symbol definitions.
         /// </summary>
-        protected virtual IEnumerable<IntermediateTupleDefinition> TupleDefinitions => Enumerable.Empty<IntermediateTupleDefinition>();
+        protected virtual IEnumerable<IntermediateSymbolDefinition> SymbolDefinitions => Enumerable.Empty<IntermediateSymbolDefinition>();
 
         public virtual void BundleFinalize()
         {
@@ -56,12 +56,12 @@ namespace WixToolset.Extensibility
             return null;
         }
 
-        public virtual bool TryAddTupleToDataManifest(IntermediateSection section, IntermediateTuple tuple)
+        public virtual bool TryAddSymbolToDataManifest(IntermediateSection section, IntermediateSymbol symbol)
         {
-            if (this.TupleDefinitions.Any(t => t == tuple.Definition) &&
-                tuple.Definition.HasTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag))
+            if (this.SymbolDefinitions.Any(t => t == symbol.Definition) &&
+                symbol.Definition.HasTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag))
             {
-                this.BackendHelper.AddBootstrapperApplicationData(tuple);
+                this.BackendHelper.AddBootstrapperApplicationData(symbol);
                 return true;
             }
 
diff --git a/src/WixToolset.Extensibility/BaseExtensionData.cs b/src/WixToolset.Extensibility/BaseExtensionData.cs
index ddcec873..597a8e4d 100644
--- a/src/WixToolset.Extensibility/BaseExtensionData.cs
+++ b/src/WixToolset.Extensibility/BaseExtensionData.cs
@@ -11,14 +11,14 @@ namespace WixToolset.Extensibility
     {
         public virtual string DefaultCulture => null;
 
-        public virtual Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions)
+        public virtual Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions)
         {
             return null;
         }
 
-        public virtual bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition)
+        public virtual bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition)
         {
-            tupleDefinition = null;
+            symbolDefinition = null;
             return false;
         }
     }
diff --git a/src/WixToolset.Extensibility/BaseLibrarianExtension.cs b/src/WixToolset.Extensibility/BaseLibrarianExtension.cs
index ffcb6684..1f231ba6 100644
--- a/src/WixToolset.Extensibility/BaseLibrarianExtension.cs
+++ b/src/WixToolset.Extensibility/BaseLibrarianExtension.cs
@@ -21,7 +21,7 @@ namespace WixToolset.Extensibility
         /// Messaging for use by the extension.
         /// </summary>
         protected IMessaging Messaging { get; private set; }
-        
+
         /// <summary>
         /// Called at the beginning of combining.
         /// </summary>
@@ -37,10 +37,10 @@ namespace WixToolset.Extensibility
         /// Resolves a path to a file path on disk.
         /// </summary>
         /// <param name="sourceLineNumber">Source line number for the path to resolve.</param>
-        /// <param name="tupleDefinition">Tuple related to the path to resolve.</param>
+        /// <param name="symbolDefinition">Symbol related to the path to resolve.</param>
         /// <param name="path">Path to resolve.</param>
         /// <returns>Optional resolved file result.</returns>
-        public virtual IResolveFileResult ResolveFile(SourceLineNumber sourceLineNumber, IntermediateTupleDefinition tupleDefinition, string path)
+        public virtual IResolveFileResult ResolveFile(SourceLineNumber sourceLineNumber, IntermediateSymbolDefinition symbolDefinition, string path)
         {
             return null;
         }
diff --git a/src/WixToolset.Extensibility/BaseResolverExtension.cs b/src/WixToolset.Extensibility/BaseResolverExtension.cs
index bf606d58..ede903d5 100644
--- a/src/WixToolset.Extensibility/BaseResolverExtension.cs
+++ b/src/WixToolset.Extensibility/BaseResolverExtension.cs
@@ -36,7 +36,7 @@ namespace WixToolset.Extensibility
             this.Messaging = context.ServiceProvider.GetService<IMessaging>();
         }
 
-        public virtual IResolveFileResult ResolveFile(string source, IntermediateTupleDefinition tupleDefinition, SourceLineNumber sourceLineNumbers, BindStage bindStage)
+        public virtual IResolveFileResult ResolveFile(string source, IntermediateSymbolDefinition symbolDefinition, SourceLineNumber sourceLineNumbers, BindStage bindStage)
         {
             return null;
         }
diff --git a/src/WixToolset.Extensibility/BaseWindowsInstallerBackendBinderExtension.cs b/src/WixToolset.Extensibility/BaseWindowsInstallerBackendBinderExtension.cs
index a0bda0b1..20e02f2e 100644
--- a/src/WixToolset.Extensibility/BaseWindowsInstallerBackendBinderExtension.cs
+++ b/src/WixToolset.Extensibility/BaseWindowsInstallerBackendBinderExtension.cs
@@ -5,7 +5,7 @@ namespace WixToolset.Extensibility
     using System.Collections.Generic;
     using System.Linq;
     using WixToolset.Data;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
     using WixToolset.Data.WindowsInstaller;
     using WixToolset.Extensibility.Data;
     using WixToolset.Extensibility.Services;
@@ -51,13 +51,13 @@ namespace WixToolset.Extensibility
 
         public virtual IResolvedCabinet ResolveCabinet(string cabinetPath, IEnumerable<IBindFileWithPath> files) => null;
 
-        public virtual string ResolveMedia(MediaTuple mediaRow, string mediaLayoutDirectory, string layoutDirectory) => null;
+        public virtual string ResolveMedia(MediaSymbol mediaRow, string mediaLayoutDirectory, string layoutDirectory) => null;
 
-        public virtual bool TryAddTupleToOutput(IntermediateSection section, IntermediateTuple tuple, WindowsInstallerData output, TableDefinitionCollection tableDefinitions)
+        public virtual bool TryAddSymbolToOutput(IntermediateSection section, IntermediateSymbol symbol, WindowsInstallerData output, TableDefinitionCollection tableDefinitions)
         {
-            if (this.TableDefinitions.Any(t => t.TupleDefinition == tuple.Definition))
+            if (this.TableDefinitions.Any(t => t.SymbolDefinition == symbol.Definition))
             {
-                return this.BackendHelper.TryAddTupleToOutputMatchingTableDefinitions(section, tuple, output, tableDefinitions);
+                return this.BackendHelper.TryAddSymbolToOutputMatchingTableDefinitions(section, symbol, output, tableDefinitions);
             }
 
             return false;
diff --git a/src/WixToolset.Extensibility/Data/IDelayedField.cs b/src/WixToolset.Extensibility/Data/IDelayedField.cs
index 5c078762..83139413 100644
--- a/src/WixToolset.Extensibility/Data/IDelayedField.cs
+++ b/src/WixToolset.Extensibility/Data/IDelayedField.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
 namespace WixToolset.Extensibility.Data
 {
@@ -8,6 +8,6 @@ namespace WixToolset.Extensibility.Data
     {
         IntermediateField Field { get; }
 
-        IntermediateTuple Row { get; }
+        IntermediateSymbol Symbol { get; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/WixToolset.Extensibility/Data/ILinkContext.cs b/src/WixToolset.Extensibility/Data/ILinkContext.cs
index c12f6d12..ab698c1d 100644
--- a/src/WixToolset.Extensibility/Data/ILinkContext.cs
+++ b/src/WixToolset.Extensibility/Data/ILinkContext.cs
@@ -19,7 +19,7 @@ namespace WixToolset.Extensibility.Data
 
         IEnumerable<Intermediate> Intermediates { get; set; }
 
-        ITupleDefinitionCreator TupleDefinitionCreator { get; set; }
+        ISymbolDefinitionCreator SymbolDefinitionCreator { get; set; }
 
         CancellationToken CancellationToken { get; set; }
     }
diff --git a/src/WixToolset.Extensibility/IBurnBackendExtension.cs b/src/WixToolset.Extensibility/IBurnBackendExtension.cs
index d5f71107..356d208d 100644
--- a/src/WixToolset.Extensibility/IBurnBackendExtension.cs
+++ b/src/WixToolset.Extensibility/IBurnBackendExtension.cs
@@ -17,16 +17,16 @@ namespace WixToolset.Extensibility
         string ResolveUrl(string url, string fallbackUrl, string packageId, string payloadId, string fileName);
 
         /// <summary>
-        /// Called for each extension tuple that hasn't been handled yet.
+        /// Called for each extension symbol that hasn't been handled yet.
         /// Use IBurnBackendHelper to add data to the appropriate data manifest.
         /// </summary>
         /// <param name="section">The linked section.</param>
-        /// <param name="tuple">The current tuple.</param>
+        /// <param name="symbol">The current symbol.</param>
         /// <returns>
-        /// True if the extension handled the tuple, false otherwise.
-        /// The Burn backend will warn on all unhandled tuples.
+        /// True if the extension handled the symbol, false otherwise.
+        /// The Burn backend will warn on all unhandled symbols.
         /// </returns>
-        bool TryAddTupleToDataManifest(IntermediateSection section, IntermediateTuple tuple);
+        bool TryAddSymbolToDataManifest(IntermediateSection section, IntermediateSymbol symbol);
 
         /// <summary>
         /// Called after all output changes occur and right before the output is bound into its final format.
diff --git a/src/WixToolset.Extensibility/IExtensionData.cs b/src/WixToolset.Extensibility/IExtensionData.cs
index 1721a76c..823e2beb 100644
--- a/src/WixToolset.Extensibility/IExtensionData.cs
+++ b/src/WixToolset.Extensibility/IExtensionData.cs
@@ -16,18 +16,18 @@ namespace WixToolset.Extensibility
         string DefaultCulture { get; }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="name"></param>
-        /// <param name="tupleDefinition"></param>
+        /// <param name="symbolDefinition"></param>
         /// <returns>True </returns>
-        bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition);
+        bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition);
 
         /// <summary>
         /// Gets the library associated with this extension.
         /// </summary>
-        /// <param name="tupleDefinitions">The tuple definitions to use while loading the library.</param>
+        /// <param name="symbolDefinitions">The symbol definitions to use while loading the library.</param>
         /// <returns>The library for this extension or null if there is no library.</returns>
-        Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions);
+        Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions);
     }
 }
diff --git a/src/WixToolset.Extensibility/ILibrarianExtension.cs b/src/WixToolset.Extensibility/ILibrarianExtension.cs
index 719ffa34..e52c71c9 100644
--- a/src/WixToolset.Extensibility/ILibrarianExtension.cs
+++ b/src/WixToolset.Extensibility/ILibrarianExtension.cs
@@ -9,7 +9,7 @@ namespace WixToolset.Extensibility
     {
         void PreCombine(ILibraryContext context);
 
-        IResolveFileResult ResolveFile(SourceLineNumber sourceLineNumber, IntermediateTupleDefinition tupleDefinition, string path);
+        IResolveFileResult ResolveFile(SourceLineNumber sourceLineNumber, IntermediateSymbolDefinition symbolDefinition, string path);
 
         void PostCombine(Intermediate library);
     }
diff --git a/src/WixToolset.Extensibility/IResolverExtension.cs b/src/WixToolset.Extensibility/IResolverExtension.cs
index 500b7165..f77581a0 100644
--- a/src/WixToolset.Extensibility/IResolverExtension.cs
+++ b/src/WixToolset.Extensibility/IResolverExtension.cs
@@ -18,7 +18,7 @@ namespace WixToolset.Extensibility
         /// <summary>
         /// Called to attempt to resolve source to a file.
         /// </summary>
-        IResolveFileResult ResolveFile(string source, IntermediateTupleDefinition tupleDefinition, SourceLineNumber sourceLineNumbers, BindStage bindStage);
+        IResolveFileResult ResolveFile(string source, IntermediateSymbolDefinition symbolDefinition, SourceLineNumber sourceLineNumbers, BindStage bindStage);
 
         /// <summary>
         /// Called after all resolving occurs.
diff --git a/src/WixToolset.Extensibility/IWindowsInstallerBackendBinderExtension.cs b/src/WixToolset.Extensibility/IWindowsInstallerBackendBinderExtension.cs
index 34a02cd7..fc769da9 100644
--- a/src/WixToolset.Extensibility/IWindowsInstallerBackendBinderExtension.cs
+++ b/src/WixToolset.Extensibility/IWindowsInstallerBackendBinderExtension.cs
@@ -4,7 +4,7 @@ namespace WixToolset.Extensibility
 {
     using System.Collections.Generic;
     using WixToolset.Data;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
     using WixToolset.Data.WindowsInstaller;
     using WixToolset.Extensibility.Data;
 
@@ -22,9 +22,9 @@ namespace WixToolset.Extensibility
 
         IResolvedCabinet ResolveCabinet(string cabinetPath, IEnumerable<IBindFileWithPath> files);
 
-        string ResolveMedia(MediaTuple mediaRow, string mediaLayoutDirectory, string layoutDirectory);
+        string ResolveMedia(MediaSymbol mediaRow, string mediaLayoutDirectory, string layoutDirectory);
 
-        bool TryAddTupleToOutput(IntermediateSection section, IntermediateTuple tuple, WindowsInstallerData output, TableDefinitionCollection tableDefinitions);
+        bool TryAddSymbolToOutput(IntermediateSection section, IntermediateSymbol symbol, WindowsInstallerData output, TableDefinitionCollection tableDefinitions);
 
         /// <summary>
         /// Called after all output changes occur and right before the output is bound into its final format.
diff --git a/src/WixToolset.Extensibility/Services/IBurnBackendHelper.cs b/src/WixToolset.Extensibility/Services/IBurnBackendHelper.cs
index f6ba7a8f..7e8d7e3e 100644
--- a/src/WixToolset.Extensibility/Services/IBurnBackendHelper.cs
+++ b/src/WixToolset.Extensibility/Services/IBurnBackendHelper.cs
@@ -16,16 +16,16 @@ namespace WixToolset.Extensibility.Services
         void AddBootstrapperApplicationData(string xml);
 
         /// <summary>
-        /// Adds an XML element for the given tuple to the BootstrapperApplicationData manifest.
-        /// The tuple's name is used for the element's name.
-        /// All of the tuple's fields are used for the element's attributes.
+        /// Adds an XML element for the given symbol to the BootstrapperApplicationData manifest.
+        /// The symbol's name is used for the element's name.
+        /// All of the symbol's fields are used for the element's attributes.
         /// </summary>
-        /// <param name="tuple">The tuple to create the element from.</param>
-        /// <param name="tupleIdIsIdAttribute">
-        /// If true and the tuple has an Id,
-        /// then an Id attribute is created with a value of the tuple's Id.
+        /// <param name="symbol">The symbol to create the element from.</param>
+        /// <param name="symbolIdIsIdAttribute">
+        /// If true and the symbol has an Id,
+        /// then an Id attribute is created with a value of the symbol's Id.
         /// </param>
-        void AddBootstrapperApplicationData(IntermediateTuple tuple, bool tupleIdIsIdAttribute = false);
+        void AddBootstrapperApplicationData(IntermediateSymbol symbol, bool symbolIdIsIdAttribute = false);
 
         /// <summary>
         /// Adds the given XML to the BundleExtensionData manifest for the given bundle extension.
@@ -35,16 +35,16 @@ namespace WixToolset.Extensibility.Services
         void AddBundleExtensionData(string extensionId, string xml);
 
         /// <summary>
-        /// Adds an XML element for the given tuple to the BundleExtensionData manifest for the given bundle extension.
-        /// The tuple's name is used for the element's name.
-        /// All of the tuple's fields are used for the element's attributes.
+        /// Adds an XML element for the given symbol to the BundleExtensionData manifest for the given bundle extension.
+        /// The symbol's name is used for the element's name.
+        /// All of the symbol's fields are used for the element's attributes.
         /// </summary>
         /// <param name="extensionId">The bundle extension's id.</param>
-        /// <param name="tuple">The tuple to create the element from.</param>
-        /// <param name="tupleIdIsIdAttribute">
-        /// If true and the tuple has an Id,
-        /// then an Id attribute is created with a value of the tuple's Id.
+        /// <param name="symbol">The symbol to create the element from.</param>
+        /// <param name="symbolIdIsIdAttribute">
+        /// If true and the symbol has an Id,
+        /// then an Id attribute is created with a value of the symbol's Id.
         /// </param>
-        void AddBundleExtensionData(string extensionId, IntermediateTuple tuple, bool tupleIdIsIdAttribute = false);
+        void AddBundleExtensionData(string extensionId, IntermediateSymbol symbol, bool symbolIdIsIdAttribute = false);
     }
 }
diff --git a/src/WixToolset.Extensibility/Services/IParseHelper.cs b/src/WixToolset.Extensibility/Services/IParseHelper.cs
index e3ae30b5..f756cb10 100644
--- a/src/WixToolset.Extensibility/Services/IParseHelper.cs
+++ b/src/WixToolset.Extensibility/Services/IParseHelper.cs
@@ -6,7 +6,7 @@ namespace WixToolset.Extensibility.Services
     using System.Collections.Generic;
     using System.Xml.Linq;
     using WixToolset.Data;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
     using WixToolset.Data.WindowsInstaller;
     using WixToolset.Extensibility.Data;
 
@@ -39,38 +39,38 @@ namespace WixToolset.Extensibility.Services
         Identifier CreateIdentifierFromFilename(string filename);
 
         /// <summary>
-        /// Creates a tuple in the section.
+        /// Creates a symbol in the section.
         /// </summary>
-        /// <param name="section">Section to add the new tuple to.</param>
-        /// <param name="sourceLineNumbers">Source and line number of current tuple.</param>
-        /// <param name="tupleName">Name of tuple definition.</param>
-        /// <param name="identifier">Optional identifier for the tuple.</param>
-        /// <returns>New tuple.</returns>
-        IntermediateTuple CreateTuple(IntermediateSection section, SourceLineNumber sourceLineNumbers, string tupleName, Identifier identifier = null);
+        /// <param name="section">Section to add the new symbol to.</param>
+        /// <param name="sourceLineNumbers">Source and line number of current symbol.</param>
+        /// <param name="symbolName">Name of symbol definition.</param>
+        /// <param name="identifier">Optional identifier for the symbol.</param>
+        /// <returns>New symbol.</returns>
+        IntermediateSymbol CreateSymbol(IntermediateSection section, SourceLineNumber sourceLineNumbers, string symbolName, Identifier identifier = null);
 
         /// <summary>
-        /// Creates a tuple in the section.
+        /// Creates a symbol in the section.
         /// </summary>
-        /// <param name="section">Section to add the new tuple to.</param>
-        /// <param name="sourceLineNumbers">Source and line number of current tuple.</param>
-        /// <param name="tupleDefinition">Tuple definition to create from.</param>
-        /// <param name="identifier">Optional identifier for the tuple.</param>
-        /// <returns>New tuple.</returns>
-        IntermediateTuple CreateTuple(IntermediateSection section, SourceLineNumber sourceLineNumbers, IntermediateTupleDefinition tupleDefinition, Identifier identifier = null);
+        /// <param name="section">Section to add the new symbol to.</param>
+        /// <param name="sourceLineNumbers">Source and line number of current symbol.</param>
+        /// <param name="symbolDefinition">Symbol definition to create from.</param>
+        /// <param name="identifier">Optional identifier for the symbol.</param>
+        /// <returns>New symbol.</returns>
+        IntermediateSymbol CreateSymbol(IntermediateSection section, SourceLineNumber sourceLineNumbers, IntermediateSymbolDefinition symbolDefinition, Identifier identifier = null);
 
         [Obsolete]
-        IntermediateTuple CreateRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, string tableName, Identifier identifier = null);
+        IntermediateSymbol CreateRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, string tableName, Identifier identifier = null);
 
         [Obsolete]
-        IntermediateTuple CreateTuple(IntermediateSection section, SourceLineNumber sourceLineNumbers, TupleDefinitionType tupleType, Identifier identifier = null);
+        IntermediateSymbol CreateSymbol(IntermediateSection section, SourceLineNumber sourceLineNumbers, SymbolDefinitionType symbolType, Identifier identifier = null);
 
         [Obsolete]
-        IntermediateTuple CreateRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, TupleDefinitionType tupleType, Identifier identifier = null);
+        IntermediateSymbol CreateRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, SymbolDefinitionType symbolType, Identifier identifier = null);
 
         /// <summary>
         /// Creates a directory row from a name.
         /// </summary>
-        /// <param name="section">Section to add the new tuple to.</param>
+        /// <param name="section">Section to add the new symbol to.</param>
         /// <param name="sourceLineNumbers">Source line information.</param>
         /// <param name="id">Optional identifier for the new row.</param>
         /// <param name="parentId">Optional identifier for the parent row.</param>
@@ -80,7 +80,7 @@ namespace WixToolset.Extensibility.Services
         /// <param name="sourceName">Optional source name for the directory.</param>
         /// <param name="shortSourceName">Optional short source name for the directory.</param>
         /// <returns>Identifier for the newly created row.</returns>
-        Identifier CreateDirectoryTuple(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string parentId, string name, ISet<string> sectionInlinedDirectoryIds, string shortName = null, string sourceName = null, string shortSourceName = null);
+        Identifier CreateDirectorySymbol(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string parentId, string name, ISet<string> sectionInlinedDirectoryIds, string shortName = null, string sourceName = null, string shortSourceName = null);
 
         [Obsolete]
         Identifier CreateDirectoryRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string parentId, string name, ISet<string> sectionInlinedDirectoryIds, string shortName = null, string sourceName = null, string shortSourceName = null);
@@ -88,7 +88,7 @@ namespace WixToolset.Extensibility.Services
         /// <summary>
         /// Creates directories using the inline directory syntax.
         /// </summary>
-        /// <param name="section">Section to add the new tuple to.</param>
+        /// <param name="section">Section to add the new symbol to.</param>
         /// <param name="sourceLineNumbers">Source line information.</param>
         /// <param name="parentId">Optional identifier of parent directory.</param>
         /// <param name="attribute">The attribute to parse.</param>
@@ -97,16 +97,16 @@ namespace WixToolset.Extensibility.Services
         string CreateDirectoryReferenceFromInlineSyntax(IntermediateSection section, SourceLineNumber sourceLineNumbers, string parentId, XAttribute attribute, ISet<string> sectionInlinedDirectoryIds);
 
         /// <summary>
-        /// Creates a Registry tuple in the active section.
+        /// Creates a Registry symbol in the active section.
         /// </summary>
-        /// <param name="sourceLineNumbers">Source and line number of the current tuple.</param>
+        /// <param name="sourceLineNumbers">Source and line number of the current symbol.</param>
         /// <param name="root">The registry entry root.</param>
         /// <param name="key">The registry entry key.</param>
         /// <param name="name">The registry entry name.</param>
         /// <param name="value">The registry entry value.</param>
         /// <param name="componentId">The component which will control installation/uninstallation of the registry entry.</param>
         /// <param name="escapeLeadingHash">If true, "escape" leading '#' characters so the value is written as a REG_SZ.</param>
-        Identifier CreateRegistryTuple(IntermediateSection section, SourceLineNumber sourceLineNumbers, RegistryRootType root, string key, string name, string value, string componentId, bool escapeLeadingHash);
+        Identifier CreateRegistrySymbol(IntermediateSection section, SourceLineNumber sourceLineNumbers, RegistryRootType root, string key, string name, string value, string componentId, bool escapeLeadingHash);
 
         [Obsolete]
         Identifier CreateRegistryRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, RegistryRootType root, string key, string name, string value, string componentId, bool escapeLeadingHash);
@@ -122,20 +122,20 @@ namespace WixToolset.Extensibility.Services
         string CreateShortName(string longName, bool keepExtension, bool allowWildcards, params string[] args);
 
         /// <summary>
-        /// Create a WixSimpleReference tuple in the active section.
+        /// Create a WixSimpleReference symbol in the active section.
         /// </summary>
         /// <param name="sourceLineNumbers">Source line information for the row.</param>
-        /// <param name="tupleName">The tuple name of the simple reference.</param>
+        /// <param name="symbolName">The symbol name of the simple reference.</param>
         /// <param name="primaryKeys">The primary keys of the simple reference.</param>
-        void CreateSimpleReference(IntermediateSection section, SourceLineNumber sourceLineNumbers, string tupleName, params string[] primaryKeys);
+        void CreateSimpleReference(IntermediateSection section, SourceLineNumber sourceLineNumbers, string symbolName, params string[] primaryKeys);
 
         /// <summary>
-        /// Create a WixSimpleReference tuple in the active section.
+        /// Create a WixSimpleReference symbol in the active section.
         /// </summary>
         /// <param name="sourceLineNumbers">Source line information for the row.</param>
-        /// <param name="tupleDefinition">The tuple definition of the simple reference.</param>
+        /// <param name="symbolDefinition">The symbol definition of the simple reference.</param>
         /// <param name="primaryKeys">The primary keys of the simple reference.</param>
-        void CreateSimpleReference(IntermediateSection section, SourceLineNumber sourceLineNumbers, IntermediateTupleDefinition tupleDefinition, params string[] primaryKeys);
+        void CreateSimpleReference(IntermediateSection section, SourceLineNumber sourceLineNumbers, IntermediateSymbolDefinition symbolDefinition, params string[] primaryKeys);
 
         /// <summary>
         /// Create a reference in the specified section for a custom action specialized for specific platforms,
@@ -149,7 +149,7 @@ namespace WixToolset.Extensibility.Services
         void CreateCustomActionReference(SourceLineNumber sourceLineNumbers, IntermediateSection section, string customAction, Platform platform, CustomActionPlatforms supportedPlatforms);
 
         /// <summary>
-        /// Creates WixComplexReference and WixGroup tuples in the active section.
+        /// Creates WixComplexReference and WixGroup symbols in the active section.
         /// </summary>
         /// <param name="section">Section to create the reference in.</param>
         /// <param name="sourceLineNumbers">Source line information.</param>
@@ -162,7 +162,7 @@ namespace WixToolset.Extensibility.Services
         void CreateComplexReference(IntermediateSection section, SourceLineNumber sourceLineNumbers, ComplexReferenceParentType parentType, string parentId, string parentLanguage, ComplexReferenceChildType childType, string childId, bool isPrimary);
 
         /// <summary>
-        /// A tuple in the WixGroup table is added for this child node and its parent node.
+        /// A symbol in the WixGroup table is added for this child node and its parent node.
         /// </summary>
         /// <param name="section">Section to create the reference in.</param>
         /// <param name="sourceLineNumbers">Source line information for the row.</param>
@@ -170,13 +170,13 @@ namespace WixToolset.Extensibility.Services
         /// <param name="parentId">Id of the parenet node.</param>
         /// <param name="childType">Complex reference type of child</param>
         /// <param name="childId">Id of the Child Node.</param>
-        void CreateWixGroupTuple(IntermediateSection section, SourceLineNumber sourceLineNumbers, ComplexReferenceParentType parentType, string parentId, ComplexReferenceChildType childType, string childId);
+        void CreateWixGroupSymbol(IntermediateSection section, SourceLineNumber sourceLineNumbers, ComplexReferenceParentType parentType, string parentId, ComplexReferenceChildType childType, string childId);
 
         [Obsolete]
         void CreateWixGroupRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, ComplexReferenceParentType parentType, string parentId, ComplexReferenceChildType childType, string childId);
 
         /// <summary>
-        /// Creates a tuple in the WixSearch table.
+        /// Creates a symbol in the WixSearch table.
         /// </summary>
         /// <param name="section">Section to create the reference in.</param>
         /// <param name="sourceLineNumbers">Source line number for the search element.</param>
@@ -186,17 +186,17 @@ namespace WixToolset.Extensibility.Services
         /// <param name="condition">A condition to test before evaluating the search.</param>
         /// <param name="after">The search that this one will execute after.</param>
         /// <param name="bundleExtensionId">The id of the bundle extension that handles this search.</param>
-        void CreateWixSearchTuple(IntermediateSection section, SourceLineNumber sourceLineNumbers, string elementName, Identifier id, string variable, string condition, string after, string bundleExtensionId);
+        void CreateWixSearchSymbol(IntermediateSection section, SourceLineNumber sourceLineNumbers, string elementName, Identifier id, string variable, string condition, string after, string bundleExtensionId);
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="section">Section to create the reference in.</param>
         /// <param name="sourceLineNumbers">Source line number for the parent element.</param>
         /// <param name="id">Identifier of the search (key into the WixSearch table)</param>
         /// <param name="parentId">Identifier of the search that comes before (key into the WixSearch table)</param>
         /// <param name="attributes">Further details about the relation between id and parentId.</param>
-        void CreateWixSearchRelationTuple(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string parentId, int attributes);
+        void CreateWixSearchRelationSymbol(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string parentId, int attributes);
 
         /// <summary>
         /// Checks if the string contains a property (i.e. "foo[Property]bar")
@@ -206,14 +206,14 @@ namespace WixToolset.Extensibility.Services
         bool ContainsProperty(string possibleProperty);
 
         /// <summary>
-        /// Add the appropriate tuples to make sure that the given table shows up in the resulting output.
+        /// Add the appropriate symbols to make sure that the given table shows up in the resulting output.
         /// </summary>
         /// <param name="sourceLineNumbers">Source line numbers.</param>
         /// <param name="tableName">Name of the table to ensure existance of.</param>
         void EnsureTable(IntermediateSection section, SourceLineNumber sourceLineNumbers, string tableName);
 
         /// <summary>
-        /// Add the appropriate tuples to make sure that the given table shows up in the resulting output.
+        /// Add the appropriate symbols to make sure that the given table shows up in the resulting output.
         /// </summary>
         /// <param name="sourceLineNumbers">Source line numbers.</param>
         /// <param name="tableDefinition">Definition of the table to ensure existance of.</param>
@@ -411,9 +411,9 @@ namespace WixToolset.Extensibility.Services
         void ParseForExtensionElements(IEnumerable<ICompilerExtension> extensions, Intermediate intermediate, IntermediateSection section, XElement element);
 
         /// <summary>
-        /// Schedules an action tuple.
+        /// Schedules an action symbol.
         /// </summary>
-        /// <param name="section">Section to add the tuple to.</param>
+        /// <param name="section">Section to add the symbol to.</param>
         /// <param name="sourceLineNumbers">Source line information about the owner element.</param>
         /// <param name="access">Access modifier for the scheduled action.</param>
         /// <param name="sequence">Sequence to add the action to.</param>
@@ -422,7 +422,7 @@ namespace WixToolset.Extensibility.Services
         /// <param name="beforeAction">Optional action to schedule before.</param>
         /// <param name="afterAction">Option action to schedule after.</param>
         /// <param name="overridable">Optional overridable flag.</param>
-        WixActionTuple ScheduleActionTuple(IntermediateSection section, SourceLineNumber sourceLineNumbers, AccessModifier access, SequenceTable sequence, string name, string condition, string beforeAction, string afterAction, bool overridable = false);
+        WixActionSymbol ScheduleActionSymbol(IntermediateSection section, SourceLineNumber sourceLineNumbers, AccessModifier access, SequenceTable sequence, string name, string condition, string beforeAction, string afterAction, bool overridable = false);
 
         /// <summary>
         /// Called when the compiler encounters an unexpected attribute.
diff --git a/src/WixToolset.Extensibility/Services/IWindowsInstallerBackendHelper.cs b/src/WixToolset.Extensibility/Services/IWindowsInstallerBackendHelper.cs
index e23630da..008db83e 100644
--- a/src/WixToolset.Extensibility/Services/IWindowsInstallerBackendHelper.cs
+++ b/src/WixToolset.Extensibility/Services/IWindowsInstallerBackendHelper.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Extensibility.Services
     /// </summary>
     public interface IWindowsInstallerBackendHelper
     {
-        Row CreateRow(IntermediateSection section, IntermediateTuple tuple, WindowsInstallerData output, TableDefinition tableDefinition);
-        bool TryAddTupleToOutputMatchingTableDefinitions(IntermediateSection section, IntermediateTuple tuple, WindowsInstallerData output, TableDefinitionCollection tableDefinitions);
+        Row CreateRow(IntermediateSection section, IntermediateSymbol symbol, WindowsInstallerData output, TableDefinition tableDefinition);
+        bool TryAddSymbolToOutputMatchingTableDefinitions(IntermediateSection section, IntermediateSymbol symbol, WindowsInstallerData output, TableDefinitionCollection tableDefinitions);
     }
 }