From 28666e3beb1776324c6d3e719cb0c37d4f2fbeff Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sat, 27 Jun 2020 15:08:14 -0700
Subject: The Great Tuple to Symbol Rename (tm)

---
 src/wixext/IIsCompiler.cs                          | 134 ++++++++++-----------
 src/wixext/IIsExtensionData.cs                     |  10 +-
 src/wixext/IisTableDefinitions.cs                  |  72 +++++------
 src/wixext/Tuples/CertificateHashTuple.cs          |  34 +++---
 src/wixext/Tuples/CertificateTuple.cs              |  70 +++++------
 src/wixext/Tuples/IIsAppPoolTuple.cs               | 112 ++++++++---------
 src/wixext/Tuples/IIsFilterTuple.cs                |  64 +++++-----
 src/wixext/Tuples/IIsHttpHeaderTuple.cs            |  64 +++++-----
 src/wixext/Tuples/IIsMimeMapTuple.cs               |  46 +++----
 src/wixext/Tuples/IIsPropertyTuple.cs              |  40 +++---
 src/wixext/Tuples/IIsWebAddressTuple.cs            |  52 ++++----
 .../Tuples/IIsWebApplicationExtensionTuple.cs      |  52 ++++----
 src/wixext/Tuples/IIsWebApplicationTuple.cs        |  88 +++++++-------
 src/wixext/Tuples/IIsWebDirPropertiesTuple.cs      | 106 ++++++++--------
 src/wixext/Tuples/IIsWebDirTuple.cs                |  52 ++++----
 src/wixext/Tuples/IIsWebErrorTuple.cs              |  58 ++++-----
 src/wixext/Tuples/IIsWebLogTuple.cs                |  28 ++---
 src/wixext/Tuples/IIsWebServiceExtensionTuple.cs   |  52 ++++----
 src/wixext/Tuples/IIsWebSiteCertificatesTuple.cs   |  34 +++---
 src/wixext/Tuples/IIsWebSiteTuple.cs               |  94 +++++++--------
 src/wixext/Tuples/IIsWebVirtualDirTuple.cs         |  58 ++++-----
 src/wixext/Tuples/IisTupleDefinitions.cs           |  82 ++++++-------
 22 files changed, 701 insertions(+), 701 deletions(-)

diff --git a/src/wixext/IIsCompiler.cs b/src/wixext/IIsCompiler.cs
index f84f8f0a..6f0cdd5e 100644
--- a/src/wixext/IIsCompiler.cs
+++ b/src/wixext/IIsCompiler.cs
@@ -8,7 +8,7 @@ namespace WixToolset.Iis
     using System.Xml.Linq;
     using WixToolset.Data;
     using WixToolset.Extensibility;
-    using WixToolset.Iis.Tuples;
+    using WixToolset.Iis.Symbols;
 
     /// <summary>
     /// The compiler for the WiX Toolset Internet Information Services Extension.
@@ -159,7 +159,7 @@ namespace WixToolset.Iis
                         case "BinaryKey":
                             attributes |= 2; // SCA_CERT_ATTRIBUTE_BINARYDATA
                             binaryKey = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.Binary, binaryKey);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Binary, binaryKey);
                             break;
                         case "CertificatePath":
                             certificatePath = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
@@ -287,13 +287,13 @@ namespace WixToolset.Iis
             this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
 
             // Reference InstallCertificates and UninstallCertificates since nothing will happen without them
