The Great Tuple to Symbol Rename (tm)

10 files changed, 197 insertions, 197 deletions

diff --git a/src/wixext/Tuples/HelpFileToNamespaceTuple.cs b/src/wixext/Tuples/HelpFileToNamespaceTuple.cs
index f91dacc1..f18d6701 100644
--- a/src/wixext/Tuples/HelpFileToNamespaceTuple.cs
+++ b/src/wixext/Tuples/HelpFileToNamespaceTuple.cs
@@ -3,53 +3,53 @@
 namespace WixToolset.VisualStudio
 {
     using WixToolset.Data;
-    using WixToolset.VisualStudio.Tuples;
+    using WixToolset.VisualStudio.Symbols;
 
-    public static partial class VSTupleDefinitions
+    public static partial class VSSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition HelpFileToNamespace = new IntermediateTupleDefinition(
-            VSTupleDefinitionType.HelpFileToNamespace.ToString(),
+        public static readonly IntermediateSymbolDefinition HelpFileToNamespace = new IntermediateSymbolDefinition(
+            VSSymbolDefinitionType.HelpFileToNamespace.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(HelpFileToNamespaceTupleFields.HelpFileRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(HelpFileToNamespaceTupleFields.HelpNamespaceRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HelpFileToNamespaceSymbolFields.HelpFileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HelpFileToNamespaceSymbolFields.HelpNamespaceRef), IntermediateFieldType.String),
             },
-            typeof(HelpFileToNamespaceTuple));
+            typeof(HelpFileToNamespaceSymbol));
     }
 }
 
