2 files changed, 90 insertions, 90 deletions

diff --git a/src/WixToolset.Data/Symbol.cs b/src/WixToolset.Data/Symbol.cs
deleted file mode 100644
index 8bcdd4f0..00000000
--- a/src/WixToolset.Data/Symbol.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-// 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.Data
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// Symbol representing a single row in a database.
-    /// </summary>
-    public sealed class Symbol
-    {
-        private HashSet<Symbol> possibleConflictSymbols;
-        private HashSet<Symbol> redundantSymbols;
-
-        /// <summary>
-        /// Creates a symbol for a row.
-        /// </summary>
-        /// <param name="row">Row for the symbol</param>
-        public Symbol(IntermediateSection section, IntermediateTuple tuple)
-        {
-            this.Row = tuple;
-            this.Section = section;
-            this.Name = String.Concat(this.Row.Definition.Name, ":", this.Row.Id.Id);
-        }
-
-        /// <summary>
-        /// Gets the accessibility of the symbol which is a direct reflection of the accessibility of the row's accessibility.
-        /// </summary>
-        /// <value>Accessbility of the symbol.</value>
-        public AccessModifier Access => this.Row.Id.Access;
-
-        /// <summary>
-        /// Gets the name of the symbol.
-        /// </summary>
-        /// <value>Name of the symbol.</value>
-        public string Name { get; }
-
-        /// <summary>
-        /// Gets the row for this symbol.
-        /// </summary>
-        /// <value>Row for this symbol.</value>
-        public IntermediateTuple Row { get; }
-
-        /// <summary>
-        /// Gets the section for the symbol.
-        /// </summary>
-        /// <value>Section for the symbol.</value>
-        public IntermediateSection Section { get; }
-
-        /// <summary>
-        /// Gets any duplicates of this symbol that are possible conflicts.
-        /// </summary>
-        public IEnumerable<Symbol> PossiblyConflictingSymbols { get { return this.possibleConflictSymbols ?? Enumerable.Empty<Symbol>(); } }
-
-        /// <summary>
-        /// Gets any duplicates of this symbol that are redundant.
-        /// </summary>
-        public IEnumerable<Symbol> RedundantSymbols { get { return this.redundantSymbols ?? Enumerable.Empty<Symbol>(); } }
-
-        /// <summary>
-        /// Adds a duplicate symbol that is a possible conflict.
-        /// </summary>
-        /// <param name="symbol">Symbol that is a possible conflict of this symbol.</param>
-        public void AddPossibleConflict(Symbol symbol)
-        {
-            if (null == this.possibleConflictSymbols)
-            {
-                this.possibleConflictSymbols = new HashSet<Symbol>();
-            }
-
-            this.possibleConflictSymbols.Add(symbol);
-        }
-
-        /// <summary>
-        /// Adds a duplicate symbol that is redundant.
-        /// </summary>
-        /// <param name="symbol">Symbol that is redundant of this symbol.</param>
-        public void AddRedundant(Symbol symbol)
-        {
-            if (null == this.redundantSymbols)
-            {
-                this.redundantSymbols = new HashSet<Symbol>();
-            }
-
-            this.redundantSymbols.Add(symbol);
-        }
-    }
-}
diff --git a/src/WixToolset.Data/TupleWithSection.cs b/src/WixToolset.Data/TupleWithSection.cs
new file mode 100644
index 00000000..a8b88814
--- /dev/null
+++ b/src/WixToolset.Data/TupleWithSection.cs
@@ -0,0 +1,90 @@
+// 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.Data
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+
+    /// <summary>
+    /// Tuple with section representing a single unique tuple.
+    /// </summary>
+    public sealed class TupleWithSection
+    {
+        private HashSet<TupleWithSection> possibleConflicts;
+        private HashSet<TupleWithSection> redundants;
+
+        /// <summary>
+        /// Creates a symbol for a tuple.
+        /// </summary>
+        /// <param name="tuple">Tuple for the symbol</param>
+        public TupleWithSection(IntermediateSection section, IntermediateTuple tuple)
+        {
+            this.Tuple = tuple;
+            this.Section = section;
+            this.Name = String.Concat(this.Tuple.Definition.Name, ":", this.Tuple.Id.Id);
+        }
+
+        /// <summary>
+        /// Gets the accessibility of the symbol which is a direct reflection of the accessibility of the row's accessibility.
+        /// </summary>
+        /// <value>Accessbility of the symbol.</value>
+        public AccessModifier Access => this.Tuple.Id.Access;
+
+        /// <summary>
+        /// Gets the name of the symbol.
+        /// </summary>
+        /// <value>Name of the symbol.</value>
+        public string Name { get; }
+
+        /// <summary>
+        /// Gets the tuple for this symbol.
+        /// </summary>
+        /// <value>Tuple for this symbol.</value>
+        public IntermediateTuple Tuple { get; }
+
+        /// <summary>
+        /// Gets the section for the symbol.
+        /// </summary>
+        /// <value>Section for the symbol.</value>
+        public IntermediateSection Section { get; }
+
+        /// <summary>
+        /// Gets any duplicates of this tuple with sections that are possible conflicts.
+        /// </summary>
+        public IEnumerable<TupleWithSection> PossiblyConflicts => this.possibleConflicts ?? Enumerable.Empty<TupleWithSection>();
+
+        /// <summary>
+        /// Gets any duplicates of this tuple with sections that are redundant.
+        /// </summary>
+        public IEnumerable<TupleWithSection> Redundants => this.redundants ?? Enumerable.Empty<TupleWithSection>();
+
+        /// <summary>
+        /// Adds a duplicate tuple with sections that is a possible conflict.
+        /// </summary>
+        /// <param name="tupleWithSection">Tuple with section that is a possible conflict of this symbol.</param>
+        public void AddPossibleConflict(TupleWithSection tupleWithSection)
+        {
+            if (null == this.possibleConflicts)
+            {
+                this.possibleConflicts = new HashSet<TupleWithSection>();
+            }
+
+            this.possibleConflicts.Add(tupleWithSection);
+        }
+
+        /// <summary>
+        /// Adds a duplicate tuple that is redundant.
+        /// </summary>
+        /// <param name="tupleWithSection">Tuple with section that is redundant of this tuple.</param>
+        public void AddRedundant(TupleWithSection tupleWithSection)
+        {
+            if (null == this.redundants)
+            {
+                this.redundants = new HashSet<TupleWithSection>();
+            }
+
+            this.redundants.Add(tupleWithSection);
+        }
+    }
+}