-            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "InstallCertificates");
-            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "UninstallCertificates");
+            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "InstallCertificates");
+            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "UninstallCertificates");
             this.ParseHelper.EnsureTable(section, sourceLineNumbers, IisTableDefinitions.CertificateHash); // Certificate CustomActions require the CertificateHash table
 
             if (!this.Messaging.EncounteredError)
             {
-                section.AddTuple(new CertificateTuple(sourceLineNumbers, id)
+                section.AddSymbol(new CertificateSymbol(sourceLineNumbers, id)
                 {
                     ComponentRef = componentId,
                     Name = name,
@@ -325,7 +325,7 @@ namespace WixToolset.Iis
                     {
                         case "Id":
                             id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
-                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisTupleDefinitions.Certificate, id.Id);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisSymbolDefinitions.Certificate, id.Id);
                             break;
                         default:
                             this.ParseHelper.UnexpectedAttribute(element, attrib);
@@ -347,9 +347,9 @@ namespace WixToolset.Iis
 
             if (!this.Messaging.EncounteredError)
             {
-                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisTupleDefinitions.Certificate, id.Id);
+                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisSymbolDefinitions.Certificate, id.Id);
 
-                section.AddTuple(new IIsWebSiteCertificatesTuple(sourceLineNumbers)
+                section.AddSymbol(new IIsWebSiteCertificatesSymbol(sourceLineNumbers)
                 {
                     WebRef = webId,
                     CertificateRef = id.Id,
@@ -422,7 +422,7 @@ namespace WixToolset.Iis
 
             if (!this.Messaging.EncounteredError)
             {
-                section.AddTuple(new IIsMimeMapTuple(sourceLineNumbers, id)
+                section.AddSymbol(new IIsMimeMapSymbol(sourceLineNumbers, id)
                 {
                     ParentType = (int)parentType,
                     ParentValue = parentId,
@@ -533,7 +533,7 @@ namespace WixToolset.Iis
 
             if (!this.Messaging.EncounteredError)
             {
-                section.AddTuple(new IIsWebAddressTuple(sourceLineNumbers, id)
+                section.AddSymbol(new IIsWebAddressSymbol(sourceLineNumbers, id)
                 {
                     WebRef = parentWeb,
                     IP = ip,
@@ -639,7 +639,7 @@ namespace WixToolset.Iis
                             break;
                         case "WebAppPool":
                             appPool = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisTupleDefinitions.IIsAppPool, appPool);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisSymbolDefinitions.IIsAppPool, appPool);
                             break;
                         default:
                             this.ParseHelper.UnexpectedAttribute(element, attrib);
@@ -688,7 +688,7 @@ namespace WixToolset.Iis
 
             if (!this.Messaging.EncounteredError)
             {
-                var tuple = section.AddTuple(new IIsWebApplicationTuple(sourceLineNumbers, id)
+                var symbol = section.AddSymbol(new IIsWebApplicationSymbol(sourceLineNumbers, id)
                 {
                     Name = name,
                     Isolation = isolation,
@@ -698,37 +698,37 @@ namespace WixToolset.Iis
 
                 if (YesNoDefaultType.Default != allowSessions)
                 {
-                    tuple.AllowSessions = YesNoDefaultType.Yes == allowSessions ? 1 : 0;
+                    symbol.AllowSessions = YesNoDefaultType.Yes == allowSessions ? 1 : 0;
                 }
 
                 if (CompilerConstants.IntegerNotSet != sessionTimeout)
                 {
-                    tuple.SessionTimeout = sessionTimeout;
+                    symbol.SessionTimeout = sessionTimeout;
                 }
 
                 if (YesNoDefaultType.Default != buffer)
                 {
-                    tuple.Buffer = YesNoDefaultType.Yes == buffer ? 1 : 0;
+                    symbol.Buffer = YesNoDefaultType.Yes == buffer ? 1 : 0;
                 }
 
                 if (YesNoDefaultType.Default != parentPaths)
                 {
-                    tuple.ParentPaths = YesNoDefaultType.Yes == parentPaths ? 1 : 0;
+                    symbol.ParentPaths = YesNoDefaultType.Yes == parentPaths ? 1 : 0;
                 }
 
                 if (CompilerConstants.IntegerNotSet != scriptTimeout)
                 {
-                    tuple.ScriptTimeout = scriptTimeout;
+                    symbol.ScriptTimeout = scriptTimeout;
                 }
 
                 if (YesNoDefaultType.Default != serverDebugging)
                 {
-                    tuple.ServerDebugging = YesNoDefaultType.Yes == serverDebugging ? 1 : 0;
+                    symbol.ServerDebugging = YesNoDefaultType.Yes == serverDebugging ? 1 : 0;
                 }
 
                 if (YesNoDefaultType.Default != clientDebugging)
                 {
-                    tuple.ClientDebugging = YesNoDefaultType.Yes == clientDebugging ? 1 : 0;
+                    symbol.ClientDebugging = YesNoDefaultType.Yes == clientDebugging ? 1 : 0;
                 }
             }
 
@@ -798,7 +798,7 @@ namespace WixToolset.Iis
 
             if (!this.Messaging.EncounteredError)
             {
-                var tuple = section.AddTuple(new IIsWebApplicationExtensionTuple(sourceLineNumbers)
+                var symbol = section.AddSymbol(new IIsWebApplicationExtensionSymbol(sourceLineNumbers)
                 {
                     ApplicationRef = application,
                     Extension = extension,
@@ -808,7 +808,7 @@ namespace WixToolset.Iis
 
                 if (0 < attributes)
                 {
-                    tuple.Attributes = attributes;
+                    symbol.Attributes = attributes;
                 }
             }
         }
@@ -925,7 +925,7 @@ namespace WixToolset.Iis
                             {
                                 switch (managedPipelineMode)
                                 {
-                                    // In 3.5 we allowed lower case values (per camel case enum style), we now use formatted fields, 
+                                    // In 3.5 we allowed lower case values (per camel case enum style), we now use formatted fields,
                                     // so the value needs to match exactly what we pass in to IIS which uses pascal case.
                                     case "classic":
                                         managedPipelineMode = "Classic";
@@ -1113,7 +1113,7 @@ namespace WixToolset.Iis
 
             if (!this.Messaging.EncounteredError)
             {
-                var tuple = section.AddTuple(new IIsAppPoolTuple(sourceLineNumbers, id)
+                var symbol = section.AddSymbol(new IIsAppPoolSymbol(sourceLineNumbers, id)
                 {
                     Name = name,
                     ComponentRef = componentId,
@@ -1127,37 +1127,37 @@ namespace WixToolset.Iis
 
                 if (CompilerConstants.IntegerNotSet != recycleMinutes)
                 {
-                    tuple.RecycleMinutes = recycleMinutes;
+                    symbol.RecycleMinutes = recycleMinutes;
                 }
 
                 if (CompilerConstants.IntegerNotSet != recycleRequests)
                 {
-                    tuple.RecycleRequests = recycleRequests;
+                    symbol.RecycleRequests = recycleRequests;
                 }
 
                 if (CompilerConstants.IntegerNotSet != idleTimeout)
                 {
-                    tuple.IdleTimeout = idleTimeout;
+                    symbol.IdleTimeout = idleTimeout;
                 }
 
                 if (CompilerConstants.IntegerNotSet != queueLimit)
                 {
-                    tuple.QueueLimit = queueLimit;
+                    symbol.QueueLimit = queueLimit;
                 }
 
                 if (CompilerConstants.IntegerNotSet != maxWorkerProcs)
                 {
-                    tuple.MaxProc = maxWorkerProcs;
+                    symbol.MaxProc = maxWorkerProcs;
                 }
 
                 if (CompilerConstants.IntegerNotSet != virtualMemory)
                 {
-                    tuple.VirtualMemory = virtualMemory;
+                    symbol.VirtualMemory = virtualMemory;
                 }
 
                 if (CompilerConstants.IntegerNotSet != privateMemory)
                 {
-                    tuple.PrivateMemory = privateMemory;
+                    symbol.PrivateMemory = privateMemory;
                 }
             }
         }
@@ -1201,7 +1201,7 @@ namespace WixToolset.Iis
                             }
 
                             parentWeb = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisTupleDefinitions.IIsWebSite, parentWeb);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisSymbolDefinitions.IIsWebSite, parentWeb);
                             break;
                         default:
                             this.ParseHelper.UnexpectedAttribute(element, attrib);
@@ -1278,17 +1278,17 @@ namespace WixToolset.Iis
 
             if (null != application)
             {
-                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisTupleDefinitions.IIsWebApplication, application);
+                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisSymbolDefinitions.IIsWebApplication, application);
             }
 
-            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisTupleDefinitions.IIsWebDirProperties, dirProperties);
+            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisSymbolDefinitions.IIsWebDirProperties, dirProperties);
 
             // Reference ConfigureIIs since nothing will happen without it
             this.AddReferenceToConfigureIIs(section, sourceLineNumbers);
 
             if (!this.Messaging.EncounteredError)
             {
-                section.AddTuple(new IIsWebDirTuple(sourceLineNumbers, id)
+                section.AddSymbol(new IIsWebDirSymbol(sourceLineNumbers, id)
                 {
                     ComponentRef = componentId,
                     WebRef = parentWeb,
@@ -1557,7 +1557,7 @@ namespace WixToolset.Iis
 
             if (!this.Messaging.EncounteredError)
             {
-                var tuple = section.AddTuple(new IIsWebDirPropertiesTuple(sourceLineNumbers, id)
+                var symbol = section.AddSymbol(new IIsWebDirPropertiesSymbol(sourceLineNumbers, id)
                 {
                     AnonymousUserRef = anonymousUser,
                     IIsControlledPassword = iisControlledPassword ? 1 : 0,
@@ -1568,47 +1568,47 @@ namespace WixToolset.Iis
 
                 if (accessSet)
                 {
-                    tuple.Access = access;
+                    symbol.Access = access;
                 }
 
                 if (authorizationSet)
                 {
-                    tuple.Authorization = authorization;
+                    symbol.Authorization = authorization;
                 }
 
                 if (YesNoType.NotSet != logVisits)
                 {
-                    tuple.LogVisits = YesNoType.Yes == logVisits ? 1 : 0;
+                    symbol.LogVisits = YesNoType.Yes == logVisits ? 1 : 0;
                 }
 
                 if (YesNoType.NotSet != index)
                 {
-                    tuple.Index = YesNoType.Yes == index ? 1 : 0;
+                    symbol.Index = YesNoType.Yes == index ? 1 : 0;
                 }
 
                 if (YesNoType.NotSet != aspDetailedError)
                 {
-                    tuple.AspDetailedError = YesNoType.Yes == aspDetailedError ? 1 : 0;
+                    symbol.AspDetailedError = YesNoType.Yes == aspDetailedError ? 1 : 0;
                 }
 
                 if (CompilerConstants.LongNotSet != cacheControlMaxAge)
                 {
-                    tuple.CacheControlMaxAge = unchecked((int)cacheControlMaxAge);
+                    symbol.CacheControlMaxAge = unchecked((int)cacheControlMaxAge);
                 }
 
                 if (YesNoType.NotSet != notCustomError)
                 {
-                    tuple.NoCustomError = YesNoType.Yes == notCustomError ? 1 : 0;
+                    symbol.NoCustomError = YesNoType.Yes == notCustomError ? 1 : 0;
                 }
 
                 if (accessSSLFlagsSet)
                 {
-                    tuple.AccessSSLFlags = accessSSLFlags;
+                    symbol.AccessSSLFlags = accessSSLFlags;
                 }
 
                 if (null != authenticationProviders)
                 {
-                    tuple.AuthenticationProviders = authenticationProviders;
+                    symbol.AuthenticationProviders = authenticationProviders;
                 }
             }
 
@@ -1682,7 +1682,7 @@ namespace WixToolset.Iis
 
             if (!this.Messaging.EncounteredError)
             {
-                section.AddTuple(new IIsWebErrorTuple(sourceLineNumbers)
+                section.AddSymbol(new IIsWebErrorSymbol(sourceLineNumbers)
                 {
                     ErrorCode = errorCode,
                     SubCode = subCode,
@@ -1756,7 +1756,7 @@ namespace WixToolset.Iis
                             }
 
                             parentWeb = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisTupleDefinitions.IIsWebSite, parentWeb);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisSymbolDefinitions.IIsWebSite, parentWeb);
                             break;
                         default:
                             this.ParseHelper.UnexpectedAttribute(element, attrib);
@@ -1791,7 +1791,7 @@ namespace WixToolset.Iis
 
             if (!this.Messaging.EncounteredError)
             {
-                var tuple = section.AddTuple(new IIsFilterTuple(sourceLineNumbers, id)
+                var symbol = section.AddSymbol(new IIsFilterSymbol(sourceLineNumbers, id)
                 {
                     Name = name,
                     ComponentRef = componentId,
@@ -1803,7 +1803,7 @@ namespace WixToolset.Iis
 
                 if (CompilerConstants.IntegerNotSet != loadOrder)
                 {
-                    tuple.LoadOrder = loadOrder;
+                    symbol.LoadOrder = loadOrder;
                 }
             }
         }
@@ -1879,7 +1879,7 @@ namespace WixToolset.Iis
 
             if (!this.Messaging.EncounteredError)
             {
-                section.AddTuple(new IIsWebLogTuple(sourceLineNumbers, id)
+                section.AddSymbol(new IIsWebLogSymbol(sourceLineNumbers, id)
                 {
                     Format = type,
                 });
@@ -1950,7 +1950,7 @@ namespace WixToolset.Iis
 
             if (!this.Messaging.EncounteredError)
             {
-                section.AddTuple(new IIsPropertyTuple(sourceLineNumbers, id)
+                section.AddSymbol(new IIsPropertySymbol(sourceLineNumbers, id)
                 {
                     ComponentRef = componentId,
                     Attributes = 0,
@@ -2039,7 +2039,7 @@ namespace WixToolset.Iis
 
             if (!this.Messaging.EncounteredError)
             {
-                section.AddTuple(new IIsWebServiceExtensionTuple(sourceLineNumbers, id)
+                section.AddSymbol(new IIsWebServiceExtensionSymbol(sourceLineNumbers, id)
                 {
                     ComponentRef = componentId,
                     File = file,
@@ -2118,7 +2118,7 @@ namespace WixToolset.Iis
                             break;
                         case "Directory":
                             directory = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.Directory, directory);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Directory, directory);
                             break;
                         case "DirProperties":
                             if (null == componentId)
@@ -2169,7 +2169,7 @@ namespace WixToolset.Iis
                             }
 
                             log = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisTupleDefinitions.IIsWebLog, log);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisSymbolDefinitions.IIsWebLog, log);
                             break;
                         default:
                             this.ParseHelper.UnexpectedAttribute(element, attrib);
@@ -2310,12 +2310,12 @@ namespace WixToolset.Iis
 
             if (null != application)
             {
-                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisTupleDefinitions.IIsWebApplication, application);
+                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisSymbolDefinitions.IIsWebApplication, application);
             }
 
             if (null != dirProperties)
             {
-                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisTupleDefinitions.IIsWebDirProperties, dirProperties);
+                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisSymbolDefinitions.IIsWebDirProperties, dirProperties);
             }
 
             if (null != componentId)
@@ -2326,7 +2326,7 @@ namespace WixToolset.Iis
 
             if (!this.Messaging.EncounteredError)
             {
-                var tuple = section.AddTuple(new IIsWebSiteTuple(sourceLineNumbers, id)
+                var symbol = section.AddSymbol(new IIsWebSiteSymbol(sourceLineNumbers, id)
                 {
                     ComponentRef = componentId,
                     Description = description,
@@ -2340,22 +2340,22 @@ namespace WixToolset.Iis
 
                 if (CompilerConstants.IntegerNotSet != connectionTimeout)
                 {
-                    tuple.ConnectionTimeout = connectionTimeout;
+                    symbol.ConnectionTimeout = connectionTimeout;
                 }
 
                 if (CompilerConstants.IntegerNotSet != state)
                 {
-                    tuple.State = state;
+                    symbol.State = state;
                 }
 
                 if (0 != attributes)
                 {
-                    tuple.Attributes = attributes;
+                    symbol.Attributes = attributes;
                 }
 
                 if (CompilerConstants.IntegerNotSet != sequence)
                 {
-                    tuple.Sequence = sequence;
+                    symbol.Sequence = sequence;
                 }
             }
         }
@@ -2415,7 +2415,7 @@ namespace WixToolset.Iis
 
             if (!this.Messaging.EncounteredError)
             {
-                section.AddTuple(new IIsHttpHeaderTuple(sourceLineNumbers, id)
+                section.AddSymbol(new IIsHttpHeaderSymbol(sourceLineNumbers, id)
                 {
                     HttpHeader = id.Id,
                     ParentType = (int)parentType,
@@ -2457,7 +2457,7 @@ namespace WixToolset.Iis
                             break;
                         case "Directory":
                             directory = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.Directory, directory);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Directory, directory);
                             break;
                         case "DirProperties":
                             dirProperties = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
@@ -2472,7 +2472,7 @@ namespace WixToolset.Iis
                             }
 
                             parentWeb = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
-                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisTupleDefinitions.IIsWebSite, parentWeb);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisSymbolDefinitions.IIsWebSite, parentWeb);
                             break;
                         default:
                             this.ParseHelper.UnexpectedAttribute(element, attrib);
@@ -2576,12 +2576,12 @@ namespace WixToolset.Iis
 
             if (null != dirProperties)
             {
-                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisTupleDefinitions.IIsWebDirProperties, dirProperties);
+                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisSymbolDefinitions.IIsWebDirProperties, dirProperties);
             }
 
             if (null != application)
             {
-                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisTupleDefinitions.IIsWebApplication, application);
+                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, IisSymbolDefinitions.IIsWebApplication, application);
             }
 
             // Reference ConfigureIIs since nothing will happen without it
@@ -2589,7 +2589,7 @@ namespace WixToolset.Iis
 
             if (!this.Messaging.EncounteredError)
             {
-                section.AddTuple(new IIsWebVirtualDirTuple(sourceLineNumbers, id)
+                section.AddSymbol(new IIsWebVirtualDirSymbol(sourceLineNumbers, id)
                 {
                     ComponentRef = componentId,
                     WebRef = parentWeb,
@@ -2603,7 +2603,7 @@ namespace WixToolset.Iis
 
         private void AddReferenceToConfigureIIs(IntermediateSection section, SourceLineNumber sourceLineNumbers)
         {
-            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "ConfigureIIs");
+            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "ConfigureIIs");
         }
     }
 }
diff --git a/src/wixext/IIsExtensionData.cs b/src/wixext/IIsExtensionData.cs
index d1696a89..6a0e1f09 100644
--- a/src/wixext/IIsExtensionData.cs
+++ b/src/wixext/IIsExtensionData.cs
@@ -16,15 +16,15 @@ namespace WixToolset.Iis
         /// <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 = IisTupleDefinitions.ByName(name);
-            return tupleDefinition != null;
+            symbolDefinition = IisSymbolDefinitions.ByName(name);
+            return symbolDefinition != null;
         }
 
-        public override Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions)
+        public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions)
         {
-            return Intermediate.Load(typeof(IIsExtensionData).Assembly, "WixToolset.Iis.iis.wixlib", tupleDefinitions);
+            return Intermediate.Load(typeof(IIsExtensionData).Assembly, "WixToolset.Iis.iis.wixlib", symbolDefinitions);
         }
     }
 }
diff --git a/src/wixext/IisTableDefinitions.cs b/src/wixext/IisTableDefinitions.cs
index 6c887e96..f513152e 100644
--- a/src/wixext/IisTableDefinitions.cs
+++ b/src/wixext/IisTableDefinitions.cs
@@ -8,7 +8,7 @@ namespace WixToolset.Iis
     {
         public static readonly TableDefinition Certificate = new TableDefinition(
             "Certificate",
-            IisTupleDefinitions.Certificate,
+            IisSymbolDefinitions.Certificate,
             new[]
             {
                 new ColumnDefinition("Certificate", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyColumn: 1, description: "Identifier for the certificate in the package.", modularizeType: ColumnModularizeType.Column),
@@ -21,34 +21,34 @@ namespace WixToolset.Iis
                 new ColumnDefinition("CertificatePath", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Property to path of certificate.", modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("PFXPassword", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Hidden property to a pfx password", modularizeType: ColumnModularizeType.Property),
             },
-            tupleIdIsPrimaryKey: true
+            symbolIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition CertificateHash = new TableDefinition(
             "CertificateHash",
-            IisTupleDefinitions.CertificateHash,
+            IisSymbolDefinitions.CertificateHash,
             new[]
             {
                 new ColumnDefinition("Certificate_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyColumn: 1, description: "Foreign key to certificate in Certificate table.", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Hash", ColumnType.String, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Base64 encoded SHA1 hash of certificate populated at run-time."),
             },
-            tupleIdIsPrimaryKey: false
+            symbolIdIsPrimaryKey: false
         );
 
         public static readonly TableDefinition IIsWebSiteCertificates = new TableDefinition(
             "IIsWebSiteCertificates",
-            IisTupleDefinitions.IIsWebSiteCertificates,
+            IisSymbolDefinitions.IIsWebSiteCertificates,
             new[]
             {
                 new ColumnDefinition("Web_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "IIsWebSite", keyColumn: 1, description: "The index into the IIsWebSite table.", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Certificate_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Text, keyTable: "Certificate", keyColumn: 1, description: "The index into the Certificate table.", modularizeType: ColumnModularizeType.Column),
             },
-            tupleIdIsPrimaryKey: false
+            symbolIdIsPrimaryKey: false
         );
 
         public static readonly TableDefinition IIsAppPool = new TableDefinition(
             "IIsAppPool",
-            IisTupleDefinitions.IIsAppPool,
+            IisSymbolDefinitions.IIsAppPool,
             new[]
             {
                 new ColumnDefinition("AppPool", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token for apppool", modularizeType: ColumnModularizeType.Column),
@@ -68,12 +68,12 @@ namespace WixToolset.Iis
                 new ColumnDefinition("ManagedRuntimeVersion", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Specifies the .NET Framework version to be used by the application pool."),
                 new ColumnDefinition("ManagedPipelineMode", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Specifies the request-processing mode that is used to process requests for managed content."),
             },
-            tupleIdIsPrimaryKey: true
+            symbolIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition IIsMimeMap = new TableDefinition(
             "IIsMimeMap",
-            IisTupleDefinitions.IIsMimeMap,
+            IisSymbolDefinitions.IIsMimeMap,
             new[]
             {
                 new ColumnDefinition("MimeMap", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token for Mime Map definitions", modularizeType: ColumnModularizeType.Column),
@@ -82,12 +82,12 @@ namespace WixToolset.Iis
                 new ColumnDefinition("MimeType", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Mime-type covered by the MimeMap."),
                 new ColumnDefinition("Extension", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Extension covered by the MimeMap."),
             },
-            tupleIdIsPrimaryKey: true
+            symbolIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition IIsProperty = new TableDefinition(
             "IIsProperty",
-            IisTupleDefinitions.IIsProperty,
+            IisSymbolDefinitions.IIsProperty,
             new[]
             {
                 new ColumnDefinition("Property", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Unique name of the IIsProperty"),
@@ -95,12 +95,12 @@ namespace WixToolset.Iis
                 new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, description: "Attributes of the IIsProperty (unused)"),
                 new ColumnDefinition("Value", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Value of the IIsProperty"),
             },
-            tupleIdIsPrimaryKey: true
+            symbolIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition IIsWebDirProperties = new TableDefinition(
             "IIsWebDirProperties",
-            IisTupleDefinitions.IIsWebDirProperties,
+            IisSymbolDefinitions.IIsWebDirProperties,
             new[]
             {
                 new ColumnDefinition("DirProperties", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token for Web Properties", modularizeType: ColumnModularizeType.Column),
@@ -119,12 +119,12 @@ namespace WixToolset.Iis
                 new ColumnDefinition("AccessSSLFlags", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Specifies AccessSSLFlags IIS metabase property."),
                 new ColumnDefinition("AuthenticationProviders", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Comma delimited list, in order of precedence, of Windows authentication providers that IIS will attempt to use: NTLM, Kerberos, Negotiate, and others."),
             },
-            tupleIdIsPrimaryKey: true
+            symbolIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition IIsWebAddress = new TableDefinition(
             "IIsWebAddress",
-            IisTupleDefinitions.IIsWebAddress,
+            IisSymbolDefinitions.IIsWebAddress,
             new[]
             {
                 new ColumnDefinition("Address", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -134,12 +134,12 @@ namespace WixToolset.Iis
                 new ColumnDefinition("Header", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Special header information for the web site"),
                 new ColumnDefinition("Secure", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, possibilities: "0;1", description: "Specifies whether SSL is used to communicate with web site"),
             },
-            tupleIdIsPrimaryKey: true
+            symbolIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition IIsWebSite = new TableDefinition(
             "IIsWebSite",
-            IisTupleDefinitions.IIsWebSite,
+            IisSymbolDefinitions.IIsWebSite,
             new[]
             {
                 new ColumnDefinition("Web", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -156,12 +156,12 @@ namespace WixToolset.Iis
                 new ColumnDefinition("Log_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Unknown, keyTable: "IIsWebLog", keyColumn: 1, description: "Foreign key reference to IIsWebLog data", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Id", ColumnType.String, 74, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Optional number or formatted value that resolves to number that acts as the WebSite Id."),
             },
-            tupleIdIsPrimaryKey: true
+            symbolIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition IIsWebApplication = new TableDefinition(
             "IIsWebApplication",
-            IisTupleDefinitions.IIsWebApplication,
+            IisSymbolDefinitions.IIsWebApplication,
             new[]
             {
                 new ColumnDefinition("Application", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token for ASP Application", modularizeType: ColumnModularizeType.Column),
@@ -177,12 +177,12 @@ namespace WixToolset.Iis
                 new ColumnDefinition("ClientDebugging", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, possibilities: "0;1", description: "Specifies whether to allow ASP client-side script debugging"),
                 new ColumnDefinition("AppPool_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "IIsAppPool", keyColumn: 1, description: "App Pool this application should run under", modularizeType: ColumnModularizeType.Column),
             },
-            tupleIdIsPrimaryKey: true
+            symbolIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition IIsWebApplicationExtension = new TableDefinition(
             "IIsWebApplicationExtension",
-            IisTupleDefinitions.IIsWebApplicationExtension,
+            IisSymbolDefinitions.IIsWebApplicationExtension,
             new[]
             {
                 new ColumnDefinition("Application_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "IIsWebApplication", keyColumn: 1, description: "Foreign key referencing possible ASP application for the web site", modularizeType: ColumnModularizeType.Column),
@@ -191,12 +191,12 @@ namespace WixToolset.Iis
                 new ColumnDefinition("Executable", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Formatted, description: "Path to extension (usually file property: [#file])", modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, possibilities: "1;4;5", description: "Attributes for extension: 1 == Script, 4 == Check Path Info"),
             },
-            tupleIdIsPrimaryKey: false
+            symbolIdIsPrimaryKey: false
         );
 
         public static readonly TableDefinition IIsFilter = new TableDefinition(
             "IIsFilter",
-            IisTupleDefinitions.IIsFilter,
+            IisSymbolDefinitions.IIsFilter,
             new[]
             {
                 new ColumnDefinition("Filter", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -208,12 +208,12 @@ namespace WixToolset.Iis
                 new ColumnDefinition("Flags", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "What do all these numbers mean?"),
                 new ColumnDefinition("LoadOrder", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "-1 == last in order, 0 == first in order, # == place in order"),
             },
-            tupleIdIsPrimaryKey: true
+            symbolIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition IIsWebDir = new TableDefinition(
             "IIsWebDir",
-            IisTupleDefinitions.IIsWebDir,
+            IisSymbolDefinitions.IIsWebDir,
             new[]
             {
                 new ColumnDefinition("WebDir", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -223,12 +223,12 @@ namespace WixToolset.Iis
                 new ColumnDefinition("DirProperties_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "IIsWebDirProperties", keyColumn: 1, description: "Foreign key referencing possible security information for the virtual directory", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Application_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "IIsWebApplication", keyColumn: 1, description: "Foreign key referencing possible ASP application for the virtual directory. This column is currently unused, but maintained for compatibility reasons.", modularizeType: ColumnModularizeType.Column),
             },
-            tupleIdIsPrimaryKey: true
+            symbolIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition IIsWebError = new TableDefinition(
             "IIsWebError",
-            IisTupleDefinitions.IIsWebError,
+            IisSymbolDefinitions.IIsWebError,
             new[]
             {
                 new ColumnDefinition("ErrorCode", ColumnType.Number, 2, primaryKey: true, nullable: false, ColumnCategory.Unknown, minValue: 400, maxValue: 599, description: "HTTP status code indicating error."),
@@ -238,12 +238,12 @@ namespace WixToolset.Iis
                 new ColumnDefinition("File", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Path to file for this custom error (usually file property: [#file]).  Must be null if URL is not null."),
                 new ColumnDefinition("URL", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "URL for this custom error.  Must be null if File is not null."),
             },
-            tupleIdIsPrimaryKey: false
+            symbolIdIsPrimaryKey: false
         );
 
         public static readonly TableDefinition IIsHttpHeader = new TableDefinition(
             "IIsHttpHeader",
-            IisTupleDefinitions.IIsHttpHeader,
+            IisSymbolDefinitions.IIsHttpHeader,
             new[]
             {
                 new ColumnDefinition("HttpHeader", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -254,12 +254,12 @@ namespace WixToolset.Iis
                 new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 0, description: "Attributes for HTTP Header: none"),
                 new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Order to add the HTTP Headers."),
             },
-            tupleIdIsPrimaryKey: false
+            symbolIdIsPrimaryKey: false
         );
 
         public static readonly TableDefinition IIsWebServiceExtension = new TableDefinition(
             "IIsWebServiceExtension",
-            IisTupleDefinitions.IIsWebServiceExtension,
+            IisSymbolDefinitions.IIsWebServiceExtension,
             new[]
             {
                 new ColumnDefinition("WebServiceExtension", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -269,12 +269,12 @@ namespace WixToolset.Iis
                 new ColumnDefinition("Group", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "String used to identify groups of extensions.", modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("Attributes", ColumnType.Number, 1, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 3, description: "Attributes for WebServiceExtension: 1 = Allow, 2 = UIDeletable"),
             },
-            tupleIdIsPrimaryKey: true
+            symbolIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition IIsWebVirtualDir = new TableDefinition(
             "IIsWebVirtualDir",
-            IisTupleDefinitions.IIsWebVirtualDir,
+            IisSymbolDefinitions.IIsWebVirtualDir,
             new[]
             {
                 new ColumnDefinition("VirtualDir", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -285,18 +285,18 @@ namespace WixToolset.Iis
                 new ColumnDefinition("DirProperties_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "IIsWebDirProperties", keyColumn: 1, description: "Foreign key referencing possible security information for the virtual directory", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Application_", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "IIsWebApplication", keyColumn: 1, description: "Foreign key referencing possible ASP application for the virtual directory", modularizeType: ColumnModularizeType.Column),
             },
-            tupleIdIsPrimaryKey: true
+            symbolIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition IIsWebLog = new TableDefinition(
             "IIsWebLog",
-            IisTupleDefinitions.IIsWebLog,
+            IisSymbolDefinitions.IIsWebLog,
             new[]
             {
                 new ColumnDefinition("Log", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Format", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Text, description: "Type of log format"),
             },
-            tupleIdIsPrimaryKey: true
+            symbolIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition[] All = new[]
diff --git a/src/wixext/Tuples/CertificateHashTuple.cs b/src/wixext/Tuples/CertificateHashTuple.cs
index 11f0592f..866d474c 100644
--- a/src/wixext/Tuples/CertificateHashTuple.cs
+++ b/src/wixext/Tuples/CertificateHashTuple.cs
@@ -3,53 +3,53 @@
 namespace WixToolset.Iis
 {
     using WixToolset.Data;
-    using WixToolset.Iis.Tuples;
+    using WixToolset.Iis.Symbols;
 
-    public static partial class IisTupleDefinitions
+    public static partial class IisSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition CertificateHash = new IntermediateTupleDefinition(
-            IisTupleDefinitionType.CertificateHash.ToString(),
+        public static readonly IntermediateSymbolDefinition CertificateHash = new IntermediateSymbolDefinition(
+            IisSymbolDefinitionType.CertificateHash.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(CertificateHashTupleFields.CertificateRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(CertificateHashTupleFields.Hash), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(CertificateHashSymbolFields.CertificateRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(CertificateHashSymbolFields.Hash), IntermediateFieldType.String),
             },
-            typeof(CertificateHashTuple));
+            typeof(CertificateHashSymbol));
     }
 }
 
-namespace WixToolset.Iis.Tuples
+namespace WixToolset.Iis.Symbols
 {
     using WixToolset.Data;
 
-    public enum CertificateHashTupleFields
+    public enum CertificateHashSymbolFields
     {
         CertificateRef,
         Hash,
     }
 
-    public class CertificateHashTuple : IntermediateTuple
+    public class CertificateHashSymbol : IntermediateSymbol
     {
-        public CertificateHashTuple() : base(IisTupleDefinitions.CertificateHash, null, null)
+        public CertificateHashSymbol() : base(IisSymbolDefinitions.CertificateHash, null, null)
         {
         }
 
-        public CertificateHashTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.CertificateHash, sourceLineNumber, id)
+        public CertificateHashSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.CertificateHash, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[CertificateHashTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[CertificateHashSymbolFields index] => this.Fields[(int)index];
 
         public string CertificateRef
         {
-            get => this.Fields[(int)CertificateHashTupleFields.CertificateRef].AsString();
-            set => this.Set((int)CertificateHashTupleFields.CertificateRef, value);
+            get => this.Fields[(int)CertificateHashSymbolFields.CertificateRef].AsString();
+            set => this.Set((int)CertificateHashSymbolFields.CertificateRef, value);
         }
 
         public string Hash
         {
-            get => this.Fields[(int)CertificateHashTupleFields.Hash].AsString();
-            set => this.Set((int)CertificateHashTupleFields.Hash, value);
+            get => this.Fields[(int)CertificateHashSymbolFields.Hash].AsString();
+            set => this.Set((int)CertificateHashSymbolFields.Hash, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/CertificateTuple.cs b/src/wixext/Tuples/CertificateTuple.cs
index 480a3569..b80b6ba4 100644
--- a/src/wixext/Tuples/CertificateTuple.cs
+++ b/src/wixext/Tuples/CertificateTuple.cs
@@ -3,32 +3,32 @@
 namespace WixToolset.Iis
 {
     using WixToolset.Data;
-    using WixToolset.Iis.Tuples;
+    using WixToolset.Iis.Symbols;
 
-    public static partial class IisTupleDefinitions
+    public static partial class IisSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition Certificate = new IntermediateTupleDefinition(
-            IisTupleDefinitionType.Certificate.ToString(),
+        public static readonly IntermediateSymbolDefinition Certificate = new IntermediateSymbolDefinition(
+            IisSymbolDefinitionType.Certificate.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(CertificateTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(CertificateTupleFields.Name), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(CertificateTupleFields.StoreLocation), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(CertificateTupleFields.StoreName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(CertificateTupleFields.Attributes), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(CertificateTupleFields.BinaryRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(CertificateTupleFields.CertificatePath), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(CertificateTupleFields.PFXPassword), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(CertificateSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(CertificateSymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(CertificateSymbolFields.StoreLocation), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(CertificateSymbolFields.StoreName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(CertificateSymbolFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(CertificateSymbolFields.BinaryRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(CertificateSymbolFields.CertificatePath), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(CertificateSymbolFields.PFXPassword), IntermediateFieldType.String),
             },
-            typeof(CertificateTuple));
+            typeof(CertificateSymbol));
     }
 }
 
-namespace WixToolset.Iis.Tuples
+namespace WixToolset.Iis.Symbols
 {
     using WixToolset.Data;
 
-    public enum CertificateTupleFields
+    public enum CertificateSymbolFields
     {
         ComponentRef,
         Name,
@@ -40,64 +40,64 @@ namespace WixToolset.Iis.Tuples
         PFXPassword,
     }
 
-    public class CertificateTuple : IntermediateTuple
+    public class CertificateSymbol : IntermediateSymbol
     {
-        public CertificateTuple() : base(IisTupleDefinitions.Certificate, null, null)
+        public CertificateSymbol() : base(IisSymbolDefinitions.Certificate, null, null)
         {
         }
 
-        public CertificateTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.Certificate, sourceLineNumber, id)
+        public CertificateSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.Certificate, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[CertificateTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[CertificateSymbolFields index] => this.Fields[(int)index];
 
         public string ComponentRef
         {
-            get => this.Fields[(int)CertificateTupleFields.ComponentRef].AsString();
-            set => this.Set((int)CertificateTupleFields.ComponentRef, value);
+            get => this.Fields[(int)CertificateSymbolFields.ComponentRef].AsString();
+            set => this.Set((int)CertificateSymbolFields.ComponentRef, value);
         }
 
         public string Name
         {
-            get => this.Fields[(int)CertificateTupleFields.Name].AsString();
-            set => this.Set((int)CertificateTupleFields.Name, value);
+            get => this.Fields[(int)CertificateSymbolFields.Name].AsString();
+            set => this.Set((int)CertificateSymbolFields.Name, value);
         }
 
         public int StoreLocation
         {
-            get => this.Fields[(int)CertificateTupleFields.StoreLocation].AsNumber();
-            set => this.Set((int)CertificateTupleFields.StoreLocation, value);
+            get => this.Fields[(int)CertificateSymbolFields.StoreLocation].AsNumber();
+            set => this.Set((int)CertificateSymbolFields.StoreLocation, value);
         }
 
         public string StoreName
         {
-            get => this.Fields[(int)CertificateTupleFields.StoreName].AsString();
-            set => this.Set((int)CertificateTupleFields.StoreName, value);
+            get => this.Fields[(int)CertificateSymbolFields.StoreName].AsString();
+            set => this.Set((int)CertificateSymbolFields.StoreName, value);
         }
 
         public int Attributes
         {
-            get => this.Fields[(int)CertificateTupleFields.Attributes].AsNumber();
-            set => this.Set((int)CertificateTupleFields.Attributes, value);
+            get => this.Fields[(int)CertificateSymbolFields.Attributes].AsNumber();
+            set => this.Set((int)CertificateSymbolFields.Attributes, value);
         }
 
         public string BinaryRef
         {
-            get => this.Fields[(int)CertificateTupleFields.BinaryRef].AsString();
-            set => this.Set((int)CertificateTupleFields.BinaryRef, value);
+            get => this.Fields[(int)CertificateSymbolFields.BinaryRef].AsString();
+            set => this.Set((int)CertificateSymbolFields.BinaryRef, value);
         }
 
         public string CertificatePath
         {
-            get => this.Fields[(int)CertificateTupleFields.CertificatePath].AsString();
-            set => this.Set((int)CertificateTupleFields.CertificatePath, value);
+            get => this.Fields[(int)CertificateSymbolFields.CertificatePath].AsString();
+            set => this.Set((int)CertificateSymbolFields.CertificatePath, value);
         }
 
         public string PFXPassword
         {
-            get => this.Fields[(int)CertificateTupleFields.PFXPassword].AsString();
-            set => this.Set((int)CertificateTupleFields.PFXPassword, value);
+            get => this.Fields[(int)CertificateSymbolFields.PFXPassword].AsString();
+            set => this.Set((int)CertificateSymbolFields.PFXPassword, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/IIsAppPoolTuple.cs b/src/wixext/Tuples/IIsAppPoolTuple.cs
index ee8dca51..a6fab136 100644
--- a/src/wixext/Tuples/IIsAppPoolTuple.cs
+++ b/src/wixext/Tuples/IIsAppPoolTuple.cs
@@ -3,39 +3,39 @@
 namespace WixToolset.Iis
 {
     using WixToolset.Data;
-    using WixToolset.Iis.Tuples;
+    using WixToolset.Iis.Symbols;
 
-    public static partial class IisTupleDefinitions
+    public static partial class IisSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition IIsAppPool = new IntermediateTupleDefinition(
-            IisTupleDefinitionType.IIsAppPool.ToString(),
+        public static readonly IntermediateSymbolDefinition IIsAppPool = new IntermediateSymbolDefinition(
+            IisSymbolDefinitionType.IIsAppPool.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(IIsAppPoolTupleFields.Name), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsAppPoolTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsAppPoolTupleFields.Attributes), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsAppPoolTupleFields.UserRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsAppPoolTupleFields.RecycleMinutes), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsAppPoolTupleFields.RecycleRequests), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsAppPoolTupleFields.RecycleTimes), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsAppPoolTupleFields.IdleTimeout), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsAppPoolTupleFields.QueueLimit), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsAppPoolTupleFields.CPUMon), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsAppPoolTupleFields.MaxProc), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsAppPoolTupleFields.VirtualMemory), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsAppPoolTupleFields.PrivateMemory), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsAppPoolTupleFields.ManagedRuntimeVersion), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsAppPoolTupleFields.ManagedPipelineMode), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsAppPoolSymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsAppPoolSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsAppPoolSymbolFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsAppPoolSymbolFields.UserRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsAppPoolSymbolFields.RecycleMinutes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsAppPoolSymbolFields.RecycleRequests), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsAppPoolSymbolFields.RecycleTimes), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsAppPoolSymbolFields.IdleTimeout), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsAppPoolSymbolFields.QueueLimit), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsAppPoolSymbolFields.CPUMon), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsAppPoolSymbolFields.MaxProc), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsAppPoolSymbolFields.VirtualMemory), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsAppPoolSymbolFields.PrivateMemory), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsAppPoolSymbolFields.ManagedRuntimeVersion), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsAppPoolSymbolFields.ManagedPipelineMode), IntermediateFieldType.String),
             },
-            typeof(IIsAppPoolTuple));
+            typeof(IIsAppPoolSymbol));
     }
 }
 
-namespace WixToolset.Iis.Tuples
+namespace WixToolset.Iis.Symbols
 {
     using WixToolset.Data;
 
-    public enum IIsAppPoolTupleFields
+    public enum IIsAppPoolSymbolFields
     {
         Name,
         ComponentRef,
@@ -54,106 +54,106 @@ namespace WixToolset.Iis.Tuples
         ManagedPipelineMode,
     }
 
-    public class IIsAppPoolTuple : IntermediateTuple
+    public class IIsAppPoolSymbol : IntermediateSymbol
     {
-        public IIsAppPoolTuple() : base(IisTupleDefinitions.IIsAppPool, null, null)
+        public IIsAppPoolSymbol() : base(IisSymbolDefinitions.IIsAppPool, null, null)
         {
         }
 
-        public IIsAppPoolTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsAppPool, sourceLineNumber, id)
+        public IIsAppPoolSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsAppPool, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[IIsAppPoolTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[IIsAppPoolSymbolFields index] => this.Fields[(int)index];
 
         public string Name
         {
-            get => this.Fields[(int)IIsAppPoolTupleFields.Name].AsString();
-            set => this.Set((int)IIsAppPoolTupleFields.Name, value);
+            get => this.Fields[(int)IIsAppPoolSymbolFields.Name].AsString();
+            set => this.Set((int)IIsAppPoolSymbolFields.Name, value);
         }
 
         public string ComponentRef
         {
-            get => this.Fields[(int)IIsAppPoolTupleFields.ComponentRef].AsString();
-            set => this.Set((int)IIsAppPoolTupleFields.ComponentRef, value);
+            get => this.Fields[(int)IIsAppPoolSymbolFields.ComponentRef].AsString();
+            set => this.Set((int)IIsAppPoolSymbolFields.ComponentRef, value);
         }
 
         public int Attributes
         {
-            get => this.Fields[(int)IIsAppPoolTupleFields.Attributes].AsNumber();
-            set => this.Set((int)IIsAppPoolTupleFields.Attributes, value);
+            get => this.Fields[(int)IIsAppPoolSymbolFields.Attributes].AsNumber();
+            set => this.Set((int)IIsAppPoolSymbolFields.Attributes, value);
         }
 
         public string UserRef
         {
-            get => this.Fields[(int)IIsAppPoolTupleFields.UserRef].AsString();
-            set => this.Set((int)IIsAppPoolTupleFields.UserRef, value);
+            get => this.Fields[(int)IIsAppPoolSymbolFields.UserRef].AsString();
+            set => this.Set((int)IIsAppPoolSymbolFields.UserRef, value);
         }
 
         public int? RecycleMinutes
         {
-            get => this.Fields[(int)IIsAppPoolTupleFields.RecycleMinutes].AsNullableNumber();
-            set => this.Set((int)IIsAppPoolTupleFields.RecycleMinutes, value);
+            get => this.Fields[(int)IIsAppPoolSymbolFields.RecycleMinutes].AsNullableNumber();
+            set => this.Set((int)IIsAppPoolSymbolFields.RecycleMinutes, value);
         }
 
         public int? RecycleRequests
         {
-            get => this.Fields[(int)IIsAppPoolTupleFields.RecycleRequests].AsNullableNumber();
-            set => this.Set((int)IIsAppPoolTupleFields.RecycleRequests, value);
+            get => this.Fields[(int)IIsAppPoolSymbolFields.RecycleRequests].AsNullableNumber();
+            set => this.Set((int)IIsAppPoolSymbolFields.RecycleRequests, value);
         }
 
         public string RecycleTimes
         {
-            get => this.Fields[(int)IIsAppPoolTupleFields.RecycleTimes].AsString();
-            set => this.Set((int)IIsAppPoolTupleFields.RecycleTimes, value);
+            get => this.Fields[(int)IIsAppPoolSymbolFields.RecycleTimes].AsString();
+            set => this.Set((int)IIsAppPoolSymbolFields.RecycleTimes, value);
         }
 
         public int? IdleTimeout
         {
-            get => this.Fields[(int)IIsAppPoolTupleFields.IdleTimeout].AsNullableNumber();
-            set => this.Set((int)IIsAppPoolTupleFields.IdleTimeout, value);
+            get => this.Fields[(int)IIsAppPoolSymbolFields.IdleTimeout].AsNullableNumber();
+            set => this.Set((int)IIsAppPoolSymbolFields.IdleTimeout, value);
         }
 
         public int? QueueLimit
         {
-            get => this.Fields[(int)IIsAppPoolTupleFields.QueueLimit].AsNullableNumber();
-            set => this.Set((int)IIsAppPoolTupleFields.QueueLimit, value);
+            get => this.Fields[(int)IIsAppPoolSymbolFields.QueueLimit].AsNullableNumber();
+            set => this.Set((int)IIsAppPoolSymbolFields.QueueLimit, value);
         }
 
         public string CPUMon
         {
-            get => this.Fields[(int)IIsAppPoolTupleFields.CPUMon].AsString();
-            set => this.Set((int)IIsAppPoolTupleFields.CPUMon, value);
+            get => this.Fields[(int)IIsAppPoolSymbolFields.CPUMon].AsString();
+            set => this.Set((int)IIsAppPoolSymbolFields.CPUMon, value);
         }
 
         public int? MaxProc
         {
-            get => this.Fields[(int)IIsAppPoolTupleFields.MaxProc].AsNullableNumber();
-            set => this.Set((int)IIsAppPoolTupleFields.MaxProc, value);
+            get => this.Fields[(int)IIsAppPoolSymbolFields.MaxProc].AsNullableNumber();
+            set => this.Set((int)IIsAppPoolSymbolFields.MaxProc, value);
         }
 
         public int? VirtualMemory
         {
-            get => this.Fields[(int)IIsAppPoolTupleFields.VirtualMemory].AsNullableNumber();
-            set => this.Set((int)IIsAppPoolTupleFields.VirtualMemory, value);
+            get => this.Fields[(int)IIsAppPoolSymbolFields.VirtualMemory].AsNullableNumber();
+            set => this.Set((int)IIsAppPoolSymbolFields.VirtualMemory, value);
         }
 
         public int? PrivateMemory
         {
-            get => this.Fields[(int)IIsAppPoolTupleFields.PrivateMemory].AsNullableNumber();
-            set => this.Set((int)IIsAppPoolTupleFields.PrivateMemory, value);
+            get => this.Fields[(int)IIsAppPoolSymbolFields.PrivateMemory].AsNullableNumber();
+            set => this.Set((int)IIsAppPoolSymbolFields.PrivateMemory, value);
         }
 
         public string ManagedRuntimeVersion
         {
-            get => this.Fields[(int)IIsAppPoolTupleFields.ManagedRuntimeVersion].AsString();
-            set => this.Set((int)IIsAppPoolTupleFields.ManagedRuntimeVersion, value);
+            get => this.Fields[(int)IIsAppPoolSymbolFields.ManagedRuntimeVersion].AsString();
+            set => this.Set((int)IIsAppPoolSymbolFields.ManagedRuntimeVersion, value);
         }
 
         public string ManagedPipelineMode
         {
-            get => this.Fields[(int)IIsAppPoolTupleFields.ManagedPipelineMode].AsString();
-            set => this.Set((int)IIsAppPoolTupleFields.ManagedPipelineMode, value);
+            get => this.Fields[(int)IIsAppPoolSymbolFields.ManagedPipelineMode].AsString();
+            set => this.Set((int)IIsAppPoolSymbolFields.ManagedPipelineMode, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/IIsFilterTuple.cs b/src/wixext/Tuples/IIsFilterTuple.cs
index e681a235..618730bf 100644
--- a/src/wixext/Tuples/IIsFilterTuple.cs
+++ b/src/wixext/Tuples/IIsFilterTuple.cs
@@ -3,31 +3,31 @@
 namespace WixToolset.Iis
 {
     using WixToolset.Data;
-    using WixToolset.Iis.Tuples;
+    using WixToolset.Iis.Symbols;
 
-    public static partial class IisTupleDefinitions
+    public static partial class IisSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition IIsFilter = new IntermediateTupleDefinition(
-            IisTupleDefinitionType.IIsFilter.ToString(),
+        public static readonly IntermediateSymbolDefinition IIsFilter = new IntermediateSymbolDefinition(
+            IisSymbolDefinitionType.IIsFilter.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(IIsFilterTupleFields.Name), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsFilterTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsFilterTupleFields.Path), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsFilterTupleFields.WebRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsFilterTupleFields.Description), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsFilterTupleFields.Flags), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsFilterTupleFields.LoadOrder), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsFilterSymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsFilterSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsFilterSymbolFields.Path), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsFilterSymbolFields.WebRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsFilterSymbolFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsFilterSymbolFields.Flags), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsFilterSymbolFields.LoadOrder), IntermediateFieldType.Number),
             },
-            typeof(IIsFilterTuple));
+            typeof(IIsFilterSymbol));
     }
 }
 
-namespace WixToolset.Iis.Tuples
+namespace WixToolset.Iis.Symbols
 {
     using WixToolset.Data;
 
-    public enum IIsFilterTupleFields
+    public enum IIsFilterSymbolFields
     {
         Name,
         ComponentRef,
@@ -38,58 +38,58 @@ namespace WixToolset.Iis.Tuples
         LoadOrder,
     }
 
-    public class IIsFilterTuple : IntermediateTuple
+    public class IIsFilterSymbol : IntermediateSymbol
     {
-        public IIsFilterTuple() : base(IisTupleDefinitions.IIsFilter, null, null)
+        public IIsFilterSymbol() : base(IisSymbolDefinitions.IIsFilter, null, null)
         {
         }
 
-        public IIsFilterTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsFilter, sourceLineNumber, id)
+        public IIsFilterSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsFilter, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[IIsFilterTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[IIsFilterSymbolFields index] => this.Fields[(int)index];
 
         public string Name
         {
-            get => this.Fields[(int)IIsFilterTupleFields.Name].AsString();
-            set => this.Set((int)IIsFilterTupleFields.Name, value);
+            get => this.Fields[(int)IIsFilterSymbolFields.Name].AsString();
+            set => this.Set((int)IIsFilterSymbolFields.Name, value);
         }
 
         public string ComponentRef
         {
-            get => this.Fields[(int)IIsFilterTupleFields.ComponentRef].AsString();
-            set => this.Set((int)IIsFilterTupleFields.ComponentRef, value);
+            get => this.Fields[(int)IIsFilterSymbolFields.ComponentRef].AsString();
+            set => this.Set((int)IIsFilterSymbolFields.ComponentRef, value);
         }
 
         public string Path
         {
-            get => this.Fields[(int)IIsFilterTupleFields.Path].AsString();
-            set => this.Set((int)IIsFilterTupleFields.Path, value);
+            get => this.Fields[(int)IIsFilterSymbolFields.Path].AsString();
+            set => this.Set((int)IIsFilterSymbolFields.Path, value);
         }
 
         public string WebRef
         {
-            get => this.Fields[(int)IIsFilterTupleFields.WebRef].AsString();
-            set => this.Set((int)IIsFilterTupleFields.WebRef, value);
+            get => this.Fields[(int)IIsFilterSymbolFields.WebRef].AsString();
+            set => this.Set((int)IIsFilterSymbolFields.WebRef, value);
         }
 
         public string Description
         {
-            get => this.Fields[(int)IIsFilterTupleFields.Description].AsString();
-            set => this.Set((int)IIsFilterTupleFields.Description, value);
+            get => this.Fields[(int)IIsFilterSymbolFields.Description].AsString();
+            set => this.Set((int)IIsFilterSymbolFields.Description, value);
         }
 
         public int Flags
         {
-            get => this.Fields[(int)IIsFilterTupleFields.Flags].AsNumber();
-            set => this.Set((int)IIsFilterTupleFields.Flags, value);
+            get => this.Fields[(int)IIsFilterSymbolFields.Flags].AsNumber();
+            set => this.Set((int)IIsFilterSymbolFields.Flags, value);
         }
 
         public int? LoadOrder
         {
-            get => this.Fields[(int)IIsFilterTupleFields.LoadOrder].AsNullableNumber();
-            set => this.Set((int)IIsFilterTupleFields.LoadOrder, value);
+            get => this.Fields[(int)IIsFilterSymbolFields.LoadOrder].AsNullableNumber();
+            set => this.Set((int)IIsFilterSymbolFields.LoadOrder, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/IIsHttpHeaderTuple.cs b/src/wixext/Tuples/IIsHttpHeaderTuple.cs
index 43ebbe16..3ab2bf59 100644
--- a/src/wixext/Tuples/IIsHttpHeaderTuple.cs
+++ b/src/wixext/Tuples/IIsHttpHeaderTuple.cs
@@ -3,31 +3,31 @@
 namespace WixToolset.Iis
 {
     using WixToolset.Data;
-    using WixToolset.Iis.Tuples;
+    using WixToolset.Iis.Symbols;
 
-    public static partial class IisTupleDefinitions
+    public static partial class IisSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition IIsHttpHeader = new IntermediateTupleDefinition(
-            IisTupleDefinitionType.IIsHttpHeader.ToString(),
+        public static readonly IntermediateSymbolDefinition IIsHttpHeader = new IntermediateSymbolDefinition(
+            IisSymbolDefinitionType.IIsHttpHeader.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(IIsHttpHeaderTupleFields.HttpHeader), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsHttpHeaderTupleFields.ParentType), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsHttpHeaderTupleFields.ParentValue), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsHttpHeaderTupleFields.Name), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsHttpHeaderTupleFields.Value), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsHttpHeaderTupleFields.Attributes), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsHttpHeaderTupleFields.Sequence), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsHttpHeaderSymbolFields.HttpHeader), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsHttpHeaderSymbolFields.ParentType), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsHttpHeaderSymbolFields.ParentValue), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsHttpHeaderSymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsHttpHeaderSymbolFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsHttpHeaderSymbolFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsHttpHeaderSymbolFields.Sequence), IntermediateFieldType.Number),
             },
-            typeof(IIsHttpHeaderTuple));
+            typeof(IIsHttpHeaderSymbol));
     }
 }
 
-namespace WixToolset.Iis.Tuples
+namespace WixToolset.Iis.Symbols
 {
     using WixToolset.Data;
 
-    public enum IIsHttpHeaderTupleFields
+    public enum IIsHttpHeaderSymbolFields
     {
         HttpHeader,
         ParentType,
@@ -38,58 +38,58 @@ namespace WixToolset.Iis.Tuples
         Sequence,
     }
 
-    public class IIsHttpHeaderTuple : IntermediateTuple
+    public class IIsHttpHeaderSymbol : IntermediateSymbol
     {
-        public IIsHttpHeaderTuple() : base(IisTupleDefinitions.IIsHttpHeader, null, null)
+        public IIsHttpHeaderSymbol() : base(IisSymbolDefinitions.IIsHttpHeader, null, null)
         {
         }
 
-        public IIsHttpHeaderTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsHttpHeader, sourceLineNumber, id)
+        public IIsHttpHeaderSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsHttpHeader, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[IIsHttpHeaderTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[IIsHttpHeaderSymbolFields index] => this.Fields[(int)index];
 
         public string HttpHeader
         {
-            get => this.Fields[(int)IIsHttpHeaderTupleFields.HttpHeader].AsString();
-            set => this.Set((int)IIsHttpHeaderTupleFields.HttpHeader, value);
+            get => this.Fields[(int)IIsHttpHeaderSymbolFields.HttpHeader].AsString();
+            set => this.Set((int)IIsHttpHeaderSymbolFields.HttpHeader, value);
         }
 
         public int ParentType
         {
-            get => this.Fields[(int)IIsHttpHeaderTupleFields.ParentType].AsNumber();
-            set => this.Set((int)IIsHttpHeaderTupleFields.ParentType, value);
+            get => this.Fields[(int)IIsHttpHeaderSymbolFields.ParentType].AsNumber();
+            set => this.Set((int)IIsHttpHeaderSymbolFields.ParentType, value);
         }
 
         public string ParentValue
         {
-            get => this.Fields[(int)IIsHttpHeaderTupleFields.ParentValue].AsString();
-            set => this.Set((int)IIsHttpHeaderTupleFields.ParentValue, value);
+            get => this.Fields[(int)IIsHttpHeaderSymbolFields.ParentValue].AsString();
+            set => this.Set((int)IIsHttpHeaderSymbolFields.ParentValue, value);
         }
 
         public string Name
         {
-            get => this.Fields[(int)IIsHttpHeaderTupleFields.Name].AsString();
-            set => this.Set((int)IIsHttpHeaderTupleFields.Name, value);
+            get => this.Fields[(int)IIsHttpHeaderSymbolFields.Name].AsString();
+            set => this.Set((int)IIsHttpHeaderSymbolFields.Name, value);
         }
 
         public string Value
         {
-            get => this.Fields[(int)IIsHttpHeaderTupleFields.Value].AsString();
-            set => this.Set((int)IIsHttpHeaderTupleFields.Value, value);
+            get => this.Fields[(int)IIsHttpHeaderSymbolFields.Value].AsString();
+            set => this.Set((int)IIsHttpHeaderSymbolFields.Value, value);
         }
 
         public int Attributes
         {
-            get => this.Fields[(int)IIsHttpHeaderTupleFields.Attributes].AsNumber();
-            set => this.Set((int)IIsHttpHeaderTupleFields.Attributes, value);
+            get => this.Fields[(int)IIsHttpHeaderSymbolFields.Attributes].AsNumber();
+            set => this.Set((int)IIsHttpHeaderSymbolFields.Attributes, value);
         }
 
         public int? Sequence
         {
-            get => this.Fields[(int)IIsHttpHeaderTupleFields.Sequence].AsNullableNumber();
-            set => this.Set((int)IIsHttpHeaderTupleFields.Sequence, value);
+            get => this.Fields[(int)IIsHttpHeaderSymbolFields.Sequence].AsNullableNumber();
+            set => this.Set((int)IIsHttpHeaderSymbolFields.Sequence, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/IIsMimeMapTuple.cs b/src/wixext/Tuples/IIsMimeMapTuple.cs
index f1a825b0..4af6f81c 100644
--- a/src/wixext/Tuples/IIsMimeMapTuple.cs
+++ b/src/wixext/Tuples/IIsMimeMapTuple.cs
@@ -3,28 +3,28 @@
 namespace WixToolset.Iis
 {
     using WixToolset.Data;
-    using WixToolset.Iis.Tuples;
+    using WixToolset.Iis.Symbols;
 
-    public static partial class IisTupleDefinitions
+    public static partial class IisSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition IIsMimeMap = new IntermediateTupleDefinition(
-            IisTupleDefinitionType.IIsMimeMap.ToString(),
+        public static readonly IntermediateSymbolDefinition IIsMimeMap = new IntermediateSymbolDefinition(
+            IisSymbolDefinitionType.IIsMimeMap.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(IIsMimeMapTupleFields.ParentType), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsMimeMapTupleFields.ParentValue), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsMimeMapTupleFields.MimeType), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsMimeMapTupleFields.Extension), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsMimeMapSymbolFields.ParentType), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsMimeMapSymbolFields.ParentValue), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsMimeMapSymbolFields.MimeType), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsMimeMapSymbolFields.Extension), IntermediateFieldType.String),
             },
-            typeof(IIsMimeMapTuple));
+            typeof(IIsMimeMapSymbol));
     }
 }
 
-namespace WixToolset.Iis.Tuples
+namespace WixToolset.Iis.Symbols
 {
     using WixToolset.Data;
 
-    public enum IIsMimeMapTupleFields
+    public enum IIsMimeMapSymbolFields
     {
         ParentType,
         ParentValue,
@@ -32,40 +32,40 @@ namespace WixToolset.Iis.Tuples
         Extension,
     }
 
-    public class IIsMimeMapTuple : IntermediateTuple
+    public class IIsMimeMapSymbol : IntermediateSymbol
     {
-        public IIsMimeMapTuple() : base(IisTupleDefinitions.IIsMimeMap, null, null)
+        public IIsMimeMapSymbol() : base(IisSymbolDefinitions.IIsMimeMap, null, null)
         {
         }
 
-        public IIsMimeMapTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsMimeMap, sourceLineNumber, id)
+        public IIsMimeMapSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsMimeMap, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[IIsMimeMapTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[IIsMimeMapSymbolFields index] => this.Fields[(int)index];
 
         public int ParentType
         {
-            get => this.Fields[(int)IIsMimeMapTupleFields.ParentType].AsNumber();
-            set => this.Set((int)IIsMimeMapTupleFields.ParentType, value);
+            get => this.Fields[(int)IIsMimeMapSymbolFields.ParentType].AsNumber();
+            set => this.Set((int)IIsMimeMapSymbolFields.ParentType, value);
         }
 
         public string ParentValue
         {
-            get => this.Fields[(int)IIsMimeMapTupleFields.ParentValue].AsString();
-            set => this.Set((int)IIsMimeMapTupleFields.ParentValue, value);
+            get => this.Fields[(int)IIsMimeMapSymbolFields.ParentValue].AsString();
+            set => this.Set((int)IIsMimeMapSymbolFields.ParentValue, value);
         }
 
         public string MimeType
         {
-            get => this.Fields[(int)IIsMimeMapTupleFields.MimeType].AsString();
-            set => this.Set((int)IIsMimeMapTupleFields.MimeType, value);
+            get => this.Fields[(int)IIsMimeMapSymbolFields.MimeType].AsString();
+            set => this.Set((int)IIsMimeMapSymbolFields.MimeType, value);
         }
 
         public string Extension
         {
-            get => this.Fields[(int)IIsMimeMapTupleFields.Extension].AsString();
-            set => this.Set((int)IIsMimeMapTupleFields.Extension, value);
+            get => this.Fields[(int)IIsMimeMapSymbolFields.Extension].AsString();
+            set => this.Set((int)IIsMimeMapSymbolFields.Extension, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/IIsPropertyTuple.cs b/src/wixext/Tuples/IIsPropertyTuple.cs
index 28e882bf..9cf67014 100644
--- a/src/wixext/Tuples/IIsPropertyTuple.cs
+++ b/src/wixext/Tuples/IIsPropertyTuple.cs
@@ -3,61 +3,61 @@
 namespace WixToolset.Iis
 {
     using WixToolset.Data;
-    using WixToolset.Iis.Tuples;
+    using WixToolset.Iis.Symbols;
 
-    public static partial class IisTupleDefinitions
+    public static partial class IisSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition IIsProperty = new IntermediateTupleDefinition(
-            IisTupleDefinitionType.IIsProperty.ToString(),
+        public static readonly IntermediateSymbolDefinition IIsProperty = new IntermediateSymbolDefinition(
+            IisSymbolDefinitionType.IIsProperty.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(IIsPropertyTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsPropertyTupleFields.Attributes), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsPropertyTupleFields.Value), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsPropertySymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsPropertySymbolFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsPropertySymbolFields.Value), IntermediateFieldType.String),
             },
-            typeof(IIsPropertyTuple));
+            typeof(IIsPropertySymbol));
     }
 }
 
-namespace WixToolset.Iis.Tuples
+namespace WixToolset.Iis.Symbols
 {
     using WixToolset.Data;
 
-    public enum IIsPropertyTupleFields
+    public enum IIsPropertySymbolFields
     {
         ComponentRef,
         Attributes,
         Value,
     }
 
-    public class IIsPropertyTuple : IntermediateTuple
+    public class IIsPropertySymbol : IntermediateSymbol
     {
-        public IIsPropertyTuple() : base(IisTupleDefinitions.IIsProperty, null, null)
+        public IIsPropertySymbol() : base(IisSymbolDefinitions.IIsProperty, null, null)
         {
         }
 
-        public IIsPropertyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsProperty, sourceLineNumber, id)
+        public IIsPropertySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsProperty, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[IIsPropertyTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[IIsPropertySymbolFields index] => this.Fields[(int)index];
 
         public string ComponentRef
         {
-            get => this.Fields[(int)IIsPropertyTupleFields.ComponentRef].AsString();
-            set => this.Set((int)IIsPropertyTupleFields.ComponentRef, value);
+            get => this.Fields[(int)IIsPropertySymbolFields.ComponentRef].AsString();
+            set => this.Set((int)IIsPropertySymbolFields.ComponentRef, value);
         }
 
         public int Attributes
         {
-            get => this.Fields[(int)IIsPropertyTupleFields.Attributes].AsNumber();
-            set => this.Set((int)IIsPropertyTupleFields.Attributes, value);
+            get => this.Fields[(int)IIsPropertySymbolFields.Attributes].AsNumber();
+            set => this.Set((int)IIsPropertySymbolFields.Attributes, value);
         }
 
         public string Value
         {
-            get => this.Fields[(int)IIsPropertyTupleFields.Value].AsString();
-            set => this.Set((int)IIsPropertyTupleFields.Value, value);
+            get => this.Fields[(int)IIsPropertySymbolFields.Value].AsString();
+            set => this.Set((int)IIsPropertySymbolFields.Value, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/IIsWebAddressTuple.cs b/src/wixext/Tuples/IIsWebAddressTuple.cs
index b6e61ccc..7111718a 100644
--- a/src/wixext/Tuples/IIsWebAddressTuple.cs
+++ b/src/wixext/Tuples/IIsWebAddressTuple.cs
@@ -3,29 +3,29 @@
 namespace WixToolset.Iis
 {
     using WixToolset.Data;
-    using WixToolset.Iis.Tuples;
+    using WixToolset.Iis.Symbols;
 
-    public static partial class IisTupleDefinitions
+    public static partial class IisSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition IIsWebAddress = new IntermediateTupleDefinition(
-            IisTupleDefinitionType.IIsWebAddress.ToString(),
+        public static readonly IntermediateSymbolDefinition IIsWebAddress = new IntermediateSymbolDefinition(
+            IisSymbolDefinitionType.IIsWebAddress.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(IIsWebAddressTupleFields.WebRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebAddressTupleFields.IP), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebAddressTupleFields.Port), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebAddressTupleFields.Header), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebAddressTupleFields.Secure), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsWebAddressSymbolFields.WebRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebAddressSymbolFields.IP), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebAddressSymbolFields.Port), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebAddressSymbolFields.Header), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebAddressSymbolFields.Secure), IntermediateFieldType.Number),
             },
-            typeof(IIsWebAddressTuple));
+            typeof(IIsWebAddressSymbol));
     }
 }
 
-namespace WixToolset.Iis.Tuples
+namespace WixToolset.Iis.Symbols
 {
     using WixToolset.Data;
 
-    public enum IIsWebAddressTupleFields
+    public enum IIsWebAddressSymbolFields
     {
         WebRef,
         IP,
@@ -34,46 +34,46 @@ namespace WixToolset.Iis.Tuples
         Secure,
     }
 
-    public class IIsWebAddressTuple : IntermediateTuple
+    public class IIsWebAddressSymbol : IntermediateSymbol
     {
-        public IIsWebAddressTuple() : base(IisTupleDefinitions.IIsWebAddress, null, null)
+        public IIsWebAddressSymbol() : base(IisSymbolDefinitions.IIsWebAddress, null, null)
         {
         }
 
-        public IIsWebAddressTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsWebAddress, sourceLineNumber, id)
+        public IIsWebAddressSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsWebAddress, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[IIsWebAddressTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[IIsWebAddressSymbolFields index] => this.Fields[(int)index];
 
         public string WebRef
         {
-            get => this.Fields[(int)IIsWebAddressTupleFields.WebRef].AsString();
-            set => this.Set((int)IIsWebAddressTupleFields.WebRef, value);
+            get => this.Fields[(int)IIsWebAddressSymbolFields.WebRef].AsString();
+            set => this.Set((int)IIsWebAddressSymbolFields.WebRef, value);
         }
 
         public string IP
         {
-            get => this.Fields[(int)IIsWebAddressTupleFields.IP].AsString();
-            set => this.Set((int)IIsWebAddressTupleFields.IP, value);
+            get => this.Fields[(int)IIsWebAddressSymbolFields.IP].AsString();
+            set => this.Set((int)IIsWebAddressSymbolFields.IP, value);
         }
 
         public string Port
         {
-            get => this.Fields[(int)IIsWebAddressTupleFields.Port].AsString();
-            set => this.Set((int)IIsWebAddressTupleFields.Port, value);
+            get => this.Fields[(int)IIsWebAddressSymbolFields.Port].AsString();
+            set => this.Set((int)IIsWebAddressSymbolFields.Port, value);
         }
 
         public string Header
         {
-            get => this.Fields[(int)IIsWebAddressTupleFields.Header].AsString();
-            set => this.Set((int)IIsWebAddressTupleFields.Header, value);
+            get => this.Fields[(int)IIsWebAddressSymbolFields.Header].AsString();
+            set => this.Set((int)IIsWebAddressSymbolFields.Header, value);
         }
 
         public int? Secure
         {
-            get => this.Fields[(int)IIsWebAddressTupleFields.Secure].AsNullableNumber();
-            set => this.Set((int)IIsWebAddressTupleFields.Secure, value);
+            get => this.Fields[(int)IIsWebAddressSymbolFields.Secure].AsNullableNumber();
+            set => this.Set((int)IIsWebAddressSymbolFields.Secure, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/IIsWebApplicationExtensionTuple.cs b/src/wixext/Tuples/IIsWebApplicationExtensionTuple.cs
index 8ab78dad..4283d702 100644
--- a/src/wixext/Tuples/IIsWebApplicationExtensionTuple.cs
+++ b/src/wixext/Tuples/IIsWebApplicationExtensionTuple.cs
@@ -3,29 +3,29 @@
 namespace WixToolset.Iis
 {
     using WixToolset.Data;
-    using WixToolset.Iis.Tuples;
+    using WixToolset.Iis.Symbols;
 
-    public static partial class IisTupleDefinitions
+    public static partial class IisSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition IIsWebApplicationExtension = new IntermediateTupleDefinition(
-            IisTupleDefinitionType.IIsWebApplicationExtension.ToString(),
+        public static readonly IntermediateSymbolDefinition IIsWebApplicationExtension = new IntermediateSymbolDefinition(
+            IisSymbolDefinitionType.IIsWebApplicationExtension.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(IIsWebApplicationExtensionTupleFields.ApplicationRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebApplicationExtensionTupleFields.Extension), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebApplicationExtensionTupleFields.Verbs), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebApplicationExtensionTupleFields.Executable), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebApplicationExtensionTupleFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsWebApplicationExtensionSymbolFields.ApplicationRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebApplicationExtensionSymbolFields.Extension), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebApplicationExtensionSymbolFields.Verbs), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebApplicationExtensionSymbolFields.Executable), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebApplicationExtensionSymbolFields.Attributes), IntermediateFieldType.Number),
             },
-            typeof(IIsWebApplicationExtensionTuple));
+            typeof(IIsWebApplicationExtensionSymbol));
     }
 }
 
-namespace WixToolset.Iis.Tuples
+namespace WixToolset.Iis.Symbols
 {
     using WixToolset.Data;
 
-    public enum IIsWebApplicationExtensionTupleFields
+    public enum IIsWebApplicationExtensionSymbolFields
     {
         ApplicationRef,
         Extension,
@@ -34,46 +34,46 @@ namespace WixToolset.Iis.Tuples
         Attributes,
     }
 
-    public class IIsWebApplicationExtensionTuple : IntermediateTuple
+    public class IIsWebApplicationExtensionSymbol : IntermediateSymbol
     {
-        public IIsWebApplicationExtensionTuple() : base(IisTupleDefinitions.IIsWebApplicationExtension, null, null)
+        public IIsWebApplicationExtensionSymbol() : base(IisSymbolDefinitions.IIsWebApplicationExtension, null, null)
         {
         }
 
-        public IIsWebApplicationExtensionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsWebApplicationExtension, sourceLineNumber, id)
+        public IIsWebApplicationExtensionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsWebApplicationExtension, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[IIsWebApplicationExtensionTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[IIsWebApplicationExtensionSymbolFields index] => this.Fields[(int)index];
 
         public string ApplicationRef
         {
-            get => this.Fields[(int)IIsWebApplicationExtensionTupleFields.ApplicationRef].AsString();
-            set => this.Set((int)IIsWebApplicationExtensionTupleFields.ApplicationRef, value);
+            get => this.Fields[(int)IIsWebApplicationExtensionSymbolFields.ApplicationRef].AsString();
+            set => this.Set((int)IIsWebApplicationExtensionSymbolFields.ApplicationRef, value);
         }
 
         public string Extension
         {
-            get => this.Fields[(int)IIsWebApplicationExtensionTupleFields.Extension].AsString();
-            set => this.Set((int)IIsWebApplicationExtensionTupleFields.Extension, value);
+            get => this.Fields[(int)IIsWebApplicationExtensionSymbolFields.Extension].AsString();
+            set => this.Set((int)IIsWebApplicationExtensionSymbolFields.Extension, value);
         }
 
         public string Verbs
         {
-            get => this.Fields[(int)IIsWebApplicationExtensionTupleFields.Verbs].AsString();
-            set => this.Set((int)IIsWebApplicationExtensionTupleFields.Verbs, value);
+            get => this.Fields[(int)IIsWebApplicationExtensionSymbolFields.Verbs].AsString();
+            set => this.Set((int)IIsWebApplicationExtensionSymbolFields.Verbs, value);
         }
 
         public string Executable
         {
-            get => this.Fields[(int)IIsWebApplicationExtensionTupleFields.Executable].AsString();
-            set => this.Set((int)IIsWebApplicationExtensionTupleFields.Executable, value);
+            get => this.Fields[(int)IIsWebApplicationExtensionSymbolFields.Executable].AsString();
+            set => this.Set((int)IIsWebApplicationExtensionSymbolFields.Executable, value);
         }
 
         public int Attributes
         {
-            get => this.Fields[(int)IIsWebApplicationExtensionTupleFields.Attributes].AsNumber();
-            set => this.Set((int)IIsWebApplicationExtensionTupleFields.Attributes, value);
+            get => this.Fields[(int)IIsWebApplicationExtensionSymbolFields.Attributes].AsNumber();
+            set => this.Set((int)IIsWebApplicationExtensionSymbolFields.Attributes, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/IIsWebApplicationTuple.cs b/src/wixext/Tuples/IIsWebApplicationTuple.cs
index 31ea955e..2f6f87de 100644
--- a/src/wixext/Tuples/IIsWebApplicationTuple.cs
+++ b/src/wixext/Tuples/IIsWebApplicationTuple.cs
@@ -3,35 +3,35 @@
 namespace WixToolset.Iis
 {
     using WixToolset.Data;
-    using WixToolset.Iis.Tuples;
+    using WixToolset.Iis.Symbols;
 
-    public static partial class IisTupleDefinitions
+    public static partial class IisSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition IIsWebApplication = new IntermediateTupleDefinition(
-            IisTupleDefinitionType.IIsWebApplication.ToString(),
+        public static readonly IntermediateSymbolDefinition IIsWebApplication = new IntermediateSymbolDefinition(
+            IisSymbolDefinitionType.IIsWebApplication.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(IIsWebApplicationTupleFields.Name), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebApplicationTupleFields.Isolation), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsWebApplicationTupleFields.AllowSessions), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsWebApplicationTupleFields.SessionTimeout), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsWebApplicationTupleFields.Buffer), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsWebApplicationTupleFields.ParentPaths), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsWebApplicationTupleFields.DefaultScript), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebApplicationTupleFields.ScriptTimeout), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsWebApplicationTupleFields.ServerDebugging), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsWebApplicationTupleFields.ClientDebugging), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsWebApplicationTupleFields.AppPoolRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebApplicationSymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebApplicationSymbolFields.Isolation), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsWebApplicationSymbolFields.AllowSessions), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsWebApplicationSymbolFields.SessionTimeout), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsWebApplicationSymbolFields.Buffer), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsWebApplicationSymbolFields.ParentPaths), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsWebApplicationSymbolFields.DefaultScript), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebApplicationSymbolFields.ScriptTimeout), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsWebApplicationSymbolFields.ServerDebugging), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsWebApplicationSymbolFields.ClientDebugging), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsWebApplicationSymbolFields.AppPoolRef), IntermediateFieldType.String),
             },
