From e9d10933bedb8215ec50ca85db272d6647426b31 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@joyofsetup.com>
Date: Thu, 5 Mar 2020 19:48:12 -0500
Subject: Version extension ids.

Partial fix for wixtoolset/issues#5933.
---
 src/wixlib/UtilExtension.wxs          | 181 ++++++++++++++++------------------
 src/wixlib/UtilExtension_Platform.wxi | 179 +++++++++++++++++----------------
 src/wixlib/caDecor.wxi                |  40 ++++++++
 src/wixlib/caSuffix.wxi               |  28 ------
 src/wixlib/util.wixproj               |   2 +-
 5 files changed, 216 insertions(+), 214 deletions(-)
 create mode 100644 src/wixlib/caDecor.wxi
 delete mode 100644 src/wixlib/caSuffix.wxi

(limited to 'src/wixlib')

diff --git a/src/wixlib/UtilExtension.wxs b/src/wixlib/UtilExtension.wxs
index e77b529b..28646ee1 100644
--- a/src/wixlib/UtilExtension.wxs
+++ b/src/wixlib/UtilExtension.wxs
@@ -3,6 +3,7 @@
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <?include caDecor.wxi ?>
     <?include caerr.wxi ?>
 
     <Fragment>
@@ -63,368 +64,358 @@
     </Fragment>
 
     <Fragment>
-        <CustomAction Id="WixFailWhenDeferred" BinaryKey="UtilCA" DllEntry="WixFailWhenDeferred" Execute="deferred" Return="check" SuppressModularization="yes" />
+        <CustomAction Id="$(var.Prefix)FailWhenDeferred$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixFailWhenDeferred" Execute="deferred" Return="check" SuppressModularization="yes" />
 
         <InstallExecuteSequence>
-            <Custom Action="WixFailWhenDeferred" Before="InstallFinalize" Overridable="yes">WIXFAILWHENDEFERRED=1 AND VersionNT &gt; 400</Custom>
+            <Custom Action="$(var.Prefix)FailWhenDeferred$(var.Suffix)" Before="InstallFinalize" Overridable="yes">WIXFAILWHENDEFERRED=1 AND VersionNT &gt; 400</Custom>
         </InstallExecuteSequence>
     </Fragment>
 
     <Fragment>
-        <CustomAction Id="WixWaitForEvent" BinaryKey="UtilCA" DllEntry="WixWaitForEvent" Execute="immediate" Return="check" SuppressModularization="yes" />
+        <CustomAction Id="$(var.Prefix)WaitForEvent$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixWaitForEvent" Execute="immediate" Return="check" SuppressModularization="yes" />
 
         <InstallExecuteSequence>
-            <Custom Action="WixWaitForEvent" Before="InstallFinalize" Overridable="yes" />
+            <Custom Action="$(var.Prefix)WaitForEvent$(var.Suffix)" Before="InstallFinalize" Overridable="yes" />
         </InstallExecuteSequence>
     </Fragment>
 
     <Fragment>
-        <CustomAction Id="WixWaitForEventDeferred" BinaryKey="UtilCA" DllEntry="WixWaitForEvent" Execute="deferred" Return="check" SuppressModularization="yes" />
+        <CustomAction Id="$(var.Prefix)WaitForEventDeferred$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixWaitForEvent" Execute="deferred" Return="check" SuppressModularization="yes" />
 
         <InstallExecuteSequence>
-            <Custom Action="WixWaitForEventDeferred" After="InstallInitialize" Overridable="yes" />
+            <Custom Action="$(var.Prefix)WaitForEventDeferred$(var.Suffix)" After="InstallInitialize" Overridable="yes" />
         </InstallExecuteSequence>
     </Fragment>
 
     <Fragment>
-        <CustomAction Id="WixExitEarlyWithSuccess" BinaryKey="UtilCA" DllEntry="WixExitEarlyWithSuccess" Execute="immediate" Return="check" SuppressModularization="yes" />
+        <CustomAction Id="$(var.Prefix)ExitEarlyWithSuccess$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixExitEarlyWithSuccess" Execute="immediate" Return="check" SuppressModularization="yes" />
 
         <InstallExecuteSequence>
-            <Custom Action="WixExitEarlyWithSuccess" After="FindRelatedProducts" Overridable="yes">NEWERVERSIONDETECTED AND VersionNT &gt; 400</Custom>
+            <Custom Action="$(var.Prefix)ExitEarlyWithSuccess$(var.Suffix)" After="FindRelatedProducts" Overridable="yes">NEWERVERSIONDETECTED AND VersionNT &gt; 400</Custom>
         </InstallExecuteSequence>
     </Fragment>
 
     <Fragment>
-        <CustomAction Id="WixRemoveFoldersEx" BinaryKey="UtilCA" DllEntry="WixRemoveFoldersEx" Execute="immediate" Return="ignore" />
+        <CustomAction Id="$(var.Prefix)RemoveFoldersEx$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixRemoveFoldersEx" Execute="immediate" Return="ignore" />
         
         <InstallExecuteSequence>
-            <Custom Action="WixRemoveFoldersEx" Before="CostInitialize" />
+            <Custom Action="$(var.Prefix)RemoveFoldersEx$(var.Suffix)" Before="CostInitialize" />
         </InstallExecuteSequence>
     </Fragment>
 
     <Fragment>
-        <CustomAction Id="WixBroadcastSettingChange" BinaryKey="UtilCA" DllEntry="WixBroadcastSettingChange" Execute="immediate" Return="ignore" SuppressModularization="yes" />
+        <CustomAction Id="$(var.Prefix)BroadcastSettingChange$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixBroadcastSettingChange" Execute="immediate" Return="ignore" SuppressModularization="yes" />
 
         <InstallExecuteSequence>
-            <Custom Action="WixBroadcastSettingChange" After="InstallFinalize" Overridable="yes" />
+            <Custom Action="$(var.Prefix)BroadcastSettingChange$(var.Suffix)" After="InstallFinalize" Overridable="yes" />
         </InstallExecuteSequence>
     </Fragment>
 
     <Fragment>
-        <CustomAction Id="WixBroadcastEnvironmentChange" BinaryKey="UtilCA" DllEntry="WixBroadcastEnvironmentChange" Execute="immediate" Return="ignore" SuppressModularization="yes" />
+        <CustomAction Id="$(var.Prefix)BroadcastEnvironmentChange$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixBroadcastEnvironmentChange" Execute="immediate" Return="ignore" SuppressModularization="yes" />
 
         <InstallExecuteSequence>
