7 files changed, 120 insertions, 120 deletions

diff --git a/src/wixext/MsmqCompiler.cs b/src/wixext/MsmqCompiler.cs
index 15c3f3ca..cfc4ef65 100644
--- a/src/wixext/MsmqCompiler.cs
+++ b/src/wixext/MsmqCompiler.cs
@@ -7,7 +7,7 @@ namespace WixToolset.Msmq
     using System.Xml.Linq;
     using WixToolset.Data;
     using WixToolset.Extensibility;
-    using WixToolset.Msmq.Tuples;
+    using WixToolset.Msmq.Symbols;
 
     /// <summary>
     /// The compiler for the WiX Toolset MSMQ Extension.
@@ -221,7 +221,7 @@ namespace WixToolset.Msmq
                 }
             }
 
-            var tuple = section.AddTuple(new MessageQueueTuple(sourceLineNumbers, id)
+            var symbol = section.AddSymbol(new MessageQueueSymbol(sourceLineNumbers, id)
             {
                 ComponentRef = componentId,
                 Label = label,
@@ -233,24 +233,24 @@ namespace WixToolset.Msmq
 
             if (CompilerConstants.IntegerNotSet != basePriority)
             {
-                tuple.BasePriority = basePriority;
+                symbol.BasePriority = basePriority;
             }
             if (CompilerConstants.IntegerNotSet != journalQuota)
             {
-                tuple.JournalQuota = journalQuota;
+                symbol.JournalQuota = journalQuota;
             }
 
             if (CompilerConstants.IntegerNotSet != privLevel)
             {
-                tuple.PrivLevel = privLevel;
+                symbol.PrivLevel = privLevel;
             }
             if (CompilerConstants.IntegerNotSet != quota)
             {
-                tuple.Quota = quota;
+                symbol.Quota = quota;
             }
 
-            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "MessageQueuingInstall");
-            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "MessageQueuingUninstall");
+            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "MessageQueuingInstall");
+            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "MessageQueuingUninstall");
         }
 
         ///     <summary>
@@ -283,7 +283,7 @@ namespace WixToolset.Msmq
                                 this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, node.Parent.Name.LocalName));
                             }
                             messageQueueId = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
-                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, MsmqTupleDefinitions.MessageQueue, messageQueueId);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, MsmqSymbolDefinitions.MessageQueue, messageQueueId);
                             break;
                         case "User":
                             if (null != group)