-            typeof(IIsWebApplicationTuple));
+            typeof(IIsWebApplicationSymbol));
     }
 }
 
-namespace WixToolset.Iis.Tuples
+namespace WixToolset.Iis.Symbols
 {
     using WixToolset.Data;
 
-    public enum IIsWebApplicationTupleFields
+    public enum IIsWebApplicationSymbolFields
     {
         Name,
         Isolation,
@@ -46,82 +46,82 @@ namespace WixToolset.Iis.Tuples
         AppPoolRef,
     }
 
-    public class IIsWebApplicationTuple : IntermediateTuple
+    public class IIsWebApplicationSymbol : IntermediateSymbol
     {
-        public IIsWebApplicationTuple() : base(IisTupleDefinitions.IIsWebApplication, null, null)
+        public IIsWebApplicationSymbol() : base(IisSymbolDefinitions.IIsWebApplication, null, null)
         {
         }
 
-        public IIsWebApplicationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsWebApplication, sourceLineNumber, id)
+        public IIsWebApplicationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsWebApplication, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[IIsWebApplicationTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[IIsWebApplicationSymbolFields index] => this.Fields[(int)index];
 
         public string Name
         {
-            get => this.Fields[(int)IIsWebApplicationTupleFields.Name].AsString();
-            set => this.Set((int)IIsWebApplicationTupleFields.Name, value);
+            get => this.Fields[(int)IIsWebApplicationSymbolFields.Name].AsString();
+            set => this.Set((int)IIsWebApplicationSymbolFields.Name, value);
         }
 
         public int Isolation
         {
-            get => this.Fields[(int)IIsWebApplicationTupleFields.Isolation].AsNumber();
-            set => this.Set((int)IIsWebApplicationTupleFields.Isolation, value);
+            get => this.Fields[(int)IIsWebApplicationSymbolFields.Isolation].AsNumber();
+            set => this.Set((int)IIsWebApplicationSymbolFields.Isolation, value);
         }
 
         public int? AllowSessions
         {
-            get => this.Fields[(int)IIsWebApplicationTupleFields.AllowSessions].AsNullableNumber();
-            set => this.Set((int)IIsWebApplicationTupleFields.AllowSessions, value);
+            get => this.Fields[(int)IIsWebApplicationSymbolFields.AllowSessions].AsNullableNumber();
+            set => this.Set((int)IIsWebApplicationSymbolFields.AllowSessions, value);
         }
 
         public int? SessionTimeout
         {
-            get => this.Fields[(int)IIsWebApplicationTupleFields.SessionTimeout].AsNullableNumber();
-            set => this.Set((int)IIsWebApplicationTupleFields.SessionTimeout, value);
+            get => this.Fields[(int)IIsWebApplicationSymbolFields.SessionTimeout].AsNullableNumber();
+            set => this.Set((int)IIsWebApplicationSymbolFields.SessionTimeout, value);
         }
 
         public int? Buffer
         {
-            get => this.Fields[(int)IIsWebApplicationTupleFields.Buffer].AsNullableNumber();
-            set => this.Set((int)IIsWebApplicationTupleFields.Buffer, value);
+            get => this.Fields[(int)IIsWebApplicationSymbolFields.Buffer].AsNullableNumber();
+            set => this.Set((int)IIsWebApplicationSymbolFields.Buffer, value);
         }
 
         public int? ParentPaths
         {
-            get => this.Fields[(int)IIsWebApplicationTupleFields.ParentPaths].AsNullableNumber();
-            set => this.Set((int)IIsWebApplicationTupleFields.ParentPaths, value);
+            get => this.Fields[(int)IIsWebApplicationSymbolFields.ParentPaths].AsNullableNumber();
+            set => this.Set((int)IIsWebApplicationSymbolFields.ParentPaths, value);
         }
 
         public string DefaultScript
         {
-            get => this.Fields[(int)IIsWebApplicationTupleFields.DefaultScript].AsString();
-            set => this.Set((int)IIsWebApplicationTupleFields.DefaultScript, value);
+            get => this.Fields[(int)IIsWebApplicationSymbolFields.DefaultScript].AsString();
+            set => this.Set((int)IIsWebApplicationSymbolFields.DefaultScript, value);
         }
 
         public int? ScriptTimeout
         {
-            get => this.Fields[(int)IIsWebApplicationTupleFields.ScriptTimeout].AsNullableNumber();
-            set => this.Set((int)IIsWebApplicationTupleFields.ScriptTimeout, value);
+            get => this.Fields[(int)IIsWebApplicationSymbolFields.ScriptTimeout].AsNullableNumber();
+            set => this.Set((int)IIsWebApplicationSymbolFields.ScriptTimeout, value);
         }
 
         public int? ServerDebugging
         {
-            get => this.Fields[(int)IIsWebApplicationTupleFields.ServerDebugging].AsNullableNumber();
-            set => this.Set((int)IIsWebApplicationTupleFields.ServerDebugging, value);
+            get => this.Fields[(int)IIsWebApplicationSymbolFields.ServerDebugging].AsNullableNumber();
+            set => this.Set((int)IIsWebApplicationSymbolFields.ServerDebugging, value);
         }
 
         public int? ClientDebugging
         {
-            get => this.Fields[(int)IIsWebApplicationTupleFields.ClientDebugging].AsNullableNumber();
-            set => this.Set((int)IIsWebApplicationTupleFields.ClientDebugging, value);
+            get => this.Fields[(int)IIsWebApplicationSymbolFields.ClientDebugging].AsNullableNumber();
+            set => this.Set((int)IIsWebApplicationSymbolFields.ClientDebugging, value);
         }
 
         public string AppPoolRef
         {
-            get => this.Fields[(int)IIsWebApplicationTupleFields.AppPoolRef].AsString();
-            set => this.Set((int)IIsWebApplicationTupleFields.AppPoolRef, value);
+            get => this.Fields[(int)IIsWebApplicationSymbolFields.AppPoolRef].AsString();
+            set => this.Set((int)IIsWebApplicationSymbolFields.AppPoolRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/IIsWebDirPropertiesTuple.cs b/src/wixext/Tuples/IIsWebDirPropertiesTuple.cs
index 48e2c932..42d2dead 100644
--- a/src/wixext/Tuples/IIsWebDirPropertiesTuple.cs
+++ b/src/wixext/Tuples/IIsWebDirPropertiesTuple.cs
@@ -3,38 +3,38 @@
 namespace WixToolset.Iis
 {
     using WixToolset.Data;
-    using WixToolset.Iis.Tuples;
+    using WixToolset.Iis.Symbols;
 
-    public static partial class IisTupleDefinitions
+    public static partial class IisSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition IIsWebDirProperties = new IntermediateTupleDefinition(
-            IisTupleDefinitionType.IIsWebDirProperties.ToString(),
+        public static readonly IntermediateSymbolDefinition IIsWebDirProperties = new IntermediateSymbolDefinition(
+            IisSymbolDefinitionType.IIsWebDirProperties.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesTupleFields.Access), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesTupleFields.Authorization), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesTupleFields.AnonymousUserRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesTupleFields.IIsControlledPassword), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesTupleFields.LogVisits), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesTupleFields.Index), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesTupleFields.DefaultDoc), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesTupleFields.AspDetailedError), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesTupleFields.HttpExpires), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesTupleFields.CacheControlMaxAge), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesTupleFields.CacheControlCustom), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesTupleFields.NoCustomError), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesTupleFields.AccessSSLFlags), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesTupleFields.AuthenticationProviders), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesSymbolFields.Access), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesSymbolFields.Authorization), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesSymbolFields.AnonymousUserRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesSymbolFields.IIsControlledPassword), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesSymbolFields.LogVisits), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesSymbolFields.Index), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesSymbolFields.DefaultDoc), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesSymbolFields.AspDetailedError), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesSymbolFields.HttpExpires), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesSymbolFields.CacheControlMaxAge), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesSymbolFields.CacheControlCustom), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesSymbolFields.NoCustomError), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesSymbolFields.AccessSSLFlags), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsWebDirPropertiesSymbolFields.AuthenticationProviders), IntermediateFieldType.String),
             },