-            <Custom Action="WixBroadcastEnvironmentChange" After="InstallFinalize" Overridable="yes" />
+            <Custom Action="$(var.Prefix)BroadcastEnvironmentChange$(var.Suffix)" After="InstallFinalize" Overridable="yes" />
         </InstallExecuteSequence>
     </Fragment>
 
     <!-- WiX OS-detection properties and custom action -->
     <Fragment>
-        <CustomAction Id="WixQueryOsInfo" BinaryKey="UtilCA" DllEntry="WixQueryOsInfo" Execute="firstSequence" Return="check" SuppressModularization="yes" />
+        <CustomAction Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixQueryOsInfo" Execute="firstSequence" Return="check" SuppressModularization="yes" />
         
         <InstallExecuteSequence>
-            <Custom Action="WixQueryOsInfo" After="AppSearch" Overridable="yes">VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)</Custom>
+            <Custom Action="$(var.Prefix)QueryOsInfo$(var.Suffix)" After="AppSearch" Overridable="yes">VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)</Custom>
         </InstallExecuteSequence>
         
         <InstallUISequence>
-            <Custom Action="WixQueryOsInfo" After="AppSearch" Overridable="yes">VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)</Custom>
+            <Custom Action="$(var.Prefix)QueryOsInfo$(var.Suffix)" After="AppSearch" Overridable="yes">VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)</Custom>
         </InstallUISequence>
     </Fragment>
 
     <Fragment>
         <Property Id="WIX_SUITE_BACKOFFICE" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsInfo" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_SUITE_BLADE" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsInfo" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_SUITE_COMMUNICATIONS" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsInfo" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_SUITE_COMPUTE_SERVER" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsInfo" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_SUITE_DATACENTER" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsInfo" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_SUITE_EMBEDDED_RESTRICTED" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsInfo" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_SUITE_EMBEDDEDNT" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsInfo" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_SUITE_ENTERPRISE" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsInfo" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_SUITE_MEDIACENTER" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsInfo" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_SUITE_PERSONAL" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsInfo" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_SUITE_SECURITY_APPLIANCE" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsInfo" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_SUITE_SERVERR2" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsInfo" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_SUITE_SINGLEUSERTS" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsInfo" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_SUITE_SMALLBUSINESS" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsInfo" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_SUITE_SMALLBUSINESS_RESTRICTED" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsInfo" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_SUITE_STARTER" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsInfo" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_SUITE_STORAGE_SERVER" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsInfo" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_SUITE_TABLETPC" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsInfo" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_SUITE_TERMINAL" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsInfo" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_SUITE_WH_SERVER" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsInfo" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsInfo$(var.Suffix)" />
     </Fragment>
 
     <Fragment>
-        <CustomAction Id="WixQueryOsDirs" BinaryKey="UtilCA" DllEntry="WixQueryOsDirs" Execute="firstSequence" Return="check" SuppressModularization="yes" />
+        <CustomAction Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixQueryOsDirs" Execute="firstSequence" Return="check" SuppressModularization="yes" />
         
         <InstallExecuteSequence>
-            <Custom Action="WixQueryOsDirs" After="AppSearch" Overridable="yes">VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)</Custom>
+            <Custom Action="$(var.Prefix)QueryOsDirs$(var.Suffix)" After="AppSearch" Overridable="yes">VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)</Custom>
         </InstallExecuteSequence>
         
         <InstallUISequence>
-            <Custom Action="WixQueryOsDirs" After="AppSearch" Overridable="yes">VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)</Custom>
+            <Custom Action="$(var.Prefix)QueryOsDirs$(var.Suffix)" After="AppSearch" Overridable="yes">VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)</Custom>
         </InstallUISequence>
     </Fragment>
 
     <Fragment>
         <Property Id="WIX_DIR_ADMINTOOLS" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsDirs" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_DIR_ALTSTARTUP" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsDirs" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_DIR_CDBURN_AREA" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsDirs" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_DIR_COMMON_ADMINTOOLS" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsDirs" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_DIR_COMMON_ALTSTARTUP" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsDirs" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_DIR_COMMON_DOCUMENTS" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsDirs" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_DIR_COMMON_FAVORITES" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsDirs" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_DIR_COMMON_MUSIC" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsDirs" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_DIR_COMMON_PICTURES" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsDirs" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_DIR_COMMON_VIDEO" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsDirs" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_DIR_COOKIES" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsDirs" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_DIR_DESKTOP" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsDirs" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_DIR_HISTORY" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsDirs" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_DIR_INTERNET_CACHE" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsDirs" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_DIR_MYMUSIC" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsDirs" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_DIR_MYPICTURES" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsDirs" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_DIR_MYVIDEO" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsDirs" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_DIR_NETHOOD" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsDirs" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_DIR_PERSONAL" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsDirs" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_DIR_PRINTHOOD" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsDirs" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_DIR_PROFILE" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsDirs" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_DIR_RECENT" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsDirs" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_DIR_RESOURCES" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsDirs" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsDirs$(var.Suffix)" />
     </Fragment>
 
     <Fragment>
-        <CustomAction Id="WixQueryOsWellKnownSID" BinaryKey="UtilCA" DllEntry="WixQueryOsWellKnownSID" Execute="firstSequence" Return="check" SuppressModularization="yes" />
+        <CustomAction Id="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixQueryOsWellKnownSID" Execute="firstSequence" Return="check" SuppressModularization="yes" />
 
         <InstallExecuteSequence>
-            <Custom Action="WixQueryOsWellKnownSID" After="AppSearch" Overridable="yes">VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)</Custom>
+            <Custom Action="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" After="AppSearch" Overridable="yes">VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)</Custom>
         </InstallExecuteSequence>
 
         <InstallUISequence>
-            <Custom Action="WixQueryOsWellKnownSID" After="AppSearch" Overridable="yes">VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)</Custom>
+            <Custom Action="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" After="AppSearch" Overridable="yes">VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)</Custom>
         </InstallUISequence>
     </Fragment>
   
     <Fragment>
         <Property Id="WIX_ACCOUNT_LOCALSYSTEM" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsWellKnownSID" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_ACCOUNT_LOCALSERVICE" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsWellKnownSID" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_ACCOUNT_NETWORKSERVICE" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsWellKnownSID" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_ACCOUNT_ADMINISTRATORS" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsWellKnownSID" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_ACCOUNT_USERS" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsWellKnownSID" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_ACCOUNT_GUESTS" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsWellKnownSID" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" />
     </Fragment>
     <Fragment>
         <Property Id="WIX_ACCOUNT_PERFLOGUSERS" Secure="yes" />
         <Property Id="WIX_ACCOUNT_PERFLOGUSERS_NODOMAIN" Secure="yes" />