-namespace WixToolset.VisualStudio.Tuples
+namespace WixToolset.VisualStudio.Symbols
 {
     using WixToolset.Data;
 
-    public enum HelpFileToNamespaceTupleFields
+    public enum HelpFileToNamespaceSymbolFields
     {
         HelpFileRef,
         HelpNamespaceRef,
     }
 
-    public class HelpFileToNamespaceTuple : IntermediateTuple
+    public class HelpFileToNamespaceSymbol : IntermediateSymbol
     {
-        public HelpFileToNamespaceTuple() : base(VSTupleDefinitions.HelpFileToNamespace, null, null)
+        public HelpFileToNamespaceSymbol() : base(VSSymbolDefinitions.HelpFileToNamespace, null, null)
         {
         }
 
-        public HelpFileToNamespaceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(VSTupleDefinitions.HelpFileToNamespace, sourceLineNumber, id)
+        public HelpFileToNamespaceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(VSSymbolDefinitions.HelpFileToNamespace, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[HelpFileToNamespaceTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[HelpFileToNamespaceSymbolFields index] => this.Fields[(int)index];
 
         public string HelpFileRef
         {
-            get => this.Fields[(int)HelpFileToNamespaceTupleFields.HelpFileRef].AsString();
-            set => this.Set((int)HelpFileToNamespaceTupleFields.HelpFileRef, value);
+            get => this.Fields[(int)HelpFileToNamespaceSymbolFields.HelpFileRef].AsString();
+            set => this.Set((int)HelpFileToNamespaceSymbolFields.HelpFileRef, value);
         }
 
         public string HelpNamespaceRef
         {
-            get => this.Fields[(int)HelpFileToNamespaceTupleFields.HelpNamespaceRef].AsString();
-            set => this.Set((int)HelpFileToNamespaceTupleFields.HelpNamespaceRef, value);
+            get => this.Fields[(int)HelpFileToNamespaceSymbolFields.HelpNamespaceRef].AsString();
+            set => this.Set((int)HelpFileToNamespaceSymbolFields.HelpNamespaceRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/HelpFileTuple.cs b/src/wixext/Tuples/HelpFileTuple.cs
index 49d3bc44..8078f4ab 100644
--- a/src/wixext/Tuples/HelpFileTuple.cs
+++ b/src/wixext/Tuples/HelpFileTuple.cs
@@ -3,31 +3,31 @@
 namespace WixToolset.VisualStudio
 {
     using WixToolset.Data;
-    using WixToolset.VisualStudio.Tuples;
+    using WixToolset.VisualStudio.Symbols;
 
-    public static partial class VSTupleDefinitions
+    public static partial class VSSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition HelpFile = new IntermediateTupleDefinition(
-            VSTupleDefinitionType.HelpFile.ToString(),
+        public static readonly IntermediateSymbolDefinition HelpFile = new IntermediateSymbolDefinition(
+            VSSymbolDefinitionType.HelpFile.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(HelpFileTupleFields.HelpFileName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(HelpFileTupleFields.LangID), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(HelpFileTupleFields.HxSFileRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(HelpFileTupleFields.HxIFileRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(HelpFileTupleFields.HxQFileRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(HelpFileTupleFields.HxRFileRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(HelpFileTupleFields.SamplesFileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HelpFileSymbolFields.HelpFileName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HelpFileSymbolFields.LangID), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(HelpFileSymbolFields.HxSFileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HelpFileSymbolFields.HxIFileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HelpFileSymbolFields.HxQFileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HelpFileSymbolFields.HxRFileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HelpFileSymbolFields.SamplesFileRef), IntermediateFieldType.String),
             },
-            typeof(HelpFileTuple));
+            typeof(HelpFileSymbol));
     }
 }
 
-namespace WixToolset.VisualStudio.Tuples
+namespace WixToolset.VisualStudio.Symbols
 {
     using WixToolset.Data;
 
-    public enum HelpFileTupleFields
+    public enum HelpFileSymbolFields
     {
         HelpFileName,
         LangID,
@@ -38,58 +38,58 @@ namespace WixToolset.VisualStudio.Tuples
         SamplesFileRef,
     }
 
-    public class HelpFileTuple : IntermediateTuple
+    public class HelpFileSymbol : IntermediateSymbol
     {
-        public HelpFileTuple() : base(VSTupleDefinitions.HelpFile, null, null)
+        public HelpFileSymbol() : base(VSSymbolDefinitions.HelpFile, null, null)
         {
         }
 
-        public HelpFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(VSTupleDefinitions.HelpFile, sourceLineNumber, id)
+        public HelpFileSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(VSSymbolDefinitions.HelpFile, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[HelpFileTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[HelpFileSymbolFields index] => this.Fields[(int)index];
 
         public string HelpFileName
         {
-            get => this.Fields[(int)HelpFileTupleFields.HelpFileName].AsString();
-            set => this.Set((int)HelpFileTupleFields.HelpFileName, value);
+            get => this.Fields[(int)HelpFileSymbolFields.HelpFileName].AsString();
+            set => this.Set((int)HelpFileSymbolFields.HelpFileName, value);
         }
 
         public int? LangID
         {
-            get => this.Fields[(int)HelpFileTupleFields.LangID].AsNullableNumber();
-            set => this.Set((int)HelpFileTupleFields.LangID, value);
+            get => this.Fields[(int)HelpFileSymbolFields.LangID].AsNullableNumber();
+            set => this.Set((int)HelpFileSymbolFields.LangID, value);
         }
 
         public string HxSFileRef
         {
-            get => this.Fields[(int)HelpFileTupleFields.HxSFileRef].AsString();
-            set => this.Set((int)HelpFileTupleFields.HxSFileRef, value);
+            get => this.Fields[(int)HelpFileSymbolFields.HxSFileRef].AsString();
+            set => this.Set((int)HelpFileSymbolFields.HxSFileRef, value);
         }
 
         public string HxIFileRef
         {
-            get => this.Fields[(int)HelpFileTupleFields.HxIFileRef].AsString();
-            set => this.Set((int)HelpFileTupleFields.HxIFileRef, value);
+            get => this.Fields[(int)HelpFileSymbolFields.HxIFileRef].AsString();
+            set => this.Set((int)HelpFileSymbolFields.HxIFileRef, value);
         }
 
         public string HxQFileRef
         {
-            get => this.Fields[(int)HelpFileTupleFields.HxQFileRef].AsString();
-            set => this.Set((int)HelpFileTupleFields.HxQFileRef, value);
+            get => this.Fields[(int)HelpFileSymbolFields.HxQFileRef].AsString();
+            set => this.Set((int)HelpFileSymbolFields.HxQFileRef, value);
         }
 
         public string HxRFileRef
         {
-            get => this.Fields[(int)HelpFileTupleFields.HxRFileRef].AsString();
-            set => this.Set((int)HelpFileTupleFields.HxRFileRef, value);
+            get => this.Fields[(int)HelpFileSymbolFields.HxRFileRef].AsString();
+            set => this.Set((int)HelpFileSymbolFields.HxRFileRef, value);
         }
 
         public string SamplesFileRef
         {
-            get => this.Fields[(int)HelpFileTupleFields.SamplesFileRef].AsString();
-            set => this.Set((int)HelpFileTupleFields.SamplesFileRef, value);
+            get => this.Fields[(int)HelpFileSymbolFields.SamplesFileRef].AsString();
+            set => this.Set((int)HelpFileSymbolFields.SamplesFileRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/HelpFilterToNamespaceTuple.cs b/src/wixext/Tuples/HelpFilterToNamespaceTuple.cs
index c6690d47..f3d21289 100644
--- a/src/wixext/Tuples/HelpFilterToNamespaceTuple.cs
+++ b/src/wixext/Tuples/HelpFilterToNamespaceTuple.cs
@@ -3,53 +3,53 @@
 namespace WixToolset.VisualStudio
 {
     using WixToolset.Data;
-    using WixToolset.VisualStudio.Tuples;
+    using WixToolset.VisualStudio.Symbols;
 
-    public static partial class VSTupleDefinitions
+    public static partial class VSSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition HelpFilterToNamespace = new IntermediateTupleDefinition(
-            VSTupleDefinitionType.HelpFilterToNamespace.ToString(),
+        public static readonly IntermediateSymbolDefinition HelpFilterToNamespace = new IntermediateSymbolDefinition(
+            VSSymbolDefinitionType.HelpFilterToNamespace.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(HelpFilterToNamespaceTupleFields.HelpFilterRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(HelpFilterToNamespaceTupleFields.HelpNamespaceRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HelpFilterToNamespaceSymbolFields.HelpFilterRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HelpFilterToNamespaceSymbolFields.HelpNamespaceRef), IntermediateFieldType.String),
             },
-            typeof(HelpFilterToNamespaceTuple));
+            typeof(HelpFilterToNamespaceSymbol));
     }
 }
 
-namespace WixToolset.VisualStudio.Tuples
+namespace WixToolset.VisualStudio.Symbols
 {
     using WixToolset.Data;
 
-    public enum HelpFilterToNamespaceTupleFields
+    public enum HelpFilterToNamespaceSymbolFields
     {
         HelpFilterRef,
         HelpNamespaceRef,
     }
 
-    public class HelpFilterToNamespaceTuple : IntermediateTuple
+    public class HelpFilterToNamespaceSymbol : IntermediateSymbol
     {
-        public HelpFilterToNamespaceTuple() : base(VSTupleDefinitions.HelpFilterToNamespace, null, null)
+        public HelpFilterToNamespaceSymbol() : base(VSSymbolDefinitions.HelpFilterToNamespace, null, null)
         {
         }
 
-        public HelpFilterToNamespaceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(VSTupleDefinitions.HelpFilterToNamespace, sourceLineNumber, id)
+        public HelpFilterToNamespaceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(VSSymbolDefinitions.HelpFilterToNamespace, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[HelpFilterToNamespaceTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[HelpFilterToNamespaceSymbolFields index] => this.Fields[(int)index];
 
         public string HelpFilterRef
         {
-            get => this.Fields[(int)HelpFilterToNamespaceTupleFields.HelpFilterRef].AsString();
-            set => this.Set((int)HelpFilterToNamespaceTupleFields.HelpFilterRef, value);
+            get => this.Fields[(int)HelpFilterToNamespaceSymbolFields.HelpFilterRef].AsString();
+            set => this.Set((int)HelpFilterToNamespaceSymbolFields.HelpFilterRef, value);
         }
 
         public string HelpNamespaceRef
         {
-            get => this.Fields[(int)HelpFilterToNamespaceTupleFields.HelpNamespaceRef].AsString();
-            set => this.Set((int)HelpFilterToNamespaceTupleFields.HelpNamespaceRef, value);
+            get => this.Fields[(int)HelpFilterToNamespaceSymbolFields.HelpNamespaceRef].AsString();
+            set => this.Set((int)HelpFilterToNamespaceSymbolFields.HelpNamespaceRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/HelpFilterTuple.cs b/src/wixext/Tuples/HelpFilterTuple.cs
index 6592defa..9deb47d0 100644
--- a/src/wixext/Tuples/HelpFilterTuple.cs
+++ b/src/wixext/Tuples/HelpFilterTuple.cs
@@ -3,53 +3,53 @@
 namespace WixToolset.VisualStudio
 {
     using WixToolset.Data;
-    using WixToolset.VisualStudio.Tuples;
+    using WixToolset.VisualStudio.Symbols;
 
-    public static partial class VSTupleDefinitions
+    public static partial class VSSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition HelpFilter = new IntermediateTupleDefinition(
-            VSTupleDefinitionType.HelpFilter.ToString(),
+        public static readonly IntermediateSymbolDefinition HelpFilter = new IntermediateSymbolDefinition(
+            VSSymbolDefinitionType.HelpFilter.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(HelpFilterTupleFields.Description), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(HelpFilterTupleFields.QueryString), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HelpFilterSymbolFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HelpFilterSymbolFields.QueryString), IntermediateFieldType.String),
             },
-            typeof(HelpFilterTuple));
+            typeof(HelpFilterSymbol));
     }
 }
 
-namespace WixToolset.VisualStudio.Tuples
+namespace WixToolset.VisualStudio.Symbols
 {
     using WixToolset.Data;
 
-    public enum HelpFilterTupleFields
+    public enum HelpFilterSymbolFields
     {
         Description,
         QueryString,
     }
 
-    public class HelpFilterTuple : IntermediateTuple
+    public class HelpFilterSymbol : IntermediateSymbol
     {
-        public HelpFilterTuple() : base(VSTupleDefinitions.HelpFilter, null, null)
+        public HelpFilterSymbol() : base(VSSymbolDefinitions.HelpFilter, null, null)
         {
         }
 
-        public HelpFilterTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(VSTupleDefinitions.HelpFilter, sourceLineNumber, id)
+        public HelpFilterSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(VSSymbolDefinitions.HelpFilter, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[HelpFilterTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[HelpFilterSymbolFields index] => this.Fields[(int)index];
 
         public string Description
         {
-            get => this.Fields[(int)HelpFilterTupleFields.Description].AsString();
-            set => this.Set((int)HelpFilterTupleFields.Description, value);
+            get => this.Fields[(int)HelpFilterSymbolFields.Description].AsString();
+            set => this.Set((int)HelpFilterSymbolFields.Description, value);
         }
 
         public string QueryString
         {
-            get => this.Fields[(int)HelpFilterTupleFields.QueryString].AsString();
-            set => this.Set((int)HelpFilterTupleFields.QueryString, value);
+            get => this.Fields[(int)HelpFilterSymbolFields.QueryString].AsString();
+            set => this.Set((int)HelpFilterSymbolFields.QueryString, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/HelpNamespaceTuple.cs b/src/wixext/Tuples/HelpNamespaceTuple.cs
index 69b471fb..8d2c2f80 100644
--- a/src/wixext/Tuples/HelpNamespaceTuple.cs
+++ b/src/wixext/Tuples/HelpNamespaceTuple.cs
@@ -3,61 +3,61 @@
 namespace WixToolset.VisualStudio
 {
     using WixToolset.Data;
-    using WixToolset.VisualStudio.Tuples;
+    using WixToolset.VisualStudio.Symbols;
 
-    public static partial class VSTupleDefinitions
+    public static partial class VSSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition HelpNamespace = new IntermediateTupleDefinition(
-            VSTupleDefinitionType.HelpNamespace.ToString(),
+        public static readonly IntermediateSymbolDefinition HelpNamespace = new IntermediateSymbolDefinition(
+            VSSymbolDefinitionType.HelpNamespace.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(HelpNamespaceTupleFields.NamespaceName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(HelpNamespaceTupleFields.CollectionFileRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(HelpNamespaceTupleFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HelpNamespaceSymbolFields.NamespaceName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HelpNamespaceSymbolFields.CollectionFileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HelpNamespaceSymbolFields.Description), IntermediateFieldType.String),
             },
-            typeof(HelpNamespaceTuple));
+            typeof(HelpNamespaceSymbol));
     }
 }
 
-namespace WixToolset.VisualStudio.Tuples
+namespace WixToolset.VisualStudio.Symbols
 {
     using WixToolset.Data;
 
-    public enum HelpNamespaceTupleFields
+    public enum HelpNamespaceSymbolFields
     {
         NamespaceName,
         CollectionFileRef,
         Description,
     }
 
-    public class HelpNamespaceTuple : IntermediateTuple
+    public class HelpNamespaceSymbol : IntermediateSymbol
     {
-        public HelpNamespaceTuple() : base(VSTupleDefinitions.HelpNamespace, null, null)
+        public HelpNamespaceSymbol() : base(VSSymbolDefinitions.HelpNamespace, null, null)
         {
         }
 
-        public HelpNamespaceTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(VSTupleDefinitions.HelpNamespace, sourceLineNumber, id)
+        public HelpNamespaceSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(VSSymbolDefinitions.HelpNamespace, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[HelpNamespaceTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[HelpNamespaceSymbolFields index] => this.Fields[(int)index];
 
         public string NamespaceName
         {
-            get => this.Fields[(int)HelpNamespaceTupleFields.NamespaceName].AsString();
-            set => this.Set((int)HelpNamespaceTupleFields.NamespaceName, value);
+            get => this.Fields[(int)HelpNamespaceSymbolFields.NamespaceName].AsString();
+            set => this.Set((int)HelpNamespaceSymbolFields.NamespaceName, value);
         }
 
         public string CollectionFileRef
         {
-            get => this.Fields[(int)HelpNamespaceTupleFields.CollectionFileRef].AsString();
-            set => this.Set((int)HelpNamespaceTupleFields.CollectionFileRef, value);
+            get => this.Fields[(int)HelpNamespaceSymbolFields.CollectionFileRef].AsString();
+            set => this.Set((int)HelpNamespaceSymbolFields.CollectionFileRef, value);
         }
 
         public string Description
         {
-            get => this.Fields[(int)HelpNamespaceTupleFields.Description].AsString();
-            set => this.Set((int)HelpNamespaceTupleFields.Description, value);
+            get => this.Fields[(int)HelpNamespaceSymbolFields.Description].AsString();
+            set => this.Set((int)HelpNamespaceSymbolFields.Description, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/HelpPluginTuple.cs b/src/wixext/Tuples/HelpPluginTuple.cs
index 5f146199..a452fbd5 100644
--- a/src/wixext/Tuples/HelpPluginTuple.cs
+++ b/src/wixext/Tuples/HelpPluginTuple.cs
@@ -3,29 +3,29 @@
 namespace WixToolset.VisualStudio
 {
     using WixToolset.Data;
-    using WixToolset.VisualStudio.Tuples;
+    using WixToolset.VisualStudio.Symbols;
 
-    public static partial class VSTupleDefinitions
+    public static partial class VSSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition HelpPlugin = new IntermediateTupleDefinition(
-            VSTupleDefinitionType.HelpPlugin.ToString(),
+        public static readonly IntermediateSymbolDefinition HelpPlugin = new IntermediateSymbolDefinition(
+            VSSymbolDefinitionType.HelpPlugin.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(HelpPluginTupleFields.HelpNamespaceRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(HelpPluginTupleFields.ParentHelpNamespaceRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(HelpPluginTupleFields.HxTFileRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(HelpPluginTupleFields.HxAFileRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(HelpPluginTupleFields.ParentHxTFileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HelpPluginSymbolFields.HelpNamespaceRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HelpPluginSymbolFields.ParentHelpNamespaceRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HelpPluginSymbolFields.HxTFileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HelpPluginSymbolFields.HxAFileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HelpPluginSymbolFields.ParentHxTFileRef), IntermediateFieldType.String),
             },
-            typeof(HelpPluginTuple));
+            typeof(HelpPluginSymbol));
     }
 }
 
-namespace WixToolset.VisualStudio.Tuples
+namespace WixToolset.VisualStudio.Symbols
 {
     using WixToolset.Data;
 
-    public enum HelpPluginTupleFields
+    public enum HelpPluginSymbolFields
     {
         HelpNamespaceRef,
         ParentHelpNamespaceRef,
@@ -34,46 +34,46 @@ namespace WixToolset.VisualStudio.Tuples
         ParentHxTFileRef,
     }
 
-    public class HelpPluginTuple : IntermediateTuple
+    public class HelpPluginSymbol : IntermediateSymbol
     {
-        public HelpPluginTuple() : base(VSTupleDefinitions.HelpPlugin, null, null)
+        public HelpPluginSymbol() : base(VSSymbolDefinitions.HelpPlugin, null, null)
         {
         }
 
-        public HelpPluginTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(VSTupleDefinitions.HelpPlugin, sourceLineNumber, id)
+        public HelpPluginSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(VSSymbolDefinitions.HelpPlugin, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[HelpPluginTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[HelpPluginSymbolFields index] => this.Fields[(int)index];
 
         public string HelpNamespaceRef
         {
-            get => this.Fields[(int)HelpPluginTupleFields.HelpNamespaceRef].AsString();
-            set => this.Set((int)HelpPluginTupleFields.HelpNamespaceRef, value);
+            get => this.Fields[(int)HelpPluginSymbolFields.HelpNamespaceRef].AsString();
+            set => this.Set((int)HelpPluginSymbolFields.HelpNamespaceRef, value);
         }
 
         public string ParentHelpNamespaceRef
         {
-            get => this.Fields[(int)HelpPluginTupleFields.ParentHelpNamespaceRef].AsString();
-            set => this.Set((int)HelpPluginTupleFields.ParentHelpNamespaceRef, value);
+            get => this.Fields[(int)HelpPluginSymbolFields.ParentHelpNamespaceRef].AsString();
+            set => this.Set((int)HelpPluginSymbolFields.ParentHelpNamespaceRef, value);
         }
 
         public string HxTFileRef
         {
-            get => this.Fields[(int)HelpPluginTupleFields.HxTFileRef].AsString();
-            set => this.Set((int)HelpPluginTupleFields.HxTFileRef, value);
+            get => this.Fields[(int)HelpPluginSymbolFields.HxTFileRef].AsString();
+            set => this.Set((int)HelpPluginSymbolFields.HxTFileRef, value);
         }
 
         public string HxAFileRef
         {
-            get => this.Fields[(int)HelpPluginTupleFields.HxAFileRef].AsString();
-            set => this.Set((int)HelpPluginTupleFields.HxAFileRef, value);
+            get => this.Fields[(int)HelpPluginSymbolFields.HxAFileRef].AsString();
+            set => this.Set((int)HelpPluginSymbolFields.HxAFileRef, value);
         }
 
         public string ParentHxTFileRef
         {
-            get => this.Fields[(int)HelpPluginTupleFields.ParentHxTFileRef].AsString();
-            set => this.Set((int)HelpPluginTupleFields.ParentHxTFileRef, value);
+            get => this.Fields[(int)HelpPluginSymbolFields.ParentHxTFileRef].AsString();
+            set => this.Set((int)HelpPluginSymbolFields.ParentHxTFileRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/VSTupleDefinitions.cs b/src/wixext/Tuples/VSTupleDefinitions.cs
index fadcf808..cea6a2b6 100644
--- a/src/wixext/Tuples/VSTupleDefinitions.cs
+++ b/src/wixext/Tuples/VSTupleDefinitions.cs
@@ -5,7 +5,7 @@ namespace WixToolset.VisualStudio
     using System;
     using WixToolset.Data;
 
-    public enum VSTupleDefinitionType
+    public enum VSSymbolDefinitionType
     {
         HelpFile,
         HelpFileToNamespace,
@@ -15,13 +15,13 @@ namespace WixToolset.VisualStudio
         HelpPlugin,
     }
 
-    public static partial class VSTupleDefinitions
+    public static partial class VSSymbolDefinitions
     {
         public static readonly Version Version = new Version("4.0.0");
 
-        public static IntermediateTupleDefinition ByName(string name)
+        public static IntermediateSymbolDefinition ByName(string name)
         {
-            if (!Enum.TryParse(name, out VSTupleDefinitionType type))
+            if (!Enum.TryParse(name, out VSSymbolDefinitionType type))
             {
                 return null;
             }
@@ -29,27 +29,27 @@ namespace WixToolset.VisualStudio
             return ByType(type);
         }
 
-        public static IntermediateTupleDefinition ByType(VSTupleDefinitionType type)
+        public static IntermediateSymbolDefinition ByType(VSSymbolDefinitionType type)
         {
             switch (type)
             {
-                case VSTupleDefinitionType.HelpFile:
-                    return VSTupleDefinitions.HelpFile;
+                case VSSymbolDefinitionType.HelpFile:
+                    return VSSymbolDefinitions.HelpFile;
 
-                case VSTupleDefinitionType.HelpFileToNamespace:
-                    return VSTupleDefinitions.HelpFileToNamespace;
+                case VSSymbolDefinitionType.HelpFileToNamespace:
+                    return VSSymbolDefinitions.HelpFileToNamespace;
 
-                case VSTupleDefinitionType.HelpFilter:
-                    return VSTupleDefinitions.HelpFilter;
+                case VSSymbolDefinitionType.HelpFilter:
+                    return VSSymbolDefinitions.HelpFilter;
 
-                case VSTupleDefinitionType.HelpFilterToNamespace:
-                    return VSTupleDefinitions.HelpFilterToNamespace;
+                case VSSymbolDefinitionType.HelpFilterToNamespace:
+                    return VSSymbolDefinitions.HelpFilterToNamespace;
 
-                case VSTupleDefinitionType.HelpNamespace:
-                    return VSTupleDefinitions.HelpNamespace;
+                case VSSymbolDefinitionType.HelpNamespace:
+                    return VSSymbolDefinitions.HelpNamespace;
 
-                case VSTupleDefinitionType.HelpPlugin:
-                    return VSTupleDefinitions.HelpPlugin;
+                case VSSymbolDefinitionType.HelpPlugin:
+                    return VSSymbolDefinitions.HelpPlugin;
 
                 default:
                     throw new ArgumentOutOfRangeException(nameof(type));
diff --git a/src/wixext/VSCompiler.cs b/src/wixext/VSCompiler.cs
index b9390fea..d3afc2ab 100644
--- a/src/wixext/VSCompiler.cs
+++ b/src/wixext/VSCompiler.cs
@@ -7,10 +7,10 @@ namespace WixToolset.VisualStudio
     using System.Globalization;
     using System.Xml.Linq;
     using WixToolset.Data;
-    using WixToolset.Data.Tuples;
+    using WixToolset.Data.Symbols;
     using WixToolset.Data.WindowsInstaller;
     using WixToolset.Extensibility;
-    using WixToolset.VisualStudio.Tuples;
+    using WixToolset.VisualStudio.Symbols;
 
     /// <summary>
     /// The compiler for the WiX Toolset Visual Studio Extension.
@@ -93,7 +93,7 @@ namespace WixToolset.VisualStudio
                     {
                         case "Id":
                             id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
-                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, VSTupleDefinitions.HelpNamespace, id.Id);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, VSSymbolDefinitions.HelpNamespace, id.Id);
                             break;
                         default:
                             this.ParseHelper.UnexpectedAttribute(element, attrib);
@@ -212,7 +212,7 @@ namespace WixToolset.VisualStudio
 
             if (!this.Messaging.EncounteredError)
             {
-                section.AddTuple(new HelpNamespaceTuple(sourceLineNumbers, id)
+                section.AddSymbol(new HelpNamespaceSymbol(sourceLineNumbers, id)
                 {
                     NamespaceName = name,
                     CollectionFileRef = fileId,
@@ -249,11 +249,11 @@ namespace WixToolset.VisualStudio
                             break;
                         case "AttributeIndex":
                             hxr = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.File, hxr);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.File, hxr);
                             break;
                         case "Index":
                             hxi = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.File, hxi);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.File, hxi);
                             break;
                         case "Language":
                             language = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, short.MaxValue);
@@ -263,11 +263,11 @@ namespace WixToolset.VisualStudio
                             break;
                         case "SampleLocation":
                             samples = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.File, samples);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.File, samples);
                             break;
                         case "Search":
                             hxq = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.File, hxq);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.File, hxq);
                             break;
                         case "SuppressCustomActions":
                             suppressCAs = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib);
@@ -303,7 +303,7 @@ namespace WixToolset.VisualStudio
 
             if (!this.Messaging.EncounteredError)
             {
-                section.AddTuple(new HelpFileTuple(sourceLineNumbers, id)
+                section.AddSymbol(new HelpFileSymbol(sourceLineNumbers, id)
                 {
                     HelpFileName = name,
                     LangID = language,
@@ -334,7 +334,7 @@ namespace WixToolset.VisualStudio
                     {
                         case "Id":
                             id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
-                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, VSTupleDefinitions.HelpFile, id.Id);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, VSSymbolDefinitions.HelpFile, id.Id);
                             break;
                         default:
                             this.ParseHelper.UnexpectedAttribute(element, attrib);
@@ -356,7 +356,7 @@ namespace WixToolset.VisualStudio
 
             if (!this.Messaging.EncounteredError)
             {
-                section.AddTuple(new HelpFileToNamespaceTuple(sourceLineNumbers, id)
+                section.AddSymbol(new HelpFileToNamespaceSymbol(sourceLineNumbers, id)
                 {
                     HelpFileRef = id.Id,
                     HelpNamespaceRef = collectionId.Id,
@@ -415,7 +415,7 @@ namespace WixToolset.VisualStudio
 
             if (!this.Messaging.EncounteredError)
             {
-                section.AddTuple(new HelpFilterTuple(sourceLineNumbers, id)
+                section.AddSymbol(new HelpFilterSymbol(sourceLineNumbers, id)
                 {
                     Description = name,
                     QueryString = filterDefinition,
@@ -441,7 +441,7 @@ namespace WixToolset.VisualStudio
                     {
                         case "Id":
                             id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
-                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, VSTupleDefinitions.HelpFilter, id.Id);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, VSSymbolDefinitions.HelpFilter, id.Id);
                             break;
                         default:
                             this.ParseHelper.UnexpectedAttribute(element, attrib);
@@ -463,7 +463,7 @@ namespace WixToolset.VisualStudio
 
             if (!this.Messaging.EncounteredError)
             {
-                section.AddTuple(new HelpFilterToNamespaceTuple(sourceLineNumbers, id)
+                section.AddSymbol(new HelpFilterToNamespaceSymbol(sourceLineNumbers, id)
                 {
                     HelpFilterRef = id.Id,
                     HelpNamespaceRef = collectionId.Id,
@@ -533,7 +533,7 @@ namespace WixToolset.VisualStudio
 
             if (!this.Messaging.EncounteredError)
             {
-                section.AddTuple(new HelpPluginTuple(sourceLineNumbers, parentId)
+                section.AddSymbol(new HelpPluginSymbol(sourceLineNumbers, parentId)
                 {
                     HelpNamespaceRef = parentId.Id,
                     ParentHelpNamespaceRef = namespaceParent,
@@ -550,7 +550,7 @@ namespace WixToolset.VisualStudio
                         this.ParseHelper.CreateComplexReference(section, sourceLineNumbers, ComplexReferenceParentType.Feature, feature, String.Empty,
                             ComplexReferenceChildType.ComponentGroup, "Help2_VS2005_Namespace_Components", false);
                         // Reference CustomAction since nothing will happen without it
-                        this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "CA_HxMerge_VSIPCC_VSCC");
+                        this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "CA_HxMerge_VSIPCC_VSCC");
                     }
                 }
                 else if (pluginVS08)
@@ -561,13 +561,13 @@ namespace WixToolset.VisualStudio
                         this.ParseHelper.CreateComplexReference(section, sourceLineNumbers, ComplexReferenceParentType.Feature, feature, String.Empty,
                             ComplexReferenceChildType.ComponentGroup, "Help2_VS2008_Namespace_Components", false);
                         // Reference CustomAction since nothing will happen without it
-                        this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "CA_ScheduleExtHelpPlugin_VSCC_VSIPCC");
+                        this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "CA_ScheduleExtHelpPlugin_VSCC_VSIPCC");
                     }
                 }
                 else
                 {
                     // Reference the parent namespace to enforce the foreign key relationship
-                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, VSTupleDefinitions.HelpNamespace, namespaceParent);
+                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, VSSymbolDefinitions.HelpNamespace, namespaceParent);
                 }
             }
         }
@@ -679,10 +679,10 @@ namespace WixToolset.VisualStudio
             if (!this.Messaging.EncounteredError)
             {
                 // Ensure there is a reference to the AppSearch Property that will find the VsixInstaller.exe.
-                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.Property, propertyId);
+                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Property, propertyId);
 
                 // Ensure there is a reference to the package file (even if we are a child under it).
-                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.File, fileId);
+                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.File, fileId);
 
                 var cmdlinePrefix = "/q ";
 
@@ -699,12 +699,12 @@ namespace WixToolset.VisualStudio
                 var installCmdLinePerMachine = String.Concat(installCmdLinePerUser, " /admin");
                 var installConditionPerUser = String.Format("NOT ALLUSERS AND ${0}=3", componentId); // only execute if the Component being installed.
                 var installConditionPerMachine = String.Format("ALLUSERS AND ${0}=3", componentId); // only execute if the Component being installed.
-                var installPerUserCA = new CustomActionTuple(sourceLineNumbers, installNamePerUser)
+                var installPerUserCA = new CustomActionSymbol(sourceLineNumbers, installNamePerUser)
                 {
                     ExecutionType = CustomActionExecutionType.Deferred,
                     Impersonate = true,
                 };
-                var installPerMachineCA = new CustomActionTuple(sourceLineNumbers, installNamePerMachine)
+                var installPerMachineCA = new CustomActionSymbol(sourceLineNumbers, installNamePerMachine)
                 {
                     ExecutionType = CustomActionExecutionType.Deferred,
                     Impersonate = false,
@@ -724,13 +724,13 @@ namespace WixToolset.VisualStudio
                     var rollbackCmdLinePerMachine = String.Concat(rollbackCmdLinePerUser, " /admin");
                     var rollbackConditionPerUser = String.Format("NOT ALLUSERS AND NOT Installed AND ${0}=2 AND ?{0}>2", componentId); // NOT Installed && Component being installed but not installed already.
                     var rollbackConditionPerMachine = String.Format("ALLUSERS AND NOT Installed AND ${0}=2 AND ?{0}>2", componentId); // NOT Installed && Component being installed but not installed already.
-                    var rollbackPerUserCA = new CustomActionTuple(sourceLineNumbers, rollbackNamePerUser)
+                    var rollbackPerUserCA = new CustomActionSymbol(sourceLineNumbers, rollbackNamePerUser)
                     {
                         ExecutionType = CustomActionExecutionType.Rollback,
                         IgnoreResult = true,
                         Impersonate = true,
                     };
-                    var rollbackPerMachineCA = new CustomActionTuple(sourceLineNumbers, rollbackNamePerMachine)
+                    var rollbackPerMachineCA = new CustomActionSymbol(sourceLineNumbers, rollbackNamePerMachine)
                     {
                         ExecutionType = CustomActionExecutionType.Rollback,
                         IgnoreResult = true,
@@ -755,13 +755,13 @@ namespace WixToolset.VisualStudio
                     var uninstallCmdLinePerMachine = String.Concat(uninstallCmdLinePerUser, " /admin");
                     var uninstallConditionPerUser = String.Format("NOT ALLUSERS AND ${0}=2 AND ?{0}>2", componentId); // Only execute if component is being uninstalled.
                     var uninstallConditionPerMachine = String.Format("ALLUSERS AND ${0}=2 AND ?{0}>2", componentId); // Only execute if component is being uninstalled.
-                    var uninstallPerUserCA = new CustomActionTuple(sourceLineNumbers, uninstallNamePerUser)
+                    var uninstallPerUserCA = new CustomActionSymbol(sourceLineNumbers, uninstallNamePerUser)
                     {
                         ExecutionType = CustomActionExecutionType.Deferred,
                         IgnoreResult = true,
                         Impersonate = true,
                     };
-                    var uninstallPerMachineCA = new CustomActionTuple(sourceLineNumbers, uninstallNamePerMachine)
+                    var uninstallPerMachineCA = new CustomActionSymbol(sourceLineNumbers, uninstallNamePerMachine)
                     {
                         ExecutionType = CustomActionExecutionType.Deferred,
                         IgnoreResult = true,
@@ -774,7 +774,7 @@ namespace WixToolset.VisualStudio
             }
         }
 
-        private void SchedulePropertyExeAction(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier name, string source, string cmdline, CustomActionTuple caTemplate, string condition, string beforeAction, string afterAction)
+        private void SchedulePropertyExeAction(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier name, string source, string cmdline, CustomActionSymbol caTemplate, string condition, string beforeAction, string afterAction)
         {
             const SequenceTable sequence = SequenceTable.InstallExecuteSequence;
 
@@ -782,9 +782,9 @@ namespace WixToolset.VisualStudio
             caTemplate.Source = source;
             caTemplate.TargetType = CustomActionTargetType.Exe;
             caTemplate.Target = cmdline;
-            section.AddTuple(caTemplate);
+            section.AddSymbol(caTemplate);
 
-            section.AddTuple(new WixActionTuple(sourceLineNumbers, new Identifier(name.Access, sequence, name.Id))
+            section.AddSymbol(new WixActionSymbol(sourceLineNumbers, new Identifier(name.Access, sequence, name.Id))
             {
                 SequenceTable = SequenceTable.InstallExecuteSequence,
                 Action = name.Id,
@@ -799,11 +799,11 @@ namespace WixToolset.VisualStudio
             {
                 if (WindowsInstallerStandard.IsStandardAction(beforeAction))
                 {
-                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.WixAction, sequence.ToString(), beforeAction);
+                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixAction, sequence.ToString(), beforeAction);
                 }
                 else
                 {
-                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, beforeAction);
+                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, beforeAction);
                 }
             }
 
@@ -811,18 +811,18 @@ namespace WixToolset.VisualStudio
             {
                 if (WindowsInstallerStandard.IsStandardAction(afterAction))
                 {
-                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.WixAction, sequence.ToString(), afterAction);
+                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixAction, sequence.ToString(), afterAction);
                 }
                 else
                 {
-                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, afterAction);
+                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, afterAction);
                 }
             }
         }
 
         private void AddReferenceToRegisterMicrosoftHelp(IntermediateSection section, SourceLineNumber sourceLineNumbers)
         {
-            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8");
+            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8");
         }
     }
 }
diff --git a/src/wixext/VSExtensionData.cs b/src/wixext/VSExtensionData.cs
index 3d28b625..51199d2c 100644
--- a/src/wixext/VSExtensionData.cs
+++ b/src/wixext/VSExtensionData.cs
@@ -13,15 +13,15 @@ namespace WixToolset.VisualStudio
         /// <value>The default culture.</value>
         public override string DefaultCulture => "en-US";
 
-        public override bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition)
+        public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition)
         {
-            tupleDefinition = VSTupleDefinitions.ByName(name);
-            return tupleDefinition != null;
+            symbolDefinition = VSSymbolDefinitions.ByName(name);
+            return symbolDefinition != null;
         }
 
-        public override Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions)
+        public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions)
         {
-            return Intermediate.Load(typeof(VSExtensionData).Assembly, "WixToolset.VisualStudio.vs.wixlib", tupleDefinitions);
+            return Intermediate.Load(typeof(VSExtensionData).Assembly, "WixToolset.VisualStudio.vs.wixlib", symbolDefinitions);
         }
     }
 }
diff --git a/src/wixext/VSTableDefinitions.cs b/src/wixext/VSTableDefinitions.cs
index bbc74b96..0c3ca907 100644
--- a/src/wixext/VSTableDefinitions.cs
+++ b/src/wixext/VSTableDefinitions.cs
@@ -8,7 +8,7 @@ namespace WixToolset.VisualStudio
     {
         public static readonly TableDefinition HelpFile = new TableDefinition(
             "HelpFile",
-            VSTupleDefinitions.HelpFile,
+            VSSymbolDefinitions.HelpFile,
             new[]
             {
                 new ColumnDefinition("HelpFileKey", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary Key for HelpFile Table (required).", modularizeType: ColumnModularizeType.Column),
@@ -20,46 +20,46 @@ namespace WixToolset.VisualStudio
                 new ColumnDefinition("File_HxR", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Key for HxR (Attributes) file (optional).", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("File_Samples", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Key for a file that is in the 'root' of the samples directory for this HelpFile (optional).", modularizeType: ColumnModularizeType.Column),
             },
-            tupleIdIsPrimaryKey: true
+            symbolIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition HelpFileToNamespace = new TableDefinition(
             "HelpFileToNamespace",
-            VSTupleDefinitions.HelpFileToNamespace,
+            VSSymbolDefinitions.HelpFileToNamespace,
             new[]
             {
                 new ColumnDefinition("HelpFile_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpFile", keyColumn: 1, description: "Foreign key into HelpFile table (required).", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("HelpNamespace_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpNamespace", keyColumn: 1, description: "Foreign key into HelpNamespace table (required)."),
             },
-            tupleIdIsPrimaryKey: false
+            symbolIdIsPrimaryKey: false
         );
 
         public static readonly TableDefinition HelpFilter = new TableDefinition(
             "HelpFilter",
-            VSTupleDefinitions.HelpFilter,
+            VSSymbolDefinitions.HelpFilter,
             new[]
             {
                 new ColumnDefinition("FilterKey", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary Key for HelpFilter (required).", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Description", ColumnType.Localized, 0, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Friendly name for Filter (required)."),
                 new ColumnDefinition("QueryString", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Query String for Help Filter (optional)."),
             },
-            tupleIdIsPrimaryKey: true
+            symbolIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition HelpFilterToNamespace = new TableDefinition(
             "HelpFilterToNamespace",
-            VSTupleDefinitions.HelpFilterToNamespace,
+            VSSymbolDefinitions.HelpFilterToNamespace,
             new[]
             {
                 new ColumnDefinition("HelpFilter_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpFilter", keyColumn: 1, description: "Foreign key into HelpFilter table (required).", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("HelpNamespace_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpNamespace", keyColumn: 1, description: "Foreign key into HelpNamespace table (required)."),
             },
-            tupleIdIsPrimaryKey: false
+            symbolIdIsPrimaryKey: false
         );
 
         public static readonly TableDefinition HelpNamespace = new TableDefinition(
             "HelpNamespace",
-            VSTupleDefinitions.HelpNamespace,
+            VSSymbolDefinitions.HelpNamespace,
             new[]
             {
                 new ColumnDefinition("NamespaceKey", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary Key for HelpNamespace (required)."),
@@ -67,12 +67,12 @@ namespace WixToolset.VisualStudio
                 new ColumnDefinition("File_Collection", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Key for HxC (Collection) file (required).", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Description", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Friendly name for Namespace (optional)."),
             },
-            tupleIdIsPrimaryKey: true
+            symbolIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition HelpPlugin = new TableDefinition(
             "HelpPlugin",
-            VSTupleDefinitions.HelpPlugin,
+            VSSymbolDefinitions.HelpPlugin,
             new[]
             {
                 new ColumnDefinition("HelpNamespace_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "HelpNamespace", keyColumn: 1, description: "Foreign key into HelpNamespace table for the child namespace that will be plugged into the parent namespace (required)."),
@@ -81,7 +81,7 @@ namespace WixToolset.VisualStudio
                 new ColumnDefinition("File_HxA", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Key for HxA (Attributes) file of child namespace (optional).", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("File_ParentHxT", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "File", keyColumn: 1, description: "Key for HxT  file of parent namespace that now includes the new child namespace (optional).", modularizeType: ColumnModularizeType.Column),
             },
-            tupleIdIsPrimaryKey: false
+            symbolIdIsPrimaryKey: false
         );
 
         public static readonly TableDefinition[] All = new[]