-            typeof(IIsWebDirPropertiesTuple));
+            typeof(IIsWebDirPropertiesSymbol));
     }
 }
 
-namespace WixToolset.Iis.Tuples
+namespace WixToolset.Iis.Symbols
 {
     using WixToolset.Data;
 
-    public enum IIsWebDirPropertiesTupleFields
+    public enum IIsWebDirPropertiesSymbolFields
     {
         Access,
         Authorization,
@@ -52,100 +52,100 @@ namespace WixToolset.Iis.Tuples
         AuthenticationProviders,
     }
 
-    public class IIsWebDirPropertiesTuple : IntermediateTuple
+    public class IIsWebDirPropertiesSymbol : IntermediateSymbol
     {
-        public IIsWebDirPropertiesTuple() : base(IisTupleDefinitions.IIsWebDirProperties, null, null)
+        public IIsWebDirPropertiesSymbol() : base(IisSymbolDefinitions.IIsWebDirProperties, null, null)
         {
         }
 
-        public IIsWebDirPropertiesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsWebDirProperties, sourceLineNumber, id)
+        public IIsWebDirPropertiesSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsWebDirProperties, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[IIsWebDirPropertiesTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[IIsWebDirPropertiesSymbolFields index] => this.Fields[(int)index];
 
         public int? Access
         {
-            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.Access].AsNullableNumber();
-            set => this.Set((int)IIsWebDirPropertiesTupleFields.Access, value);
+            get => this.Fields[(int)IIsWebDirPropertiesSymbolFields.Access].AsNullableNumber();
+            set => this.Set((int)IIsWebDirPropertiesSymbolFields.Access, value);
         }
 
         public int? Authorization
         {
-            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.Authorization].AsNullableNumber();
-            set => this.Set((int)IIsWebDirPropertiesTupleFields.Authorization, value);
+            get => this.Fields[(int)IIsWebDirPropertiesSymbolFields.Authorization].AsNullableNumber();
+            set => this.Set((int)IIsWebDirPropertiesSymbolFields.Authorization, value);
         }
 
         public string AnonymousUserRef
         {
-            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.AnonymousUserRef].AsString();
-            set => this.Set((int)IIsWebDirPropertiesTupleFields.AnonymousUserRef, value);
+            get => this.Fields[(int)IIsWebDirPropertiesSymbolFields.AnonymousUserRef].AsString();
+            set => this.Set((int)IIsWebDirPropertiesSymbolFields.AnonymousUserRef, value);
         }
 
         public int? IIsControlledPassword
         {
-            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.IIsControlledPassword].AsNullableNumber();
-            set => this.Set((int)IIsWebDirPropertiesTupleFields.IIsControlledPassword, value);
+            get => this.Fields[(int)IIsWebDirPropertiesSymbolFields.IIsControlledPassword].AsNullableNumber();
+            set => this.Set((int)IIsWebDirPropertiesSymbolFields.IIsControlledPassword, value);
         }
 
         public int? LogVisits
         {
-            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.LogVisits].AsNullableNumber();
-            set => this.Set((int)IIsWebDirPropertiesTupleFields.LogVisits, value);
+            get => this.Fields[(int)IIsWebDirPropertiesSymbolFields.LogVisits].AsNullableNumber();
+            set => this.Set((int)IIsWebDirPropertiesSymbolFields.LogVisits, value);
         }
 
         public int? Index
         {
-            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.Index].AsNullableNumber();
-            set => this.Set((int)IIsWebDirPropertiesTupleFields.Index, value);
+            get => this.Fields[(int)IIsWebDirPropertiesSymbolFields.Index].AsNullableNumber();
+            set => this.Set((int)IIsWebDirPropertiesSymbolFields.Index, value);
         }
 
         public string DefaultDoc
         {
-            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.DefaultDoc].AsString();
-            set => this.Set((int)IIsWebDirPropertiesTupleFields.DefaultDoc, value);
+            get => this.Fields[(int)IIsWebDirPropertiesSymbolFields.DefaultDoc].AsString();
+            set => this.Set((int)IIsWebDirPropertiesSymbolFields.DefaultDoc, value);
         }
 
         public int? AspDetailedError
         {
-            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.AspDetailedError].AsNullableNumber();
-            set => this.Set((int)IIsWebDirPropertiesTupleFields.AspDetailedError, value);
+            get => this.Fields[(int)IIsWebDirPropertiesSymbolFields.AspDetailedError].AsNullableNumber();
+            set => this.Set((int)IIsWebDirPropertiesSymbolFields.AspDetailedError, value);
         }
 
         public string HttpExpires
         {
-            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.HttpExpires].AsString();
-            set => this.Set((int)IIsWebDirPropertiesTupleFields.HttpExpires, value);
+            get => this.Fields[(int)IIsWebDirPropertiesSymbolFields.HttpExpires].AsString();
+            set => this.Set((int)IIsWebDirPropertiesSymbolFields.HttpExpires, value);
         }
 
         public int? CacheControlMaxAge
         {
-            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.CacheControlMaxAge].AsNullableNumber();
-            set => this.Set((int)IIsWebDirPropertiesTupleFields.CacheControlMaxAge, value);
+            get => this.Fields[(int)IIsWebDirPropertiesSymbolFields.CacheControlMaxAge].AsNullableNumber();
+            set => this.Set((int)IIsWebDirPropertiesSymbolFields.CacheControlMaxAge, value);
         }
 
         public string CacheControlCustom
         {
-            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.CacheControlCustom].AsString();
-            set => this.Set((int)IIsWebDirPropertiesTupleFields.CacheControlCustom, value);
+            get => this.Fields[(int)IIsWebDirPropertiesSymbolFields.CacheControlCustom].AsString();
+            set => this.Set((int)IIsWebDirPropertiesSymbolFields.CacheControlCustom, value);
         }
 
         public int? NoCustomError
         {
-            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.NoCustomError].AsNullableNumber();
-            set => this.Set((int)IIsWebDirPropertiesTupleFields.NoCustomError, value);
+            get => this.Fields[(int)IIsWebDirPropertiesSymbolFields.NoCustomError].AsNullableNumber();
+            set => this.Set((int)IIsWebDirPropertiesSymbolFields.NoCustomError, value);
         }
 
         public int? AccessSSLFlags
         {
-            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.AccessSSLFlags].AsNullableNumber();
-            set => this.Set((int)IIsWebDirPropertiesTupleFields.AccessSSLFlags, value);
+            get => this.Fields[(int)IIsWebDirPropertiesSymbolFields.AccessSSLFlags].AsNullableNumber();
+            set => this.Set((int)IIsWebDirPropertiesSymbolFields.AccessSSLFlags, value);
         }
 
         public string AuthenticationProviders
         {
-            get => this.Fields[(int)IIsWebDirPropertiesTupleFields.AuthenticationProviders].AsString();
-            set => this.Set((int)IIsWebDirPropertiesTupleFields.AuthenticationProviders, value);
+            get => this.Fields[(int)IIsWebDirPropertiesSymbolFields.AuthenticationProviders].AsString();
+            set => this.Set((int)IIsWebDirPropertiesSymbolFields.AuthenticationProviders, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/IIsWebDirTuple.cs b/src/wixext/Tuples/IIsWebDirTuple.cs
index 471fe223..7f257f14 100644
--- a/src/wixext/Tuples/IIsWebDirTuple.cs
+++ b/src/wixext/Tuples/IIsWebDirTuple.cs
@@ -3,29 +3,29 @@
 namespace WixToolset.Iis
 {
     using WixToolset.Data;
-    using WixToolset.Iis.Tuples;
+    using WixToolset.Iis.Symbols;
 
-    public static partial class IisTupleDefinitions
+    public static partial class IisSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition IIsWebDir = new IntermediateTupleDefinition(
-            IisTupleDefinitionType.IIsWebDir.ToString(),
+        public static readonly IntermediateSymbolDefinition IIsWebDir = new IntermediateSymbolDefinition(
+            IisSymbolDefinitionType.IIsWebDir.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(IIsWebDirTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebDirTupleFields.WebRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebDirTupleFields.Path), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebDirTupleFields.DirPropertiesRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebDirTupleFields.ApplicationRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebDirSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebDirSymbolFields.WebRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebDirSymbolFields.Path), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebDirSymbolFields.DirPropertiesRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebDirSymbolFields.ApplicationRef), IntermediateFieldType.String),
             },
-            typeof(IIsWebDirTuple));
+            typeof(IIsWebDirSymbol));
     }
 }
 