-        <CustomActionRef Id="WixQueryOsWellKnownSID" />
+        <CustomActionRef Id="$(var.Prefix)QueryOsWellKnownSID$(var.Suffix)" />
     </Fragment>
 
     <Fragment>
-      <CustomAction Id="WixQueryOsDriverInfo" BinaryKey="UtilCA" DllEntry="WixQueryOsDriverInfo" Execute="firstSequence" Return="check" SuppressModularization="yes" />
+      <CustomAction Id="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixQueryOsDriverInfo" Execute="firstSequence" Return="check" SuppressModularization="yes" />
 
       <InstallExecuteSequence>
-        <Custom Action="WixQueryOsDriverInfo" After="AppSearch" Overridable="yes">VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)</Custom>
+        <Custom Action="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" After="AppSearch" Overridable="yes">VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)</Custom>
       </InstallExecuteSequence>
 
       <InstallUISequence>
-        <Custom Action="WixQueryOsDriverInfo" After="AppSearch" Overridable="yes">VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)</Custom>
+        <Custom Action="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" After="AppSearch" Overridable="yes">VersionNT &gt; 400 OR (VersionNT = 400 AND ServicePackLevel &gt; 3)</Custom>
       </InstallUISequence>
     </Fragment>
 
     <Fragment>
       <Property Id="WIX_WDDM_DRIVER_PRESENT" Secure="yes" />
-      <CustomActionRef Id="WixQueryOsDriverInfo" />
+      <CustomActionRef Id="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" />
     </Fragment>
 
     <Fragment>
       <Property Id="WIX_DWM_COMPOSITION_ENABLED" Secure="yes" />
-      <CustomActionRef Id="WixQueryOsDriverInfo" />
+      <CustomActionRef Id="$(var.Prefix)QueryOsDriverInfo$(var.Suffix)" />
     </Fragment>
 
     <!-- ShellExec custom actions (for when only one is needed; multiple executions need their own IDs) --> 
     <Fragment>
         <PropertyRef Id="WixShellExecBinaryId" />
-        <CustomAction Id="WixShellExecBinary" BinaryKey="UtilCA" DllEntry="WixShellExecBinary" Execute="immediate" Return="check" Impersonate="yes" />
+        <CustomAction Id="$(var.Prefix)ShellExecBinary$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixShellExecBinary" Execute="immediate" Return="check" Impersonate="yes" />
     </Fragment>
 
     <Fragment>
         <PropertyRef Id="WixShellExecTarget" />
-        <CustomAction Id="WixShellExec" BinaryKey="UtilCA" DllEntry="WixShellExec" Execute="immediate" Return="check" Impersonate="yes" />
+        <CustomAction Id="$(var.Prefix)ShellExec$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixShellExec" Execute="immediate" Return="check" Impersonate="yes" />
     </Fragment>
 
     <Fragment>
         <PropertyRef Id="WixUnelevatedShellExecTarget" />
-        <CustomAction Id="WixUnelevatedShellExec" BinaryKey="UtilCA" DllEntry="WixUnelevatedShellExec" Execute="immediate" Return="check" Impersonate="yes" />
-    </Fragment>
-
-    <Fragment>
-        <PropertyRef Id="QtExecCmdLine" />
-        <CustomAction Id="QtExec" BinaryKey="UtilCA" DllEntry="CAQuietExec" Execute="immediate" Return="check" Impersonate="yes" />
-    </Fragment>
-
-    <Fragment>
-        <PropertyRef Id="QtExec64CmdLine" />
-        <CustomAction Id="QtExec64" BinaryKey="UtilCA" DllEntry="CAQuietExec64" Execute="immediate" Return="check" Impersonate="yes" />
+        <CustomAction Id="$(var.Prefix)UnelevatedShellExec$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixUnelevatedShellExec" Execute="immediate" Return="check" Impersonate="yes" />
     </Fragment>
 
     <Fragment>
         <PropertyRef Id="WixQuietExecCmdLine" />
-        <CustomAction Id="WixQuietExec" BinaryKey="UtilCA" DllEntry="WixQuietExec" Execute="immediate" Return="check" Impersonate="yes" />
+        <CustomAction Id="$(var.Prefix)QuietExec$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixQuietExec" Execute="immediate" Return="check" Impersonate="yes" />
     </Fragment>
 
     <Fragment>
         <PropertyRef Id="WixQuietExec64CmdLine" />
-        <CustomAction Id="WixQuietExec64" BinaryKey="UtilCA" DllEntry="WixQuietExec64" Execute="immediate" Return="check" Impersonate="yes" />
+        <CustomAction Id="$(var.Prefix)QuietExec64$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixQuietExec64" Execute="immediate" Return="check" Impersonate="yes" />
     </Fragment>
 
     <!-- SilentExec custom actions differ from QtExec in that they do not log the commandline or output of the exe -->
     <Fragment>
         <PropertyRef Id="WixSilentExecCmdLine" />
-        <CustomAction Id="WixSilentExec" BinaryKey="UtilCA" DllEntry="WixSilentExec" Execute="immediate" Return="check" Impersonate="yes" />
+        <CustomAction Id="$(var.Prefix)SilentExec$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixSilentExec" Execute="immediate" Return="check" Impersonate="yes" />
     </Fragment>
 
     <Fragment>
         <PropertyRef Id="WixSilentExec64CmdLine" />
-        <CustomAction Id="WixSilentExec64" BinaryKey="UtilCA" DllEntry="WixSilentExec64" Execute="immediate" Return="check" Impersonate="yes" />
+        <CustomAction Id="$(var.Prefix)SilentExec64$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixSilentExec64" Execute="immediate" Return="check" Impersonate="yes" />
     </Fragment>
 </Wix>
diff --git a/src/wixlib/UtilExtension_Platform.wxi b/src/wixlib/UtilExtension_Platform.wxi
index 4f76c687..0d7fed09 100644
--- a/src/wixlib/UtilExtension_Platform.wxi
+++ b/src/wixlib/UtilExtension_Platform.wxi
@@ -3,8 +3,7 @@
 
 
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-
-  <?include caSuffix.wxi ?>
+  <?include caDecor.wxi ?>
 
   <!--
   The following actions do not support X64.
@@ -12,178 +11,178 @@
   <?if $(var.platform)!=x64 ?>
   
   <Fragment>