@@ -490,7 +490,7 @@ namespace WixToolset.Msmq
 
             if (null != user)
             {
-                section.AddTuple(new MessageQueueUserPermissionTuple(sourceLineNumbers, id)
+                section.AddSymbol(new MessageQueueUserPermissionSymbol(sourceLineNumbers, id)
                 {
                     ComponentRef = componentId,
                     MessageQueueRef = messageQueueId,
@@ -500,7 +500,7 @@ namespace WixToolset.Msmq
             }
             if (null != group)
             {
-                section.AddTuple(new MessageQueueGroupPermissionTuple(sourceLineNumbers, id)
+                section.AddSymbol(new MessageQueueGroupPermissionSymbol(sourceLineNumbers, id)
                 {
                     ComponentRef = componentId,
                     MessageQueueRef = messageQueueId,
diff --git a/src/wixext/MsmqExtensionData.cs b/src/wixext/MsmqExtensionData.cs
index dd1694f4..91485724 100644
--- a/src/wixext/MsmqExtensionData.cs
+++ b/src/wixext/MsmqExtensionData.cs
@@ -16,15 +16,15 @@ namespace WixToolset.Msmq
         /// <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 = MsmqTupleDefinitions.ByName(name);
-            return tupleDefinition != null;
+            symbolDefinition = MsmqSymbolDefinitions.ByName(name);
+            return symbolDefinition != null;
         }
 
-        public override Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions)
+        public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions)
         {
-            return Intermediate.Load(typeof(MsmqExtensionData).Assembly, "WixToolset.Msmq.msmq.wixlib", tupleDefinitions);
+            return Intermediate.Load(typeof(MsmqExtensionData).Assembly, "WixToolset.Msmq.msmq.wixlib", symbolDefinitions);
         }
     }
 }
diff --git a/src/wixext/MsmqTableDefinitions.cs b/src/wixext/MsmqTableDefinitions.cs
index 30e8d2da..46e2dd10 100644
--- a/src/wixext/MsmqTableDefinitions.cs
+++ b/src/wixext/MsmqTableDefinitions.cs
@@ -8,7 +8,7 @@ namespace WixToolset.Msmq
     {
         public static readonly TableDefinition MessageQueue = new TableDefinition(
             "MessageQueue",
-            MsmqTupleDefinitions.MessageQueue,
+            MsmqSymbolDefinitions.MessageQueue,
             new[]
             {
                 new ColumnDefinition("MessageQueue", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -23,12 +23,12 @@ namespace WixToolset.Msmq
                 new ColumnDefinition("ServiceTypeGuid", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, modularizeType: ColumnModularizeType.Property),
                 new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown),
             },
-            tupleIdIsPrimaryKey: true
+            symbolIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition MessageQueueUserPermission = new TableDefinition(
             "MessageQueueUserPermission",
-            MsmqTupleDefinitions.MessageQueueUserPermission,
+            MsmqSymbolDefinitions.MessageQueueUserPermission,
             new[]
             {
                 new ColumnDefinition("MessageQueueUserPermission", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -37,12 +37,12 @@ namespace WixToolset.Msmq
                 new ColumnDefinition("User_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Permissions", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown),
             },
-            tupleIdIsPrimaryKey: true
+            symbolIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition MessageQueueGroupPermission = new TableDefinition(
             "MessageQueueGroupPermission",
-            MsmqTupleDefinitions.MessageQueueGroupPermission,
+            MsmqSymbolDefinitions.MessageQueueGroupPermission,
             new[]
             {
                 new ColumnDefinition("MessageQueueGroupPermission", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
@@ -51,7 +51,7 @@ namespace WixToolset.Msmq
                 new ColumnDefinition("Group_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, modularizeType: ColumnModularizeType.Column),
                 new ColumnDefinition("Permissions", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown),
             },
-            tupleIdIsPrimaryKey: true
+            symbolIdIsPrimaryKey: true
         );
 
         public static readonly TableDefinition[] All = new[]
diff --git a/src/wixext/Tuples/MessageQueueGroupPermissionTuple.cs b/src/wixext/Tuples/MessageQueueGroupPermissionTuple.cs
index 0b1794fd..404c061c 100644
--- a/src/wixext/Tuples/MessageQueueGroupPermissionTuple.cs
+++ b/src/wixext/Tuples/MessageQueueGroupPermissionTuple.cs
@@ -3,28 +3,28 @@
 namespace WixToolset.Msmq
 {
     using WixToolset.Data;
-    using WixToolset.Msmq.Tuples;
+    using WixToolset.Msmq.Symbols;
 
-    public static partial class MsmqTupleDefinitions
+    public static partial class MsmqSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition MessageQueueGroupPermission = new IntermediateTupleDefinition(
-            MsmqTupleDefinitionType.MessageQueueGroupPermission.ToString(),
+        public static readonly IntermediateSymbolDefinition MessageQueueGroupPermission = new IntermediateSymbolDefinition(
+            MsmqSymbolDefinitionType.MessageQueueGroupPermission.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(MessageQueueGroupPermissionTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MessageQueueGroupPermissionTupleFields.MessageQueueRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MessageQueueGroupPermissionTupleFields.GroupRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MessageQueueGroupPermissionTupleFields.Permissions), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MessageQueueGroupPermissionSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MessageQueueGroupPermissionSymbolFields.MessageQueueRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MessageQueueGroupPermissionSymbolFields.GroupRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MessageQueueGroupPermissionSymbolFields.Permissions), IntermediateFieldType.Number),
             },
-            typeof(MessageQueueGroupPermissionTuple));
+            typeof(MessageQueueGroupPermissionSymbol));
     }
 }
 
-namespace WixToolset.Msmq.Tuples
+namespace WixToolset.Msmq.Symbols
 {
     using WixToolset.Data;
 
-    public enum MessageQueueGroupPermissionTupleFields
+    public enum MessageQueueGroupPermissionSymbolFields
     {
         ComponentRef,
         MessageQueueRef,
@@ -32,40 +32,40 @@ namespace WixToolset.Msmq.Tuples
         Permissions,
     }
 
-    public class MessageQueueGroupPermissionTuple : IntermediateTuple
+    public class MessageQueueGroupPermissionSymbol : IntermediateSymbol
     {
-        public MessageQueueGroupPermissionTuple() : base(MsmqTupleDefinitions.MessageQueueGroupPermission, null, null)
+        public MessageQueueGroupPermissionSymbol() : base(MsmqSymbolDefinitions.MessageQueueGroupPermission, null, null)
         {
         }
 
-        public MessageQueueGroupPermissionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(MsmqTupleDefinitions.MessageQueueGroupPermission, sourceLineNumber, id)
+        public MessageQueueGroupPermissionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(MsmqSymbolDefinitions.MessageQueueGroupPermission, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[MessageQueueGroupPermissionTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[MessageQueueGroupPermissionSymbolFields index] => this.Fields[(int)index];
 
         public string ComponentRef
         {
-            get => this.Fields[(int)MessageQueueGroupPermissionTupleFields.ComponentRef].AsString();
-            set => this.Set((int)MessageQueueGroupPermissionTupleFields.ComponentRef, value);
+            get => this.Fields[(int)MessageQueueGroupPermissionSymbolFields.ComponentRef].AsString();
+            set => this.Set((int)MessageQueueGroupPermissionSymbolFields.ComponentRef, value);
         }
 
         public string MessageQueueRef
         {
-            get => this.Fields[(int)MessageQueueGroupPermissionTupleFields.MessageQueueRef].AsString();
-            set => this.Set((int)MessageQueueGroupPermissionTupleFields.MessageQueueRef, value);
+            get => this.Fields[(int)MessageQueueGroupPermissionSymbolFields.MessageQueueRef].AsString();
+            set => this.Set((int)MessageQueueGroupPermissionSymbolFields.MessageQueueRef, value);
         }
 
         public string GroupRef
         {
-            get => this.Fields[(int)MessageQueueGroupPermissionTupleFields.GroupRef].AsString();
-            set => this.Set((int)MessageQueueGroupPermissionTupleFields.GroupRef, value);
+            get => this.Fields[(int)MessageQueueGroupPermissionSymbolFields.GroupRef].AsString();
+            set => this.Set((int)MessageQueueGroupPermissionSymbolFields.GroupRef, value);
         }
 
         public int Permissions
         {
-            get => this.Fields[(int)MessageQueueGroupPermissionTupleFields.Permissions].AsNumber();
-            set => this.Set((int)MessageQueueGroupPermissionTupleFields.Permissions, value);
+            get => this.Fields[(int)MessageQueueGroupPermissionSymbolFields.Permissions].AsNumber();
+            set => this.Set((int)MessageQueueGroupPermissionSymbolFields.Permissions, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/MessageQueueTuple.cs b/src/wixext/Tuples/MessageQueueTuple.cs
index 32125c0f..b911f0ea 100644
--- a/src/wixext/Tuples/MessageQueueTuple.cs
+++ b/src/wixext/Tuples/MessageQueueTuple.cs
@@ -3,34 +3,34 @@
 namespace WixToolset.Msmq
 {
     using WixToolset.Data;
-    using WixToolset.Msmq.Tuples;
+    using WixToolset.Msmq.Symbols;
 
-    public static partial class MsmqTupleDefinitions
+    public static partial class MsmqSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition MessageQueue = new IntermediateTupleDefinition(
-            MsmqTupleDefinitionType.MessageQueue.ToString(),
+        public static readonly IntermediateSymbolDefinition MessageQueue = new IntermediateSymbolDefinition(
+            MsmqSymbolDefinitionType.MessageQueue.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(MessageQueueTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MessageQueueTupleFields.BasePriority), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(MessageQueueTupleFields.JournalQuota), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(MessageQueueTupleFields.Label), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MessageQueueTupleFields.MulticastAddress), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MessageQueueTupleFields.PathName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MessageQueueTupleFields.PrivLevel), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(MessageQueueTupleFields.Quota), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(MessageQueueTupleFields.ServiceTypeGuid), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MessageQueueTupleFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MessageQueueSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MessageQueueSymbolFields.BasePriority), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MessageQueueSymbolFields.JournalQuota), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MessageQueueSymbolFields.Label), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MessageQueueSymbolFields.MulticastAddress), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MessageQueueSymbolFields.PathName), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MessageQueueSymbolFields.PrivLevel), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MessageQueueSymbolFields.Quota), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MessageQueueSymbolFields.ServiceTypeGuid), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MessageQueueSymbolFields.Attributes), IntermediateFieldType.Number),
             },