-namespace WixToolset.Iis.Tuples
+namespace WixToolset.Iis.Symbols
 {
     using WixToolset.Data;
 
-    public enum IIsWebDirTupleFields
+    public enum IIsWebDirSymbolFields
     {
         ComponentRef,
         WebRef,
@@ -34,46 +34,46 @@ namespace WixToolset.Iis.Tuples
         ApplicationRef,
     }
 
-    public class IIsWebDirTuple : IntermediateTuple
+    public class IIsWebDirSymbol : IntermediateSymbol
     {
-        public IIsWebDirTuple() : base(IisTupleDefinitions.IIsWebDir, null, null)
+        public IIsWebDirSymbol() : base(IisSymbolDefinitions.IIsWebDir, null, null)
         {
         }
 
-        public IIsWebDirTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsWebDir, sourceLineNumber, id)
+        public IIsWebDirSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsWebDir, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[IIsWebDirTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[IIsWebDirSymbolFields index] => this.Fields[(int)index];
 
         public string ComponentRef
         {
-            get => this.Fields[(int)IIsWebDirTupleFields.ComponentRef].AsString();
-            set => this.Set((int)IIsWebDirTupleFields.ComponentRef, value);
+            get => this.Fields[(int)IIsWebDirSymbolFields.ComponentRef].AsString();
+            set => this.Set((int)IIsWebDirSymbolFields.ComponentRef, value);
         }
 
         public string WebRef
         {
-            get => this.Fields[(int)IIsWebDirTupleFields.WebRef].AsString();
-            set => this.Set((int)IIsWebDirTupleFields.WebRef, value);
+            get => this.Fields[(int)IIsWebDirSymbolFields.WebRef].AsString();
+            set => this.Set((int)IIsWebDirSymbolFields.WebRef, value);
         }
 
         public string Path
         {
-            get => this.Fields[(int)IIsWebDirTupleFields.Path].AsString();
-            set => this.Set((int)IIsWebDirTupleFields.Path, value);
+            get => this.Fields[(int)IIsWebDirSymbolFields.Path].AsString();
+            set => this.Set((int)IIsWebDirSymbolFields.Path, value);
         }
 
         public string DirPropertiesRef
         {
-            get => this.Fields[(int)IIsWebDirTupleFields.DirPropertiesRef].AsString();
-            set => this.Set((int)IIsWebDirTupleFields.DirPropertiesRef, value);
+            get => this.Fields[(int)IIsWebDirSymbolFields.DirPropertiesRef].AsString();
+            set => this.Set((int)IIsWebDirSymbolFields.DirPropertiesRef, value);
         }
 
         public string ApplicationRef
         {
-            get => this.Fields[(int)IIsWebDirTupleFields.ApplicationRef].AsString();
-            set => this.Set((int)IIsWebDirTupleFields.ApplicationRef, value);
+            get => this.Fields[(int)IIsWebDirSymbolFields.ApplicationRef].AsString();
+            set => this.Set((int)IIsWebDirSymbolFields.ApplicationRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/IIsWebErrorTuple.cs b/src/wixext/Tuples/IIsWebErrorTuple.cs
index ba6b2722..f8488fed 100644
--- a/src/wixext/Tuples/IIsWebErrorTuple.cs
+++ b/src/wixext/Tuples/IIsWebErrorTuple.cs
@@ -3,30 +3,30 @@
 namespace WixToolset.Iis
 {
     using WixToolset.Data;
-    using WixToolset.Iis.Tuples;
+    using WixToolset.Iis.Symbols;
 
-    public static partial class IisTupleDefinitions
+    public static partial class IisSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition IIsWebError = new IntermediateTupleDefinition(
-            IisTupleDefinitionType.IIsWebError.ToString(),
+        public static readonly IntermediateSymbolDefinition IIsWebError = new IntermediateSymbolDefinition(
+            IisSymbolDefinitionType.IIsWebError.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(IIsWebErrorTupleFields.ErrorCode), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsWebErrorTupleFields.SubCode), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsWebErrorTupleFields.ParentType), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsWebErrorTupleFields.ParentValue), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebErrorTupleFields.File), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebErrorTupleFields.URL), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebErrorSymbolFields.ErrorCode), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsWebErrorSymbolFields.SubCode), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsWebErrorSymbolFields.ParentType), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsWebErrorSymbolFields.ParentValue), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebErrorSymbolFields.File), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebErrorSymbolFields.URL), IntermediateFieldType.String),
             },