-    <CustomAction Id="WixCheckRebootRequired$(var.Suffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="WixCheckRebootRequired" Execute="immediate" Return="ignore" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)CheckRebootRequired$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixCheckRebootRequired" Execute="immediate" Return="ignore" SuppressModularization="yes" />
 
     <InstallExecuteSequence>
       <!-- Condition this so it runs on install and MMode, but not uninstall -->
-      <Custom Action="WixCheckRebootRequired$(var.Suffix)" After="InstallFinalize" Overridable="yes">NOT REMOVE~="ALL" AND VersionNT &gt; 400</Custom>
+      <Custom Action="$(var.Prefix)CheckRebootRequired$(var.Suffix)" After="InstallFinalize" Overridable="yes">NOT REMOVE~="ALL" AND VersionNT &gt; 400</Custom>
     </InstallExecuteSequence>
   </Fragment>
 
   <Fragment>
-    <CustomAction Id="WixCloseApplications$(var.Suffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="WixCloseApplications" Execute="immediate" Return="check" SuppressModularization="yes" />
-    <CustomAction Id="WixCloseApplicationsDeferred$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="WixCloseApplicationsDeferred" Impersonate="no" Execute="deferred" Return="check" SuppressModularization="yes" />
-    <CustomActionRef Id="WixCheckRebootRequired$(var.Suffix)" />
+    <CustomAction Id="$(var.Prefix)CloseApplications$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixCloseApplications" Execute="immediate" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)CloseApplicationsDeferred$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixCloseApplicationsDeferred" Impersonate="no" Execute="deferred" Return="check" SuppressModularization="yes" />
+    <CustomActionRef Id="$(var.Prefix)CheckRebootRequired$(var.Suffix)" />
 
     <InstallExecuteSequence>
-      <Custom Action="WixCloseApplications$(var.Suffix)" Before="InstallFiles" Overridable="yes">VersionNT &gt; 400</Custom>
+      <Custom Action="$(var.Prefix)CloseApplications$(var.Suffix)" Before="InstallFiles" Overridable="yes">VersionNT &gt; 400</Custom>
     </InstallExecuteSequence>
   </Fragment>
 
   <Fragment>
-    <CustomAction Id="WixRegisterRestartResources$(var.Suffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="WixRegisterRestartResources$(var.Suffix)" Execute="immediate" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)RegisterRestartResources$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixRegisterRestartResources$(var.Suffix)" Execute="immediate" Return="check" SuppressModularization="yes" />
 
     <InstallExecuteSequence>
-      <Custom Action="WixRegisterRestartResources$(var.Suffix)" Before="InstallValidate" Overridable="yes" />
+      <Custom Action="$(var.Prefix)RegisterRestartResources$(var.Suffix)" Before="InstallValidate" Overridable="yes" />
     </InstallExecuteSequence>
   </Fragment>
 
   <Fragment>
     <UIRef Id="ConfigureUsersErrorText" />
 
-    <CustomAction Id="ConfigureUsers$(var.Suffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="ConfigureUsers" Execute="immediate" Return="check" SuppressModularization="yes" />
-    <CustomAction Id="CreateUser$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="CreateUser" Impersonate="no" Execute="deferred" Return="check" HideTarget="yes" SuppressModularization="yes" />
-    <CustomAction Id="CreateUserRollback$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="RemoveUser" Impersonate="no" Execute="rollback" Return="check" HideTarget="yes" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)ConfigureUsers$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="ConfigureUsers" Execute="immediate" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)CreateUser$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="CreateUser" Impersonate="no" Execute="deferred" Return="check" HideTarget="yes" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)CreateUserRollback$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="RemoveUser" Impersonate="no" Execute="rollback" Return="check" HideTarget="yes" SuppressModularization="yes" />
     <!-- RemoveUser is a type commit action because it is not possible to rollback the removal of a user -->
-    <CustomAction Id="RemoveUser$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="RemoveUser" Impersonate="no" Execute="commit" Return="ignore" HideTarget="yes" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)RemoveUser$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="RemoveUser" Impersonate="no" Execute="commit" Return="ignore" HideTarget="yes" SuppressModularization="yes" />
 
     <InstallExecuteSequence>
-      <Custom Action="ConfigureUsers$(var.Suffix)" Before="InstallFiles" Overridable="yes">VersionNT &gt; 400</Custom>
+      <Custom Action="$(var.Prefix)ConfigureUsers$(var.Suffix)" Before="InstallFiles" Overridable="yes">VersionNT &gt; 400</Custom>
     </InstallExecuteSequence>
   </Fragment>
 
   <Fragment>
     <UIRef Id="ConfigureSmbErrorsText" />
 
-    <CustomAction Id="ConfigureSmbInstall$(var.Suffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="ConfigureSmbInstall" Execute="immediate" Return="check" SuppressModularization="yes" />
-    <CustomAction Id="ConfigureSmbUninstall$(var.Suffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="ConfigureSmbUninstall" Execute="immediate" Return="check" SuppressModularization="yes" />
-    <CustomAction Id="CreateSmb$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="CreateSmb" Impersonate="no" Execute="deferred" Return="check" HideTarget="yes" SuppressModularization="yes" />
-    <CustomAction Id="CreateSmbRollback$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="DropSmb" Impersonate="no" Execute="rollback" Return="ignore" HideTarget="yes" SuppressModularization="yes" />
-    <CustomAction Id="DropSmb$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="DropSmb" Impersonate="no" Execute="deferred" Return="check" HideTarget="yes" SuppressModularization="yes" />
-    <CustomAction Id="DropSmbRollback$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="CreateSmb" Impersonate="no" Execute="rollback" Return="ignore" HideTarget="yes" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)ConfigureSmbInstall$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="ConfigureSmbInstall" Execute="immediate" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)ConfigureSmbUninstall$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="ConfigureSmbUninstall" Execute="immediate" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)CreateSmb$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="CreateSmb" Impersonate="no" Execute="deferred" Return="check" HideTarget="yes" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)CreateSmbRollback$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="DropSmb" Impersonate="no" Execute="rollback" Return="ignore" HideTarget="yes" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)DropSmb$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="DropSmb" Impersonate="no" Execute="deferred" Return="check" HideTarget="yes" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)DropSmbRollback$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="CreateSmb" Impersonate="no" Execute="rollback" Return="ignore" HideTarget="yes" SuppressModularization="yes" />
 
     <InstallExecuteSequence>
