2 files changed, 9 insertions, 6 deletions

diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs
index acd96e15..a5745b6c 100644
--- a/src/wixext/UtilCompiler.cs
+++ b/src/wixext/UtilCompiler.cs
@@ -549,7 +549,13 @@ namespace WixToolset.Util
 
             this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
 
-            this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, UtilConstants.UtilBundleExtensionId);
+            var bundleExtensionId = this.ParseHelper.CreateIdentifierValueFromPlatform("Wix4UtilBundleExtension", this.Context.Platform, BurnPlatforms.X86 | BurnPlatforms.X64 | BurnPlatforms.ARM64);
+            if (bundleExtensionId == null)
+            {
+                this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, this.Context.Platform.ToString(), element.Name.LocalName));
+            }
+
+            this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, bundleExtensionId);
 
             if (!this.Messaging.EncounteredError)
             {
@@ -1498,10 +1504,9 @@ namespace WixToolset.Util
             section.AddSymbol(new RemoveFileSymbol(sourceLineNumbers, shortcutId)
             {
                 ComponentRef = componentId,
-                DirProperty = directoryId,
+                DirPropertyRef = directoryId,
                 OnUninstall = true,
-                // TODO: A better way?
-                FileName = this.ParseHelper.IsValidShortFilename(name, false) ? name : String.Concat(this.ParseHelper.CreateShortName(name, true, false, directoryId, name), "|", name),
+                FileName = name,
             });
         }
 
diff --git a/src/wixext/UtilConstants.cs b/src/wixext/UtilConstants.cs
index d9ad460f..28ff368f 100644
--- a/src/wixext/UtilConstants.cs
+++ b/src/wixext/UtilConstants.cs
@@ -13,7 +13,5 @@ namespace WixToolset.Util
         internal static readonly string[] RegistryPermissions = { "Read", "Write", "CreateSubkeys", "EnumerateSubkeys", "Notify", "CreateLink" };
         internal static readonly string[] ServicePermissions = { "ServiceQueryConfig", "ServiceChangeConfig", "ServiceQueryStatus", "ServiceEnumerateDependents", "ServiceStart", "ServiceStop", "ServicePauseContinue", "ServiceInterrogate", "ServiceUserDefinedControl" };
         internal static readonly string[] StandardPermissions = { "Delete", "ReadPermission", "ChangePermission", "TakeOwnership", "Synchronize" };
-
-        internal const string UtilBundleExtensionId = "WixUtilBundleExtension";
     }
 }