-            typeof(IIsWebErrorTuple));
+            typeof(IIsWebErrorSymbol));
     }
 }
 
-namespace WixToolset.Iis.Tuples
+namespace WixToolset.Iis.Symbols
 {
     using WixToolset.Data;
 
-    public enum IIsWebErrorTupleFields
+    public enum IIsWebErrorSymbolFields
     {
         ErrorCode,
         SubCode,
@@ -36,52 +36,52 @@ namespace WixToolset.Iis.Tuples
         URL,
     }
 
-    public class IIsWebErrorTuple : IntermediateTuple
+    public class IIsWebErrorSymbol : IntermediateSymbol
     {
-        public IIsWebErrorTuple() : base(IisTupleDefinitions.IIsWebError, null, null)
+        public IIsWebErrorSymbol() : base(IisSymbolDefinitions.IIsWebError, null, null)
         {
         }
 
-        public IIsWebErrorTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsWebError, sourceLineNumber, id)
+        public IIsWebErrorSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsWebError, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[IIsWebErrorTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[IIsWebErrorSymbolFields index] => this.Fields[(int)index];
 
         public int ErrorCode
         {
-            get => this.Fields[(int)IIsWebErrorTupleFields.ErrorCode].AsNumber();
-            set => this.Set((int)IIsWebErrorTupleFields.ErrorCode, value);
+            get => this.Fields[(int)IIsWebErrorSymbolFields.ErrorCode].AsNumber();
+            set => this.Set((int)IIsWebErrorSymbolFields.ErrorCode, value);
         }
 
         public int SubCode
         {
-            get => this.Fields[(int)IIsWebErrorTupleFields.SubCode].AsNumber();
-            set => this.Set((int)IIsWebErrorTupleFields.SubCode, value);
+            get => this.Fields[(int)IIsWebErrorSymbolFields.SubCode].AsNumber();
+            set => this.Set((int)IIsWebErrorSymbolFields.SubCode, value);
         }
 
         public int ParentType
         {
-            get => this.Fields[(int)IIsWebErrorTupleFields.ParentType].AsNumber();
-            set => this.Set((int)IIsWebErrorTupleFields.ParentType, value);
+            get => this.Fields[(int)IIsWebErrorSymbolFields.ParentType].AsNumber();
+            set => this.Set((int)IIsWebErrorSymbolFields.ParentType, value);
         }
 
         public string ParentValue
         {
-            get => this.Fields[(int)IIsWebErrorTupleFields.ParentValue].AsString();
-            set => this.Set((int)IIsWebErrorTupleFields.ParentValue, value);
+            get => this.Fields[(int)IIsWebErrorSymbolFields.ParentValue].AsString();
+            set => this.Set((int)IIsWebErrorSymbolFields.ParentValue, value);
         }
 
         public string File
         {
-            get => this.Fields[(int)IIsWebErrorTupleFields.File].AsString();
-            set => this.Set((int)IIsWebErrorTupleFields.File, value);
+            get => this.Fields[(int)IIsWebErrorSymbolFields.File].AsString();
+            set => this.Set((int)IIsWebErrorSymbolFields.File, value);
         }
 
         public string URL
         {
-            get => this.Fields[(int)IIsWebErrorTupleFields.URL].AsString();
-            set => this.Set((int)IIsWebErrorTupleFields.URL, value);
+            get => this.Fields[(int)IIsWebErrorSymbolFields.URL].AsString();
+            set => this.Set((int)IIsWebErrorSymbolFields.URL, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/IIsWebLogTuple.cs b/src/wixext/Tuples/IIsWebLogTuple.cs
index ec912ac5..409dc673 100644
--- a/src/wixext/Tuples/IIsWebLogTuple.cs
+++ b/src/wixext/Tuples/IIsWebLogTuple.cs
@@ -3,45 +3,45 @@
 namespace WixToolset.Iis
 {
     using WixToolset.Data;
-    using WixToolset.Iis.Tuples;
+    using WixToolset.Iis.Symbols;
 
-    public static partial class IisTupleDefinitions
+    public static partial class IisSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition IIsWebLog = new IntermediateTupleDefinition(
-            IisTupleDefinitionType.IIsWebLog.ToString(),
+        public static readonly IntermediateSymbolDefinition IIsWebLog = new IntermediateSymbolDefinition(
+            IisSymbolDefinitionType.IIsWebLog.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(IIsWebLogTupleFields.Format), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebLogSymbolFields.Format), IntermediateFieldType.String),
             },
-            typeof(IIsWebLogTuple));
+            typeof(IIsWebLogSymbol));
     }
 }
 