-      <Custom Action="ConfigureSmbInstall$(var.Suffix)" After="InstallFiles" Overridable="yes">VersionNT &gt; 400</Custom>
-      <Custom Action="ConfigureSmbUninstall$(var.Suffix)" After="RemoveFiles" Overridable="yes">VersionNT &gt; 400</Custom>
+      <Custom Action="$(var.Prefix)ConfigureSmbInstall$(var.Suffix)" After="InstallFiles" Overridable="yes">VersionNT &gt; 400</Custom>
+      <Custom Action="$(var.Prefix)ConfigureSmbUninstall$(var.Suffix)" After="RemoveFiles" Overridable="yes">VersionNT &gt; 400</Custom>
     </InstallExecuteSequence>
   </Fragment>
 
   <Fragment>
     <UIRef Id="PerCounterDataErrorsText" />
 
-    <CustomAction Id="InstallPerfCounterData$(var.Suffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="InstallPerfCounterData" Execute="immediate" Return="check" SuppressModularization="yes" />
-    <CustomAction Id="UninstallPerfCounterData$(var.Suffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="UninstallPerfCounterData" Execute="immediate" Return="check" SuppressModularization="yes" />
-    <CustomAction Id="RegisterPerfCounterData$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="RegisterPerfCounterData" Impersonate="no" Execute="deferred" Return="check" HideTarget="yes" SuppressModularization="yes" />
-    <CustomAction Id="UnregisterPerfCounterData$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="UnregisterPerfCounterData" Impersonate="no" Execute="deferred" Return="check" HideTarget="yes" SuppressModularization="yes" />
-    <CustomAction Id="RollbackRegisterPerfCounterData$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="UnregisterPerfCounterData" Impersonate="no" Execute="rollback" Return="check" HideTarget="yes" SuppressModularization="yes" />
-    <CustomAction Id="RollbackUnregisterPerfCounterData$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="RegisterPerfCounterData" Impersonate="no" Execute="rollback" Return="check" HideTarget="yes" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)InstallPerfCounterData$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="InstallPerfCounterData" Execute="immediate" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)UninstallPerfCounterData$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="UninstallPerfCounterData" Execute="immediate" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)RegisterPerfCounterData$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="RegisterPerfCounterData" Impersonate="no" Execute="deferred" Return="check" HideTarget="yes" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)UnregisterPerfCounterData$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="UnregisterPerfCounterData" Impersonate="no" Execute="deferred" Return="check" HideTarget="yes" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)RollbackRegisterPerfCounterData$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="UnregisterPerfCounterData" Impersonate="no" Execute="rollback" Return="check" HideTarget="yes" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)RollbackUnregisterPerfCounterData$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="RegisterPerfCounterData" Impersonate="no" Execute="rollback" Return="check" HideTarget="yes" SuppressModularization="yes" />
 
     <InstallExecuteSequence>
-      <Custom Action="InstallPerfCounterData$(var.Suffix)" After="WriteRegistryValues" Overridable="yes">VersionNT &gt; 400</Custom>
-      <Custom Action="UninstallPerfCounterData$(var.Suffix)" Before="RemoveRegistryValues" Overridable="yes">VersionNT &gt; 400</Custom>
+      <Custom Action="$(var.Prefix)InstallPerfCounterData$(var.Suffix)" After="WriteRegistryValues" Overridable="yes">VersionNT &gt; 400</Custom>
+      <Custom Action="$(var.Prefix)UninstallPerfCounterData$(var.Suffix)" Before="RemoveRegistryValues" Overridable="yes">VersionNT &gt; 400</Custom>
     </InstallExecuteSequence>
   </Fragment>
 
   <Fragment>
     <UIRef Id="ConfigurePerfmonErrorsText" />
 
-    <CustomAction Id="ConfigurePerfmonInstall$(var.Suffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="ConfigurePerfmonInstall" Execute="immediate" Return="check" SuppressModularization="yes" />
-    <CustomAction Id="ConfigurePerfmonUninstall$(var.Suffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="ConfigurePerfmonUninstall" Execute="immediate" Return="check" SuppressModularization="yes" />
-    <CustomAction Id="RegisterPerfmon$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="RegisterPerfmon" Impersonate="no" Execute="deferred" Return="check" SuppressModularization="yes" />
-    <CustomAction Id="UnregisterPerfmon$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="UnregisterPerfmon" Impersonate="no" Execute="deferred" Return="check" SuppressModularization="yes" />
-    <CustomAction Id="RollbackRegisterPerfmon$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="UnregisterPerfmon" Impersonate="no" Execute="rollback" Return="check" SuppressModularization="yes" />
-    <CustomAction Id="RollbackUnregisterPerfmon$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="RegisterPerfmon" Impersonate="no" Execute="rollback" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)ConfigurePerfmonInstall$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="ConfigurePerfmonInstall" Execute="immediate" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)ConfigurePerfmonUninstall$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="ConfigurePerfmonUninstall" Execute="immediate" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)RegisterPerfmon$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="RegisterPerfmon" Impersonate="no" Execute="deferred" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)UnregisterPerfmon$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="UnregisterPerfmon" Impersonate="no" Execute="deferred" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)RollbackRegisterPerfmon$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="UnregisterPerfmon" Impersonate="no" Execute="rollback" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)RollbackUnregisterPerfmon$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="RegisterPerfmon" Impersonate="no" Execute="rollback" Return="check" SuppressModularization="yes" />
 
     <InstallExecuteSequence>
-      <Custom Action="ConfigurePerfmonInstall$(var.Suffix)" After="WriteRegistryValues" Overridable="yes">VersionNT &gt; 400</Custom>
-      <Custom Action="ConfigurePerfmonUninstall$(var.Suffix)" Before="RemoveRegistryValues" Overridable="yes">VersionNT &gt; 400</Custom>
+      <Custom Action="$(var.Prefix)ConfigurePerfmonInstall$(var.Suffix)" After="WriteRegistryValues" Overridable="yes">VersionNT &gt; 400</Custom>
+      <Custom Action="$(var.Prefix)ConfigurePerfmonUninstall$(var.Suffix)" Before="RemoveRegistryValues" Overridable="yes">VersionNT &gt; 400</Custom>
     </InstallExecuteSequence>
   </Fragment>
 
   <Fragment>
