2 files changed, 6 insertions, 6 deletions

diff --git a/src/ext/Msmq/wixext/MsmqCompiler.cs b/src/ext/Msmq/wixext/MsmqCompiler.cs
index cfc4ef65..8a811d40 100644
--- a/src/ext/Msmq/wixext/MsmqCompiler.cs
+++ b/src/ext/Msmq/wixext/MsmqCompiler.cs
@@ -7,6 +7,7 @@ namespace WixToolset.Msmq
     using System.Xml.Linq;
     using WixToolset.Data;
     using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Data;
     using WixToolset.Msmq.Symbols;
 
     /// <summary>
@@ -71,7 +72,6 @@ namespace WixToolset.Msmq
             {
                 case "Component":
                     var componentId = context["ComponentId"];
-                    var directoryId = context["DirectoryId"];
 
                     switch (element.Name.LocalName)
                     {
@@ -249,8 +249,8 @@ namespace WixToolset.Msmq
                 symbol.Quota = quota;
             }
 
-            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "MessageQueuingInstall");
-            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "MessageQueuingUninstall");
+            this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4MessageQueuingInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
+            this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4MessageQueuingUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
         }
 
         ///     <summary>
diff --git a/src/ext/Msmq/wixext/MsmqTableDefinitions.cs b/src/ext/Msmq/wixext/MsmqTableDefinitions.cs
index 46e2dd10..c48292bc 100644
--- a/src/ext/Msmq/wixext/MsmqTableDefinitions.cs
+++ b/src/ext/Msmq/wixext/MsmqTableDefinitions.cs
@@ -7,7 +7,7 @@ namespace WixToolset.Msmq
     public static class MsmqTableDefinitions
     {
         public static readonly TableDefinition MessageQueue = new TableDefinition(
-            "MessageQueue",
+            "Wix4MessageQueue",
             MsmqSymbolDefinitions.MessageQueue,
             new[]
             {
@@ -27,7 +27,7 @@ namespace WixToolset.Msmq
         );
 
         public static readonly TableDefinition MessageQueueUserPermission = new TableDefinition(
-            "MessageQueueUserPermission",
+            "Wix4MessageQueueUserPermission",
             MsmqSymbolDefinitions.MessageQueueUserPermission,
             new[]
             {
@@ -41,7 +41,7 @@ namespace WixToolset.Msmq
         );
 
         public static readonly TableDefinition MessageQueueGroupPermission = new TableDefinition(
-            "MessageQueueGroupPermission",
+            "Wix4MessageQueueGroupPermission",
             MsmqSymbolDefinitions.MessageQueueGroupPermission,
             new[]
             {