-namespace WixToolset.Iis.Tuples
+namespace WixToolset.Iis.Symbols
 {
     using WixToolset.Data;
 
-    public enum IIsWebLogTupleFields
+    public enum IIsWebLogSymbolFields
     {
         Format,
     }
 
-    public class IIsWebLogTuple : IntermediateTuple
+    public class IIsWebLogSymbol : IntermediateSymbol
     {
-        public IIsWebLogTuple() : base(IisTupleDefinitions.IIsWebLog, null, null)
+        public IIsWebLogSymbol() : base(IisSymbolDefinitions.IIsWebLog, null, null)
         {
         }
 
-        public IIsWebLogTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsWebLog, sourceLineNumber, id)
+        public IIsWebLogSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsWebLog, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[IIsWebLogTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[IIsWebLogSymbolFields index] => this.Fields[(int)index];
 
         public string Format
         {
-            get => this.Fields[(int)IIsWebLogTupleFields.Format].AsString();
-            set => this.Set((int)IIsWebLogTupleFields.Format, value);
+            get => this.Fields[(int)IIsWebLogSymbolFields.Format].AsString();
+            set => this.Set((int)IIsWebLogSymbolFields.Format, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/IIsWebServiceExtensionTuple.cs b/src/wixext/Tuples/IIsWebServiceExtensionTuple.cs
index 82d9c82a..44922357 100644
--- a/src/wixext/Tuples/IIsWebServiceExtensionTuple.cs
+++ b/src/wixext/Tuples/IIsWebServiceExtensionTuple.cs
@@ -3,29 +3,29 @@
 namespace WixToolset.Iis
 {
     using WixToolset.Data;
-    using WixToolset.Iis.Tuples;
+    using WixToolset.Iis.Symbols;
 
-    public static partial class IisTupleDefinitions
+    public static partial class IisSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition IIsWebServiceExtension = new IntermediateTupleDefinition(
-            IisTupleDefinitionType.IIsWebServiceExtension.ToString(),
+        public static readonly IntermediateSymbolDefinition IIsWebServiceExtension = new IntermediateSymbolDefinition(
+            IisSymbolDefinitionType.IIsWebServiceExtension.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(IIsWebServiceExtensionTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebServiceExtensionTupleFields.File), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebServiceExtensionTupleFields.Description), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebServiceExtensionTupleFields.Group), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebServiceExtensionTupleFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsWebServiceExtensionSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebServiceExtensionSymbolFields.File), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebServiceExtensionSymbolFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebServiceExtensionSymbolFields.Group), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebServiceExtensionSymbolFields.Attributes), IntermediateFieldType.Number),
             },
-            typeof(IIsWebServiceExtensionTuple));
+            typeof(IIsWebServiceExtensionSymbol));
     }
 }
 
-namespace WixToolset.Iis.Tuples
+namespace WixToolset.Iis.Symbols
 {
     using WixToolset.Data;
 
-    public enum IIsWebServiceExtensionTupleFields
+    public enum IIsWebServiceExtensionSymbolFields
     {
         ComponentRef,
         File,
@@ -34,46 +34,46 @@ namespace WixToolset.Iis.Tuples
         Attributes,
     }
 
-    public class IIsWebServiceExtensionTuple : IntermediateTuple
+    public class IIsWebServiceExtensionSymbol : IntermediateSymbol
     {
-        public IIsWebServiceExtensionTuple() : base(IisTupleDefinitions.IIsWebServiceExtension, null, null)
+        public IIsWebServiceExtensionSymbol() : base(IisSymbolDefinitions.IIsWebServiceExtension, null, null)
         {
         }
 
-        public IIsWebServiceExtensionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsWebServiceExtension, sourceLineNumber, id)
+        public IIsWebServiceExtensionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsWebServiceExtension, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[IIsWebServiceExtensionTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[IIsWebServiceExtensionSymbolFields index] => this.Fields[(int)index];
 
         public string ComponentRef
         {
-            get => this.Fields[(int)IIsWebServiceExtensionTupleFields.ComponentRef].AsString();
-            set => this.Set((int)IIsWebServiceExtensionTupleFields.ComponentRef, value);
+            get => this.Fields[(int)IIsWebServiceExtensionSymbolFields.ComponentRef].AsString();
+            set => this.Set((int)IIsWebServiceExtensionSymbolFields.ComponentRef, value);
         }
 
         public string File
         {
-            get => this.Fields[(int)IIsWebServiceExtensionTupleFields.File].AsString();
-            set => this.Set((int)IIsWebServiceExtensionTupleFields.File, value);
+            get => this.Fields[(int)IIsWebServiceExtensionSymbolFields.File].AsString();
+            set => this.Set((int)IIsWebServiceExtensionSymbolFields.File, value);
         }
 
         public string Description
         {
-            get => this.Fields[(int)IIsWebServiceExtensionTupleFields.Description].AsString();
-            set => this.Set((int)IIsWebServiceExtensionTupleFields.Description, value);
+            get => this.Fields[(int)IIsWebServiceExtensionSymbolFields.Description].AsString();
+            set => this.Set((int)IIsWebServiceExtensionSymbolFields.Description, value);
         }
 
         public string Group
         {
-            get => this.Fields[(int)IIsWebServiceExtensionTupleFields.Group].AsString();
-            set => this.Set((int)IIsWebServiceExtensionTupleFields.Group, value);
+            get => this.Fields[(int)IIsWebServiceExtensionSymbolFields.Group].AsString();
+            set => this.Set((int)IIsWebServiceExtensionSymbolFields.Group, value);
         }
 
         public int Attributes
         {
-            get => this.Fields[(int)IIsWebServiceExtensionTupleFields.Attributes].AsNumber();
-            set => this.Set((int)IIsWebServiceExtensionTupleFields.Attributes, value);
+            get => this.Fields[(int)IIsWebServiceExtensionSymbolFields.Attributes].AsNumber();
+            set => this.Set((int)IIsWebServiceExtensionSymbolFields.Attributes, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/IIsWebSiteCertificatesTuple.cs b/src/wixext/Tuples/IIsWebSiteCertificatesTuple.cs
index 7e4879d7..851ce556 100644
--- a/src/wixext/Tuples/IIsWebSiteCertificatesTuple.cs
+++ b/src/wixext/Tuples/IIsWebSiteCertificatesTuple.cs
@@ -3,53 +3,53 @@
 namespace WixToolset.Iis
 {
     using WixToolset.Data;
-    using WixToolset.Iis.Tuples;
+    using WixToolset.Iis.Symbols;
 
-    public static partial class IisTupleDefinitions
+    public static partial class IisSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition IIsWebSiteCertificates = new IntermediateTupleDefinition(
-            IisTupleDefinitionType.IIsWebSiteCertificates.ToString(),
+        public static readonly IntermediateSymbolDefinition IIsWebSiteCertificates = new IntermediateSymbolDefinition(
+            IisSymbolDefinitionType.IIsWebSiteCertificates.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(IIsWebSiteCertificatesTupleFields.WebRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebSiteCertificatesTupleFields.CertificateRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebSiteCertificatesSymbolFields.WebRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebSiteCertificatesSymbolFields.CertificateRef), IntermediateFieldType.String),
             },
-            typeof(IIsWebSiteCertificatesTuple));
+            typeof(IIsWebSiteCertificatesSymbol));
     }
 }
 
-namespace WixToolset.Iis.Tuples
+namespace WixToolset.Iis.Symbols
 {
     using WixToolset.Data;
 
-    public enum IIsWebSiteCertificatesTupleFields
+    public enum IIsWebSiteCertificatesSymbolFields
     {
         WebRef,
         CertificateRef,
     }
 
-    public class IIsWebSiteCertificatesTuple : IntermediateTuple
+    public class IIsWebSiteCertificatesSymbol : IntermediateSymbol
     {
-        public IIsWebSiteCertificatesTuple() : base(IisTupleDefinitions.IIsWebSiteCertificates, null, null)
+        public IIsWebSiteCertificatesSymbol() : base(IisSymbolDefinitions.IIsWebSiteCertificates, null, null)
         {
         }
 
-        public IIsWebSiteCertificatesTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsWebSiteCertificates, sourceLineNumber, id)
+        public IIsWebSiteCertificatesSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsWebSiteCertificates, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[IIsWebSiteCertificatesTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[IIsWebSiteCertificatesSymbolFields index] => this.Fields[(int)index];
 
         public string WebRef
         {
-            get => this.Fields[(int)IIsWebSiteCertificatesTupleFields.WebRef].AsString();
-            set => this.Set((int)IIsWebSiteCertificatesTupleFields.WebRef, value);
+            get => this.Fields[(int)IIsWebSiteCertificatesSymbolFields.WebRef].AsString();
+            set => this.Set((int)IIsWebSiteCertificatesSymbolFields.WebRef, value);
         }
 
         public string CertificateRef
         {
-            get => this.Fields[(int)IIsWebSiteCertificatesTupleFields.CertificateRef].AsString();
-            set => this.Set((int)IIsWebSiteCertificatesTupleFields.CertificateRef, value);
+            get => this.Fields[(int)IIsWebSiteCertificatesSymbolFields.CertificateRef].AsString();
+            set => this.Set((int)IIsWebSiteCertificatesSymbolFields.CertificateRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/IIsWebSiteTuple.cs b/src/wixext/Tuples/IIsWebSiteTuple.cs
index 1cce69fb..ceba2ea0 100644
--- a/src/wixext/Tuples/IIsWebSiteTuple.cs
+++ b/src/wixext/Tuples/IIsWebSiteTuple.cs
@@ -3,36 +3,36 @@
 namespace WixToolset.Iis
 {
     using WixToolset.Data;
-    using WixToolset.Iis.Tuples;
+    using WixToolset.Iis.Symbols;
 
-    public static partial class IisTupleDefinitions
+    public static partial class IisSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition IIsWebSite = new IntermediateTupleDefinition(
-            IisTupleDefinitionType.IIsWebSite.ToString(),
+        public static readonly IntermediateSymbolDefinition IIsWebSite = new IntermediateSymbolDefinition(
+            IisSymbolDefinitionType.IIsWebSite.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(IIsWebSiteTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebSiteTupleFields.Description), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebSiteTupleFields.ConnectionTimeout), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsWebSiteTupleFields.DirectoryRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebSiteTupleFields.State), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsWebSiteTupleFields.Attributes), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsWebSiteTupleFields.KeyAddressRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebSiteTupleFields.DirPropertiesRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebSiteTupleFields.ApplicationRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebSiteTupleFields.Sequence), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(IIsWebSiteTupleFields.LogRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebSiteTupleFields.WebsiteId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebSiteSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebSiteSymbolFields.Description), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebSiteSymbolFields.ConnectionTimeout), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsWebSiteSymbolFields.DirectoryRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebSiteSymbolFields.State), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsWebSiteSymbolFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsWebSiteSymbolFields.KeyAddressRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebSiteSymbolFields.DirPropertiesRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebSiteSymbolFields.ApplicationRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebSiteSymbolFields.Sequence), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(IIsWebSiteSymbolFields.LogRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebSiteSymbolFields.WebsiteId), IntermediateFieldType.String),
             },
-            typeof(IIsWebSiteTuple));
+            typeof(IIsWebSiteSymbol));
     }
 }
 