-    <CustomAction Id="ConfigurePerfmonManifestRegister$(var.Suffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="ConfigurePerfmonManifestRegister" Execute="immediate" Return="check" SuppressModularization="yes" />
-    <CustomAction Id="ConfigurePerfmonManifestUnregister$(var.Suffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="ConfigurePerfmonManifestUnregister" Execute="immediate" Return="check" SuppressModularization="yes" />
-    <CustomAction Id="RegisterPerfmonManifest$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="CAQuietExec" Impersonate="no" Execute="deferred" Return="check" SuppressModularization="yes" />
-    <CustomAction Id="UnregisterPerfmonManifest$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="CAQuietExec" Impersonate="no" Execute="deferred" Return="ignore" SuppressModularization="yes" />
-    <CustomAction Id="RollbackRegisterPerfmonManifest$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="CAQuietExec" Impersonate="no" Execute="rollback" Return="ignore" SuppressModularization="yes" />
-    <CustomAction Id="RollbackUnregisterPerfmonManifest$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="CAQuietExec" Impersonate="no" Execute="rollback" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)ConfigurePerfmonManifestRegister$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="ConfigurePerfmonManifestRegister" Execute="immediate" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)ConfigurePerfmonManifestUnregister$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="ConfigurePerfmonManifestUnregister" Execute="immediate" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)RegisterPerfmonManifest$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="CAQuietExec" Impersonate="no" Execute="deferred" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)UnregisterPerfmonManifest$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="CAQuietExec" Impersonate="no" Execute="deferred" Return="ignore" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)RollbackRegisterPerfmonManifest$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="CAQuietExec" Impersonate="no" Execute="rollback" Return="ignore" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)RollbackUnregisterPerfmonManifest$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="CAQuietExec" Impersonate="no" Execute="rollback" Return="check" SuppressModularization="yes" />
 
     <InstallExecuteSequence>
-      <Custom Action="ConfigurePerfmonManifestRegister$(var.Suffix)" After="InstallFiles" Overridable="yes">VersionNT &gt; 400</Custom>
-      <Custom Action="ConfigurePerfmonManifestUnregister$(var.Suffix)" After="RemoveRegistryValues" Overridable="yes">VersionNT &gt; 400</Custom>
+      <Custom Action="$(var.Prefix)ConfigurePerfmonManifestRegister$(var.Suffix)" After="InstallFiles" Overridable="yes">VersionNT &gt; 400</Custom>
+      <Custom Action="$(var.Prefix)ConfigurePerfmonManifestUnregister$(var.Suffix)" After="RemoveRegistryValues" Overridable="yes">VersionNT &gt; 400</Custom>
     </InstallExecuteSequence>
   </Fragment>
 
   <Fragment>
-    <CustomAction Id="ConfigureEventManifestRegister$(var.Suffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="ConfigureEventManifestRegister" Execute="immediate" Return="check" SuppressModularization="yes" />
-    <CustomAction Id="ConfigureEventManifestUnregister$(var.Suffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="ConfigureEventManifestUnregister" Execute="immediate" Return="check" SuppressModularization="yes" />
-    <CustomAction Id="RegisterEventManifest$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="CAQuietExec" Impersonate="no" Execute="deferred" Return="check" SuppressModularization="yes" />
-    <CustomAction Id="UnregisterEventManifest$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="CAQuietExec" Impersonate="no" Execute="deferred" Return="ignore" SuppressModularization="yes" />
-    <CustomAction Id="RollbackRegisterEventManifest$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="CAQuietExec" Impersonate="no" Execute="rollback" Return="ignore" SuppressModularization="yes" />
-    <CustomAction Id="RollbackUnregisterEventManifest$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="CAQuietExec" Impersonate="no" Execute="rollback" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)ConfigureEventManifestRegister$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="ConfigureEventManifestRegister" Execute="immediate" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)ConfigureEventManifestUnregister$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="ConfigureEventManifestUnregister" Execute="immediate" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)RegisterEventManifest$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="CAQuietExec" Impersonate="no" Execute="deferred" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)UnregisterEventManifest$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="CAQuietExec" Impersonate="no" Execute="deferred" Return="ignore" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)RollbackRegisterEventManifest$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="CAQuietExec" Impersonate="no" Execute="rollback" Return="ignore" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)RollbackUnregisterEventManifest$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="CAQuietExec" Impersonate="no" Execute="rollback" Return="check" SuppressModularization="yes" />
 
     <InstallExecuteSequence>
-      <Custom Action="ConfigureEventManifestRegister$(var.Suffix)" After="SchedXmlFile" Overridable="yes">VersionNT &gt; 400</Custom>
-      <Custom Action="ConfigureEventManifestUnregister$(var.Suffix)" After="RemoveRegistryValues" Overridable="yes">VersionNT &gt; 400</Custom>
+      <Custom Action="$(var.Prefix)ConfigureEventManifestRegister$(var.Suffix)" After="$(var.Prefix)SchedXmlFile$(var.Suffix)" Overridable="yes">VersionNT &gt; 400</Custom>
+      <Custom Action="$(var.Prefix)ConfigureEventManifestUnregister$(var.Suffix)" After="RemoveRegistryValues" Overridable="yes">VersionNT &gt; 400</Custom>
     </InstallExecuteSequence>
   </Fragment>
 
   <Fragment>
-    <CustomAction Id="SchedServiceConfig$(var.Suffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="SchedServiceConfig" Execute="immediate" Return="check" SuppressModularization="yes" />
-    <CustomAction Id="ExecServiceConfig$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="ExecServiceConfig" Execute="deferred" Impersonate="no" Return="check" SuppressModularization="yes" />
-    <CustomAction Id="RollbackServiceConfig$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="RollbackServiceConfig" Execute="rollback" Impersonate="no" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)SchedServiceConfig$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="SchedServiceConfig" Execute="immediate" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)ExecServiceConfig$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="ExecServiceConfig" Execute="deferred" Impersonate="no" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)RollbackServiceConfig$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="RollbackServiceConfig" Execute="rollback" Impersonate="no" Return="check" SuppressModularization="yes" />
 
     <InstallExecuteSequence>
       <!-- Condition this so it runs on install and MMode, but not uninstall -->
-      <Custom Action="SchedServiceConfig$(var.Suffix)" After="InstallServices" Overridable="yes">NOT REMOVE~="ALL" AND VersionNT &gt; 400</Custom>
+      <Custom Action="$(var.Prefix)SchedServiceConfig$(var.Suffix)" After="InstallServices" Overridable="yes">NOT REMOVE~="ALL" AND VersionNT &gt; 400</Custom>
     </InstallExecuteSequence>
   </Fragment>
 
   <Fragment>