-            typeof(MessageQueueTuple));
+            typeof(MessageQueueSymbol));
     }
 }
 
-namespace WixToolset.Msmq.Tuples
+namespace WixToolset.Msmq.Symbols
 {
     using WixToolset.Data;
 
-    public enum MessageQueueTupleFields
+    public enum MessageQueueSymbolFields
     {
         ComponentRef,
         BasePriority,
@@ -44,76 +44,76 @@ namespace WixToolset.Msmq.Tuples
         Attributes,
     }
 
-    public class MessageQueueTuple : IntermediateTuple
+    public class MessageQueueSymbol : IntermediateSymbol
     {
-        public MessageQueueTuple() : base(MsmqTupleDefinitions.MessageQueue, null, null)
+        public MessageQueueSymbol() : base(MsmqSymbolDefinitions.MessageQueue, null, null)
         {
         }
 
-        public MessageQueueTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(MsmqTupleDefinitions.MessageQueue, sourceLineNumber, id)
+        public MessageQueueSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(MsmqSymbolDefinitions.MessageQueue, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[MessageQueueTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[MessageQueueSymbolFields index] => this.Fields[(int)index];
 
         public string ComponentRef
         {
-            get => this.Fields[(int)MessageQueueTupleFields.ComponentRef].AsString();
-            set => this.Set((int)MessageQueueTupleFields.ComponentRef, value);
+            get => this.Fields[(int)MessageQueueSymbolFields.ComponentRef].AsString();
+            set => this.Set((int)MessageQueueSymbolFields.ComponentRef, value);
         }
 
         public int? BasePriority
         {
-            get => this.Fields[(int)MessageQueueTupleFields.BasePriority].AsNullableNumber();
-            set => this.Set((int)MessageQueueTupleFields.BasePriority, value);
+            get => this.Fields[(int)MessageQueueSymbolFields.BasePriority].AsNullableNumber();
+            set => this.Set((int)MessageQueueSymbolFields.BasePriority, value);
         }
 
         public int? JournalQuota
         {
-            get => this.Fields[(int)MessageQueueTupleFields.JournalQuota].AsNullableNumber();
-            set => this.Set((int)MessageQueueTupleFields.JournalQuota, value);
+            get => this.Fields[(int)MessageQueueSymbolFields.JournalQuota].AsNullableNumber();
+            set => this.Set((int)MessageQueueSymbolFields.JournalQuota, value);
         }
 
         public string Label
         {
-            get => this.Fields[(int)MessageQueueTupleFields.Label].AsString();
-            set => this.Set((int)MessageQueueTupleFields.Label, value);
+            get => this.Fields[(int)MessageQueueSymbolFields.Label].AsString();
+            set => this.Set((int)MessageQueueSymbolFields.Label, value);
         }
 
         public string MulticastAddress
         {
-            get => this.Fields[(int)MessageQueueTupleFields.MulticastAddress].AsString();
-            set => this.Set((int)MessageQueueTupleFields.MulticastAddress, value);
+            get => this.Fields[(int)MessageQueueSymbolFields.MulticastAddress].AsString();
+            set => this.Set((int)MessageQueueSymbolFields.MulticastAddress, value);
         }
 
         public string PathName
         {
-            get => this.Fields[(int)MessageQueueTupleFields.PathName].AsString();
-            set => this.Set((int)MessageQueueTupleFields.PathName, value);
+            get => this.Fields[(int)MessageQueueSymbolFields.PathName].AsString();
+            set => this.Set((int)MessageQueueSymbolFields.PathName, value);
         }
 
         public int? PrivLevel
         {
-            get => this.Fields[(int)MessageQueueTupleFields.PrivLevel].AsNullableNumber();
-            set => this.Set((int)MessageQueueTupleFields.PrivLevel, value);
+            get => this.Fields[(int)MessageQueueSymbolFields.PrivLevel].AsNullableNumber();
+            set => this.Set((int)MessageQueueSymbolFields.PrivLevel, value);
         }
 
         public int? Quota
         {
-            get => this.Fields[(int)MessageQueueTupleFields.Quota].AsNullableNumber();
-            set => this.Set((int)MessageQueueTupleFields.Quota, value);
+            get => this.Fields[(int)MessageQueueSymbolFields.Quota].AsNullableNumber();
+            set => this.Set((int)MessageQueueSymbolFields.Quota, value);
         }
 
         public string ServiceTypeGuid
         {
-            get => this.Fields[(int)MessageQueueTupleFields.ServiceTypeGuid].AsString();
-            set => this.Set((int)MessageQueueTupleFields.ServiceTypeGuid, value);
+            get => this.Fields[(int)MessageQueueSymbolFields.ServiceTypeGuid].AsString();
+            set => this.Set((int)MessageQueueSymbolFields.ServiceTypeGuid, value);
         }
 
         public int Attributes
         {
-            get => this.Fields[(int)MessageQueueTupleFields.Attributes].AsNumber();
-            set => this.Set((int)MessageQueueTupleFields.Attributes, value);
+            get => this.Fields[(int)MessageQueueSymbolFields.Attributes].AsNumber();
+            set => this.Set((int)MessageQueueSymbolFields.Attributes, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/MessageQueueUserPermissionTuple.cs b/src/wixext/Tuples/MessageQueueUserPermissionTuple.cs
index c6d5a45a..cc783845 100644
--- a/src/wixext/Tuples/MessageQueueUserPermissionTuple.cs
+++ b/src/wixext/Tuples/MessageQueueUserPermissionTuple.cs
@@ -3,28 +3,28 @@
 namespace WixToolset.Msmq
 {
     using WixToolset.Data;
-    using WixToolset.Msmq.Tuples;
+    using WixToolset.Msmq.Symbols;
 
-    public static partial class MsmqTupleDefinitions
+    public static partial class MsmqSymbolDefinitions
     {
-        public static readonly IntermediateTupleDefinition MessageQueueUserPermission = new IntermediateTupleDefinition(
-            MsmqTupleDefinitionType.MessageQueueUserPermission.ToString(),
+        public static readonly IntermediateSymbolDefinition MessageQueueUserPermission = new IntermediateSymbolDefinition(
+            MsmqSymbolDefinitionType.MessageQueueUserPermission.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(MessageQueueUserPermissionTupleFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MessageQueueUserPermissionTupleFields.MessageQueueRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MessageQueueUserPermissionTupleFields.UserRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(MessageQueueUserPermissionTupleFields.Permissions), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(MessageQueueUserPermissionSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MessageQueueUserPermissionSymbolFields.MessageQueueRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MessageQueueUserPermissionSymbolFields.UserRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(MessageQueueUserPermissionSymbolFields.Permissions), IntermediateFieldType.Number),
             },
-            typeof(MessageQueueUserPermissionTuple));
+            typeof(MessageQueueUserPermissionSymbol));
     }
 }
 
-namespace WixToolset.Msmq.Tuples
+namespace WixToolset.Msmq.Symbols
 {
     using WixToolset.Data;
 
-    public enum MessageQueueUserPermissionTupleFields
+    public enum MessageQueueUserPermissionSymbolFields
     {
         ComponentRef,
         MessageQueueRef,
@@ -32,40 +32,40 @@ namespace WixToolset.Msmq.Tuples
         Permissions,
     }
 
-    public class MessageQueueUserPermissionTuple : IntermediateTuple
+    public class MessageQueueUserPermissionSymbol : IntermediateSymbol
     {
-        public MessageQueueUserPermissionTuple() : base(MsmqTupleDefinitions.MessageQueueUserPermission, null, null)
+        public MessageQueueUserPermissionSymbol() : base(MsmqSymbolDefinitions.MessageQueueUserPermission, null, null)
         {
         }
 
-        public MessageQueueUserPermissionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(MsmqTupleDefinitions.MessageQueueUserPermission, sourceLineNumber, id)
+        public MessageQueueUserPermissionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(MsmqSymbolDefinitions.MessageQueueUserPermission, sourceLineNumber, id)
         {
         }
 
-        public IntermediateField this[MessageQueueUserPermissionTupleFields index] => this.Fields[(int)index];
+        public IntermediateField this[MessageQueueUserPermissionSymbolFields index] => this.Fields[(int)index];
 
         public string ComponentRef
         {
-            get => this.Fields[(int)MessageQueueUserPermissionTupleFields.ComponentRef].AsString();
-            set => this.Set((int)MessageQueueUserPermissionTupleFields.ComponentRef, value);
+            get => this.Fields[(int)MessageQueueUserPermissionSymbolFields.ComponentRef].AsString();
+            set => this.Set((int)MessageQueueUserPermissionSymbolFields.ComponentRef, value);
         }
 
         public string MessageQueueRef
         {
-            get => this.Fields[(int)MessageQueueUserPermissionTupleFields.MessageQueueRef].AsString();
-            set => this.Set((int)MessageQueueUserPermissionTupleFields.MessageQueueRef, value);
+            get => this.Fields[(int)MessageQueueUserPermissionSymbolFields.MessageQueueRef].AsString();
+            set => this.Set((int)MessageQueueUserPermissionSymbolFields.MessageQueueRef, value);
         }
 
         public string UserRef
         {
-            get => this.Fields[(int)MessageQueueUserPermissionTupleFields.UserRef].AsString();
-            set => this.Set((int)MessageQueueUserPermissionTupleFields.UserRef, value);
+            get => this.Fields[(int)MessageQueueUserPermissionSymbolFields.UserRef].AsString();
+            set => this.Set((int)MessageQueueUserPermissionSymbolFields.UserRef, value);
         }
 
         public int Permissions
         {
-            get => this.Fields[(int)MessageQueueUserPermissionTupleFields.Permissions].AsNumber();
-            set => this.Set((int)MessageQueueUserPermissionTupleFields.Permissions, value);
+            get => this.Fields[(int)MessageQueueUserPermissionSymbolFields.Permissions].AsNumber();
+            set => this.Set((int)MessageQueueUserPermissionSymbolFields.Permissions, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/MsmqTupleDefinitions.cs b/src/wixext/Tuples/MsmqTupleDefinitions.cs
index e6accdc6..229417fe 100644
--- a/src/wixext/Tuples/MsmqTupleDefinitions.cs
+++ b/src/wixext/Tuples/MsmqTupleDefinitions.cs
@@ -5,20 +5,20 @@ namespace WixToolset.Msmq
     using System;
     using WixToolset.Data;
 
-    public enum MsmqTupleDefinitionType
+    public enum MsmqSymbolDefinitionType
     {
         MessageQueue,
         MessageQueueGroupPermission,
         MessageQueueUserPermission,
     }
 
-    public static partial class MsmqTupleDefinitions
+    public static partial class MsmqSymbolDefinitions
     {
         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 MsmqTupleDefinitionType type))
+            if (!Enum.TryParse(name, out MsmqSymbolDefinitionType type))
             {
                 return null;
             }
@@ -26,18 +26,18 @@ namespace WixToolset.Msmq
             return ByType(type);
         }
 
-        public static IntermediateTupleDefinition ByType(MsmqTupleDefinitionType type)
+        public static IntermediateSymbolDefinition ByType(MsmqSymbolDefinitionType type)
         {
             switch (type)
             {
-                case MsmqTupleDefinitionType.MessageQueue:
-                    return MsmqTupleDefinitions.MessageQueue;
+                case MsmqSymbolDefinitionType.MessageQueue:
+                    return MsmqSymbolDefinitions.MessageQueue;
 
-                case MsmqTupleDefinitionType.MessageQueueGroupPermission:
-                    return MsmqTupleDefinitions.MessageQueueGroupPermission;
+                case MsmqSymbolDefinitionType.MessageQueueGroupPermission:
+                    return MsmqSymbolDefinitions.MessageQueueGroupPermission;
 
-                case MsmqTupleDefinitionType.MessageQueueUserPermission:
-                    return MsmqTupleDefinitions.MessageQueueUserPermission;
+                case MsmqSymbolDefinitionType.MessageQueueUserPermission:
+                    return MsmqSymbolDefinitions.MessageQueueUserPermission;
 
                 default:
                     throw new ArgumentOutOfRangeException(nameof(type));