-namespace WixToolset.Iis.Tuples
+namespace WixToolset.Iis.Symbols
 {
     using WixToolset.Data;
 
-    public enum IIsWebSiteTupleFields
+    public enum IIsWebSiteSymbolFields
     {
         ComponentRef,
         Description,
@@ -48,88 +48,88 @@ namespace WixToolset.Iis.Tuples
         WebsiteId,
     }
 
-    public class IIsWebSiteTuple : IntermediateTuple
+    public class IIsWebSiteSymbol : IntermediateSymbol
     {
-        public IIsWebSiteTuple() : base(IisTupleDefinitions.IIsWebSite, null, null)
+        public IIsWebSiteSymbol() : base(IisSymbolDefinitions.IIsWebSite, null, null)
         {
         }
 
-        public IIsWebSiteTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsWebSite, sourceLineNumber, id)
+        public IIsWebSiteSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsWebSite, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[IIsWebSiteTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[IIsWebSiteSymbolFields index] => this.Fields[(int)index];
 
         public string ComponentRef
         {
-            get => this.Fields[(int)IIsWebSiteTupleFields.ComponentRef].AsString();
-            set => this.Set((int)IIsWebSiteTupleFields.ComponentRef, value);
+            get => this.Fields[(int)IIsWebSiteSymbolFields.ComponentRef].AsString();
+            set => this.Set((int)IIsWebSiteSymbolFields.ComponentRef, value);
         }
 
         public string Description
         {
-            get => this.Fields[(int)IIsWebSiteTupleFields.Description].AsString();
-            set => this.Set((int)IIsWebSiteTupleFields.Description, value);
+            get => this.Fields[(int)IIsWebSiteSymbolFields.Description].AsString();
+            set => this.Set((int)IIsWebSiteSymbolFields.Description, value);
         }
 
         public int? ConnectionTimeout
         {
-            get => this.Fields[(int)IIsWebSiteTupleFields.ConnectionTimeout].AsNullableNumber();
-            set => this.Set((int)IIsWebSiteTupleFields.ConnectionTimeout, value);
+            get => this.Fields[(int)IIsWebSiteSymbolFields.ConnectionTimeout].AsNullableNumber();
+            set => this.Set((int)IIsWebSiteSymbolFields.ConnectionTimeout, value);
         }
 
         public string DirectoryRef
         {
-            get => this.Fields[(int)IIsWebSiteTupleFields.DirectoryRef].AsString();
-            set => this.Set((int)IIsWebSiteTupleFields.DirectoryRef, value);
+            get => this.Fields[(int)IIsWebSiteSymbolFields.DirectoryRef].AsString();
+            set => this.Set((int)IIsWebSiteSymbolFields.DirectoryRef, value);
         }
 
         public int? State
         {
-            get => this.Fields[(int)IIsWebSiteTupleFields.State].AsNullableNumber();
-            set => this.Set((int)IIsWebSiteTupleFields.State, value);
+            get => this.Fields[(int)IIsWebSiteSymbolFields.State].AsNullableNumber();
+            set => this.Set((int)IIsWebSiteSymbolFields.State, value);
         }
 
         public int Attributes
         {
-            get => this.Fields[(int)IIsWebSiteTupleFields.Attributes].AsNumber();
-            set => this.Set((int)IIsWebSiteTupleFields.Attributes, value);
+            get => this.Fields[(int)IIsWebSiteSymbolFields.Attributes].AsNumber();
+            set => this.Set((int)IIsWebSiteSymbolFields.Attributes, value);
         }
 
         public string KeyAddressRef
         {
-            get => this.Fields[(int)IIsWebSiteTupleFields.KeyAddressRef].AsString();
-            set => this.Set((int)IIsWebSiteTupleFields.KeyAddressRef, value);
+            get => this.Fields[(int)IIsWebSiteSymbolFields.KeyAddressRef].AsString();
+            set => this.Set((int)IIsWebSiteSymbolFields.KeyAddressRef, value);
         }
 
         public string DirPropertiesRef
         {
-            get => this.Fields[(int)IIsWebSiteTupleFields.DirPropertiesRef].AsString();
-            set => this.Set((int)IIsWebSiteTupleFields.DirPropertiesRef, value);
+            get => this.Fields[(int)IIsWebSiteSymbolFields.DirPropertiesRef].AsString();
+            set => this.Set((int)IIsWebSiteSymbolFields.DirPropertiesRef, value);
         }
 
         public string ApplicationRef
         {
-            get => this.Fields[(int)IIsWebSiteTupleFields.ApplicationRef].AsString();
-            set => this.Set((int)IIsWebSiteTupleFields.ApplicationRef, value);
+            get => this.Fields[(int)IIsWebSiteSymbolFields.ApplicationRef].AsString();
+            set => this.Set((int)IIsWebSiteSymbolFields.ApplicationRef, value);
         }
 
         public int? Sequence
         {
-            get => this.Fields[(int)IIsWebSiteTupleFields.Sequence].AsNullableNumber();
-            set => this.Set((int)IIsWebSiteTupleFields.Sequence, value);
+            get => this.Fields[(int)IIsWebSiteSymbolFields.Sequence].AsNullableNumber();
+            set => this.Set((int)IIsWebSiteSymbolFields.Sequence, value);
         }
 
         public string LogRef
         {
-            get => this.Fields[(int)IIsWebSiteTupleFields.LogRef].AsString();
-            set => this.Set((int)IIsWebSiteTupleFields.LogRef, value);
+            get => this.Fields[(int)IIsWebSiteSymbolFields.LogRef].AsString();
+            set => this.Set((int)IIsWebSiteSymbolFields.LogRef, value);
         }
 
         public string WebsiteId
         {
-            get => this.Fields[(int)IIsWebSiteTupleFields.WebsiteId].AsString();
-            set => this.Set((int)IIsWebSiteTupleFields.WebsiteId, value);
+            get => this.Fields[(int)IIsWebSiteSymbolFields.WebsiteId].AsString();
+            set => this.Set((int)IIsWebSiteSymbolFields.WebsiteId, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/IIsWebVirtualDirTuple.cs b/src/wixext/Tuples/IIsWebVirtualDirTuple.cs
index 3a624b80..bfc29e84 100644
--- a/src/wixext/Tuples/IIsWebVirtualDirTuple.cs
+++ b/src/wixext/Tuples/IIsWebVirtualDirTuple.cs
@@ -3,30 +3,30 @@
 namespace WixToolset.Iis
 {
     using WixToolset.Data;
-    using WixToolset.Iis.Tuples;
+    using WixToolset.Iis.Symbols;
 
-    public static partial class IisTupleDefinitions
+    public static partial class IisSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition IIsWebVirtualDir = new IntermediateTupleDefinition(
-            IisTupleDefinitionType.IIsWebVirtualDir.ToString(),
+        public static readonly IntermediateSymbolDefinition IIsWebVirtualDir = new IntermediateSymbolDefinition(
+            IisSymbolDefinitionType.IIsWebVirtualDir.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(IIsWebVirtualDirTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebVirtualDirTupleFields.WebRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebVirtualDirTupleFields.Alias), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebVirtualDirTupleFields.DirectoryRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebVirtualDirTupleFields.DirPropertiesRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(IIsWebVirtualDirTupleFields.ApplicationRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebVirtualDirSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebVirtualDirSymbolFields.WebRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebVirtualDirSymbolFields.Alias), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebVirtualDirSymbolFields.DirectoryRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebVirtualDirSymbolFields.DirPropertiesRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(IIsWebVirtualDirSymbolFields.ApplicationRef), IntermediateFieldType.String),
             },
-            typeof(IIsWebVirtualDirTuple));
+            typeof(IIsWebVirtualDirSymbol));
     }
 }
 
-namespace WixToolset.Iis.Tuples
+namespace WixToolset.Iis.Symbols
 {
     using WixToolset.Data;
 
-    public enum IIsWebVirtualDirTupleFields
+    public enum IIsWebVirtualDirSymbolFields
     {
         ComponentRef,
         WebRef,
@@ -36,52 +36,52 @@ namespace WixToolset.Iis.Tuples
         ApplicationRef,
     }
 
-    public class IIsWebVirtualDirTuple : IntermediateTuple
+    public class IIsWebVirtualDirSymbol : IntermediateSymbol
     {
-        public IIsWebVirtualDirTuple() : base(IisTupleDefinitions.IIsWebVirtualDir, null, null)
+        public IIsWebVirtualDirSymbol() : base(IisSymbolDefinitions.IIsWebVirtualDir, null, null)
         {
         }
 
-        public IIsWebVirtualDirTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisTupleDefinitions.IIsWebVirtualDir, sourceLineNumber, id)
+        public IIsWebVirtualDirSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(IisSymbolDefinitions.IIsWebVirtualDir, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[IIsWebVirtualDirTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[IIsWebVirtualDirSymbolFields index] => this.Fields[(int)index];
 
         public string ComponentRef
         {
-            get => this.Fields[(int)IIsWebVirtualDirTupleFields.ComponentRef].AsString();
-            set => this.Set((int)IIsWebVirtualDirTupleFields.ComponentRef, value);
+            get => this.Fields[(int)IIsWebVirtualDirSymbolFields.ComponentRef].AsString();
+            set => this.Set((int)IIsWebVirtualDirSymbolFields.ComponentRef, value);
         }
 
         public string WebRef
         {
-            get => this.Fields[(int)IIsWebVirtualDirTupleFields.WebRef].AsString();
-            set => this.Set((int)IIsWebVirtualDirTupleFields.WebRef, value);
+            get => this.Fields[(int)IIsWebVirtualDirSymbolFields.WebRef].AsString();
+            set => this.Set((int)IIsWebVirtualDirSymbolFields.WebRef, value);
         }
 
         public string Alias
         {
-            get => this.Fields[(int)IIsWebVirtualDirTupleFields.Alias].AsString();
-            set => this.Set((int)IIsWebVirtualDirTupleFields.Alias, value);
+            get => this.Fields[(int)IIsWebVirtualDirSymbolFields.Alias].AsString();
+            set => this.Set((int)IIsWebVirtualDirSymbolFields.Alias, value);
         }
 
         public string DirectoryRef
         {
-            get => this.Fields[(int)IIsWebVirtualDirTupleFields.DirectoryRef].AsString();
-            set => this.Set((int)IIsWebVirtualDirTupleFields.DirectoryRef, value);
+            get => this.Fields[(int)IIsWebVirtualDirSymbolFields.DirectoryRef].AsString();
+            set => this.Set((int)IIsWebVirtualDirSymbolFields.DirectoryRef, value);
         }
 
         public string DirPropertiesRef
         {
-            get => this.Fields[(int)IIsWebVirtualDirTupleFields.DirPropertiesRef].AsString();
-            set => this.Set((int)IIsWebVirtualDirTupleFields.DirPropertiesRef, value);
+            get => this.Fields[(int)IIsWebVirtualDirSymbolFields.DirPropertiesRef].AsString();
+            set => this.Set((int)IIsWebVirtualDirSymbolFields.DirPropertiesRef, value);
         }
 
         public string ApplicationRef
         {
-            get => this.Fields[(int)IIsWebVirtualDirTupleFields.ApplicationRef].AsString();
-            set => this.Set((int)IIsWebVirtualDirTupleFields.ApplicationRef, value);
+            get => this.Fields[(int)IIsWebVirtualDirSymbolFields.ApplicationRef].AsString();
+            set => this.Set((int)IIsWebVirtualDirSymbolFields.ApplicationRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/IisTupleDefinitions.cs b/src/wixext/Tuples/IisTupleDefinitions.cs
index 4017fa27..d6ed80a2 100644
--- a/src/wixext/Tuples/IisTupleDefinitions.cs
+++ b/src/wixext/Tuples/IisTupleDefinitions.cs
@@ -5,7 +5,7 @@ namespace WixToolset.Iis
     using System;
     using WixToolset.Data;
 
-    public enum IisTupleDefinitionType
+    public enum IisSymbolDefinitionType
     {
         Certificate,
         CertificateHash,
@@ -27,13 +27,13 @@ namespace WixToolset.Iis
         IIsWebVirtualDir,
     }
 
-    public static partial class IisTupleDefinitions
+    public static partial class IisSymbolDefinitions
     {
         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 IisTupleDefinitionType type))
+            if (!Enum.TryParse(name, out IisSymbolDefinitionType type))
             {
                 return null;
             }
@@ -41,63 +41,63 @@ namespace WixToolset.Iis
             return ByType(type);
         }
 
-        public static IntermediateTupleDefinition ByType(IisTupleDefinitionType type)
+        public static IntermediateSymbolDefinition ByType(IisSymbolDefinitionType type)
         {
             switch (type)
             {
-                case IisTupleDefinitionType.Certificate:
-                    return IisTupleDefinitions.Certificate;
+                case IisSymbolDefinitionType.Certificate:
+                    return IisSymbolDefinitions.Certificate;
 
-                case IisTupleDefinitionType.CertificateHash:
-                    return IisTupleDefinitions.CertificateHash;
+                case IisSymbolDefinitionType.CertificateHash:
+                    return IisSymbolDefinitions.CertificateHash;
 
-                case IisTupleDefinitionType.IIsAppPool:
-                    return IisTupleDefinitions.IIsAppPool;
+                case IisSymbolDefinitionType.IIsAppPool:
+                    return IisSymbolDefinitions.IIsAppPool;
 
-                case IisTupleDefinitionType.IIsFilter:
-                    return IisTupleDefinitions.IIsFilter;
+                case IisSymbolDefinitionType.IIsFilter:
+                    return IisSymbolDefinitions.IIsFilter;
 
-                case IisTupleDefinitionType.IIsHttpHeader:
-                    return IisTupleDefinitions.IIsHttpHeader;
+                case IisSymbolDefinitionType.IIsHttpHeader:
+                    return IisSymbolDefinitions.IIsHttpHeader;
 
-                case IisTupleDefinitionType.IIsMimeMap:
-                    return IisTupleDefinitions.IIsMimeMap;
+                case IisSymbolDefinitionType.IIsMimeMap:
+                    return IisSymbolDefinitions.IIsMimeMap;
 
-                case IisTupleDefinitionType.IIsProperty:
-                    return IisTupleDefinitions.IIsProperty;
+                case IisSymbolDefinitionType.IIsProperty:
+                    return IisSymbolDefinitions.IIsProperty;
 
-                case IisTupleDefinitionType.IIsWebAddress:
-                    return IisTupleDefinitions.IIsWebAddress;
+                case IisSymbolDefinitionType.IIsWebAddress:
+                    return IisSymbolDefinitions.IIsWebAddress;
 
-                case IisTupleDefinitionType.IIsWebApplication:
-                    return IisTupleDefinitions.IIsWebApplication;
+                case IisSymbolDefinitionType.IIsWebApplication:
+                    return IisSymbolDefinitions.IIsWebApplication;
 
-                case IisTupleDefinitionType.IIsWebApplicationExtension:
-                    return IisTupleDefinitions.IIsWebApplicationExtension;
+                case IisSymbolDefinitionType.IIsWebApplicationExtension:
+                    return IisSymbolDefinitions.IIsWebApplicationExtension;
 
-                case IisTupleDefinitionType.IIsWebDir:
-                    return IisTupleDefinitions.IIsWebDir;
+                case IisSymbolDefinitionType.IIsWebDir:
+                    return IisSymbolDefinitions.IIsWebDir;
 
-                case IisTupleDefinitionType.IIsWebDirProperties:
-                    return IisTupleDefinitions.IIsWebDirProperties;
+                case IisSymbolDefinitionType.IIsWebDirProperties:
+                    return IisSymbolDefinitions.IIsWebDirProperties;
 
-                case IisTupleDefinitionType.IIsWebError:
-                    return IisTupleDefinitions.IIsWebError;
+                case IisSymbolDefinitionType.IIsWebError:
+                    return IisSymbolDefinitions.IIsWebError;
 
-                case IisTupleDefinitionType.IIsWebLog:
-                    return IisTupleDefinitions.IIsWebLog;
+                case IisSymbolDefinitionType.IIsWebLog:
+                    return IisSymbolDefinitions.IIsWebLog;
 
-                case IisTupleDefinitionType.IIsWebServiceExtension:
-                    return IisTupleDefinitions.IIsWebServiceExtension;
+                case IisSymbolDefinitionType.IIsWebServiceExtension:
+                    return IisSymbolDefinitions.IIsWebServiceExtension;
 
-                case IisTupleDefinitionType.IIsWebSite:
-                    return IisTupleDefinitions.IIsWebSite;
+                case IisSymbolDefinitionType.IIsWebSite:
+                    return IisSymbolDefinitions.IIsWebSite;
 
-                case IisTupleDefinitionType.IIsWebSiteCertificates:
-                    return IisTupleDefinitions.IIsWebSiteCertificates;
+                case IisSymbolDefinitionType.IIsWebSiteCertificates:
+                    return IisSymbolDefinitions.IIsWebSiteCertificates;
 
-                case IisTupleDefinitionType.IIsWebVirtualDir:
-                    return IisTupleDefinitions.IIsWebVirtualDir;
+                case IisSymbolDefinitionType.IIsWebVirtualDir:
+                    return IisSymbolDefinitions.IIsWebVirtualDir;
 
                 default:
                     throw new ArgumentOutOfRangeException(nameof(type));
-- 
cgit v1.2.3-55-g6feb