-    <CustomAction Id="WixTouchFileDuringInstall" BinaryKey="UtilCA$(var.Suffix)" DllEntry="WixTouchFileDuringInstall" Execute="immediate" Return="check" SuppressModularization="yes" />
-    <CustomAction Id="WixTouchFileDuringUninstall" BinaryKey="UtilCA$(var.Suffix)" DllEntry="WixTouchFileDuringUninstall" Execute="immediate" Return="check" SuppressModularization="yes" />
-    <CustomAction Id="WixExecuteTouchFile" BinaryKey="UtilCA$(var.Suffix)" DllEntry="WixExecuteTouchFile" Execute="deferred" Impersonate="no" Return="check" SuppressModularization="yes" />
-    <CustomAction Id="WixRollbackTouchFile" BinaryKey="UtilCA$(var.Suffix)" DllEntry="WixExecuteTouchFile" Execute="rollback" Impersonate="no" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)TouchFileDuringInstall$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixTouchFileDuringInstall" Execute="immediate" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)TouchFileDuringUninstall$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixTouchFileDuringUninstall" Execute="immediate" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)ExecuteTouchFile$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixExecuteTouchFile" Execute="deferred" Impersonate="no" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)RollbackTouchFile$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixExecuteTouchFile" Execute="rollback" Impersonate="no" Return="check" SuppressModularization="yes" />
 
     <InstallExecuteSequence>
-      <Custom Action="WixTouchFileDuringUninstall" Before="RemoveFiles" Overridable="yes" />
-      <Custom Action="WixTouchFileDuringInstall" After="InstallFiles" Overridable="yes" />
+      <Custom Action="$(var.Prefix)TouchFileDuringUninstall" Before="RemoveFiles" Overridable="yes" />
+      <Custom Action="$(var.Prefix)TouchFileDuringInstall" After="InstallFiles" Overridable="yes" />
     </InstallExecuteSequence>
   </Fragment>
 
   <Fragment>
     <UIRef Id="XmlFileErrorsText" />
 
-    <CustomAction Id="SchedXmlFile$(var.Suffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="SchedXmlFile" Execute="immediate" Return="check" SuppressModularization="yes" />
-    <CustomAction Id="ExecXmlFile$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="ExecXmlFile" Execute="deferred" Impersonate="no" Return="check" HideTarget="yes" SuppressModularization="yes" />
-    <CustomAction Id="ExecXmlFileRollback$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="ExecXmlFileRollback" Execute="rollback" Impersonate="no" Return="check" HideTarget="yes" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)SchedXmlFile$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="SchedXmlFile" Execute="immediate" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)ExecXmlFile$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="ExecXmlFile" Execute="deferred" Impersonate="no" Return="check" HideTarget="yes" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)ExecXmlFileRollback$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="ExecXmlFileRollback" Execute="rollback" Impersonate="no" Return="check" HideTarget="yes" SuppressModularization="yes" />
 
     <InstallExecuteSequence>
-      <Custom Action="SchedXmlFile$(var.Suffix)" After="DuplicateFiles" Overridable="yes">VersionNT &gt; 400</Custom>
+      <Custom Action="$(var.Prefix)SchedXmlFile$(var.Suffix)" After="DuplicateFiles" Overridable="yes">VersionNT &gt; 400</Custom>
     </InstallExecuteSequence>
   </Fragment>
 
   <Fragment>
     <UIRef Id="XmlConfigErrorsText" />
 
-    <CustomAction Id="SchedXmlConfig$(var.Suffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="SchedXmlConfig" Execute="immediate" Return="check" SuppressModularization="yes" />
-    <CustomAction Id="ExecXmlConfig$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="ExecXmlConfig" Execute="deferred" Impersonate="no" Return="check" HideTarget="yes" SuppressModularization="yes" />
-    <CustomAction Id="ExecXmlConfigRollback$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="ExecXmlConfigRollback" Execute="rollback" Impersonate="no" Return="check" HideTarget="yes" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)SchedXmlConfig$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="SchedXmlConfig" Execute="immediate" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)ExecXmlConfig$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="ExecXmlConfig" Execute="deferred" Impersonate="no" Return="check" HideTarget="yes" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)ExecXmlConfigRollback$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="ExecXmlConfigRollback" Execute="rollback" Impersonate="no" Return="check" HideTarget="yes" SuppressModularization="yes" />
 
     <InstallExecuteSequence>
-      <Custom Action="SchedXmlConfig$(var.Suffix)" After="DuplicateFiles" Overridable="yes">VersionNT &gt; 400</Custom>
+      <Custom Action="$(var.Prefix)SchedXmlConfig$(var.Suffix)" After="DuplicateFiles" Overridable="yes">VersionNT &gt; 400</Custom>
     </InstallExecuteSequence>
   </Fragment>
 
   <Fragment>
-    <CustomAction Id="WixSchedInternetShortcuts$(var.Suffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="WixSchedInternetShortcuts" Execute="immediate" Return="check" SuppressModularization="yes" />
-    <CustomAction Id="WixRollbackInternetShortcuts$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="WixRollbackInternetShortcuts" Impersonate="no" Execute="rollback" Return="check" SuppressModularization="yes" />
-    <CustomAction Id="WixCreateInternetShortcuts$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="WixCreateInternetShortcuts" Impersonate="no" Execute="deferred" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)SchedInternetShortcuts$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixSchedInternetShortcuts" Execute="immediate" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)RollbackInternetShortcuts$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixRollbackInternetShortcuts" Impersonate="no" Execute="rollback" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)CreateInternetShortcuts$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixCreateInternetShortcuts" Impersonate="no" Execute="deferred" Return="check" SuppressModularization="yes" />
 
     <InstallExecuteSequence>
-      <Custom Action="WixSchedInternetShortcuts$(var.Suffix)" Before="RemoveFolders" Overridable="yes">VersionNT &gt; 400</Custom>
-      <Custom Action="WixRollbackInternetShortcuts$(var.DeferredSuffix)" Before="WixCreateInternetShortcuts$(var.DeferredSuffix)" Overridable="yes">VersionNT &gt; 400</Custom>
-      <Custom Action="WixCreateInternetShortcuts$(var.DeferredSuffix)" After="CreateShortcuts" Overridable="yes">VersionNT &gt; 400</Custom>
+      <Custom Action="$(var.Prefix)SchedInternetShortcuts$(var.Suffix)" Before="RemoveFolders" Overridable="yes">VersionNT &gt; 400</Custom>
+      <Custom Action="$(var.Prefix)RollbackInternetShortcuts$(var.Suffix)" Before="$(var.Prefix)CreateInternetShortcuts$(var.Suffix)" Overridable="yes">VersionNT &gt; 400</Custom>
+      <Custom Action="$(var.Prefix)CreateInternetShortcuts$(var.Suffix)" After="CreateShortcuts" Overridable="yes">VersionNT &gt; 400</Custom>
     </InstallExecuteSequence>
   </Fragment>
 
@@ -196,29 +195,29 @@
   <Fragment>
     <UIRef Id="SecureObjectsErrors" />
 
-    <CustomAction Id="SchedSecureObjects$(var.Suffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="SchedSecureObjects" Execute="immediate" Return="check" SuppressModularization="yes" />
-    <CustomAction Id="SchedSecureObjectsRollback$(var.Suffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="SchedSecureObjectsRollback" Execute="immediate" Return="check" SuppressModularization="yes" />
-    <CustomAction Id="ExecSecureObjects$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="ExecSecureObjects" Execute="deferred" Impersonate="no" Return="check" HideTarget="yes" SuppressModularization="yes" />
-    <CustomAction Id="ExecSecureObjectsRollback$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="ExecSecureObjectsRollback" Execute="rollback" Impersonate="no" Return="check" HideTarget="yes" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)SchedSecureObjects$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="SchedSecureObjects" Execute="immediate" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)SchedSecureObjectsRollback$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="SchedSecureObjectsRollback" Execute="immediate" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)ExecSecureObjects$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="ExecSecureObjects" Execute="deferred" Impersonate="no" Return="check" HideTarget="yes" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)ExecSecureObjectsRollback$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="ExecSecureObjectsRollback" Execute="rollback" Impersonate="no" Return="check" HideTarget="yes" SuppressModularization="yes" />
 
     <InstallExecuteSequence>
       <!-- Condition this so it runs on install and MMode, but not uninstall -->
-      <Custom Action="SchedSecureObjects$(var.Suffix)" After="InstallServices" Overridable="yes">NOT REMOVE~="ALL" AND VersionNT &gt; 400</Custom>
-      <Custom Action="SchedSecureObjectsRollback$(var.Suffix)" After="UnpublishFeatures" Overridable="yes">VersionNT &gt; 400</Custom>
+      <Custom Action="$(var.Prefix)SchedSecureObjects$(var.Suffix)" After="InstallServices" Overridable="yes">NOT REMOVE~="ALL" AND VersionNT &gt; 400</Custom>
+      <Custom Action="$(var.Prefix)SchedSecureObjectsRollback$(var.Suffix)" After="UnpublishFeatures" Overridable="yes">VersionNT &gt; 400</Custom>
     </InstallExecuteSequence>
   </Fragment>
 
   <Fragment>
-    <CustomAction Id="WixSchedFormatFiles$(var.Suffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="WixSchedFormatFiles" Execute="immediate" Return="check" SuppressModularization="yes" />
-    <CustomAction Id="WixExecFormatFiles$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="WixExecFormatFiles" Execute="deferred" Impersonate="no" Return="check" SuppressModularization="yes" />
-    <CustomAction Id="WixRollbackFormatFiles$(var.DeferredSuffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="WixExecFormatFiles" Execute="rollback" Impersonate="no" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)SchedFormatFiles$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixSchedFormatFiles" Execute="immediate" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)ExecFormatFiles$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixExecFormatFiles" Execute="deferred" Impersonate="no" Return="check" SuppressModularization="yes" />
+    <CustomAction Id="$(var.Prefix)RollbackFormatFiles$(var.Suffix)" BinaryKey="$(var.Prefix)UtilCA$(var.Suffix)" DllEntry="WixExecFormatFiles" Execute="rollback" Impersonate="no" Return="check" SuppressModularization="yes" />
 
     <InstallExecuteSequence>
-      <Custom Action="WixSchedFormatFiles$(var.Suffix)" After="InstallFiles" />
+      <Custom Action="$(var.Prefix)SchedFormatFiles$(var.Suffix)" After="InstallFiles" />
     </InstallExecuteSequence>
   </Fragment>
 
   <Fragment>
-    <Binary Id="UtilCA$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))utilca.dll" />
+    <Binary Id="$(var.Prefix)UtilCA$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))utilca.dll" />
   </Fragment>
 </Include>
diff --git a/src/wixlib/caDecor.wxi b/src/wixlib/caDecor.wxi
new file mode 100644
index 00000000..1d00df8f
--- /dev/null
+++ b/src/wixlib/caDecor.wxi
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <?ifdef Prefix ?>
+        <?undef Prefix ?>
+    <?endif ?>
+
+    <?define Prefix="Wix4" ?>
+
+    <?ifndef platform ?>
+        <?define platform="x86" ?>
+    <?endif ?>
+
+    <?if $(var.platform)="" ?>
+        <?undef platform ?>
+        <?define platform="x86" ?>
+    <?endif ?>
+
+    <?ifdef Suffix ?>
+        <?undef Suffix ?>
+    <?endif ?>
+
+    <?if $(var.platform)~="x86" ?>
+        <?define Suffix="_X86" ?>
+    <?endif ?>
+
+    <?if $(var.platform)~="x64" ?>
+        <?define Suffix="_X64" ?>
+    <?endif ?>
+
+    <?if $(var.platform)~="arm" ?>
+        <?define Suffix="_A32" ?>
+    <?endif ?>
+
+    <?if $(var.platform)~="arm64" ?>
+        <?define Suffix="_A64" ?>
+    <?endif ?>
+</Include>
diff --git a/src/wixlib/caSuffix.wxi b/src/wixlib/caSuffix.wxi
deleted file mode 100644
index a56a2393..00000000
--- a/src/wixlib/caSuffix.wxi
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?ifndef platform ?>
-        <?error Required value "platform" not defined in include caSuffix.wxi ?>
-    <?endif ?>
-
-    <?ifdef Suffix ?>
-        <?undef Suffix ?>
-        <?undef DeferredSuffix ?>
-    <?endif ?>
-
-    <?if $(var.platform)="x86" ?>
-        <?define Suffix="" ?>
-        <?define DeferredSuffix="" ?>
-    <?endif ?>
-
-    <?if $(var.platform)="x64" ?>
-        <?define Suffix="_x64" ?>
-        <?define DeferredSuffix="_64" ?>
-    <?endif ?>
-
-    <?if $(var.platform)="arm" ?>
-        <?define Suffix="_ARM" ?>
-        <?define DeferredSuffix="_ARM" ?>
-    <?endif ?>
-</Include>
diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj
index f9dbabb8..21d96832 100644
--- a/src/wixlib/util.wixproj
+++ b/src/wixlib/util.wixproj
@@ -33,7 +33,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="caerr.wxi" />
-    <None Include="caSuffix.wxi" />
+    <None Include="caDecor.wxi" />
     <None Include="UtilExtension_Platform.wxi" />
   </ItemGroup>
   <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' AND Exists('$(WixTargetsPath)') " />
-- 
cgit v1.2.3-55-g6feb