125 files changed, 2452 insertions, 2302 deletions

diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/BalUtil.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/BalUtil.cs
index 25257554..b4497d07 100644
--- a/src/api/burn/WixToolset.BootstrapperApplicationApi/BalUtil.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/BalUtil.cs
@@ -38,7 +38,7 @@ namespace WixToolset.BootstrapperApplicationApi
         [DllImport("mbanative.dll", ExactSpelling = true)]
         internal static extern int BalGetRelatedBundleVariableFromEngine(
             [MarshalAs(UnmanagedType.Interface)] IBootstrapperEngine pEngine,
-            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleId,
+            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
             [MarshalAs(UnmanagedType.LPWStr)] string wzVariable,
             ref StrUtil.StrHandle psczOut
             );
diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/BootstrapperApplication.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/BootstrapperApplication.cs
index f9fca748..515a68b4 100644
--- a/src/api/burn/WixToolset.BootstrapperApplicationApi/BootstrapperApplication.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/BootstrapperApplication.cs
@@ -1449,9 +1449,9 @@ namespace WixToolset.BootstrapperApplicationApi
             return args.HResult;
         }
 
-        int IBootstrapperApplication.OnDetectForwardCompatibleBundle(string wzBundleId, RelationType relationType, string wzBundleTag, bool fPerMachine, string wzVersion, bool fMissingFromCache, ref bool fCancel)
+        int IBootstrapperApplication.OnDetectForwardCompatibleBundle(string wzBundleCode, RelationType relationType, string wzBundleTag, bool fPerMachine, string wzVersion, bool fMissingFromCache, ref bool fCancel)
         {
-            DetectForwardCompatibleBundleEventArgs args = new DetectForwardCompatibleBundleEventArgs(wzBundleId, relationType, wzBundleTag, fPerMachine, wzVersion, fMissingFromCache, fCancel);
+            DetectForwardCompatibleBundleEventArgs args = new DetectForwardCompatibleBundleEventArgs(wzBundleCode, relationType, wzBundleTag, fPerMachine, wzVersion, fMissingFromCache, fCancel);
             this.OnDetectForwardCompatibleBundle(args);
 
             fCancel = args.Cancel;
@@ -1566,9 +1566,9 @@ namespace WixToolset.BootstrapperApplicationApi
             return args.HResult;
         }
 
-        int IBootstrapperApplication.OnPlanRelatedBundle(string wzBundleId, RequestState recommendedState, ref RequestState pRequestedState, ref bool fCancel)
+        int IBootstrapperApplication.OnPlanRelatedBundle(string wzBundleCode, RequestState recommendedState, ref RequestState pRequestedState, ref bool fCancel)
         {
-            PlanRelatedBundleEventArgs args = new PlanRelatedBundleEventArgs(wzBundleId, recommendedState, pRequestedState, fCancel);
+            PlanRelatedBundleEventArgs args = new PlanRelatedBundleEventArgs(wzBundleCode, recommendedState, pRequestedState, fCancel);
             this.OnPlanRelatedBundle(args);
 
             pRequestedState = args.State;
@@ -1576,9 +1576,9 @@ namespace WixToolset.BootstrapperApplicationApi
             return args.HResult;
         }
 
-        int IBootstrapperApplication.OnPlanRelatedBundleType(string wzBundleId, RelatedBundlePlanType recommendedType, ref RelatedBundlePlanType pRequestedType, ref bool fCancel)
+        int IBootstrapperApplication.OnPlanRelatedBundleType(string wzBundleCode, RelatedBundlePlanType recommendedType, ref RelatedBundlePlanType pRequestedType, ref bool fCancel)
         {
-            PlanRelatedBundleTypeEventArgs args = new PlanRelatedBundleTypeEventArgs(wzBundleId, recommendedType, pRequestedType, fCancel);
+            PlanRelatedBundleTypeEventArgs args = new PlanRelatedBundleTypeEventArgs(wzBundleCode, recommendedType, pRequestedType, fCancel);
             this.OnPlanRelatedBundleType(args);
 
             pRequestedType = args.Type;
@@ -2060,9 +2060,9 @@ namespace WixToolset.BootstrapperApplicationApi
             return args.HResult;
         }
 
-        int IBootstrapperApplication.OnPlanForwardCompatibleBundle(string wzBundleId, RelationType relationType, string wzBundleTag, bool fPerMachine, string wzVersion, bool fRecommendedIgnoreBundle, ref bool fCancel, ref bool fIgnoreBundle)
+        int IBootstrapperApplication.OnPlanForwardCompatibleBundle(string wzBundleCode, RelationType relationType, string wzBundleTag, bool fPerMachine, string wzVersion, bool fRecommendedIgnoreBundle, ref bool fCancel, ref bool fIgnoreBundle)
         {
-            PlanForwardCompatibleBundleEventArgs args = new PlanForwardCompatibleBundleEventArgs(wzBundleId, relationType, wzBundleTag, fPerMachine, wzVersion, fRecommendedIgnoreBundle, fCancel, fIgnoreBundle);
+            PlanForwardCompatibleBundleEventArgs args = new PlanForwardCompatibleBundleEventArgs(wzBundleCode, relationType, wzBundleTag, fPerMachine, wzVersion, fRecommendedIgnoreBundle, fCancel, fIgnoreBundle);
             this.OnPlanForwardCompatibleBundle(args);
 
             fCancel = args.Cancel;
@@ -2122,9 +2122,9 @@ namespace WixToolset.BootstrapperApplicationApi
             return args.HResult;
         }
 
-        int IBootstrapperApplication.OnPlanRestoreRelatedBundle(string wzBundleId, RequestState recommendedState, ref RequestState pRequestedState, ref bool fCancel)
+        int IBootstrapperApplication.OnPlanRestoreRelatedBundle(string wzBundleCode, RequestState recommendedState, ref RequestState pRequestedState, ref bool fCancel)
         {
-            PlanRestoreRelatedBundleEventArgs args = new PlanRestoreRelatedBundleEventArgs(wzBundleId, recommendedState, pRequestedState, fCancel);
+            PlanRestoreRelatedBundleEventArgs args = new PlanRestoreRelatedBundleEventArgs(wzBundleCode, recommendedState, pRequestedState, fCancel);
             this.OnPlanRestoreRelatedBundle(args);
 
             pRequestedState = args.State;
diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/Engine.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/Engine.cs
index 487858e0..44d77359 100644
--- a/src/api/burn/WixToolset.BootstrapperApplicationApi/Engine.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/Engine.cs
@@ -209,12 +209,12 @@ namespace WixToolset.BootstrapperApplicationApi
         }
 
         /// <inheritdoc/>
-        public string GetRelatedBundleVariable(string bundleId, string name)
+        public string GetRelatedBundleVariable(string bundleCode, string name)
         {
             StrUtil.StrHandle handle = new StrUtil.StrHandle();
             try
             {
-                int ret = BalUtil.BalGetRelatedBundleVariableFromEngine(this.engine, bundleId, name, ref handle);
+                int ret = BalUtil.BalGetRelatedBundleVariableFromEngine(this.engine, bundleCode, name, ref handle);
                 if (ret != NativeMethods.S_OK)
                 {
                     throw new Win32Exception(ret);
diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/EventArgs.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/EventArgs.cs
index e1649d43..4df07e57 100644
--- a/src/api/burn/WixToolset.BootstrapperApplicationApi/EventArgs.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/EventArgs.cs
@@ -325,10 +325,10 @@ namespace WixToolset.BootstrapperApplicationApi
         /// This class is for events raised by the engine.
         /// It is not intended to be instantiated by user code.
         /// </summary>
-        public DetectForwardCompatibleBundleEventArgs(string bundleId, RelationType relationType, string bundleTag, bool perMachine, string version, bool missingFromCache, bool cancelRecommendation)
+        public DetectForwardCompatibleBundleEventArgs(string bundleCode, RelationType relationType, string bundleTag, bool perMachine, string version, bool missingFromCache, bool cancelRecommendation)
             : base(cancelRecommendation)
         {
-            this.BundleId = bundleId;
+            this.BundleCode = bundleCode;
             this.RelationType = relationType;
             this.BundleTag = bundleTag;
             this.PerMachine = perMachine;
@@ -339,7 +339,11 @@ namespace WixToolset.BootstrapperApplicationApi
         /// <summary>
         /// Gets the identity of the forward compatible bundle detected.
         /// </summary>
-        public string BundleId { get; private set; }
+        public string BundleCode { get; private set; }
+
+        /// <inheritdoc cref="BundleCode" />
+        [Obsolete("Use BundleCode instead.")]
+        public string BundleId => this.BundleCode;
 
         /// <summary>
         /// Gets the relationship type of the forward compatible bundle.
@@ -807,10 +811,10 @@ namespace WixToolset.BootstrapperApplicationApi
         /// This class is for events raised by the engine.
         /// It is not intended to be instantiated by user code.
         /// </summary>
-        public PlanRelatedBundleEventArgs(string bundleId, RequestState recommendedState, RequestState state, bool cancelRecommendation)
+        public PlanRelatedBundleEventArgs(string bundleCode, RequestState recommendedState, RequestState state, bool cancelRecommendation)
             : base(cancelRecommendation)
         {
-            this.BundleId = bundleId;
+            this.BundleCode = bundleCode;
             this.RecommendedState = recommendedState;
             this.State = state;
         }
@@ -818,7 +822,11 @@ namespace WixToolset.BootstrapperApplicationApi
         /// <summary>
         /// Gets the identity of the bundle to plan for.
         /// </summary>
-        public string BundleId { get; private set; }
+        public string BundleCode { get; private set; }
+
+        /// <inheritdoc cref="BundleCode" />
+        [Obsolete("Use BundleCode instead.")]
+        public string BundleId => this.BundleCode;
 
         /// <summary>
         /// Gets the recommended requested state for the bundle.
@@ -841,10 +849,10 @@ namespace WixToolset.BootstrapperApplicationApi
         /// This class is for events raised by the engine.
         /// It is not intended to be instantiated by user code.
         /// </summary>
-        public PlanRelatedBundleTypeEventArgs(string bundleId, RelatedBundlePlanType recommendedType, RelatedBundlePlanType type, bool cancelRecommendation)
+        public PlanRelatedBundleTypeEventArgs(string bundleCode, RelatedBundlePlanType recommendedType, RelatedBundlePlanType type, bool cancelRecommendation)
             : base(cancelRecommendation)
         {
-            this.BundleId = bundleId;
+            this.BundleCode = bundleCode;
             this.RecommendedType = recommendedType;
             this.Type = type;
         }
@@ -852,7 +860,11 @@ namespace WixToolset.BootstrapperApplicationApi
         /// <summary>
         /// Gets the identity of the bundle to plan for.
         /// </summary>
-        public string BundleId { get; private set; }
+        public string BundleCode { get; private set; }
+
+        /// <inheritdoc cref="BundleCode" />
+        [Obsolete("Use BundleCode instead.")]
+        public string BundleId => this.BundleCode;
 
         /// <summary>
         /// Gets the recommended plan type for the bundle.
@@ -1327,10 +1339,10 @@ namespace WixToolset.BootstrapperApplicationApi
         /// This class is for events raised by the engine.
         /// It is not intended to be instantiated by user code.
         /// </summary>
-        public PlanForwardCompatibleBundleEventArgs(string bundleId, RelationType relationType, string bundleTag, bool perMachine, string version, bool recommendedIgnoreBundle, bool cancelRecommendation, bool ignoreBundle)
+        public PlanForwardCompatibleBundleEventArgs(string bundleCode, RelationType relationType, string bundleTag, bool perMachine, string version, bool recommendedIgnoreBundle, bool cancelRecommendation, bool ignoreBundle)
             : base(cancelRecommendation)
         {
-            this.BundleId = bundleId;
+            this.BundleCode = bundleCode;
             this.RelationType = relationType;
             this.BundleTag = bundleTag;
             this.PerMachine = perMachine;
@@ -1342,7 +1354,11 @@ namespace WixToolset.BootstrapperApplicationApi
         /// <summary>
         /// Gets the identity of the forward compatible bundle detected.
         /// </summary>
-        public string BundleId { get; private set; }
+        public string BundleCode { get; private set; }
+
+        /// <inheritdoc cref="BundleCode" />
+        [Obsolete("Use BundleCode instead.")]
+        public string BundleId => this.BundleCode;
 
         /// <summary>
         /// Gets the relationship type of the forward compatible bundle.
@@ -2624,10 +2640,10 @@ namespace WixToolset.BootstrapperApplicationApi
         /// This class is for events raised by the engine.
         /// It is not intended to be instantiated by user code.
         /// </summary>
-        public PlanRestoreRelatedBundleEventArgs(string bundleId, RequestState recommendedState, RequestState state, bool cancelRecommendation)
+        public PlanRestoreRelatedBundleEventArgs(string bundleCode, RequestState recommendedState, RequestState state, bool cancelRecommendation)
             : base(cancelRecommendation)
         {
-            this.BundleId = bundleId;
+            this.BundleCode = bundleCode;
             this.RecommendedState = recommendedState;
             this.State = state;
         }
@@ -2635,7 +2651,11 @@ namespace WixToolset.BootstrapperApplicationApi
         /// <summary>
         /// Gets the identity of the bundle to plan for.
         /// </summary>
-        public string BundleId { get; private set; }
+        public string BundleCode { get; private set; }
+
+        /// <inheritdoc cref="BundleCode" />
+        [Obsolete("Use BundleCode instead.")]
+        public string BundleId => this.BundleCode;
 
         /// <summary>
         /// Gets the recommended requested state for the bundle.
diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperApplication.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperApplication.cs
index ad7f8dd7..c2b43c15 100644
--- a/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperApplication.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperApplication.cs
@@ -80,7 +80,7 @@ namespace WixToolset.BootstrapperApplicationApi
         [PreserveSig]
         [return: MarshalAs(UnmanagedType.I4)]
         int OnDetectForwardCompatibleBundle(
-            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleId,
+            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
             [MarshalAs(UnmanagedType.U4)] RelationType relationType,
             [MarshalAs(UnmanagedType.LPWStr)] string wzBundleTag,
             [MarshalAs(UnmanagedType.Bool)] bool fPerMachine,
@@ -135,7 +135,7 @@ namespace WixToolset.BootstrapperApplicationApi
         [PreserveSig]
         [return: MarshalAs(UnmanagedType.I4)]
         int OnDetectRelatedBundle(
-            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleId,
+            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
             [MarshalAs(UnmanagedType.U4)] RelationType relationType,
             [MarshalAs(UnmanagedType.LPWStr)] string wzBundleTag,
             [MarshalAs(UnmanagedType.Bool)] bool fPerMachine,
@@ -243,7 +243,7 @@ namespace WixToolset.BootstrapperApplicationApi
         [PreserveSig]
         [return: MarshalAs(UnmanagedType.I4)]
         int OnPlanRelatedBundle(
-            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleId,
+            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
             [MarshalAs(UnmanagedType.U4)] RequestState recommendedState,
             [MarshalAs(UnmanagedType.U4)] ref RequestState pRequestedState,
             [MarshalAs(UnmanagedType.Bool)] ref bool fCancel
@@ -869,7 +869,7 @@ namespace WixToolset.BootstrapperApplicationApi
         [PreserveSig]
         [return: MarshalAs(UnmanagedType.I4)]
         int OnPlanForwardCompatibleBundle(
-            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleId,
+            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
             [MarshalAs(UnmanagedType.U4)] RelationType relationType,
             [MarshalAs(UnmanagedType.LPWStr)] string wzBundleTag,
             [MarshalAs(UnmanagedType.Bool)] bool fPerMachine,
@@ -957,7 +957,7 @@ namespace WixToolset.BootstrapperApplicationApi
         [PreserveSig]
         [return: MarshalAs(UnmanagedType.I4)]
         int OnPlanRestoreRelatedBundle(
-            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleId,
+            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
             [MarshalAs(UnmanagedType.U4)] RequestState recommendedState,
             [MarshalAs(UnmanagedType.U4)] ref RequestState pRequestedState,
             [MarshalAs(UnmanagedType.Bool)] ref bool fCancel
@@ -969,7 +969,7 @@ namespace WixToolset.BootstrapperApplicationApi
         [PreserveSig]
         [return: MarshalAs(UnmanagedType.I4)]
         int OnPlanRelatedBundleType(
-            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleId,
+            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
             [MarshalAs(UnmanagedType.U4)] RelatedBundlePlanType recommendedType,
             [MarshalAs(UnmanagedType.U4)] ref RelatedBundlePlanType pRequestedType,
             [MarshalAs(UnmanagedType.Bool)] ref bool fCancel
@@ -1004,7 +1004,7 @@ namespace WixToolset.BootstrapperApplicationApi
         [return: MarshalAs(UnmanagedType.I4)]
         int OnDetectRelatedBundlePackage(
             [MarshalAs(UnmanagedType.LPWStr)] string wzPackageId,
-            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleId,
+            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
             [MarshalAs(UnmanagedType.U4)] RelationType relationType,
             [MarshalAs(UnmanagedType.Bool)] bool fPerMachine,
             [MarshalAs(UnmanagedType.LPWStr)] string wzVersion,
diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperEngine.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperEngine.cs
index 1e91cd31..c7b0c003 100644
--- a/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperEngine.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperEngine.cs
@@ -236,7 +236,7 @@ namespace WixToolset.BootstrapperApplicationApi
         /// </summary>
         [PreserveSig]
         int GetRelatedBundleVariable(
-            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleId,
+            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleCode,
             [MarshalAs(UnmanagedType.LPWStr)] string wzVariable,
                                               IntPtr wzValue,
                                           ref IntPtr pcchValue
diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/IEngine.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/IEngine.cs
index 8e6a293b..bd78409b 100644
--- a/src/api/burn/WixToolset.BootstrapperApplicationApi/IEngine.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/IEngine.cs
@@ -107,9 +107,9 @@ namespace WixToolset.BootstrapperApplicationApi
         /// <summary>
         /// Gets persisted variables from a related bundle.
         /// </summary>
-        /// <param name="bundleId">The BundleId of the related bundle.</param>
+        /// <param name="bundleCode">The bundle code of the related bundle.</param>
         /// <param name="name">The name of the variable.</param>
-        string GetRelatedBundleVariable(string bundleId, string name);
+        string GetRelatedBundleVariable(string bundleCode, string name);
 
         /// <summary>
         /// Launches a preapproved executable elevated.  As long as the engine already elevated, there will be no UAC prompt.
diff --git a/src/api/burn/balutil/BalBootstrapperEngine.cpp b/src/api/burn/balutil/BalBootstrapperEngine.cpp
index 28608cb9..61e7e31b 100644
--- a/src/api/burn/balutil/BalBootstrapperEngine.cpp
+++ b/src/api/burn/balutil/BalBootstrapperEngine.cpp
@@ -319,7 +319,7 @@ public: // IBootstrapperEngine
     }
 
     virtual STDMETHODIMP GetRelatedBundleVariable(
-        __in_z LPCWSTR wzBundleId,
+        __in_z LPCWSTR wzBundleCode,
         __in_z LPCWSTR wzVariable,
         __out_ecount_opt(*pcchValue) LPWSTR wzValue,
         __inout SIZE_T* pcchValue
@@ -338,7 +338,7 @@ public: // IBootstrapperEngine
 
         // Init send structs.
         args.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION;
-        args.wzBundleId = wzBundleId;
+        args.wzBundleCode = wzBundleCode;
         args.wzVariable = wzVariable;
 
         results.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION;
@@ -349,8 +349,8 @@ public: // IBootstrapperEngine
         hr = BuffWriteNumberToBuffer(&bufferArgs, args.dwApiVersion);
         ExitOnFailure(hr, "Failed to write API version of GetRelatedBundleVariable args.");
 
-        hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleId);
-        ExitOnFailure(hr, "Failed to write bundle id of GetRelatedBundleVariable args.");
+        hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleCode);
+        ExitOnFailure(hr, "Failed to write bundle code of GetRelatedBundleVariable args.");
 
         hr = BuffWriteStringToBuffer(&bufferArgs, args.wzVariable);
         ExitOnFailure(hr, "Failed to write variable name of GetRelatedBundleVariable args.");
diff --git a/src/api/burn/balutil/balutil.cpp b/src/api/burn/balutil/balutil.cpp
index 716f82d3..3cca38a4 100644
--- a/src/api/burn/balutil/balutil.cpp
+++ b/src/api/burn/balutil/balutil.cpp
@@ -551,7 +551,7 @@ LExit:
 }
 
 DAPI_(HRESULT) BalGetRelatedBundleVariable(
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in_z LPCWSTR wzVariable,
     __inout LPWSTR* psczValue
 )
@@ -564,7 +564,7 @@ DAPI_(HRESULT) BalGetRelatedBundleVariable(
         ExitOnRootFailure(hr, "BalInitialize() must be called first.");
     }
 
-    hr = BalGetRelatedBundleVariableFromEngine(vpEngine, wzBundleId, wzVariable, psczValue);
+    hr = BalGetRelatedBundleVariableFromEngine(vpEngine, wzBundleCode, wzVariable, psczValue);
 
 LExit:
     return hr;
@@ -572,7 +572,7 @@ LExit:
 
 DAPI_(HRESULT) BalGetRelatedBundleVariableFromEngine(
     __in IBootstrapperEngine* pEngine,
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in_z LPCWSTR wzVariable,
     __inout LPWSTR* psczValue
 )
@@ -586,7 +586,7 @@ DAPI_(HRESULT) BalGetRelatedBundleVariableFromEngine(
         ExitOnFailure(hr, "Failed to determine length of value.");
     }
 
-    hr = pEngine->GetRelatedBundleVariable(wzBundleId, wzVariable, *psczValue, &cch);
+    hr = pEngine->GetRelatedBundleVariable(wzBundleCode, wzVariable, *psczValue, &cch);
     if (E_MOREDATA == hr)
     {
         ++cch;
@@ -594,7 +594,7 @@ DAPI_(HRESULT) BalGetRelatedBundleVariableFromEngine(
         hr = StrAllocSecure(psczValue, cch);
         ExitOnFailure(hr, "Failed to allocate value.");
 
-        hr = pEngine->GetRelatedBundleVariable(wzBundleId, wzVariable, *psczValue, &cch);
+        hr = pEngine->GetRelatedBundleVariable(wzBundleCode, wzVariable, *psczValue, &cch);
     }
 
 LExit:
diff --git a/src/api/burn/balutil/inc/BootstrapperApplicationBase.h b/src/api/burn/balutil/inc/BootstrapperApplicationBase.h
index a3a3643f..80bfd361 100644
--- a/src/api/burn/balutil/inc/BootstrapperApplicationBase.h
+++ b/src/api/burn/balutil/inc/BootstrapperApplicationBase.h
@@ -129,7 +129,7 @@ public: // IBootstrapperApplication
     }
 
     virtual STDMETHODIMP OnDetectForwardCompatibleBundle(
-        __in_z LPCWSTR /*wzBundleId*/,
+        __in_z LPCWSTR /*wzBundleCode*/,
         __in BOOTSTRAPPER_RELATION_TYPE /*relationType*/,
         __in_z LPCWSTR /*wzBundleTag*/,
         __in BOOL /*fPerMachine*/,
@@ -179,7 +179,7 @@ public: // IBootstrapperApplication
     }
 
     virtual STDMETHODIMP OnDetectRelatedBundle(
-        __in_z LPCWSTR /*wzBundleId*/,
+        __in_z LPCWSTR /*wzBundleCode*/,
         __in BOOTSTRAPPER_RELATION_TYPE /*relationType*/,
         __in_z LPCWSTR /*wzBundleTag*/,
         __in BOOL /*fPerMachine*/,
@@ -276,7 +276,7 @@ public: // IBootstrapperApplication
     }
 
     virtual STDMETHODIMP OnPlanRelatedBundle(
-        __in_z LPCWSTR /*wzBundleId*/,
+        __in_z LPCWSTR /*wzBundleCode*/,
         __in BOOTSTRAPPER_REQUEST_STATE /*recommendedState*/,
         __inout BOOTSTRAPPER_REQUEST_STATE* /*pRequestedState*/,
         __inout BOOL* pfCancel
@@ -995,7 +995,7 @@ public: // IBootstrapperApplication
     }
 
     virtual STDMETHODIMP OnPlanForwardCompatibleBundle(
-        __in_z LPCWSTR /*wzBundleId*/,
+        __in_z LPCWSTR /*wzBundleCode*/,
         __in BOOTSTRAPPER_RELATION_TYPE /*relationType*/,
         __in_z LPCWSTR /*wzBundleTag*/,
         __in BOOL /*fPerMachine*/,
@@ -1074,7 +1074,7 @@ public: // IBootstrapperApplication
     }
 
     virtual STDMETHODIMP OnPlanRestoreRelatedBundle(
-        __in_z LPCWSTR /*wzBundleId*/,
+        __in_z LPCWSTR /*wzBundleCode*/,
         __in BOOTSTRAPPER_REQUEST_STATE /*recommendedState*/,
         __inout BOOTSTRAPPER_REQUEST_STATE* /*pRequestedState*/,
         __inout BOOL* pfCancel
@@ -1085,7 +1085,7 @@ public: // IBootstrapperApplication
     }
 
     virtual STDMETHODIMP OnPlanRelatedBundleType(
-        __in_z LPCWSTR /*wzBundleId*/,
+        __in_z LPCWSTR /*wzBundleCode*/,
         __in BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE /*recommendedType*/,
         __inout BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE* /*pRequestedType*/,
         __inout BOOL* pfCancel
@@ -1115,7 +1115,7 @@ public: // IBootstrapperApplication
 
     virtual STDMETHODIMP OnDetectRelatedBundlePackage(
         __in_z LPCWSTR /*wzPackageId*/,
-        __in_z LPCWSTR /*wzBundleId*/,
+        __in_z LPCWSTR /*wzBundleCode*/,
         __in BOOTSTRAPPER_RELATION_TYPE /*relationType*/,
         __in BOOL /*fPerMachine*/,
         __in_z LPCWSTR /*wzVersion*/,
diff --git a/src/api/burn/balutil/inc/IBootstrapperApplication.h b/src/api/burn/balutil/inc/IBootstrapperApplication.h
index a08f6863..a3b24bc3 100644
--- a/src/api/burn/balutil/inc/IBootstrapperApplication.h
+++ b/src/api/burn/balutil/inc/IBootstrapperApplication.h
@@ -56,7 +56,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
 
     // OnDetectForwardCompatibleBundle - called when the engine detects a forward compatible bundle.
     STDMETHOD(OnDetectForwardCompatibleBundle)(
-        __in_z LPCWSTR wzBundleId,
+        __in_z LPCWSTR wzBundleCode,
         __in BOOTSTRAPPER_RELATION_TYPE relationType,
         __in_z LPCWSTR wzBundleTag,
         __in BOOL fPerMachine,
@@ -95,7 +95,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
 
     // OnDetectRelatedBundle - called when the engine detects a related bundle.
     STDMETHOD(OnDetectRelatedBundle)(
-        __in_z LPCWSTR wzBundleId,
+        __in_z LPCWSTR wzBundleCode,
         __in BOOTSTRAPPER_RELATION_TYPE relationType,
         __in_z LPCWSTR wzBundleTag,
         __in BOOL fPerMachine,
@@ -170,7 +170,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
 
     // OnPlanRelatedBundle - called when the engine begins planning a related bundle.
     STDMETHOD(OnPlanRelatedBundle)(
-        __in_z LPCWSTR wzBundleId,
+        __in_z LPCWSTR wzBundleCode,
         __in BOOTSTRAPPER_REQUEST_STATE recommendedState,
         __inout BOOTSTRAPPER_REQUEST_STATE* pRequestedState,
         __inout BOOL* pfCancel
@@ -649,7 +649,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
         ) = 0;
 
     STDMETHOD(OnPlanForwardCompatibleBundle)(
-        __in_z LPCWSTR wzBundleId,
+        __in_z LPCWSTR wzBundleCode,
         __in BOOTSTRAPPER_RELATION_TYPE relationType,
         __in_z LPCWSTR wzBundleTag,
         __in BOOL fPerMachine,
@@ -703,7 +703,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
 
     // OnPlanRestoreRelatedBundle - called when the engine begins planning an upgrade related bundle for restoring in case of failure.
     STDMETHOD(OnPlanRestoreRelatedBundle)(
-        __in_z LPCWSTR wzBundleId,
+        __in_z LPCWSTR wzBundleCode,
         __in BOOTSTRAPPER_REQUEST_STATE recommendedState,
         __inout BOOTSTRAPPER_REQUEST_STATE* pRequestedState,
         __inout BOOL* pfCancel
@@ -711,7 +711,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
 
     // OnPlanRelatedBundleType - called when the engine begins planning the related bundle relation type.
     STDMETHOD(OnPlanRelatedBundleType)(
-        __in_z LPCWSTR wzBundleId,
+        __in_z LPCWSTR wzBundleCode,
         __in BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE recommendedType,
         __inout BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE* pRequestedType,
         __inout BOOL* pfCancel
@@ -736,7 +736,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
     // OnDetectRelatedBundlePackage - called when the engine detects a related bundle for a BundlePackage.
     STDMETHOD(OnDetectRelatedBundlePackage)(
         __in_z LPCWSTR wzPackageId,
-        __in_z LPCWSTR wzBundleId,
+        __in_z LPCWSTR wzBundleCode,
         __in BOOTSTRAPPER_RELATION_TYPE relationType,
         __in BOOL fPerMachine,
         __in_z LPCWSTR wzVersion,
diff --git a/src/api/burn/balutil/inc/IBootstrapperEngine.h b/src/api/burn/balutil/inc/IBootstrapperEngine.h
index 02094aa5..57fc9be9 100644
--- a/src/api/burn/balutil/inc/IBootstrapperEngine.h
+++ b/src/api/burn/balutil/inc/IBootstrapperEngine.h
@@ -142,7 +142,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperEngine, IUnknown, "6480D616-27A0-44D7-905B-8
         ) = 0;
 
     STDMETHOD(GetRelatedBundleVariable)(
-        __in_z LPCWSTR wzBundleId,
+        __in_z LPCWSTR wzBundleCode,
         __in_z LPCWSTR wzVariable,
         __out_ecount_opt(*pcchValue) LPWSTR wzValue,
         __inout SIZE_T* pcchValue
diff --git a/src/api/burn/balutil/inc/balutil.h b/src/api/burn/balutil/inc/balutil.h
index 03575883..4c8550ee 100644
--- a/src/api/burn/balutil/inc/balutil.h
+++ b/src/api/burn/balutil/inc/balutil.h
@@ -141,7 +141,7 @@ BalGetRelatedBundleVariable - gets a string from a shared variable in the engine
 Note: Use StrFree() to release psczValue.
 ********************************************************************/
 DAPI_(HRESULT) BalGetRelatedBundleVariable(
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in_z LPCWSTR wzVariable,
     __inout LPWSTR* psczValue
 );
@@ -153,7 +153,7 @@ BalGetRelatedBundleVariableFromEngine - gets a string from a shared variable in
 ********************************************************************/
 DAPI_(HRESULT) BalGetRelatedBundleVariableFromEngine(
     __in IBootstrapperEngine* pEngine,
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in_z LPCWSTR wzVariable,
     __inout LPWSTR* psczValue
 );
diff --git a/src/api/burn/balutil/msg.cpp b/src/api/burn/balutil/msg.cpp
index 690108a5..b728cc83 100644
--- a/src/api/burn/balutil/msg.cpp
+++ b/src/api/burn/balutil/msg.cpp
@@ -1768,7 +1768,7 @@ static HRESULT OnDetectForwardCompatibleBundle(
     HRESULT hr = S_OK;
     BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_ARGS args = { };
     BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_RESULTS results = { };
-    LPWSTR sczBundleId = NULL;
+    LPWSTR sczBundleCode = NULL;
     LPWSTR sczBundleTag = NULL;
     LPWSTR sczVersion = NULL;
 
@@ -1776,10 +1776,10 @@ static HRESULT OnDetectForwardCompatibleBundle(
     hr = BuffReaderReadNumber(pReaderArgs, &args.dwApiVersion);
     ExitOnFailure(hr, "Failed to read API version of OnDetectForwardCompatibleBundle args.");
 
-    hr = BuffReaderReadString(pReaderArgs, &sczBundleId);
-    ExitOnFailure(hr, "Failed to read bundle id of OnDetectForwardCompatibleBundle args.");
+    hr = BuffReaderReadString(pReaderArgs, &sczBundleCode);
+    ExitOnFailure(hr, "Failed to read bundle code of OnDetectForwardCompatibleBundle args.");
 
-    args.wzBundleId = sczBundleId;
+    args.wzBundleCode = sczBundleCode;
 
     hr = BuffReaderReadNumber(pReaderArgs, reinterpret_cast<DWORD*>(&args.relationType));
     ExitOnFailure(hr, "Failed to read relation type of OnDetectForwardCompatibleBundle args.");
@@ -1809,7 +1809,7 @@ static HRESULT OnDetectForwardCompatibleBundle(
 
     if (E_NOTIMPL == hr)
     {
-        hr = pApplication->OnDetectForwardCompatibleBundle(args.wzBundleId, args.relationType, args.wzBundleTag, args.fPerMachine, args.wzVersion, args.fMissingFromCache, &results.fCancel);
+        hr = pApplication->OnDetectForwardCompatibleBundle(args.wzBundleCode, args.relationType, args.wzBundleTag, args.fPerMachine, args.wzVersion, args.fMissingFromCache, &results.fCancel);
     }
 
     pApplication->BAProcFallback(BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTFORWARDCOMPATIBLEBUNDLE, &args, &results, &hr);
@@ -1825,7 +1825,7 @@ static HRESULT OnDetectForwardCompatibleBundle(
 LExit:
     ReleaseStr(sczVersion);
     ReleaseStr(sczBundleTag);
-    ReleaseStr(sczBundleId);
+    ReleaseStr(sczBundleCode);
     return hr;
 }
 
@@ -1999,7 +1999,7 @@ static HRESULT OnDetectRelatedBundle(
     HRESULT hr = S_OK;
     BA_ONDETECTRELATEDBUNDLE_ARGS args = { };
     BA_ONDETECTRELATEDBUNDLE_RESULTS results = { };
-    LPWSTR sczBundleId = NULL;
+    LPWSTR sczBundleCode = NULL;
     LPWSTR sczBundleTag = NULL;
     LPWSTR sczVersion = NULL;
 
@@ -2007,10 +2007,10 @@ static HRESULT OnDetectRelatedBundle(
     hr = BuffReaderReadNumber(pReaderArgs, &args.dwApiVersion);
     ExitOnFailure(hr, "Failed to read API version of OnDetectRelatedBundle args.");
 
-    hr = BuffReaderReadString(pReaderArgs, &sczBundleId);
-    ExitOnFailure(hr, "Failed to read bundle id of OnDetectRelatedBundle args.");
+    hr = BuffReaderReadString(pReaderArgs, &sczBundleCode);
+    ExitOnFailure(hr, "Failed to read bundle code of OnDetectRelatedBundle args.");
 
-    args.wzBundleId = sczBundleId;
+    args.wzBundleCode = sczBundleCode;
 
     hr = BuffReaderReadNumber(pReaderArgs, reinterpret_cast<DWORD*>(&args.relationType));
     ExitOnFailure(hr, "Failed to read relation type of OnDetectRelatedBundle args.");
@@ -2040,7 +2040,7 @@ static HRESULT OnDetectRelatedBundle(
 
     if (E_NOTIMPL == hr)
     {
-        hr = pApplication->OnDetectRelatedBundle(args.wzBundleId, args.relationType, args.wzBundleTag, args.fPerMachine, args.wzVersion, args.fMissingFromCache, &results.fCancel);
+        hr = pApplication->OnDetectRelatedBundle(args.wzBundleCode, args.relationType, args.wzBundleTag, args.fPerMachine, args.wzVersion, args.fMissingFromCache, &results.fCancel);
     }
 
     pApplication->BAProcFallback(BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDBUNDLE, &args, &results, &hr);
@@ -2056,7 +2056,7 @@ static HRESULT OnDetectRelatedBundle(
 LExit:
     ReleaseStr(sczVersion);
     ReleaseStr(sczBundleTag);
-    ReleaseStr(sczBundleId);
+    ReleaseStr(sczBundleCode);
     return hr;
 }
 
@@ -2071,7 +2071,7 @@ static HRESULT OnDetectRelatedBundlePackage(
     BA_ONDETECTRELATEDBUNDLEPACKAGE_ARGS args = { };
     BA_ONDETECTRELATEDBUNDLEPACKAGE_RESULTS results = { };
     LPWSTR sczPackageId = NULL;
-    LPWSTR sczBundleId = NULL;
+    LPWSTR sczBundleCode = NULL;
     LPWSTR sczVersion = NULL;
 
     // Read args.
@@ -2083,10 +2083,10 @@ static HRESULT OnDetectRelatedBundlePackage(
 
     args.wzPackageId = sczPackageId;
 
-    hr = BuffReaderReadString(pReaderArgs, &sczBundleId);
-    ExitOnFailure(hr, "Failed to read bundle id of OnDetectRelatedBundlePackage args.");
+    hr = BuffReaderReadString(pReaderArgs, &sczBundleCode);
+    ExitOnFailure(hr, "Failed to read bundle code of OnDetectRelatedBundlePackage args.");
 
-    args.wzBundleId = sczBundleId;
+    args.wzBundleCode = sczBundleCode;
 
     hr = BuffReaderReadNumber(pReaderArgs, reinterpret_cast<DWORD*>(&args.relationType));
     ExitOnFailure(hr, "Failed to read relation type of OnDetectRelatedBundlePackage args.");
@@ -2108,7 +2108,7 @@ static HRESULT OnDetectRelatedBundlePackage(
 
     if (E_NOTIMPL == hr)
     {
-        hr = pApplication->OnDetectRelatedBundlePackage(args.wzPackageId, args.wzBundleId, args.relationType, args.fPerMachine, args.wzVersion, &results.fCancel);
+        hr = pApplication->OnDetectRelatedBundlePackage(args.wzPackageId, args.wzBundleCode, args.relationType, args.fPerMachine, args.wzVersion, &results.fCancel);
     }
 
     pApplication->BAProcFallback(BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDBUNDLEPACKAGE, &args, &results, &hr);
@@ -2123,7 +2123,7 @@ static HRESULT OnDetectRelatedBundlePackage(
 
 LExit:
     ReleaseStr(sczVersion);
-    ReleaseStr(sczBundleId);
+    ReleaseStr(sczBundleCode);
     ReleaseStr(sczPackageId);
     return hr;
 }
@@ -3650,7 +3650,7 @@ static HRESULT OnPlanForwardCompatibleBundle(
     HRESULT hr = S_OK;
     BA_ONPLANFORWARDCOMPATIBLEBUNDLE_ARGS args = { };
     BA_ONPLANFORWARDCOMPATIBLEBUNDLE_RESULTS results = { };
-    LPWSTR sczBundleId = NULL;
+    LPWSTR sczBundleCode = NULL;
     LPWSTR sczBundleTag = NULL;
     LPWSTR sczVersion = NULL;
 
@@ -3658,10 +3658,10 @@ static HRESULT OnPlanForwardCompatibleBundle(
     hr = BuffReaderReadNumber(pReaderArgs, &args.dwApiVersion);
     ExitOnFailure(hr, "Failed to read API version of OnPlanForwardCompatibleBundle args.");
 
-    hr = BuffReaderReadString(pReaderArgs, &sczBundleId);
-    ExitOnFailure(hr, "Failed to read bundle id of OnPlanForwardCompatibleBundle args.");
+    hr = BuffReaderReadString(pReaderArgs, &sczBundleCode);
+    ExitOnFailure(hr, "Failed to read bundle code of OnPlanForwardCompatibleBundle args.");
 
-    args.wzBundleId = sczBundleId;
+    args.wzBundleCode = sczBundleCode;
 
     hr = BuffReaderReadNumber(pReaderArgs, reinterpret_cast<DWORD*>(&args.relationType));
     ExitOnFailure(hr, "Failed to read relation type of OnPlanForwardCompatibleBundle args.");
@@ -3694,7 +3694,7 @@ static HRESULT OnPlanForwardCompatibleBundle(
 
     if (E_NOTIMPL == hr)
     {
-        hr = pApplication->OnPlanForwardCompatibleBundle(args.wzBundleId, args.relationType, args.wzBundleTag, args.fPerMachine, args.wzVersion, args.fRecommendedIgnoreBundle, &results.fCancel, &results.fIgnoreBundle);
+        hr = pApplication->OnPlanForwardCompatibleBundle(args.wzBundleCode, args.relationType, args.wzBundleTag, args.fPerMachine, args.wzVersion, args.fRecommendedIgnoreBundle, &results.fCancel, &results.fIgnoreBundle);
     }
 
     pApplication->BAProcFallback(BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANFORWARDCOMPATIBLEBUNDLE, &args, &results, &hr);
@@ -3713,7 +3713,7 @@ static HRESULT OnPlanForwardCompatibleBundle(
 LExit:
     ReleaseStr(sczVersion);
     ReleaseStr(sczBundleTag);
-    ReleaseStr(sczBundleId);
+    ReleaseStr(sczBundleCode);
     return hr;
 }
 
@@ -4049,16 +4049,16 @@ static HRESULT OnPlanRelatedBundle(
     HRESULT hr = S_OK;
     BA_ONPLANRELATEDBUNDLE_ARGS args = { };
     BA_ONPLANRELATEDBUNDLE_RESULTS results = { };
-    LPWSTR sczBundleId = NULL;
+    LPWSTR sczBundleCode = NULL;
 
     // Read args.
     hr = BuffReaderReadNumber(pReaderArgs, &args.dwApiVersion);
     ExitOnFailure(hr, "Failed to read API version of OnPlanRelatedBundle args.");
 
-    hr = BuffReaderReadString(pReaderArgs, &sczBundleId);
+    hr = BuffReaderReadString(pReaderArgs, &sczBundleCode);
     ExitOnFailure(hr, "Failed to read package id of OnPlanRelatedBundle args.");
 
-    args.wzBundleId = sczBundleId;
+    args.wzBundleCode = sczBundleCode;
 
     hr = BuffReaderReadNumber(pReaderArgs, reinterpret_cast<DWORD*>(&args.recommendedState));
     ExitOnFailure(hr, "Failed to read recommended state of OnPlanRelatedBundle args.");
@@ -4075,7 +4075,7 @@ static HRESULT OnPlanRelatedBundle(
 
     if (E_NOTIMPL == hr)
     {
-        hr = pApplication->OnPlanRelatedBundle(args.wzBundleId, args.recommendedState, &results.requestedState, &results.fCancel);
+        hr = pApplication->OnPlanRelatedBundle(args.wzBundleCode, args.recommendedState, &results.requestedState, &results.fCancel);
     }
 
     pApplication->BAProcFallback(BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANRELATEDBUNDLE, &args, &results, &hr);
@@ -4092,7 +4092,7 @@ static HRESULT OnPlanRelatedBundle(
     ExitOnFailure(hr, "Failed to write requested state of OnPlanRelatedBundle struct.");
 
 LExit:
-    ReleaseStr(sczBundleId);
+    ReleaseStr(sczBundleCode);
     return hr;
 }
 
@@ -4106,16 +4106,16 @@ static HRESULT OnPlanRelatedBundleType(
     HRESULT hr = S_OK;
     BA_ONPLANRELATEDBUNDLETYPE_ARGS args = { };
     BA_ONPLANRELATEDBUNDLETYPE_RESULTS results = { };
-    LPWSTR sczBundleId = NULL;
+    LPWSTR sczBundleCode = NULL;
 
     // Read args.
     hr = BuffReaderReadNumber(pReaderArgs, &args.dwApiVersion);
     ExitOnFailure(hr, "Failed to read API version of OnPlanRelatedBundleType args.");
 
-    hr = BuffReaderReadString(pReaderArgs, &sczBundleId);
+    hr = BuffReaderReadString(pReaderArgs, &sczBundleCode);
     ExitOnFailure(hr, "Failed to read package id of OnPlanRelatedBundleType args.");
 
-    args.wzBundleId = sczBundleId;
+    args.wzBundleCode = sczBundleCode;
 
     hr = BuffReaderReadNumber(pReaderArgs, reinterpret_cast<DWORD*>(&args.recommendedType));
     ExitOnFailure(hr, "Failed to read recommended type of OnPlanRelatedBundleType args.");
@@ -4132,7 +4132,7 @@ static HRESULT OnPlanRelatedBundleType(
 
     if (E_NOTIMPL == hr)
     {
-        hr = pApplication->OnPlanRelatedBundleType(args.wzBundleId, args.recommendedType, &results.requestedType, &results.fCancel);
+        hr = pApplication->OnPlanRelatedBundleType(args.wzBundleCode, args.recommendedType, &results.requestedType, &results.fCancel);
     }
 
     pApplication->BAProcFallback(BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANRELATEDBUNDLETYPE, &args, &results, &hr);
@@ -4149,7 +4149,7 @@ static HRESULT OnPlanRelatedBundleType(
     ExitOnFailure(hr, "Failed to write requested type of OnPlanRelatedBundleType struct.");
 
 LExit:
-    ReleaseStr(sczBundleId);
+    ReleaseStr(sczBundleCode);
     return hr;
 }
 
@@ -4163,16 +4163,16 @@ static HRESULT OnPlanRestoreRelatedBundle(
     HRESULT hr = S_OK;
     BA_ONPLANRESTORERELATEDBUNDLE_ARGS args = { };
     BA_ONPLANRESTORERELATEDBUNDLE_RESULTS results = { };
-    LPWSTR sczBundleId = NULL;
+    LPWSTR sczBundleCode = NULL;
 
     // Read args.
     hr = BuffReaderReadNumber(pReaderArgs, &args.dwApiVersion);
     ExitOnFailure(hr, "Failed to read API version of OnPlanRestoreRelatedBundle args.");
 
-    hr = BuffReaderReadString(pReaderArgs, &sczBundleId);
+    hr = BuffReaderReadString(pReaderArgs, &sczBundleCode);
     ExitOnFailure(hr, "Failed to read package id of OnPlanRestoreRelatedBundle args.");
 
-    args.wzBundleId = sczBundleId;
+    args.wzBundleCode = sczBundleCode;
 
     hr = BuffReaderReadNumber(pReaderArgs, reinterpret_cast<DWORD*>(&args.recommendedState));
     ExitOnFailure(hr, "Failed to read recommended state of OnPlanRestoreRelatedBundle args.");
@@ -4189,7 +4189,7 @@ static HRESULT OnPlanRestoreRelatedBundle(
 
     if (E_NOTIMPL == hr)
     {
-        hr = pApplication->OnPlanRestoreRelatedBundle(args.wzBundleId, args.recommendedState, &results.requestedState, &results.fCancel);
+        hr = pApplication->OnPlanRestoreRelatedBundle(args.wzBundleCode, args.recommendedState, &results.requestedState, &results.fCancel);
     }
 
     pApplication->BAProcFallback(BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANRESTORERELATEDBUNDLE, &args, &results, &hr);
@@ -4206,7 +4206,7 @@ static HRESULT OnPlanRestoreRelatedBundle(
     ExitOnFailure(hr, "Failed to write requested state of OnPlanRestoreRelatedBundle struct.");
 
 LExit:
-    ReleaseStr(sczBundleId);
+    ReleaseStr(sczBundleCode);
     return hr;
 }
 
diff --git a/src/api/burn/bextutil/BextBootstrapperExtensionEngine.cpp b/src/api/burn/bextutil/BextBootstrapperExtensionEngine.cpp
index a5e40c8e..f9e1802a 100644
--- a/src/api/burn/bextutil/BextBootstrapperExtensionEngine.cpp
+++ b/src/api/burn/bextutil/BextBootstrapperExtensionEngine.cpp
@@ -307,7 +307,7 @@ public: // IBootstrapperExtensionEngine
     }
 
     virtual STDMETHODIMP GetRelatedBundleVariable(
-        __in_z LPCWSTR wzBundleId,
+        __in_z LPCWSTR wzBundleCode,
         __in_z LPCWSTR wzVariable,
         __out_ecount_opt(*pcchValue) LPWSTR wzValue,
         __inout SIZE_T* pcchValue
@@ -320,7 +320,7 @@ public: // IBootstrapperExtensionEngine
         ExitOnNull(pcchValue, hr, E_INVALIDARG, "pcchValue is required");
 
         args.cbSize = sizeof(args);
-        args.wzBundleId = wzBundleId;
+        args.wzBundleCode = wzBundleCode;
         args.wzVariable = wzVariable;
 
         results.cbSize = sizeof(results);
diff --git a/src/api/burn/bextutil/inc/IBootstrapperExtensionEngine.h b/src/api/burn/bextutil/inc/IBootstrapperExtensionEngine.h
index a78868f2..31fe9ef8 100644
--- a/src/api/burn/bextutil/inc/IBootstrapperExtensionEngine.h
+++ b/src/api/burn/bextutil/inc/IBootstrapperExtensionEngine.h
@@ -67,7 +67,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperExtensionEngine, IUnknown, "9D027A39-F6B6-42
         ) = 0;
 
     STDMETHOD(GetRelatedBundleVariable)(
-        __in_z LPCWSTR wzBundleId,
+        __in_z LPCWSTR wzBundleCode,
         __in_z LPCWSTR wzVariable,
         __out_ecount_opt(*pcchValue) LPWSTR wzValue,
         __inout SIZE_T * pcchValue
diff --git a/src/api/burn/inc/BootstrapperApplicationTypes.h b/src/api/burn/inc/BootstrapperApplicationTypes.h
index c7eaa3d3..2ece1b7b 100644
--- a/src/api/burn/inc/BootstrapperApplicationTypes.h
+++ b/src/api/burn/inc/BootstrapperApplicationTypes.h
@@ -790,7 +790,7 @@ struct BA_ONDETECTCOMPLETE_RESULTS
 struct BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_ARGS
 {
     DWORD dwApiVersion;
-    LPCWSTR wzBundleId;
+    LPCWSTR wzBundleCode;
     BOOTSTRAPPER_RELATION_TYPE relationType;
     LPCWSTR wzBundleTag;
     BOOL fPerMachine;
@@ -847,7 +847,7 @@ struct BA_ONDETECTPACKAGECOMPLETE_RESULTS
 struct BA_ONDETECTRELATEDBUNDLE_ARGS
 {
     DWORD dwApiVersion;
-    LPCWSTR wzBundleId;
+    LPCWSTR wzBundleCode;
     BOOTSTRAPPER_RELATION_TYPE relationType;
     LPCWSTR wzBundleTag;
     BOOL fPerMachine;
@@ -865,7 +865,7 @@ struct BA_ONDETECTRELATEDBUNDLEPACKAGE_ARGS
 {
     DWORD dwApiVersion;
     LPCWSTR wzPackageId;
-    LPCWSTR wzBundleId;
+    LPCWSTR wzBundleCode;
     BOOTSTRAPPER_RELATION_TYPE relationType;
     BOOL fPerMachine;
     LPCWSTR wzVersion;
@@ -1226,7 +1226,7 @@ struct BA_ONPLANCOMPLETE_RESULTS
 struct BA_ONPLANFORWARDCOMPATIBLEBUNDLE_ARGS
 {
     DWORD dwApiVersion;
-    LPCWSTR wzBundleId;
+    LPCWSTR wzBundleCode;
     BOOTSTRAPPER_RELATION_TYPE relationType;
     LPCWSTR wzBundleTag;
     BOOL fPerMachine;
@@ -1339,7 +1339,7 @@ struct BA_ONPLANPACKAGECOMPLETE_RESULTS
 struct BA_ONPLANRELATEDBUNDLE_ARGS
 {
     DWORD dwApiVersion;
-    LPCWSTR wzBundleId;
+    LPCWSTR wzBundleCode;
     BOOTSTRAPPER_REQUEST_STATE recommendedState;
 };
 
@@ -1353,7 +1353,7 @@ struct BA_ONPLANRELATEDBUNDLE_RESULTS
 struct BA_ONPLANRELATEDBUNDLETYPE_ARGS
 {
     DWORD dwApiVersion;
-    LPCWSTR wzBundleId;
+    LPCWSTR wzBundleCode;
     BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE recommendedType;
 };
 
@@ -1367,7 +1367,7 @@ struct BA_ONPLANRELATEDBUNDLETYPE_RESULTS
 struct BA_ONPLANRESTORERELATEDBUNDLE_ARGS
 {
     DWORD dwApiVersion;
-    LPCWSTR wzBundleId;
+    LPCWSTR wzBundleCode;
     BOOTSTRAPPER_REQUEST_STATE recommendedState;
 };
 
diff --git a/src/api/burn/inc/BootstrapperEngineTypes.h b/src/api/burn/inc/BootstrapperEngineTypes.h
index e2634383..f89238c0 100644
--- a/src/api/burn/inc/BootstrapperEngineTypes.h
+++ b/src/api/burn/inc/BootstrapperEngineTypes.h
@@ -436,7 +436,7 @@ typedef struct _BAENGINE_SETVARIABLEVERSION_RESULTS
 typedef struct _BAENGINE_GETRELATEDBUNDLEVARIABLE_ARGS
 {
     DWORD dwApiVersion;
-    LPCWSTR wzBundleId;
+    LPCWSTR wzBundleCode;
     LPCWSTR wzVariable;
 } BAENGINE_GETRELATEDBUNDLEVARIABLE_ARGS;
 
diff --git a/src/api/burn/inc/BootstrapperExtensionEngineTypes.h b/src/api/burn/inc/BootstrapperExtensionEngineTypes.h
index 24c304c6..66dabe88 100644
--- a/src/api/burn/inc/BootstrapperExtensionEngineTypes.h
+++ b/src/api/burn/inc/BootstrapperExtensionEngineTypes.h
@@ -176,7 +176,7 @@ typedef struct _BOOTSTRAPPER_EXTENSION_ENGINE_SETVARIABLEVERSION_RESULTS
 typedef struct _BOOTSTRAPPER_EXTENSION_ENGINE_GETRELATEDBUNDLEVARIABLE_ARGS
 {
     DWORD cbSize;
-    LPCWSTR wzBundleId;
+    LPCWSTR wzBundleCode;
     LPCWSTR wzVariable;
 } BOOTSTRAPPER_EXTENSION_ENGINE_GETRELATEDBUNDLEVARIABLE_ARGS;
 
diff --git a/src/api/wix/WixToolset.Data/Symbols/WixBundleBundlePackageSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/WixBundleBundlePackageSymbol.cs
index 8d930580..2313e0a8 100644
--- a/src/api/wix/WixToolset.Data/Symbols/WixBundleBundlePackageSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/WixBundleBundlePackageSymbol.cs
@@ -11,7 +11,7 @@ namespace WixToolset.Data
             new[]
             {
                 new IntermediateFieldDefinition(nameof(WixBundleBundlePackageSymbolFields.Attributes), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixBundleBundlePackageSymbolFields.BundleId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleBundlePackageSymbolFields.BundleCode), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundleBundlePackageSymbolFields.EngineVersion), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundleBundlePackageSymbolFields.Version), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundleBundlePackageSymbolFields.InstallCommand), IntermediateFieldType.String),
@@ -29,7 +29,9 @@ namespace WixToolset.Data.Symbols
     public enum WixBundleBundlePackageSymbolFields
     {
         Attributes,
-        BundleId,
+        BundleCode,
+        [Obsolete("Use BundleCode instead.")]
+        BundleId = BundleCode,
         EngineVersion,
         Version,
         InstallCommand,
@@ -62,10 +64,17 @@ namespace WixToolset.Data.Symbols
             set => this.Set((int)WixBundleBundlePackageSymbolFields.Attributes, (int)value);
         }
 
+        public string BundleCode
+        {
+            get => (string)this.Fields[(int)WixBundleBundlePackageSymbolFields.BundleCode];
+            set => this.Set((int)WixBundleBundlePackageSymbolFields.BundleCode, value);
+        }
+
+        [Obsolete("Use BundleCode instead.")]
         public string BundleId
         {
-            get => (string)this.Fields[(int)WixBundleBundlePackageSymbolFields.BundleId];
-            set => this.Set((int)WixBundleBundlePackageSymbolFields.BundleId, value);
+            get => (string)this.Fields[(int)WixBundleBundlePackageSymbolFields.BundleCode];
+            set => this.Set((int)WixBundleBundlePackageSymbolFields.BundleCode, value);
         }
 
         public string EngineVersion
diff --git a/src/api/wix/WixToolset.Data/Symbols/WixBundleHarvestedBundlePackageSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/WixBundleHarvestedBundlePackageSymbol.cs
index 9f205ce6..8c969e77 100644
--- a/src/api/wix/WixToolset.Data/Symbols/WixBundleHarvestedBundlePackageSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/WixBundleHarvestedBundlePackageSymbol.cs
@@ -11,7 +11,7 @@ namespace WixToolset.Data
             new[]
             {
                 new IntermediateFieldDefinition(nameof(WixBundleHarvestedBundlePackageSymbolFields.Attributes), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(WixBundleHarvestedBundlePackageSymbolFields.BundleId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleHarvestedBundlePackageSymbolFields.BundleCode), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundleHarvestedBundlePackageSymbolFields.EngineVersion), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundleHarvestedBundlePackageSymbolFields.ManifestNamespace), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundleHarvestedBundlePackageSymbolFields.ProtocolVersion), IntermediateFieldType.Number),
@@ -30,7 +30,9 @@ namespace WixToolset.Data.Symbols
     public enum WixBundleHarvestedBundlePackageSymbolFields
     {
         Attributes,
-        BundleId,
+        BundleCode,
+        [Obsolete("Use BundleCode instead.")]
+        BundleId = BundleCode,
         EngineVersion,
         ManifestNamespace,
         ProtocolVersion,
@@ -65,10 +67,17 @@ namespace WixToolset.Data.Symbols
             set => this.Set((int)WixBundleHarvestedBundlePackageSymbolFields.Attributes, (int)value);
         }
 
+        public string BundleCode
+        {
+            get => this.Fields[(int)WixBundleHarvestedBundlePackageSymbolFields.BundleCode].AsString();
+            set => this.Set((int)WixBundleHarvestedBundlePackageSymbolFields.BundleCode, value);
+        }
+
+        [Obsolete("Use BundleCode instead.")]
         public string BundleId
         {
-            get => this.Fields[(int)WixBundleHarvestedBundlePackageSymbolFields.BundleId].AsString();
-            set => this.Set((int)WixBundleHarvestedBundlePackageSymbolFields.BundleId, value);
+            get => this.Fields[(int)WixBundleHarvestedBundlePackageSymbolFields.BundleCode].AsString();
+            set => this.Set((int)WixBundleHarvestedBundlePackageSymbolFields.BundleCode, value);
         }
 
         public string EngineVersion
diff --git a/src/api/wix/WixToolset.Data/Symbols/WixBundlePackageRelatedBundleSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/WixBundlePackageRelatedBundleSymbol.cs
index 31f4f713..c4586601 100644
--- a/src/api/wix/WixToolset.Data/Symbols/WixBundlePackageRelatedBundleSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/WixBundlePackageRelatedBundleSymbol.cs
@@ -11,7 +11,7 @@ namespace WixToolset.Data
             new[]
             {
                 new IntermediateFieldDefinition(nameof(WixBundlePackageRelatedBundleSymbolFields.PackagePayloadRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePackageRelatedBundleSymbolFields.BundleId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageRelatedBundleSymbolFields.BundleCode), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundlePackageRelatedBundleSymbolFields.Action), IntermediateFieldType.Number),
             },
             typeof(WixBundlePackageRelatedBundleSymbol));
@@ -20,10 +20,14 @@ namespace WixToolset.Data
 
 namespace WixToolset.Data.Symbols
 {
+    using System;
+
     public enum WixBundlePackageRelatedBundleSymbolFields
     {
         PackagePayloadRef,
-        BundleId,
+        BundleCode,
+        [Obsolete("Use BundleCode instead.")]
+        BundleId = BundleCode,
         Action,
     }
 
@@ -45,10 +49,17 @@ namespace WixToolset.Data.Symbols
             set => this.Set((int)WixBundlePackageRelatedBundleSymbolFields.PackagePayloadRef, value);
         }
 
+        public string BundleCode
+        {
+            get => (string)this.Fields[(int)WixBundlePackageRelatedBundleSymbolFields.BundleCode];
+            set => this.Set((int)WixBundlePackageRelatedBundleSymbolFields.BundleCode, value);
+        }
+
+        [Obsolete("Use BundleCode instead.")]
         public string BundleId
         {
-            get => (string)this.Fields[(int)WixBundlePackageRelatedBundleSymbolFields.BundleId];
-            set => this.Set((int)WixBundlePackageRelatedBundleSymbolFields.BundleId, value);
+            get => (string)this.Fields[(int)WixBundlePackageRelatedBundleSymbolFields.BundleCode];
+            set => this.Set((int)WixBundlePackageRelatedBundleSymbolFields.BundleCode, value);
         }
 
         public RelatedBundleActionType Action
diff --git a/src/api/wix/WixToolset.Data/Symbols/WixBundleSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/WixBundleSymbol.cs
index ffeb5f3b..f16cdbb8 100644
--- a/src/api/wix/WixToolset.Data/Symbols/WixBundleSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/WixBundleSymbol.cs
@@ -30,7 +30,7 @@ namespace WixToolset.Data
                 new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.Tag), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.Platform), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.ParentName), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.BundleId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.BundleCode), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.ProviderKey), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.InProgressName), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.DisableModify), IntermediateFieldType.String),
@@ -65,7 +65,9 @@ namespace WixToolset.Data.Symbols
         Tag,
         Platform,
         ParentName,
-        BundleId,
+        BundleCode,
+        [Obsolete("Use BundleCode instead.")]
+        BundleId = BundleCode,
         ProviderKey,
         InProgressName,
         DisableModify,
@@ -218,10 +220,17 @@ namespace WixToolset.Data.Symbols
             set => this.Set((int)WixBundleSymbolFields.ParentName, value);
         }
 
+        public string BundleCode
+        {
+            get => (string)this.Fields[(int)WixBundleSymbolFields.BundleCode];
+            set => this.Set((int)WixBundleSymbolFields.BundleCode, value);
+        }
+
+        [Obsolete("Use BundleCode instead.")]
         public string BundleId
         {
-            get => (string)this.Fields[(int)WixBundleSymbolFields.BundleId];
-            set => this.Set((int)WixBundleSymbolFields.BundleId, value);
+            get => (string)this.Fields[(int)WixBundleSymbolFields.BundleCode];
+            set => this.Set((int)WixBundleSymbolFields.BundleCode, value);
         }
 
         public string ProviderKey
diff --git a/src/api/wix/WixToolset.Data/Symbols/WixRelatedBundleSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/WixRelatedBundleSymbol.cs
index dc544e29..02db0da4 100644
--- a/src/api/wix/WixToolset.Data/Symbols/WixRelatedBundleSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/WixRelatedBundleSymbol.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Data
             SymbolDefinitionType.WixRelatedBundle,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(WixRelatedBundleSymbolFields.BundleId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixRelatedBundleSymbolFields.BundleCode), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(WixRelatedBundleSymbolFields.Action), IntermediateFieldType.Number),
             },
             typeof(WixRelatedBundleSymbol));
@@ -19,9 +19,13 @@ namespace WixToolset.Data
 
 namespace WixToolset.Data.Symbols
 {
+    using System;
+
     public enum WixRelatedBundleSymbolFields
     {
-        BundleId,
+        BundleCode,
+        [Obsolete("Use BundleCode instead.")]
+        BundleId = BundleCode,
         Action,
     }
 
@@ -45,10 +49,17 @@ namespace WixToolset.Data.Symbols
 
         public IntermediateField this[WixRelatedBundleSymbolFields index] => this.Fields[(int)index];
 
+        public string BundleCode
+        {
+            get => (string)this.Fields[(int)WixRelatedBundleSymbolFields.BundleCode];
+            set => this.Set((int)WixRelatedBundleSymbolFields.BundleCode, value);
+        }
+
+        [Obsolete("Use BundleCode instead.")]
         public string BundleId
         {
-            get => (string)this.Fields[(int)WixRelatedBundleSymbolFields.BundleId];
-            set => this.Set((int)WixRelatedBundleSymbolFields.BundleId, value);
+            get => (string)this.Fields[(int)WixRelatedBundleSymbolFields.BundleCode];
+            set => this.Set((int)WixRelatedBundleSymbolFields.BundleCode, value);
         }
 
         public RelatedBundleActionType Action
@@ -57,4 +68,4 @@ namespace WixToolset.Data.Symbols
             set => this.Set((int)WixRelatedBundleSymbolFields.Action, (int)value);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/burn/engine/EngineForExtension.cpp b/src/burn/engine/EngineForExtension.cpp
index e19cb802..3f7db0d4 100644
--- a/src/burn/engine/EngineForExtension.cpp
+++ b/src/burn/engine/EngineForExtension.cpp
@@ -213,7 +213,7 @@ static HRESULT BEEngineGetRelatedBundleVariable(
     ValidateMessageArgs(hr, pvArgs, BOOTSTRAPPER_EXTENSION_ENGINE_GETRELATEDBUNDLEVARIABLE_ARGS, pArgs);
     ValidateMessageResults(hr, pvResults, BOOTSTRAPPER_EXTENSION_ENGINE_GETRELATEDBUNDLEVARIABLE_RESULTS, pResults);
 
-    hr = ExternalEngineGetRelatedBundleVariable(pContext->pEngineState, pArgs->wzBundleId, pArgs->wzVariable, pResults->wzValue, &pResults->cchValue);
+    hr = ExternalEngineGetRelatedBundleVariable(pContext->pEngineState, pArgs->wzBundleCode, pArgs->wzVariable, pResults->wzValue, &pResults->cchValue);
 
 LExit:
     return hr;
diff --git a/src/burn/engine/apply.cpp b/src/burn/engine/apply.cpp
index 0f65b0ad..e4e76a6c 100644
--- a/src/burn/engine/apply.cpp
+++ b/src/burn/engine/apply.cpp
@@ -452,7 +452,7 @@ extern "C" HRESULT ApplyRegister(
 
     if (pEngineState->registration.fPerMachine)
     {
-        hr = ElevationSessionBegin(pEngineState->companionConnection.hPipe, sczEngineWorkingPath, pEngineState->registration.sczResumeCommandLine, pEngineState->registration.fDisableResume, &pEngineState->variables, pEngineState->plan.dwRegistrationOperations, pEngineState->registration.fDetectedForeignProviderKeyBundleId, qwEstimatedSize, registrationType);
+        hr = ElevationSessionBegin(pEngineState->companionConnection.hPipe, sczEngineWorkingPath, pEngineState->registration.sczResumeCommandLine, pEngineState->registration.fDisableResume, &pEngineState->variables, pEngineState->plan.dwRegistrationOperations, pEngineState->registration.fDetectedForeignProviderKeyBundleCode, qwEstimatedSize, registrationType);
         ExitOnFailure(hr, "Failed to begin registration session in per-machine process.");
     }
     else
@@ -548,7 +548,7 @@ extern "C" HRESULT ApplyUnregister(
 
     if (pEngineState->registration.fPerMachine)
     {
-        hr = ElevationSessionEnd(pEngineState->companionConnection.hPipe, resumeMode, restart, pEngineState->registration.fDetectedForeignProviderKeyBundleId, qwEstimatedSize, registrationType);
+        hr = ElevationSessionEnd(pEngineState->companionConnection.hPipe, resumeMode, restart, pEngineState->registration.fDetectedForeignProviderKeyBundleCode, qwEstimatedSize, registrationType);
         ExitOnFailure(hr, "Failed to end session in per-machine process.");
     }
     else
diff --git a/src/burn/engine/bacallback.cpp b/src/burn/engine/bacallback.cpp
index f4e6894d..72ca27ea 100644
--- a/src/burn/engine/bacallback.cpp
+++ b/src/burn/engine/bacallback.cpp
@@ -2120,7 +2120,7 @@ LExit:
 
 EXTERN_C HRESULT BACallbackOnDetectForwardCompatibleBundle(
     __in BURN_USER_EXPERIENCE* pUserExperience,
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in BOOTSTRAPPER_RELATION_TYPE relationType,
     __in_z LPCWSTR wzBundleTag,
     __in BOOL fPerMachine,
@@ -2138,7 +2138,7 @@ EXTERN_C HRESULT BACallbackOnDetectForwardCompatibleBundle(
 
     // Init structs.
     args.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION;
-    args.wzBundleId = wzBundleId;
+    args.wzBundleCode = wzBundleCode;
     args.relationType = relationType;
     args.wzBundleTag = wzBundleTag;
     args.fPerMachine = fPerMachine;
@@ -2151,8 +2151,8 @@ EXTERN_C HRESULT BACallbackOnDetectForwardCompatibleBundle(
     hr = BuffWriteNumberToBuffer(&bufferArgs, args.dwApiVersion);
     ExitOnFailure(hr, "Failed to write API version of OnDetectForwardCompatibleBundle args.");
 
-    hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleId);
-    ExitOnFailure(hr, "Failed to write bundle id of OnDetectForwardCompatibleBundle args.");
+    hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleCode);
+    ExitOnFailure(hr, "Failed to write bundle code of OnDetectForwardCompatibleBundle args.");
 
     hr = BuffWriteNumberToBuffer(&bufferArgs, args.relationType);
     ExitOnFailure(hr, "Failed to write relation type of OnDetectForwardCompatibleBundle args.");
@@ -2393,7 +2393,7 @@ LExit:
 
 EXTERN_C HRESULT BACallbackOnDetectRelatedBundle(
     __in BURN_USER_EXPERIENCE* pUserExperience,
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in BOOTSTRAPPER_RELATION_TYPE relationType,
     __in_z LPCWSTR wzBundleTag,
     __in BOOL fPerMachine,
@@ -2411,7 +2411,7 @@ EXTERN_C HRESULT BACallbackOnDetectRelatedBundle(
 
     // Init structs.
     args.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION;
-    args.wzBundleId = wzBundleId;
+    args.wzBundleCode = wzBundleCode;
     args.relationType = relationType;
     args.wzBundleTag = wzBundleTag;
     args.fPerMachine = fPerMachine;
@@ -2424,8 +2424,8 @@ EXTERN_C HRESULT BACallbackOnDetectRelatedBundle(
     hr = BuffWriteNumberToBuffer(&bufferArgs, args.dwApiVersion);
     ExitOnFailure(hr, "Failed to write API version of OnDetectRelatedBundle args.");
 
-    hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleId);
-    ExitOnFailure(hr, "Failed to write bundle id of OnDetectRelatedBundle args.");
+    hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleCode);
+    ExitOnFailure(hr, "Failed to write bundle code of OnDetectRelatedBundle args.");
 
     hr = BuffWriteNumberToBuffer(&bufferArgs, args.relationType);
     ExitOnFailure(hr, "Failed to write relation type of OnDetectRelatedBundle args.");
@@ -2478,7 +2478,7 @@ LExit:
 EXTERN_C HRESULT BACallbackOnDetectRelatedBundlePackage(
     __in BURN_USER_EXPERIENCE* pUserExperience,
     __in_z LPCWSTR wzPackageId,
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in BOOTSTRAPPER_RELATION_TYPE relationType,
     __in BOOL fPerMachine,
     __in VERUTIL_VERSION* pVersion
@@ -2495,7 +2495,7 @@ EXTERN_C HRESULT BACallbackOnDetectRelatedBundlePackage(
     // Init structs.
     args.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION;
     args.wzPackageId = wzPackageId;
-    args.wzBundleId = wzBundleId;
+    args.wzBundleCode = wzBundleCode;
     args.relationType = relationType;
     args.fPerMachine = fPerMachine;
     args.wzVersion = pVersion->sczVersion;
@@ -2509,8 +2509,8 @@ EXTERN_C HRESULT BACallbackOnDetectRelatedBundlePackage(
     hr = BuffWriteStringToBuffer(&bufferArgs, args.wzPackageId);
     ExitOnFailure(hr, "Failed to write package id of OnDetectRelatedBundlePackage args.");
 
-    hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleId);
-    ExitOnFailure(hr, "Failed to write bundle id of OnDetectRelatedBundlePackage args.");
+    hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleCode);
+    ExitOnFailure(hr, "Failed to write bundle code of OnDetectRelatedBundlePackage args.");
 
     hr = BuffWriteNumberToBuffer(&bufferArgs, args.relationType);
     ExitOnFailure(hr, "Failed to write relation type of OnDetectRelatedBundlePackage args.");
@@ -4315,7 +4315,7 @@ LExit:
 
 EXTERN_C HRESULT BACallbackOnPlanForwardCompatibleBundle(
     __in BURN_USER_EXPERIENCE* pUserExperience,
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in BOOTSTRAPPER_RELATION_TYPE relationType,
     __in_z LPCWSTR wzBundleTag,
     __in BOOL fPerMachine,
@@ -4333,7 +4333,7 @@ EXTERN_C HRESULT BACallbackOnPlanForwardCompatibleBundle(
 
     // Init structs.
     args.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION;
-    args.wzBundleId = wzBundleId;
+    args.wzBundleCode = wzBundleCode;
     args.relationType = relationType;
     args.wzBundleTag = wzBundleTag;
     args.fPerMachine = fPerMachine;
@@ -4347,8 +4347,8 @@ EXTERN_C HRESULT BACallbackOnPlanForwardCompatibleBundle(
     hr = BuffWriteNumberToBuffer(&bufferArgs, args.dwApiVersion);
     ExitOnFailure(hr, "Failed to write API version of OnPlanForwardCompatibleBundle args.");
 
-    hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleId);
-    ExitOnFailure(hr, "Failed to write bundle id of OnPlanForwardCompatibleBundle args.");
+    hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleCode);
+    ExitOnFailure(hr, "Failed to write bundle code of OnPlanForwardCompatibleBundle args.");
 
     hr = BuffWriteNumberToBuffer(&bufferArgs, args.relationType);
     ExitOnFailure(hr, "Failed to write relation type of OnPlanForwardCompatibleBundle args.");
@@ -4806,7 +4806,7 @@ LExit:
 
 EXTERN_C HRESULT BACallbackOnPlanRelatedBundle(
     __in BURN_USER_EXPERIENCE* pUserExperience,
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __inout BOOTSTRAPPER_REQUEST_STATE* pRequestedState
     )
 {
@@ -4820,7 +4820,7 @@ EXTERN_C HRESULT BACallbackOnPlanRelatedBundle(
 
     // Init structs.
     args.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION;
-    args.wzBundleId = wzBundleId;
+    args.wzBundleCode = wzBundleCode;
     args.recommendedState = *pRequestedState;
 
     results.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION;
@@ -4830,8 +4830,8 @@ EXTERN_C HRESULT BACallbackOnPlanRelatedBundle(
     hr = BuffWriteNumberToBuffer(&bufferArgs, args.dwApiVersion);
     ExitOnFailure(hr, "Failed to write API version of OnPlanRelatedBundle args.");
 
-    hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleId);
-    ExitOnFailure(hr, "Failed to write bundle id of OnPlanRelatedBundle args.");
+    hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleCode);
+    ExitOnFailure(hr, "Failed to write bundle code of OnPlanRelatedBundle args.");
 
     hr = BuffWriteNumberToBuffer(&bufferArgs, args.recommendedState);
     ExitOnFailure(hr, "Failed to write recommended state of OnPlanRelatedBundle args.");
@@ -4879,7 +4879,7 @@ LExit:
 
 EXTERN_C HRESULT BACallbackOnPlanRelatedBundleType(
     __in BURN_USER_EXPERIENCE* pUserExperience,
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __inout BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE* pRequestedType
     )
 {
@@ -4893,7 +4893,7 @@ EXTERN_C HRESULT BACallbackOnPlanRelatedBundleType(
 
     // Init structs.
     args.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION;
-    args.wzBundleId = wzBundleId;
+    args.wzBundleCode = wzBundleCode;
     args.recommendedType = *pRequestedType;
 
     results.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION;
@@ -4903,8 +4903,8 @@ EXTERN_C HRESULT BACallbackOnPlanRelatedBundleType(
     hr = BuffWriteNumberToBuffer(&bufferArgs, args.dwApiVersion);
     ExitOnFailure(hr, "Failed to write API version of OnPlanRelatedBundleType args.");
 
-    hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleId);
-    ExitOnFailure(hr, "Failed to write bundle id of OnPlanRelatedBundleType args.");
+    hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleCode);
+    ExitOnFailure(hr, "Failed to write bundle code of OnPlanRelatedBundleType args.");
 
     hr = BuffWriteNumberToBuffer(&bufferArgs, args.recommendedType);
     ExitOnFailure(hr, "Failed to write recommended type of OnPlanRelatedBundleType args.");
@@ -4952,7 +4952,7 @@ LExit:
 
 EXTERN_C HRESULT BACallbackOnPlanRestoreRelatedBundle(
     __in BURN_USER_EXPERIENCE* pUserExperience,
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __inout BOOTSTRAPPER_REQUEST_STATE* pRequestedState
     )
 {
@@ -4966,7 +4966,7 @@ EXTERN_C HRESULT BACallbackOnPlanRestoreRelatedBundle(
 
     // Init structs.
     args.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION;
-    args.wzBundleId = wzBundleId;
+    args.wzBundleCode = wzBundleCode;
     args.recommendedState = *pRequestedState;
 
     results.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION;
@@ -4976,8 +4976,8 @@ EXTERN_C HRESULT BACallbackOnPlanRestoreRelatedBundle(
     hr = BuffWriteNumberToBuffer(&bufferArgs, args.dwApiVersion);
     ExitOnFailure(hr, "Failed to write API version of OnPlanRestoreRelatedBundle args.");
 
-    hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleId);
-    ExitOnFailure(hr, "Failed to write bundle id of OnPlanRestoreRelatedBundle args.");
+    hr = BuffWriteStringToBuffer(&bufferArgs, args.wzBundleCode);
+    ExitOnFailure(hr, "Failed to write bundle code of OnPlanRestoreRelatedBundle args.");
 
     hr = BuffWriteNumberToBuffer(&bufferArgs, args.recommendedState);
     ExitOnFailure(hr, "Failed to write recommended state of OnPlanRestoreRelatedBundle args.");
diff --git a/src/burn/engine/bacallback.h b/src/burn/engine/bacallback.h
index 8d1f41c4..cd363b6e 100644
--- a/src/burn/engine/bacallback.h
+++ b/src/burn/engine/bacallback.h
@@ -193,7 +193,7 @@ HRESULT BACallbackOnDetectComplete(
     );
 HRESULT BACallbackOnDetectForwardCompatibleBundle(
     __in BURN_USER_EXPERIENCE* pUserExperience,
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in BOOTSTRAPPER_RELATION_TYPE relationType,
     __in_z LPCWSTR wzBundleTag,
     __in BOOL fPerMachine,
@@ -219,7 +219,7 @@ HRESULT BACallbackOnDetectPackageComplete(
     );
 HRESULT BACallbackOnDetectRelatedBundle(
     __in BURN_USER_EXPERIENCE* pUserExperience,
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in BOOTSTRAPPER_RELATION_TYPE relationType,
     __in_z LPCWSTR wzBundleTag,
     __in BOOL fPerMachine,
@@ -229,7 +229,7 @@ HRESULT BACallbackOnDetectRelatedBundle(
 HRESULT BACallbackOnDetectRelatedBundlePackage(
     __in BURN_USER_EXPERIENCE* pUserExperience,
     __in_z LPCWSTR wzPackageId,
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in BOOTSTRAPPER_RELATION_TYPE relationType,
     __in BOOL fPerMachine,
     __in VERUTIL_VERSION* pVersion
@@ -388,7 +388,7 @@ HRESULT BACallbackOnPlanComplete(
     );
 HRESULT BACallbackOnPlanForwardCompatibleBundle(
     __in BURN_USER_EXPERIENCE* pUserExperience,
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in BOOTSTRAPPER_RELATION_TYPE relationType,
     __in_z LPCWSTR wzBundleTag,
     __in BOOL fPerMachine,
@@ -443,17 +443,17 @@ HRESULT BACallbackOnPlanPackageComplete(
     );
 HRESULT BACallbackOnPlanRelatedBundle(
     __in BURN_USER_EXPERIENCE* pUserExperience,
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __inout BOOTSTRAPPER_REQUEST_STATE* pRequestedState
     );
 HRESULT BACallbackOnPlanRelatedBundleType(
     __in BURN_USER_EXPERIENCE* pUserExperience,
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __inout BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE* pRequestedType
     );
 HRESULT BACallbackOnPlanRestoreRelatedBundle(
     __in BURN_USER_EXPERIENCE* pUserExperience,
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __inout BOOTSTRAPPER_REQUEST_STATE* pRequestedState
     );
 HRESULT BACallbackOnPlanRollbackBoundary(
diff --git a/src/burn/engine/baengine.cpp b/src/burn/engine/baengine.cpp
index e63836f4..d1704ad9 100644
--- a/src/burn/engine/baengine.cpp
+++ b/src/burn/engine/baengine.cpp
@@ -330,7 +330,7 @@ static HRESULT BAEngineGetRelatedBundleVariable(
     HRESULT hr = S_OK;
     BAENGINE_GETRELATEDBUNDLEVARIABLE_ARGS args = { };
     BAENGINE_GETRELATEDBUNDLEVARIABLE_RESULTS results = { };
-    LPWSTR sczBundleId = NULL;
+    LPWSTR sczBundleCode = NULL;
     LPWSTR sczVariable = NULL;
     LPWSTR sczValue = NULL;
 
@@ -338,13 +338,13 @@ static HRESULT BAEngineGetRelatedBundleVariable(
     hr = BuffReaderReadNumber(pReaderArgs, &args.dwApiVersion);
     ExitOnFailure(hr, "Failed to read API version of BAEngineGetRelatedBundleVariable args.");
 
-    hr = BuffReaderReadString(pReaderArgs, &sczBundleId);
-    ExitOnFailure(hr, "Failed to read bundle id of BAEngineGetRelatedBundleVariable args.");
+    hr = BuffReaderReadString(pReaderArgs, &sczBundleCode);
+    ExitOnFailure(hr, "Failed to read bundle code of BAEngineGetRelatedBundleVariable args.");
 
     hr = BuffReaderReadString(pReaderArgs, &sczVariable);
     ExitOnFailure(hr, "Failed to read variable name of BAEngineGetRelatedBundleVariable args.");
 
-    args.wzBundleId = sczBundleId;
+    args.wzBundleCode = sczBundleCode;
     args.wzVariable = sczVariable;
 
     // Read results.
@@ -355,7 +355,7 @@ static HRESULT BAEngineGetRelatedBundleVariable(
     ExitOnFailure(hr, "Failed to read API version of BAEngineGetRelatedBundleVariable results.");
 
     // Execute.
-    hr = BundleGetBundleVariable(args.wzBundleId, args.wzVariable, &sczValue);
+    hr = BundleGetBundleVariable(args.wzBundleCode, args.wzVariable, &sczValue);
     ExitOnFailure(hr, "Failed to get related bundle variable: %ls", sczVariable);
 
     results.cchValue = lstrlenW(sczValue);
@@ -374,7 +374,7 @@ static HRESULT BAEngineGetRelatedBundleVariable(
 LExit:
     ReleaseStr(sczValue);
     ReleaseStr(sczVariable);
-    ReleaseStr(sczBundleId);
+    ReleaseStr(sczBundleCode);
 
     return hr;
 }
diff --git a/src/burn/engine/bundlepackageengine.cpp b/src/burn/engine/bundlepackageengine.cpp
index 90262638..612da389 100644
--- a/src/burn/engine/bundlepackageengine.cpp
+++ b/src/burn/engine/bundlepackageengine.cpp
@@ -52,8 +52,8 @@ extern "C" HRESULT BundlePackageEngineParsePackageFromXml(
     LPWSTR scz = NULL;
 
     // @DetectCondition
-    hr = XmlGetAttributeEx(pixnBundlePackage, L"BundleId", &pPackage->Bundle.sczBundleId);
-    ExitOnRequiredXmlQueryFailure(hr, "Failed to get @BundleId.");
+    hr = XmlGetAttributeEx(pixnBundlePackage, L"BundleCode", &pPackage->Bundle.sczBundleCode);
+    ExitOnRequiredXmlQueryFailure(hr, "Failed to get @BundleCode.");
 
     // @Version
     hr = XmlGetAttributeEx(pixnBundlePackage, L"Version", &scz);
@@ -100,7 +100,7 @@ extern "C" HRESULT BundlePackageEngineParsePackageFromXml(
     hr = ExeEngineParseCommandLineArgumentsFromXml(pixnBundlePackage, &pPackage->Bundle.rgCommandLineArguments, &pPackage->Bundle.cCommandLineArguments);
     ExitOnFailure(hr, "Failed to parse command lines.");
 
-    hr = StrAllocFormatted(&pPackage->Bundle.sczRegistrationKey, L"%ls\\%ls", BURN_REGISTRATION_REGISTRY_UNINSTALL_KEY, pPackage->Bundle.sczBundleId);
+    hr = StrAllocFormatted(&pPackage->Bundle.sczRegistrationKey, L"%ls\\%ls", BURN_REGISTRATION_REGISTRY_UNINSTALL_KEY, pPackage->Bundle.sczBundleCode);
     ExitOnFailure(hr, "Failed to build uninstall registry key path.");
 
 LExit:
@@ -126,7 +126,7 @@ extern "C" HRESULT BundlePackageEngineParseRelatedCodes(
     IXMLDOMNodeList* pixnNodes = NULL;
     IXMLDOMNode* pixnElement = NULL;
     LPWSTR sczAction = NULL;
-    LPWSTR sczId = NULL;
+    LPWSTR sczCode = NULL;
     DWORD cElements = 0;
 
     hr = XmlSelectNodes(pixnBundle, L"RelatedBundle", &pixnNodes);
@@ -143,16 +143,16 @@ extern "C" HRESULT BundlePackageEngineParseRelatedCodes(
         hr = XmlGetAttributeEx(pixnElement, L"Action", &sczAction);
         ExitOnFailure(hr, "Failed to get @Action.");
 
-        hr = XmlGetAttributeEx(pixnElement, L"Id", &sczId);
-        ExitOnFailure(hr, "Failed to get @Id.");
+        hr = XmlGetAttributeEx(pixnElement, L"Code", &sczCode);
+        ExitOnFailure(hr, "Failed to get @Code.");
 
         if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, sczAction, -1, L"Detect", -1))
         {
             hr = MemEnsureArraySizeForNewItems(reinterpret_cast<LPVOID*>(prgsczDetectCodes), *pcDetectCodes, 1, sizeof(LPWSTR), 5);
             ExitOnFailure(hr, "Failed to resize Detect code array");
 
-            (*prgsczDetectCodes)[*pcDetectCodes] = sczId;
-            sczId = NULL;
+            (*prgsczDetectCodes)[*pcDetectCodes] = sczCode;
+            sczCode = NULL;
             *pcDetectCodes += 1;
         }
         else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, sczAction, -1, L"Upgrade", -1))
@@ -160,8 +160,8 @@ extern "C" HRESULT BundlePackageEngineParseRelatedCodes(
             hr = MemEnsureArraySizeForNewItems(reinterpret_cast<LPVOID*>(prgsczUpgradeCodes), *pcUpgradeCodes, 1, sizeof(LPWSTR), 5);
             ExitOnFailure(hr, "Failed to resize Upgrade code array");
 
-            (*prgsczUpgradeCodes)[*pcUpgradeCodes] = sczId;
-            sczId = NULL;
+            (*prgsczUpgradeCodes)[*pcUpgradeCodes] = sczCode;
+            sczCode = NULL;
             *pcUpgradeCodes += 1;
         }
         else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, sczAction, -1, L"Addon", -1))
@@ -169,8 +169,8 @@ extern "C" HRESULT BundlePackageEngineParseRelatedCodes(
             hr = MemEnsureArraySizeForNewItems(reinterpret_cast<LPVOID*>(prgsczAddonCodes), *pcAddonCodes, 1, sizeof(LPWSTR), 5);
             ExitOnFailure(hr, "Failed to resize Addon code array");
 
-            (*prgsczAddonCodes)[*pcAddonCodes] = sczId;
-            sczId = NULL;
+            (*prgsczAddonCodes)[*pcAddonCodes] = sczCode;
+            sczCode = NULL;
             *pcAddonCodes += 1;
         }
         else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, sczAction, -1, L"Patch", -1))
@@ -178,8 +178,8 @@ extern "C" HRESULT BundlePackageEngineParseRelatedCodes(
             hr = MemEnsureArraySizeForNewItems(reinterpret_cast<LPVOID*>(prgsczPatchCodes), *pcPatchCodes, 1, sizeof(LPWSTR), 5);
             ExitOnFailure(hr, "Failed to resize Patch code array");
 
-            (*prgsczPatchCodes)[*pcPatchCodes] = sczId;
-            sczId = NULL;
+            (*prgsczPatchCodes)[*pcPatchCodes] = sczCode;
+            sczCode = NULL;
             *pcPatchCodes += 1;
         }
         else
@@ -193,7 +193,7 @@ LExit:
     ReleaseObject(pixnNodes);
     ReleaseObject(pixnElement);
     ReleaseStr(sczAction);
-    ReleaseStr(sczId);
+    ReleaseStr(sczCode);
 
     return hr;
 }
@@ -202,7 +202,7 @@ extern "C" void BundlePackageEnginePackageUninitialize(
     __in BURN_PACKAGE* pPackage
     )
 {
-    ReleaseStr(pPackage->Bundle.sczBundleId);
+    ReleaseStr(pPackage->Bundle.sczBundleCode);
     ReleaseStr(pPackage->Bundle.sczArpKeyPath);
     ReleaseVerutilVersion(pPackage->Bundle.pVersion);
     ReleaseStr(pPackage->Bundle.sczRegistrationKey);
@@ -457,7 +457,7 @@ extern "C" HRESULT BundlePackageEnginePlanAddPackage(
         pAction->bundlePackage.pPackage = pPackage;
         pAction->bundlePackage.action = pPackage->rollback;
 
-        hr = StrAllocString(&pAction->bundlePackage.sczParent, pPlan->wzBundleId, 0);
+        hr = StrAllocString(&pAction->bundlePackage.sczParent, pPlan->wzBundleCode, 0);
         ExitOnFailure(hr, "Failed to allocate the parent.");
 
         if (pPackage->Bundle.wzAncestors)
@@ -488,7 +488,7 @@ extern "C" HRESULT BundlePackageEnginePlanAddPackage(
         pAction->bundlePackage.pPackage = pPackage;
         pAction->bundlePackage.action = pPackage->execute;
 
-        hr = StrAllocString(&pAction->bundlePackage.sczParent, pPlan->wzBundleId, 0);
+        hr = StrAllocString(&pAction->bundlePackage.sczParent, pPlan->wzBundleCode, 0);
         ExitOnFailure(hr, "Failed to allocate the parent.");
 
         if (pPackage->Bundle.wzAncestors)
@@ -686,7 +686,7 @@ static BUNDLE_QUERY_CALLBACK_RESULT CALLBACK QueryRelatedBundlesCallback(
     BOOTSTRAPPER_RELATION_TYPE relationType = RelatedBundleConvertRelationType(pBundle->relationType);
     BOOL fPerMachine = BUNDLE_INSTALL_CONTEXT_MACHINE == pBundle->installContext;
 
-    if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, pBundle->wzBundleId, -1, pPackage->Bundle.sczBundleId, -1) &&
+    if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, pBundle->wzBundleCode, -1, pPackage->Bundle.sczBundleCode, -1) &&
         pPackage->Bundle.fWin64 == (REG_KEY_64BIT == pBundle->regBitness))
     {
         Assert(BOOTSTRAPPER_RELATION_UPGRADE == relationType);
@@ -695,14 +695,14 @@ static BUNDLE_QUERY_CALLBACK_RESULT CALLBACK QueryRelatedBundlesCallback(
     }
 
     hr = RegReadString(pBundle->hkBundle, BURN_REGISTRATION_REGISTRY_BUNDLE_VERSION, &sczBundleVersion);
-    ExitOnFailure(hr, "Failed to read version from registry for related bundle package: %ls", pBundle->wzBundleId);
+    ExitOnFailure(hr, "Failed to read version from registry for related bundle package: %ls", pBundle->wzBundleCode);
 
     hr = VerParseVersion(sczBundleVersion, 0, FALSE, &pVersion);
     ExitOnFailure(hr, "Failed to parse related bundle package version: %ls", sczBundleVersion);
 
     if (pVersion->fInvalid)
     {
-        LogId(REPORT_WARNING, MSG_RELATED_PACKAGE_INVALID_VERSION, pBundle->wzBundleId, sczBundleVersion);
+        LogId(REPORT_WARNING, MSG_RELATED_PACKAGE_INVALID_VERSION, pBundle->wzBundleCode, sczBundleVersion);
     }
 
     if (BOOTSTRAPPER_RELATION_UPGRADE == relationType)
@@ -719,7 +719,7 @@ static BUNDLE_QUERY_CALLBACK_RESULT CALLBACK QueryRelatedBundlesCallback(
     result = BUNDLE_QUERY_CALLBACK_RESULT_CANCEL;
 
     // Pass to BA.
-    hr = BACallbackOnDetectRelatedBundlePackage(pContext->pUserExperience, pPackage->sczId, pBundle->wzBundleId, relationType, fPerMachine, pVersion);
+    hr = BACallbackOnDetectRelatedBundlePackage(pContext->pUserExperience, pPackage->sczId, pBundle->wzBundleCode, relationType, fPerMachine, pVersion);
     ExitOnRootFailure(hr, "BA aborted detect related BUNDLE package.");
 
     result = BUNDLE_QUERY_CALLBACK_RESULT_CONTINUE;
@@ -1064,7 +1064,7 @@ static HRESULT DetectArpEntry(
 
     if (!pPackage->Bundle.sczArpKeyPath)
     {
-        hr = PathConcatRelativeToBase(L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\", pPackage->Bundle.sczBundleId, &pPackage->Bundle.sczArpKeyPath);
+        hr = PathConcatRelativeToBase(L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\", pPackage->Bundle.sczBundleCode, &pPackage->Bundle.sczArpKeyPath);
         ExitOnFailure(hr, "Failed to build full key path.");
     }
 
diff --git a/src/burn/engine/cache.cpp b/src/burn/engine/cache.cpp
index 358327a2..5a8388c4 100644
--- a/src/burn/engine/cache.cpp
+++ b/src/burn/engine/cache.cpp
@@ -259,7 +259,7 @@ extern "C" HRESULT CacheInitializeSources(
     ExitOnFailure(hr, "Failed to get current process path.");
 
     // Determine if we are running from the package cache or not.
-    hr = CacheGetCompletedPath(pCache, pRegistration->fPerMachine, pRegistration->sczId, &sczCompletedFolder);
+    hr = CacheGetCompletedPath(pCache, pRegistration->fPerMachine, pRegistration->sczCode, &sczCompletedFolder);
     ExitOnFailure(hr, "Failed to get completed path for bundle.");
 
     hr = PathConcatRelativeToFullyQualifiedBase(sczCompletedFolder, pRegistration->sczExecutableName, &sczCompletedPath);
@@ -432,7 +432,7 @@ LExit:
 
 extern "C" HRESULT CacheCalculateBundleLayoutWorkingPath(
     __in BURN_CACHE* pCache,
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __deref_out_z LPWSTR* psczWorkingPath
     )
 {
@@ -440,8 +440,8 @@ extern "C" HRESULT CacheCalculateBundleLayoutWorkingPath(
 
     HRESULT hr = S_OK;
 
-    hr = PathConcatRelativeToFullyQualifiedBase(pCache->sczAcquisitionFolder, wzBundleId, psczWorkingPath);
-    ExitOnFailure(hr, "Failed to append bundle id for bundle layout working path.");
+    hr = PathConcatRelativeToFullyQualifiedBase(pCache->sczAcquisitionFolder, wzBundleCode, psczWorkingPath);
+    ExitOnFailure(hr, "Failed to append bundle code for bundle layout working path.");
 
 LExit:
     return hr;
@@ -978,7 +978,7 @@ extern "C" HRESULT CacheCompleteBundle(
     __in BURN_CACHE* pCache,
     __in BOOL fPerMachine,
     __in_z LPCWSTR wzExecutableName,
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in_z LPCWSTR wzSourceBundlePath
 #ifdef DEBUG
     , __in_z LPCWSTR wzExecutablePath
@@ -990,7 +990,7 @@ extern "C" HRESULT CacheCompleteBundle(
     LPWSTR sczTargetDirectory = NULL;
     LPWSTR sczTargetPath = NULL;
 
-    hr = CreateCompletedPath(pCache, fPerMachine, wzBundleId, NULL, &sczTargetDirectory);
+    hr = CreateCompletedPath(pCache, fPerMachine, wzBundleCode, NULL, &sczTargetDirectory);
     ExitOnFailure(hr, "Failed to create completed cache path for bundle.");
 
     hr = PathConcatRelativeToFullyQualifiedBase(sczTargetDirectory, wzExecutableName, &sczTargetPath);
@@ -1217,13 +1217,13 @@ extern "C" HRESULT CacheRemoveBaseWorkingFolder(
 extern "C" HRESULT CacheRemoveBundle(
     __in BURN_CACHE* pCache,
     __in BOOL fPerMachine,
-    __in_z LPCWSTR wzBundleId
+    __in_z LPCWSTR wzBundleCode
     )
 {
     HRESULT hr = S_OK;
 
-    hr = RemoveBundleOrPackage(pCache, TRUE, fPerMachine, wzBundleId, wzBundleId);
-    ExitOnFailure(hr, "Failed to remove bundle id: %ls.", wzBundleId);
+    hr = RemoveBundleOrPackage(pCache, TRUE, fPerMachine, wzBundleCode, wzBundleCode);
+    ExitOnFailure(hr, "Failed to remove bundle code: %ls.", wzBundleCode);
 
 LExit:
     return hr;
diff --git a/src/burn/engine/cache.h b/src/burn/engine/cache.h
index 7c4dfaa1..cce35df0 100644
--- a/src/burn/engine/cache.h
+++ b/src/burn/engine/cache.h
@@ -107,7 +107,7 @@ HRESULT CacheCalculateBundleWorkingPath(
     );
 HRESULT CacheCalculateBundleLayoutWorkingPath(
     __in BURN_CACHE* pCache,
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __deref_out_z LPWSTR* psczWorkingPath
     );
 HRESULT CacheCalculatePayloadWorkingPath(
@@ -191,7 +191,7 @@ HRESULT CacheCompleteBundle(
     __in BURN_CACHE* pCache,
     __in BOOL fPerMachine,
     __in_z LPCWSTR wzExecutableName,
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in_z LPCWSTR wzSourceBundlePath
 #ifdef DEBUG
     , __in_z LPCWSTR wzExecutablePath
diff --git a/src/burn/engine/core.cpp b/src/burn/engine/core.cpp
index a85e6f18..3fe9b586 100644
--- a/src/burn/engine/core.cpp
+++ b/src/burn/engine/core.cpp
@@ -202,12 +202,12 @@ extern "C" HRESULT CoreInitializeConstants(
     // Support passing Ancestors to embedded burn bundles.
     if (pInternalCommand->sczAncestors && *pInternalCommand->sczAncestors)
     {
-        hr = StrAllocFormatted(&pRegistration->sczBundlePackageAncestors, L"%ls;%ls", pInternalCommand->sczAncestors, pRegistration->sczId);
+        hr = StrAllocFormatted(&pRegistration->sczBundlePackageAncestors, L"%ls;%ls", pInternalCommand->sczAncestors, pRegistration->sczCode);
         ExitOnFailure(hr, "Failed to copy ancestors and self to bundle package ancestors.");
     }
     else
     {
-        hr = StrAllocString(&pRegistration->sczBundlePackageAncestors, pRegistration->sczId, 0);
+        hr = StrAllocString(&pRegistration->sczBundlePackageAncestors, pRegistration->sczCode, 0);
         ExitOnFailure(hr, "Failed to copy self to bundle package ancestors.");
     }
 
@@ -330,7 +330,7 @@ extern "C" HRESULT CoreDetect(
     ExitOnFailure(hr, "Failed to report detected related bundles.");
 
     // Do update detection.
-    hr = DetectUpdate(pEngineState->registration.sczId, &pEngineState->userExperience, &pEngineState->update);
+    hr = DetectUpdate(pEngineState->registration.sczCode, &pEngineState->userExperience, &pEngineState->update);
     ExitOnFailure(hr, "Failed to detect update.");
 
     // Detecting MSPs requires special initialization before processing each package but
@@ -462,8 +462,8 @@ extern "C" HRESULT CorePlan(
     pEngineState->plan.pCommand = &pEngineState->command;
     pEngineState->plan.pInternalCommand = &pEngineState->internalCommand;
     pEngineState->plan.pPayloads = &pEngineState->payloads;
-    pEngineState->plan.wzBundleId = pEngineState->registration.sczId;
-    pEngineState->plan.wzBundleProviderKey = pEngineState->registration.sczId;
+    pEngineState->plan.wzBundleCode = pEngineState->registration.sczCode;
+    pEngineState->plan.wzBundleProviderKey = pEngineState->registration.sczCode;
     pEngineState->plan.fDisableRollback = pEngineState->fDisableRollback || BOOTSTRAPPER_ACTION_UNSAFE_UNINSTALL == pEngineState->plan.action;
     pEngineState->plan.fPlanPackageCacheRollback = BOOTSTRAPPER_REGISTRATION_TYPE_NONE == pEngineState->registration.detectedRegistrationType;
 
diff --git a/src/burn/engine/dependency.cpp b/src/burn/engine/dependency.cpp
index d6698680..f398a070 100644
--- a/src/burn/engine/dependency.cpp
+++ b/src/burn/engine/dependency.cpp
@@ -200,10 +200,10 @@ extern "C" HRESULT DependencyInitialize(
 
     HRESULT hr = S_OK;
 
-    // If no parent was specified at all, use the bundle id as the self dependent.
+    // If no parent was specified at all, use the bundle code as the self dependent.
     if (!pInternalCommand->sczActiveParent)
     {
-        pDependencies->wzSelfDependent = pRegistration->sczId;
+        pDependencies->wzSelfDependent = pRegistration->sczCode;
     }
     else if (*pInternalCommand->sczActiveParent) // if parent was specified use that as the self dependent.
     {
@@ -243,30 +243,30 @@ extern "C" void DependencyUninitialize(
     memset(pDependencies, 0, sizeof(BURN_DEPENDENCIES));
 }
 
-extern "C" HRESULT DependencyDetectProviderKeyBundleId(
+extern "C" HRESULT DependencyDetectProviderKeyBundleCode(
     __in BURN_REGISTRATION* pRegistration
     )
 {
     HRESULT hr = S_OK;
 
-    hr = DepGetProviderInformation(pRegistration->hkRoot, pRegistration->sczProviderKey, &pRegistration->sczDetectedProviderKeyBundleId, NULL, NULL);
+    hr = DepGetProviderInformation(pRegistration->hkRoot, pRegistration->sczProviderKey, &pRegistration->sczDetectedProviderKeyBundleCode, NULL, NULL);
     if (E_NOTFOUND == hr)
     {
-        ReleaseNullStr(pRegistration->sczDetectedProviderKeyBundleId);
+        ReleaseNullStr(pRegistration->sczDetectedProviderKeyBundleCode);
         ExitFunction1(hr = S_OK);
     }
-    ExitOnFailure(hr, "Failed to get provider key bundle id.");
+    ExitOnFailure(hr, "Failed to get provider key bundle code.");
 
-    // If a bundle id was not explicitly set, default the provider key bundle id to this bundle's provider key.
-    if (!pRegistration->sczDetectedProviderKeyBundleId || !*pRegistration->sczDetectedProviderKeyBundleId)
+    // If a bundle code was not explicitly set, default the provider key bundle code to this bundle's provider key.
+    if (!pRegistration->sczDetectedProviderKeyBundleCode || !*pRegistration->sczDetectedProviderKeyBundleCode)
     {
-        hr = StrAllocString(&pRegistration->sczDetectedProviderKeyBundleId, pRegistration->sczProviderKey, 0);
-        ExitOnFailure(hr, "Failed to initialize provider key bundle id.");
+        hr = StrAllocString(&pRegistration->sczDetectedProviderKeyBundleCode, pRegistration->sczProviderKey, 0);
+        ExitOnFailure(hr, "Failed to initialize provider key bundle code.");
     }
-    else if (CSTR_EQUAL != ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, pRegistration->sczId, -1, pRegistration->sczDetectedProviderKeyBundleId, -1))
+    else if (CSTR_EQUAL != ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, pRegistration->sczCode, -1, pRegistration->sczDetectedProviderKeyBundleCode, -1))
     {
-        pRegistration->fDetectedForeignProviderKeyBundleId = TRUE;
-        LogId(REPORT_STANDARD, MSG_DETECTED_FOREIGN_BUNDLE_PROVIDER_REGISTRATION, pRegistration->sczProviderKey, pRegistration->sczDetectedProviderKeyBundleId);
+        pRegistration->fDetectedForeignProviderKeyBundleCode = TRUE;
+        LogId(REPORT_STANDARD, MSG_DETECTED_FOREIGN_BUNDLE_PROVIDER_REGISTRATION, pRegistration->sczProviderKey, pRegistration->sczDetectedProviderKeyBundleCode);
     }
 
 LExit:
@@ -281,8 +281,8 @@ extern "C" HRESULT DependencyDetectBundle(
     HRESULT hr = S_OK;
     BOOL fExists = FALSE;
 
-    hr = DependencyDetectProviderKeyBundleId(pRegistration);
-    ExitOnFailure(hr, "Failed to detect provider key bundle id.");
+    hr = DependencyDetectProviderKeyBundleCode(pRegistration);
+    ExitOnFailure(hr, "Failed to detect provider key bundle code.");
 
     hr = DepCheckDependents(pRegistration->hkRoot, pRegistration->sczProviderKey, 0, NULL, &pRegistration->rgDependents, &pRegistration->cDependents);
     ExitOnPathFailure(hr, fExists, "Failed dependents check on bundle.");
@@ -794,7 +794,7 @@ extern "C" HRESULT DependencyRegisterBundle(
     LogId(REPORT_VERBOSE, MSG_DEPENDENCY_BUNDLE_REGISTER, pRegistration->sczProviderKey, pRegistration->pVersion->sczVersion);
 
     // Register the bundle provider key.
-    hr = DepRegisterDependency(pRegistration->hkRoot, pRegistration->sczProviderKey, pRegistration->pVersion->sczVersion, pRegistration->sczDisplayName, pRegistration->sczId, 0);
+    hr = DepRegisterDependency(pRegistration->hkRoot, pRegistration->sczProviderKey, pRegistration->pVersion->sczVersion, pRegistration->sczDisplayName, pRegistration->sczCode, 0);
     ExitOnFailure(hr, "Failed to register the bundle dependency provider.");
 
 LExit:
@@ -835,10 +835,10 @@ extern "C" void DependencyUnregisterBundle(
     )
 {
     HRESULT hr = S_OK;
-    LPCWSTR wzDependentProviderKey = pRegistration->sczId;
+    LPCWSTR wzDependentProviderKey = pRegistration->sczCode;
 
     // If we own the bundle dependency then remove it.
-    if (!pRegistration->fDetectedForeignProviderKeyBundleId)
+    if (!pRegistration->fDetectedForeignProviderKeyBundleCode)
     {
         // Remove the bundle provider key.
         hr = DepUnregisterDependency(pRegistration->hkRoot, pRegistration->sczProviderKey);
@@ -969,7 +969,7 @@ static HRESULT DetectPackageDependents(
         {
             DEPENDENCY* pDependent = pProvider->rgDependents + iDependent;
 
-            if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, pRegistration->sczId, -1, pDependent->sczKey, -1))
+            if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, pRegistration->sczCode, -1, pDependent->sczKey, -1))
             {
                 pProvider->fBundleRegisteredAsDependent = TRUE;
                 fBundleRegisteredAsDependent = TRUE;
diff --git a/src/burn/engine/dependency.h b/src/burn/engine/dependency.h
index b5e4050f..d539e9b5 100644
--- a/src/burn/engine/dependency.h
+++ b/src/burn/engine/dependency.h
@@ -55,12 +55,12 @@ void DependencyUninitialize(
     );
 
 /********************************************************************
- DependencyDetectProviderKeyBundleId - Detect if the provider key is
+ DependencyDetectProviderKeyBundleCode - Detect if the provider key is
   registered and if so what bundle is registered.
 
  Note: Returns E_NOTFOUND if the provider key is not registered.
 *********************************************************************/
-HRESULT DependencyDetectProviderKeyBundleId(
+HRESULT DependencyDetectProviderKeyBundleCode(
     __in BURN_REGISTRATION* pRegistration
     );
 
diff --git a/src/burn/engine/detect.cpp b/src/burn/engine/detect.cpp
index 18820c5d..08f6b57c 100644
--- a/src/burn/engine/detect.cpp
+++ b/src/burn/engine/detect.cpp
@@ -18,13 +18,13 @@ static HRESULT WINAPI AuthenticationRequired(
     );
 
 static HRESULT DetectAtomFeedUpdate(
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in BURN_USER_EXPERIENCE* pUX,
     __in BURN_UPDATE* pUpdate
     );
 
 static HRESULT DownloadUpdateFeed(
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in BURN_USER_EXPERIENCE* pUX,
     __in BURN_UPDATE* pUpdate,
     __deref_inout_z LPWSTR* psczTempFile
@@ -38,8 +38,8 @@ extern "C" void DetectReset(
     )
 {
     RelatedBundlesUninitialize(&pRegistration->relatedBundles);
-    ReleaseNullStr(pRegistration->sczDetectedProviderKeyBundleId);
-    pRegistration->fDetectedForeignProviderKeyBundleId = FALSE;
+    ReleaseNullStr(pRegistration->sczDetectedProviderKeyBundleCode);
+    pRegistration->fDetectedForeignProviderKeyBundleCode = FALSE;
     pRegistration->fSelfRegisteredAsDependent = FALSE;
     pRegistration->fParentRegisteredAsDependent = FALSE;
     pRegistration->fForwardCompatibleBundleExists = FALSE;
@@ -123,14 +123,14 @@ extern "C" HRESULT DetectForwardCompatibleBundles(
     HRESULT hr = S_OK;
     int nCompareResult = 0;
 
-    if (pRegistration->fDetectedForeignProviderKeyBundleId)
+    if (pRegistration->fDetectedForeignProviderKeyBundleCode)
     {
         for (DWORD iRelatedBundle = 0; iRelatedBundle < pRegistration->relatedBundles.cRelatedBundles; ++iRelatedBundle)
         {
             BURN_RELATED_BUNDLE* pRelatedBundle = pRegistration->relatedBundles.rgRelatedBundles + iRelatedBundle;
 
             if (BOOTSTRAPPER_RELATION_UPGRADE == pRelatedBundle->detectRelationType &&
-                CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, pRegistration->sczDetectedProviderKeyBundleId, -1, pRelatedBundle->package.sczId, -1))
+                CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, pRegistration->sczDetectedProviderKeyBundleCode, -1, pRelatedBundle->package.sczId, -1))
             {
                 hr = VerCompareParsedVersions(pRegistration->pVersion, pRelatedBundle->pVersion, &nCompareResult);
                 ExitOnFailure(hr, "Failed to compare bundle version '%ls' to related bundle version '%ls'", pRegistration->pVersion->sczVersion, pRelatedBundle->pVersion->sczVersion);
@@ -201,7 +201,7 @@ LExit:
 }
 
 extern "C" HRESULT DetectUpdate(
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in BURN_USER_EXPERIENCE* pUX,
     __in BURN_UPDATE* pUpdate
     )
@@ -228,7 +228,7 @@ extern "C" HRESULT DetectUpdate(
 
     if (!fSkip)
     {
-        hr = DetectAtomFeedUpdate(wzBundleId, pUX, pUpdate);
+        hr = DetectAtomFeedUpdate(wzBundleCode, pUX, pUpdate);
         ExitOnFailure(hr, "Failed to detect atom feed update.");
     }
 
@@ -306,7 +306,7 @@ LExit:
 }
 
 static HRESULT DownloadUpdateFeed(
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in BURN_USER_EXPERIENCE* pUX,
     __in BURN_UPDATE* pUpdate,
     __deref_inout_z LPWSTR* psczTempFile
@@ -334,7 +334,7 @@ static HRESULT DownloadUpdateFeed(
     cacheCallback.pv = NULL; //pProgress;
 
     authenticationData.pUX = pUX;
-    authenticationData.wzPackageOrContainerId = wzBundleId;
+    authenticationData.wzPackageOrContainerId = wzBundleCode;
 
     authenticationCallback.pv =  static_cast<LPVOID>(&authenticationData);
     authenticationCallback.pfnAuthenticate = &AuthenticationRequired;
@@ -364,7 +364,7 @@ LExit:
 
 
 static HRESULT DetectAtomFeedUpdate(
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in BURN_USER_EXPERIENCE* pUX,
     __in BURN_UPDATE* pUpdate
     )
@@ -385,7 +385,7 @@ static HRESULT DetectAtomFeedUpdate(
     hr = AtomInitialize();
     ExitOnFailure(hr, "Failed to initialize Atom.");
 
-    hr = DownloadUpdateFeed(wzBundleId, pUX, pUpdate, &sczUpdateFeedTempFile);
+    hr = DownloadUpdateFeed(wzBundleCode, pUX, pUpdate, &sczUpdateFeedTempFile);
     ExitOnFailure(hr, "Failed to download update feed.");
 
     hr = AtomParseFromFile(sczUpdateFeedTempFile, &pAtomFeed);
diff --git a/src/burn/engine/detect.h b/src/burn/engine/detect.h
index cdca2777..a0562ba2 100644
--- a/src/burn/engine/detect.h
+++ b/src/burn/engine/detect.h
@@ -33,7 +33,7 @@ HRESULT DetectReportRelatedBundles(
     );
 
 HRESULT DetectUpdate(
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in BURN_USER_EXPERIENCE* pUX,
     __in BURN_UPDATE* pUpdate
     );
diff --git a/src/burn/engine/elevation.cpp b/src/burn/engine/elevation.cpp
index 924d2184..85d5a543 100644
--- a/src/burn/engine/elevation.cpp
+++ b/src/burn/engine/elevation.cpp
@@ -556,7 +556,7 @@ extern "C" HRESULT ElevationSessionBegin(
     __in BOOL fDisableResume,
     __in BURN_VARIABLES* pVariables,
     __in DWORD dwRegistrationOperations,
-    __in BOOL fDetectedForeignProviderKeyBundleId,
+    __in BOOL fDetectedForeignProviderKeyBundleCode,
     __in DWORD64 qwEstimatedSize,
     __in BOOTSTRAPPER_REGISTRATION_TYPE registrationType
     )
@@ -579,7 +579,7 @@ extern "C" HRESULT ElevationSessionBegin(
     hr = BuffWriteNumber(&pbData, &cbData, dwRegistrationOperations);
     ExitOnFailure(hr, "Failed to write registration operations to message buffer.");
 
-    hr = BuffWriteNumber(&pbData, &cbData, (DWORD)fDetectedForeignProviderKeyBundleId);
+    hr = BuffWriteNumber(&pbData, &cbData, (DWORD)fDetectedForeignProviderKeyBundleCode);
     ExitOnFailure(hr, "Failed to write dependency registration action to message buffer.");
 
     hr = BuffWriteNumber64(&pbData, &cbData, qwEstimatedSize);
@@ -611,7 +611,7 @@ extern "C" HRESULT ElevationSessionEnd(
     __in HANDLE hPipe,
     __in BURN_RESUME_MODE resumeMode,
     __in BOOTSTRAPPER_APPLY_RESTART restart,
-    __in BOOL fDetectedForeignProviderKeyBundleId,
+    __in BOOL fDetectedForeignProviderKeyBundleCode,
     __in DWORD64 qwEstimatedSize,
     __in BOOTSTRAPPER_REGISTRATION_TYPE registrationType
     )
@@ -628,7 +628,7 @@ extern "C" HRESULT ElevationSessionEnd(
     hr = BuffWriteNumber(&pbData, &cbData, (DWORD)restart);
     ExitOnFailure(hr, "Failed to write restart enum to message buffer.");
 
-    hr = BuffWriteNumber(&pbData, &cbData, (DWORD)fDetectedForeignProviderKeyBundleId);
+    hr = BuffWriteNumber(&pbData, &cbData, (DWORD)fDetectedForeignProviderKeyBundleCode);
     ExitOnFailure(hr, "Failed to write dependency registration action to message buffer.");
 
     hr = BuffWriteNumber64(&pbData, &cbData, qwEstimatedSize);
@@ -821,8 +821,8 @@ extern "C" HRESULT ElevationProcessDependentRegistration(
     hr = BuffWriteNumber(&pbData, &cbData, pAction->type);
     ExitOnFailure(hr, "Failed to write action type to message buffer.");
 
-    hr = BuffWriteString(&pbData, &cbData, pAction->sczBundleId);
-    ExitOnFailure(hr, "Failed to write bundle id to message buffer.");
+    hr = BuffWriteString(&pbData, &cbData, pAction->sczBundleCode);
+    ExitOnFailure(hr, "Failed to write bundle code to message buffer.");
 
     hr = BuffWriteString(&pbData, &cbData, pAction->sczDependentProviderKey);
     ExitOnFailure(hr, "Failed to write dependent provider key to message buffer.");
@@ -2559,7 +2559,7 @@ static HRESULT OnSessionBegin(
     hr = BuffReadNumber(pbData, cbData, &iData, &dwRegistrationOperations);
     ExitOnFailure(hr, "Failed to read registration operations.");
 
-    hr = BuffReadNumber(pbData, cbData, &iData, (DWORD*)&pRegistration->fDetectedForeignProviderKeyBundleId);
+    hr = BuffReadNumber(pbData, cbData, &iData, (DWORD*)&pRegistration->fDetectedForeignProviderKeyBundleCode);
     ExitOnFailure(hr, "Failed to read dependency registration action.");
 
     hr = BuffReadNumber64(pbData, cbData, &iData, &qwEstimatedSize);
@@ -2604,7 +2604,7 @@ static HRESULT OnSessionEnd(
     hr = BuffReadNumber(pbData, cbData, &iData, &dwRestart);
     ExitOnFailure(hr, "Failed to read restart enum.");
 
-    hr = BuffReadNumber(pbData, cbData, &iData, (DWORD*)&pRegistration->fDetectedForeignProviderKeyBundleId);
+    hr = BuffReadNumber(pbData, cbData, &iData, (DWORD*)&pRegistration->fDetectedForeignProviderKeyBundleCode);
     ExitOnFailure(hr, "Failed to read dependency registration action.");
 
     hr = BuffReadNumber64(pbData, cbData, &iData, &qwEstimatedSize);
@@ -2810,8 +2810,8 @@ static HRESULT OnProcessDependentRegistration(
     hr = BuffReadNumber(pbData, cbData, &iData, (DWORD*)&action.type);
     ExitOnFailure(hr, "Failed to read action type.");
 
-    hr = BuffReadString(pbData, cbData, &iData, &action.sczBundleId);
-    ExitOnFailure(hr, "Failed to read bundle id.");
+    hr = BuffReadString(pbData, cbData, &iData, &action.sczBundleCode);
+    ExitOnFailure(hr, "Failed to read bundle code.");
 
     hr = BuffReadString(pbData, cbData, &iData, &action.sczDependentProviderKey);
     ExitOnFailure(hr, "Failed to read dependent provider key.");
@@ -2824,7 +2824,7 @@ LExit:
     // TODO: do the right thing here.
     //DependencyUninitializeRegistrationAction(&action);
     ReleaseStr(action.sczDependentProviderKey);
-    ReleaseStr(action.sczBundleId)
+    ReleaseStr(action.sczBundleCode)
 
     return hr;
 }
@@ -2854,7 +2854,7 @@ static HRESULT OnExecuteRelatedBundle(
 
     // Deserialize message data.
     hr = BuffReadString(pbData, cbData, &iData, &sczPackage);
-    ExitOnFailure(hr, "Failed to read related bundle id.");
+    ExitOnFailure(hr, "Failed to read related bundle code.");
 
     hr = BuffReadNumber(pbData, cbData, &iData, (DWORD*)&executeAction.relatedBundle.action);
     ExitOnFailure(hr, "Failed to read action.");
diff --git a/src/burn/engine/elevation.h b/src/burn/engine/elevation.h
index 02019977..04ad244c 100644
--- a/src/burn/engine/elevation.h
+++ b/src/burn/engine/elevation.h
@@ -29,7 +29,7 @@ HRESULT ElevationSessionBegin(
     __in BOOL fDisableResume,
     __in BURN_VARIABLES* pVariables,
     __in DWORD dwRegistrationOperations,
-    __in BOOL fDetectedForeignProviderKeyBundleId,
+    __in BOOL fDetectedForeignProviderKeyBundleCode,
     __in DWORD64 qwEstimatedSize,
     __in BOOTSTRAPPER_REGISTRATION_TYPE registrationType
     );
@@ -37,7 +37,7 @@ HRESULT ElevationSessionEnd(
     __in HANDLE hPipe,
     __in BURN_RESUME_MODE resumeMode,
     __in BOOTSTRAPPER_APPLY_RESTART restart,
-    __in BOOL fDetectedForeignProviderKeyBundleId,
+    __in BOOL fDetectedForeignProviderKeyBundleCode,
     __in DWORD64 qwEstimatedSize,
     __in BOOTSTRAPPER_REGISTRATION_TYPE registrationType
     );
diff --git a/src/burn/engine/externalengine.cpp b/src/burn/engine/externalengine.cpp
index 1c775e23..352d184c 100644
--- a/src/burn/engine/externalengine.cpp
+++ b/src/burn/engine/externalengine.cpp
@@ -837,7 +837,7 @@ LExit:
 
 HRESULT ExternalEngineGetRelatedBundleVariable(
     __in BURN_ENGINE_STATE* /*pEngineState*/,
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in_z LPCWSTR wzVariable,
     __out_ecount_opt(*pcchValue) LPWSTR wzValue,
     __inout SIZE_T* pcchValue
@@ -848,7 +848,7 @@ HRESULT ExternalEngineGetRelatedBundleVariable(
 
     if (wzVariable && *wzVariable && pcchValue)
     {
-        hr = BundleGetBundleVariable(wzBundleId, wzVariable, &sczValue);
+        hr = BundleGetBundleVariable(wzBundleCode, wzVariable, &sczValue);
         if (SUCCEEDED(hr))
         {
             hr = CopyStringToExternal(sczValue, wzValue, pcchValue);
diff --git a/src/burn/engine/externalengine.h b/src/burn/engine/externalengine.h
index 3569392d..9b95e645 100644
--- a/src/burn/engine/externalengine.h
+++ b/src/burn/engine/externalengine.h
@@ -133,7 +133,7 @@ HRESULT ExternalEngineCompareVersions(
 
 HRESULT ExternalEngineGetRelatedBundleVariable(
     __in BURN_ENGINE_STATE* pEngineState,
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in_z LPCWSTR wzVariable,
     __out_ecount_opt(*pcchValue) LPWSTR wzValue,
     __inout SIZE_T* pcchValue
diff --git a/src/burn/engine/package.h b/src/burn/engine/package.h
index 1ea169e6..d596d7c0 100644
--- a/src/burn/engine/package.h
+++ b/src/burn/engine/package.h
@@ -323,7 +323,7 @@ typedef struct _BURN_PACKAGE
     {
         struct
         {
-            LPWSTR sczBundleId;
+            LPWSTR sczBundleCode;
             LPWSTR sczArpKeyPath;
             VERUTIL_VERSION* pVersion;
             LPWSTR sczRegistrationKey;
diff --git a/src/burn/engine/plan.cpp b/src/burn/engine/plan.cpp
index be281827..47b1c621 100644
--- a/src/burn/engine/plan.cpp
+++ b/src/burn/engine/plan.cpp
@@ -74,7 +74,7 @@ static HRESULT AddRegistrationAction(
     __in BURN_PLAN* pPlan,
     __in BURN_DEPENDENT_REGISTRATION_ACTION_TYPE type,
     __in_z LPCWSTR wzDependentProviderKey,
-    __in_z LPCWSTR wzOwnerBundleId
+    __in_z LPCWSTR wzOwnerBundleCode
     );
 static HRESULT AddCachePackage(
     __in BURN_PLAN* pPlan,
@@ -467,7 +467,7 @@ extern "C" HRESULT PlanLayoutBundle(
     hr = StrAllocString(&pCacheAction->bundleLayout.sczExecutableName, wzExecutableName, 0);
     ExitOnFailure(hr, "Failed to to copy executable name for bundle.");
 
-    hr = CacheCalculateBundleLayoutWorkingPath(pPlan->pCache, pPlan->wzBundleId, &pCacheAction->bundleLayout.sczUnverifiedPath);
+    hr = CacheCalculateBundleLayoutWorkingPath(pPlan->pCache, pPlan->wzBundleCode, &pCacheAction->bundleLayout.sczUnverifiedPath);
     ExitOnFailure(hr, "Failed to calculate bundle layout working path.");
 
     pCacheAction->bundleLayout.qwBundleSize = qwBundleSize;
@@ -599,7 +599,7 @@ extern "C" HRESULT PlanRegistration(
         // If our provider key was not owned by a different bundle,
         // then plan to write our provider key registration to "fix it" if broken
         // in case the bundle isn't successfully uninstalled.
-        if (!pRegistration->fDetectedForeignProviderKeyBundleId)
+        if (!pRegistration->fDetectedForeignProviderKeyBundleCode)
         {
             pPlan->dwRegistrationOperations |= BURN_REGISTRATION_ACTION_OPERATIONS_WRITE_PROVIDER_KEY;
         }
@@ -612,7 +612,7 @@ extern "C" HRESULT PlanRegistration(
         // would prevent self-removal.
         if (pRegistration->fSelfRegisteredAsDependent)
         {
-            hr = AddRegistrationAction(pPlan, BURN_DEPENDENT_REGISTRATION_ACTION_TYPE_UNREGISTER, pDependencies->wzSelfDependent, pRegistration->sczId);
+            hr = AddRegistrationAction(pPlan, BURN_DEPENDENT_REGISTRATION_ACTION_TYPE_UNREGISTER, pDependencies->wzSelfDependent, pRegistration->sczCode);
             ExitOnFailure(hr, "Failed to allocate registration action.");
 
             hr = DependencyAddIgnoreDependencies(sdIgnoreDependents, pDependencies->wzSelfDependent);
@@ -758,7 +758,7 @@ extern "C" HRESULT PlanRegistration(
         // as our own dependent.
         if (pDependencies->wzSelfDependent && !pRegistration->fSelfRegisteredAsDependent && (pDependencies->wzActiveParent || !fAddonOrPatchBundle))
         {
-            hr = AddRegistrationAction(pPlan, BURN_DEPENDENT_REGISTRATION_ACTION_TYPE_REGISTER, pDependencies->wzSelfDependent, pRegistration->sczId);
+            hr = AddRegistrationAction(pPlan, BURN_DEPENDENT_REGISTRATION_ACTION_TYPE_REGISTER, pDependencies->wzSelfDependent, pRegistration->sczCode);
             ExitOnFailure(hr, "Failed to add registration action for self dependent.");
         }
     }
@@ -1439,7 +1439,7 @@ extern "C" HRESULT PlanRelatedBundlesBegin(
             }
             else if (E_NOTFOUND != hr)
             {
-                ExitOnFailure(hr, "Failed to lookup the bundle ID in the ancestors dictionary.");
+                ExitOnFailure(hr, "Failed to lookup the bundle code in the ancestors dictionary.");
             }
         }
         else if (fDependent && BOOTSTRAPPER_RELATION_NONE != relationType)
@@ -2076,7 +2076,7 @@ static void UninitializeRegistrationAction(
     )
 {
     ReleaseStr(pAction->sczDependentProviderKey);
-    ReleaseStr(pAction->sczBundleId);
+    ReleaseStr(pAction->sczBundleCode);
     memset(pAction, 0, sizeof(BURN_DEPENDENT_REGISTRATION_ACTION));
 }
 
@@ -2271,7 +2271,7 @@ static HRESULT AddRegistrationAction(
     __in BURN_PLAN* pPlan,
     __in BURN_DEPENDENT_REGISTRATION_ACTION_TYPE type,
     __in_z LPCWSTR wzDependentProviderKey,
-    __in_z LPCWSTR wzOwnerBundleId
+    __in_z LPCWSTR wzOwnerBundleCode
     )
 {
     HRESULT hr = S_OK;
@@ -2287,7 +2287,7 @@ static HRESULT AddRegistrationAction(
 
     pAction->type = type;
 
-    hr = StrAllocString(&pAction->sczBundleId, wzOwnerBundleId, 0);
+    hr = StrAllocString(&pAction->sczBundleCode, wzOwnerBundleCode, 0);
     ExitOnFailure(hr, "Failed to copy owner bundle to registration action.");
 
     hr = StrAllocString(&pAction->sczDependentProviderKey, wzDependentProviderKey, 0);
@@ -2302,7 +2302,7 @@ static HRESULT AddRegistrationAction(
 
     pAction->type = rollbackType;
 
-    hr = StrAllocString(&pAction->sczBundleId, wzOwnerBundleId, 0);
+    hr = StrAllocString(&pAction->sczBundleCode, wzOwnerBundleCode, 0);
     ExitOnFailure(hr, "Failed to copy owner bundle to registration action.");
 
     hr = StrAllocString(&pAction->sczDependentProviderKey, wzDependentProviderKey, 0);
@@ -2880,7 +2880,7 @@ static void DependentRegistrationActionLog(
 
     if (wzType)
     {
-        LogStringLine(PlanDumpLevel, "%ls action[%u]: %ls bundle id: %ls, provider key: %ls", wzBase, iAction, wzType, pAction->sczBundleId, pAction->sczDependentProviderKey);
+        LogStringLine(PlanDumpLevel, "%ls action[%u]: %ls bundle code: %ls, provider key: %ls", wzBase, iAction, wzType, pAction->sczBundleCode, pAction->sczDependentProviderKey);
     }
 }
 
@@ -3076,7 +3076,7 @@ extern "C" void PlanDump(
     LogStringLine(PlanDumpLevel, "--- Begin plan dump ---");
 
     LogStringLine(PlanDumpLevel, "Plan action: %hs", LoggingBurnActionToString(pPlan->action));
-    LogStringLine(PlanDumpLevel, "     bundle id: %ls", pPlan->wzBundleId);
+    LogStringLine(PlanDumpLevel, "     bundle code: %ls", pPlan->wzBundleCode);
     LogStringLine(PlanDumpLevel, "     bundle provider key: %ls", pPlan->wzBundleProviderKey);
     LogStringLine(PlanDumpLevel, "     use-forward-compatible: %hs", LoggingTrueFalseToString(pPlan->fEnabledForwardCompatibleBundle));
     LogStringLine(PlanDumpLevel, "     per-machine: %hs", LoggingTrueFalseToString(pPlan->fPerMachine));
diff --git a/src/burn/engine/plan.h b/src/burn/engine/plan.h
index 386de2c6..03b1423d 100644
--- a/src/burn/engine/plan.h
+++ b/src/burn/engine/plan.h
@@ -71,7 +71,7 @@ enum BURN_CLEAN_ACTION_TYPE
 typedef struct _BURN_DEPENDENT_REGISTRATION_ACTION
 {
     BURN_DEPENDENT_REGISTRATION_ACTION_TYPE type;
-    LPWSTR sczBundleId;
+    LPWSTR sczBundleCode;
     LPWSTR sczDependentProviderKey;
 } BURN_DEPENDENT_REGISTRATION_ACTION;
 
@@ -253,7 +253,7 @@ typedef struct _BURN_PLAN
     BOOTSTRAPPER_COMMAND* pCommand;
     BURN_ENGINE_COMMAND* pInternalCommand;
     BURN_PAYLOADS* pPayloads;
-    LPWSTR wzBundleId;          // points directly into parent the ENGINE_STATE.
+    LPWSTR wzBundleCode;          // points directly into parent the ENGINE_STATE.
     LPWSTR wzBundleProviderKey; // points directly into parent the ENGINE_STATE.
     BOOL fPerMachine;
     BOOL fCanAffectMachineState;
diff --git a/src/burn/engine/registration.cpp b/src/burn/engine/registration.cpp
index 771b9425..85c006f7 100644
--- a/src/burn/engine/registration.cpp
+++ b/src/burn/engine/registration.cpp
@@ -132,9 +132,9 @@ extern "C" HRESULT RegistrationParseFromXml(
     hr = XmlSelectSingleNode(pixnBundle, L"Registration", &pixnRegistrationNode);
     ExitOnRequiredXmlQueryFailure(hr, "Failed to select registration node.");
 
-    // @Id
-    hr = XmlGetAttributeEx(pixnRegistrationNode, L"Id", &pRegistration->sczId);
-    ExitOnRequiredXmlQueryFailure(hr, "Failed to get @Id.");
+    // @Code
+    hr = XmlGetAttributeEx(pixnRegistrationNode, L"Code", &pRegistration->sczCode);
+    ExitOnRequiredXmlQueryFailure(hr, "Failed to get @Code.");
 
     // @Tag
     hr = XmlGetAttributeEx(pixnRegistrationNode, L"Tag", &pRegistration->sczTag);
@@ -305,7 +305,7 @@ extern "C" void RegistrationUninitialize(
     __in BURN_REGISTRATION* pRegistration
     )
 {
-    ReleaseStr(pRegistration->sczId);
+    ReleaseStr(pRegistration->sczCode);
     ReleaseStr(pRegistration->sczTag);
 
     for (DWORD i = 0; i < pRegistration->cDetectCodes; ++i)
@@ -371,7 +371,7 @@ extern "C" void RegistrationUninitialize(
         MemFree(pRegistration->softwareTags.rgSoftwareTags);
     }
 
-    ReleaseStr(pRegistration->sczDetectedProviderKeyBundleId);
+    ReleaseStr(pRegistration->sczDetectedProviderKeyBundleCode);
     ReleaseStr(pRegistration->sczBundlePackageAncestors);
     RelatedBundlesUninitialize(&pRegistration->relatedBundles);
 
@@ -620,7 +620,7 @@ extern "C" HRESULT RegistrationSessionBegin(
     // Cache bundle executable.
     if (dwRegistrationOptions & BURN_REGISTRATION_ACTION_OPERATIONS_CACHE_BUNDLE)
     {
-        hr = CacheCompleteBundle(pCache, pRegistration->fPerMachine, pRegistration->sczExecutableName, pRegistration->sczId, wzEngineWorkingPath
+        hr = CacheCompleteBundle(pCache, pRegistration->fPerMachine, pRegistration->sczExecutableName, pRegistration->sczCode, wzEngineWorkingPath
 #ifdef DEBUG
                         , pRegistration->sczCacheExecutablePath
 #endif
@@ -888,7 +888,7 @@ extern "C" HRESULT RegistrationSessionEnd(
         hr = RegDelete(pRegistration->hkRoot, pRegistration->sczRegistrationKey, REG_KEY_DEFAULT, TRUE);
         ExitOnPathFailure(hr, fDeleted, "Failed to delete registration key: %ls", pRegistration->sczRegistrationKey);
 
-        CacheRemoveBundle(pCache, pRegistration->fPerMachine, pRegistration->sczId);
+        CacheRemoveBundle(pCache, pRegistration->fPerMachine, pRegistration->sczCode);
     }
     else // the mode needs to be updated so open the registration key.
     {
@@ -1153,11 +1153,11 @@ static HRESULT SetPaths(
     pRegistration->hkRoot = pRegistration->fPerMachine ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
 
     // build uninstall registry key path
-    hr = StrAllocFormatted(&pRegistration->sczRegistrationKey, L"%ls\\%ls", BURN_REGISTRATION_REGISTRY_UNINSTALL_KEY, pRegistration->sczId);
+    hr = StrAllocFormatted(&pRegistration->sczRegistrationKey, L"%ls\\%ls", BURN_REGISTRATION_REGISTRY_UNINSTALL_KEY, pRegistration->sczCode);
     ExitOnFailure(hr, "Failed to build uninstall registry key path.");
 
     // build cache directory
-    hr = CacheGetCompletedPath(pCache, pRegistration->fPerMachine, pRegistration->sczId, &sczCacheDirectory);
+    hr = CacheGetCompletedPath(pCache, pRegistration->fPerMachine, pRegistration->sczCode, &sczCacheDirectory);
     ExitOnFailure(hr, "Failed to build cache directory.");
 
     // build cached executable path
@@ -1287,7 +1287,7 @@ static HRESULT UpdateResumeMode(
         hr = RegCreate(pRegistration->hkRoot, sczResumeKey, KEY_WRITE, &hkRun);
         ExitOnFailure(hr, "Failed to create run key.");
 
-        hr = RegWriteString(hkRun, pRegistration->sczId, sczRunOnceCommandLine);
+        hr = RegWriteString(hkRun, pRegistration->sczCode, sczRunOnceCommandLine);
         ExitOnFailure(hr, "Failed to write run key value.");
 
         hr = RegWriteString(hkRegistration, REGISTRY_BUNDLE_RESUME_COMMAND_LINE, pRegistration->sczResumeCommandLine);
@@ -1304,7 +1304,7 @@ static HRESULT UpdateResumeMode(
         {
             ExitOnFailure(hr, "Failed to open run key.");
 
-            er = ::RegDeleteValueW(hkRun, pRegistration->sczId);
+            er = ::RegDeleteValueW(hkRun, pRegistration->sczCode);
             if (ERROR_FILE_NOT_FOUND == er)
             {
                 er = ERROR_SUCCESS;
diff --git a/src/burn/engine/registration.h b/src/burn/engine/registration.h
index 91c3fdcd..326f21c6 100644
--- a/src/burn/engine/registration.h
+++ b/src/burn/engine/registration.h
@@ -99,7 +99,7 @@ typedef struct _BURN_REGISTRATION
     BOOL fDisableResume;
     BOOL fCached;
     BOOTSTRAPPER_REGISTRATION_TYPE detectedRegistrationType;
-    LPWSTR sczId;
+    LPWSTR sczCode;
     LPWSTR sczTag;
 
     LPWSTR *rgsczDetectCodes;
@@ -155,8 +155,8 @@ typedef struct _BURN_REGISTRATION
     BOOL fForwardCompatibleBundleExists; // Only valid after detect.
     BOOL fEligibleForCleanup;            // Only valid after detect.
 
-    BOOL fDetectedForeignProviderKeyBundleId;
-    LPWSTR sczDetectedProviderKeyBundleId;
+    BOOL fDetectedForeignProviderKeyBundleCode;
+    LPWSTR sczDetectedProviderKeyBundleCode;
     LPWSTR sczBundlePackageAncestors;
 } BURN_REGISTRATION;
 
diff --git a/src/burn/engine/relatedbundle.cpp b/src/burn/engine/relatedbundle.cpp
index 23e0f352..938b24d7 100644
--- a/src/burn/engine/relatedbundle.cpp
+++ b/src/burn/engine/relatedbundle.cpp
@@ -30,8 +30,8 @@ static HRESULT LoadIfRelatedBundle(
     __in BURN_RELATED_BUNDLES* pRelatedBundles
     );
 static HRESULT LoadRelatedBundleFromKey(
-    __in_z LPCWSTR wzRelatedBundleId,
-    __in HKEY hkBundleId,
+    __in_z LPCWSTR wzRelatedBundleCode,
+    __in HKEY hkBundleCode,
     __in BOOL fPerMachine,
     __in BOOTSTRAPPER_RELATION_TYPE relationType,
     __in BURN_RELATED_BUNDLE *pRelatedBundle
@@ -108,7 +108,7 @@ extern "C" HRESULT RelatedBundleFindById(
     HRESULT hr = S_OK;
     BURN_RELATED_BUNDLE* pRelatedBundle = NULL;
     BURN_PACKAGE* pPackage = NULL;
-    
+
     *ppRelatedBundle = NULL;
 
     for (DWORD i = 0; i < pRelatedBundles->cRelatedBundles; ++i)
@@ -180,7 +180,7 @@ static __callback int __cdecl CompareRelatedBundlesDetect(
     const BURN_RELATED_BUNDLE* pBundleLeft = static_cast<const BURN_RELATED_BUNDLE*>(pvLeft);
     const BURN_RELATED_BUNDLE* pBundleRight = static_cast<const BURN_RELATED_BUNDLE*>(pvRight);
 
-    // Sort by relation type, then version, then bundle id.
+    // Sort by relation type, then version, then bundle code.
     if (pBundleLeft->detectRelationType != pBundleRight->detectRelationType)
     {
         // Upgrade bundles last, everything else according to the enum.
@@ -223,7 +223,7 @@ static __callback int __cdecl CompareRelatedBundlesPlan(
     const BURN_RELATED_BUNDLE* pBundleLeft = *reinterpret_cast<BURN_RELATED_BUNDLE**>(const_cast<void*>(pvLeft));
     const BURN_RELATED_BUNDLE* pBundleRight = *reinterpret_cast<BURN_RELATED_BUNDLE**>(const_cast<void*>(pvRight));
 
-    // Sort by relation type, then version, then bundle id.
+    // Sort by relation type, then version, then bundle code.
     if (pBundleLeft->planRelationType != pBundleRight->planRelationType)
     {
         // Upgrade bundles last, everything else according to the enum.
@@ -266,7 +266,7 @@ static BUNDLE_QUERY_CALLBACK_RESULT CALLBACK QueryRelatedBundlesCallback(
     BUNDLE_QUERY_CONTEXT* pContext = reinterpret_cast<BUNDLE_QUERY_CONTEXT*>(pvContext);
 
     hr = LoadIfRelatedBundle(pBundle, pContext->pRegistration, pContext->pRelatedBundles);
-    ExitOnFailure(hr, "Failed to load related bundle: %ls", pBundle->wzBundleId);
+    ExitOnFailure(hr, "Failed to load related bundle: %ls", pBundle->wzBundleCode);
 
 LExit:
     return result;
@@ -283,8 +283,8 @@ static HRESULT LoadIfRelatedBundle(
     BOOTSTRAPPER_RELATION_TYPE relationType = RelatedBundleConvertRelationType(pBundle->relationType);
     BURN_RELATED_BUNDLE* pRelatedBundle = NULL;
 
-    // If we found our bundle id, it's not a related bundle.
-    if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, pBundle->wzBundleId, -1, pRegistration->sczId, -1))
+    // If we found our bundle code, it's not a related bundle.
+    if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, pBundle->wzBundleCode, -1, pRegistration->sczCode, -1))
     {
         ExitFunction1(hr = S_FALSE);
     }
@@ -294,8 +294,8 @@ static HRESULT LoadIfRelatedBundle(
 
     pRelatedBundle = pRelatedBundles->rgRelatedBundles + pRelatedBundles->cRelatedBundles;
 
-    hr = LoadRelatedBundleFromKey(pBundle->wzBundleId, pBundle->hkBundle, fPerMachine, relationType, pRelatedBundle);
-    ExitOnFailure(hr, "Failed to initialize package from related bundle id: %ls", pBundle->wzBundleId);
+    hr = LoadRelatedBundleFromKey(pBundle->wzBundleCode, pBundle->hkBundle, fPerMachine, relationType, pRelatedBundle);
+    ExitOnFailure(hr, "Failed to initialize package from related bundle code: %ls", pBundle->wzBundleCode);
 
     hr = DependencyDetectRelatedBundle(pRelatedBundle, pRegistration);
     ExitOnFailure(hr, "Failed to detect dependencies for related bundle.");
@@ -307,8 +307,8 @@ LExit:
 }
 
 static HRESULT LoadRelatedBundleFromKey(
-    __in_z LPCWSTR wzRelatedBundleId,
-    __in HKEY hkBundleId,
+    __in_z LPCWSTR wzRelatedBundleCode,
+    __in HKEY hkBundleCode,
     __in BOOL fPerMachine,
     __in BOOTSTRAPPER_RELATION_TYPE relationType,
     __in BURN_RELATED_BUNDLE* pRelatedBundle
@@ -327,7 +327,7 @@ static HRESULT LoadRelatedBundleFromKey(
     BURN_DEPENDENCY_PROVIDER* pBundleDependencyProvider = NULL;
 
     // Only support progress from engines that are compatible.
-    hr = RegReadNumber(hkBundleId, BURN_REGISTRATION_REGISTRY_ENGINE_PROTOCOL_VERSION, &dwEngineProtocolVersion);
+    hr = RegReadNumber(hkBundleCode, BURN_REGISTRATION_REGISTRY_ENGINE_PROTOCOL_VERSION, &dwEngineProtocolVersion);
     if (SUCCEEDED(hr))
     {
         fSupportsBurnProtocol = BURN_PROTOCOL_VERSION == dwEngineProtocolVersion;
@@ -335,7 +335,7 @@ static HRESULT LoadRelatedBundleFromKey(
     else
     {
         // Rely on version checking (aka: version greater than or equal to last protocol breaking change *and* versions that are older or the same as this engine)
-        hr = RegReadVersion(hkBundleId, BURN_REGISTRATION_REGISTRY_ENGINE_VERSION, &qwEngineVersion);
+        hr = RegReadVersion(hkBundleCode, BURN_REGISTRATION_REGISTRY_ENGINE_VERSION, &qwEngineVersion);
         if (SUCCEEDED(hr))
         {
             fSupportsBurnProtocol = (FILEMAKEVERSION(3, 6, 2221, 0) <= qwEngineVersion && qwEngineVersion <= FILEMAKEVERSION(rmj, rmm, rup, rpr));
@@ -344,19 +344,19 @@ static HRESULT LoadRelatedBundleFromKey(
         hr = S_OK;
     }
 
-    hr = RegReadString(hkBundleId, BURN_REGISTRATION_REGISTRY_BUNDLE_VERSION, &sczBundleVersion);
-    ExitOnFailure(hr, "Failed to read version from registry for bundle: %ls", wzRelatedBundleId);
+    hr = RegReadString(hkBundleCode, BURN_REGISTRATION_REGISTRY_BUNDLE_VERSION, &sczBundleVersion);
+    ExitOnFailure(hr, "Failed to read version from registry for bundle: %ls", wzRelatedBundleCode);
 
     hr = VerParseVersion(sczBundleVersion, 0, FALSE, &pRelatedBundle->pVersion);
     ExitOnFailure(hr, "Failed to parse pseudo bundle version: %ls", sczBundleVersion);
 
     if (pRelatedBundle->pVersion->fInvalid)
     {
-        LogId(REPORT_WARNING, MSG_RELATED_PACKAGE_INVALID_VERSION, wzRelatedBundleId, sczBundleVersion);
+        LogId(REPORT_WARNING, MSG_RELATED_PACKAGE_INVALID_VERSION, wzRelatedBundleCode, sczBundleVersion);
     }
 
-    hr = RegReadString(hkBundleId, BURN_REGISTRATION_REGISTRY_BUNDLE_CACHE_PATH, &sczCachePath);
-    ExitOnFailure(hr, "Failed to read cache path from registry for bundle: %ls", wzRelatedBundleId);
+    hr = RegReadString(hkBundleCode, BURN_REGISTRATION_REGISTRY_BUNDLE_CACHE_PATH, &sczCachePath);
+    ExitOnFailure(hr, "Failed to read cache path from registry for bundle: %ls", wzRelatedBundleCode);
 
     if (FileExistsEx(sczCachePath, NULL))
     {
@@ -364,13 +364,13 @@ static HRESULT LoadRelatedBundleFromKey(
     }
     else
     {
-        LogId(REPORT_STANDARD, MSG_DETECT_RELATED_BUNDLE_NOT_CACHED, wzRelatedBundleId, sczCachePath);
+        LogId(REPORT_STANDARD, MSG_DETECT_RELATED_BUNDLE_NOT_CACHED, wzRelatedBundleCode, sczCachePath);
     }
 
     pRelatedBundle->fPlannable = fCached;
 
-    hr = RegReadString(hkBundleId, BURN_REGISTRATION_REGISTRY_BUNDLE_PROVIDER_KEY, &dependencyProvider.sczKey);
-    ExitOnPathFailure(hr, fExists, "Failed to read provider key from registry for bundle: %ls", wzRelatedBundleId);
+    hr = RegReadString(hkBundleCode, BURN_REGISTRATION_REGISTRY_BUNDLE_PROVIDER_KEY, &dependencyProvider.sczKey);
+    ExitOnPathFailure(hr, fExists, "Failed to read provider key from registry for bundle: %ls", wzRelatedBundleCode);
 
     if (dependencyProvider.sczKey && *dependencyProvider.sczKey)
     {
@@ -379,23 +379,23 @@ static HRESULT LoadRelatedBundleFromKey(
         dependencyProvider.fImported = TRUE;
 
         hr = StrAllocString(&dependencyProvider.sczVersion, pRelatedBundle->pVersion->sczVersion, 0);
-        ExitOnFailure(hr, "Failed to copy version for bundle: %ls", wzRelatedBundleId);
+        ExitOnFailure(hr, "Failed to copy version for bundle: %ls", wzRelatedBundleCode);
 
-        hr = RegReadString(hkBundleId, BURN_REGISTRATION_REGISTRY_BUNDLE_DISPLAY_NAME, &dependencyProvider.sczDisplayName);
-        ExitOnPathFailure(hr, fExists, "Failed to copy display name for bundle: %ls", wzRelatedBundleId);
+        hr = RegReadString(hkBundleCode, BURN_REGISTRATION_REGISTRY_BUNDLE_DISPLAY_NAME, &dependencyProvider.sczDisplayName);
+        ExitOnPathFailure(hr, fExists, "Failed to copy display name for bundle: %ls", wzRelatedBundleCode);
     }
 
-    hr = RegReadString(hkBundleId, BURN_REGISTRATION_REGISTRY_BUNDLE_TAG, &pRelatedBundle->sczTag);
-    ExitOnPathFailure(hr, fExists, "Failed to read tag from registry for bundle: %ls", wzRelatedBundleId);
+    hr = RegReadString(hkBundleCode, BURN_REGISTRATION_REGISTRY_BUNDLE_TAG, &pRelatedBundle->sczTag);
+    ExitOnPathFailure(hr, fExists, "Failed to read tag from registry for bundle: %ls", wzRelatedBundleCode);
 
     pRelatedBundle->detectRelationType = relationType;
 
-    hr = PseudoBundleInitializeRelated(&pRelatedBundle->package, fSupportsBurnProtocol, fPerMachine, wzRelatedBundleId,
+    hr = PseudoBundleInitializeRelated(&pRelatedBundle->package, fSupportsBurnProtocol, fPerMachine, wzRelatedBundleCode,
 #ifdef DEBUG
                                        pRelatedBundle->detectRelationType,
 #endif
                                        fCached, sczCachePath, qwFileSize, pBundleDependencyProvider);
-    ExitOnFailure(hr, "Failed to initialize related bundle to represent bundle: %ls", wzRelatedBundleId);
+    ExitOnFailure(hr, "Failed to initialize related bundle to represent bundle: %ls", wzRelatedBundleCode);
 
 LExit:
     DependencyUninitializeProvider(&dependencyProvider);
diff --git a/src/burn/engine/section.cpp b/src/burn/engine/section.cpp
index fd3ce92c..f7c508f3 100644
--- a/src/burn/engine/section.cpp
+++ b/src/burn/engine/section.cpp
@@ -9,7 +9,7 @@ typedef struct _BURN_SECTION_HEADER
     DWORD dwMagic;
     DWORD dwVersion;
 
-    GUID guidBundleId;
+    GUID guidBundleCode;
 
     DWORD dwStubSize;
     DWORD dwOriginalChecksum;
@@ -235,7 +235,7 @@ extern "C" HRESULT SectionInitialize(
     memcpy(pSection->rgcbContainers, pBurnSectionHeader->rgcbContainers, sizeof(DWORD) * pSection->cContainers);
 
     // TODO: verify more than just the GUID.
-    hr = VerifySectionMatchesMemoryPEHeader(pBurnSectionHeader->guidBundleId);
+    hr = VerifySectionMatchesMemoryPEHeader(pBurnSectionHeader->guidBundleCode);
     ExitOnRootFailure(hr, "PE Header from file didn't match PE Header in memory.");
 
 LExit:
@@ -299,7 +299,7 @@ LExit:
 }
 
 HRESULT VerifySectionMatchesMemoryPEHeader(
-    __in REFGUID pBundleId
+    __in REFGUID pBundleCode
     )
 {
     HRESULT hr = S_OK;
@@ -382,7 +382,7 @@ HRESULT VerifySectionMatchesMemoryPEHeader(
         ExitOnRootFailure(hr, "Failed to read section info, unsupported version: %08x", pBurnSectionHeader->dwVersion);
     }
 
-    if (!::IsEqualGUID(pBundleId, pBurnSectionHeader->guidBundleId))
+    if (!::IsEqualGUID(pBundleCode, pBurnSectionHeader->guidBundleCode))
     {
         hr = E_INVALIDDATA;
         ExitOnRootFailure(hr, "Bundle guid didn't match the guid in the PE Header in memory.");
diff --git a/src/burn/stub/StubSection.cpp b/src/burn/stub/StubSection.cpp
index 62d3e91e..fc3ed182 100644
--- a/src/burn/stub/StubSection.cpp
+++ b/src/burn/stub/StubSection.cpp
@@ -8,7 +8,7 @@
 static DWORD dwMagic = BURN_SECTION_MAGIC;
 static DWORD dwVersion = BURN_SECTION_VERSION;
 
-static GUID guidBundleId = { };
+static GUID guidBundleCode = { };
 
 static DWORD dwStubSize = 0;
 static DWORD dwOriginalChecksum = 0;
diff --git a/src/burn/test/BurnUnitTest/ManifestTest.cpp b/src/burn/test/BurnUnitTest/ManifestTest.cpp
index 87484472..4959cee0 100644
--- a/src/burn/test/BurnUnitTest/ManifestTest.cpp
+++ b/src/burn/test/BurnUnitTest/ManifestTest.cpp
@@ -40,7 +40,7 @@ namespace Bootstrapper
                     "    <UX PrimaryPayloadId='ux.exe'>"
                     "        <Payload Id='ux.exe' FilePath='ux.exe' Packaging='embedded' SourcePath='u0' />"
                     "    </UX>"
-                    "    <Registration Id='{D54F896D-1952-43e6-9C67-B5652240618C}' Tag='foo' ProviderKey='foo' Version='1.0.0.0' ExecutableName='setup.exe' PerMachine='no' />"
+                    "    <Registration Code='{D54F896D-1952-43e6-9C67-B5652240618C}' Tag='foo' ProviderKey='foo' Version='1.0.0.0' ExecutableName='setup.exe' PerMachine='no' />"
                     "    <Variable Id='Variable1' Type='numeric' Value='1' Hidden='no' Persisted='no' />"
                     "    <RegistrySearch Id='Search1' Type='exists' Root='HKLM' Key='SOFTWARE\\Microsoft' Variable='Variable1' Condition='0' />"
                     "</BurnManifest>";
diff --git a/src/burn/test/BurnUnitTest/PlanTest.cpp b/src/burn/test/BurnUnitTest/PlanTest.cpp
index 97f0c015..e426cb09 100644
--- a/src/burn/test/BurnUnitTest/PlanTest.cpp
+++ b/src/burn/test/BurnUnitTest/PlanTest.cpp
@@ -64,7 +64,7 @@ namespace Bootstrapper
             NativeAssert::Succeeded(hr, "CorePlan failed");
 
             Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
-            NativeAssert::StringEqual(L"{9C459DAD-0E64-40C8-8C9F-4F68E46AB223}", pPlan->wzBundleId);
+            NativeAssert::StringEqual(L"{9C459DAD-0E64-40C8-8C9F-4F68E46AB223}", pPlan->wzBundleCode);
             NativeAssert::StringEqual(L"{9C459DAD-0E64-40C8-8C9F-4F68E46AB223}", pPlan->wzBundleProviderKey);
             Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle);
             Assert::Equal<BOOL>(FALSE, pPlan->fPerMachine);
@@ -158,7 +158,7 @@ namespace Bootstrapper
             NativeAssert::Succeeded(hr, "CorePlan failed");
 
             Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
-            NativeAssert::StringEqual(L"{9C459DAD-0E64-40C8-8C9F-4F68E46AB223}", pPlan->wzBundleId);
+            NativeAssert::StringEqual(L"{9C459DAD-0E64-40C8-8C9F-4F68E46AB223}", pPlan->wzBundleCode);
             NativeAssert::StringEqual(L"{9C459DAD-0E64-40C8-8C9F-4F68E46AB223}", pPlan->wzBundleProviderKey);
             Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle);
             Assert::Equal<BOOL>(FALSE, pPlan->fPerMachine);
@@ -237,7 +237,7 @@ namespace Bootstrapper
             NativeAssert::Succeeded(hr, "CorePlan failed");
 
             Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_UNINSTALL, pPlan->action);
-            NativeAssert::StringEqual(L"{9C459DAD-0E64-40C8-8C9F-4F68E46AB223}", pPlan->wzBundleId);
+            NativeAssert::StringEqual(L"{9C459DAD-0E64-40C8-8C9F-4F68E46AB223}", pPlan->wzBundleCode);
             NativeAssert::StringEqual(L"{9C459DAD-0E64-40C8-8C9F-4F68E46AB223}", pPlan->wzBundleProviderKey);
             Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle);
             Assert::Equal<BOOL>(FALSE, pPlan->fPerMachine);
@@ -330,7 +330,7 @@ namespace Bootstrapper
             NativeAssert::Succeeded(hr, "CorePlan failed");
 
             Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
-            NativeAssert::StringEqual(L"{E6469F05-BDC8-4EB8-B218-67412543EFAA}", pPlan->wzBundleId);
+            NativeAssert::StringEqual(L"{E6469F05-BDC8-4EB8-B218-67412543EFAA}", pPlan->wzBundleCode);
             NativeAssert::StringEqual(L"{E6469F05-BDC8-4EB8-B218-67412543EFAA}", pPlan->wzBundleProviderKey);
             Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle);
             Assert::Equal<BOOL>(TRUE, pPlan->fPerMachine);
@@ -490,7 +490,7 @@ namespace Bootstrapper
             NativeAssert::Succeeded(hr, "CorePlan failed");
 
             Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_UNINSTALL, pPlan->action);
-            NativeAssert::StringEqual(L"{E6469F05-BDC8-4EB8-B218-67412543EFAA}", pPlan->wzBundleId);
+            NativeAssert::StringEqual(L"{E6469F05-BDC8-4EB8-B218-67412543EFAA}", pPlan->wzBundleCode);
             NativeAssert::StringEqual(L"{E6469F05-BDC8-4EB8-B218-67412543EFAA}", pPlan->wzBundleProviderKey);
             Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle);
             Assert::Equal<BOOL>(TRUE, pPlan->fPerMachine);
@@ -631,7 +631,7 @@ namespace Bootstrapper
             NativeAssert::Succeeded(hr, "CorePlan failed");
 
             Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
-            NativeAssert::StringEqual(L"{35192ED0-C70A-49B2-9D12-3B1FA39B5E6F}", pPlan->wzBundleId);
+            NativeAssert::StringEqual(L"{35192ED0-C70A-49B2-9D12-3B1FA39B5E6F}", pPlan->wzBundleCode);
             NativeAssert::StringEqual(L"{35192ED0-C70A-49B2-9D12-3B1FA39B5E6F}", pPlan->wzBundleProviderKey);
             Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle);
             Assert::Equal<BOOL>(TRUE, pPlan->fPerMachine);
@@ -746,7 +746,7 @@ namespace Bootstrapper
             NativeAssert::Succeeded(hr, "CorePlan failed");
 
             Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_REPAIR, pPlan->action);
-            NativeAssert::StringEqual(L"{35192ED0-C70A-49B2-9D12-3B1FA39B5E6F}", pPlan->wzBundleId);
+            NativeAssert::StringEqual(L"{35192ED0-C70A-49B2-9D12-3B1FA39B5E6F}", pPlan->wzBundleCode);
             NativeAssert::StringEqual(L"{35192ED0-C70A-49B2-9D12-3B1FA39B5E6F}", pPlan->wzBundleProviderKey);
             Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle);
             Assert::Equal<BOOL>(TRUE, pPlan->fPerMachine);
@@ -840,7 +840,7 @@ namespace Bootstrapper
             NativeAssert::Succeeded(hr, "CorePlan failed");
 
             Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_UNINSTALL, pPlan->action);
-            NativeAssert::StringEqual(L"{35192ED0-C70A-49B2-9D12-3B1FA39B5E6F}", pPlan->wzBundleId);
+            NativeAssert::StringEqual(L"{35192ED0-C70A-49B2-9D12-3B1FA39B5E6F}", pPlan->wzBundleCode);
             NativeAssert::StringEqual(L"{35192ED0-C70A-49B2-9D12-3B1FA39B5E6F}", pPlan->wzBundleProviderKey);
             Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle);
             Assert::Equal<BOOL>(TRUE, pPlan->fPerMachine);
@@ -959,7 +959,7 @@ namespace Bootstrapper
             NativeAssert::Succeeded(hr, "CorePlan failed");
 
             Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_UNINSTALL, pPlan->action);
-            NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleId);
+            NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleCode);
             NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleProviderKey);
             Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle);
             Assert::Equal<BOOL>(TRUE, pPlan->fPerMachine);
@@ -1059,7 +1059,7 @@ namespace Bootstrapper
             NativeAssert::Succeeded(hr, "CorePlan failed");
 
             Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
-            NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleId);
+            NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleCode);
             NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleProviderKey);
             Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle);
             Assert::Equal<BOOL>(TRUE, pPlan->fPerMachine);
@@ -1178,7 +1178,7 @@ namespace Bootstrapper
             NativeAssert::Succeeded(hr, "CorePlan failed");
 
             Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
-            NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleId);
+            NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleCode);
             NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleProviderKey);
             Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle);
             Assert::Equal<BOOL>(TRUE, pPlan->fPerMachine);
@@ -1280,7 +1280,7 @@ namespace Bootstrapper
             NativeAssert::Succeeded(hr, "CorePlan failed");
 
             Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
-            NativeAssert::StringEqual(L"{9C184683-04FB-49AD-9D79-65101BDC3EE3}", pPlan->wzBundleId);
+            NativeAssert::StringEqual(L"{9C184683-04FB-49AD-9D79-65101BDC3EE3}", pPlan->wzBundleCode);
             NativeAssert::StringEqual(L"{9C184683-04FB-49AD-9D79-65101BDC3EE3}", pPlan->wzBundleProviderKey);
             Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle);
             Assert::Equal<BOOL>(TRUE, pPlan->fPerMachine);
@@ -1373,7 +1373,7 @@ namespace Bootstrapper
             NativeAssert::Succeeded(hr, "CorePlan failed");
 
             Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_LAYOUT, pPlan->action);
-            NativeAssert::StringEqual(L"{9C184683-04FB-49AD-9D79-65101BDC3EE3}", pPlan->wzBundleId);
+            NativeAssert::StringEqual(L"{9C184683-04FB-49AD-9D79-65101BDC3EE3}", pPlan->wzBundleCode);
             NativeAssert::StringEqual(L"{9C184683-04FB-49AD-9D79-65101BDC3EE3}", pPlan->wzBundleProviderKey);
             Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle);
             Assert::Equal<BOOL>(FALSE, pPlan->fPerMachine);
@@ -1456,7 +1456,7 @@ namespace Bootstrapper
             NativeAssert::Succeeded(hr, "CorePlan failed");
 
             Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_CACHE, pPlan->action);
-            NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleId);
+            NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleCode);
             NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleProviderKey);
             Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle);
             Assert::Equal<BOOL>(TRUE, pPlan->fPerMachine);
@@ -1545,7 +1545,7 @@ namespace Bootstrapper
             NativeAssert::Succeeded(hr, "CorePlan failed");
 
             Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
-            NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleId);
+            NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleCode);
             NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleProviderKey);
             Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle);
             Assert::Equal<BOOL>(TRUE, pPlan->fPerMachine);
@@ -1620,7 +1620,7 @@ namespace Bootstrapper
             NativeAssert::Succeeded(hr, "CorePlan failed");
 
             Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_UNINSTALL, pPlan->action);
-            NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleId);
+            NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleCode);
             NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleProviderKey);
             Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle);
             Assert::Equal<BOOL>(TRUE, pPlan->fPerMachine);
@@ -1709,7 +1709,7 @@ namespace Bootstrapper
             NativeAssert::Succeeded(hr, "CorePlan failed");
 
             Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
-            NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleId);
+            NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleCode);
             NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleProviderKey);
             Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle);
             Assert::Equal<BOOL>(TRUE, pPlan->fPerMachine);
@@ -1802,7 +1802,7 @@ namespace Bootstrapper
             NativeAssert::Succeeded(hr, "CorePlan failed");
 
             Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
-            NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleId);
+            NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleCode);
             NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleProviderKey);
             Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle);
             Assert::Equal<BOOL>(TRUE, pPlan->fPerMachine);
@@ -1908,7 +1908,7 @@ namespace Bootstrapper
             NativeAssert::Succeeded(hr, "CorePlan failed");
 
             Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_MODIFY, pPlan->action);
-            NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleId);
+            NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleCode);
             NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleProviderKey);
             Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle);
             Assert::Equal<BOOL>(TRUE, pPlan->fPerMachine);
@@ -1987,7 +1987,7 @@ namespace Bootstrapper
             NativeAssert::Succeeded(hr, "CorePlan failed");
 
             Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_UNINSTALL, pPlan->action);
-            NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleId);
+            NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleCode);
             NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleProviderKey);
             Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle);
             Assert::Equal<BOOL>(TRUE, pPlan->fPerMachine);
@@ -2088,7 +2088,7 @@ namespace Bootstrapper
             NativeAssert::Succeeded(hr, "CorePlan failed");
 
             Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_UNINSTALL, pPlan->action);
-            NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleId);
+            NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleCode);
             NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleProviderKey);
             Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle);
             Assert::Equal<BOOL>(TRUE, pPlan->fPerMachine);
@@ -2158,7 +2158,7 @@ namespace Bootstrapper
             NativeAssert::Succeeded(hr, "CorePlan failed");
 
             Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_UNINSTALL, pPlan->action);
-            NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleId);
+            NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleCode);
             NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleProviderKey);
             Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle);
             Assert::Equal<BOOL>(TRUE, pPlan->fPerMachine);
@@ -2244,7 +2244,7 @@ namespace Bootstrapper
             NativeAssert::Succeeded(hr, "CorePlan failed");
 
             Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_UNINSTALL, pPlan->action);
-            NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleId);
+            NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleCode);
             NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleProviderKey);
             Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle);
             Assert::Equal<BOOL>(TRUE, pPlan->fPerMachine);
@@ -2332,7 +2332,7 @@ namespace Bootstrapper
             NativeAssert::Succeeded(hr, "CorePlan failed");
 
             Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_UNSAFE_UNINSTALL, pPlan->action);
-            NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleId);
+            NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleCode);
             NativeAssert::StringEqual(L"{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}", pPlan->wzBundleProviderKey);
             Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle);
             Assert::Equal<BOOL>(TRUE, pPlan->fPerMachine);
@@ -2437,7 +2437,7 @@ namespace Bootstrapper
 
             Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
             Assert::Equal<LONGLONG>(BOOTSTRAPPER_ACTION_INSTALL, llPlannedAction);
-            NativeAssert::StringEqual(L"{06077C60-DC46-4F4A-8D3C-05F869187191}", pPlan->wzBundleId);
+            NativeAssert::StringEqual(L"{06077C60-DC46-4F4A-8D3C-05F869187191}", pPlan->wzBundleCode);
             NativeAssert::StringEqual(L"{06077C60-DC46-4F4A-8D3C-05F869187191}", pPlan->wzBundleProviderKey);
             Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle);
             Assert::Equal<BOOL>(TRUE, pPlan->fPerMachine);
@@ -2527,7 +2527,7 @@ namespace Bootstrapper
             NativeAssert::Succeeded(hr, "CorePlan failed");
 
             Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
-            NativeAssert::StringEqual(L"{22D1DDBA-284D-40A7-BD14-95EA07906F21}", pPlan->wzBundleId);
+            NativeAssert::StringEqual(L"{22D1DDBA-284D-40A7-BD14-95EA07906F21}", pPlan->wzBundleCode);
             NativeAssert::StringEqual(L"{22D1DDBA-284D-40A7-BD14-95EA07906F21}", pPlan->wzBundleProviderKey);
             Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle);
             Assert::Equal<BOOL>(TRUE, pPlan->fPerMachine);
@@ -2658,7 +2658,7 @@ namespace Bootstrapper
             NativeAssert::Succeeded(hr, "CorePlan failed");
 
             Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_UNINSTALL, pPlan->action);
-            NativeAssert::StringEqual(L"{22D1DDBA-284D-40A7-BD14-95EA07906F21}", pPlan->wzBundleId);
+            NativeAssert::StringEqual(L"{22D1DDBA-284D-40A7-BD14-95EA07906F21}", pPlan->wzBundleCode);
             NativeAssert::StringEqual(L"{22D1DDBA-284D-40A7-BD14-95EA07906F21}", pPlan->wzBundleProviderKey);
             Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle);
             Assert::Equal<BOOL>(TRUE, pPlan->fPerMachine);
@@ -2788,7 +2788,7 @@ namespace Bootstrapper
             NativeAssert::Succeeded(hr, "CorePlan failed");
 
             Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_UNINSTALL, pPlan->action);
-            NativeAssert::StringEqual(L"{22D1DDBA-284D-40A7-BD14-95EA07906F21}", pPlan->wzBundleId);
+            NativeAssert::StringEqual(L"{22D1DDBA-284D-40A7-BD14-95EA07906F21}", pPlan->wzBundleCode);
             NativeAssert::StringEqual(L"{22D1DDBA-284D-40A7-BD14-95EA07906F21}", pPlan->wzBundleProviderKey);
             Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle);
             Assert::Equal<BOOL>(TRUE, pPlan->fPerMachine);
@@ -2889,7 +2889,7 @@ namespace Bootstrapper
             NativeAssert::Succeeded(hr, "CorePlan failed");
 
             Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
-            NativeAssert::StringEqual(L"{22D1DDBA-284D-40A7-BD14-95EA07906F21}", pPlan->wzBundleId);
+            NativeAssert::StringEqual(L"{22D1DDBA-284D-40A7-BD14-95EA07906F21}", pPlan->wzBundleCode);
             NativeAssert::StringEqual(L"{22D1DDBA-284D-40A7-BD14-95EA07906F21}", pPlan->wzBundleProviderKey);
             Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle);
             Assert::Equal<BOOL>(TRUE, pPlan->fPerMachine);
@@ -3114,7 +3114,7 @@ namespace Bootstrapper
             hr = StrAllocString(&pCompatiblePackage->compatibleEntry.sczProviderKey, pProvider->sczKey, 0);
             NativeAssert::Succeeded(hr, "Failed to copy provider key");
 
-            DetectPackageDependent(pPackage, pEngineState->registration.sczId);
+            DetectPackageDependent(pPackage, pEngineState->registration.sczCode);
         }
 
         void DetectPackageAsAbsent(BURN_PACKAGE* pPackage)
@@ -3203,7 +3203,7 @@ namespace Bootstrapper
             {
                 BURN_PACKAGE* pPackage = pEngineState->packages.rgPackages + i;
                 DetectPackageAsPresentAndCached(pPackage);
-                DetectPackageDependent(pPackage, pEngineState->registration.sczId);
+                DetectPackageDependent(pPackage, pEngineState->registration.sczCode);
 
                 if (BURN_PACKAGE_TYPE_MSI == pPackage->type)
                 {
@@ -3236,7 +3236,7 @@ namespace Bootstrapper
                 else
                 {
                     DetectPackageAsPresentAndCached(pPackage);
-                    DetectPackageDependent(pPackage, pEngineState->registration.sczId);
+                    DetectPackageDependent(pPackage, pEngineState->registration.sczCode);
                 }
             }
         }
@@ -3296,7 +3296,7 @@ namespace Bootstrapper
             HRESULT hr = StrAllocString(&pEngineState->internalCommand.sczAncestors, wzId, 0);
             NativeAssert::Succeeded(hr, "Failed to set registration's ancestors");
 
-            hr = StrAllocFormatted(&pEngineState->registration.sczBundlePackageAncestors, L"%ls;%ls", wzId, pEngineState->registration.sczId);
+            hr = StrAllocFormatted(&pEngineState->registration.sczBundlePackageAncestors, L"%ls;%ls", wzId, pEngineState->registration.sczCode);
             NativeAssert::Succeeded(hr, "Failed to set registration's package ancestors");
 
             pEngineState->command.relationType = BOOTSTRAPPER_RELATION_UPGRADE;
@@ -3435,13 +3435,13 @@ namespace Bootstrapper
             __in BOOL fRollback,
             __in DWORD dwIndex,
             __in BOOL fRegister,
-            __in LPCWSTR wzBundleId,
+            __in LPCWSTR wzBundleCode,
             __in LPCWSTR wzProviderKey
             )
         {
             BURN_DEPENDENT_REGISTRATION_ACTION* pAction = ValidateDependentRegistrationActionExists(pPlan, fRollback, dwIndex);
             Assert::Equal<DWORD>(fRegister ? BURN_DEPENDENT_REGISTRATION_ACTION_TYPE_REGISTER : BURN_DEPENDENT_REGISTRATION_ACTION_TYPE_UNREGISTER, pAction->type);
-            NativeAssert::StringEqual(wzBundleId, pAction->sczBundleId);
+            NativeAssert::StringEqual(wzBundleCode, pAction->sczBundleCode);
             NativeAssert::StringEqual(wzProviderKey, pAction->sczDependentProviderKey);
         }
 
diff --git a/src/burn/test/BurnUnitTest/RegistrationTest.cpp b/src/burn/test/BurnUnitTest/RegistrationTest.cpp
index 2d6515ef..3068eb6a 100644
--- a/src/burn/test/BurnUnitTest/RegistrationTest.cpp
+++ b/src/burn/test/BurnUnitTest/RegistrationTest.cpp
@@ -73,7 +73,7 @@ namespace Bootstrapper
                     L"    <UX PrimaryPayloadId='ux.exe'>"
                     L"        <Payload Id='ux.exe' FilePath='ux.exe' Packaging='embedded' SourcePath='ux.exe' Hash='000000000000' />"
                     L"    </UX>"
-                    L"    <Registration Id='{D54F896D-1952-43E6-9C67-B5652240618C}' UpgradeCode='{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}' Tag='foo' ProviderKey='foo' Version='1.0.0.0' ExecutableName='setup.exe' PerMachine='no'>"
+                    L"    <Registration Code='{D54F896D-1952-43E6-9C67-B5652240618C}' UpgradeCode='{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}' Tag='foo' ProviderKey='foo' Version='1.0.0.0' ExecutableName='setup.exe' PerMachine='no'>"
                     L"        <Arp Register='yes' Publisher='WiX Toolset' DisplayName='RegisterBasicTest' DisplayVersion='1.0.0.0' />"
                     L"    </Registration>"
                     L"</Bundle>";
@@ -173,7 +173,7 @@ namespace Bootstrapper
                     L"    <UX PrimaryPayloadId='ux.exe'>"
                     L"        <Payload Id='ux.exe' FilePath='ux.exe' Packaging='embedded' SourcePath='ux.exe' Hash='000000000000' />"
                     L"    </UX>"
-                    L"    <Registration Id='{D54F896D-1952-43E6-9C67-B5652240618C}' UpgradeCode='{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}' Tag='foo' ProviderKey='foo' Version='1.0.0.0' ExecutableName='setup.exe' PerMachine='no'>"
+                    L"    <Registration Code='{D54F896D-1952-43E6-9C67-B5652240618C}' UpgradeCode='{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}' Tag='foo' ProviderKey='foo' Version='1.0.0.0' ExecutableName='setup.exe' PerMachine='no'>"
                     L"        <Arp Register='yes' Publisher='WiX Toolset' DisplayName='Product1' InProgressDisplayName='Product1 Installation' DisplayVersion='1.0.0.0' />"
                     L"    </Registration>"
                     L"</Bundle>";
@@ -294,7 +294,7 @@ namespace Bootstrapper
                     L"    <UX PrimaryPayloadId='ux.exe'>"
                     L"        <Payload Id='ux.exe' FilePath='ux.exe' Packaging='embedded' SourcePath='ux.exe' Hash='000000000000' />"
                     L"    </UX>"
-                    L"    <Registration Id='{D54F896D-1952-43E6-9C67-B5652240618C}' UpgradeCode='{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}' Tag='foo' ProviderKey='bar' Version='1.0.0.0' ExecutableName='setup.exe' PerMachine='no'>"
+                    L"    <Registration Code='{D54F896D-1952-43E6-9C67-B5652240618C}' UpgradeCode='{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}' Tag='foo' ProviderKey='bar' Version='1.0.0.0' ExecutableName='setup.exe' PerMachine='no'>"
                     L"        <Arp Register='yes' Publisher='WiX Toolset' DisplayName='Product1' DisplayVersion='1.0.0.0' />"
                     L"    </Registration>"
                     L"</Bundle>";
@@ -415,7 +415,7 @@ namespace Bootstrapper
                     L"    <UX PrimaryPayloadId='ux.exe'>"
                     L"        <Payload Id='ux.exe' FilePath='ux.exe' Packaging='embedded' SourcePath='ux.exe' Hash='000000000000' />"
                     L"    </UX>"
-                    L"    <Registration Id='{D54F896D-1952-43E6-9C67-B5652240618C}' UpgradeCode='{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}' Tag='foo' ProviderKey='foo' Version='1.0.0.0' ExecutableName='setup.exe' PerMachine='no'>"
+                    L"    <Registration Code='{D54F896D-1952-43E6-9C67-B5652240618C}' UpgradeCode='{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}' Tag='foo' ProviderKey='foo' Version='1.0.0.0' ExecutableName='setup.exe' PerMachine='no'>"
                     L"        <Arp Register='yes' DisplayName='DisplayName1' DisplayVersion='1.2.3.4' Publisher='Publisher1' HelpLink='http://www.microsoft.com/help'"
                     L"             HelpTelephone='555-555-5555' AboutUrl='http://www.microsoft.com/about' UpdateUrl='http://www.microsoft.com/update'"
                     L"             Comments='Comments1' Contact='Contact1' DisableModify='yes' DisableRemove='yes' />"
@@ -525,7 +525,7 @@ namespace Bootstrapper
             IXMLDOMElement* pixeBundle = NULL;
             LPWSTR sczCurrentProcess = NULL;
             LPWSTR sczValue = NULL;
-            LPWSTR sczRelatedBundleId = NULL;
+            LPWSTR sczRelatedBundleCode = NULL;
             DWORD dwRelatedBundleIndex = 0;
             BURN_VARIABLES variables = { };
             BURN_USER_EXPERIENCE userExperience = { };
@@ -553,8 +553,8 @@ namespace Bootstrapper
                     L"    <UX PrimaryPayloadId='ux.exe'>"
                     L"        <Payload Id='ux.exe' FilePath='ux.exe' Packaging='embedded' SourcePath='ux.exe' Hash='000000000000' />"
                     L"    </UX>"
-                    L"    <RelatedBundle Id='" TEST_BUNDLE_UPGRADE_CODE L"' Action='Upgrade' />"
-                    L"    <Registration Id='" TEST_BUNDLE_ID L"' Tag='foo' ProviderKey='" TEST_BUNDLE_ID L"' Version='1.0.0.0' ExecutableName='setup.exe' PerMachine='no'>"
+                    L"    <RelatedBundle Code='" TEST_BUNDLE_UPGRADE_CODE L"' Action='Upgrade' />"
+                    L"    <Registration Code='" TEST_BUNDLE_ID L"' Tag='foo' ProviderKey='" TEST_BUNDLE_ID L"' Version='1.0.0.0' ExecutableName='setup.exe' PerMachine='no'>"
                     L"        <Arp Register='yes' Publisher='WiX Toolset' DisplayName='RegisterBasicTest' DisplayVersion='1.0.0.0' />"
                     L"    </Registration>"
                     L"    <Variable Id='MyBurnVariable1' Type='numeric' Value='0' Hidden='no' Persisted='yes' />"
@@ -622,14 +622,14 @@ namespace Bootstrapper
                 this->ValidateVariableKey(L"MyBurnVariable5", gcnew String(L"vvv"));
                 this->ValidateVariableKeyEmpty(L"WixBundleForcedRestartPackage");
 
-                hr = StrAlloc(&sczRelatedBundleId, MAX_GUID_CHARS + 1);
-                NativeAssert::Succeeded(hr, "Failed to allocate buffer for related bundle id.");
+                hr = StrAlloc(&sczRelatedBundleCode, MAX_GUID_CHARS + 1);
+                NativeAssert::Succeeded(hr, "Failed to allocate buffer for related bundle code.");
 
                 // Verify we can find ourself via the UpgradeCode
-                hr = BundleEnumRelatedBundleFixed(TEST_BUNDLE_UPGRADE_CODE, BUNDLE_INSTALL_CONTEXT_USER, REG_KEY_DEFAULT, &dwRelatedBundleIndex, sczRelatedBundleId);
+                hr = BundleEnumRelatedBundleFixed(TEST_BUNDLE_UPGRADE_CODE, BUNDLE_INSTALL_CONTEXT_USER, REG_KEY_DEFAULT, &dwRelatedBundleIndex, sczRelatedBundleCode);
                 TestThrowOnFailure(hr, L"Failed to enumerate related bundle.");
 
-                NativeAssert::StringEqual(TEST_BUNDLE_ID, sczRelatedBundleId);
+                NativeAssert::StringEqual(TEST_BUNDLE_ID, sczRelatedBundleCode);
 
                 // Verify we can read the bundle variables via the API
                 hr = BundleGetBundleVariable(TEST_BUNDLE_ID, L"MyBurnVariable1", &sczValue);
@@ -643,7 +643,7 @@ namespace Bootstrapper
             }
             finally
             {
-                ReleaseStr(sczRelatedBundleId);
+                ReleaseStr(sczRelatedBundleCode);
                 ReleaseStr(sczCurrentProcess);
                 ReleaseObject(pixeBundle);
                 BootstrapperApplicationUninitialize(&userExperience);
@@ -694,7 +694,7 @@ namespace Bootstrapper
                     L"    <UX PrimaryPayloadId='ux.exe'>"
                     L"        <Payload Id='ux.exe' FilePath='ux.exe' Packaging='embedded' SourcePath='ux.exe' Hash='000000000000' />"
                     L"    </UX>"
-                    L"    <Registration Id='{D54F896D-1952-43E6-9C67-B5652240618C}' UpgradeCode='{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}' Tag='foo' ProviderKey='foo' Version='1.0.0.0' ExecutableName='setup.exe' PerMachine='no'>"
+                    L"    <Registration Code='{D54F896D-1952-43E6-9C67-B5652240618C}' UpgradeCode='{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}' Tag='foo' ProviderKey='foo' Version='1.0.0.0' ExecutableName='setup.exe' PerMachine='no'>"
                     L"        <Arp Register='yes' Publisher='WiX Toolset' DisplayName='RegisterBasicTest' DisplayVersion='1.0.0.0' />"
                     L"    </Registration>"
                     L"    <Variable Id='MyBurnVariable1' Type='numeric' Value='0' Hidden='no' Persisted='yes' />"
diff --git a/src/burn/test/BurnUnitTest/RelatedBundleTest.cpp b/src/burn/test/BurnUnitTest/RelatedBundleTest.cpp
index 4fee1b1d..9feb85d6 100644
--- a/src/burn/test/BurnUnitTest/RelatedBundleTest.cpp
+++ b/src/burn/test/BurnUnitTest/RelatedBundleTest.cpp
@@ -48,8 +48,8 @@ namespace Bootstrapper
                     L"    <UX>"
                     L"        <Payload Id='ux.exe' FilePath='ux.exe' Packaging='embedded' SourcePath='ux.exe' />"
                     L"    </UX>"
-                    L"    <RelatedBundle Id='{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}' Action='Upgrade' />"
-                    L"    <Registration Id='{D54F896D-1952-43E6-9C67-B5652240618C}' Tag='foo' ProviderKey='foo' Version='1.0.0.0' ExecutableName='setup.exe' PerMachine='yes'>"
+                    L"    <RelatedBundle Code='{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}' Action='Upgrade' />"
+                    L"    <Registration Code='{D54F896D-1952-43E6-9C67-B5652240618C}' Tag='foo' ProviderKey='foo' Version='1.0.0.0' ExecutableName='setup.exe' PerMachine='yes'>"
                     L"        <Arp Register='yes' Publisher='WiX Toolset' DisplayName='RegisterBasicTest' DisplayVersion='1.0.0.0' />"
                     L"    </Registration>"
                     L"</Bundle>";
@@ -100,8 +100,8 @@ namespace Bootstrapper
                     L"    <UX>"
                     L"        <Payload Id='ux.exe' FilePath='ux.exe' Packaging='embedded' SourcePath='ux.exe' />"
                     L"    </UX>"
-                    L"    <RelatedBundle Id='{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}' Action='Upgrade' />"
-                    L"    <Registration Id='{3DB49D3D-1FB8-4147-A465-BBE8BFD0DAD0}' Tag='foo' ProviderKey='foo' Version='4.0.0.0' ExecutableName='setup.exe' PerMachine='no'>"
+                    L"    <RelatedBundle Code='{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}' Action='Upgrade' />"
+                    L"    <Registration Code='{3DB49D3D-1FB8-4147-A465-BBE8BFD0DAD0}' Tag='foo' ProviderKey='foo' Version='4.0.0.0' ExecutableName='setup.exe' PerMachine='no'>"
                     L"        <Arp Register='yes' Publisher='WiX Toolset' DisplayName='RegisterBasicTest' DisplayVersion='4.0.0.0' />"
                     L"    </Registration>"
                     L"</Bundle>";
@@ -142,7 +142,7 @@ namespace Bootstrapper
             this->RegisterFakeBundle(L"{3DB49D3D-1FB8-4147-A465-BBE8BFD0DAD0}", L"{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}", NULL, L"4.0.0.0", FALSE);
         }
 
-        void RegisterFakeBundle(LPCWSTR wzBundleId, LPCWSTR wzUpgradeCodes, LPCWSTR wzCachePath, LPCWSTR wzVersion, BOOL fPerMachine)
+        void RegisterFakeBundle(LPCWSTR wzBundleCode, LPCWSTR wzUpgradeCodes, LPCWSTR wzCachePath, LPCWSTR wzVersion, BOOL fPerMachine)
         {
             HRESULT hr = S_OK;
             LPWSTR* rgsczUpgradeCodes = NULL;
@@ -157,12 +157,12 @@ namespace Bootstrapper
                 hr = StrSplitAllocArray(&rgsczUpgradeCodes, reinterpret_cast<UINT*>(&cUpgradeCodes), wzUpgradeCodes, L";");
                 NativeAssert::Succeeded(hr, "Failed to split upgrade codes.");
 
-                hr = StrAllocFormatted(&sczRegistrationKey, L"%s\\%s", BURN_REGISTRATION_REGISTRY_UNINSTALL_KEY, wzBundleId);
+                hr = StrAllocFormatted(&sczRegistrationKey, L"%s\\%s", BURN_REGISTRATION_REGISTRY_UNINSTALL_KEY, wzBundleCode);
                 NativeAssert::Succeeded(hr, "Failed to build uninstall registry key path.");
 
                 if (!wzCachePath)
                 {
-                    hr = StrAllocFormatted(&sczCachePath, L"%ls.exe", wzBundleId);
+                    hr = StrAllocFormatted(&sczCachePath, L"%ls.exe", wzBundleCode);
                     NativeAssert::Succeeded(hr, "Failed to build cache path.");
 
                     wzCachePath = sczCachePath;
diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/BasicFunctionality_BundleA_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/BasicFunctionality_BundleA_manifest.xml
index 975a3805..f3848eda 100644
--- a/src/burn/test/BurnUnitTest/TestData/PlanTest/BasicFunctionality_BundleA_manifest.xml
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/BasicFunctionality_BundleA_manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BurnManifest xmlns="http://wixtoolset.org/schemas/v4/2008/Burn">
     <Log PathVariable="WixBundleLog" Prefix="~BasicFunctionalityTests_BundleA" Extension=".log" />
-    <RelatedBundle Id="{8C7E2C47-1EE7-4BBE-99A2-EAB7F3693F48}" Action="Upgrade" />
+    <RelatedBundle Code="{8C7E2C47-1EE7-4BBE-99A2-EAB7F3693F48}" Action="Upgrade" />
     <Variable Id="TestGroupName" Value="BasicFunctionalityTests" Type="string" Hidden="no" Persisted="no" />
     <UX PrimaryPayloadId="WixStandardBootstrapperApplication">
         <Payload Id="WixStandardBootstrapperApplication" FilePath="wixstdba.exe" FileSize="245760" Hash="23F0568ADACD69D72B259F876B437707A0D41069" Packaging="embedded" SourcePath="u3" />
@@ -15,7 +15,7 @@
     <Payload Id="PackageA" FilePath="PackageA.msi" FileSize="32768" Hash="89C61F8A105A81B08036401152A1FDE67CDC0158" Packaging="embedded" SourcePath="a0" Container="WixAttachedContainer" />
     <Payload Id="cab9Ins_fTP3wNwq5Gxo41ch5VUPaQ" FilePath="1a.cab" FileSize="975" Hash="11DE5863C4B2A8762D0EE23FE25B7774CA07676B" Packaging="embedded" SourcePath="a1" Container="WixAttachedContainer" />
     <RollbackBoundary Id="WixDefaultBoundary" Vital="yes" Transaction="no" />
-    <Registration Id="{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}" ExecutableName="BundleA.exe" PerMachine="yes" Tag="" Version="1.0.0.0" ProviderKey="{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}">
+    <Registration Code="{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}" ExecutableName="BundleA.exe" PerMachine="yes" Tag="" Version="1.0.0.0" ProviderKey="{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}">
         <Arp Register="yes" DisplayName="~BasicFunctionalityTests - BundleA" DisplayVersion="1.0.0.0" />
     </Registration>
     <Chain>
diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/BundlePackage_Multiple_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/BundlePackage_Multiple_manifest.xml
index a8696537..988bbfe0 100644
--- a/src/burn/test/BurnUnitTest/TestData/PlanTest/BundlePackage_Multiple_manifest.xml
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/BundlePackage_Multiple_manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BurnManifest xmlns="http://wixtoolset.org/schemas/v4/2008/Burn">
     <Log PathVariable="WixBundleLog" Prefix="~BundlePackageTests_MultipleBundlePackagesBundle" Extension=".log" />
-    <RelatedBundle Id="{86D214FB-8D74-456C-99B3-6557ECA6159C}" Action="Upgrade" />
+    <RelatedBundle Code="{86D214FB-8D74-456C-99B3-6557ECA6159C}" Action="Upgrade" />
     <Variable Id="TestGroupName" Value="BundlePackageTests" Type="string" Hidden="no" Persisted="no" />
     <RegistrySearch Id="NETFRAMEWORK45" Variable="NETFRAMEWORK45" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" Value="Release" Type="value" VariableType="string" />
     <UX PrimaryPayloadId="WixManagedBootstrapperApplicationHost">
@@ -46,21 +46,21 @@
     <Payload Id="PackageA" FilePath="BundleA.exe" FileSize="5241635" Hash="20E1AFF76DE4693CB2876DC6BCCA0152DB16BE49AEDE2CD581C03FC39AB89DEA12BC25CB435F06E4D7D2B4443CE8A8935D5E92E2E49A4981B60A273980E4B29B" Packaging="embedded" SourcePath="a0" Container="WixAttachedContainer" />
     <Payload Id="PackageB" FilePath="BundleB_x64.exe" FileSize="10450821" Hash="43A58873D61D6E0FA83F6C5266F2F05FEA9BC85D11C195493B7FD9F0B4AA799C1EFCB78D76DCED32124D2EC62A4E7114B62CDE6F0B87E42A7E28CDBB0DA0FF8E" Packaging="embedded" SourcePath="a1" Container="WixAttachedContainer" />
     <RollbackBoundary Id="WixDefaultBoundary" Vital="yes" Transaction="no" />
-    <Registration Id="{35192ED0-C70A-49B2-9D12-3B1FA39B5E6F}" ExecutableName="MultipleBundlePackagesBundle.exe" PerMachine="yes" Tag="" Version="1.0.0.0" ProviderKey="{35192ED0-C70A-49B2-9D12-3B1FA39B5E6F}">
+    <Registration Code="{35192ED0-C70A-49B2-9D12-3B1FA39B5E6F}" ExecutableName="MultipleBundlePackagesBundle.exe" PerMachine="yes" Tag="" Version="1.0.0.0" ProviderKey="{35192ED0-C70A-49B2-9D12-3B1FA39B5E6F}">
         <Arp Register="yes" DisplayName="~BundlePackageTests - MultipleBundlePackagesBundle" DisplayVersion="1.0.0.0" />
     </Registration>
     <Chain>
         <ExePackage Id="NetFx48Web" Cache="remove" CacheId="642721C60D52051C7F3434D8710FE3406A7CFE10B2B39E90EA847719ED1697D7C614F2DF44AD50412B1DF8C98DD78FDC57CA1D047D28C81AC158092E5FB18040" InstallSize="1439328" Size="1439328" PerMachine="yes" Permanent="yes" Vital="yes" RollbackBoundaryForward="WixDefaultBoundary" LogPathVariable="NetFx48WebLog" RollbackLogPathVariable="WixBundleRollbackLog_NetFx48Web" DetectCondition="NETFRAMEWORK45 &gt;= 528040" InstallArguments="/q /norestart /log &quot;[NetFx48WebLog].html&quot;" UninstallArguments="" Uninstallable="no" RepairArguments="" Repairable="no" Protocol="netfx4" DetectionType="condition">
             <PayloadRef Id="NetFx48Web" />
         </ExePackage>
-        <BundlePackage Id="PackageA" Cache="keep" CacheId="{B39CEE4D-CCD7-4797-BE3A-6613BD1DC4BE}v1.0.0.0" InstallSize="2169" Size="5241635" Version="1.0.0.0" PerMachine="yes" Permanent="no" Vital="yes" RepairCondition="0" LogPathVariable="WixBundleLog_PackageA" RollbackLogPathVariable="WixBundleRollbackLog_PackageA" BundleId="{B39CEE4D-CCD7-4797-BE3A-6613BD1DC4BE}" InstallArguments="" UninstallArguments="" RepairArguments="" SupportsBurnProtocol="yes" Win64="no">
+        <BundlePackage Id="PackageA" Cache="keep" CacheId="{B39CEE4D-CCD7-4797-BE3A-6613BD1DC4BE}v1.0.0.0" InstallSize="2169" Size="5241635" Version="1.0.0.0" PerMachine="yes" Permanent="no" Vital="yes" RepairCondition="0" LogPathVariable="WixBundleLog_PackageA" RollbackLogPathVariable="WixBundleRollbackLog_PackageA" BundleCode="{B39CEE4D-CCD7-4797-BE3A-6613BD1DC4BE}" InstallArguments="" UninstallArguments="" RepairArguments="" SupportsBurnProtocol="yes" Win64="no">
             <Provides Key="{B39CEE4D-CCD7-4797-BE3A-6613BD1DC4BE}" Version="1.0.0.0" DisplayName="~BasicFunctionalityTests - BundleA" Imported="yes" />
-            <RelatedBundle Id="{8C7E2C47-1EE7-4BBE-99A2-EAB7F3693F48}" Action="Upgrade" />
+            <RelatedBundle Code="{8C7E2C47-1EE7-4BBE-99A2-EAB7F3693F48}" Action="Upgrade" />
             <PayloadRef Id="PackageA" />
         </BundlePackage>
-        <BundlePackage Id="PackageB" Cache="keep" CacheId="{7506235A-7C59-4750-82C7-EB460A87ED3A}v1.0.0.0" InstallSize="1441497" Size="10450821" Version="1.0.0.0" PerMachine="yes" Permanent="no" Vital="yes" RollbackBoundaryBackward="WixDefaultBoundary" LogPathVariable="WixBundleLog_PackageB" RollbackLogPathVariable="WixBundleRollbackLog_PackageB" BundleId="{7506235A-7C59-4750-82C7-EB460A87ED3A}" InstallArguments="" UninstallArguments="" RepairArguments="" SupportsBurnProtocol="yes" Win64="yes">
+        <BundlePackage Id="PackageB" Cache="keep" CacheId="{7506235A-7C59-4750-82C7-EB460A87ED3A}v1.0.0.0" InstallSize="1441497" Size="10450821" Version="1.0.0.0" PerMachine="yes" Permanent="no" Vital="yes" RollbackBoundaryBackward="WixDefaultBoundary" LogPathVariable="WixBundleLog_PackageB" RollbackLogPathVariable="WixBundleRollbackLog_PackageB" BundleCode="{7506235A-7C59-4750-82C7-EB460A87ED3A}" InstallArguments="" UninstallArguments="" RepairArguments="" SupportsBurnProtocol="yes" Win64="yes">
             <Provides Key="{7506235A-7C59-4750-82C7-EB460A87ED3A}" Version="1.0.0.0" DisplayName="~BasicFunctionalityTests - BundleB_x64" Imported="yes" />
-            <RelatedBundle Id="{79F45B7A-D990-46E4-819B-078D87C3321A}" Action="Upgrade" />
+            <RelatedBundle Code="{79F45B7A-D990-46E4-819B-078D87C3321A}" Action="Upgrade" />
             <PayloadRef Id="PackageB" />
         </BundlePackage>
     </Chain>
diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/ExePackage_PerUserArpEntry_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/ExePackage_PerUserArpEntry_manifest.xml
index 167bfbbb..a5dfc188 100644
--- a/src/burn/test/BurnUnitTest/TestData/PlanTest/ExePackage_PerUserArpEntry_manifest.xml
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/ExePackage_PerUserArpEntry_manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BurnManifest EngineVersion="4.0.0.409" ProtocolVersion="1" Win64="no" xmlns="http://wixtoolset.org/schemas/v4/2008/Burn">
     <Log PathVariable="WixBundleLog" Prefix="~ExePackageTests_PerUserArpEntryExePackage" Extension=".log" />
-    <RelatedBundle Id="{E4683E88-AF03-40D0-B308-5C084B0E1FA0}" Action="Upgrade" />
+    <RelatedBundle Code="{E4683E88-AF03-40D0-B308-5C084B0E1FA0}" Action="Upgrade" />
     <Variable Id="TestGroupName" Value="ExePackageTests" Type="string" Hidden="no" Persisted="no" />
     <RegistrySearch Id="NETFRAMEWORK45" Variable="NETFRAMEWORK45" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" Value="Release" Type="value" VariableType="string" />
     <UX PrimaryPayloadId="WixManagedBootstrapperApplicationHost">
@@ -46,7 +46,7 @@
     <Payload Id="TestExe.exe" FilePath="TestExe.exe" FileSize="23552" Hash="8A3CAD62E7C15EE88B3B78A5F61EFA6D4C9AED67049075688A641EE65E1526589797B0C52398DEB520A7911E41F2A6F73C178D19C9FFBC03ECF964A822E6438E" Packaging="embedded" SourcePath="a0" Container="WixAttachedContainer" />
     <Payload Id="paygJp32KbpyjbVEQFNbl5_izmhdZw" FilePath="TestExe.exe.config" FileSize="387" Hash="8C819A9E835F3921FA80C5C783AB0C42DDAADF0C0F2BEF8630EA122ABCB9DC8EAF0B14E061C46B37C92F55114BB09A8D5B1B613947A76A648953F2C63C0ACA63" Packaging="embedded" SourcePath="a1" Container="WixAttachedContainer" />
     <RollbackBoundary Id="WixDefaultBoundary" Vital="yes" Transaction="no" />
-    <Registration Id="{9C459DAD-0E64-40C8-8C9F-4F68E46AB223}" ExecutableName="PerUserArpEntryExePackage.exe" PerMachine="no" Tag="" Version="1.0.0.0" ProviderKey="{9C459DAD-0E64-40C8-8C9F-4F68E46AB223}">
+    <Registration Code="{9C459DAD-0E64-40C8-8C9F-4F68E46AB223}" ExecutableName="PerUserArpEntryExePackage.exe" PerMachine="no" Tag="" Version="1.0.0.0" ProviderKey="{9C459DAD-0E64-40C8-8C9F-4F68E46AB223}">
         <Arp DisplayName="~ExePackageTests - PerUserArpEntryExePackage" DisplayVersion="1.0.0.0" />
     </Registration>
     <Chain>
diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/Failure_BundleD_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/Failure_BundleD_manifest.xml
index 4e15fddb..f3cfb179 100644
--- a/src/burn/test/BurnUnitTest/TestData/PlanTest/Failure_BundleD_manifest.xml
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/Failure_BundleD_manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BurnManifest xmlns="http://wixtoolset.org/schemas/v4/2008/Burn">
     <Log PathVariable="WixBundleLog" Prefix="~FailureTests_BundleD" Extension=".log" />
-    <RelatedBundle Id="{3C1A4842-81AC-4C90-8B35-A5E18F034C8D}" Action="Upgrade" />
+    <RelatedBundle Code="{3C1A4842-81AC-4C90-8B35-A5E18F034C8D}" Action="Upgrade" />
     <Variable Id="TestGroupName" Value="FailureTests" Type="string" Hidden="no" Persisted="no" />
     <RegistrySearch Id="NETFRAMEWORK45" Variable="NETFRAMEWORK45" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" Value="Release" Type="value" VariableType="string" />
     <RegistrySearch Id="wrsQ7JTGqvaQuDYjfHJoyjxtkLlR6c" Variable="ExeA_Version" Root="HKLM" Key="Software\WiX\Tests\FailureTests\ExeA" Value="Version" Type="value" VariableType="string" />
@@ -47,7 +47,7 @@
     <Payload Id="TestExe.exe" FilePath="TestExe.exe" FileSize="23552" Hash="4344604ECBA4DFE5DE7C680CB1AA5BD6FAA29BF95CE07740F02878C2BB1EF6DE6432944A0DB79B034D1C6F68CF80842EEE442EA8A551816E52D3F68901C50AB9" Packaging="embedded" SourcePath="a0" Container="WixAttachedContainer" />
     <Payload Id="paygJp32KbpyjbVEQFNbl5_izmhdZw" FilePath="TestExe.exe.config" FileSize="387" Hash="8C819A9E835F3921FA80C5C783AB0C42DDAADF0C0F2BEF8630EA122ABCB9DC8EAF0B14E061C46B37C92F55114BB09A8D5B1B613947A76A648953F2C63C0ACA63" Packaging="embedded" SourcePath="a1" Container="WixAttachedContainer" />
     <RollbackBoundary Id="WixDefaultBoundary" Vital="yes" Transaction="no" />
-    <Registration Id="{9C184683-04FB-49AD-9D79-65101BDC3EE3}" ExecutableName="BundleD.exe" PerMachine="yes" Tag="" Version="1.0.0.0" ProviderKey="{9C184683-04FB-49AD-9D79-65101BDC3EE3}">
+    <Registration Code="{9C184683-04FB-49AD-9D79-65101BDC3EE3}" ExecutableName="BundleD.exe" PerMachine="yes" Tag="" Version="1.0.0.0" ProviderKey="{9C184683-04FB-49AD-9D79-65101BDC3EE3}">
         <Arp Register="yes" DisplayName="~FailureTests - BundleD" DisplayVersion="1.0.0.0" />
     </Registration>
     <Chain>
diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/MsiTransaction_BundleAv1_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/MsiTransaction_BundleAv1_manifest.xml
index c9294707..2047f495 100644
--- a/src/burn/test/BurnUnitTest/TestData/PlanTest/MsiTransaction_BundleAv1_manifest.xml
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/MsiTransaction_BundleAv1_manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BurnManifest xmlns="http://wixtoolset.org/schemas/v4/2008/Burn">
     <Log PathVariable="WixBundleLog" Prefix="~MsiTransactionTests_BundleAv1" Extension=".log" />
-    <RelatedBundle Id="{90ED10D5-B187-4470-B498-05D80DAB729A}" Action="Upgrade" />
+    <RelatedBundle Code="{90ED10D5-B187-4470-B498-05D80DAB729A}" Action="Upgrade" />
     <Variable Id="TestGroupName" Value="MsiTransactionTests" Type="string" Hidden="no" Persisted="no" />
     <UX PrimaryPayloadId="WixStandardBootstrapperApplication">
         <Payload Id="WixStandardBootstrapperApplication" FilePath="wixstdba.exe" FileSize="245760" Hash="23F0568ADACD69D72B259F876B437707A0D41069" Packaging="embedded" SourcePath="u3" />
@@ -20,7 +20,7 @@
     <Payload Id="cab3wekki1le1R8RPDV2B8_g8jcjZc" FilePath="1cv1.cab" FileSize="975" Hash="11DE5863C4B2A8762D0EE23FE25B7774CA07676B" Packaging="embedded" SourcePath="a5" Container="WixAttachedContainer" />
     <RollbackBoundary Id="WixDefaultBoundary" Vital="yes" Transaction="no" />
     <RollbackBoundary Id="rbaOCA08D8ky7uBOK71_6FWz1K3TuQ" Vital="yes" Transaction="yes" />
-    <Registration Id="{E6469F05-BDC8-4EB8-B218-67412543EFAA}" ExecutableName="BundleAv1.exe" PerMachine="yes" Tag="" Version="1.0.0.0" ProviderKey="{E6469F05-BDC8-4EB8-B218-67412543EFAA}">
+    <Registration Code="{E6469F05-BDC8-4EB8-B218-67412543EFAA}" ExecutableName="BundleAv1.exe" PerMachine="yes" Tag="" Version="1.0.0.0" ProviderKey="{E6469F05-BDC8-4EB8-B218-67412543EFAA}">
         <Arp Register="yes" DisplayName="~MsiTransactionTests - BundleAv1" DisplayVersion="1.0.0.0" />
     </Registration>
     <Chain>
diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/MsuPackageFixture_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/MsuPackageFixture_manifest.xml
index 824cf489..4fd1d75a 100644
--- a/src/burn/test/BurnUnitTest/TestData/PlanTest/MsuPackageFixture_manifest.xml
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/MsuPackageFixture_manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BurnManifest xmlns="http://wixtoolset.org/schemas/v4/2008/Burn">
     <Log PathVariable="WixBundleLog" Prefix="BurnBundle" Extension="log" />
-    <RelatedBundle Id="{B94478B1-E1F3-4700-9CE8-6AA090854AEC}" Action="Upgrade" />
+    <RelatedBundle Code="{B94478B1-E1F3-4700-9CE8-6AA090854AEC}" Action="Upgrade" />
     <UX PrimaryPayloadId="payaQenPi7_8hq6T._EXtBW0NvR7gA">
         <Payload Id="payaQenPi7_8hq6T._EXtBW0NvR7gA" FilePath="fakeba.exe" SourcePath="u0" />
         <Payload Id="uxmKgAFS4cS31ZH_Myfqo5J4kHixQ" FilePath="BootstrapperApplicationData.xml" SourcePath="u1" />
@@ -10,7 +10,7 @@
     <Container Id="WixAttachedContainer" FileSize="119" Hash="06D28293FD57CD231E125EF9C82418A488928A98832A6937A77A3283A17A5C37F8D619C51759319A57E8F8A948FA73E8C5814185A0114130F3213AB268073555" FilePath="test.exe" AttachedIndex="1" Attached="yes" Primary="yes" />
     <Payload Id="test.msu" FilePath="test.msu" FileSize="28" Hash="B040F02D2F90E04E9AFBDC91C00CEB5DF97D48E205D96DC0A44E10AF8870794DAE62CA70224F12BE9112AA730BBE470CA81FB5617AAC690E832F3F84510E92BA" Packaging="embedded" SourcePath="a0" Container="WixAttachedContainer" />
     <RollbackBoundary Id="WixDefaultBoundary" Vital="yes" Transaction="no" />
-    <Registration Id="{06077C60-DC46-4F4A-8D3C-05F869187191}" ExecutableName="test.exe" PerMachine="yes" Tag="" Version="1.0.0.0" ProviderKey="{06077C60-DC46-4F4A-8D3C-05F869187191}">
+    <Registration Code="{06077C60-DC46-4F4A-8D3C-05F869187191}" ExecutableName="test.exe" PerMachine="yes" Tag="" Version="1.0.0.0" ProviderKey="{06077C60-DC46-4F4A-8D3C-05F869187191}">
         <Arp Register="yes" DisplayName="BurnBundle" DisplayVersion="1.0.0.0" Publisher="Example Corporation" />
     </Registration>
     <Chain>
diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_manifest.xml
index d1fd96bb..495bbf05 100644
--- a/src/burn/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_manifest.xml
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BurnManifest xmlns="http://wixtoolset.org/schemas/v4/2008/Burn">
     <Log PathVariable="WixBundleLog" Prefix="~SlipstreamTests_BundleA" Extension=".log" />
-    <RelatedBundle Id="{62C28DAF-A13E-4F55-ACA1-FB843630789C}" Action="Upgrade" />
+    <RelatedBundle Code="{62C28DAF-A13E-4F55-ACA1-FB843630789C}" Action="Upgrade" />
     <Variable Id="TestGroupName" Value="SlipstreamTests" Type="string" Hidden="no" Persisted="no" />
     <RegistrySearch Id="NETFRAMEWORK45" Variable="NETFRAMEWORK45" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" Value="Release" Type="value" VariableType="string" />
     <UX PrimaryPayloadId="WixManagedBootstrapperApplicationHost">
@@ -45,7 +45,7 @@
     <Payload Id="PackageA" FilePath="PackageAv1.msi" FileSize="32768" Hash="2369B16B7219B3C834DFBC5D2AF8B2EF8803D43D" Packaging="external" SourcePath="PackageAv1.msi" />
     <Payload Id="PatchA" FilePath="PatchA.msp" FileSize="20480" Hash="FABC6C18E4A778E127E84CDF67F93A291CAEC8BB" Packaging="external" SourcePath="PatchA.msp" />
     <RollbackBoundary Id="WixDefaultBoundary" Vital="yes" Transaction="no" />
-    <Registration Id="{22D1DDBA-284D-40A7-BD14-95EA07906F21}" ExecutableName="BundleA.exe" PerMachine="yes" Tag="" Version="1.0.0.0" ProviderKey="{22D1DDBA-284D-40A7-BD14-95EA07906F21}">
+    <Registration Code="{22D1DDBA-284D-40A7-BD14-95EA07906F21}" ExecutableName="BundleA.exe" PerMachine="yes" Tag="" Version="1.0.0.0" ProviderKey="{22D1DDBA-284D-40A7-BD14-95EA07906F21}">
         <Arp Register="yes" DisplayName="~SlipstreamTests - BundleA" DisplayVersion="1.0.0.0" />
     </Registration>
     <Chain>
diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_modified_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_modified_manifest.xml
index 2f829586..de73c66f 100644
--- a/src/burn/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_modified_manifest.xml
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_modified_manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BurnManifest xmlns="http://wixtoolset.org/schemas/v4/2008/Burn">
     <Log PathVariable="WixBundleLog" Prefix="~SlipstreamTests_BundleA" Extension=".log" />
-    <RelatedBundle Id="{62C28DAF-A13E-4F55-ACA1-FB843630789C}" Action="Upgrade" />
+    <RelatedBundle Code="{62C28DAF-A13E-4F55-ACA1-FB843630789C}" Action="Upgrade" />
     <Variable Id="TestGroupName" Value="SlipstreamTests" Type="string" Hidden="no" Persisted="no" />
     <RegistrySearch Id="NETFRAMEWORK45" Variable="NETFRAMEWORK45" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" Value="Release" Type="value" VariableType="string" />
     <UX PrimaryPayloadId="WixManagedBootstrapperApplicationHost">
@@ -44,7 +44,7 @@
     <Payload Id="NetFx48Web" FilePath="redist\ndp48-web.exe" FileSize="1479400" Hash="5A84A8E612E270E27D0061D58DB6B470153BE1F9" DownloadUrl="https://go.microsoft.com/fwlink/?LinkId=2085155" Packaging="external" SourcePath="redist\ndp48-web.exe" />
     <Payload Id="PackageA" FilePath="PackageAv1.msi" FileSize="32768" Hash="2369B16B7219B3C834DFBC5D2AF8B2EF8803D43D" Packaging="external" SourcePath="PackageAv1.msi" />
     <RollbackBoundary Id="WixDefaultBoundary" Vital="yes" Transaction="no" />
-    <Registration Id="{22D1DDBA-284D-40A7-BD14-95EA07906F21}" ExecutableName="BundleA.exe" PerMachine="yes" Tag="" Version="1.0.0.0" ProviderKey="{DC94A8E0-4BF4-4026-B80B-2755DAFC05D3}">
+    <Registration Code="{22D1DDBA-284D-40A7-BD14-95EA07906F21}" ExecutableName="BundleA.exe" PerMachine="yes" Tag="" Version="1.0.0.0" ProviderKey="{DC94A8E0-4BF4-4026-B80B-2755DAFC05D3}">
         <Arp Register="yes" DisplayName="~SlipstreamTests - BundleA" DisplayVersion="1.0.0.0" />
     </Registration>
     <Chain>
diff --git a/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp b/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp
index c86a4a1d..59b2d8de 100644
--- a/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp
+++ b/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp
@@ -355,7 +355,7 @@ public: // IBootstrapperApplication
     }
 
     virtual STDMETHODIMP OnDetectRelatedBundle(
-        __in LPCWSTR wzBundleId,
+        __in LPCWSTR wzBundleCode,
         __in BOOTSTRAPPER_RELATION_TYPE relationType,
         __in LPCWSTR wzBundleTag,
         __in BOOL fPerMachine,
@@ -368,7 +368,7 @@ public: // IBootstrapperApplication
 
         if (!fMissingFromCache)
         {
-            BalInfoAddRelatedBundleAsPackage(&m_Bundle.packages, wzBundleId, relationType, fPerMachine, &pPackage);
+            BalInfoAddRelatedBundleAsPackage(&m_Bundle.packages, wzBundleCode, relationType, fPerMachine, &pPackage);
             // Best effort
         }
 
@@ -387,7 +387,7 @@ public: // IBootstrapperApplication
         }
 
     LExit:
-        return CBootstrapperApplicationBase::OnDetectRelatedBundle(wzBundleId, relationType, wzBundleTag, fPerMachine, wzVersion, fMissingFromCache, pfCancel);
+        return CBootstrapperApplicationBase::OnDetectRelatedBundle(wzBundleCode, relationType, wzBundleTag, fPerMachine, wzVersion, fMissingFromCache, pfCancel);
     }
 
 
@@ -550,7 +550,7 @@ public: // IBootstrapperApplication
 
 
     virtual STDMETHODIMP OnPlanRelatedBundleType(
-        __in_z LPCWSTR wzBundleId,
+        __in_z LPCWSTR wzBundleCode,
         __in BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE recommendedType,
         __inout BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE* pRequestedType,
         __inout BOOL* pfCancel
@@ -562,7 +562,7 @@ public: // IBootstrapperApplication
             *pRequestedType = BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE_NONE;
         }
 
-        return CBootstrapperApplicationBase::OnPlanRelatedBundleType(wzBundleId, recommendedType, pRequestedType, pfCancel);
+        return CBootstrapperApplicationBase::OnPlanRelatedBundleType(wzBundleCode, recommendedType, pRequestedType, pfCancel);
     }
 
 
@@ -1853,7 +1853,7 @@ private: // privates
     {
         BOOTSTRAPPER_REQUEST_STATE requestedState = pResults->requestedState;
         m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANRELATEDBUNDLE, pArgs, pResults, m_pvBAFunctionsProcContext);
-        BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_RELATED_BUNDLE, m_hModule, pArgs->wzBundleId, LoggingRequestStateToString(requestedState), LoggingRequestStateToString(pResults->requestedState));
+        BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_RELATED_BUNDLE, m_hModule, pArgs->wzBundleCode, LoggingRequestStateToString(requestedState), LoggingRequestStateToString(pResults->requestedState));
     }
 
     void OnPlanRelatedBundleTypeFallback(
@@ -1863,7 +1863,7 @@ private: // privates
     {
         BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE requestedType = pResults->requestedType;
         m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANRELATEDBUNDLETYPE, pArgs, pResults, m_pvBAFunctionsProcContext);
-        BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_RELATED_BUNDLE_TYPE, m_hModule, pArgs->wzBundleId, LoggingPlanRelationTypeToString(requestedType), LoggingPlanRelationTypeToString(pResults->requestedType));
+        BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_RELATED_BUNDLE_TYPE, m_hModule, pArgs->wzBundleCode, LoggingPlanRelationTypeToString(requestedType), LoggingPlanRelationTypeToString(pResults->requestedType));
     }
 
     void OnPlanPackageBeginFallback(
@@ -2259,7 +2259,7 @@ private: // privates
     {
         BOOL fIgnoreBundle = pResults->fIgnoreBundle;
         m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANFORWARDCOMPATIBLEBUNDLE, pArgs, pResults, m_pvBAFunctionsProcContext);
-        BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_FORWARD_COMPATIBLE_BUNDLE, m_hModule, pArgs->wzBundleId, fIgnoreBundle ? "ignore" : "enable", pResults->fIgnoreBundle ? "ignore" : "enable");
+        BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_FORWARD_COMPATIBLE_BUNDLE, m_hModule, pArgs->wzBundleCode, fIgnoreBundle ? "ignore" : "enable", pResults->fIgnoreBundle ? "ignore" : "enable");
     }
 
     void OnCacheVerifyProgressFallback(
@@ -2361,7 +2361,7 @@ private: // privates
     {
         BOOTSTRAPPER_REQUEST_STATE requestedState = pResults->requestedState;
         m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANRESTORERELATEDBUNDLE, pArgs, pResults, m_pvBAFunctionsProcContext);
-        BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_RESTORE_RELATED_BUNDLE, m_hModule, pArgs->wzBundleId, LoggingRequestStateToString(requestedState), LoggingRequestStateToString(pResults->requestedState));
+        BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_RESTORE_RELATED_BUNDLE, m_hModule, pArgs->wzBundleCode, LoggingRequestStateToString(requestedState), LoggingRequestStateToString(pResults->requestedState));
     }
 
     void OnApplyDowngradeFallback(
diff --git a/src/ext/Bal/wixstdfn/BalBaseBAFunctionsProc.cpp b/src/ext/Bal/wixstdfn/BalBaseBAFunctionsProc.cpp
index 38ebf65c..f8a94853 100644
--- a/src/ext/Bal/wixstdfn/BalBaseBAFunctionsProc.cpp
+++ b/src/ext/Bal/wixstdfn/BalBaseBAFunctionsProc.cpp
@@ -71,7 +71,7 @@ static HRESULT BalBaseBAFunctionsProcOnDetectForwardCompatibleBundle(
     __inout BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_RESULTS* pResults
     )
 {
-    return pBAFunctions->OnDetectForwardCompatibleBundle(pArgs->wzBundleId, pArgs->relationType, pArgs->wzBundleTag, pArgs->fPerMachine, pArgs->wzVersion, pArgs->fMissingFromCache, &pResults->fCancel);
+    return pBAFunctions->OnDetectForwardCompatibleBundle(pArgs->wzBundleCode, pArgs->relationType, pArgs->wzBundleTag, pArgs->fPerMachine, pArgs->wzVersion, pArgs->fMissingFromCache, &pResults->fCancel);
 }
 
 static HRESULT BalBaseBAFunctionsProcOnDetectUpdateBegin(
@@ -107,7 +107,7 @@ static HRESULT BalBaseBAFunctionsProcOnDetectRelatedBundle(
     __inout BA_ONDETECTRELATEDBUNDLE_RESULTS* pResults
     )
 {
-    return pBAFunctions->OnDetectRelatedBundle(pArgs->wzBundleId, pArgs->relationType, pArgs->wzBundleTag, pArgs->fPerMachine, pArgs->wzVersion, pArgs->fMissingFromCache, &pResults->fCancel);
+    return pBAFunctions->OnDetectRelatedBundle(pArgs->wzBundleCode, pArgs->relationType, pArgs->wzBundleTag, pArgs->fPerMachine, pArgs->wzVersion, pArgs->fMissingFromCache, &pResults->fCancel);
 }
 
 static HRESULT BalBaseBAFunctionsProcOnDetectPackageBegin(
@@ -170,7 +170,7 @@ static HRESULT BalBaseBAFunctionsProcOnPlanRelatedBundle(
     __inout BA_ONPLANRELATEDBUNDLE_RESULTS* pResults
     )
 {
-    return pBAFunctions->OnPlanRelatedBundle(pArgs->wzBundleId, pArgs->recommendedState, &pResults->requestedState, &pResults->fCancel);
+    return pBAFunctions->OnPlanRelatedBundle(pArgs->wzBundleCode, pArgs->recommendedState, &pResults->requestedState, &pResults->fCancel);
 }
 
 static HRESULT BalBaseBAFunctionsProcOnPlanRollbackBoundary(
@@ -647,7 +647,7 @@ static HRESULT BalBaseBAFunctionsProcOnPlanForwardCompatibleBundle(
     __inout BA_ONPLANFORWARDCOMPATIBLEBUNDLE_RESULTS* pResults
     )
 {
-    return pBAFunctions->OnPlanForwardCompatibleBundle(pArgs->wzBundleId, pArgs->relationType, pArgs->wzBundleTag, pArgs->fPerMachine, pArgs->wzVersion, pArgs->fRecommendedIgnoreBundle, &pResults->fCancel, &pResults->fIgnoreBundle);
+    return pBAFunctions->OnPlanForwardCompatibleBundle(pArgs->wzBundleCode, pArgs->relationType, pArgs->wzBundleTag, pArgs->fPerMachine, pArgs->wzVersion, pArgs->fRecommendedIgnoreBundle, &pResults->fCancel, &pResults->fIgnoreBundle);
 }
 
 static HRESULT BalBaseBAFunctionsProcOnCacheContainerOrPayloadVerifyBegin(
@@ -710,7 +710,7 @@ static HRESULT BalBaseBAFunctionsProcOnPlanRestoreRelatedBundle(
     __inout BA_ONPLANRESTORERELATEDBUNDLE_RESULTS* pResults
     )
 {
-    return pBAFunctions->OnPlanRestoreRelatedBundle(pArgs->wzBundleId, pArgs->recommendedState, &pResults->requestedState, &pResults->fCancel);
+    return pBAFunctions->OnPlanRestoreRelatedBundle(pArgs->wzBundleCode, pArgs->recommendedState, &pResults->requestedState, &pResults->fCancel);
 }
 
 static HRESULT BalBaseBAFunctionsProcOnPlanRelatedBundleType(
@@ -719,7 +719,7 @@ static HRESULT BalBaseBAFunctionsProcOnPlanRelatedBundleType(
     __inout BA_ONPLANRELATEDBUNDLETYPE_RESULTS* pResults
     )
 {
-    return pBAFunctions->OnPlanRelatedBundleType(pArgs->wzBundleId, pArgs->recommendedType, &pResults->requestedType, &pResults->fCancel);
+    return pBAFunctions->OnPlanRelatedBundleType(pArgs->wzBundleCode, pArgs->recommendedType, &pResults->requestedType, &pResults->fCancel);
 }
 
 static HRESULT BalBaseBAFunctionsProcOnApplyDowngrade(
@@ -737,7 +737,7 @@ static HRESULT BalBaseBAFunctionsProcOnDetectRelatedBundlePackage(
     __inout BA_ONDETECTRELATEDBUNDLEPACKAGE_RESULTS* pResults
     )
 {
-    return pBAFunctions->OnDetectRelatedBundlePackage(pArgs->wzPackageId, pArgs->wzBundleId, pArgs->relationType, pArgs->fPerMachine, pArgs->wzVersion, &pResults->fCancel);
+    return pBAFunctions->OnDetectRelatedBundlePackage(pArgs->wzPackageId, pArgs->wzBundleCode, pArgs->relationType, pArgs->fPerMachine, pArgs->wzVersion, &pResults->fCancel);
 }
 
 static HRESULT BalBaseBAFunctionsProcOnCachePackageNonVitalValidationFailure(
diff --git a/src/ext/Bal/wixstdfn/inc/BalBaseBAFunctions.h b/src/ext/Bal/wixstdfn/inc/BalBaseBAFunctions.h
index fd284d9c..d057f625 100644
--- a/src/ext/Bal/wixstdfn/inc/BalBaseBAFunctions.h
+++ b/src/ext/Bal/wixstdfn/inc/BalBaseBAFunctions.h
@@ -121,7 +121,7 @@ public: // IBootstrapperApplication
     }
 
     virtual STDMETHODIMP OnDetectForwardCompatibleBundle(
-        __in_z LPCWSTR /*wzBundleId*/,
+        __in_z LPCWSTR /*wzBundleCode*/,
         __in BOOTSTRAPPER_RELATION_TYPE /*relationType*/,
         __in_z LPCWSTR /*wzBundleTag*/,
         __in BOOL /*fPerMachine*/,
@@ -168,7 +168,7 @@ public: // IBootstrapperApplication
     }
 
     virtual STDMETHODIMP OnDetectRelatedBundle(
-        __in_z LPCWSTR /*wzBundleId*/,
+        __in_z LPCWSTR /*wzBundleCode*/,
         __in BOOTSTRAPPER_RELATION_TYPE /*relationType*/,
         __in_z LPCWSTR /*wzBundleTag*/,
         __in BOOL /*fPerMachine*/,
@@ -258,7 +258,7 @@ public: // IBootstrapperApplication
     }
 
     virtual STDMETHODIMP OnPlanRelatedBundle(
-        __in_z LPCWSTR /*wzBundleId*/,
+        __in_z LPCWSTR /*wzBundleCode*/,
         __in BOOTSTRAPPER_REQUEST_STATE /*recommendedState*/,
         __inout BOOTSTRAPPER_REQUEST_STATE* /*pRequestedState*/,
         __inout BOOL* /*pfCancel*/
@@ -776,7 +776,7 @@ public: // IBootstrapperApplication
     }
 
     virtual STDMETHODIMP OnPlanForwardCompatibleBundle(
-        __in_z LPCWSTR /*wzBundleId*/,
+        __in_z LPCWSTR /*wzBundleCode*/,
         __in BOOTSTRAPPER_RELATION_TYPE /*relationType*/,
         __in_z LPCWSTR /*wzBundleTag*/,
         __in BOOL /*fPerMachine*/,
@@ -850,7 +850,7 @@ public: // IBootstrapperApplication
     }
 
     virtual STDMETHODIMP OnPlanRestoreRelatedBundle(
-        __in_z LPCWSTR /*wzBundleId*/,
+        __in_z LPCWSTR /*wzBundleCode*/,
         __in BOOTSTRAPPER_REQUEST_STATE /*recommendedState*/,
         __inout BOOTSTRAPPER_REQUEST_STATE* /*pRequestedState*/,
         __inout BOOL* /*pfCancel*/
@@ -860,7 +860,7 @@ public: // IBootstrapperApplication
     }
 
     virtual STDMETHODIMP OnPlanRelatedBundleType(
-        __in_z LPCWSTR /*wzBundleId*/,
+        __in_z LPCWSTR /*wzBundleCode*/,
         __in BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE /*recommendedType*/,
         __inout BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE* /*pRequestedType*/,
         __inout BOOL* /*pfCancel*/
@@ -889,7 +889,7 @@ public: // IBootstrapperApplication
 
     virtual STDMETHODIMP OnDetectRelatedBundlePackage(
         __in_z LPCWSTR /*wzPackageId*/,
-        __in_z LPCWSTR /*wzBundleId*/,
+        __in_z LPCWSTR /*wzBundleCode*/,
         __in BOOTSTRAPPER_RELATION_TYPE /*relationType*/,
         __in BOOL /*fPerMachine*/,
         __in LPCWSTR /*wzVersion*/,
diff --git a/src/libs/dutil/WixToolset.DUtil/butil.cpp b/src/libs/dutil/WixToolset.DUtil/butil.cpp
index 4b6cd02a..87e58e36 100644
--- a/src/libs/dutil/WixToolset.DUtil/butil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/butil.cpp
@@ -61,12 +61,12 @@ static HRESULT QueryRelatedBundlesForScopeAndBitness(
 static HRESULT QueryPotentialRelatedBundle(
     __in BUNDLE_QUERY_CONTEXT* pQueryContext,
     __in HKEY hkUninstallKey,
-    __in_z LPCWSTR wzRelatedBundleId,
+    __in_z LPCWSTR wzRelatedBundleCode,
     __inout BUNDLE_QUERY_CALLBACK_RESULT* pResult
     );
 static HRESULT DetermineRelationType(
     __in BUNDLE_QUERY_CONTEXT* pQueryContext,
-    __in HKEY hkBundleId,
+    __in HKEY hkBundleCode,
     __out BUNDLE_RELATION_TYPE* pRelationType
     );
 /********************************************************************
@@ -76,7 +76,7 @@ LocateAndQueryBundleValue - Locates the requested key for the bundle,
 NOTE: caller is responsible for closing key
 ********************************************************************/
 static HRESULT LocateAndQueryBundleValue(
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in_opt LPCWSTR wzSubKey,
     __in LPCWSTR wzValueName,
     __inout HKEY* phKey,
@@ -91,7 +91,7 @@ static HRESULT CopyStringToBuffer(
 
 
 DAPI_(HRESULT) BundleGetBundleInfo(
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in_z LPCWSTR wzAttribute,
     __deref_out_z LPWSTR* psczValue
     )
@@ -102,12 +102,12 @@ DAPI_(HRESULT) BundleGetBundleInfo(
     DWORD dwType = 0;
     DWORD dwValue = 0;
 
-    if (!wzBundleId || !wzAttribute || !psczValue)
+    if (!wzBundleCode || !wzAttribute || !psczValue)
     {
         ButilExitWithRootFailure(hr, E_INVALIDARG, "An invalid parameter was passed to the function.");
     }
 
-    hr = LocateAndQueryBundleValue(wzBundleId, NULL, wzAttribute, &hkBundle, &dwType, &status);
+    hr = LocateAndQueryBundleValue(wzBundleCode, NULL, wzAttribute, &hkBundle, &dwType, &status);
     ButilExitOnFailure(hr, "Failed to locate and query bundle attribute.");
 
     switch (status)
@@ -144,7 +144,7 @@ LExit:
 
 
 DAPI_(HRESULT) BundleGetBundleInfoFixed(
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in_z LPCWSTR wzAttribute,
     __out_ecount_opt(*pcchValue) LPWSTR wzValue,
     __inout SIZE_T* pcchValue
@@ -158,7 +158,7 @@ DAPI_(HRESULT) BundleGetBundleInfoFixed(
         ButilExitWithRootFailure(hr, E_INVALIDARG, "An invalid parameter was passed to the function.");
     }
 
-    hr = BundleGetBundleInfo(wzBundleId, wzAttribute, &sczValue);
+    hr = BundleGetBundleInfo(wzBundleCode, wzAttribute, &sczValue);
     if (SUCCEEDED(hr))
     {
         hr = CopyStringToBuffer(sczValue, wzValue, pcchValue);
@@ -176,7 +176,7 @@ DAPI_(HRESULT) BundleEnumRelatedBundle(
     __in BUNDLE_INSTALL_CONTEXT context,
     __in REG_KEY_BITNESS kbKeyBitness,
     __inout PDWORD pdwStartIndex,
-    __deref_out_z LPWSTR* psczBundleId
+    __deref_out_z LPWSTR* psczBundleCode
     )
 {
     HRESULT hr = S_OK;
@@ -218,9 +218,9 @@ DAPI_(HRESULT) BundleEnumRelatedBundle(
             fUpgradeCodeFound = TRUE;
             *pdwStartIndex = dwIndex;
 
-            if (psczBundleId)
+            if (psczBundleCode)
             {
-                *psczBundleId = sczUninstallSubKey;
+                *psczBundleCode = sczUninstallSubKey;
                 sczUninstallSubKey = NULL;
             }
 
@@ -246,7 +246,7 @@ DAPI_(HRESULT) BundleEnumRelatedBundleFixed(
     __in BUNDLE_INSTALL_CONTEXT context,
     __in REG_KEY_BITNESS kbKeyBitness,
     __inout PDWORD pdwStartIndex,
-    __out_ecount(MAX_GUID_CHARS+1) LPWSTR wzBundleId
+    __out_ecount(MAX_GUID_CHARS+1) LPWSTR wzBundleCode
     )
 {
     HRESULT hr = S_OK;
@@ -254,12 +254,12 @@ DAPI_(HRESULT) BundleEnumRelatedBundleFixed(
     size_t cchValue = 0;
 
     hr = BundleEnumRelatedBundle(wzUpgradeCode, context, kbKeyBitness, pdwStartIndex, &sczValue);
-    if (S_OK == hr && wzBundleId)
+    if (S_OK == hr && wzBundleCode)
     {
         hr = ::StringCchLengthW(sczValue, STRSAFE_MAX_CCH, &cchValue);
         ButilExitOnRootFailure(hr, "Failed to calculate length of string.");
 
-        hr = ::StringCchCopyNExW(wzBundleId, MAX_GUID_CHARS + 1, sczValue, cchValue, NULL, NULL, STRSAFE_FILL_BEHIND_NULL);
+        hr = ::StringCchCopyNExW(wzBundleCode, MAX_GUID_CHARS + 1, sczValue, cchValue, NULL, NULL, STRSAFE_FILL_BEHIND_NULL);
         ButilExitOnRootFailure(hr, "Failed to copy the property value to the output buffer.");
     }
 
@@ -271,7 +271,7 @@ LExit:
 
 
 DAPI_(HRESULT) BundleGetBundleVariable(
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in_z LPCWSTR wzVariable,
     __deref_out_z LPWSTR* psczValue
     )
@@ -281,12 +281,12 @@ DAPI_(HRESULT) BundleGetBundleVariable(
     INTERNAL_BUNDLE_STATUS status = INTERNAL_BUNDLE_STATUS_SUCCESS;
     DWORD dwType = 0;
 
-    if (!wzBundleId || !wzVariable || !psczValue)
+    if (!wzBundleCode || !wzVariable || !psczValue)
     {
         ButilExitWithRootFailure(hr, E_INVALIDARG, "An invalid parameter was passed to the function.");
     }
 
-    hr = LocateAndQueryBundleValue(wzBundleId, BUNDLE_REGISTRATION_REGISTRY_BUNDLE_VARIABLE_KEY, wzVariable, &hkBundle, &dwType, &status);
+    hr = LocateAndQueryBundleValue(wzBundleCode, BUNDLE_REGISTRATION_REGISTRY_BUNDLE_VARIABLE_KEY, wzVariable, &hkBundle, &dwType, &status);
     ButilExitOnFailure(hr, "Failed to locate and query bundle variable.");
 
     switch (status)
@@ -319,7 +319,7 @@ LExit:
 
 
 DAPI_(HRESULT) BundleGetBundleVariableFixed(
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in_z LPCWSTR wzVariable,
     __out_ecount_opt(*pcchValue) LPWSTR wzValue,
     __inout SIZE_T* pcchValue
@@ -333,7 +333,7 @@ DAPI_(HRESULT) BundleGetBundleVariableFixed(
         ButilExitWithRootFailure(hr, E_INVALIDARG, "An invalid parameter was passed to the function.");
     }
 
-    hr = BundleGetBundleVariable(wzBundleId, wzVariable, &sczValue);
+    hr = BundleGetBundleVariable(wzBundleCode, wzVariable, &sczValue);
     if (SUCCEEDED(hr))
     {
         hr = CopyStringToBuffer(sczValue, wzValue, pcchValue);
@@ -405,7 +405,7 @@ static HRESULT QueryRelatedBundlesForScopeAndBitness(
     HKEY hkRoot = BUNDLE_INSTALL_CONTEXT_USER == pQueryContext->installContext ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE;
     HKEY hkUninstallKey = NULL;
     BOOL fExists = FALSE;
-    LPWSTR sczRelatedBundleId = NULL;
+    LPWSTR sczRelatedBundleCode = NULL;
     BUNDLE_QUERY_CALLBACK_RESULT result = BUNDLE_QUERY_CALLBACK_RESULT_CONTINUE;
 
     hr = RegOpenEx(hkRoot, BUNDLE_REGISTRATION_REGISTRY_UNINSTALL_KEY, KEY_READ, pQueryContext->regBitness, &hkUninstallKey);
@@ -418,7 +418,7 @@ static HRESULT QueryRelatedBundlesForScopeAndBitness(
 
     for (DWORD dwIndex = 0; /* exit via break below */; ++dwIndex)
     {
-        hr = RegKeyEnum(hkUninstallKey, dwIndex, &sczRelatedBundleId);
+        hr = RegKeyEnum(hkUninstallKey, dwIndex, &sczRelatedBundleCode);
         if (E_NOMOREITEMS == hr)
         {
             hr = S_OK;
@@ -428,7 +428,7 @@ static HRESULT QueryRelatedBundlesForScopeAndBitness(
 
         // Ignore failures here since we'll often find products that aren't actually
         // related bundles (or even bundles at all).
-        HRESULT hrRelatedBundle = QueryPotentialRelatedBundle(pQueryContext, hkUninstallKey, sczRelatedBundleId, &result);
+        HRESULT hrRelatedBundle = QueryPotentialRelatedBundle(pQueryContext, hkUninstallKey, sczRelatedBundleCode, &result);
         if (SUCCEEDED(hrRelatedBundle) && BUNDLE_QUERY_CALLBACK_RESULT_CONTINUE != result)
         {
             ExitFunction1(hr = HRESULT_FROM_WIN32(ERROR_REQUEST_ABORTED));
@@ -436,7 +436,7 @@ static HRESULT QueryRelatedBundlesForScopeAndBitness(
     }
 
 LExit:
-    ReleaseStr(sczRelatedBundleId);
+    ReleaseStr(sczRelatedBundleCode);
     ReleaseRegKey(hkUninstallKey);
 
     return hr;
@@ -445,19 +445,19 @@ LExit:
 static HRESULT QueryPotentialRelatedBundle(
     __in BUNDLE_QUERY_CONTEXT* pQueryContext,
     __in HKEY hkUninstallKey,
-    __in_z LPCWSTR wzRelatedBundleId,
+    __in_z LPCWSTR wzRelatedBundleCode,
     __inout BUNDLE_QUERY_CALLBACK_RESULT* pResult
     )
 {
     HRESULT hr = S_OK;
-    HKEY hkBundleId = NULL;
+    HKEY hkBundleCode = NULL;
     BUNDLE_RELATION_TYPE relationType = BUNDLE_RELATION_NONE;
     BUNDLE_QUERY_RELATED_BUNDLE_RESULT bundle = { };
 
-    hr = RegOpenEx(hkUninstallKey, wzRelatedBundleId, KEY_READ, pQueryContext->regBitness, &hkBundleId);
-    ButilExitOnFailure(hr, "Failed to open uninstall key for potential related bundle: %ls", wzRelatedBundleId);
+    hr = RegOpenEx(hkUninstallKey, wzRelatedBundleCode, KEY_READ, pQueryContext->regBitness, &hkBundleCode);
+    ButilExitOnFailure(hr, "Failed to open uninstall key for potential related bundle: %ls", wzRelatedBundleCode);
 
-    hr = DetermineRelationType(pQueryContext, hkBundleId, &relationType);
+    hr = DetermineRelationType(pQueryContext, hkBundleCode, &relationType);
     if (FAILED(hr))
     {
         ExitFunction();
@@ -465,21 +465,21 @@ static HRESULT QueryPotentialRelatedBundle(
 
     bundle.installContext = pQueryContext->installContext;
     bundle.regBitness = pQueryContext->regBitness;
-    bundle.wzBundleId = wzRelatedBundleId;
+    bundle.wzBundleCode = wzRelatedBundleCode;
     bundle.relationType = relationType;
-    bundle.hkBundle = hkBundleId;
+    bundle.hkBundle = hkBundleCode;
 
     *pResult = pQueryContext->pfnCallback(&bundle, pQueryContext->pvContext);
 
 LExit:
-    ReleaseRegKey(hkBundleId);
+    ReleaseRegKey(hkBundleCode);
 
     return hr;
 }
 
 static HRESULT DetermineRelationType(
     __in BUNDLE_QUERY_CONTEXT* pQueryContext,
-    __in HKEY hkBundleId,
+    __in HKEY hkBundleCode,
     __out BUNDLE_RELATION_TYPE* pRelationType
     )
 {
@@ -499,7 +499,7 @@ static HRESULT DetermineRelationType(
 
     *pRelationType = BUNDLE_RELATION_NONE;
 
-    hr = RegReadStringArray(hkBundleId, BUNDLE_REGISTRATION_REGISTRY_BUNDLE_UPGRADE_CODE, &rgsczUpgradeCodes, &cUpgradeCodes);
+    hr = RegReadStringArray(hkBundleCode, BUNDLE_REGISTRATION_REGISTRY_BUNDLE_UPGRADE_CODE, &rgsczUpgradeCodes, &cUpgradeCodes);
     if (HRESULT_FROM_WIN32(ERROR_INVALID_DATATYPE) == hr)
     {
         TraceError(hr, "Failed to read upgrade codes as REG_MULTI_SZ. Trying again as REG_SZ in case of older bundles.");
@@ -507,7 +507,7 @@ static HRESULT DetermineRelationType(
         rgsczUpgradeCodes = reinterpret_cast<LPWSTR*>(MemAlloc(sizeof(LPWSTR), TRUE));
         ButilExitOnNull(rgsczUpgradeCodes, hr, E_OUTOFMEMORY, "Failed to allocate list for a single upgrade code from older bundle.");
 
-        hr = RegReadString(hkBundleId, BUNDLE_REGISTRATION_REGISTRY_BUNDLE_UPGRADE_CODE, &rgsczUpgradeCodes[0]);
+        hr = RegReadString(hkBundleCode, BUNDLE_REGISTRATION_REGISTRY_BUNDLE_UPGRADE_CODE, &rgsczUpgradeCodes[0]);
         if (SUCCEEDED(hr))
         {
             cUpgradeCodes = 1;
@@ -581,7 +581,7 @@ static HRESULT DetermineRelationType(
     }
 
     // Compare addon codes.
-    hr = RegReadStringArray(hkBundleId, BUNDLE_REGISTRATION_REGISTRY_BUNDLE_ADDON_CODE, &rgsczAddonCodes, &cAddonCodes);
+    hr = RegReadStringArray(hkBundleCode, BUNDLE_REGISTRATION_REGISTRY_BUNDLE_ADDON_CODE, &rgsczAddonCodes, &cAddonCodes);
     if (SUCCEEDED(hr))
     {
         hr = DictCreateStringListFromArray(&sdAddonCodes, rgsczAddonCodes, cAddonCodes, DICT_FLAG_CASEINSENSITIVE);
@@ -620,7 +620,7 @@ static HRESULT DetermineRelationType(
     }
 
     // Compare patch codes.
-    hr = RegReadStringArray(hkBundleId, BUNDLE_REGISTRATION_REGISTRY_BUNDLE_PATCH_CODE, &rgsczPatchCodes, &cPatchCodes);
+    hr = RegReadStringArray(hkBundleCode, BUNDLE_REGISTRATION_REGISTRY_BUNDLE_PATCH_CODE, &rgsczPatchCodes, &cPatchCodes);
     if (SUCCEEDED(hr))
     {
         hr = DictCreateStringListFromArray(&sdPatchCodes, rgsczPatchCodes, cPatchCodes, DICT_FLAG_CASEINSENSITIVE);
@@ -659,7 +659,7 @@ static HRESULT DetermineRelationType(
     }
 
     // Compare detect codes.
-    hr = RegReadStringArray(hkBundleId, BUNDLE_REGISTRATION_REGISTRY_BUNDLE_DETECT_CODE, &rgsczDetectCodes, &cDetectCodes);
+    hr = RegReadStringArray(hkBundleCode, BUNDLE_REGISTRATION_REGISTRY_BUNDLE_DETECT_CODE, &rgsczDetectCodes, &cDetectCodes);
     if (SUCCEEDED(hr))
     {
         hr = DictCreateStringListFromArray(&sdDetectCodes, rgsczDetectCodes, cDetectCodes, DICT_FLAG_CASEINSENSITIVE);
@@ -730,7 +730,7 @@ LExit:
 }
 
 static HRESULT LocateAndQueryBundleValue(
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in_opt LPCWSTR wzSubKey,
     __in LPCWSTR wzValueName,
     __inout HKEY* phKey,
@@ -746,11 +746,11 @@ static HRESULT LocateAndQueryBundleValue(
 
     if (wzSubKey)
     {
-        hr = StrAllocFormatted(&sczKeypath, L"%ls\\%ls\\%ls", BUNDLE_REGISTRATION_REGISTRY_UNINSTALL_KEY, wzBundleId, wzSubKey);
+        hr = StrAllocFormatted(&sczKeypath, L"%ls\\%ls\\%ls", BUNDLE_REGISTRATION_REGISTRY_UNINSTALL_KEY, wzBundleCode, wzSubKey);
     }
     else
     {
-        hr = StrAllocFormatted(&sczKeypath, L"%ls\\%ls", BUNDLE_REGISTRATION_REGISTRY_UNINSTALL_KEY, wzBundleId);
+        hr = StrAllocFormatted(&sczKeypath, L"%ls\\%ls", BUNDLE_REGISTRATION_REGISTRY_UNINSTALL_KEY, wzBundleCode);
     }
     ButilExitOnFailure(hr, "Failed to allocate bundle uninstall key path.");
 
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/butil.h b/src/libs/dutil/WixToolset.DUtil/inc/butil.h
index 5d390344..567d59d9 100644
--- a/src/libs/dutil/WixToolset.DUtil/inc/butil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/butil.h
@@ -31,7 +31,7 @@ typedef enum _BUNDLE_RELATION_TYPE
 
 typedef struct _BUNDLE_QUERY_RELATED_BUNDLE_RESULT
 {
-    LPCWSTR wzBundleId;
+    LPCWSTR wzBundleCode;
     BUNDLE_INSTALL_CONTEXT installContext;
     REG_KEY_BITNESS regBitness;
     HKEY hkBundle;
@@ -61,7 +61,7 @@ RETURNS:
     All other returns are unexpected returns from other dutil methods.
 ********************************************************************/
 HRESULT DAPI BundleGetBundleInfo(
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in_z LPCWSTR wzAttribute,
     __deref_out_z LPWSTR* psczValue
     );
@@ -84,7 +84,7 @@ RETURNS:
     All other returns are unexpected returns from other dutil methods.
 ********************************************************************/
 HRESULT DAPI BundleGetBundleInfoFixed(
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in_z LPCWSTR wzAttribute,
     __out_ecount_opt(*pcchValue) LPWSTR wzValue,
     __inout SIZE_T* pcchValue
@@ -109,15 +109,16 @@ HRESULT DAPI BundleEnumRelatedBundle(
     __in BUNDLE_INSTALL_CONTEXT context,
     __in REG_KEY_BITNESS kbKeyBitness,
     __inout PDWORD pdwStartIndex,
-    __deref_out_z LPWSTR* psczBundleId
+    __deref_out_z LPWSTR* psczBundleCode
     );
 
 /********************************************************************
 BundleEnumRelatedBundleFixed - Queries the bundle installation metadata for installs with the given upgrade code
 Enumerate 32-bit and 64-bit in two passes.
 
-NOTE: lpBundleIdBuff is a buffer to receive the bundle GUID. This buffer must be 39 characters long.
-        The first 38 characters are for the GUID, and the last character is for the terminating null character.
+NOTE: wzBundleCode is a buffer to receive the bundle GUID. This buffer must be 39 characters long.
+      The first 38 characters are for the GUID, and the last character is for the terminating null character.
+
 RETURNS:
     E_INVALIDARG
         An invalid parameter was passed to the function.
@@ -133,7 +134,7 @@ HRESULT DAPI BundleEnumRelatedBundleFixed(
     __in BUNDLE_INSTALL_CONTEXT context,
     __in REG_KEY_BITNESS kbKeyBitness,
     __inout PDWORD pdwStartIndex,
-    __out_ecount(MAX_GUID_CHARS+1) LPWSTR wzBundleId
+    __out_ecount(MAX_GUID_CHARS+1) LPWSTR wzBundleCode
     );
 
 /********************************************************************
@@ -155,7 +156,7 @@ RETURNS:
     All other returns are unexpected returns from other dutil methods.
 ********************************************************************/
 HRESULT DAPI BundleGetBundleVariable(
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in_z LPCWSTR wzVariable,
     __deref_out_z LPWSTR* psczValue
     );
@@ -180,7 +181,7 @@ RETURNS:
     All other returns are unexpected returns from other dutil methods.
 ********************************************************************/
 HRESULT DAPI BundleGetBundleVariableFixed(
-    __in_z LPCWSTR wzBundleId,
+    __in_z LPCWSTR wzBundleCode,
     __in_z LPCWSTR wzVariable,
     __out_ecount_opt(*pcchValue) LPWSTR wzValue,
     __inout SIZE_T* pcchValue
diff --git a/src/setup/MetadataTask/GenerateMetadata.cs b/src/setup/MetadataTask/GenerateMetadata.cs
index 645b7750..ddb645ad 100644
--- a/src/setup/MetadataTask/GenerateMetadata.cs
+++ b/src/setup/MetadataTask/GenerateMetadata.cs
@@ -76,7 +76,7 @@ namespace WixToolset.Tasks
                 Description = "Installation for " + bundleSymbol.Name,
                 License = "MS-RL",
                 SupportUrl = bundleSymbol.HelpUrl,
-                BundleCode = bundleSymbol.BundleId,
+                BundleCode = bundleSymbol.BundleCode,
                 UpgradeCode = bundleSymbol.UpgradeCode,
                 AboutUrl = bundleSymbol.AboutUrl,
                 Architecture = PlatformToArchitecture(bundleSymbol.Platform),
diff --git a/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyBurnBackendExtension.cs b/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyBurnBackendExtension.cs
index fff23274..cb97984f 100644
--- a/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyBurnBackendExtension.cs
+++ b/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyBurnBackendExtension.cs
@@ -37,7 +37,7 @@ namespace ForTestingUseOnly
             }
 
             var bundleSymbol = section.Symbols.OfType<WixBundleSymbol>().Single();
-            bundleSymbol.ProviderKey = bundleSymbol.BundleId = forTestingUseOnlyBundleSymbol.BundleId;
+            bundleSymbol.ProviderKey = bundleSymbol.BundleCode = forTestingUseOnlyBundleSymbol.BundleCode;
         }
     }
 }
diff --git a/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyCompiler.cs b/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyCompiler.cs
index 4963c941..f6ff7f87 100644
--- a/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyCompiler.cs
+++ b/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyCompiler.cs
@@ -32,7 +32,7 @@ namespace ForTestingUseOnly
         private void ParseForTestingUseOnlyBundleElement(Intermediate intermediate, IntermediateSection section, XElement element)
         {
             var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element);
-            string bundleId = null;
+            string bundleCode = null;
 
             foreach (var attrib in element.Attributes())
             {
@@ -41,7 +41,7 @@ namespace ForTestingUseOnly
                     switch (attrib.Name.LocalName)
                     {
                         case "Id":
-                            bundleId = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            bundleCode = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
                             break;
                         default:
                             this.ParseHelper.UnexpectedAttribute(element, attrib);
@@ -54,13 +54,13 @@ namespace ForTestingUseOnly
                 }
             }
 
-            if (null == bundleId)
+            if (null == bundleCode)
             {
                 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Id"));
             }
             else
             {
-                bundleId = Guid.Parse(bundleId).ToString("B").ToUpperInvariant();
+                bundleCode = Guid.Parse(bundleCode).ToString("B").ToUpperInvariant();
             }
 
             this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
@@ -69,7 +69,7 @@ namespace ForTestingUseOnly
             {
                 section.AddSymbol(new ForTestingUseOnlyBundleSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "ForTestingUseOnlyBundle"))
                 {
-                    BundleId = bundleId,
+                    BundleCode = bundleCode,
                 });
             }
         }
diff --git a/src/test/burn/ForTestingUseOnlyExtension/Symbols/ForTestingUseOnlyBundleSymbol.cs b/src/test/burn/ForTestingUseOnlyExtension/Symbols/ForTestingUseOnlyBundleSymbol.cs
index a17dfe31..6cf9dabb 100644
--- a/src/test/burn/ForTestingUseOnlyExtension/Symbols/ForTestingUseOnlyBundleSymbol.cs
+++ b/src/test/burn/ForTestingUseOnlyExtension/Symbols/ForTestingUseOnlyBundleSymbol.cs
@@ -11,7 +11,7 @@ namespace ForTestingUseOnly
             ForTestingUseOnlySymbolDefinitionType.ForTestingUseOnlyBundle.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(ForTestingUseOnlyBundleSymbolFields.BundleId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ForTestingUseOnlyBundleSymbolFields.BundleCode), IntermediateFieldType.String),
             },
             typeof(ForTestingUseOnlyBundleSymbol));
     }
@@ -23,7 +23,7 @@ namespace ForTestingUseOnly.Symbols
 
     public enum ForTestingUseOnlyBundleSymbolFields
     {
-        BundleId,
+        BundleCode,
     }
 
     public class ForTestingUseOnlyBundleSymbol : IntermediateSymbol
@@ -38,10 +38,10 @@ namespace ForTestingUseOnly.Symbols
 
         public IntermediateField this[ForTestingUseOnlyBundleSymbolFields index] => this.Fields[(int)index];
 
-        public string BundleId
+        public string BundleCode
         {
-            get => this.Fields[(int)ForTestingUseOnlyBundleSymbolFields.BundleId].AsString();
-            set => this.Set((int)ForTestingUseOnlyBundleSymbolFields.BundleId, value);
+            get => this.Fields[(int)ForTestingUseOnlyBundleSymbolFields.BundleCode].AsString();
+            set => this.Set((int)ForTestingUseOnlyBundleSymbolFields.BundleCode, value);
         }
     }
 }
diff --git a/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/BafRelatedBundleVariableTesting.cpp b/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/BafRelatedBundleVariableTesting.cpp
index ba559b05..e65ac5ca 100644
--- a/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/BafRelatedBundleVariableTesting.cpp
+++ b/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/BafRelatedBundleVariableTesting.cpp
@@ -14,7 +14,7 @@ public: // IBAFunctions
 
 public: //IBootstrapperApplication
     virtual STDMETHODIMP OnDetectRelatedBundle(
-        __in_z LPCWSTR wzBundleId,
+        __in_z LPCWSTR wzBundleCode,
         __in BOOTSTRAPPER_RELATION_TYPE relationType,
         __in_z LPCWSTR wzBundleTag,
         __in BOOL fPerMachine,
@@ -27,15 +27,15 @@ public: //IBootstrapperApplication
         HRESULT hr = S_OK;
         LPWSTR wzValue = NULL;
 
-        hr = BalGetRelatedBundleVariable(wzBundleId, STRING_VARIABLE, &wzValue);
+        hr = BalGetRelatedBundleVariable(wzBundleCode, STRING_VARIABLE, &wzValue);
 
         BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Retrieved related bundle variable with BAFunctions: AString = %ws, Error: 0x%x", wzValue, hr);
 
-        hr = BalGetRelatedBundleVariable(wzBundleId, NUMBER_VARIABLE, &wzValue);
+        hr = BalGetRelatedBundleVariable(wzBundleCode, NUMBER_VARIABLE, &wzValue);
 
         BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Retrieved related bundle variable with BAFunctions: ANumber = %ws, Error: 0x%x", wzValue, hr);
 
-        hr = __super::OnDetectRelatedBundle(wzBundleId, relationType, wzBundleTag, fPerMachine, wzVersion, fMissingFromCache, pfCancel);
+        hr = __super::OnDetectRelatedBundle(wzBundleCode, relationType, wzBundleTag, fPerMachine, wzVersion, fMissingFromCache, pfCancel);
 
         ReleaseStr(wzValue);
         return hr;
diff --git a/src/test/burn/TestData/BundlePackageTests/MultipleBundlePackagesWithRemoteBundle/MultipleBundlePackagesWithRemoteBundle.wxs b/src/test/burn/TestData/BundlePackageTests/MultipleBundlePackagesWithRemoteBundle/MultipleBundlePackagesWithRemoteBundle.wxs
index a0f42ee9..0d05700f 100644
--- a/src/test/burn/TestData/BundlePackageTests/MultipleBundlePackagesWithRemoteBundle/MultipleBundlePackagesWithRemoteBundle.wxs
+++ b/src/test/burn/TestData/BundlePackageTests/MultipleBundlePackagesWithRemoteBundle/MultipleBundlePackagesWithRemoteBundle.wxs
@@ -6,13 +6,13 @@
     <PackageGroup Id="BundlePackages">
       <BundlePackage Id="ASP.Net_Core_6.0" Permanent="yes">
         <BundlePackagePayload Id="ASP.Net_Core_6.0" Name="aspnetcore-runtime-6.0.10-win-x64.exe" ProductName="Microsoft ASP.NET Core 6.0.10 - Shared Framework (x64)" Description="Microsoft ASP.NET Core 6.0.10 - Shared Framework (x64)" DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/2370bcad-45b1-4ccb-bc61-21ffd7116d63/1aa8efcabfb60ee778b913a5eb237a56/aspnetcore-runtime-6.0.10-win-x64.exe" Hash="4AF8DA7DE85BCB1D079A85CD3F4AAFDFC4E4D441B87DFCDFFC27C820D9F69513341BE5ACC987C47CACDC597CBC0CC89C7D746050E6D40AE02DB7391E8214352D" Size="8997144" Version="6.0.10.22476">
-          <RemoteBundle BundleId="{5D69246A-5874-401D-9879-ECC18D5A1BAB}" DisplayName="Microsoft ASP.NET Core 6.0.10 - Shared Framework (x64)" InstallSize="22958021" ManifestNamespace="http://schemas.microsoft.com/wix/2008/Burn" PerMachine="yes" ProviderKey="{5d69246a-5874-401d-9879-ecc18d5a1bab}" ProtocolVersion="1" Version="6.0.10.22476" Win64="no" UpgradeCode="{B7C4CC53-CE40-39E9-9F43-81CE9F5CD47C}" />
+          <RemoteBundle BundleCode="{5D69246A-5874-401D-9879-ECC18D5A1BAB}" DisplayName="Microsoft ASP.NET Core 6.0.10 - Shared Framework (x64)" InstallSize="22958021" ManifestNamespace="http://schemas.microsoft.com/wix/2008/Burn" PerMachine="yes" ProviderKey="{5d69246a-5874-401d-9879-ecc18d5a1bab}" ProtocolVersion="1" Version="6.0.10.22476" Win64="no" UpgradeCode="{B7C4CC53-CE40-39E9-9F43-81CE9F5CD47C}" />
         </BundlePackagePayload>
       </BundlePackage>
 
       <BundlePackage Id="Dotnet_Runtime_6.0" Permanent="yes">
         <BundlePackagePayload Id="Dotnet_Runtime_6.0" Name="dotnet-runtime-6.0.10-win-x64.exe" ProductName="Microsoft .NET Runtime - 6.0.10 (x64)" Description="Microsoft .NET Runtime - 6.0.10 (x64)" DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/50336bc7-7fd1-4a12-b5a2-81ce0219edf9/8d862413975808de0d835888e41e49a7/dotnet-runtime-6.0.10-win-x64.exe" Hash="23E4C862AFEF34A2C0D6476A93274CE0158D28F1609E0404737663E4BE17263E61E5A8760382FB125D288A0965394E3D04B9E1C77F99DE80A2C590DD295B8732" Size="27912752" Version="6.0.10.31726">
-          <RemoteBundle BundleId="{9A89127E-80A4-45FB-AD62-58F72634274A}" DisplayName="Microsoft .NET Runtime - 6.0.10 (x64)" InstallSize="71462036" ManifestNamespace="http://schemas.microsoft.com/wix/2008/Burn" PerMachine="yes" ProviderKey="{9a89127e-80a4-45fb-ad62-58f72634274a}" ProtocolVersion="1" Version="6.0.10.31726" Win64="no" UpgradeCode="{B19A028F-5C89-7AF4-5102-0F8ED67CCACA}" />
+          <RemoteBundle BundleCode="{9A89127E-80A4-45FB-AD62-58F72634274A}" DisplayName="Microsoft .NET Runtime - 6.0.10 (x64)" InstallSize="71462036" ManifestNamespace="http://schemas.microsoft.com/wix/2008/Burn" PerMachine="yes" ProviderKey="{9a89127e-80a4-45fb-ad62-58f72634274a}" ProtocolVersion="1" Version="6.0.10.31726" Win64="no" UpgradeCode="{B19A028F-5C89-7AF4-5102-0F8ED67CCACA}" />
         </BundlePackagePayload>
       </BundlePackage>
     </PackageGroup>
diff --git a/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wxs b/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wxs
index cfeda6c4..51d6c508 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wxs
@@ -3,18 +3,18 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:fortestinguseonly="http://wixtoolset.org/schemas/v4/wxs/fortestinguseonly">
   <Fragment>
     <fortestinguseonly:ForTestingUseOnlyBundle Id="{5E9D5B04-41EA-4196-954C-1F7357C31FB0}" />
-    <RelatedBundle Id="{AAAAAAAA-0000-0000-0000-000000000000}" Action="addon" />
-    <RelatedBundle Id="{BBBBBBBB-0000-0000-0000-000000000000}" Action="patch" />
-    <RelatedBundle Id="{CCCCCCCC-0000-0000-0000-000000000000}" Action="upgrade" />
-    <RelatedBundle Id="{DDDDDDDD-0000-0000-0000-000000000000}" Action="detect" />
-    <RelatedBundle Id="{AAAAAAAA-1111-0000-0000-000000000000}" Action="addon" />
-    <RelatedBundle Id="{BBBBBBBB-1111-0000-0000-000000000000}" Action="patch" />
-    <RelatedBundle Id="{CCCCCCCC-1111-0000-0000-000000000000}" Action="upgrade" />
-    <RelatedBundle Id="{DDDDDDDD-1111-0000-0000-000000000000}" Action="detect" />
-    <RelatedBundle Id="{AAAAAAAA-2222-0000-0000-000000000000}" Action="addon" />
-    <RelatedBundle Id="{BBBBBBBB-2222-0000-0000-000000000000}" Action="patch" />
-    <RelatedBundle Id="{CCCCCCCC-2222-0000-0000-000000000000}" Action="upgrade" />
-    <RelatedBundle Id="{DDDDDDDD-2222-0000-0000-000000000000}" Action="detect" />
+    <RelatedBundle Code="{AAAAAAAA-0000-0000-0000-000000000000}" Action="addon" />
+    <RelatedBundle Code="{BBBBBBBB-0000-0000-0000-000000000000}" Action="patch" />
+    <RelatedBundle Code="{CCCCCCCC-0000-0000-0000-000000000000}" Action="upgrade" />
+    <RelatedBundle Code="{DDDDDDDD-0000-0000-0000-000000000000}" Action="detect" />
+    <RelatedBundle Code="{AAAAAAAA-1111-0000-0000-000000000000}" Action="addon" />
+    <RelatedBundle Code="{BBBBBBBB-1111-0000-0000-000000000000}" Action="patch" />
+    <RelatedBundle Code="{CCCCCCCC-1111-0000-0000-000000000000}" Action="upgrade" />
+    <RelatedBundle Code="{DDDDDDDD-1111-0000-0000-000000000000}" Action="detect" />
+    <RelatedBundle Code="{AAAAAAAA-2222-0000-0000-000000000000}" Action="addon" />
+    <RelatedBundle Code="{BBBBBBBB-2222-0000-0000-000000000000}" Action="patch" />
+    <RelatedBundle Code="{CCCCCCCC-2222-0000-0000-000000000000}" Action="upgrade" />
+    <RelatedBundle Code="{DDDDDDDD-2222-0000-0000-000000000000}" Action="detect" />
 
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wxs b/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wxs
index 78c5493d..a808b124 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wxs
@@ -5,7 +5,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util" xmlns:fortestinguseonly="http://wixtoolset.org/schemas/v4/wxs/fortestinguseonly">
   <Fragment>
     <fortestinguseonly:ForTestingUseOnlyBundle Id="{FE6B19EC-D52F-4F77-88E5-87FAE11E95D6}" />
-    <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="addon" />
+    <RelatedBundle Code="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="addon" />
     <util:RegistrySearch Root="HKLM" Key="$(var.TestExeRegistryKey)" Value="Version" Variable="ExeA_Version" />
 
     <PackageGroup Id="BundlePackages">
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wxs b/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wxs
index 5da954ea..24379a56 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wxs
@@ -5,7 +5,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util" xmlns:fortestinguseonly="http://wixtoolset.org/schemas/v4/wxs/fortestinguseonly">
   <Fragment>
     <fortestinguseonly:ForTestingUseOnlyBundle Id="{B774BF3B-3E89-4D42-9D29-AFAB27C5772D}" />
-    <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="addon" />
+    <RelatedBundle Code="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="addon" />
     <util:RegistrySearch Root="HKLM" Key="$(var.TestExeRegistryKey)" Value="Version" Variable="ExeA_Version" />
 
     <PackageGroup Id="BundlePackages">
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs
index e23c9f88..6458fc08 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs
@@ -2,7 +2,7 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
-    <RelatedBundle Id="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="patch" />
+    <RelatedBundle Code="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="patch" />
 
     <PackageGroup Id="BundlePackages">
       <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" PerMachine="yes">
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs
index b1f60b31..495798b5 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs
@@ -2,7 +2,7 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
-    <RelatedBundle Id="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="patch" />
+    <RelatedBundle Code="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="patch" />
 
     <PackageGroup Id="BundlePackages">
       <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" PerMachine="yes">
diff --git a/src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wxs b/src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wxs
index 509047d6..5dfff3e8 100644
--- a/src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wxs
@@ -2,7 +2,7 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
-    <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="detect" />
+    <RelatedBundle Code="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="detect" />
 
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
diff --git a/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wxs b/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wxs
index 5207be28..febf46ea 100644
--- a/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wxs
@@ -2,7 +2,7 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
-    <RelatedBundle Id="{B1617DA6-F824-4B9F-B9B2-A6AFD07A652D}" Action="detect" />
+    <RelatedBundle Code="{B1617DA6-F824-4B9F-B9B2-A6AFD07A652D}" Action="detect" />
 
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
diff --git a/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs b/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs
index 3af7bbf2..889fdfbc 100644
--- a/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs
@@ -4,7 +4,7 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
-    <RelatedBundle Id="{B1617DA6-F824-4B9F-B9B2-A6AFD07A652D}" Action="patch" />
+    <RelatedBundle Code="{B1617DA6-F824-4B9F-B9B2-A6AFD07A652D}" Action="patch" />
 
     <PackageGroup Id="BundlePackages">
       <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)">
diff --git a/src/test/burn/WixTestTools/BundleVerifier.cs b/src/test/burn/WixTestTools/BundleVerifier.cs
index b750c80c..da61d96e 100644
--- a/src/test/burn/WixTestTools/BundleVerifier.cs
+++ b/src/test/burn/WixTestTools/BundleVerifier.cs
@@ -62,7 +62,7 @@ namespace WixTestTools
         public string GetExpectedCachedBundlePath()
         {
             var bundleSymbol = this.GetBundleSymbol();
-            var cachePath = this.GetPackageCachePathForCacheId(bundleSymbol.BundleId, bundleSymbol.PerMachine);
+            var cachePath = this.GetPackageCachePathForCacheId(bundleSymbol.BundleCode, bundleSymbol.PerMachine);
             return Path.Combine(cachePath, Path.GetFileName(this.Bundle));
         }
 
@@ -107,14 +107,14 @@ namespace WixTestTools
         {
             var bundleSymbol = this.GetBundleSymbol();
             var x64 = bundleSymbol.Platform != Platform.X86;
-            var bundleId = bundleSymbol.BundleId;
+            var bundleCode = bundleSymbol.BundleCode;
             if (bundleSymbol.PerMachine)
             {
-                return BundleRegistration.TryGetPerMachineBundleRegistrationById(bundleId, x64, out registration);
+                return BundleRegistration.TryGetPerMachineBundleRegistrationById(bundleCode, x64, out registration);
             }
             else
             {
-                return BundleRegistration.TryGetPerUserBundleRegistrationById(bundleId, out registration);
+                return BundleRegistration.TryGetPerUserBundleRegistrationById(bundleCode, out registration);
             }
         }
 
@@ -141,8 +141,8 @@ namespace WixTestTools
 
         public void VerifyUnregisteredAndRemovedFromPackageCache(string cachedBundlePath)
         {
-            Assert.False(this.TryGetRegistration(out _));
-            Assert.False(File.Exists(cachedBundlePath));
+            Assert.False(this.TryGetRegistration(out _), $"Bundle cached at '{cachedBundlePath}' should not still be registered.");
+            Assert.False(File.Exists(cachedBundlePath), $"Cached bundle should have been removed from package cache at '{cachedBundlePath}'.");
         }
 
         public void RemovePackageFromCache(string packageId)
diff --git a/src/tools/heat/Serialize/wix.cs b/src/tools/heat/Serialize/wix.cs
index cb62079d..504959fd 100644
--- a/src/tools/heat/Serialize/wix.cs
+++ b/src/tools/heat/Serialize/wix.cs
@@ -9319,7 +9319,7 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteStartElement("RelatedBundle", "http://wixtoolset.org/schemas/v4/wxs");
             if (this.idFieldSet)
             {
-                writer.WriteAttributeString("Id", this.idField);
+                writer.WriteAttributeString("Code", this.idField);
             }
             if (this.actionFieldSet)
             {
@@ -24008,7 +24008,7 @@ namespace WixToolset.Harvesters.Serialize
         /// The Formatted string providing the full path to the language neutral file containing the MUI Manifest.   Generally
         /// authored using [#filekey] form.  When this attribute is specified, the DisplayResourceId attribute must also
         /// be provided.
-        /// 
+        ///
         /// This attribute is only used on Windows Vista and above.  If this attribute is not populated and the install
         /// is running on Vista and above, the value in the Name attribute is used.  If this attribute is populated and
         /// the install is running on Vista and above, the value in the Name attribute is ignored.
@@ -24029,7 +24029,7 @@ namespace WixToolset.Harvesters.Serialize
         /// <summary>
         /// The display name index for the shortcut. This must be a non-negative number.  When this attribute is specified, the
         /// DisplayResourceDll attribute must also be provided.
-        /// 
+        ///
         /// This attribute is only used on Windows Vista and above.  If this attribute is not specified and the install
         /// is running on Vista and above, the value in the Name attribute is used.  If this attribute is specified and
         /// the install is running on Vista and above, the value in the Name attribute is ignored.
@@ -24051,7 +24051,7 @@ namespace WixToolset.Harvesters.Serialize
         /// The Formatted string providing the full path to the language neutral file containing the MUI Manifest.   Generally
         /// authored using [#filekey] form.  When this attribute is specified, the DescriptionResourceId attribute must also
         /// be provided.
-        /// 
+        ///
         /// This attribute is only used on Windows Vista and above.  If this attribute is not specified and the install
         /// is running on Vista and above, the value in the Name attribute is used.  If this attribute is provided and
         /// the install is running on Vista and above, the value in the Name attribute is ignored.
@@ -24072,7 +24072,7 @@ namespace WixToolset.Harvesters.Serialize
         /// <summary>
         /// The description name index for the shortcut. This must be a non-negative number.  When this attribute is specified,
         /// the DescriptionResourceDll attribute must also be populated.
-        /// 
+        ///
         /// This attribute is only used on Windows Vista and above.  If this attribute is not specified and the install
         /// is running on Vista and above, the value in the Name attribute is used.  If this attribute is populated and the
         /// install is running on Vista and above, the value in the Name attribute is ignored.
@@ -27922,7 +27922,7 @@ namespace WixToolset.Harvesters.Serialize
 
     /// <summary>
     /// Used to create a registry value.  For multi-string values, this can be used to prepend or append values.
-    /// 
+    ///
     /// For legacy authoring: Use several of these elements to specify each registry value in a multiString registry value.  This element
     /// cannot be used if the Value attribute is specified unless the Type attribute is set to 'multiString'.  The
     /// values should go in the text area of the RegistryValue element.
@@ -39331,7 +39331,7 @@ namespace WixToolset.Harvesters.Serialize
 
         /// <summary>
         /// The name of the directory.
-        /// 
+        ///
         /// Do not specify this attribute if this directory represents
         /// the same directory as the parent (see the Windows Installer SDK's
         /// </summary>
@@ -39387,7 +39387,7 @@ namespace WixToolset.Harvesters.Serialize
         /// <summary>
         /// The name of the directory on the source media.
         /// If this attribute is not specified, Windows Installer will default to the Name attribute.
-        /// 
+        ///
         /// In prior versions of the WiX toolset, this attribute specified the short source directory name.
         /// This attribute's value may now be either a short or long directory name.
         /// If a short directory name is specified, the ShortSourceName attribute may not be specified.
@@ -39917,57 +39917,57 @@ namespace WixToolset.Harvesters.Serialize
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class UpgradeVersion : ISchemaElement, ISetAttributes
     {
-        
+
         private string minimumField;
-        
+
         private bool minimumFieldSet;
-        
+
         private string maximumField;
-        
+
         private bool maximumFieldSet;
-        
+
         private string languageField;
-        
+
         private bool languageFieldSet;
-        
+
         private string removeFeaturesField;
-        
+
         private bool removeFeaturesFieldSet;
-        
+
         private string propertyField;
-        
+
         private bool propertyFieldSet;
-        
+
         private YesNoType migrateFeaturesField;
-        
+
         private bool migrateFeaturesFieldSet;
-        
+
         private YesNoType onlyDetectField;
-        
+
         private bool onlyDetectFieldSet;
-        
+
         private YesNoType ignoreRemoveFailureField;
-        
+
         private bool ignoreRemoveFailureFieldSet;
-        
+
         private YesNoType includeMinimumField;
-        
+
         private bool includeMinimumFieldSet;
-        
+
         private YesNoType includeMaximumField;
-        
+
         private bool includeMaximumFieldSet;
-        
+
         private YesNoType excludeLanguagesField;
-        
+
         private bool excludeLanguagesFieldSet;
-        
+
         private string contentField;
-        
+
         private bool contentFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         /// <summary>
         /// Specifies the lower bound on the range of product versions to be detected by FindRelatedProducts.
         /// </summary>
@@ -39983,7 +39983,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.minimumField = value;
             }
         }
-        
+
         /// <summary>
         /// Specifies the upper boundary of the range of product versions detected by FindRelatedProducts.
         /// </summary>
@@ -39999,7 +39999,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.maximumField = value;
             }
         }
-        
+
         /// <summary>
         /// Specifies the set of languages detected by FindRelatedProducts.  Enter a list of numeric language identifiers (LANGID) separated by commas (,).  Leave this value null to specify all languages.  Set ExcludeLanguages to "yes" in order detect all languages, excluding the languages listed in this value.
         /// </summary>
@@ -40015,7 +40015,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.languageField = value;
             }
         }
-        
+
         /// <summary>
         /// The installer sets the REMOVE property to features specified in this column.  The features to be removed can be determined at run time.  The Formatted string entered in this field must evaluate to a comma-delimited list of feature names.  For example: [Feature1],[Feature2],[Feature3].  No features are removed if the field contains formatted text that evaluates to an empty string.  The installer sets REMOVE=ALL only if the Remove field is empty.
         /// </summary>
@@ -40031,7 +40031,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.removeFeaturesField = value;
             }
         }
-        
+
         /// <summary>
         /// When the FindRelatedProducts action detects a related product installed on the system, it appends the product code to the property specified in this field.  Windows Installer documentation for the
         /// </summary>
@@ -40047,7 +40047,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.propertyField = value;
             }
         }
-        
+
         /// <summary>
         /// Set to "yes" to migrate feature states from upgraded products by enabling the logic in the MigrateFeatureStates action.
         /// </summary>
@@ -40063,7 +40063,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.migrateFeaturesField = value;
             }
         }
-        
+
         /// <summary>
         /// Set to "yes" to detect products and applications but do not uninstall.
         /// </summary>
@@ -40079,7 +40079,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.onlyDetectField = value;
             }
         }
-        
+
         /// <summary>
         /// Set to "yes" to continue installation upon failure to remove a product or application.
         /// </summary>
@@ -40095,7 +40095,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.ignoreRemoveFailureField = value;
             }
         }
-        
+
         /// <summary>
         /// Set to "no" to make the range of versions detected exclude the value specified in Minimum.  This attribute is "yes" by default.
         /// </summary>
@@ -40111,7 +40111,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.includeMinimumField = value;
             }
         }
-        
+
         /// <summary>
         /// Set to "yes" to make the range of versions detected include the value specified in Maximum.
         /// </summary>
@@ -40127,7 +40127,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.includeMaximumField = value;
             }
         }
-        
+
         /// <summary>
         /// Set to "yes" to detect all languages, excluding the languages listed in the Language attribute.
         /// </summary>
@@ -40143,7 +40143,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.excludeLanguagesField = value;
             }
         }
-        
+
         public string Content
         {
             get
@@ -40156,7 +40156,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.contentField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -40168,7 +40168,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -40272,7 +40272,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         void ISetAttributes.SetAttribute(string name, string value)
@@ -40343,22 +40343,22 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Upgrade info for a particular UpgradeCode
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class Upgrade : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes
     {
-        
+
         private ElementCollection children;
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         public Upgrade()
         {
             ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Choice);
@@ -40366,7 +40366,7 @@ namespace WixToolset.Harvesters.Serialize
             childCollection0.AddItem(new ElementCollection.ChoiceItem(typeof(Property)));
             this.children = childCollection0;
         }
-        
+
         public virtual IEnumerable Children
         {
             get
@@ -40374,7 +40374,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children;
             }
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")]
         public virtual IEnumerable this[System.Type childType]
         {
@@ -40383,7 +40383,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children.Filter(childType);
             }
         }
-        
+
         /// <summary>
         /// This value specifies the upgrade code for the products that are to be detected by the FindRelatedProducts action.
         /// </summary>
@@ -40399,7 +40399,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -40411,7 +40411,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         public virtual void AddChild(ISchemaElement child)
         {
             if ((null == child))
@@ -40421,7 +40421,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.AddElement(child);
             child.ParentElement = this;
         }
-        
+
         public virtual void RemoveChild(ISchemaElement child)
         {
             if ((null == child))
@@ -40431,7 +40431,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.RemoveElement(child);
             child.ParentElement = null;
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         ISchemaElement ICreateChildren.CreateChild(string childName)
         {
@@ -40454,7 +40454,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return childValue;
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -40476,7 +40476,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -40491,7 +40491,7 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// A feature for the Feature table.  Features are the smallest installable unit.  See msi.chm for more
     /// detailed information on the myriad installation options for a feature.
@@ -40499,51 +40499,51 @@ namespace WixToolset.Harvesters.Serialize
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class Feature : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes
     {
-        
+
         private ElementCollection children;
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private AbsentType absentField;
-        
+
         private bool absentFieldSet;
-        
+
         private AllowAdvertiseType allowAdvertiseField;
-        
+
         private bool allowAdvertiseFieldSet;
-        
+
         private string configurableDirectoryField;
-        
+
         private bool configurableDirectoryFieldSet;
-        
+
         private string descriptionField;
-        
+
         private bool descriptionFieldSet;
-        
+
         private string displayField;
-        
+
         private bool displayFieldSet;
-        
+
         private InstallDefaultType installDefaultField;
-        
+
         private bool installDefaultFieldSet;
-        
+
         private int levelField;
-        
+
         private bool levelFieldSet;
-        
+
         private string titleField;
-        
+
         private bool titleFieldSet;
-        
+
         private TypicalDefaultType typicalDefaultField;
-        
+
         private bool typicalDefaultFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         public Feature()
         {
             ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Choice);
@@ -40558,7 +40558,7 @@ namespace WixToolset.Harvesters.Serialize
             childCollection0.AddItem(new ElementCollection.ChoiceItem(typeof(ISchemaElement)));
             this.children = childCollection0;
         }
-        
+
         public virtual IEnumerable Children
         {
             get
@@ -40566,7 +40566,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children;
             }
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")]
         public virtual IEnumerable this[System.Type childType]
         {
@@ -40575,7 +40575,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children.Filter(childType);
             }
         }
-        
+
         /// <summary>
         /// Unique identifier of the feature.
         /// </summary>
@@ -40591,7 +40591,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute determines if a user will have the option to set a feature to absent in the user interface.
         /// </summary>
@@ -40607,7 +40607,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.absentField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute determines the possible advertise states for this feature.
         /// </summary>
@@ -40623,7 +40623,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.allowAdvertiseField = value;
             }
         }
-        
+
         /// <summary>
         /// Specify the Id of a Directory that can be configured by the user at installation time.  This identifier
         /// must be a public property and therefore completely uppercase.
@@ -40640,7 +40640,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.configurableDirectoryField = value;
             }
         }
-        
+
         /// <summary>
         /// Longer string of text describing the feature.  This localizable string is displayed by the
         /// Text Control of the Selection Dialog.
@@ -40657,7 +40657,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.descriptionField = value;
             }
         }
-        
+
         /// <summary>
         /// Determines the initial display of this feature in the feature tree.
         /// This attribute's value should be one of the following:
@@ -40674,7 +40674,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.displayField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute determines the default install/run location of a feature.  This attribute cannot be specified
         /// if the value of the FollowParent attribute is 'yes' since that would ask the installer to force this feature
@@ -40692,7 +40692,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.installDefaultField = value;
             }
         }
-        
+
         /// <summary>
         /// Sets the install level of this feature.  A value of 0 will disable the feature.  Processing the
         /// Condition Table can modify the level value (this is set via the Condition child element). The
@@ -40710,7 +40710,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.levelField = value;
             }
         }
-        
+
         /// <summary>
         /// Short string of text identifying the feature.  This string is listed as an item by the
         /// SelectionTree control of the Selection Dialog.
@@ -40727,7 +40727,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.titleField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute determines the default advertise state of the feature.
         /// </summary>
@@ -40743,7 +40743,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.typicalDefaultField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -40755,7 +40755,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         public virtual void AddChild(ISchemaElement child)
         {
             if ((null == child))
@@ -40765,7 +40765,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.AddElement(child);
             child.ParentElement = this;
         }
-        
+
         public virtual void RemoveChild(ISchemaElement child)
         {
             if ((null == child))
@@ -40775,7 +40775,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.RemoveElement(child);
             child.ParentElement = null;
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         ISchemaElement ICreateChildren.CreateChild(string childName)
@@ -40823,7 +40823,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return childValue;
         }
-        
+
         /// <summary>
         /// Parses a AbsentType from a string.
         /// </summary>
@@ -40833,7 +40833,7 @@ namespace WixToolset.Harvesters.Serialize
             Feature.TryParseAbsentType(value, out parsedValue);
             return parsedValue;
         }
-        
+
         /// <summary>
         /// Tries to parse a AbsentType from a string.
         /// </summary>
@@ -40862,7 +40862,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return true;
         }
-        
+
         /// <summary>
         /// Parses a AllowAdvertiseType from a string.
         /// </summary>
@@ -40872,7 +40872,7 @@ namespace WixToolset.Harvesters.Serialize
             Feature.TryParseAllowAdvertiseType(value, out parsedValue);
             return parsedValue;
         }
-        
+
         /// <summary>
         /// Tries to parse a AllowAdvertiseType from a string.
         /// </summary>
@@ -40908,7 +40908,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return true;
         }
-        
+
         /// <summary>
         /// Parses a InstallDefaultType from a string.
         /// </summary>
@@ -40918,7 +40918,7 @@ namespace WixToolset.Harvesters.Serialize
             Feature.TryParseInstallDefaultType(value, out parsedValue);
             return parsedValue;
         }
-        
+
         /// <summary>
         /// Tries to parse a InstallDefaultType from a string.
         /// </summary>
@@ -40954,7 +40954,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return true;
         }
-        
+
         /// <summary>
         /// Parses a TypicalDefaultType from a string.
         /// </summary>
@@ -40964,7 +40964,7 @@ namespace WixToolset.Harvesters.Serialize
             Feature.TryParseTypicalDefaultType(value, out parsedValue);
             return parsedValue;
         }
-        
+
         /// <summary>
         /// Tries to parse a TypicalDefaultType from a string.
         /// </summary>
@@ -40993,7 +40993,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return true;
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -41088,7 +41088,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         void ISetAttributes.SetAttribute(string name, string value)
@@ -41148,20 +41148,20 @@ namespace WixToolset.Harvesters.Serialize
                 this.typicalDefaultFieldSet = true;
             }
         }
-        
+
         [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
         public enum AbsentType
         {
-            
+
             IllegalValue = int.MaxValue,
-            
+
             NotSet = -1,
-            
+
             /// <summary>
             /// Allows the user interface to display an option to change the feature state to Absent.
             /// </summary>
             allow,
-            
+
             /// <summary>
             /// Prevents the user interface from displaying an option to change the feature state
             /// to Absent by setting the msidbFeatureAttributesUIDisallowAbsent attribute.  This will force the feature
@@ -41169,93 +41169,93 @@ namespace WixToolset.Harvesters.Serialize
             /// </summary>
             disallow,
         }
-        
+
         [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
         public enum AllowAdvertiseType
         {
-            
+
             IllegalValue = int.MaxValue,
-            
+
             NotSet = -1,
-            
+
             /// <summary>
             /// Prevents this feature from being advertised by setting the msidbFeatureAttributesDisallowAdvertise attribute.
             /// </summary>
             no,
-            
+
             /// <summary>
             /// Prevents advertising for this feature if the operating system shell does not support Windows Installer
             /// descriptors by setting the msidbFeatureAttributesNoUnsupportedAdvertise attribute.
             /// </summary>
             system,
-            
+
             /// <summary>
             /// Allows the feature to be advertised.
             /// </summary>
             yes,
         }
-        
+
         [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
         public enum InstallDefaultType
         {
-            
+
             IllegalValue = int.MaxValue,
-            
+
             NotSet = -1,
-            
+
             /// <summary>
             /// Forces the feature to follow the same installation state as its parent feature.
             /// </summary>
             followParent,
-            
+
             /// <summary>
             /// Favors installing this feature locally by setting the msidbFeatureAttributesFavorLocal attribute.
             /// </summary>
             local,
-            
+
             /// <summary>
             /// Favors running this feature from source by setting the msidbFeatureAttributesFavorSource attribute.
             /// </summary>
             source,
         }
-        
+
         [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
         public enum TypicalDefaultType
         {
-            
+
             IllegalValue = int.MaxValue,
-            
+
             NotSet = -1,
-            
+
             /// <summary>
             /// Sets the feature to be advertised by setting the msidbFeatureAttributesFavorAdvertise attribute.
             /// This value cannot be set if the value of the AllowAdvertise attribute is 'no' since that would ask the installer to
             /// disallow the advertised state for this feature while at the same time favoring it.
             /// </summary>
             advertise,
-            
+
             /// <summary>
             /// Sets the feature to the default non-advertised installation option.
             /// </summary>
             install,
         }
     }
-    
+
     /// <summary>
     /// Groups together multiple components, features, and merges to be used in other locations.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class FeatureGroup : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes
     {
-        
+
         private ElementCollection children;
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         public FeatureGroup()
         {
             ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Choice);
@@ -41269,7 +41269,7 @@ namespace WixToolset.Harvesters.Serialize
             childCollection0.AddItem(new ElementCollection.ChoiceItem(typeof(ISchemaElement)));
             this.children = childCollection0;
         }
-        
+
         public virtual IEnumerable Children
         {
             get
@@ -41277,7 +41277,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children;
             }
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")]
         public virtual IEnumerable this[System.Type childType]
         {
@@ -41286,7 +41286,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children.Filter(childType);
             }
         }
-        
+
         /// <summary>
         /// Identifier for the FeatureGroup.
         /// </summary>
@@ -41302,7 +41302,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -41314,7 +41314,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         public virtual void AddChild(ISchemaElement child)
         {
             if ((null == child))
@@ -41324,7 +41324,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.AddElement(child);
             child.ParentElement = this;
         }
-        
+
         public virtual void RemoveChild(ISchemaElement child)
         {
             if ((null == child))
@@ -41334,7 +41334,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.RemoveElement(child);
             child.ParentElement = null;
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         ISchemaElement ICreateChildren.CreateChild(string childName)
@@ -41378,7 +41378,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return childValue;
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -41400,7 +41400,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -41415,28 +41415,28 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Create a reference to a FeatureGroup in another Fragment.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class FeatureGroupRef : ISchemaElement, ISetAttributes
     {
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private YesNoType ignoreParentField;
-        
+
         private bool ignoreParentFieldSet;
-        
+
         private YesNoType primaryField;
-        
+
         private bool primaryFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         /// <summary>
         /// The identifier of the FeatureGroup to reference.
         /// </summary>
@@ -41452,7 +41452,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         /// <summary>
         /// Normally feature group references that end up nested under a parent element create a
         /// connection to that parent. This behavior is undesirable when trying to simply reference
@@ -41471,7 +41471,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.ignoreParentField = value;
             }
         }
-        
+
         /// <summary>
         /// Set this attribute to 'yes' in order to make the parent feature of this group
         /// the primary feature for any components and merges contained in the group.
@@ -41495,7 +41495,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.primaryField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -41507,7 +41507,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -41546,7 +41546,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -41571,26 +41571,26 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Create a reference to a Feature element in another Fragment.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class FeatureRef : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes
     {
-        
+
         private ElementCollection children;
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private YesNoType ignoreParentField;
-        
+
         private bool ignoreParentFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         public FeatureRef()
         {
             ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Choice);
@@ -41605,7 +41605,7 @@ namespace WixToolset.Harvesters.Serialize
             childCollection0.AddItem(new ElementCollection.ChoiceItem(typeof(ISchemaElement)));
             this.children = childCollection0;
         }
-        
+
         public virtual IEnumerable Children
         {
             get
@@ -41613,7 +41613,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children;
             }
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")]
         public virtual IEnumerable this[System.Type childType]
         {
@@ -41622,7 +41622,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children.Filter(childType);
             }
         }
-        
+
         /// <summary>
         /// The identifier of the Feature element to reference.
         /// </summary>
@@ -41638,7 +41638,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         /// <summary>
         /// Normally feature references that are nested under a parent element create a connection to that
         /// parent. This behavior is undesirable when trying to simply reference a Feature in a different
@@ -41657,7 +41657,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.ignoreParentField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -41669,7 +41669,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         public virtual void AddChild(ISchemaElement child)
         {
             if ((null == child))
@@ -41679,7 +41679,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.AddElement(child);
             child.ParentElement = this;
         }
-        
+
         public virtual void RemoveChild(ISchemaElement child)
         {
             if ((null == child))
@@ -41689,7 +41689,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.RemoveElement(child);
             child.ParentElement = null;
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         ISchemaElement ICreateChildren.CreateChild(string childName)
@@ -41737,7 +41737,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return childValue;
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -41770,7 +41770,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -41790,54 +41790,54 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Media element describes a disk that makes up the source media for the installation.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class Media : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes
     {
-        
+
         private ElementCollection children;
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private string cabinetField;
-        
+
         private bool cabinetFieldSet;
-        
+
         private CompressionLevelType compressionLevelField;
-        
+
         private bool compressionLevelFieldSet;
-        
+
         private string diskPromptField;
-        
+
         private bool diskPromptFieldSet;
-        
+
         private YesNoType embedCabField;
-        
+
         private bool embedCabFieldSet;
-        
+
         private string layoutField;
-        
+
         private bool layoutFieldSet;
-        
+
         private string srcField;
-        
+
         private bool srcFieldSet;
-        
+
         private string volumeLabelField;
-        
+
         private bool volumeLabelFieldSet;
-        
+
         private string sourceField;
-        
+
         private bool sourceFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         public Media()
         {
             ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Sequence);
@@ -41848,7 +41848,7 @@ namespace WixToolset.Harvesters.Serialize
             childCollection0.AddCollection(childCollection1);
             this.children = childCollection0;
         }
-        
+
         public virtual IEnumerable Children
         {
             get
@@ -41856,7 +41856,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children;
             }
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")]
         public virtual IEnumerable this[System.Type childType]
         {
@@ -41865,7 +41865,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children.Filter(childType);
             }
         }
-        
+
         /// <summary>
         /// Disk identifier for Media table. This number must be equal to or greater than 1.
         /// </summary>
@@ -41881,7 +41881,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         /// <summary>
         /// The name of the cabinet if some or all of the files stored on the media are in a cabinet file.  If no cabinets are used, this attribute must not be set.
         /// </summary>
@@ -41897,7 +41897,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.cabinetField = value;
             }
         }
-        
+
         /// <summary>
         /// Indicates the compression level for the Media's cabinet.  This attribute can
         /// only be used in conjunction with the Cabinet attribute.  The default is 'mszip'.
@@ -41914,7 +41914,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.compressionLevelField = value;
             }
         }
-        
+
         /// <summary>
         /// The disk name, which is usually the visible text printed on the disk. This localizable text is used to prompt the user when this disk needs to be inserted. This value will be used in the "[1]" of the DiskPrompt Property. Using this attribute will require you to define a DiskPrompt Property.
         /// </summary>
@@ -41930,7 +41930,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.diskPromptField = value;
             }
         }
-        
+
         /// <summary>
         /// Instructs the binder to embed the cabinet in the product if 'yes'.  This attribute can only be specified in conjunction with the Cabinet attribute.
         /// </summary>
@@ -41946,7 +41946,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.embedCabField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute specifies the root directory for the uncompressed files that
         /// are a part of this Media element.  By default, the src will be the output
@@ -41968,7 +41968,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.layoutField = value;
             }
         }
-        
+
         [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly")]
         public string src
         {
@@ -41982,7 +41982,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.srcField = value;
             }
         }
-        
+
         /// <summary>
         /// The label attributed to the volume. This is the volume label returned
         /// by the GetVolumeInformation function. If the SourceDir property refers
@@ -42003,7 +42003,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.volumeLabelField = value;
             }
         }
-        
+
         /// <summary>
         /// Optional property that identifies the source of the embedded cabinet.
         /// If a cabinet is specified for a patch, this property should be defined
@@ -42025,7 +42025,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.sourceField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -42037,7 +42037,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         public virtual void AddChild(ISchemaElement child)
         {
             if ((null == child))
@@ -42047,7 +42047,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.AddElement(child);
             child.ParentElement = this;
         }
-        
+
         public virtual void RemoveChild(ISchemaElement child)
         {
             if ((null == child))
@@ -42057,7 +42057,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.RemoveElement(child);
             child.ParentElement = null;
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         ISchemaElement ICreateChildren.CreateChild(string childName)
         {
@@ -42084,7 +42084,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return childValue;
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -42165,7 +42165,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         void ISetAttributes.SetAttribute(string name, string value)
@@ -42221,7 +42221,7 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// MediaTeplate element describes information to automatically assign files to cabinets.
     /// A maximumum number of cabinets created is 999.
@@ -42229,37 +42229,37 @@ namespace WixToolset.Harvesters.Serialize
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class MediaTemplate : ISchemaElement, ISetAttributes
     {
-        
+
         private string cabinetTemplateField;
-        
+
         private bool cabinetTemplateFieldSet;
-        
+
         private CompressionLevelType compressionLevelField;
-        
+
         private bool compressionLevelFieldSet;
-        
+
         private string diskPromptField;
-        
+
         private bool diskPromptFieldSet;
-        
+
         private YesNoType embedCabField;
-        
+
         private bool embedCabFieldSet;
-        
+
         private string volumeLabelField;
-        
+
         private bool volumeLabelFieldSet;
-        
+
         private int maximumUncompressedMediaSizeField;
-        
+
         private bool maximumUncompressedMediaSizeFieldSet;
-        
+
         private int maximumCabinetSizeForLargeFileSplittingField;
-        
+
         private bool maximumCabinetSizeForLargeFileSplittingFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         /// <summary>
         /// Templated name of the cabinet if some or all of the files stored on the media are in
         /// a cabinet file. This name must begin with either a letter or an underscore, contain
@@ -42278,7 +42278,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.cabinetTemplateField = value;
             }
         }
-        
+
         /// <summary>
         /// Indicates the compression level for the Media's cabinet.  This attribute can
         /// only be used in conjunction with the Cabinet attribute.  The default is 'mszip'.
@@ -42295,7 +42295,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.compressionLevelField = value;
             }
         }
-        
+
         /// <summary>
         /// The disk name, which is usually the visible text printed on the disk. This localizable text is used
         /// to prompt the user when this disk needs to be inserted. This value will be used in the "[1]" of the
@@ -42313,7 +42313,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.diskPromptField = value;
             }
         }
-        
+
         /// <summary>
         /// Instructs the binder to embed the cabinets in the product if 'yes'.
         /// </summary>
@@ -42329,7 +42329,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.embedCabField = value;
             }
         }
-        
+
         /// <summary>
         /// The label attributed to the volume. This is the volume label returned
         /// by the GetVolumeInformation function. If the SourceDir property refers
@@ -42350,7 +42350,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.volumeLabelField = value;
             }
         }
-        
+
         /// <summary>
         /// Size of uncompressed files in each cabinet, in megabytes. WIX_MUMS environment variable
         /// can be used to override this value. Default value is 200 MB.
@@ -42390,7 +42390,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.maximumCabinetSizeForLargeFileSplittingField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -42402,7 +42402,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Parses a CompressionLevelType from a string.
         /// </summary>
@@ -42412,7 +42412,7 @@ namespace WixToolset.Harvesters.Serialize
             MediaTemplate.TryParseCompressionLevelType(value, out parsedValue);
             return parsedValue;
         }
-        
+
         /// <summary>
         /// Tries to parse a CompressionLevelType from a string.
         /// </summary>
@@ -42462,7 +42462,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return true;
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -42530,7 +42530,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -42574,27 +42574,27 @@ namespace WixToolset.Harvesters.Serialize
                 this.maximumCabinetSizeForLargeFileSplittingFieldSet = true;
             }
         }
-        
+
         [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
         public enum CompressionLevelType
         {
-            
+
             IllegalValue = int.MaxValue,
-            
+
             NotSet = -1,
-            
+
             high,
-            
+
             low,
-            
+
             medium,
-            
+
             mszip,
-            
+
             none,
         }
     }
-    
+
     /// <summary>
     /// This element has been deprecated.
     /// Use the Binary/@SuppressModularization, CustomAction/@SuppressModularization, or Property/@SuppressModularization attributes instead.
@@ -42602,17 +42602,17 @@ namespace WixToolset.Harvesters.Serialize
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class IgnoreModularization : ISchemaElement, ISetAttributes
     {
-        
+
         private string nameField;
-        
+
         private bool nameFieldSet;
-        
+
         private TypeType typeField;
-        
+
         private bool typeFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         /// <summary>
         /// The name of the item to ignore modularization for.
         /// </summary>
@@ -42628,7 +42628,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.nameField = value;
             }
         }
-        
+
         /// <summary>
         /// The type of the item to ignore modularization for.
         /// </summary>
@@ -42644,7 +42644,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.typeField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -42656,7 +42656,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Parses a TypeType from a string.
         /// </summary>
@@ -42666,7 +42666,7 @@ namespace WixToolset.Harvesters.Serialize
             IgnoreModularization.TryParseTypeType(value, out parsedValue);
             return parsedValue;
         }
-        
+
         /// <summary>
         /// Tries to parse a TypeType from a string.
         /// </summary>
@@ -42702,7 +42702,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return true;
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -42734,7 +42734,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -42753,23 +42753,23 @@ namespace WixToolset.Harvesters.Serialize
                 this.typeFieldSet = true;
             }
         }
-        
+
         [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
         public enum TypeType
         {
-            
+
             IllegalValue = int.MaxValue,
-            
+
             NotSet = -1,
-            
+
             Action,
-            
+
             Property,
-            
+
             Directory,
         }
     }
-    
+
     /// <summary>
     /// Specifies a custom action to be added to the MSI CustomAction table. Various combinations of the attributes for this element
     /// correspond to different custom action types. For more information about custom actions see the
@@ -42777,93 +42777,93 @@ namespace WixToolset.Harvesters.Serialize
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class CustomAction : ISchemaElement, ISetAttributes
     {
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private string binaryKeyField;
-        
+
         private bool binaryKeyFieldSet;
-        
+
         private string fileKeyField;
-        
+
         private bool fileKeyFieldSet;
-        
+
         private string propertyField;
-        
+
         private bool propertyFieldSet;
-        
+
         private string directoryField;
-        
+
         private bool directoryFieldSet;
-        
+
         private string dllEntryField;
-        
+
         private bool dllEntryFieldSet;
-        
+
         private string exeCommandField;
-        
+
         private bool exeCommandFieldSet;
-        
+
         private string jScriptCallField;
-        
+
         private bool jScriptCallFieldSet;
-        
+
         private string vBScriptCallField;
-        
+
         private bool vBScriptCallFieldSet;
-        
+
         private ScriptType scriptField;
-        
+
         private bool scriptFieldSet;
-        
+
         private YesNoType suppressModularizationField;
-        
+
         private bool suppressModularizationFieldSet;
-        
+
         private string valueField;
-        
+
         private bool valueFieldSet;
-        
+
         private string errorField;
-        
+
         private bool errorFieldSet;
-        
+
         private ReturnType returnField;
-        
+
         private bool returnFieldSet;
-        
+
         private ExecuteType executeField;
-        
+
         private bool executeFieldSet;
-        
+
         private YesNoType impersonateField;
-        
+
         private bool impersonateFieldSet;
-        
+
         private YesNoType patchUninstallField;
-        
+
         private bool patchUninstallFieldSet;
-        
+
         private YesNoType win64Field;
-        
+
         private bool win64FieldSet;
-        
+
         private YesNoType terminalServerAwareField;
-        
+
         private bool terminalServerAwareFieldSet;
-        
+
         private YesNoType hideTargetField;
-        
+
         private bool hideTargetFieldSet;
-        
+
         private string contentField;
-        
+
         private bool contentFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         /// <summary>
         /// The identifier of the custom action.
         /// </summary>
@@ -42879,7 +42879,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute is a reference to a Binary element with matching Id attribute.  That binary stream contains
         /// the custom action for use during install.  The custom action will not be installed into a target directory.  This attribute is
@@ -42899,7 +42899,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.binaryKeyField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute specifies a reference to a File element with matching Id attribute that
         /// will execute the custom action code in the file after the file is installed.  This
@@ -42920,7 +42920,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.fileKeyField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute specifies a reference to a Property element with matching Id attribute that specifies the Property
         /// to be used or updated on execution of this custom action. This attribute is
@@ -42943,7 +42943,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.propertyField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute specifies a reference to a Directory element with matching Id attribute containing a directory path.
         /// This attribute is typically used with the ExeCommand attribute to specify the source executable for a type 34
@@ -42962,7 +42962,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.directoryField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute specifies the name of a function in a custom action to execute.
         /// This attribute is used with the BinaryKey attribute to create a type 1 custom
@@ -42980,7 +42980,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.dllEntryField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute specifies the command line parameters to supply to an externally
         /// run executable. This attribute is typically used with the BinaryKey attribute for a type 2 custom action,
@@ -42999,7 +42999,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.exeCommandField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute specifies the name of the JScript function to execute in a script. The script must be
         /// provided in a Binary element identified by the BinaryKey attribute described above. In other words, this
@@ -43017,7 +43017,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.jScriptCallField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute specifies the name of the VBScript Subroutine to execute in a script. The script must be
         /// provided in a Binary element identified by the BinaryKey attribute described above. In other words, this
@@ -43036,7 +43036,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.vBScriptCallField = value;
             }
         }
-        
+
         /// <summary>
         /// Creates a type 37 or 38 custom action.  The text of the element should contain the script to be embedded in the package.
         /// </summary>
@@ -43052,7 +43052,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.scriptField = value;
             }
         }
-        
+
         /// <summary>
         /// Use to suppress modularization of this custom action name in merge modules.
         /// This should only be necessary for table-driven custom actions because the
@@ -43071,7 +43071,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.suppressModularizationField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute specifies a string value to use in the custom action. This attribute
         /// must be used with the Property attribute to set the property as part of a
@@ -43091,7 +43091,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.valueField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute specifies an index in the MSI Error table to use as an error message for a
         /// type 19 custom action that displays the error message and aborts a product's installation.
@@ -43108,7 +43108,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.errorField = value;
             }
         }
-        
+
         /// <summary>
         /// Set this attribute to set the return behavior of the custom action.
         /// </summary>
@@ -43124,7 +43124,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.returnField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute indicates the scheduling of the custom action.
         /// </summary>
@@ -43140,7 +43140,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.executeField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute specifies whether the Windows Installer, which executes as LocalSystem,
         /// should impersonate the user context of the installing user when executing this custom action.
@@ -43159,7 +43159,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.impersonateField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute specifies that the Windows Installer, execute the custom action only when
         /// a patch is being uninstalled.  These custom actions should also be conditioned using the
@@ -43178,7 +43178,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.patchUninstallField = value;
             }
         }
-        
+
         /// <summary>
         /// Specifies that a script custom action targets a 64-bit platform. Valid only when used with
         /// the Script, VBScriptCall, and JScriptCall attributes.
@@ -43199,7 +43199,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.win64Field = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute specifies controls whether the custom action will impersonate the
         /// installing user during per-machine installs on Terminal Server machines.
@@ -43220,7 +43220,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.terminalServerAwareField = value;
             }
         }
-        
+
         /// <summary>
         /// Ensures the installer does not log the CustomActionData for the deferred custom action.
         /// </summary>
@@ -43236,7 +43236,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.hideTargetField = value;
             }
         }
-        
+
         /// <summary>
         /// The text node is only valid if the Script attribute is specified.  In that case, the text node contains the script to embed.
         /// </summary>
@@ -43252,7 +43252,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.contentField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -43264,7 +43264,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Parses a ScriptType from a string.
         /// </summary>
@@ -43274,7 +43274,7 @@ namespace WixToolset.Harvesters.Serialize
             CustomAction.TryParseScriptType(value, out parsedValue);
             return parsedValue;
         }
-        
+
         /// <summary>
         /// Tries to parse a ScriptType from a string.
         /// </summary>
@@ -43303,7 +43303,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return true;
         }
-        
+
         /// <summary>
         /// Parses a ReturnType from a string.
         /// </summary>
@@ -43313,7 +43313,7 @@ namespace WixToolset.Harvesters.Serialize
             CustomAction.TryParseReturnType(value, out parsedValue);
             return parsedValue;
         }
-        
+
         /// <summary>
         /// Tries to parse a ReturnType from a string.
         /// </summary>
@@ -43356,7 +43356,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return true;
         }
-        
+
         /// <summary>
         /// Parses a ExecuteType from a string.
         /// </summary>
@@ -43366,7 +43366,7 @@ namespace WixToolset.Harvesters.Serialize
             CustomAction.TryParseExecuteType(value, out parsedValue);
             return parsedValue;
         }
-        
+
         /// <summary>
         /// Tries to parse a ExecuteType from a string.
         /// </summary>
@@ -43430,7 +43430,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return true;
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -43619,7 +43619,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         void ISetAttributes.SetAttribute(string name, string value)
@@ -43734,95 +43734,95 @@ namespace WixToolset.Harvesters.Serialize
                 this.contentFieldSet = true;
             }
         }
-        
+
         [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
         public enum ScriptType
         {
-            
+
             IllegalValue = int.MaxValue,
-            
+
             NotSet = -1,
-            
+
             jscript,
-            
+
             vbscript,
         }
-        
+
         [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
         public enum ReturnType
         {
-            
+
             IllegalValue = int.MaxValue,
-            
+
             NotSet = -1,
-            
+
             /// <summary>
             /// Indicates that the custom action will run asyncronously and execution may continue after the installer terminates.
             /// </summary>
             asyncNoWait,
-            
+
             /// <summary>
             /// Indicates that the custom action will run asynchronously but the installer will wait for the return code at sequence end.
             /// </summary>
             asyncWait,
-            
+
             /// <summary>
             /// Indicates that the custom action will run synchronously and the return code will be checked for success.  This is the default.
             /// </summary>
             check,
-            
+
             /// <summary>
             /// Indicates that the custom action will run synchronously and the return code will not be checked.
             /// </summary>
             ignore,
         }
-        
+
         [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
         public enum ExecuteType
         {
-            
+
             IllegalValue = int.MaxValue,
-            
+
             NotSet = -1,
-            
+
             /// <summary>
             /// Indicates that the custom action will run after successful completion of the installation script (at the end of the installation).
             /// </summary>
             commit,
-            
+
             /// <summary>
             /// Indicates that the custom action runs in-script (possibly with elevated privileges).
             /// </summary>
             deferred,
-            
+
             /// <summary>
             /// Indicates that the custom action will only run in the first sequence that runs it.
             /// </summary>
             firstSequence,
-            
+
             /// <summary>
             /// Indicates that the custom action will run during normal processing time with user privileges.  This is the default.
             /// </summary>
             immediate,
-            
+
             /// <summary>
             /// Indicates that the custom action will only run in the first sequence that runs it in the same process.
             /// </summary>
             oncePerProcess,
-            
+
             /// <summary>
             /// Indicates that a custom action will run in the rollback sequence when a failure
             /// occurs during installation, usually to undo changes made by a deferred custom action.
             /// </summary>
             rollback,
-            
+
             /// <summary>
             /// Indicates that a custom action should be run a second time if it was previously run in an earlier sequence.
             /// </summary>
             secondSequence,
         }
     }
-    
+
     /// <summary>
     /// This will cause the entire contents of the Fragment containing the referenced CustomAction to be
     /// included in the installer database.
@@ -43830,13 +43830,13 @@ namespace WixToolset.Harvesters.Serialize
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class CustomActionRef : ISchemaElement, ISetAttributes
     {
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         /// <summary>
         /// The identifier of the CustomAction to reference.
         /// </summary>
@@ -43852,7 +43852,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -43864,7 +43864,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -43881,7 +43881,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -43896,7 +43896,7 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Sets a Directory to a particular value. This is accomplished by creating a Type 51 custom action that is appropriately scheduled in
     /// the InstallUISequence and InstallExecuteSequence.
@@ -43904,29 +43904,29 @@ namespace WixToolset.Harvesters.Serialize
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class SetDirectory : ISchemaElement, ISetAttributes
     {
-        
+
         private string actionField;
-        
+
         private bool actionFieldSet;
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private SequenceType sequenceField;
-        
+
         private bool sequenceFieldSet;
-        
+
         private string valueField;
-        
+
         private bool valueFieldSet;
-        
+
         private string contentField;
-        
+
         private bool contentFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         /// <summary>
         /// By default the action is "Set" + Id attribute's value. This optional attribute can override the action name in the case
         /// where multiple SetDirectory elements target the same Id (probably with mutually exclusive conditions).
@@ -43943,7 +43943,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.actionField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute specifies a reference to a Directory element with matching Id attribute. The path of the Directory will be set to
         /// the Value attribute.
@@ -43960,7 +43960,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         /// <summary>
         /// Controls which sequences the Directory assignment is sequenced in.
         /// For 'execute', the assignment is scheduled in the InstallExecuteSequence.
@@ -43981,7 +43981,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.sequenceField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute specifies a string value to assign to the Directory. The value can be a literal value or derived from a
         /// Property element using the
@@ -43998,7 +43998,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.valueField = value;
             }
         }
-        
+
         /// <summary>
         /// The condition that determines whether the Directory is set. If the condition evaluates to false, the SetDirectory is skipped.
         /// </summary>
@@ -44014,7 +44014,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.contentField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -44026,7 +44026,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -44074,7 +44074,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -44109,7 +44109,7 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Sets a Property to a particular value. This is accomplished by creating a Type 51 custom action that is appropriately scheduled in
     /// the InstallUISequence and InstallExecuteSequence.
@@ -44117,37 +44117,37 @@ namespace WixToolset.Harvesters.Serialize
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class SetProperty : ISchemaElement, ISetAttributes
     {
-        
+
         private string actionField;
-        
+
         private bool actionFieldSet;
-        
+
         private string afterField;
-        
+
         private bool afterFieldSet;
-        
+
         private string beforeField;
-        
+
         private bool beforeFieldSet;
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private SequenceType sequenceField;
-        
+
         private bool sequenceFieldSet;
-        
+
         private string valueField;
-        
+
         private bool valueFieldSet;
-        
+
         private string contentField;
-        
+
         private bool contentFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         /// <summary>
         /// By default the action is "Set" + Id attribute's value. This optional attribute can override the action name in the case
         /// where multiple SetProperty elements target the same Id (probably with mutually exclusive conditions).
@@ -44164,7 +44164,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.actionField = value;
             }
         }
-        
+
         /// <summary>
         /// The name of the standard or custom action after which this action should be performed. Mutually exclusive with the Before attribute. A Before or After attribute is required when setting a Property.
         /// </summary>
@@ -44180,7 +44180,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.afterField = value;
             }
         }
-        
+
         /// <summary>
         /// The name of the standard or custom action before which this action should be performed. Mutually exclusive with the After attribute. A Before or After attribute is required when setting a Property.
         /// </summary>
@@ -44196,7 +44196,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.beforeField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute specifies the Property to set to the Value.
         /// </summary>
@@ -44212,7 +44212,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         /// <summary>
         /// Controls which sequences the Property assignment is sequenced in.
         /// For 'execute', the assignment is scheduled in the InstallExecuteSequence.
@@ -44233,7 +44233,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.sequenceField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute specifies a string value to assign to the Property. The value can be a literal value or derived from a
         /// Property element using the
@@ -44250,7 +44250,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.valueField = value;
             }
         }
-        
+
         /// <summary>
         /// The condition that determines whether the Property is set. If the condition evaluates to false, the Set is skipped.
         /// </summary>
@@ -44266,7 +44266,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.contentField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -44278,7 +44278,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -44335,7 +44335,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -44380,7 +44380,7 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// This will cause the entire contents of the Fragment containing the referenced PatchFamily to be
     /// used in the process of creating a patch.
@@ -44388,17 +44388,17 @@ namespace WixToolset.Harvesters.Serialize
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class PatchFamilyRef : ISchemaElement, ISetAttributes
     {
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private string productCodeField;
-        
+
         private bool productCodeFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         /// <summary>
         /// The identifier of the PatchFamily to reference.
         /// </summary>
@@ -44414,7 +44414,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         /// <summary>
         /// Specifies the ProductCode of the product that this family applies to.
         /// </summary>
@@ -44430,7 +44430,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.productCodeField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -44442,7 +44442,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -44463,7 +44463,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -44483,14 +44483,14 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Sets the ProductID property to the full product identifier.  This action must be sequenced before the user interface wizard in the InstallUISequence table and before the RegisterUser action in the InstallExecuteSequence table.  If the product identifier has already been validated successfully, the ValidateProductID action does nothing.  The ValidateProductID action always returns a success, whether or not the product identifier is valid, so that the product identifier can be entered on the command line the first time the product is run.  The product identifier can be validated without having the user reenter this information by setting the PIDKEY property on the command line or by using a transform.  The display of the dialog box requesting the user to enter the product identifier can then be made conditional upon the presence of the ProductID property, which is set when the PIDKEY property is validated.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class ValidateProductID : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -44505,14 +44505,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Initiates the internal installation costing process.  Any standard or custom actions that affect costing should be sequenced before the CostInitialize action.  Call the FileCost action immediately following the CostInitialize action.  Then call the CostFinalize action following the CostInitialize action to make all final cost calculations available to the installer through the Component table.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class CostInitialize : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -44527,14 +44527,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Initiates dynamic costing of standard installation actions.  Any standard or custom actions that affect costing should sequenced before the CostInitialize action.  Call the FileCost action immediately following the CostInitialize action.  Then call the CostFinalize action following the FileCost action to make all final cost calculations available to the installer through the Component table.  The CostInitialize action must be executed before the FileCost action.  The installer then determines the disk-space cost of every file in the File table, on a per-component basis, taking both volume clustering and the presence of existing files that may need to be overwritten into account.  All actions that consume or release disk space are also considered.  If an existing file is found, a file version check is performed to determine whether the new file actually needs to be installed or not.  If the existing file is of an equal or greater version number, the existing file is not overwritten and no disk-space cost is incurred.  In all cases, the installer uses the results of version number checking to set the installation state of each file.  The FileCost action initializes cost calculation with the installer.  Actual dynamic costing does not occur until the CostFinalize action is executed.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class FileCost : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -44549,14 +44549,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Installs a copy of a component (commonly a shared DLL) into a private location for use by a specific application (typically an .exe).  This isolates the application from other copies of the component that may be installed to a shared location on the computer.  The action refers to each record of the IsolatedComponent table and associates the files of the component listed in the Component_Shared field with the component listed in the Component_Application field.  The installer installs the files of Component_Shared into the same directory as Component_Application.  The installer generates a file in this directory, zero bytes in length, having the short filename name of the key file for Component_Application (typically this is the same file name as the .exe) appended with .local.  The IsolatedComponent action does not affect the installation of Component_Application.  Uninstalling Component_Application also removes the Component_Shared files and the .local file from the directory.  The IsolateComponents action can be used only in the InstallUISequence table and the InstallExecuteSequence table.  This action must come after the CostInitialize action and before the CostFinalize action.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class IsolateComponents : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -44571,14 +44571,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Ends the internal installation costing process begun by the CostInitialize action.  Any standard or custom actions that affect costing should be sequenced before the CostInitialize action.  Call the FileCost action immediately following the CostInitialize action and then call the CostFinalize action to make all final cost calculations available to the installer through the Component table.  The CostFinalize action must be executed before starting any user interface sequence which allows the user to view or modify Feature table selections or directories.  The CostFinalize action queries the Condition table to determine which features are scheduled to be installed.  Costing is done for each component in the Component table.  The CostFinalize action also verifies that all the target directories are writable before allowing the installation to continue.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class CostFinalize : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -44593,14 +44593,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Checks for existing ODBC drivers and sets the target directory for each new driver to the location of an existing driver.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class SetODBCFolders : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -44615,14 +44615,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Used for upgrading or installing over an existing application.  Reads feature states from existing application and sets these feature states for the pending installation.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class MigrateFeatureStates : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -44637,14 +44637,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Initiates the execution sequence.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class ExecuteAction : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -44659,14 +44659,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Verifies that all costed volumes have enough space for the installation.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class InstallValidate : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -44681,14 +44681,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Marks the beginning of a sequence of actions that change the system.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class InstallInitialize : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -44703,14 +44703,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Ensures the needed amount of space exists in the registry.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class AllocateRegistrySpace : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -44725,14 +44725,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Registers and unregisters components, their key paths, and the component clients.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class ProcessComponents : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -44747,14 +44747,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Manages the unadvertisement of components listed in the PublishComponent table.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class UnpublishComponents : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -44769,14 +44769,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Manages the unadvertisement of CLR and Win32 assemblies that are being removed.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class MsiUnpublishAssemblies : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -44791,14 +44791,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Removes selection-state and feature-component mapping information from the registry.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class UnpublishFeatures : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -44813,14 +44813,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Stops system services.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class StopServices : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -44835,14 +44835,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Stops a service and removes its registration from the system.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class DeleteServices : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -44857,14 +44857,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Removes COM+ applications from the registry.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class UnregisterComPlus : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -44879,14 +44879,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Unregisters all modules listed in the SelfReg table that are scheduled to be uninstalled.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class SelfUnregModules : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -44901,14 +44901,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Unregisters type libraries from the system.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class UnregisterTypeLibraries : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -44923,14 +44923,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Removes the data sources, translators, and drivers listed for removal during the installation.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class RemoveODBC : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -44945,14 +44945,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Removes registration information about installed fonts from the system.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class UnregisterFonts : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -44967,14 +44967,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Removes a registry value that has been authored into the registry table if the associated component was installed locally or as run from source, and is now set to be uninstalled.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class RemoveRegistryValues : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -44989,14 +44989,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Manages the removal of COM class information from the system registry.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class UnregisterClassInfo : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45011,14 +45011,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Manages the removal of extension-related information from the system registry.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class UnregisterExtensionInfo : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45033,14 +45033,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Manages the unregistration of OLE ProgId information with the system.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class UnregisterProgIdInfo : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45055,14 +45055,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Unregisters MIME-related registry information from the system.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class UnregisterMIMEInfo : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45077,14 +45077,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Removes .ini file information specified for removal in the RemoveIniFile table if the component is set to be installed locally or run from source.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class RemoveIniValues : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45099,14 +45099,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Manages the removal of an advertised shortcut whose feature is selected for uninstallation or a nonadvertised shortcut whose component is selected for uninstallation.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class RemoveShortcuts : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45121,14 +45121,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Modifies the values of environment variables.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class RemoveEnvironmentStrings : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45143,14 +45143,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Deletes files installed by the DuplicateFiles action.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class RemoveDuplicateFiles : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45165,14 +45165,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Removes files previously installed by the InstallFiles action.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class RemoveFiles : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45187,14 +45187,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Removes any folders linked to components set to be removed or run from source.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class RemoveFolders : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45209,14 +45209,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Creates empty folders for components that are set to be installed.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class CreateFolders : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45231,14 +45231,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Locates existing files on the system and moves or copies those files to a new location.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class MoveFiles : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45253,14 +45253,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Copies the product database to the administrative installation point.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class InstallAdminPackage : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45275,14 +45275,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Copies files specified in the File table from the source directory to the destination directory.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class InstallFiles : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45297,14 +45297,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Duplicates files installed by the InstallFiles action.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class DuplicateFiles : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45319,14 +45319,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Queries the Patch table to determine which patches are to be applied.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class PatchFiles : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45341,14 +45341,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Binds each executable or DLL that must be bound to the DLLs imported by it.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class BindImage : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45363,14 +45363,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Manages the creation of shortcuts.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class CreateShortcuts : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45385,14 +45385,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Manages the registration of COM class information with the system.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class RegisterClassInfo : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45407,14 +45407,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Manages the registration of extension related information with the system.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class RegisterExtensionInfo : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45429,14 +45429,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Manages the registration of OLE ProgId information with the system.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class RegisterProgIdInfo : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45451,14 +45451,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Registers MIME-related registry information with the system.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class RegisterMIMEInfo : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45473,14 +45473,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Sets up an application's registry information.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class WriteRegistryValues : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45495,14 +45495,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Writes the .ini file information that the application needs written to its .ini files.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class WriteIniValues : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45517,14 +45517,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Modifies the values of environment variables.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class WriteEnvironmentStrings : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45539,14 +45539,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Registers installed fonts with the system.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class RegisterFonts : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45561,14 +45561,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Installs the drivers, translators, and data sources in the ODBCDriver table, ODBCTranslator table, and ODBCDataSource table.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class InstallODBC : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45583,14 +45583,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Registers type libraries with the system.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class RegisterTypeLibraries : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45605,14 +45605,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Processes all modules listed in the SelfReg table and registers all installed modules with the system.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class SelfRegModules : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45627,14 +45627,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Registers COM+ applications.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class RegisterComPlus : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45649,14 +45649,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Registers a service for the system.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class InstallServices : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45671,14 +45671,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Starts system services.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class StartServices : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45693,14 +45693,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Registers the user information with the installer to identify the user of a product.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class RegisterUser : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45715,14 +45715,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Registers the product information with the installer.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class RegisterProduct : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45737,14 +45737,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Manages the advertisement of the components from the PublishComponent table.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class PublishComponents : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45759,14 +45759,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Manages the advertisement of CLR and Win32 assemblies.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class MsiPublishAssemblies : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45781,14 +45781,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Writes each feature's state into the system registry.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class PublishFeatures : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45803,14 +45803,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Manages the advertisement of the product information with the system.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class PublishProduct : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45825,14 +45825,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Marks the end of a sequence of actions that change the system.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class InstallFinalize : ActionSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45847,14 +45847,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Uses file signatures to search for existing versions of products.  The AppSearch action may use this information to determine where upgrades are to be installed.  The AppSearch action can also be used to set a property to the existing value of an registry or .ini file entry.  AppSearch should be authored into the InstallUISequence table and InstallExecuteSequence table.  The installer prevents The AppSearch action from running in the InstallExecuteSequence sequence if the action has already run in InstallUISequence sequence.  The AppSearch action searches for file signatures using the CompLocator table first, the RegLocator table next, then the IniLocator table, and finally the DrLocator table.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class AppSearch : ActionModuleSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45869,14 +45869,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Uses file signatures to validate that qualifying products are installed on a system before an upgrade installation is performed.  The CCPSearch action should be authored into the InstallUISequence table and InstallExecuteSequence table.  The installer prevents the CCPSearch action from running in the InstallExecuteSequence sequence if the action has already run in InstallUISequence sequence.  The CCPSearch action must come before the RMCCPSearch action.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class CCPSearch : ActionModuleSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45891,14 +45891,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Uses file signatures to validate that qualifying products are installed on a system before an upgrade installation is performed.  The RMCCPSearch action should be authored into the InstallUISequence table and InstallExecuteSequence table.  The installer prevents RMCCPSearch from running in the InstallExecuteSequence sequence if the action has already run in InstallUISequence sequence.  The RMCCPSearch action requires the CCP_DRIVE property to be set to the root path on the removable volume that has the installation for any of the qualifying products.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class RMCCPSearch : ActionModuleSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45913,14 +45913,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Queries the LaunchCondition table and evaluates each conditional statement recorded there.  If any of these conditional statements fail, an error message is displayed to the user and the installation is terminated.  The LaunchConditions action is optional.  This action is normally the first in the sequence, but the AppSearch Action may be sequenced before the LaunchConditions action.  If there are launch conditions that do not apply to all installation modes, the appropriate installation mode property should be used in a conditional expression in the appropriate sequence table.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class LaunchConditions : ActionModuleSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45935,14 +45935,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Runs through each record of the Upgrade table in sequence and compares the upgrade code, product version, and language in each row to products installed on the system.  When FindRelatedProducts detects a correspondence between the upgrade information and an installed product, it appends the product code to the property specified in the ActionProperty column of the UpgradeTable.  The FindRelatedProducts action only runs the first time the product is installed.  The FindRelatedProducts action does not run during maintenance mode or uninstallation.  FindRelatedProducts should be authored into the InstallUISequence table and InstallExecuteSequence tables.  The installer prevents FindRelatedProducts from running in InstallExecuteSequence if the action has already run in InstallUISequence.  The FindRelatedProducts action must come before the MigrateFeatureStates action and the RemoveExistingProducts action.  The condition for this action may be specified in the element's inner text.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class FindRelatedProducts : ActionModuleSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45957,14 +45957,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Runs a script containing all operations spooled since either the start of the installation or the last InstallExecute action, or InstallExecuteAgain action.  Special actions don't have a built-in sequence number and thus must appear relative to another action.  The suggested way to do this is by using the Before or After attribute.  InstallExecute and InstallExecuteAgain can optionally appear anywhere between InstallInitialize and InstallFinalize.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class InstallExecute : ActionModuleSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -45979,14 +45979,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Runs a script containing all operations spooled since either the start of the installation or the last InstallExecute action, or InstallExecuteAgain action.  Should only be used after InstallExecute.  Special actions don't have a built-in sequence number and thus must appear relative to another action.  The suggested way to do this is by using the Before or After attribute.  InstallExecute and InstallExecuteAgain can optionally appear anywhere between InstallInitialize and InstallFinalize.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class InstallExecuteAgain : ActionModuleSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -46001,14 +46001,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Disables rollback for the remainder of the installation.  Special actions don't have a built-in sequence number and thus must appear relative to another action.  The suggested way to do this is by using the Before or After attribute.  InstallExecute and InstallExecuteAgain can optionally appear anywhere between InstallInitialize and InstallFinalize.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class DisableRollback : ActionModuleSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -46023,14 +46023,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Goes through the product codes listed in the ActionProperty column of the Upgrade table and removes the products in sequence.  Special actions don't have a built-in sequence number and thus must appear relative to another action.  The suggested way to do this is by using the Before or After attribute.  InstallExecute and InstallExecuteAgain can optionally appear anywhere between InstallInitialize and InstallFinalize.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class RemoveExistingProducts : ActionModuleSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -46045,14 +46045,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Prompts the user to restart the system at the end of installation.  Special actions don't have a built-in sequence number and thus must appear relative to another action.  The suggested way to do this is by using the Before or After attribute.  InstallExecute and InstallExecuteAgain can optionally appear anywhere between InstallInitialize and InstallFinalize.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class ScheduleReboot : ActionModuleSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -46067,14 +46067,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Prompts the user for a restart of the system during the installation.  Special actions don't have a built-in sequence number and thus must appear relative to another action.  The suggested way to do this is by using the Before or After attribute.  InstallExecute and InstallExecuteAgain can optionally appear anywhere between InstallInitialize and InstallFinalize.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class ForceReboot : ActionModuleSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -46089,14 +46089,14 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Determines the location of the source and sets the SourceDir property if the source has not been resolved yet.  Special actions don't have a built-in sequence number and thus must appear relative to another action.  The suggested way to do this is by using the Before or After attribute.  InstallExecute and InstallExecuteAgain can optionally appear anywhere between InstallInitialize and InstallFinalize.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class ResolveSource : ActionModuleSequenceType, ISchemaElement
     {
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -46111,44 +46111,44 @@ namespace WixToolset.Harvesters.Serialize
             writer.WriteEndElement();
         }
     }
-    
+
     /// <summary>
     /// Use to sequence a custom action.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class Custom : ISchemaElement, ISetAttributes
     {
-        
+
         private string actionField;
-        
+
         private bool actionFieldSet;
-        
+
         private ExitType onExitField;
-        
+
         private bool onExitFieldSet;
-        
+
         private string beforeField;
-        
+
         private bool beforeFieldSet;
-        
+
         private string afterField;
-        
+
         private bool afterFieldSet;
-        
+
         private YesNoType overridableField;
-        
+
         private bool overridableFieldSet;
-        
+
         private int sequenceField;
-        
+
         private bool sequenceFieldSet;
-        
+
         private string contentField;
-        
+
         private bool contentFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         /// <summary>
         /// The action to which the Custom element applies.
         /// </summary>
@@ -46164,7 +46164,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.actionField = value;
             }
         }
-        
+
         /// <summary>
         /// Mutually exclusive with Before, After, and Sequence attributes
         /// </summary>
@@ -46180,7 +46180,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.onExitField = value;
             }
         }
-        
+
         /// <summary>
         /// The name of the standard or custom action before which this action should be performed. Mutually exclusive with OnExit, After, and Sequence attributes
         /// </summary>
@@ -46196,7 +46196,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.beforeField = value;
             }
         }
-        
+
         /// <summary>
         /// The name of the standard or custom action after which this action should be performed. Mutually exclusive with Before, OnExit, and Sequence attributes
         /// </summary>
@@ -46212,7 +46212,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.afterField = value;
             }
         }
-        
+
         /// <summary>
         /// If "yes", the sequencing of this action may be overridden by sequencing elsewhere.
         /// </summary>
@@ -46228,7 +46228,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.overridableField = value;
             }
         }
-        
+
         /// <summary>
         /// The sequence number for this action. Mutually exclusive with Before, After, and OnExit attributes
         /// </summary>
@@ -46244,7 +46244,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.sequenceField = value;
             }
         }
-        
+
         /// <summary>
         /// Text node specifies the condition of the action.
         /// </summary>
@@ -46260,7 +46260,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.contentField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -46272,7 +46272,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -46336,7 +46336,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -46381,41 +46381,41 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class Show : ISchemaElement, ISetAttributes
     {
-        
+
         private string dialogField;
-        
+
         private bool dialogFieldSet;
-        
+
         private ExitType onExitField;
-        
+
         private bool onExitFieldSet;
-        
+
         private string beforeField;
-        
+
         private bool beforeFieldSet;
-        
+
         private string afterField;
-        
+
         private bool afterFieldSet;
-        
+
         private YesNoType overridableField;
-        
+
         private bool overridableFieldSet;
-        
+
         private int sequenceField;
-        
+
         private bool sequenceFieldSet;
-        
+
         private string contentField;
-        
+
         private bool contentFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         public string Dialog
         {
             get
@@ -46428,7 +46428,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.dialogField = value;
             }
         }
-        
+
         /// <summary>
         /// mutually exclusive with Before, After, and Sequence attributes
         /// </summary>
@@ -46444,7 +46444,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.onExitField = value;
             }
         }
-        
+
         public string Before
         {
             get
@@ -46457,7 +46457,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.beforeField = value;
             }
         }
-        
+
         public string After
         {
             get
@@ -46470,7 +46470,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.afterField = value;
             }
         }
-        
+
         /// <summary>
         /// If "yes", the sequencing of this dialog may be overridden by sequencing elsewhere.
         /// </summary>
@@ -46486,7 +46486,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.overridableField = value;
             }
         }
-        
+
         public int Sequence
         {
             get
@@ -46499,7 +46499,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.sequenceField = value;
             }
         }
-        
+
         public string Content
         {
             get
@@ -46512,7 +46512,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.contentField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -46524,7 +46524,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -46588,7 +46588,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -46633,15 +46633,15 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class InstallUISequence : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes
     {
-        
+
         private ElementCollection children;
-        
+
         private ISchemaElement parentElement;
-        
+
         public InstallUISequence()
         {
             ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Choice);
@@ -46663,7 +46663,7 @@ namespace WixToolset.Harvesters.Serialize
             childCollection0.AddItem(new ElementCollection.ChoiceItem(typeof(ExecuteAction)));
             this.children = childCollection0;
         }
-        
+
         public virtual IEnumerable Children
         {
             get
@@ -46671,7 +46671,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children;
             }
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")]
         public virtual IEnumerable this[System.Type childType]
         {
@@ -46680,7 +46680,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children.Filter(childType);
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -46692,7 +46692,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         public virtual void AddChild(ISchemaElement child)
         {
             if ((null == child))
@@ -46702,7 +46702,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.AddElement(child);
             child.ParentElement = this;
         }
-        
+
         public virtual void RemoveChild(ISchemaElement child)
         {
             if ((null == child))
@@ -46712,7 +46712,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.RemoveElement(child);
             child.ParentElement = null;
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         ISchemaElement ICreateChildren.CreateChild(string childName)
@@ -46792,7 +46792,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return childValue;
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -46810,7 +46810,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -46820,15 +46820,15 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class InstallExecuteSequence : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes
     {
-        
+
         private ElementCollection children;
-        
+
         private ISchemaElement parentElement;
-        
+
         public InstallExecuteSequence()
         {
             ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Choice);
@@ -46907,7 +46907,7 @@ namespace WixToolset.Harvesters.Serialize
             childCollection0.AddItem(new ElementCollection.ChoiceItem(typeof(MsiUnpublishAssemblies)));
             this.children = childCollection0;
         }
-        
+
         public virtual IEnumerable Children
         {
             get
@@ -46915,7 +46915,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children;
             }
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")]
         public virtual IEnumerable this[System.Type childType]
         {
@@ -46924,7 +46924,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children.Filter(childType);
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -46936,7 +46936,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         public virtual void AddChild(ISchemaElement child)
         {
             if ((null == child))
@@ -46946,7 +46946,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.AddElement(child);
             child.ParentElement = this;
         }
-        
+
         public virtual void RemoveChild(ISchemaElement child)
         {
             if ((null == child))
@@ -46956,7 +46956,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.RemoveElement(child);
             child.ParentElement = null;
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         ISchemaElement ICreateChildren.CreateChild(string childName)
@@ -47264,7 +47264,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return childValue;
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -47282,7 +47282,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -47292,15 +47292,15 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class AdminUISequence : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes
     {
-        
+
         private ElementCollection children;
-        
+
         private ISchemaElement parentElement;
-        
+
         public AdminUISequence()
         {
             ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Choice);
@@ -47318,7 +47318,7 @@ namespace WixToolset.Harvesters.Serialize
             childCollection0.AddItem(new ElementCollection.ChoiceItem(typeof(LaunchConditions)));
             this.children = childCollection0;
         }
-        
+
         public virtual IEnumerable Children
         {
             get
@@ -47326,7 +47326,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children;
             }
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")]
         public virtual IEnumerable this[System.Type childType]
         {
@@ -47335,7 +47335,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children.Filter(childType);
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -47347,7 +47347,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         public virtual void AddChild(ISchemaElement child)
         {
             if ((null == child))
@@ -47357,7 +47357,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.AddElement(child);
             child.ParentElement = this;
         }
-        
+
         public virtual void RemoveChild(ISchemaElement child)
         {
             if ((null == child))
@@ -47367,7 +47367,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.RemoveElement(child);
             child.ParentElement = null;
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         ISchemaElement ICreateChildren.CreateChild(string childName)
@@ -47431,7 +47431,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return childValue;
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -47449,7 +47449,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -47459,15 +47459,15 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class AdminExecuteSequence : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes
     {
-        
+
         private ElementCollection children;
-        
+
         private ISchemaElement parentElement;
-        
+
         public AdminExecuteSequence()
         {
             ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Choice);
@@ -47485,7 +47485,7 @@ namespace WixToolset.Harvesters.Serialize
             childCollection0.AddItem(new ElementCollection.ChoiceItem(typeof(ResolveSource)));
             this.children = childCollection0;
         }
-        
+
         public virtual IEnumerable Children
         {
             get
@@ -47493,7 +47493,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children;
             }
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")]
         public virtual IEnumerable this[System.Type childType]
         {
@@ -47502,7 +47502,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children.Filter(childType);
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -47514,7 +47514,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         public virtual void AddChild(ISchemaElement child)
         {
             if ((null == child))
@@ -47524,7 +47524,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.AddElement(child);
             child.ParentElement = this;
         }
-        
+
         public virtual void RemoveChild(ISchemaElement child)
         {
             if ((null == child))
@@ -47534,7 +47534,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.RemoveElement(child);
             child.ParentElement = null;
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         ISchemaElement ICreateChildren.CreateChild(string childName)
@@ -47598,7 +47598,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return childValue;
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -47616,7 +47616,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -47626,15 +47626,15 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class AdvertiseExecuteSequence : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes
     {
-        
+
         private ElementCollection children;
-        
+
         private ISchemaElement parentElement;
-        
+
         public AdvertiseExecuteSequence()
         {
             ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Choice);
@@ -47655,7 +47655,7 @@ namespace WixToolset.Harvesters.Serialize
             childCollection0.AddItem(new ElementCollection.ChoiceItem(typeof(MsiPublishAssemblies)));
             this.children = childCollection0;
         }
-        
+
         public virtual IEnumerable Children
         {
             get
@@ -47663,7 +47663,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children;
             }
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")]
         public virtual IEnumerable this[System.Type childType]
         {
@@ -47672,7 +47672,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children.Filter(childType);
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -47684,7 +47684,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         public virtual void AddChild(ISchemaElement child)
         {
             if ((null == child))
@@ -47694,7 +47694,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.AddElement(child);
             child.ParentElement = this;
         }
-        
+
         public virtual void RemoveChild(ISchemaElement child)
         {
             if ((null == child))
@@ -47704,7 +47704,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.RemoveElement(child);
             child.ParentElement = null;
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         ISchemaElement ICreateChildren.CreateChild(string childName)
@@ -47780,7 +47780,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return childValue;
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -47798,7 +47798,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -47808,41 +47808,41 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Binary data used for CustomAction elements and UI controls.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class Binary : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes
     {
-        
+
         private ElementCollection children;
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private string sourceFileField;
-        
+
         private bool sourceFileFieldSet;
-        
+
         private string srcField;
-        
+
         private bool srcFieldSet;
-        
+
         private YesNoType suppressModularizationField;
-        
+
         private bool suppressModularizationFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         public Binary()
         {
             ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Choice);
             childCollection0.AddItem(new ElementCollection.ChoiceItem(typeof(ISchemaElement)));
             this.children = childCollection0;
         }
-        
+
         public virtual IEnumerable Children
         {
             get
@@ -47850,7 +47850,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children;
             }
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")]
         public virtual IEnumerable this[System.Type childType]
         {
@@ -47859,7 +47859,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children.Filter(childType);
             }
         }
-        
+
         /// <summary>
         /// The Id cannot be longer than 55 characters.  In order to prevent errors in cases where the Id is modularized, it should not be longer than 18 characters.
         /// </summary>
@@ -47875,7 +47875,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         /// <summary>
         /// Path to the binary file.
         /// </summary>
@@ -47891,7 +47891,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.sourceFileField = value;
             }
         }
-        
+
         [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly")]
         public string src
         {
@@ -47905,7 +47905,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.srcField = value;
             }
         }
-        
+
         /// <summary>
         /// Use to suppress modularization of this Binary identifier in merge modules.
         /// </summary>
@@ -47921,7 +47921,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.suppressModularizationField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -47933,7 +47933,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         public virtual void AddChild(ISchemaElement child)
         {
             if ((null == child))
@@ -47943,7 +47943,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.AddElement(child);
             child.ParentElement = this;
         }
-        
+
         public virtual void RemoveChild(ISchemaElement child)
         {
             if ((null == child))
@@ -47953,7 +47953,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.RemoveElement(child);
             child.ParentElement = null;
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         ISchemaElement ICreateChildren.CreateChild(string childName)
         {
@@ -47968,7 +47968,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return childValue;
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -48009,7 +48009,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -48039,28 +48039,28 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Icon used for Shortcut, ProgId, or Class elements (but not UI controls)
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class Icon : ISchemaElement, ISetAttributes
     {
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private string sourceFileField;
-        
+
         private bool sourceFileFieldSet;
-        
+
         private string srcField;
-        
+
         private bool srcFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         /// <summary>
         /// The Id cannot be longer than 55 characters.  In order to prevent errors in cases where the Id is modularized, it should not be longer than 18 characters.
         /// </summary>
@@ -48076,7 +48076,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         /// <summary>
         /// Path to the icon file.
         /// </summary>
@@ -48092,7 +48092,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.sourceFileField = value;
             }
         }
-        
+
         [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly")]
         public string src
         {
@@ -48106,7 +48106,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.srcField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -48118,7 +48118,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -48143,7 +48143,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -48168,37 +48168,37 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class EmbeddedChainer : ISchemaElement, ISetAttributes
     {
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private string commandLineField;
-        
+
         private bool commandLineFieldSet;
-        
+
         private string binarySourceField;
-        
+
         private bool binarySourceFieldSet;
-        
+
         private string fileSourceField;
-        
+
         private bool fileSourceFieldSet;
-        
+
         private string propertySourceField;
-        
+
         private bool propertySourceFieldSet;
-        
+
         private string contentField;
-        
+
         private bool contentFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         /// <summary>
         /// Unique identifier for embedded chainer.
         /// </summary>
@@ -48214,7 +48214,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         /// <summary>
         /// Value to append to the transaction handle and passed to the chainer executable.
         /// </summary>
@@ -48230,7 +48230,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.commandLineField = value;
             }
         }
-        
+
         /// <summary>
         /// Reference to the Binary element that contains the chainer executable. Mutually exclusive with
         /// the FileSource and PropertySource attributes.
@@ -48247,7 +48247,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.binarySourceField = value;
             }
         }
-        
+
         /// <summary>
         /// Reference to the File element that is the chainer executable. Mutually exclusive with
         /// the BinarySource and PropertySource attributes.
@@ -48264,7 +48264,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.fileSourceField = value;
             }
         }
-        
+
         /// <summary>
         /// Reference to a Property that resolves to the full path to the chainer executable. Mutually exclusive with
         /// the BinarySource and FileSource attributes.
@@ -48281,7 +48281,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.propertySourceField = value;
             }
         }
-        
+
         /// <summary>
         /// Element value is the condition.  CDATA may be used to when a condition contains many XML characters
         /// that must be escaped.  It is important to note that each EmbeddedChainer element must have a mutually exclusive condition
@@ -48300,7 +48300,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.contentField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -48312,7 +48312,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -48349,7 +48349,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -48389,7 +48389,7 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Reference to an EmbeddedChainer element.  This will force the entire referenced Fragment's contents
     /// to be included in the installer database.
@@ -48397,13 +48397,13 @@ namespace WixToolset.Harvesters.Serialize
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class EmbeddedChainerRef : ISchemaElement, ISetAttributes
     {
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         public string Id
         {
             get
@@ -48416,7 +48416,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -48428,7 +48428,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -48445,7 +48445,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -48460,113 +48460,113 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Element value is the condition. Use CDATA if message contains delimiter characters.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class EmbeddedUI : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes
     {
-        
+
         private ElementCollection children;
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private YesNoType ignoreFatalExitField;
-        
+
         private bool ignoreFatalExitFieldSet;
-        
+
         private YesNoType ignoreErrorField;
-        
+
         private bool ignoreErrorFieldSet;
-        
+
         private YesNoType ignoreWarningField;
-        
+
         private bool ignoreWarningFieldSet;
-        
+
         private YesNoType ignoreUserField;
-        
+
         private bool ignoreUserFieldSet;
-        
+
         private YesNoType ignoreInfoField;
-        
+
         private bool ignoreInfoFieldSet;
-        
+
         private YesNoType ignoreFilesInUseField;
-        
+
         private bool ignoreFilesInUseFieldSet;
-        
+
         private YesNoType ignoreResolveSourceField;
-        
+
         private bool ignoreResolveSourceFieldSet;
-        
+
         private YesNoType ignoreOutOfDiskSpaceField;
-        
+
         private bool ignoreOutOfDiskSpaceFieldSet;
-        
+
         private YesNoType ignoreActionStartField;
-        
+
         private bool ignoreActionStartFieldSet;
-        
+
         private YesNoType ignoreActionDataField;
-        
+
         private bool ignoreActionDataFieldSet;
-        
+
         private YesNoType ignoreProgressField;
-        
+
         private bool ignoreProgressFieldSet;
-        
+
         private YesNoType ignoreCommonDataField;
-        
+
         private bool ignoreCommonDataFieldSet;
-        
+
         private YesNoType ignoreInitializeField;
-        
+
         private bool ignoreInitializeFieldSet;
-        
+
         private YesNoType ignoreTerminateField;
-        
+
         private bool ignoreTerminateFieldSet;
-        
+
         private YesNoType ignoreShowDialogField;
-        
+
         private bool ignoreShowDialogFieldSet;
-        
+
         private YesNoType ignoreRMFilesInUseField;
-        
+
         private bool ignoreRMFilesInUseFieldSet;
-        
+
         private YesNoType ignoreInstallStartField;
-        
+
         private bool ignoreInstallStartFieldSet;
-        
+
         private YesNoType ignoreInstallEndField;
-        
+
         private bool ignoreInstallEndFieldSet;
-        
+
         private string nameField;
-        
+
         private bool nameFieldSet;
-        
+
         private string sourceFileField;
-        
+
         private bool sourceFileFieldSet;
-        
+
         private YesNoType supportBasicUIField;
-        
+
         private bool supportBasicUIFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         public EmbeddedUI()
         {
             ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Sequence);
             childCollection0.AddItem(new ElementCollection.SequenceItem(typeof(EmbeddedUIResource)));
             this.children = childCollection0;
         }
-        
+
         public virtual IEnumerable Children
         {
             get
@@ -48574,7 +48574,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children;
             }
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")]
         public virtual IEnumerable this[System.Type childType]
         {
@@ -48583,7 +48583,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children.Filter(childType);
             }
         }
-        
+
         /// <summary>
         /// Unique identifier for embedded UI.If this attribute is not specified the Name attribute or the file name
         /// portion of the SourceFile attribute will be used.
@@ -48600,7 +48600,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         /// <summary>
         /// Embedded UI will not recieve any INSTALLLOGMODE_FATALEXIT messages.
         /// </summary>
@@ -48616,7 +48616,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.ignoreFatalExitField = value;
             }
         }
-        
+
         /// <summary>
         /// Embedded UI will not recieve any INSTALLLOGMODE_ERROR messages.
         /// </summary>
@@ -48632,7 +48632,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.ignoreErrorField = value;
             }
         }
-        
+
         /// <summary>
         /// Embedded UI will not recieve any INSTALLLOGMODE_WARNING messages.
         /// </summary>
@@ -48648,7 +48648,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.ignoreWarningField = value;
             }
         }
-        
+
         /// <summary>
         /// Embedded UI will not recieve any INSTALLLOGMODE_USER messages.
         /// </summary>
@@ -48664,7 +48664,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.ignoreUserField = value;
             }
         }
-        
+
         /// <summary>
         /// Embedded UI will not recieve any INSTALLLOGMODE_INFO messages.
         /// </summary>
@@ -48680,7 +48680,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.ignoreInfoField = value;
             }
         }
-        
+
         /// <summary>
         /// Embedded UI will not recieve any INSTALLLOGMODE_FILESINUSE messages.
         /// </summary>
@@ -48696,7 +48696,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.ignoreFilesInUseField = value;
             }
         }
-        
+
         /// <summary>
         /// Embedded UI will not recieve any INSTALLLOGMODE_RESOLVESOURCE messages.
         /// </summary>
@@ -48712,7 +48712,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.ignoreResolveSourceField = value;
             }
         }
-        
+
         /// <summary>
         /// Embedded UI will not recieve any INSTALLLOGMODE_OUTOFDISKSPACE messages.
         /// </summary>
@@ -48728,7 +48728,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.ignoreOutOfDiskSpaceField = value;
             }
         }
-        
+
         /// <summary>
         /// Embedded UI will not recieve any INSTALLLOGMODE_ACTIONSTART messages.
         /// </summary>
@@ -48744,7 +48744,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.ignoreActionStartField = value;
             }
         }
-        
+
         /// <summary>
         /// Embedded UI will not recieve any INSTALLLOGMODE_ACTIONDATA messages.
         /// </summary>
@@ -48760,7 +48760,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.ignoreActionDataField = value;
             }
         }
-        
+
         /// <summary>
         /// Embedded UI will not recieve any INSTALLLOGMODE_PROGRESS messages.
         /// </summary>
@@ -48776,7 +48776,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.ignoreProgressField = value;
             }
         }
-        
+
         /// <summary>
         /// Embedded UI will not recieve any INSTALLLOGMODE_COMMONDATA messages.
         /// </summary>
@@ -48792,7 +48792,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.ignoreCommonDataField = value;
             }
         }
-        
+
         /// <summary>
         /// Embedded UI will not recieve any INSTALLLOGMODE_INITIALIZE messages.
         /// </summary>
@@ -48808,7 +48808,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.ignoreInitializeField = value;
             }
         }
-        
+
         /// <summary>
         /// Embedded UI will not recieve any INSTALLLOGMODE_TERMINATE messages.
         /// </summary>
@@ -48824,7 +48824,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.ignoreTerminateField = value;
             }
         }
-        
+
         /// <summary>
         /// Embedded UI will not recieve any INSTALLLOGMODE_SHOWDIALOG messages.
         /// </summary>
@@ -48840,7 +48840,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.ignoreShowDialogField = value;
             }
         }
-        
+
         /// <summary>
         /// Embedded UI will not recieve any INSTALLLOGMODE_RMFILESINUSE messages.
         /// </summary>
@@ -48857,7 +48857,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.ignoreRMFilesInUseField = value;
             }
         }
-        
+
         /// <summary>
         /// Embedded UI will not recieve any INSTALLLOGMODE_INSTALLSTART messages.
         /// </summary>
@@ -48873,7 +48873,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.ignoreInstallStartField = value;
             }
         }
-        
+
         /// <summary>
         /// Embedded UI will not recieve any INSTALLLOGMODE_INSTALLEND messages.
         /// </summary>
@@ -48908,7 +48908,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.nameField = value;
             }
         }
-        
+
         /// <summary>
         /// Path to the binary file that is the embedded UI. This must be a DLL that exports the following
         /// three entry points: InitializeEmbeddedUI, EmbeddedUIHandler and ShutdownEmbeddedUI.
@@ -48925,7 +48925,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.sourceFileField = value;
             }
         }
-        
+
         /// <summary>
         /// Set yes to allow the Windows Installer to display the embedded UI during basic UI level installation.
         /// </summary>
@@ -48941,7 +48941,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.supportBasicUIField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -48953,7 +48953,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         public virtual void AddChild(ISchemaElement child)
         {
             if ((null == child))
@@ -48963,7 +48963,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.AddElement(child);
             child.ParentElement = this;
         }
-        
+
         public virtual void RemoveChild(ISchemaElement child)
         {
             if ((null == child))
@@ -48973,7 +48973,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.RemoveElement(child);
             child.ParentElement = null;
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         ISchemaElement ICreateChildren.CreateChild(string childName)
         {
@@ -48992,7 +48992,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return childValue;
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -49232,7 +49232,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         void ISetAttributes.SetAttribute(string name, string value)
@@ -49353,28 +49353,28 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Defines a resource for use by the embedded UI.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class EmbeddedUIResource : ISchemaElement, ISetAttributes
     {
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private string nameField;
-        
+
         private bool nameFieldSet;
-        
+
         private string sourceFileField;
-        
+
         private bool sourceFileFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         /// <summary>
         /// Identifier for the embedded UI resource.
         /// </summary>
@@ -49408,7 +49408,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.nameField = value;
             }
         }
-        
+
         /// <summary>
         /// Path to the binary file that is the embedded UI resource.
         /// </summary>
@@ -49424,7 +49424,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.sourceFileField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -49436,7 +49436,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -49461,7 +49461,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -49486,21 +49486,21 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class Error : ISchemaElement, ISetAttributes
     {
-        
+
         private int idField;
-        
+
         private bool idFieldSet;
-        
+
         private string contentField;
-        
+
         private bool contentFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         /// <summary>
         /// Number of the error for which a message is being provided. See MSI SDK for error definitions.
         /// </summary>
@@ -49516,7 +49516,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         /// <summary>
         /// Element value is Message, use CDATA if message contains delimiter characters
         /// </summary>
@@ -49532,7 +49532,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.contentField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -49544,7 +49544,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -49565,7 +49565,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -49585,41 +49585,41 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class Publish : ISchemaElement, ISetAttributes
     {
-        
+
         private string controlField;
-        
+
         private bool controlFieldSet;
-        
+
         private string dialogField;
-        
+
         private bool dialogFieldSet;
-        
+
         private string eventField;
-        
+
         private bool eventFieldSet;
-        
+
         private string orderField;
-        
+
         private bool orderFieldSet;
-        
+
         private string propertyField;
-        
+
         private bool propertyFieldSet;
-        
+
         private string valueField;
-        
+
         private bool valueFieldSet;
-        
+
         private string contentField;
-        
+
         private bool contentFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         /// <summary>
         /// The parent Control for this Publish element, should only be specified when this element is a child of the UI element.
         /// </summary>
@@ -49635,7 +49635,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.controlField = value;
             }
         }
-        
+
         /// <summary>
         /// The parent Dialog for this Publish element, should only be specified when this element is a child of the UI element.
         /// This attribute will create a reference to the specified Dialog, so an additional DialogRef is not necessary.
@@ -49652,7 +49652,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.dialogField = value;
             }
         }
-        
+
         /// <summary>
         /// Set this attribute's value to one of the standard control events to trigger that event.
         /// Either this attribute or the Property attribute must be set, but not both at the same time.
@@ -49669,7 +49669,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.eventField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute should only need to be set if this element is nested under a UI element in order to
         /// control the order in which this publish event will be started.
@@ -49690,7 +49690,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.orderField = value;
             }
         }
-        
+
         /// <summary>
         /// Set this attribute's value to a property name to set that property.
         /// Either this attribute or the Event attribute must be set, but not both at the same time.
@@ -49707,7 +49707,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.propertyField = value;
             }
         }
-        
+
         /// <summary>
         /// If the Property attribute is specified, set the value of this attribute to the new value for the property.
         /// To set a property to null, do not set this attribute (the ControlEvent Argument column will be set to '{}').
@@ -49726,7 +49726,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.valueField = value;
             }
         }
-        
+
         /// <summary>
         /// The element value is the optional Condition expression.
         /// </summary>
@@ -49742,7 +49742,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.contentField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -49754,7 +49754,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -49796,7 +49796,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -49841,24 +49841,24 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Sets attributes for events in the EventMapping table
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class Subscribe : ISchemaElement, ISetAttributes
     {
-        
+
         private string eventField;
-        
+
         private bool eventFieldSet;
-        
+
         private string attributeField;
-        
+
         private bool attributeFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         /// <summary>
         /// must be one of the standard control events'
         /// </summary>
@@ -49874,7 +49874,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.eventField = value;
             }
         }
-        
+
         /// <summary>
         /// if not present can only handle enable, disable, hide, unhide events
         /// </summary>
@@ -49890,7 +49890,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.attributeField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -49902,7 +49902,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -49923,7 +49923,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -49943,28 +49943,28 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// An alternative to using the Text attribute when the value contains special XML characters like &lt;, &gt;, or &amp;.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class Text : ISchemaElement, ISetAttributes
     {
-        
+
         private string sourceFileField;
-        
+
         private bool sourceFileFieldSet;
-        
+
         private string srcField;
-        
+
         private bool srcFieldSet;
-        
+
         private string contentField;
-        
+
         private bool contentFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         /// <summary>
         /// Instructs the text to be imported from a file instead of the element value during the binding process.
         /// </summary>
@@ -49980,7 +49980,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.sourceFileField = value;
             }
         }
-        
+
         [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly")]
         public string src
         {
@@ -49994,7 +49994,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.srcField = value;
             }
         }
-        
+
         public string Content
         {
             get
@@ -50007,7 +50007,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.contentField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -50019,7 +50019,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -50044,7 +50044,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -50069,210 +50069,210 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Contains the controls that appear on each dialog.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class Control : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes
     {
-        
+
         private ElementCollection children;
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private string typeField;
-        
+
         private bool typeFieldSet;
-        
+
         private string xField;
-        
+
         private bool xFieldSet;
-        
+
         private string yField;
-        
+
         private bool yFieldSet;
-        
+
         private string widthField;
-        
+
         private bool widthFieldSet;
-        
+
         private string heightField;
-        
+
         private bool heightFieldSet;
-        
+
         private string propertyField;
-        
+
         private bool propertyFieldSet;
-        
+
         private string textField;
-        
+
         private bool textFieldSet;
-        
+
         private string helpField;
-        
+
         private bool helpFieldSet;
-        
+
         private string toolTipField;
-        
+
         private bool toolTipFieldSet;
-        
+
         private string checkBoxValueField;
-        
+
         private bool checkBoxValueFieldSet;
-        
+
         private string checkBoxPropertyRefField;
-        
+
         private bool checkBoxPropertyRefFieldSet;
-        
+
         private YesNoType tabSkipField;
-        
+
         private bool tabSkipFieldSet;
-        
+
         private YesNoType defaultField;
-        
+
         private bool defaultFieldSet;
-        
+
         private YesNoType cancelField;
-        
+
         private bool cancelFieldSet;
-        
+
         private YesNoType hiddenField;
-        
+
         private bool hiddenFieldSet;
-        
+
         private YesNoType disabledField;
-        
+
         private bool disabledFieldSet;
-        
+
         private YesNoType sunkenField;
-        
+
         private bool sunkenFieldSet;
-        
+
         private YesNoType indirectField;
-        
+
         private bool indirectFieldSet;
-        
+
         private YesNoType integerField;
-        
+
         private bool integerFieldSet;
-        
+
         private YesNoType rightToLeftField;
-        
+
         private bool rightToLeftFieldSet;
-        
+
         private YesNoType rightAlignedField;
-        
+
         private bool rightAlignedFieldSet;
-        
+
         private YesNoType leftScrollField;
-        
+
         private bool leftScrollFieldSet;
-        
+
         private YesNoType transparentField;
-        
+
         private bool transparentFieldSet;
-        
+
         private YesNoType noPrefixField;
-        
+
         private bool noPrefixFieldSet;
-        
+
         private YesNoType noWrapField;
-        
+
         private bool noWrapFieldSet;
-        
+
         private YesNoType formatSizeField;
-        
+
         private bool formatSizeFieldSet;
-        
+
         private YesNoType userLanguageField;
-        
+
         private bool userLanguageFieldSet;
-        
+
         private YesNoType multilineField;
-        
+
         private bool multilineFieldSet;
-        
+
         private YesNoType passwordField;
-        
+
         private bool passwordFieldSet;
-        
+
         private YesNoType progressBlocksField;
-        
+
         private bool progressBlocksFieldSet;
-        
+
         private YesNoType removableField;
-        
+
         private bool removableFieldSet;
-        
+
         private YesNoType fixedField;
-        
+
         private bool fixedFieldSet;
-        
+
         private YesNoType remoteField;
-        
+
         private bool remoteFieldSet;
-        
+
         private YesNoType cDROMField;
-        
+
         private bool cDROMFieldSet;
-        
+
         private YesNoType rAMDiskField;
-        
+
         private bool rAMDiskFieldSet;
-        
+
         private YesNoType floppyField;
-        
+
         private bool floppyFieldSet;
-        
+
         private YesNoType showRollbackCostField;
-        
+
         private bool showRollbackCostFieldSet;
-        
+
         private YesNoType sortedField;
-        
+
         private bool sortedFieldSet;
-        
+
         private YesNoType comboListField;
-        
+
         private bool comboListFieldSet;
-        
+
         private YesNoType imageField;
-        
+
         private bool imageFieldSet;
-        
+
         private IconSizeType iconSizeField;
-        
+
         private bool iconSizeFieldSet;
-        
+
         private YesNoType fixedSizeField;
-        
+
         private bool fixedSizeFieldSet;
-        
+
         private YesNoType iconField;
-        
+
         private bool iconFieldSet;
-        
+
         private YesNoType bitmapField;
-        
+
         private bool bitmapFieldSet;
-        
+
         private YesNoType pushLikeField;
-        
+
         private bool pushLikeFieldSet;
-        
+
         private YesNoType hasBorderField;
-        
+
         private bool hasBorderFieldSet;
-        
+
         private YesNoType elevationShieldField;
-        
+
         private bool elevationShieldFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         public Control()
         {
             ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Sequence);
@@ -50290,7 +50290,7 @@ namespace WixToolset.Harvesters.Serialize
             childCollection0.AddCollection(childCollection1);
             this.children = childCollection0;
         }
-        
+
         public virtual IEnumerable Children
         {
             get
@@ -50298,7 +50298,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children;
             }
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")]
         public virtual IEnumerable this[System.Type childType]
         {
@@ -50307,7 +50307,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children.Filter(childType);
             }
         }
-        
+
         /// <summary>
         /// Combined with the Dialog Id to make up the primary key of the Control table.
         /// </summary>
@@ -50323,7 +50323,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         /// <summary>
         /// The type of the control. Could be one of the following: Billboard, Bitmap, CheckBox, ComboBox, DirectoryCombo, DirectoryList, Edit, GroupBox, Hyperlink, Icon, Line, ListBox, ListView, MaskedEdit, PathEdit, ProgressBar, PushButton, RadioButtonGroup, ScrollableText, SelectionTree, Text, VolumeCostList, VolumeSelectCombo
         /// </summary>
@@ -50339,7 +50339,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.typeField = value;
             }
         }
-        
+
         /// <summary>
         /// Horizontal coordinate of the upper-left corner of the rectangular boundary of the control. This must be a non-negative number.
         /// </summary>
@@ -50355,7 +50355,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.xField = value;
             }
         }
-        
+
         /// <summary>
         /// Vertical coordinate of the upper-left corner of the rectangular boundary of the control. This must be a non-negative number.
         /// </summary>
@@ -50371,7 +50371,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.yField = value;
             }
         }
-        
+
         /// <summary>
         /// Width of the rectangular boundary of the control. This must be a non-negative number.
         /// </summary>
@@ -50387,7 +50387,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.widthField = value;
             }
         }
-        
+
         /// <summary>
         /// Height of the rectangular boundary of the control. This must be a non-negative number.
         /// </summary>
@@ -50403,7 +50403,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.heightField = value;
             }
         }
-        
+
         /// <summary>
         /// The name of a defined property to be linked to this control. This column is required for active controls.
         /// </summary>
@@ -50419,7 +50419,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.propertyField = value;
             }
         }
-        
+
         /// <summary>
         /// A localizable string used to set the initial text contained in a control. This attribute can contain a formatted string that is processed at install time to insert the values of properties using [PropertyName] syntax. Also supported are environment variables, file installation paths, and component installation directories; see
         /// </summary>
@@ -50435,7 +50435,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.textField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute is reserved for future use. There is no need to use this until Windows Installer uses it for something.
         /// </summary>
@@ -50451,7 +50451,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.helpField = value;
             }
         }
-        
+
         /// <summary>
         /// The string used for the Tooltip.
         /// </summary>
@@ -50467,7 +50467,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.toolTipField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute is only valid for CheckBox Controls. When set, the linked Property will be set to this value when the check box is checked.
         /// </summary>
@@ -50483,7 +50483,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.checkBoxValueField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute is only valid for CheckBox controls. The value is the name of a Property that was already used as the Property for another CheckBox control. The Property attribute cannot be specified. The attribute exists to support multiple checkboxes on different dialogs being tied to the same property.
         /// </summary>
@@ -50499,7 +50499,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.checkBoxPropertyRefField = value;
             }
         }
-        
+
         /// <summary>
         /// Set this attribute to "yes" to cause this Control to be skipped in the tab sequence.
         /// </summary>
@@ -50515,7 +50515,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.tabSkipField = value;
             }
         }
-        
+
         /// <summary>
         /// Set this attribute to "yes" to cause this Control to be invoked by the return key.
         /// </summary>
@@ -50531,7 +50531,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.defaultField = value;
             }
         }
-        
+
         /// <summary>
         /// Set this attribute to "yes" to cause this Control to be invoked by the escape key.
         /// </summary>
@@ -50547,7 +50547,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.cancelField = value;
             }
         }
-        
+
         /// <summary>
         /// Set this attribute to "yes" to cause the Control to be hidden.
         /// </summary>
@@ -50563,7 +50563,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.hiddenField = value;
             }
         }
-        
+
         /// <summary>
         /// Set this attribute to "yes" to cause the Control to be disabled.
         /// </summary>
@@ -50579,7 +50579,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.disabledField = value;
             }
         }
-        
+
         /// <summary>
         /// Set this attribute to "yes" to cause the Control to be sunken.
         /// </summary>
@@ -50595,7 +50595,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.sunkenField = value;
             }
         }
-        
+
         /// <summary>
         /// Specifies whether the value displayed or changed by this control is referenced indirectly. If this bit is set, the control displays or changes the value of the property that has the identifier listed in the Property column of the Control table.
         /// </summary>
@@ -50611,7 +50611,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.indirectField = value;
             }
         }
-        
+
         /// <summary>
         /// Set this attribute to "yes" to cause the linked Property value for the Control to be treated as an integer. Otherwise, the Property will be treated as a string.
         /// </summary>
@@ -50627,7 +50627,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.integerField = value;
             }
         }
-        
+
         /// <summary>
         /// Set this attribute to "yes" to cause the Control to display from right to left.
         /// </summary>
@@ -50643,7 +50643,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.rightToLeftField = value;
             }
         }
-        
+
         /// <summary>
         /// Set this attribute to "yes" to cause the Control to be right aligned.
         /// </summary>
@@ -50659,7 +50659,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.rightAlignedField = value;
             }
         }
-        
+
         /// <summary>
         /// Set this attribute to "yes" to cause the scroll bar to display on the left side of the Control.
         /// </summary>
@@ -50675,7 +50675,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.leftScrollField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute is only valid for Text Controls.
         /// </summary>
@@ -50691,7 +50691,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.transparentField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute is only valid for Text Controls.
         /// </summary>
@@ -50707,7 +50707,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.noPrefixField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute is only valid for Text Controls.
         /// </summary>
@@ -50723,7 +50723,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.noWrapField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute is only valid for Text Controls.
         /// </summary>
@@ -50739,7 +50739,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.formatSizeField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute is only valid for Text Controls.
         /// </summary>
@@ -50755,7 +50755,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.userLanguageField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute is only valid for Edit Controls.
         /// </summary>
@@ -50771,7 +50771,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.multilineField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute is only valid for Edit Controls.
         /// </summary>
@@ -50787,7 +50787,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.passwordField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute is only valid for ProgressBar Controls.
         /// </summary>
@@ -50803,7 +50803,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.progressBlocksField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute is only valid for Volume and Directory Controls.
         /// </summary>
@@ -50819,7 +50819,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.removableField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute is only valid for Volume and Directory Controls.
         /// </summary>
@@ -50835,7 +50835,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.fixedField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute is only valid for Volume and Directory Controls.
         /// </summary>
@@ -50851,7 +50851,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.remoteField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute is only valid for Volume and Directory Controls.
         /// </summary>
@@ -50868,7 +50868,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.cDROMField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute is only valid for Volume and Directory Controls.
         /// </summary>
@@ -50885,7 +50885,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.rAMDiskField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute is only valid for Volume and Directory Controls.
         /// </summary>
@@ -50901,7 +50901,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.floppyField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute is only valid for VolumeCostList Controls.
         /// </summary>
@@ -50917,7 +50917,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.showRollbackCostField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute is only valid for ListBox, ListView, and ComboBox Controls. Set
         /// the value of this attribute to "yes" to have entries appear in the order specified under the Control.
@@ -50935,7 +50935,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.sortedField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute is only valid for ComboBox Controls.
         /// </summary>
@@ -50951,7 +50951,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.comboListField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute is only valid for RadioButton, PushButton, and Icon Controls.
         /// </summary>
@@ -50967,7 +50967,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.imageField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute is only valid for RadioButton, PushButton, and Icon Controls.
         /// </summary>
@@ -50983,7 +50983,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.iconSizeField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute is only valid for RadioButton, PushButton, and Icon Controls.
         /// </summary>
@@ -50999,7 +50999,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.fixedSizeField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute is only valid for RadioButton and PushButton Controls.
         /// </summary>
@@ -51015,7 +51015,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.iconField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute is only valid for RadioButton and PushButton Controls.
         /// </summary>
@@ -51031,7 +51031,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.bitmapField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute is only valid for RadioButton and Checkbox Controls.
         /// </summary>
@@ -51047,7 +51047,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.pushLikeField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute is only valid for RadioButton Controls.
         /// </summary>
@@ -51063,7 +51063,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.hasBorderField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute is only valid for PushButton controls.
         /// Set this attribute to "yes" to add the User Account Control (UAC) elevation icon (shield icon) to the PushButton control.
@@ -51085,7 +51085,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.elevationShieldField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -51097,7 +51097,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         public virtual void AddChild(ISchemaElement child)
         {
             if ((null == child))
@@ -51107,7 +51107,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.AddElement(child);
             child.ParentElement = this;
         }
-        
+
         public virtual void RemoveChild(ISchemaElement child)
         {
             if ((null == child))
@@ -51117,7 +51117,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.RemoveElement(child);
             child.ParentElement = null;
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         ISchemaElement ICreateChildren.CreateChild(string childName)
@@ -51173,7 +51173,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return childValue;
         }
-        
+
         /// <summary>
         /// Parses a IconSizeType from a string.
         /// </summary>
@@ -51183,7 +51183,7 @@ namespace WixToolset.Harvesters.Serialize
             Control.TryParseIconSizeType(value, out parsedValue);
             return parsedValue;
         }
-        
+
         /// <summary>
         /// Tries to parse a IconSizeType from a string.
         /// </summary>
@@ -51219,7 +51219,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return true;
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -51686,7 +51686,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         void ISetAttributes.SetAttribute(string name, string value)
@@ -51936,49 +51936,49 @@ namespace WixToolset.Harvesters.Serialize
                 this.elevationShieldFieldSet = true;
             }
         }
-        
+
         [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
         public enum IconSizeType
         {
-            
+
             IllegalValue = int.MaxValue,
-            
+
             NotSet = -1,
-            
+
             Item16,
-            
+
             Item32,
-            
+
             Item48,
         }
     }
-    
+
     /// <summary>
     /// Billboard to display during install of a Feature
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class Billboard : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes
     {
-        
+
         private ElementCollection children;
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private string featureField;
-        
+
         private bool featureFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         public Billboard()
         {
             ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Sequence);
             childCollection0.AddItem(new ElementCollection.SequenceItem(typeof(Control)));
             this.children = childCollection0;
         }
-        
+
         public virtual IEnumerable Children
         {
             get
@@ -51986,7 +51986,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children;
             }
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")]
         public virtual IEnumerable this[System.Type childType]
         {
@@ -51995,7 +51995,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children.Filter(childType);
             }
         }
-        
+
         /// <summary>
         /// Unique identifier for the Billboard.
         /// </summary>
@@ -52011,7 +52011,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         /// <summary>
         /// Feature whose state determines if the Billboard is shown.
         /// </summary>
@@ -52027,7 +52027,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.featureField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -52039,7 +52039,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         public virtual void AddChild(ISchemaElement child)
         {
             if ((null == child))
@@ -52049,7 +52049,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.AddElement(child);
             child.ParentElement = this;
         }
-        
+
         public virtual void RemoveChild(ISchemaElement child)
         {
             if ((null == child))
@@ -52059,7 +52059,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.RemoveElement(child);
             child.ParentElement = null;
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         ISchemaElement ICreateChildren.CreateChild(string childName)
         {
@@ -52078,7 +52078,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return childValue;
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -52104,7 +52104,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -52124,29 +52124,29 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Billboard action during which child Billboards are displayed
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class BillboardAction : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes
     {
-        
+
         private ElementCollection children;
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         public BillboardAction()
         {
             ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Sequence);
             childCollection0.AddItem(new ElementCollection.SequenceItem(typeof(Billboard)));
             this.children = childCollection0;
         }
-        
+
         public virtual IEnumerable Children
         {
             get
@@ -52154,7 +52154,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children;
             }
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")]
         public virtual IEnumerable this[System.Type childType]
         {
@@ -52163,7 +52163,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children.Filter(childType);
             }
         }
-        
+
         /// <summary>
         /// Action name that determines when the Billboard should be shown.
         /// </summary>
@@ -52179,7 +52179,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -52191,7 +52191,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         public virtual void AddChild(ISchemaElement child)
         {
             if ((null == child))
@@ -52201,7 +52201,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.AddElement(child);
             child.ParentElement = this;
         }
-        
+
         public virtual void RemoveChild(ISchemaElement child)
         {
             if ((null == child))
@@ -52211,7 +52211,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.RemoveElement(child);
             child.ParentElement = null;
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         ISchemaElement ICreateChildren.CreateChild(string childName)
         {
@@ -52230,7 +52230,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return childValue;
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -52252,7 +52252,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -52267,93 +52267,93 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Defines a dialog box in the Dialog Table.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class Dialog : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes
     {
-        
+
         private ElementCollection children;
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private int xField;
-        
+
         private bool xFieldSet;
-        
+
         private int yField;
-        
+
         private bool yFieldSet;
-        
+
         private int widthField;
-        
+
         private bool widthFieldSet;
-        
+
         private int heightField;
-        
+
         private bool heightFieldSet;
-        
+
         private string titleField;
-        
+
         private bool titleFieldSet;
-        
+
         private YesNoType hiddenField;
-        
+
         private bool hiddenFieldSet;
-        
+
         private YesNoType modelessField;
-        
+
         private bool modelessFieldSet;
-        
+
         private YesNoType noMinimizeField;
-        
+
         private bool noMinimizeFieldSet;
-        
+
         private YesNoType systemModalField;
-        
+
         private bool systemModalFieldSet;
-        
+
         private YesNoType keepModelessField;
-        
+
         private bool keepModelessFieldSet;
-        
+
         private YesNoType trackDiskSpaceField;
-        
+
         private bool trackDiskSpaceFieldSet;
-        
+
         private YesNoType customPaletteField;
-        
+
         private bool customPaletteFieldSet;
-        
+
         private YesNoType rightToLeftField;
-        
+
         private bool rightToLeftFieldSet;
-        
+
         private YesNoType rightAlignedField;
-        
+
         private bool rightAlignedFieldSet;
-        
+
         private YesNoType leftScrollField;
-        
+
         private bool leftScrollFieldSet;
-        
+
         private YesNoType errorDialogField;
-        
+
         private bool errorDialogFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         public Dialog()
         {
             ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Sequence);
             childCollection0.AddItem(new ElementCollection.SequenceItem(typeof(Control)));
             this.children = childCollection0;
         }
-        
+
         public virtual IEnumerable Children
         {
             get
@@ -52361,7 +52361,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children;
             }
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")]
         public virtual IEnumerable this[System.Type childType]
         {
@@ -52370,7 +52370,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children.Filter(childType);
             }
         }
-        
+
         /// <summary>
         /// Unique identifier for the dialog.
         /// </summary>
@@ -52386,7 +52386,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         /// <summary>
         /// Horizontal placement of the dialog box as a percentage of screen width. The default value is 50.
         /// </summary>
@@ -52402,7 +52402,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.xField = value;
             }
         }
-        
+
         /// <summary>
         /// Vertical placement of the dialog box as a percentage of screen height. The default value is 50.
         /// </summary>
@@ -52418,7 +52418,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.yField = value;
             }
         }
-        
+
         /// <summary>
         /// The width of the dialog box in dialog units.
         /// </summary>
@@ -52434,7 +52434,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.widthField = value;
             }
         }
-        
+
         /// <summary>
         /// The height of the dialog box in dialog units.
         /// </summary>
@@ -52450,7 +52450,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.heightField = value;
             }
         }
-        
+
         /// <summary>
         /// The title of the dialog box.
         /// </summary>
@@ -52466,7 +52466,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.titleField = value;
             }
         }
-        
+
         /// <summary>
         /// Used to hide the dialog.
         /// </summary>
@@ -52482,7 +52482,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.hiddenField = value;
             }
         }
-        
+
         /// <summary>
         /// Used to set the dialog as modeless.
         /// </summary>
@@ -52498,7 +52498,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.modelessField = value;
             }
         }
-        
+
         /// <summary>
         /// Used to specify if the dialog can be minimized.
         /// </summary>
@@ -52514,7 +52514,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.noMinimizeField = value;
             }
         }
-        
+
         /// <summary>
         /// Used to set the dialog as system modal.
         /// </summary>
@@ -52530,7 +52530,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.systemModalField = value;
             }
         }
-        
+
         /// <summary>
         /// Keep modeless dialogs alive when this dialog is created through DoAction.
         /// </summary>
@@ -52546,7 +52546,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.keepModelessField = value;
             }
         }
-        
+
         /// <summary>
         /// Have the dialog periodically call the installer to check if available disk space has changed.
         /// </summary>
@@ -52562,7 +52562,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.trackDiskSpaceField = value;
             }
         }
-        
+
         /// <summary>
         /// Used to specify if pictures in the dialog box are rendered with a custom palette.
         /// </summary>
@@ -52578,7 +52578,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.customPaletteField = value;
             }
         }
-        
+
         /// <summary>
         /// Used to specify if the text in the dialog should be displayed in right to left reading order.
         /// </summary>
@@ -52594,7 +52594,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.rightToLeftField = value;
             }
         }
-        
+
         /// <summary>
         /// Align text on the right.
         /// </summary>
@@ -52610,7 +52610,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.rightAlignedField = value;
             }
         }
-        
+
         /// <summary>
         /// Used to align the scroll bar on the left.
         /// </summary>
@@ -52626,7 +52626,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.leftScrollField = value;
             }
         }
-        
+
         /// <summary>
         /// Specifies this dialog as an error dialog.
         /// </summary>
@@ -52642,7 +52642,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.errorDialogField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -52654,7 +52654,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         public virtual void AddChild(ISchemaElement child)
         {
             if ((null == child))
@@ -52664,7 +52664,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.AddElement(child);
             child.ParentElement = this;
         }
-        
+
         public virtual void RemoveChild(ISchemaElement child)
         {
             if ((null == child))
@@ -52674,7 +52674,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.RemoveElement(child);
             child.ParentElement = null;
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         ISchemaElement ICreateChildren.CreateChild(string childName)
         {
@@ -52693,7 +52693,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return childValue;
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -52857,7 +52857,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         void ISetAttributes.SetAttribute(string name, string value)
@@ -52953,7 +52953,7 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Reference to a Dialog.  This will cause the entire referenced section's contents
     /// to be included in the installer database.
@@ -52961,13 +52961,13 @@ namespace WixToolset.Harvesters.Serialize
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class DialogRef : ISchemaElement, ISetAttributes
     {
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         /// <summary>
         /// The identifier of the Dialog to reference.
         /// </summary>
@@ -52983,7 +52983,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -52995,7 +52995,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -53012,7 +53012,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -53027,25 +53027,25 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class ProgressText : ISchemaElement, ISetAttributes
     {
-        
+
         private string actionField;
-        
+
         private bool actionFieldSet;
-        
+
         private string templateField;
-        
+
         private bool templateFieldSet;
-        
+
         private string contentField;
-        
+
         private bool contentFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         public string Action
         {
             get
@@ -53058,7 +53058,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.actionField = value;
             }
         }
-        
+
         /// <summary>
         /// used to format ActionData messages from action processing
         /// </summary>
@@ -53074,7 +53074,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.templateField = value;
             }
         }
-        
+
         /// <summary>
         /// Element value is progress message text for action
         /// </summary>
@@ -53090,7 +53090,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.contentField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -53102,7 +53102,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -53127,7 +53127,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -53152,53 +53152,53 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class TextStyle : ISchemaElement, ISetAttributes
     {
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private string faceNameField;
-        
+
         private bool faceNameFieldSet;
-        
+
         private string sizeField;
-        
+
         private bool sizeFieldSet;
-        
+
         private int redField;
-        
+
         private bool redFieldSet;
-        
+
         private int greenField;
-        
+
         private bool greenFieldSet;
-        
+
         private int blueField;
-        
+
         private bool blueFieldSet;
-        
+
         private YesNoType boldField;
-        
+
         private bool boldFieldSet;
-        
+
         private YesNoType italicField;
-        
+
         private bool italicFieldSet;
-        
+
         private YesNoType underlineField;
-        
+
         private bool underlineFieldSet;
-        
+
         private YesNoType strikeField;
-        
+
         private bool strikeFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         public string Id
         {
             get
@@ -53211,7 +53211,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         public string FaceName
         {
             get
@@ -53224,7 +53224,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.faceNameField = value;
             }
         }
-        
+
         public string Size
         {
             get
@@ -53237,7 +53237,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.sizeField = value;
             }
         }
-        
+
         /// <summary>
         /// 0 to 255
         /// </summary>
@@ -53253,7 +53253,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.redField = value;
             }
         }
-        
+
         /// <summary>
         /// 0 to 255
         /// </summary>
@@ -53269,7 +53269,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.greenField = value;
             }
         }
-        
+
         /// <summary>
         /// 0 to 255
         /// </summary>
@@ -53285,7 +53285,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.blueField = value;
             }
         }
-        
+
         public YesNoType Bold
         {
             get
@@ -53298,7 +53298,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.boldField = value;
             }
         }
-        
+
         public YesNoType Italic
         {
             get
@@ -53311,7 +53311,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.italicField = value;
             }
         }
-        
+
         public YesNoType Underline
         {
             get
@@ -53324,7 +53324,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.underlineField = value;
             }
         }
-        
+
         public YesNoType Strike
         {
             get
@@ -53337,7 +53337,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.strikeField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -53349,7 +53349,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -53431,7 +53431,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         void ISetAttributes.SetAttribute(string name, string value)
@@ -53492,28 +53492,28 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// The value (and optional text) associated with an item in a ComboBox, ListBox, or ListView.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class ListItem : ISchemaElement, ISetAttributes
     {
-        
+
         private string valueField;
-        
+
         private bool valueFieldSet;
-        
+
         private string textField;
-        
+
         private bool textFieldSet;
-        
+
         private string iconField;
-        
+
         private bool iconFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         /// <summary>
         /// The value assigned to the associated ComboBox, ListBox, or ListView property if this item is selected.
         /// </summary>
@@ -53529,7 +53529,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.valueField = value;
             }
         }
-        
+
         /// <summary>
         /// The localizable, visible text to be assigned to the item.
         /// If not specified, this will default to the value of the Value attribute.
@@ -53546,7 +53546,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.textField = value;
             }
         }
-        
+
         /// <summary>
         /// The identifier of the Binary (not Icon) element containing the icon to associate with this item.
         /// This value is only valid when nested under a ListView element.
@@ -53563,7 +53563,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.iconField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -53575,7 +53575,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -53600,7 +53600,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -53625,29 +53625,29 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Set of items for a particular ListBox control tied to an install Property
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class ListBox : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes
     {
-        
+
         private ElementCollection children;
-        
+
         private string propertyField;
-        
+
         private bool propertyFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         public ListBox()
         {
             ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Sequence);
             childCollection0.AddItem(new ElementCollection.SequenceItem(typeof(ListItem)));
             this.children = childCollection0;
         }
-        
+
         public virtual IEnumerable Children
         {
             get
@@ -53655,7 +53655,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children;
             }
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")]
         public virtual IEnumerable this[System.Type childType]
         {
@@ -53664,7 +53664,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children.Filter(childType);
             }
         }
-        
+
         /// <summary>
         /// Property tied to this group
         /// </summary>
@@ -53680,7 +53680,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.propertyField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -53692,7 +53692,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         public virtual void AddChild(ISchemaElement child)
         {
             if ((null == child))
@@ -53702,7 +53702,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.AddElement(child);
             child.ParentElement = this;
         }
-        
+
         public virtual void RemoveChild(ISchemaElement child)
         {
             if ((null == child))
@@ -53712,7 +53712,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.RemoveElement(child);
             child.ParentElement = null;
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         ISchemaElement ICreateChildren.CreateChild(string childName)
         {
@@ -53731,7 +53731,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return childValue;
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -53753,7 +53753,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -53768,29 +53768,29 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Set of items for a particular ComboBox control tied to an install Property
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class ComboBox : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes
     {
-        
+
         private ElementCollection children;
-        
+
         private string propertyField;
-        
+
         private bool propertyFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         public ComboBox()
         {
             ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Sequence);
             childCollection0.AddItem(new ElementCollection.SequenceItem(typeof(ListItem)));
             this.children = childCollection0;
         }
-        
+
         public virtual IEnumerable Children
         {
             get
@@ -53798,7 +53798,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children;
             }
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")]
         public virtual IEnumerable this[System.Type childType]
         {
@@ -53807,7 +53807,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children.Filter(childType);
             }
         }
-        
+
         /// <summary>
         /// Property tied to this group
         /// </summary>
@@ -53823,7 +53823,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.propertyField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -53835,7 +53835,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         public virtual void AddChild(ISchemaElement child)
         {
             if ((null == child))
@@ -53845,7 +53845,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.AddElement(child);
             child.ParentElement = this;
         }
-        
+
         public virtual void RemoveChild(ISchemaElement child)
         {
             if ((null == child))
@@ -53855,7 +53855,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.RemoveElement(child);
             child.ParentElement = null;
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         ISchemaElement ICreateChildren.CreateChild(string childName)
         {
@@ -53874,7 +53874,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return childValue;
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -53896,7 +53896,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -53911,29 +53911,29 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Set of items for a particular ListView control tied to an install Property
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class ListView : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes
     {
-        
+
         private ElementCollection children;
-        
+
         private string propertyField;
-        
+
         private bool propertyFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         public ListView()
         {
             ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Sequence);
             childCollection0.AddItem(new ElementCollection.SequenceItem(typeof(ListItem)));
             this.children = childCollection0;
         }
-        
+
         public virtual IEnumerable Children
         {
             get
@@ -53941,7 +53941,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children;
             }
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")]
         public virtual IEnumerable this[System.Type childType]
         {
@@ -53950,7 +53950,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children.Filter(childType);
             }
         }
-        
+
         /// <summary>
         /// Property tied to this group
         /// </summary>
@@ -53966,7 +53966,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.propertyField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -53978,7 +53978,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         public virtual void AddChild(ISchemaElement child)
         {
             if ((null == child))
@@ -53988,7 +53988,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.AddElement(child);
             child.ParentElement = this;
         }
-        
+
         public virtual void RemoveChild(ISchemaElement child)
         {
             if ((null == child))
@@ -53998,7 +53998,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.RemoveElement(child);
             child.ParentElement = null;
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         ISchemaElement ICreateChildren.CreateChild(string childName)
         {
@@ -54017,7 +54017,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return childValue;
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -54039,7 +54039,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -54054,56 +54054,56 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Text or Icon plus Value that is assigned to the Property of the parent Control (RadioButtonGroup).
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class RadioButton : ISchemaElement, ISetAttributes
     {
-        
+
         private string bitmapField;
-        
+
         private bool bitmapFieldSet;
-        
+
         private string heightField;
-        
+
         private bool heightFieldSet;
-        
+
         private string helpField;
-        
+
         private bool helpFieldSet;
-        
+
         private string iconField;
-        
+
         private bool iconFieldSet;
-        
+
         private string textField;
-        
+
         private bool textFieldSet;
-        
+
         private string toolTipField;
-        
+
         private bool toolTipFieldSet;
-        
+
         private string valueField;
-        
+
         private bool valueFieldSet;
-        
+
         private string widthField;
-        
+
         private bool widthFieldSet;
-        
+
         private string xField;
-        
+
         private bool xFieldSet;
-        
+
         private string yField;
-        
+
         private bool yFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         /// <summary>
         /// This attribute defines the bitmap displayed with the radio button.  The value of the attribute creates a reference
         /// to a Binary element that represents the bitmap.  This attribute is mutually exclusive with the Icon and Text
@@ -54121,7 +54121,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.bitmapField = value;
             }
         }
-        
+
         public string Height
         {
             get
@@ -54134,7 +54134,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.heightField = value;
             }
         }
-        
+
         public string Help
         {
             get
@@ -54147,7 +54147,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.helpField = value;
             }
         }
-        
+
         /// <summary>
         /// This attribute defines the icon displayed with the radio button.  The value of the attribute creates a reference
         /// to a Binary element that represents the icon.  This attribute is mutually exclusive with the Bitmap and Text
@@ -54165,7 +54165,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.iconField = value;
             }
         }
-        
+
         /// <summary>
         /// Text displayed with the radio button.  This attribute is mutually exclusive with the Bitmap and Icon attributes.
         /// </summary>
@@ -54181,7 +54181,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.textField = value;
             }
         }
-        
+
         public string ToolTip
         {
             get
@@ -54194,7 +54194,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.toolTipField = value;
             }
         }
-        
+
         /// <summary>
         /// Value assigned to the associated control Property when this radio button is selected.
         /// </summary>
@@ -54210,7 +54210,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.valueField = value;
             }
         }
-        
+
         public string Width
         {
             get
@@ -54223,7 +54223,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.widthField = value;
             }
         }
-        
+
         public string X
         {
             get
@@ -54236,7 +54236,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.xField = value;
             }
         }
-        
+
         public string Y
         {
             get
@@ -54249,7 +54249,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.yField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -54261,7 +54261,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -54315,7 +54315,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         void ISetAttributes.SetAttribute(string name, string value)
@@ -54376,29 +54376,29 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Set of radio buttons tied to the specified Property
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class RadioButtonGroup : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes
     {
-        
+
         private ElementCollection children;
-        
+
         private string propertyField;
-        
+
         private bool propertyFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         public RadioButtonGroup()
         {
             ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Sequence);
             childCollection0.AddItem(new ElementCollection.SequenceItem(typeof(RadioButton)));
             this.children = childCollection0;
         }
-        
+
         public virtual IEnumerable Children
         {
             get
@@ -54406,7 +54406,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children;
             }
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")]
         public virtual IEnumerable this[System.Type childType]
         {
@@ -54415,7 +54415,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children.Filter(childType);
             }
         }
-        
+
         /// <summary>
         /// Property tied to this group.
         /// </summary>
@@ -54431,7 +54431,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.propertyField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -54443,7 +54443,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         public virtual void AddChild(ISchemaElement child)
         {
             if ((null == child))
@@ -54453,7 +54453,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.AddElement(child);
             child.ParentElement = this;
         }
-        
+
         public virtual void RemoveChild(ISchemaElement child)
         {
             if ((null == child))
@@ -54463,7 +54463,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.RemoveElement(child);
             child.ParentElement = null;
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         ISchemaElement ICreateChildren.CreateChild(string childName)
         {
@@ -54482,7 +54482,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return childValue;
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -54504,7 +54504,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -54519,24 +54519,24 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Text associated with certain controls
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class UIText : ISchemaElement, ISetAttributes
     {
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private string contentField;
-        
+
         private bool contentFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         public string Id
         {
             get
@@ -54549,7 +54549,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         /// <summary>
         /// Element value is text, may use CDATA if needed to escape XML delimiters
         /// </summary>
@@ -54565,7 +54565,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.contentField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -54577,7 +54577,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -54598,7 +54598,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -54618,7 +54618,7 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Reference to a UI element.  This will force the entire referenced Fragment's contents
     /// to be included in the installer database.
@@ -54626,13 +54626,13 @@ namespace WixToolset.Harvesters.Serialize
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class UIRef : ISchemaElement, ISetAttributes
     {
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         public string Id
         {
             get
@@ -54645,7 +54645,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -54657,7 +54657,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -54674,7 +54674,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -54689,22 +54689,22 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Enclosing element to compartmentalize UI specifications.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class UI : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes
     {
-        
+
         private ElementCollection children;
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         public UI()
         {
             ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Choice);
@@ -54731,7 +54731,7 @@ namespace WixToolset.Harvesters.Serialize
             childCollection0.AddItem(new ElementCollection.ChoiceItem(typeof(UIRef)));
             this.children = childCollection0;
         }
-        
+
         public virtual IEnumerable Children
         {
             get
@@ -54739,7 +54739,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children;
             }
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")]
         public virtual IEnumerable this[System.Type childType]
         {
@@ -54748,7 +54748,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children.Filter(childType);
             }
         }
-        
+
         public string Id
         {
             get
@@ -54761,7 +54761,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -54773,7 +54773,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         public virtual void AddChild(ISchemaElement child)
         {
             if ((null == child))
@@ -54783,7 +54783,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.AddElement(child);
             child.ParentElement = this;
         }
-        
+
         public virtual void RemoveChild(ISchemaElement child)
         {
             if ((null == child))
@@ -54793,7 +54793,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.RemoveElement(child);
             child.ParentElement = null;
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         ISchemaElement ICreateChildren.CreateChild(string childName)
@@ -54885,7 +54885,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return childValue;
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -54907,7 +54907,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -54922,26 +54922,26 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Defines a custom table for use from a custom action.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class CustomTable : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes
     {
-        
+
         private ElementCollection children;
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private YesNoType bootstrapperApplicationDataField;
-        
+
         private bool bootstrapperApplicationDataFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         public CustomTable()
         {
             ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Sequence);
@@ -54949,7 +54949,7 @@ namespace WixToolset.Harvesters.Serialize
             childCollection0.AddItem(new ElementCollection.SequenceItem(typeof(Row)));
             this.children = childCollection0;
         }
-        
+
         public virtual IEnumerable Children
         {
             get
@@ -54957,7 +54957,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children;
             }
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")]
         public virtual IEnumerable this[System.Type childType]
         {
@@ -54966,7 +54966,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children.Filter(childType);
             }
         }
-        
+
         /// <summary>
         /// Identifier for the custom table.
         /// </summary>
@@ -54982,7 +54982,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         /// <summary>
         /// Indicates the table data is transformed into the bootstrapper application data manifest.
         /// </summary>
@@ -54998,7 +54998,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.bootstrapperApplicationDataField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -55010,7 +55010,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         public virtual void AddChild(ISchemaElement child)
         {
             if ((null == child))
@@ -55020,7 +55020,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.AddElement(child);
             child.ParentElement = this;
         }
-        
+
         public virtual void RemoveChild(ISchemaElement child)
         {
             if ((null == child))
@@ -55030,7 +55030,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.RemoveElement(child);
             child.ParentElement = null;
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         ISchemaElement ICreateChildren.CreateChild(string childName)
         {
@@ -55053,7 +55053,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return childValue;
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -55086,7 +55086,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -55106,72 +55106,72 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Column definition for a Custom Table
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class Column : ISchemaElement, ISetAttributes
     {
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private YesNoType primaryKeyField;
-        
+
         private bool primaryKeyFieldSet;
-        
+
         private TypeType typeField;
-        
+
         private bool typeFieldSet;
-        
+
         private int widthField;
-        
+
         private bool widthFieldSet;
-        
+
         private YesNoType nullableField;
-        
+
         private bool nullableFieldSet;
-        
+
         private YesNoType localizableField;
-        
+
         private bool localizableFieldSet;
-        
+
         private long minValueField;
-        
+
         private bool minValueFieldSet;
-        
+
         private long maxValueField;
-        
+
         private bool maxValueFieldSet;
-        
+
         private string keyTableField;
-        
+
         private bool keyTableFieldSet;
-        
+
         private int keyColumnField;
-        
+
         private bool keyColumnFieldSet;
-        
+
         private CategoryType categoryField;
-        
+
         private bool categoryFieldSet;
-        
+
         private string setField;
-        
+
         private bool setFieldSet;
-        
+
         private string descriptionField;
-        
+
         private bool descriptionFieldSet;
-        
+
         private ModularizeType modularizeField;
-        
+
         private bool modularizeFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         /// <summary>
         /// Identifier for the column.
         /// </summary>
@@ -55187,7 +55187,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         /// <summary>
         /// Whether this column is a primary key.
         /// </summary>
@@ -55203,7 +55203,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.primaryKeyField = value;
             }
         }
-        
+
         /// <summary>
         /// The type of this column.
         /// </summary>
@@ -55219,7 +55219,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.typeField = value;
             }
         }
-        
+
         /// <summary>
         /// Width of this column.
         /// </summary>
@@ -55235,7 +55235,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.widthField = value;
             }
         }
-        
+
         /// <summary>
         /// Whether this column can be left null.
         /// </summary>
@@ -55251,7 +55251,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.nullableField = value;
             }
         }
-        
+
         /// <summary>
         /// Whether this column can be localized.
         /// </summary>
@@ -55267,7 +55267,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.localizableField = value;
             }
         }
-        
+
         /// <summary>
         /// Minimum value for a numeric value, date or version in this column.
         /// </summary>
@@ -55283,7 +55283,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.minValueField = value;
             }
         }
-        
+
         /// <summary>
         /// Maximum value for a numeric value, date or version in this column.
         /// </summary>
@@ -55299,7 +55299,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.maxValueField = value;
             }
         }
-        
+
         /// <summary>
         /// Table in which this column is an external key. Can be semicolon delimited.
         /// </summary>
@@ -55315,7 +55315,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.keyTableField = value;
             }
         }
-        
+
         /// <summary>
         /// Column in the table in KeyTable attribute.
         /// </summary>
@@ -55331,7 +55331,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.keyColumnField = value;
             }
         }
-        
+
         /// <summary>
         /// Category of this column.
         /// This attribute must be specified with a value of 'Binary' if the Type attribute's value is 'binary'.
@@ -55348,7 +55348,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.categoryField = value;
             }
         }
-        
+
         /// <summary>
         /// Semicolon delimited list of permissible values.
         /// </summary>
@@ -55364,7 +55364,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.setField = value;
             }
         }
-        
+
         /// <summary>
         /// Description of this column.
         /// </summary>
@@ -55380,7 +55380,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.descriptionField = value;
             }
         }
-        
+
         /// <summary>
         /// How this column should be modularized, if at all.
         /// </summary>
@@ -55396,7 +55396,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.modularizeField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -55408,7 +55408,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Parses a TypeType from a string.
         /// </summary>
@@ -55418,7 +55418,7 @@ namespace WixToolset.Harvesters.Serialize
             Column.TryParseTypeType(value, out parsedValue);
             return parsedValue;
         }
-        
+
         /// <summary>
         /// Tries to parse a TypeType from a string.
         /// </summary>
@@ -55454,7 +55454,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return true;
         }
-        
+
         /// <summary>
         /// Parses a CategoryType from a string.
         /// </summary>
@@ -55464,7 +55464,7 @@ namespace WixToolset.Harvesters.Serialize
             Column.TryParseCategoryType(value, out parsedValue);
             return parsedValue;
         }
-        
+
         /// <summary>
         /// Tries to parse a CategoryType from a string.
         /// </summary>
@@ -55661,7 +55661,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return true;
         }
-        
+
         /// <summary>
         /// Parses a ModularizeType from a string.
         /// </summary>
@@ -55671,7 +55671,7 @@ namespace WixToolset.Harvesters.Serialize
             Column.TryParseModularizeType(value, out parsedValue);
             return parsedValue;
         }
-        
+
         /// <summary>
         /// Tries to parse a ModularizeType from a string.
         /// </summary>
@@ -55728,7 +55728,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return true;
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -55956,7 +55956,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         void ISetAttributes.SetAttribute(string name, string value)
@@ -56036,151 +56036,151 @@ namespace WixToolset.Harvesters.Serialize
                 this.modularizeFieldSet = true;
             }
         }
-        
+
         [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
         public enum TypeType
         {
-            
+
             IllegalValue = int.MaxValue,
-            
+
             NotSet = -1,
-            
+
             /// <summary>
             /// Column contains a path to a file that will be inserted into the column as a binary object.
             /// If this value is set, the Category attribute must also be set with a value of 'Binary' to pass ICE validation.
             /// </summary>
             binary,
-            
+
             /// <summary>
             /// Column contains an integer or datetime value (the MinValue and MaxValue attributes should also be set).
             /// </summary>
             @int,
-            
+
             /// <summary>
             /// Column contains a non-localizable string value.
             /// </summary>
             @string,
         }
-        
+
         [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
         public enum CategoryType
         {
-            
+
             IllegalValue = int.MaxValue,
-            
+
             NotSet = -1,
-            
+
             text,
-            
+
             upperCase,
-            
+
             lowerCase,
-            
+
             integer,
-            
+
             doubleInteger,
-            
+
             timeDate,
-            
+
             identifier,
-            
+
             property,
-            
+
             filename,
-            
+
             wildCardFilename,
-            
+
             path,
-            
+
             paths,
-            
+
             anyPath,
-            
+
             defaultDir,
-            
+
             regPath,
-            
+
             formatted,
-            
+
             formattedSddl,
-            
+
             template,
-            
+
             condition,
-            
+
             guid,
-            
+
             version,
-            
+
             language,
-            
+
             binary,
-            
+
             customSource,
-            
+
             cabinet,
-            
+
             shortcut,
         }
-        
+
         [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
         public enum ModularizeType
         {
-            
+
             IllegalValue = int.MaxValue,
-            
+
             NotSet = -1,
-            
+
             /// <summary>
             /// Column should not be modularized.  This is the default value.
             /// </summary>
             None,
-            
+
             /// <summary>
             /// Column should be modularized.
             /// </summary>
             Column,
-            
+
             /// <summary>
             /// Column is a condition and should be modularized.
             /// </summary>
             Condition,
-            
+
             /// <summary>
             /// When the column is an primary or foreign key to the Icon table it should be modularized special.
             /// </summary>
             Icon,
-            
+
             /// <summary>
             /// Any Properties in the column should be modularized.
             /// </summary>
             Property,
-            
+
             /// <summary>
             /// Semi-colon list of keys, all of which need to be modularized.
             /// </summary>
             SemicolonDelimited,
         }
     }
-    
+
     /// <summary>
     /// Row data for a Custom Table
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class Row : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes
     {
-        
+
         private ElementCollection children;
-        
+
         private ISchemaElement parentElement;
-        
+
         public Row()
         {
             ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Sequence);
             childCollection0.AddItem(new ElementCollection.SequenceItem(typeof(Data)));
             this.children = childCollection0;
         }
-        
+
         public virtual IEnumerable Children
         {
             get
@@ -56188,7 +56188,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children;
             }
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")]
         public virtual IEnumerable this[System.Type childType]
         {
@@ -56197,7 +56197,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children.Filter(childType);
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -56209,7 +56209,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         public virtual void AddChild(ISchemaElement child)
         {
             if ((null == child))
@@ -56219,7 +56219,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.AddElement(child);
             child.ParentElement = this;
         }
-        
+
         public virtual void RemoveChild(ISchemaElement child)
         {
             if ((null == child))
@@ -56229,7 +56229,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.RemoveElement(child);
             child.ParentElement = null;
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         ISchemaElement ICreateChildren.CreateChild(string childName)
         {
@@ -56248,7 +56248,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return childValue;
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -56266,7 +56266,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -56276,24 +56276,24 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Used for a Custom Table. Specifies the data for the parent Row and specified Column.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class Data : ISchemaElement, ISetAttributes
     {
-        
+
         private string columnField;
-        
+
         private bool columnFieldSet;
-        
+
         private string contentField;
-        
+
         private bool contentFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         /// <summary>
         /// Specifies in which column to insert this data.
         /// </summary>
@@ -56309,7 +56309,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.columnField = value;
             }
         }
-        
+
         /// <summary>
         /// A data value
         /// </summary>
@@ -56325,7 +56325,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.contentField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -56337,7 +56337,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -56358,7 +56358,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -56378,20 +56378,20 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Use this element to ensure that a table appears in the installer database, even if its empty.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class EnsureTable : ISchemaElement, ISetAttributes
     {
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         /// <summary>
         /// The name of the table.
         /// </summary>
@@ -56407,7 +56407,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -56419,7 +56419,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -56436,7 +56436,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -56451,7 +56451,7 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// This element exposes advanced WiX functionality.  Use this element to declare WiX variables
     /// from directly within your authoring.  WiX variables are not resolved until the final msi/msm/pcp
@@ -56461,21 +56461,21 @@ namespace WixToolset.Harvesters.Serialize
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class WixVariable : ISchemaElement, ISetAttributes
     {
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private YesNoType overridableField;
-        
+
         private bool overridableFieldSet;
-        
+
         private string valueField;
-        
+
         private bool valueFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         /// <summary>
         /// The name of the variable.
         /// </summary>
@@ -56491,7 +56491,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         /// <summary>
         /// Set this value to 'yes' in order to make the variable's value overridable either by
         /// another WixVariable entry or via the command-line option -d&lt;name&gt;=&lt;value&gt;
@@ -56511,7 +56511,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.overridableField = value;
             }
         }
-        
+
         /// <summary>
         /// The value of the variable.  The value cannot be an empty string because that would
         /// make it possible to accidentally set a column to null.
@@ -56528,7 +56528,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.valueField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -56540,7 +56540,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -56572,7 +56572,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -56597,29 +56597,29 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Use this element to contain definitions for instance transforms.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class InstanceTransforms : IParentElement, ICreateChildren, ISchemaElement, ISetAttributes
     {
-        
+
         private ElementCollection children;
-        
+
         private string propertyField;
-        
+
         private bool propertyFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         public InstanceTransforms()
         {
             ElementCollection childCollection0 = new ElementCollection(ElementCollection.CollectionType.Choice);
             childCollection0.AddItem(new ElementCollection.ChoiceItem(typeof(Instance)));
             this.children = childCollection0;
         }
-        
+
         public virtual IEnumerable Children
         {
             get
@@ -56627,7 +56627,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children;
             }
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers")]
         public virtual IEnumerable this[System.Type childType]
         {
@@ -56636,7 +56636,7 @@ namespace WixToolset.Harvesters.Serialize
                 return this.children.Filter(childType);
             }
         }
-        
+
         /// <summary>
         /// The Id of the Property who's value should change for each instance.
         /// </summary>
@@ -56652,7 +56652,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.propertyField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -56664,7 +56664,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         public virtual void AddChild(ISchemaElement child)
         {
             if ((null == child))
@@ -56674,7 +56674,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.AddElement(child);
             child.ParentElement = this;
         }
-        
+
         public virtual void RemoveChild(ISchemaElement child)
         {
             if ((null == child))
@@ -56684,7 +56684,7 @@ namespace WixToolset.Harvesters.Serialize
             this.children.RemoveElement(child);
             child.ParentElement = null;
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         ISchemaElement ICreateChildren.CreateChild(string childName)
         {
@@ -56703,7 +56703,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return childValue;
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -56725,7 +56725,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -56740,32 +56740,32 @@ namespace WixToolset.Harvesters.Serialize
             }
         }
     }
-    
+
     /// <summary>
     /// Defines an instance transform for your product.
     /// </summary>
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class Instance : ISchemaElement, ISetAttributes
     {
-        
+
         private string idField;
-        
+
         private bool idFieldSet;
-        
+
         private string productCodeField;
-        
+
         private bool productCodeFieldSet;
-        
+
         private string productNameField;
-        
+
         private bool productNameFieldSet;
-        
+
         private string upgradeCodeField;
-        
+
         private bool upgradeCodeFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         /// <summary>
         /// The identity of the instance transform. This value will define the name by which the instance
         /// should be referred to on the command line. In addition, the value of the this attribute will
@@ -56784,7 +56784,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.idField = value;
             }
         }
-        
+
         /// <summary>
         /// The ProductCode for this instance.
         /// </summary>
@@ -56800,7 +56800,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.productCodeField = value;
             }
         }
-        
+
         /// <summary>
         /// The ProductName for this instance.
         /// </summary>
@@ -56816,7 +56816,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.productNameField = value;
             }
         }
-        
+
         /// <summary>
         /// The UpgradeCode for this instance.
         /// </summary>
@@ -56832,7 +56832,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.upgradeCodeField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -56844,7 +56844,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -56873,7 +56873,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         void ISetAttributes.SetAttribute(string name, string value)
         {
@@ -56906,9 +56906,9 @@ namespace WixToolset.Harvesters.Serialize
 
     /// <summary>
     /// Simplifies authoring for major upgrades, including support for preventing downgrades.
-    /// 
+    ///
     /// The parent Package element must have valid UpgradeCode and Version attributes.
-    /// 
+    ///
     /// When the FindRelatedProducts action detects a related product installed on the system,
     /// it appends the product code to the property named WIX_UPGRADE_DETECTED. After the
     /// FindRelatedProducts action is run, the value of the WIX_UPGRADE_DETECTED property is a
@@ -56917,54 +56917,54 @@ namespace WixToolset.Harvesters.Serialize
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class MajorUpgrade : ISchemaElement, ISetAttributes
     {
-        
+
         private YesNoType allowDowngradesField;
-        
+
         private bool allowDowngradesFieldSet;
-        
+
         private YesNoType allowSameVersionUpgradesField;
-        
+
         private bool allowSameVersionUpgradesFieldSet;
-        
+
         private YesNoType disallowField;
-        
+
         private bool disallowFieldSet;
-        
+
         private string downgradeErrorMessageField;
-        
+
         private bool downgradeErrorMessageFieldSet;
-        
+
         private string disallowUpgradeErrorMessageField;
-        
+
         private bool disallowUpgradeErrorMessageFieldSet;
-        
+
         private YesNoType migrateFeaturesField;
-        
+
         private bool migrateFeaturesFieldSet;
-        
+
         private YesNoType ignoreLanguageField;
-        
+
         private bool ignoreLanguageFieldSet;
-        
+
         private YesNoType ignoreRemoveFailureField;
-        
+
         private bool ignoreRemoveFailureFieldSet;
-        
+
         private string removeFeaturesField;
-        
+
         private bool removeFeaturesFieldSet;
-        
+
         private ScheduleType scheduleField;
-        
+
         private bool scheduleFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         /// <summary>
         /// When set to no (the default), products with lower version numbers are blocked from
         /// installing when a product with a higher version is installed; the DowngradeErrorMessage
         /// attribute must also be specified.
-        /// 
+        ///
         /// When set to yes, any version can be installed over any other version.
         /// </summary>
         public YesNoType AllowDowngrades
@@ -56979,24 +56979,24 @@ namespace WixToolset.Harvesters.Serialize
                 this.allowDowngradesField = value;
             }
         }
-        
+
         /// <summary>
         /// When set to no (the default), installing a product with the same version and upgrade code
         /// (but different product code) is allowed and treated by MSI as two products. When set to yes,
         /// WiX sets the msidbUpgradeAttributesVersionMaxInclusive attribute, which tells MSI to treat
         /// a product with the same version as a major upgrade.
-        /// 
+        ///
         /// This is useful when two product versions differ only in the fourth version field. MSI
         /// specifically ignores that field when comparing product versions, so two products that
         /// differ only in the fourth version field are the same product and need this attribute set to
         /// yes to be detected.
-        /// 
+        ///
         /// Note that because MSI ignores the fourth product version field, setting this attribute to
         /// yes also allows downgrades when the first three product version fields are identical.
         /// For example, product version 1.0.0.1 will "upgrade" 1.0.0.2998 because they're seen as the
         /// same version (1.0.0). That could reintroduce serious bugs so the safest choice is to change
         /// the first three version fields and omit this attribute to get the default of no.
-        /// 
+        ///
         /// This attribute cannot be "yes" when AllowDowngrades is also "yes" -- AllowDowngrades
         /// already allows two products with the same version number to upgrade each other.
         /// </summary>
@@ -57012,12 +57012,12 @@ namespace WixToolset.Harvesters.Serialize
                 this.allowSameVersionUpgradesField = value;
             }
         }
-        
+
         /// <summary>
         /// When set to yes, products with higer version numbers are blocked from
         /// installing when a product with a lower version is installed; the UpgradeErrorMessage
         /// attribute must also be specified.
-        /// 
+        ///
         /// When set to no (the default), any version can be installed over any lower version.
         /// </summary>
         public YesNoType Disallow
@@ -57032,7 +57032,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.disallowField = value;
             }
         }
-        
+
         /// <summary>
         /// The message displayed if users try to install a product with a lower version number
         /// when a product with a higher version is installed. Used only when AllowDowngrades
@@ -57050,7 +57050,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.downgradeErrorMessageField = value;
             }
         }
-        
+
         /// <summary>
         /// The message displayed if users try to install a product with a higer version number
         /// when a product with a lower version is installed. Used only when Disallow
@@ -57068,11 +57068,11 @@ namespace WixToolset.Harvesters.Serialize
                 this.disallowUpgradeErrorMessageField = value;
             }
         }
-        
+
         /// <summary>
         /// When set to yes (the default), the MigrateFeatureStates standard action will set the
         /// feature states of the upgrade product to those of the installed product.
-        /// 
+        ///
         /// When set to no, the installed features have no effect on the upgrade installation.
         /// </summary>
         public YesNoType MigrateFeatures
@@ -57087,10 +57087,10 @@ namespace WixToolset.Harvesters.Serialize
                 this.migrateFeaturesField = value;
             }
         }
-        
+
         /// <summary>
         /// When set to yes, the Upgrade table rows will match any product with the same UpgradeCode.
-        /// 
+        ///
         /// When set to no (the default), the Upgrade table rows will match only products with the
         /// same UpgradeCode and ProductLanguage.
         /// </summary>
@@ -57106,11 +57106,11 @@ namespace WixToolset.Harvesters.Serialize
                 this.ignoreLanguageField = value;
             }
         }
-        
+
         /// <summary>
         /// When set to yes, failures removing the installed product during the upgrade will be
         /// ignored.
-        /// 
+        ///
         /// When set to no (the default), failures removing the installed product during the upgrade
         /// will be considered a failure and, depending on the scheduling, roll back the upgrade.
         /// </summary>
@@ -57126,7 +57126,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.ignoreRemoveFailureField = value;
             }
         }
-        
+
         /// <summary>
         /// A formatted string that contains the list of features to remove from the installed
         /// product. The default is to remove all features. Note that if you use formatted property
@@ -57145,13 +57145,13 @@ namespace WixToolset.Harvesters.Serialize
                 this.removeFeaturesField = value;
             }
         }
-        
+
         /// <summary>
         /// Determines the scheduling of the RemoveExistingProducts standard action, which is when
         /// the installed product is removed. The default is "afterInstallValidate" which removes
         /// the installed product entirely before installing the upgrade product. It's slowest but
         /// gives the most flexibility in changing components and features in the upgrade product.
-        /// 
+        ///
         /// For more information, see
         /// </summary>
         public ScheduleType Schedule
@@ -57166,7 +57166,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.scheduleField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -57178,7 +57178,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Parses a ScheduleType from a string.
         /// </summary>
@@ -57188,7 +57188,7 @@ namespace WixToolset.Harvesters.Serialize
             MajorUpgrade.TryParseScheduleType(value, out parsedValue);
             return parsedValue;
         }
-        
+
         /// <summary>
         /// Tries to parse a ScheduleType from a string.
         /// </summary>
@@ -57238,7 +57238,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             return true;
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -57353,7 +57353,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         void ISetAttributes.SetAttribute(string name, string value)
@@ -57413,15 +57413,15 @@ namespace WixToolset.Harvesters.Serialize
                 this.scheduleFieldSet = true;
             }
         }
-        
+
         [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
         public enum ScheduleType
         {
-            
+
             IllegalValue = int.MaxValue,
-            
+
             NotSet = -1,
-            
+
             /// <summary>
             /// (Default) Schedules RemoveExistingProducts after the InstallValidate standard
             /// action. This scheduling removes the installed product entirely before installing
@@ -57430,7 +57430,7 @@ namespace WixToolset.Harvesters.Serialize
             /// of the upgrade product fails, the machine will have neither version installed.
             /// </summary>
             afterInstallValidate,
-            
+
             /// <summary>
             /// Schedules RemoveExistingProducts after the InstallInitialize standard action.
             /// This is similar to the afterInstallValidate scheduling, but if the installation
@@ -57438,7 +57438,7 @@ namespace WixToolset.Harvesters.Serialize
             /// the installed product -- in other words, reinstalls it.
             /// </summary>
             afterInstallInitialize,
-            
+
             /// <summary>
             /// Schedules RemoveExistingProducts between the InstallExecute and InstallFinalize standard actions.
             /// This scheduling installs the upgrade product "on top of" the installed product then lets
@@ -57448,14 +57448,14 @@ namespace WixToolset.Harvesters.Serialize
             /// removal of the installed product. For more information, see
             /// </summary>
             afterInstallExecute,
-            
+
             /// <summary>
             /// Schedules RemoveExistingProducts between the InstallExecuteAgain and InstallFinalize standard actions.
             /// This is identical to the afterInstallExecute scheduling but after the InstallExecuteAgain standard
             /// action instead of InstallExecute.
             /// </summary>
             afterInstallExecuteAgain,
-            
+
             /// <summary>
             /// Schedules RemoveExistingProducts after the InstallFinalize standard action. This is similar to the
             /// afterInstallExecute and afterInstallExecuteAgain schedulings but takes place outside the
@@ -57466,45 +57466,45 @@ namespace WixToolset.Harvesters.Serialize
             afterInstallFinalize,
         }
     }
-    
+
     [GeneratedCode("WixBuildTools.XsdGen", "4.0.0.0")]
     public class ProductSearch : ISchemaElement, ISetAttributes
     {
-        
+
         private string minimumField;
-        
+
         private bool minimumFieldSet;
-        
+
         private string maximumField;
-        
+
         private bool maximumFieldSet;
-        
+
         private string languageField;
-        
+
         private bool languageFieldSet;
-        
+
         private YesNoType includeMinimumField;
-        
+
         private bool includeMinimumFieldSet;
-        
+
         private YesNoType includeMaximumField;
-        
+
         private bool includeMaximumFieldSet;
-        
+
         private YesNoType excludeLanguagesField;
-        
+
         private bool excludeLanguagesFieldSet;
-        
+
         private string upgradeCodeField;
-        
+
         private bool upgradeCodeFieldSet;
-        
+
         private string contentField;
-        
+
         private bool contentFieldSet;
-        
+
         private ISchemaElement parentElement;
-        
+
         /// <summary>
         /// Specifies the lower bound on the range of product versions to be detected by FindRelatedProducts.
         /// </summary>
@@ -57520,7 +57520,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.minimumField = value;
             }
         }
-        
+
         /// <summary>
         /// Specifies the upper boundary of the range of product versions detected by FindRelatedProducts.
         /// </summary>
@@ -57536,7 +57536,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.maximumField = value;
             }
         }
-        
+
         /// <summary>
         /// Specifies the set of languages detected by FindRelatedProducts.  Enter a list of numeric language identifiers (LANGID) separated by commas (,).  Leave this value null to specify all languages.  Set ExcludeLanguages to "yes" in order detect all languages, excluding the languages listed in this value.
         /// </summary>
@@ -57552,7 +57552,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.languageField = value;
             }
         }
-        
+
         /// <summary>
         /// Set to "no" to make the range of versions detected exclude the value specified in Minimum.  This attribute is "yes" by default.
         /// </summary>
@@ -57568,7 +57568,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.includeMinimumField = value;
             }
         }
-        
+
         /// <summary>
         /// Set to "yes" to make the range of versions detected include the value specified in Maximum.
         /// </summary>
@@ -57584,7 +57584,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.includeMaximumField = value;
             }
         }
-        
+
         /// <summary>
         /// Set to "yes" to detect all languages, excluding the languages listed in the Language attribute.
         /// </summary>
@@ -57600,7 +57600,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.excludeLanguagesField = value;
             }
         }
-        
+
         /// <summary>
         /// This value specifies the upgrade code for the products that are to be detected by the FindRelatedProducts action.
         /// </summary>
@@ -57616,7 +57616,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.upgradeCodeField = value;
             }
         }
-        
+
         public string Content
         {
             get
@@ -57629,7 +57629,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.contentField = value;
             }
         }
-        
+
         public virtual ISchemaElement ParentElement
         {
             get
@@ -57641,7 +57641,7 @@ namespace WixToolset.Harvesters.Serialize
                 this.parentElement = value;
             }
         }
-        
+
         /// <summary>
         /// Processes this element and all child elements into an XmlWriter.
         /// </summary>
@@ -57708,7 +57708,7 @@ namespace WixToolset.Harvesters.Serialize
             }
             writer.WriteEndElement();
         }
-        
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
         [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         void ISetAttributes.SetAttribute(string name, string value)
diff --git a/src/wix/WixToolset.Converters/WixConverter.cs b/src/wix/WixToolset.Converters/WixConverter.cs
index a4de1d21..faa77da9 100644
--- a/src/wix/WixToolset.Converters/WixConverter.cs
+++ b/src/wix/WixToolset.Converters/WixConverter.cs
@@ -1751,6 +1751,14 @@ namespace WixToolset.Converters
 
         private void ConvertRelatedBundleElement(XElement element)
         {
+            var xId = element.Attribute("Id");
+            if (xId != null &&
+                this.OnInformation(ConverterTestType.RelatedBundleIdAttributeRenamed, element, "The {0} element's Id attribute has been renamed. Use the Code attribute instead.", element.Name.LocalName))
+            {
+                element.Add(new XAttribute("Code", xId.Value));
+                xId.Remove();
+            }
+
             var xAction = element.Attribute("Action");
             var value = xAction?.Value;
             var lowercaseValue = value?.ToLowerInvariant();
@@ -3139,7 +3147,6 @@ namespace WixToolset.Converters
 
             public bool CollectInnerTextWithTrailingWhitespaceAndCommentsForScriptFile(XElement element, out string collectedText)
             {
-                var value = String.Empty;
                 char[] whitespaceChars = { ' ', '\t', '\r', '\n' };
                 var nodes = element.Nodes().ToList();
                 var cDataFound = false;
@@ -3560,6 +3567,11 @@ namespace WixToolset.Converters
             /// The WixUIPrintEula custom action has been replaced with the MSI native MsiPrint control event in WiX v5 and no longer needs to be authored in a custom dialog set.
             /// </summary>
             WixUIPrintEulaCustomAction,
+
+            /// <summary>
+            /// The RelatedBundle element's Id attribute has been renamed. Use the Code attribute instead."
+            /// </summary>
+            RelatedBundleIdAttributeRenamed,
         }
     }
 }
diff --git a/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs b/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
index 91146a0f..2ba1d3a2 100644
--- a/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
@@ -99,7 +99,7 @@ namespace WixToolset.Core.Burn
             // Ensure there is one and only one WixBundleSymbol.
             var bundleSymbol = this.GetSingleSymbol<WixBundleSymbol>("bundle");
 
-            bundleSymbol.ProviderKey = bundleSymbol.BundleId = Guid.NewGuid().ToString("B").ToUpperInvariant();
+            bundleSymbol.ProviderKey = bundleSymbol.BundleCode = Guid.NewGuid().ToString("B").ToUpperInvariant();
 
             bundleSymbol.PerMachine = true; // default to per-machine but the first-per user package wil flip the bundle per-user.
 
diff --git a/src/wix/WixToolset.Core.Burn/Bind/GenerateManifestDataFromIRCommand.cs b/src/wix/WixToolset.Core.Burn/Bind/GenerateManifestDataFromIRCommand.cs
index c947524b..f5a9781b 100644
--- a/src/wix/WixToolset.Core.Burn/Bind/GenerateManifestDataFromIRCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bind/GenerateManifestDataFromIRCommand.cs
@@ -7,7 +7,6 @@ namespace WixToolset.Core.Burn.Bind
     using System.Linq;
     using System.Text;
     using System.Xml;
-    using WixToolset.Core.Burn.Bundles;
     using WixToolset.Core.Burn.ExtensibilityServices;
     using WixToolset.Data;
     using WixToolset.Data.Burn;
diff --git a/src/wix/WixToolset.Core.Burn/Bind/NormalizeRelatedBundlesCommand.cs b/src/wix/WixToolset.Core.Burn/Bind/NormalizeRelatedBundlesCommand.cs
index 71a31bff..dd440345 100644
--- a/src/wix/WixToolset.Core.Burn/Bind/NormalizeRelatedBundlesCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bind/NormalizeRelatedBundlesCommand.cs
@@ -28,32 +28,32 @@ namespace WixToolset.Core.Burn.Bind
             foreach (var relatedBundleSymbol in this.Section.Symbols.OfType<WixRelatedBundleSymbol>())
             {
                 var elementName = "RelatedBundle";
-                var attributeName = "Id";
+                var attributeName = "Code";
 
-                if (this.BundleSymbol.UpgradeCode == relatedBundleSymbol.BundleId)
+                if (this.BundleSymbol.UpgradeCode == relatedBundleSymbol.BundleCode)
                 {
                     elementName = "Bundle";
                     attributeName = "UpgradeCode";
                 }
 
-                relatedBundleSymbol.BundleId = this.NormalizeBundleRelatedBundleId(relatedBundleSymbol.SourceLineNumbers, relatedBundleSymbol.BundleId, elementName, attributeName);
+                relatedBundleSymbol.BundleCode = this.NormalizeBundleRelatedBundleCode(relatedBundleSymbol.SourceLineNumbers, relatedBundleSymbol.BundleCode, elementName, attributeName);
             }
 
-            this.BundleSymbol.UpgradeCode = this.NormalizeBundleRelatedBundleId(this.BundleSymbol.SourceLineNumbers, this.BundleSymbol.UpgradeCode, null, null);
+            this.BundleSymbol.UpgradeCode = this.NormalizeBundleRelatedBundleCode(this.BundleSymbol.SourceLineNumbers, this.BundleSymbol.UpgradeCode, null, null);
         }
 
-        private string NormalizeBundleRelatedBundleId(SourceLineNumber sourceLineNumber, string relatedBundleId, string elementName, string attributeName)
+        private string NormalizeBundleRelatedBundleCode(SourceLineNumber sourceLineNumber, string relatedBundleCode, string elementName, string attributeName)
         {
-            if (Guid.TryParse(relatedBundleId, out var guid))
+            if (Guid.TryParse(relatedBundleCode, out var guid))
             {
                 return guid.ToString("B").ToUpperInvariant();
             }
             else if (!String.IsNullOrEmpty(elementName))
             {
-                this.Messaging.Write(ErrorMessages.IllegalGuidValue(sourceLineNumber, elementName, attributeName, relatedBundleId));
+                this.Messaging.Write(ErrorMessages.IllegalGuidValue(sourceLineNumber, elementName, attributeName, relatedBundleCode));
             }
 
-            return relatedBundleId;
+            return relatedBundleCode;
         }
     }
 }
diff --git a/src/wix/WixToolset.Core.Burn/Bind/ProcessBundleSoftwareTagsCommand.cs b/src/wix/WixToolset.Core.Burn/Bind/ProcessBundleSoftwareTagsCommand.cs
index 1962660f..5231e0be 100644
--- a/src/wix/WixToolset.Core.Burn/Bind/ProcessBundleSoftwareTagsCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bind/ProcessBundleSoftwareTagsCommand.cs
@@ -27,10 +27,10 @@ namespace WixToolset.Core.Burn.Bind
         public void Execute()
         {
             var bundleInfo = this.Section.Symbols.OfType<WixBundleSymbol>().FirstOrDefault();
-            var bundleId = NormalizeGuid(bundleInfo.BundleId);
+            var bundleCode = NormalizeGuid(bundleInfo.BundleCode);
             var upgradeCode = NormalizeGuid(bundleInfo.UpgradeCode);
 
-            var uniqueId = String.Concat("wix:bundle/", bundleId);
+            var uniqueId = String.Concat("wix:bundle/", bundleCode);
             var persistentId = String.Concat("wix:bundle.upgrade/", upgradeCode);
 
             // Try to collect all the software id tags from all the child packages.
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/BurnCommon.cs b/src/wix/WixToolset.Core.Burn/Bundles/BurnCommon.cs
index 863a14aa..f90a089b 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/BurnCommon.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/BurnCommon.cs
@@ -154,7 +154,7 @@ namespace WixToolset.Core.Burn.Bundles
         public uint SignatureOffset { get; protected set; }
         public uint SignatureSize { get; protected set; }
         public uint Version { get; protected set; }
-        public Guid BundleId { get; protected set; }
+        public Guid BundleCode { get; protected set; }
         public uint StubSize { get; protected set; }
         public uint OriginalChecksum { get; protected set; }
         public uint OriginalSignatureOffset { get; protected set; }
@@ -238,7 +238,7 @@ namespace WixToolset.Core.Burn.Bundles
                 return false;
             }
 
-            this.BundleId = BurnCommon.ReadGuid(bytes, BURN_SECTION_OFFSET_BUNDLEGUID);
+            this.BundleCode = BurnCommon.ReadGuid(bytes, BURN_SECTION_OFFSET_BUNDLEGUID);
             this.StubSize = BurnCommon.ReadUInt32(bytes, BURN_SECTION_OFFSET_STUBSIZE);
             this.OriginalChecksum = BurnCommon.ReadUInt32(bytes, BURN_SECTION_OFFSET_ORIGINALCHECKSUM);
             this.OriginalSignatureOffset = BurnCommon.ReadUInt32(bytes, BURN_SECTION_OFFSET_ORIGINALSIGNATUREOFFSET);
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/BurnWriter.cs b/src/wix/WixToolset.Core.Burn/Bundles/BurnWriter.cs
index 29664177..4b3cca34 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/BurnWriter.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/BurnWriter.cs
@@ -60,25 +60,25 @@ namespace WixToolset.Core.Burn.Bundles
         /// Update the ".wixburn" section data.
         /// </summary>
         /// <param name="stubSize">Size of the stub engine "burn.exe".</param>
-        /// <param name="bundleId">Unique identifier for this bundle.</param>
+        /// <param name="bundleCode">Unique identifier for this bundle.</param>
         /// <returns></returns>
-        public bool InitializeBundleSectionData(long stubSize, string bundleId)
+        public bool InitializeBundleSectionData(long stubSize, string bundleCode)
         {
             if (this.Invalid)
             {
                 return false;
             }
 
-            var bundleGuid = Guid.Parse(bundleId);
+            var bundleGuid = Guid.Parse(bundleCode);
 
             this.WriteToBurnSectionOffset(BURN_SECTION_OFFSET_MAGIC, BURN_SECTION_MAGIC);
             this.WriteToBurnSectionOffset(BURN_SECTION_OFFSET_VERSION, BURN_SECTION_VERSION);
 
-            this.Messaging.Write(VerboseMessages.BundleGuid(bundleId));
+            this.Messaging.Write(VerboseMessages.BundleGuid(bundleCode));
             this.binaryWriter.BaseStream.Seek(this.wixburnDataOffset + BURN_SECTION_OFFSET_BUNDLEGUID, SeekOrigin.Begin);
             this.binaryWriter.Write(bundleGuid.ToByteArray());
 
-            this.BundleId = bundleGuid;
+            this.BundleCode = bundleGuid;
             this.StubSize = (uint)stubSize;
 
             this.WriteToBurnSectionOffset(BURN_SECTION_OFFSET_STUBSIZE, this.StubSize);
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/CacheIdGenerator.cs b/src/wix/WixToolset.Core.Burn/Bundles/CacheIdGenerator.cs
index 389eed2d..ee7535b3 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/CacheIdGenerator.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/CacheIdGenerator.cs
@@ -59,7 +59,7 @@ namespace WixToolset.Core.Burn.Bundles
 
             if (harvestedPackageSymbol is WixBundleHarvestedBundlePackageSymbol harvestedBundlePackageSymbol)
             {
-                cacheId = GenerateCacheIdFromGuidAndVersion(harvestedBundlePackageSymbol.BundleId, harvestedBundlePackageSymbol.Version);
+                cacheId = GenerateCacheIdFromGuidAndVersion(harvestedBundlePackageSymbol.BundleCode, harvestedBundlePackageSymbol.Version);
             }
             else if (harvestedPackageSymbol is WixBundleHarvestedMsiPackageSymbol harvestedMsiPackageSymbol)
             {
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs
index f611cefa..dd6171b6 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs
@@ -92,10 +92,15 @@ namespace WixToolset.Core.Burn.Bundles
         {
             writer.WriteStartElement("WixBundleProperties");
 
+            if (this.BundleSymbol.Id != null)
+            {
+                writer.WriteAttributeString("BundleId", this.BundleSymbol.Id.Id);
+            }
+
+            writer.WriteAttributeString("Code", this.BundleSymbol.BundleCode.ToUpperInvariant());
             writer.WriteAttributeString("DisplayName", this.BundleSymbol.Name);
             writer.WriteAttributeString("LogPathVariable", this.BundleSymbol.LogPathVariable);
             writer.WriteAttributeString("Compressed", this.BundleSymbol.Compressed == true ? "yes" : "no");
-            writer.WriteAttributeString("Id", this.BundleSymbol.BundleId.ToUpperInvariant());
             writer.WriteAttributeString("UpgradeCode", this.BundleSymbol.UpgradeCode);
             writer.WriteAttributeString("PerMachine", this.BundleSymbol.PerMachine ? "yes" : "no");
 
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs
index 241e3538..c1dba91e 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs
@@ -78,7 +78,7 @@ namespace WixToolset.Core.Burn.Bundles
             using (var writer = BurnWriter.Open(this.Messaging, this.FileSystem, bundleTempPath))
             {
                 var burnStubFile = new FileInfo(bundleTempPath);
-                writer.InitializeBundleSectionData(burnStubFile.Length, this.BundleSymbol.BundleId);
+                writer.InitializeBundleSectionData(burnStubFile.Length, this.BundleSymbol.BundleCode);
 
                 // Always attach the UX container first
                 writer.AppendContainer(this.UXContainer.SourceLineNumbers, this.UXContainer.WorkingPath, BurnWriter.Container.UX);
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
index 5955392e..8ce2623e 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
@@ -118,10 +118,10 @@ namespace WixToolset.Core.Burn.Bundles
 
                 foreach (var relatedBundle in relatedBundles)
                 {
-                    if (distinctRelatedBundles.Add(relatedBundle.BundleId))
+                    if (distinctRelatedBundles.Add(relatedBundle.BundleCode))
                     {
                         writer.WriteStartElement("RelatedBundle");
-                        writer.WriteAttributeString("Id", relatedBundle.BundleId);
+                        writer.WriteAttributeString("Code", relatedBundle.BundleCode);
                         writer.WriteAttributeString("Action", relatedBundle.Action.ToString());
                         writer.WriteEndElement();
                     }
@@ -216,7 +216,12 @@ namespace WixToolset.Core.Burn.Bundles
                 // Write the registration information...
                 writer.WriteStartElement("Registration");
 
-                writer.WriteAttributeString("Id", this.BundleSymbol.BundleId);
+                if (this.BundleSymbol.Id != null)
+                {
+                    writer.WriteAttributeString("BundleId", this.BundleSymbol.Id.Id);
+                }
+
+                writer.WriteAttributeString("Code", this.BundleSymbol.BundleCode);
                 writer.WriteAttributeString("ExecutableName", this.ExecutableName);
                 writer.WriteAttributeString("PerMachine", this.BundleSymbol.PerMachine ? "yes" : "no");
                 writer.WriteAttributeString("Tag", this.BundleSymbol.Tag);
@@ -407,7 +412,7 @@ namespace WixToolset.Core.Burn.Bundles
 
                     if (package.SpecificPackageSymbol is WixBundleBundlePackageSymbol bundlePackage) // BUNDLE
                     {
-                        writer.WriteAttributeString("BundleId", bundlePackage.BundleId);
+                        writer.WriteAttributeString("BundleCode", bundlePackage.BundleCode);
                         writer.WriteAttributeString("Version", bundlePackage.Version);
                         writer.WriteAttributeString("InstallArguments", bundlePackage.InstallCommand);
                         writer.WriteAttributeString("UninstallArguments", bundlePackage.UninstallCommand);
@@ -608,7 +613,7 @@ namespace WixToolset.Core.Burn.Bundles
                     foreach (var relatedBundle in packageRelatedBundles)
                     {
                         writer.WriteStartElement("RelatedBundle");
-                        writer.WriteAttributeString("Id", relatedBundle.BundleId);
+                        writer.WriteAttributeString("Code", relatedBundle.BundleCode);
                         writer.WriteAttributeString("Action", relatedBundle.Action.ToString());
                         writer.WriteEndElement();
                     }
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/HarvestBundlePackageCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/HarvestBundlePackageCommand.cs
index 668f57e2..abc54be7 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/HarvestBundlePackageCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/HarvestBundlePackageCommand.cs
@@ -57,7 +57,7 @@ namespace WixToolset.Core.Burn.Bundles
         public void Execute()
         {
             bool win64;
-            string bundleId;
+            string bundleCode;
             string engineVersion;
             int protocolVersion;
             string manifestNamespace;
@@ -76,7 +76,7 @@ namespace WixToolset.Core.Burn.Bundles
                     return;
                 }
 
-                var baFolderPath = Path.Combine(this.IntermediateFolder, burnReader.BundleId.ToString());
+                var baFolderPath = Path.Combine(this.IntermediateFolder, burnReader.BundleCode.ToString());
 
                 if (!burnReader.ExtractUXContainer(baFolderPath, baFolderPath))
                 {
@@ -89,7 +89,7 @@ namespace WixToolset.Core.Burn.Bundles
                     this.TrackedFiles.Add(this.BackendHelper.TrackFile(filePath, TrackedFileType.Temporary, sourceLineNumbers));
                 }
 
-                bundleId = burnReader.BundleId.ToString("B").ToUpperInvariant();
+                bundleCode = burnReader.BundleCode.ToString("B").ToUpperInvariant();
 
                 try
                 {
@@ -144,7 +144,7 @@ namespace WixToolset.Core.Burn.Bundles
             this.HarvestedBundlePackage = new WixBundleHarvestedBundlePackageSymbol(this.PackagePayload.SourceLineNumbers, this.PackagePayload.Id)
             {
                 Win64 = win64,
-                BundleId = bundleId,
+                BundleCode = bundleCode,
                 EngineVersion = engineVersion,
                 ManifestNamespace = manifestNamespace,
                 ProtocolVersion = protocolVersion,
@@ -395,7 +395,12 @@ namespace WixToolset.Core.Burn.Bundles
 
             foreach (XmlElement relatedBundleElement in document.SelectNodes("/burn:BurnManifest/burn:RelatedBundle", namespaceManager))
             {
-                var id = relatedBundleElement.GetAttribute("Id");
+                var code = relatedBundleElement.GetAttribute("Code");
+                if (String.IsNullOrEmpty(code))
+                {
+                    code = relatedBundleElement.GetAttribute("Id");
+                }
+
                 var actionValue = relatedBundleElement.GetAttribute("Action");
 
                 if (!Enum.TryParse(actionValue, out RelatedBundleActionType action))
@@ -407,7 +412,7 @@ namespace WixToolset.Core.Burn.Bundles
                 this.RelatedBundles.Add(new WixBundlePackageRelatedBundleSymbol(sourceLineNumbers)
                 {
                     PackagePayloadRef = this.PackagePayload.Id.Id,
-                    BundleId = id,
+                    BundleCode = code,
                     Action = action,
                 });
             }
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/ProcessBundlePackageCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/ProcessBundlePackageCommand.cs
index 83ec10b3..35bd43e6 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/ProcessBundlePackageCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/ProcessBundlePackageCommand.cs
@@ -75,7 +75,7 @@ namespace WixToolset.Core.Burn.Bundles
             }
 
             this.ChainPackage.Win64 = harvestedBundlePackage.Win64;
-            this.BundlePackage.BundleId = Guid.Parse(harvestedBundlePackage.BundleId).ToString("B").ToUpperInvariant();
+            this.BundlePackage.BundleCode = Guid.Parse(harvestedBundlePackage.BundleCode).ToString("B").ToUpperInvariant();
             this.BundlePackage.EngineVersion = harvestedBundlePackage.EngineVersion;
             this.BundlePackage.SupportsBurnProtocol = harvestedBundlePackage.ProtocolVersion == BurnCommon.BURN_PROTOCOL_VERSION;
 
diff --git a/src/wix/WixToolset.Core.Burn/CommandLine/RemotePayloadSubcommand.cs b/src/wix/WixToolset.Core.Burn/CommandLine/RemotePayloadSubcommand.cs
index 3a232754..7ccae3fd 100644
--- a/src/wix/WixToolset.Core.Burn/CommandLine/RemotePayloadSubcommand.cs
+++ b/src/wix/WixToolset.Core.Burn/CommandLine/RemotePayloadSubcommand.cs
@@ -407,7 +407,7 @@ namespace WixToolset.Core.Burn.CommandLine
                 }
             }
 
-            return Path.GetFileName(path); 
+            return Path.GetFileName(path);
         }
 
         private void HarvestBundlePackage(HarvestedFile harvestedFile)
@@ -424,7 +424,7 @@ namespace WixToolset.Core.Burn.CommandLine
             {
                 var bundleElement = new XElement(RemoteBundleName);
 
-                bundleElement.Add(new XAttribute("BundleId", command.HarvestedBundlePackage.BundleId));
+                bundleElement.Add(new XAttribute("BundleCode", command.HarvestedBundlePackage.BundleCode));
 
                 if (!String.IsNullOrEmpty(command.HarvestedBundlePackage.DisplayName))
                 {
@@ -455,13 +455,13 @@ namespace WixToolset.Core.Burn.CommandLine
                     if (!setUpgradeCode && relatedBundle.Action == RelatedBundleActionType.Upgrade)
                     {
                         setUpgradeCode = true;
-                        bundleElement.Add(new XAttribute("UpgradeCode", relatedBundle.BundleId));
+                        bundleElement.Add(new XAttribute("UpgradeCode", relatedBundle.BundleCode));
                         continue;
                     }
 
                     var relatedBundleElement = new XElement(RemoteRelatedBundleName);
 
-                    relatedBundleElement.Add(new XAttribute("Id", relatedBundle.BundleId));
+                    relatedBundleElement.Add(new XAttribute("Code", relatedBundle.BundleCode));
                     relatedBundleElement.Add(new XAttribute("Action", relatedBundle.Action.ToString()));
 
                     bundleElement.Add(relatedBundleElement);
diff --git a/src/wix/WixToolset.Core/Compiler_Bundle.cs b/src/wix/WixToolset.Core/Compiler_Bundle.cs
index 38dbd4c2..14de99eb 100644
--- a/src/wix/WixToolset.Core/Compiler_Bundle.cs
+++ b/src/wix/WixToolset.Core/Compiler_Bundle.cs
@@ -447,7 +447,7 @@ namespace WixToolset.Core
                 {
                     this.Core.AddSymbol(new WixRelatedBundleSymbol(sourceLineNumbers)
                     {
-                        BundleId = upgradeCode,
+                        BundleCode = upgradeCode,
                         Action = RelatedBundleActionType.Upgrade,
                     });
                 }
@@ -2765,7 +2765,7 @@ namespace WixToolset.Core
         private void ParseRemoteBundleElement(XElement node, string packagePayloadId)
         {
             var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
-            string bundleId = null;
+            string bundleCode = null;
             string displayName = null;
             string engineVersion = null;
             long? installSize = null;
@@ -2784,7 +2784,10 @@ namespace WixToolset.Core
                     switch (attrib.Name.LocalName)
                     {
                         case "BundleId":
-                            bundleId = this.Core.GetAttributeGuidValue(sourceLineNumbers, attrib);
+                            this.Core.Write(WarningMessages.DeprecatedAttribute(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BundleCode"));
+                            goto case "BundleCode";
+                        case "BundleCode":
+                            bundleCode = this.Core.GetAttributeGuidValue(sourceLineNumbers, attrib);
                             break;
                         case "DisplayName":
                             displayName = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
@@ -2827,9 +2830,9 @@ namespace WixToolset.Core
                 }
             }
 
-            if (String.IsNullOrEmpty(bundleId))
+            if (String.IsNullOrEmpty(bundleCode))
             {
-                this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "BundleId"));
+                this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "BundleCode"));
             }
 
             if (String.IsNullOrEmpty(manifestNamespace))
@@ -2876,7 +2879,7 @@ namespace WixToolset.Core
                 var symbol = this.Core.AddSymbol(new WixBundleHarvestedBundlePackageSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, packagePayloadId))
                 {
                     Attributes = bundleAttributes,
-                    BundleId = bundleId,
+                    BundleCode = bundleCode,
                     DisplayName = displayName,
                     EngineVersion = engineVersion,
                     ManifestNamespace = manifestNamespace,
@@ -2892,7 +2895,7 @@ namespace WixToolset.Core
                 this.Core.AddSymbol(new WixBundlePackageRelatedBundleSymbol(sourceLineNumbers)
                 {
                     PackagePayloadRef = packagePayloadId,
-                    BundleId = upgradeCode,
+                    BundleCode = upgradeCode,
                     Action = RelatedBundleActionType.Upgrade,
                 });
 
@@ -3006,7 +3009,7 @@ namespace WixToolset.Core
                 this.Core.AddSymbol(new WixBundlePackageRelatedBundleSymbol(sourceLineNumbers)
                 {
                     PackagePayloadRef = payloadId,
-                    BundleId = id,
+                    BundleCode = id,
                     Action = actionType.Value,
                 });
             }
@@ -3489,7 +3492,7 @@ namespace WixToolset.Core
         private void ParseRelatedBundleElement(XElement node)
         {
             var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
-            string id = null;
+            string code = null;
             var actionType = RelatedBundleActionType.Detect;
 
             foreach (var attrib in node.Attributes())
@@ -3499,7 +3502,10 @@ namespace WixToolset.Core
                     switch (attrib.Name.LocalName)
                     {
                         case "Id":
-                            id = this.Core.GetAttributeGuidValue(sourceLineNumbers, attrib, false);
+                            this.Core.Write(WarningMessages.DeprecatedAttribute(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "Code"));
+                            goto case "Code";
+                        case "Code":
+                            code = this.Core.GetAttributeGuidValue(sourceLineNumbers, attrib, false);
                             break;
                         case "Action":
                             var action = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
@@ -3539,9 +3545,9 @@ namespace WixToolset.Core
                 }
             }
 
-            if (null == id)
+            if (null == code)
             {
-                this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id"));
+                this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Code"));
             }
 
             this.Core.ParseForExtensionElements(node);
@@ -3550,7 +3556,7 @@ namespace WixToolset.Core
             {
                 this.Core.AddSymbol(new WixRelatedBundleSymbol(sourceLineNumbers)
                 {
-                    BundleId = id,
+                    BundleCode = code,
                     Action = actionType,
                 });
             }
diff --git a/src/wix/test/WixToolsetTest.Converters/RelatedBundleFixture.cs b/src/wix/test/WixToolsetTest.Converters/RelatedBundleFixture.cs
index ea0be80b..950dfa70 100644
--- a/src/wix/test/WixToolsetTest.Converters/RelatedBundleFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/RelatedBundleFixture.cs
@@ -18,10 +18,10 @@ namespace WixToolsetTest.Converters
             var parse = String.Join(Environment.NewLine,
                 "<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>",
                 "  <Fragment>",
-                "    <RelatedBundle Id='D' Action='Detect' />",
-                "    <RelatedBundle Id='U' Action='Upgrade' />",
-                "    <RelatedBundle Id='A' Action='Addon' />",
-                "    <RelatedBundle Id='P' Action='Patch' />",
+                "    <RelatedBundle Code='D' Action='Detect' />",
+                "    <RelatedBundle Code='U' Action='Upgrade' />",
+                "    <RelatedBundle Code='A' Action='Addon' />",
+                "    <RelatedBundle Code='P' Action='Patch' />",
                 "  </Fragment>",
                 "</Wix>");
 
@@ -29,10 +29,10 @@ namespace WixToolsetTest.Converters
             {
                 "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
                 "  <Fragment>",
-                "    <RelatedBundle Id=\"D\" Action=\"detect\" />",
-                "    <RelatedBundle Id=\"U\" Action=\"upgrade\" />",
-                "    <RelatedBundle Id=\"A\" Action=\"addon\" />",
-                "    <RelatedBundle Id=\"P\" Action=\"patch\" />",
+                "    <RelatedBundle Code=\"D\" Action=\"detect\" />",
+                "    <RelatedBundle Code=\"U\" Action=\"upgrade\" />",
+                "    <RelatedBundle Code=\"A\" Action=\"addon\" />",
+                "    <RelatedBundle Code=\"P\" Action=\"patch\" />",
                 "  </Fragment>",
                 "</Wix>"
             };
@@ -57,5 +57,51 @@ namespace WixToolsetTest.Converters
 
             Assert.Equal(4, errors);
         }
+    
+        [Fact]
+        public void CanConvertIdToCode()
+        {
+            var parse = String.Join(Environment.NewLine,
+                "<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>",
+                "  <Fragment>",
+                "    <RelatedBundle Id='D' Action='detect' />",
+                "    <RelatedBundle Id='U' Action='upgrade' />",
+                "    <RelatedBundle Id='A' Action='addon' />",
+                "    <RelatedBundle Id='P' Action='patch' />",
+                "  </Fragment>",
+                "</Wix>");
+
+            var expected = new[]
+            {
+                "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
+                "  <Fragment>",
+                "    <RelatedBundle Action=\"detect\" Code=\"D\" />",
+                "    <RelatedBundle Action=\"upgrade\" Code=\"U\" />",
+                "    <RelatedBundle Action=\"addon\" Code=\"A\" />",
+                "    <RelatedBundle Action=\"patch\" Code=\"P\" />",
+                "  </Fragment>",
+                "</Wix>"
+            };
+
+            var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+
+            var messaging = new MockMessaging();
+            var converter = new WixConverter(messaging, 2, null, null);
+
+            var errors = converter.ConvertDocument(document);
+
+            var actualLines = UnformattedDocumentLines(document);
+            WixAssert.CompareLineByLine(expected, actualLines);
+
+            WixAssert.CompareLineByLine(new[]
+            {
+                "[Converted] The RelatedBundle element's Id attribute has been renamed. Use the Code attribute instead. (RelatedBundleIdAttributeRenamed)",
+                "[Converted] The RelatedBundle element's Id attribute has been renamed. Use the Code attribute instead. (RelatedBundleIdAttributeRenamed)",
+                "[Converted] The RelatedBundle element's Id attribute has been renamed. Use the Code attribute instead. (RelatedBundleIdAttributeRenamed)",
+                "[Converted] The RelatedBundle element's Id attribute has been renamed. Use the Code attribute instead. (RelatedBundleIdAttributeRenamed)",
+            }, messaging.Messages.Select(m => m.ToString()).ToArray());
+
+            Assert.Equal(4, errors);
+        }
     }
 }
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
index 3280c608..9ff5e26c 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
@@ -166,7 +166,7 @@ namespace WixToolsetTest.CoreIntegration
                     var registrationElements = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Registration");
                     WixAssert.CompareLineByLine(new[]
                     {
-                        $"<Registration Id='{bundleSymbol.BundleId}' ExecutableName='test.exe' PerMachine='yes' Tag='' Version='1.0.0.0' ProviderKey='{bundleSymbol.BundleId}'>" +
+                        $"<Registration Code='{bundleSymbol.BundleCode}' ExecutableName='test.exe' PerMachine='yes' Tag='' Version='1.0.0.0' ProviderKey='{bundleSymbol.BundleCode}'>" +
                         "<Arp DisplayName='~TestBundle' DisplayVersion='1.0.0.0' InProgressDisplayName='~InProgressTestBundle' Publisher='Example Corporation' />" +
                         "</Registration>",
                     }, registrationElements);
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs
index f06d1e53..323b5eb0 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs
@@ -176,17 +176,17 @@ namespace WixToolsetTest.CoreIntegration
                 var manifestRelatedBundlesElements = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:RelatedBundle");
                 WixAssert.CompareLineByLine(new[]
                 {
-                    "<RelatedBundle Id='{6D4CE32B-FB91-45DA-A9B5-7E0D9929A3C3}' Action='Upgrade' />",
+                    "<RelatedBundle Code='{6D4CE32B-FB91-45DA-A9B5-7E0D9929A3C3}' Action='Upgrade' />",
                 }, manifestRelatedBundlesElements);
 
                 var ignoreAttributesByElementName = new Dictionary<string, List<string>>
                 {
-                    { "WixBundleProperties", new List<string> { "DisplayName", "Id" } },
+                    { "WixBundleProperties", new List<string> { "Code", "DisplayName" } },
                 };
                 var dataRelatedBundlesElements = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixBundleProperties", ignoreAttributesByElementName);
                 WixAssert.CompareLineByLine(new[]
                 {
-                    "<WixBundleProperties DisplayName='*' LogPathVariable='WixBundleLog' Compressed='no' Id='*' UpgradeCode='{6D4CE32B-FB91-45DA-A9B5-7E0D9929A3C3}' PerMachine='yes' />",
+                    "<WixBundleProperties BundleId='WixToolsetTest.BundleWithInvalidUpgradeCode' Code='*' DisplayName='*' LogPathVariable='WixBundleLog' Compressed='no' UpgradeCode='{6D4CE32B-FB91-45DA-A9B5-7E0D9929A3C3}' PerMachine='yes' />",
                 }, dataRelatedBundlesElements);
             }
         }
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/BundlePackageFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/BundlePackageFixture.cs
index ce5ad17c..d4ff0dbd 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/BundlePackageFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/BundlePackageFixture.cs
@@ -5,9 +5,8 @@ namespace WixToolsetTest.CoreIntegration
     using System.Collections.Generic;
     using System.IO;
     using System.Linq;
-    using System.Xml;
-    using WixInternal.TestSupport;
     using WixInternal.Core.TestPackage;
+    using WixInternal.TestSupport;
     using WixToolset.Data;
     using WixToolset.Data.Symbols;
     using Xunit;
@@ -51,7 +50,7 @@ namespace WixToolsetTest.CoreIntegration
 
                 Assert.True(File.Exists(chainBundlePath));
 
-                var chainBundleId = GetBundleIdFromWixpdb(chainPdbPath);
+                var chainBundleId = GetBundleCodeFromWixpdb(chainPdbPath);
 
                 // parent.exe
                 result = WixRunner.Execute(new[]
@@ -69,7 +68,7 @@ namespace WixToolsetTest.CoreIntegration
 
                 Assert.True(File.Exists(parentBundlePath));
 
-                var parentBundleId = GetBundleIdFromWixpdb(parentPdbPath);
+                var parentBundleId = GetBundleCodeFromWixpdb(parentPdbPath);
 
                 var extractResult = BundleExtractor.ExtractBAContainer(null, parentBundlePath, parentBaFolderPath, extractFolderPath);
                 extractResult.AssertSuccess();
@@ -81,9 +80,9 @@ namespace WixToolsetTest.CoreIntegration
                 var bundlePackages = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:BundlePackage", ignoreAttributesByElementName);
                 WixAssert.CompareLineByLine(new[]
                 {
-                    $"<BundlePackage Id='chain.exe' Cache='keep' CacheId='{chainBundleId}v1.0.0.0' InstallSize='34' Size='*' PerMachine='yes' Permanent='yes' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_chain.exe' RollbackLogPathVariable='WixBundleRollbackLog_chain.exe' BundleId='{chainBundleId}' Version='1.0.0.0' InstallArguments='' UninstallArguments='' RepairArguments='' SupportsBurnProtocol='yes' Win64='no' HideARP='yes'>" +
+                    $"<BundlePackage Id='chain.exe' Cache='keep' CacheId='{chainBundleId}v1.0.0.0' InstallSize='34' Size='*' PerMachine='yes' Permanent='yes' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_chain.exe' RollbackLogPathVariable='WixBundleRollbackLog_chain.exe' BundleCode='{chainBundleId}' Version='1.0.0.0' InstallArguments='' UninstallArguments='' RepairArguments='' SupportsBurnProtocol='yes' Win64='no' HideARP='yes'>" +
                     "<Provides Key='MyProviderKey,v1.0' Version='1.0.0.0' DisplayName='BurnBundle' Imported='yes' />" +
-                    "<RelatedBundle Id='{B94478B1-E1F3-4700-9CE8-6AA090854AEC}' Action='Upgrade' />" +
+                    "<RelatedBundle Code='{DFEA7F84-8F9D-5330-AAAE-7D849E650215}' Action='Upgrade' />" +
                     "<PayloadRef Id='chain.exe' />" +
                     "<PayloadRef Id='paydfjdGCAZtFxTeTjs0nIscHI86SY' />" +
                     "</BundlePackage>",
@@ -92,7 +91,7 @@ namespace WixToolsetTest.CoreIntegration
                 var registrations = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Registration");
                 WixAssert.CompareLineByLine(new[]
                 {
-                    $"<Registration Id='{parentBundleId}' ExecutableName='parent.exe' PerMachine='yes' Tag='' Version='1.0.1.0' ProviderKey='{parentBundleId}'>" +
+                    $"<Registration BundleId='WixToolsetTest.TestBundle' Code='{parentBundleId}' ExecutableName='parent.exe' PerMachine='yes' Tag='' Version='1.0.1.0' ProviderKey='{parentBundleId}'>" +
                     "<Arp DisplayName='BundlePackageBundle' DisplayVersion='1.0.1.0' Publisher='Example Corporation' />" +
                     "</Registration>"
                 }, registrations);
@@ -122,7 +121,7 @@ namespace WixToolsetTest.CoreIntegration
 
                 Assert.True(File.Exists(grandparentBundlePath));
 
-                var grandparentBundleId = GetBundleIdFromWixpdb(grandparentPdbPath);
+                var grandparentBundleId = GetBundleCodeFromWixpdb(grandparentPdbPath);
 
                 var grandparentExtractResult = BundleExtractor.ExtractBAContainer(null, grandparentBundlePath, grandparentBaFolderPath, extractFolderPath);
                 grandparentExtractResult.AssertSuccess();
@@ -134,9 +133,9 @@ namespace WixToolsetTest.CoreIntegration
                 bundlePackages = grandparentExtractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:BundlePackage", ignoreAttributesByElementName);
                 WixAssert.CompareLineByLine(new[]
                 {
-                    $"<BundlePackage Id='parent.exe' Cache='keep' CacheId='{parentBundleId}v1.0.1.0' InstallSize='34' Size='*' PerMachine='yes' Permanent='yes' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_parent.exe' RollbackLogPathVariable='WixBundleRollbackLog_parent.exe' BundleId='{parentBundleId}' Version='1.0.1.0' InstallArguments='' UninstallArguments='' RepairArguments='' SupportsBurnProtocol='yes' Win64='no'>" +
+                    $"<BundlePackage Id='parent.exe' Cache='keep' CacheId='{parentBundleId}v1.0.1.0' InstallSize='34' Size='*' PerMachine='yes' Permanent='yes' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_parent.exe' RollbackLogPathVariable='WixBundleRollbackLog_parent.exe' BundleCode='{parentBundleId}' Version='1.0.1.0' InstallArguments='' UninstallArguments='' RepairArguments='' SupportsBurnProtocol='yes' Win64='no'>" +
                     $"<Provides Key='{parentBundleId}' Version='1.0.1.0' DisplayName='BundlePackageBundle' Imported='yes' />" +
-                    "<RelatedBundle Id='{4BE34BEE-CA23-488E-96A0-B15878E3654B}' Action='Upgrade' />" +
+                    "<RelatedBundle Code='{DFEA7F84-8F9D-5330-AAAE-7D849E650215}' Action='Upgrade' />" +
                     "<PayloadRef Id='parent.exe' />" +
                     "</BundlePackage>",
                 }, bundlePackages);
@@ -155,7 +154,7 @@ namespace WixToolsetTest.CoreIntegration
                 registrations = grandparentExtractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Registration");
                 WixAssert.CompareLineByLine(new[]
                 {
-                    $"<Registration Id='{grandparentBundleId}' ExecutableName='grandparent.exe' PerMachine='yes' Tag='' Version='1.0.2.0' ProviderKey='{grandparentBundleId}'>" +
+                    $"<Registration BundleId='WixToolsetTest.TestBundle' Code='{grandparentBundleId}' ExecutableName='grandparent.exe' PerMachine='yes' Tag='' Version='1.0.2.0' ProviderKey='{grandparentBundleId}'>" +
                     "<Arp DisplayName='PermanentBundlePackageBundle' DisplayVersion='1.0.2.0' Publisher='Example Corporation' />" +
                     "</Registration>"
                 }, registrations);
@@ -203,7 +202,7 @@ namespace WixToolsetTest.CoreIntegration
 
                 var chainBundleId = "{216BDA7F-74BD-45E8-957B-500552F05629}";
 
-                var parentBundleId = GetBundleIdFromWixpdb(parentPdbPath);
+                var parentBundleId = GetBundleCodeFromWixpdb(parentPdbPath);
 
                 var extractResult = BundleExtractor.ExtractBAContainer(null, parentBundlePath, parentBaFolderPath, extractFolderPath);
                 extractResult.AssertSuccess();
@@ -215,9 +214,9 @@ namespace WixToolsetTest.CoreIntegration
                 var bundlePackages = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:BundlePackage", ignoreAttributesByElementName);
                 WixAssert.CompareLineByLine(new[]
                 {
-                    $"<BundlePackage Id='chain.exe' Cache='keep' CacheId='{chainBundleId}v1.0.0-foo.55' InstallSize='34' Size='*' PerMachine='yes' Permanent='yes' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_chain.exe' RollbackLogPathVariable='WixBundleRollbackLog_chain.exe' BundleId='{chainBundleId}' Version='1.0.0-foo.55' InstallArguments='' UninstallArguments='' RepairArguments='' SupportsBurnProtocol='yes' Win64='no'>" +
+                    $"<BundlePackage Id='chain.exe' Cache='keep' CacheId='{chainBundleId}v1.0.0-foo.55' InstallSize='34' Size='*' PerMachine='yes' Permanent='yes' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_chain.exe' RollbackLogPathVariable='WixBundleRollbackLog_chain.exe' BundleCode='{chainBundleId}' Version='1.0.0-foo.55' InstallArguments='' UninstallArguments='' RepairArguments='' SupportsBurnProtocol='yes' Win64='no'>" +
                     "<Provides Key='MyProviderKey,v1.0' Version='1.0.0-foo.55' DisplayName='BurnBundle' Imported='yes' />" +
-                    "<RelatedBundle Id='{B94478B1-E1F3-4700-9CE8-6AA090854AEC}' Action='Upgrade' />" +
+                    "<RelatedBundle Code='{B94478B1-E1F3-4700-9CE8-6AA090854AEC}' Action='Upgrade' />" +
                     "<PayloadRef Id='chain.exe' />" +
                     "</BundlePackage>",
                 }, bundlePackages);
@@ -225,7 +224,7 @@ namespace WixToolsetTest.CoreIntegration
                 var registrations = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Registration");
                 WixAssert.CompareLineByLine(new[]
                 {
-                    $"<Registration Id='{parentBundleId}' ExecutableName='parent.exe' PerMachine='yes' Tag='' Version='1.0.1.0' ProviderKey='{parentBundleId}'>" +
+                    $"<Registration BundleId='WixToolsetTest.TestBundle' Code='{parentBundleId}' ExecutableName='parent.exe' PerMachine='yes' Tag='' Version='1.0.1.0' ProviderKey='{parentBundleId}'>" +
                     "<Arp DisplayName='RemoteBundlePackageBundle' DisplayVersion='1.0.1.0' Publisher='Example Corporation' />" +
                     "</Registration>"
                 }, registrations);
@@ -281,7 +280,7 @@ namespace WixToolsetTest.CoreIntegration
 
                 Assert.True(File.Exists(parentBundlePath));
 
-                var parentBundleId = GetBundleIdFromWixpdb(parentPdbPath);
+                var parentBundleId = GetBundleCodeFromWixpdb(parentPdbPath);
 
                 var extractResult = BundleExtractor.ExtractBAContainer(null, parentBundlePath, baFolderPath, extractFolderPath);
                 extractResult.AssertSuccess();
@@ -293,9 +292,9 @@ namespace WixToolsetTest.CoreIntegration
                 var bundlePackages = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:BundlePackage", ignoreAttributesByElementName);
                 WixAssert.CompareLineByLine(new[]
                 {
-                    $"<BundlePackage Id='v3bundle.exe' Cache='keep' CacheId='{chainBundleId}v1.0.0.0' InstallSize='1135' Size='*' PerMachine='yes' Permanent='no' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_v3bundle.exe' RollbackLogPathVariable='WixBundleRollbackLog_v3bundle.exe' RepairCondition='0' BundleId='{chainBundleId}' Version='1.0.0.0' InstallArguments='' UninstallArguments='' RepairArguments='' SupportsBurnProtocol='yes' Win64='no'>" +
+                    $"<BundlePackage Id='v3bundle.exe' Cache='keep' CacheId='{chainBundleId}v1.0.0.0' InstallSize='1135' Size='*' PerMachine='yes' Permanent='no' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_v3bundle.exe' RollbackLogPathVariable='WixBundleRollbackLog_v3bundle.exe' RepairCondition='0' BundleCode='{chainBundleId}' Version='1.0.0.0' InstallArguments='' UninstallArguments='' RepairArguments='' SupportsBurnProtocol='yes' Win64='no'>" +
                     "<Provides Key='{215a70db-ab35-48c7-be51-d66eaac87177}' Version='1.0.0.0' DisplayName='CustomV3Theme' Imported='yes' />" +
-                    "<RelatedBundle Id='{2BF4C01F-C132-4E70-97AB-2BC68C7CCD10}' Action='Upgrade' />" +
+                    "<RelatedBundle Code='{2BF4C01F-C132-4E70-97AB-2BC68C7CCD10}' Action='Upgrade' />" +
                     "<PayloadRef Id='v3bundle.exe' />" +
                     "</BundlePackage>",
                 }, bundlePackages);
@@ -303,7 +302,7 @@ namespace WixToolsetTest.CoreIntegration
                 var registrations = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Registration");
                 WixAssert.CompareLineByLine(new[]
                 {
-                    $"<Registration Id='{parentBundleId}' ExecutableName='parent.exe' PerMachine='yes' Tag='' Version='1.1.1.1' ProviderKey='{parentBundleId}'>" +
+                    $"<Registration Code='{parentBundleId}' ExecutableName='parent.exe' PerMachine='yes' Tag='' Version='1.1.1.1' ProviderKey='{parentBundleId}'>" +
                     "<Arp DisplayName='V3BundlePackageBundle' DisplayVersion='1.1.1.1' Publisher='Example Corporation' />" +
                     "</Registration>"
                 }, registrations);
@@ -365,7 +364,7 @@ namespace WixToolsetTest.CoreIntegration
 
                 result.AssertSuccess();
 
-                var parentBundleId = GetBundleIdFromWixpdb(bundlePdbPath);
+                var parentBundleId = GetBundleCodeFromWixpdb(bundlePdbPath);
 
                 var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath);
                 extractResult.AssertSuccess();
@@ -373,7 +372,7 @@ namespace WixToolsetTest.CoreIntegration
                 var registrations = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Registration");
                 WixAssert.CompareLineByLine(new[]
                 {
-                    $"<Registration Id='{parentBundleId}' ExecutableName='bundle.exe' PerMachine='yes' Tag='' Version='9.9' ProviderKey='{parentBundleId}'>" +
+                    $"<Registration BundleId='WixToolsetTest.TestBundle' Code='{parentBundleId}' ExecutableName='bundle.exe' PerMachine='yes' Tag='' Version='9.9' ProviderKey='{parentBundleId}'>" +
                     "<Arp DisplayName='All Users Bundle' DisplayVersion='9.9' Publisher='Example Corporation' />" +
                     "</Registration>"
                 }, registrations);
@@ -391,7 +390,7 @@ namespace WixToolsetTest.CoreIntegration
             }
         }
 
-        private static string GetBundleIdFromWixpdb(string bundlePdbPath)
+        private static string GetBundleCodeFromWixpdb(string bundlePdbPath)
         {
             using (var wixOutput = WixOutput.Read(bundlePdbPath))
             {
@@ -400,7 +399,7 @@ namespace WixToolsetTest.CoreIntegration
                 var section = intermediate.Sections.Single();
 
                 var bundleSymbol = section.Symbols.OfType<WixBundleSymbol>().Single();
-                return bundleSymbol.BundleId;
+                return bundleSymbol.BundleCode;
             }
         }
     }
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/BurnRemotePayloadSubcommandFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/BurnRemotePayloadSubcommandFixture.cs
index 32ff5287..c1ca14e8 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/BurnRemotePayloadSubcommandFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/BurnRemotePayloadSubcommandFixture.cs
@@ -55,13 +55,13 @@ namespace WixToolsetTest.CoreIntegration
                 var ignoreAttributesByElementName = new Dictionary<string, List<string>>
                 {
                     { "BundlePackagePayload", new List<string> { "Size", "Hash" } },
-                    { "RemoteBundle", new List<string> { "BundleId", "EngineVersion", "ProviderKey" } },
+                    { "RemoteBundle", new List<string> { "BundleCode", "EngineVersion", "ProviderKey" } },
                     { "Payload", new List<string> { "Size", "Hash" } },
                 };
                 WixAssert.StringEqual(
                     "<BundlePackage>" +
                     "<BundlePackagePayload Name='test.exe' ProductName='DiversePayloadsBundle' Description='DiversePayloadsBundle' Hash='*' Size='*' Version='1.0.0.0'>" +
-                    "<RemoteBundle BundleId='*' DisplayName='DiversePayloadsBundle' EngineVersion='*' InstallSize='3790116' ManifestNamespace='http://wixtoolset.org/schemas/v4/2008/Burn' PerMachine='yes' ProviderKey='*' ProtocolVersion='1' Version='1.0.0.0' Win64='no' UpgradeCode='{FEF1D2B8-4737-4A2A-9F91-77F7294FB55B}' />" +
+                    "<RemoteBundle BundleCode='*' DisplayName='DiversePayloadsBundle' EngineVersion='*' InstallSize='3790116' ManifestNamespace='http://wixtoolset.org/schemas/v4/2008/Burn' PerMachine='yes' ProviderKey='*' ProtocolVersion='1' Version='1.0.0.0' Win64='no' UpgradeCode='{FEF1D2B8-4737-4A2A-9F91-77F7294FB55B}' />" +
                     "</BundlePackagePayload>" +
                     "</BundlePackage>", xml.GetTestXml(ignoreAttributesByElementName));
 
@@ -83,7 +83,7 @@ namespace WixToolsetTest.CoreIntegration
                 WixAssert.StringEqual(
                     "<BundlePackage>" +
                     "<BundlePackagePayload Name='test.exe' ProductName='DiversePayloadsBundle' Description='DiversePayloadsBundle' Hash='*' Size='*' Version='1.0.0.0'>" +
-                    "<RemoteBundle BundleId='*' DisplayName='DiversePayloadsBundle' EngineVersion='*' InstallSize='3790116' ManifestNamespace='http://wixtoolset.org/schemas/v4/2008/Burn' PerMachine='yes' ProviderKey='*' ProtocolVersion='1' Version='1.0.0.0' Win64='no' UpgradeCode='{FEF1D2B8-4737-4A2A-9F91-77F7294FB55B}' />" +
+                    "<RemoteBundle BundleCode='*' DisplayName='DiversePayloadsBundle' EngineVersion='*' InstallSize='3790116' ManifestNamespace='http://wixtoolset.org/schemas/v4/2008/Burn' PerMachine='yes' ProviderKey='*' ProtocolVersion='1' Version='1.0.0.0' Win64='no' UpgradeCode='{FEF1D2B8-4737-4A2A-9F91-77F7294FB55B}' />" +
                     "</BundlePackagePayload>" +
                     "<Payload Name='External.cab' Hash='*' Size='*' />" +
                     "<Payload Name='test.msi' Hash='*' Size='*' />" +
@@ -109,7 +109,7 @@ namespace WixToolsetTest.CoreIntegration
                 WixAssert.StringEqual(
                     "<BundlePackage>" +
                     "<BundlePackagePayload Name='test.exe' ProductName='DiversePayloadsBundle' Description='DiversePayloadsBundle' Hash='*' Size='*' Version='1.0.0.0'>" +
-                    "<RemoteBundle BundleId='*' DisplayName='DiversePayloadsBundle' EngineVersion='*' InstallSize='3790116' ManifestNamespace='http://wixtoolset.org/schemas/v4/2008/Burn' PerMachine='yes' ProviderKey='*' ProtocolVersion='1' Version='1.0.0.0' Win64='no' UpgradeCode='{FEF1D2B8-4737-4A2A-9F91-77F7294FB55B}' />" +
+                    "<RemoteBundle BundleCode='*' DisplayName='DiversePayloadsBundle' EngineVersion='*' InstallSize='3790116' ManifestNamespace='http://wixtoolset.org/schemas/v4/2008/Burn' PerMachine='yes' ProviderKey='*' ProtocolVersion='1' Version='1.0.0.0' Win64='no' UpgradeCode='{FEF1D2B8-4737-4A2A-9F91-77F7294FB55B}' />" +
                     "</BundlePackagePayload>" +
                     "<Payload Name='External.cab' Hash='*' Size='*' />" +
                     "<Payload Name='Windows8.1-KB2937592-x86.msu' Hash='*' Size='*' />" +
@@ -136,7 +136,7 @@ namespace WixToolsetTest.CoreIntegration
                 WixAssert.StringEqual(
                     "<BundlePackage>" +
                     "<BundlePackagePayload Name='test.exe' ProductName='DiversePayloadsBundle' Description='DiversePayloadsBundle' Hash='*' Size='*' Version='1.0.0.0'>" +
-                    "<RemoteBundle BundleId='*' DisplayName='DiversePayloadsBundle' EngineVersion='*' InstallSize='3790116' ManifestNamespace='http://wixtoolset.org/schemas/v4/2008/Burn' PerMachine='yes' ProviderKey='*' ProtocolVersion='1' Version='1.0.0.0' Win64='no' UpgradeCode='{FEF1D2B8-4737-4A2A-9F91-77F7294FB55B}' />" +
+                    "<RemoteBundle BundleCode='*' DisplayName='DiversePayloadsBundle' EngineVersion='*' InstallSize='3790116' ManifestNamespace='http://wixtoolset.org/schemas/v4/2008/Burn' PerMachine='yes' ProviderKey='*' ProtocolVersion='1' Version='1.0.0.0' Win64='no' UpgradeCode='{FEF1D2B8-4737-4A2A-9F91-77F7294FB55B}' />" +
                     "</BundlePackagePayload>" +
                     "<Payload Name='External.cab' Hash='*' Size='*' />" +
                     "<Payload Name='signed_bundle_engine.exe' ProductName='~TestBundle' Description='~TestBundle' Hash='*' Size='*' Version='1.0.0.0' />" +
@@ -182,7 +182,7 @@ namespace WixToolsetTest.CoreIntegration
                 {
                     @"<BundlePackage Visible='yes' CacheId='{C0BA713B-9CFE-42DF-B92C-883F6846B4BA}v3.14.0.4118C95FC39334E667F3DD3D'>",
                     @"  <BundlePackagePayload Name='signed_wix314_4118_engine.exe' ProductName='WiX Toolset v3.14.0.4118' Description='WiX Toolset v3.14.0.4118' DownloadUrl='http://wixtoolset.org/{0}' CertificatePublicKey='03169B5A32E602D436FC14EC14C435D7309945D4' CertificateThumbprint='C95FC39334E667F3DD3D82AF382E05719B88F7C1' Size='1088640' Version='3.14.0.4118'>",
-                    @"    <RemoteBundle BundleId='{C0BA713B-9CFE-42DF-B92C-883F6846B4BA}' DisplayName='WiX Toolset v3.14.0.4118' InstallSize='188426175' ManifestNamespace='http://schemas.microsoft.com/wix/2008/Burn' PerMachine='yes' ProviderKey='{c0ba713b-9cfe-42df-b92c-883f6846b4ba}' ProtocolVersion='1' Version='3.14.0.4118' Win64='no' UpgradeCode='{65E893AD-EDD5-4E7D-80CA-F0F50F383532}' />",
+                    @"    <RemoteBundle BundleCode='{C0BA713B-9CFE-42DF-B92C-883F6846B4BA}' DisplayName='WiX Toolset v3.14.0.4118' InstallSize='188426175' ManifestNamespace='http://schemas.microsoft.com/wix/2008/Burn' PerMachine='yes' ProviderKey='{c0ba713b-9cfe-42df-b92c-883f6846b4ba}' ProtocolVersion='1' Version='3.14.0.4118' Win64='no' UpgradeCode='{65E893AD-EDD5-4E7D-80CA-F0F50F383532}' />",
                     @"  </BundlePackagePayload>",
                     @"</BundlePackage>",
                 }, elements);
@@ -216,9 +216,9 @@ namespace WixToolsetTest.CoreIntegration
                 var msuPackages = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:BundlePackage");
                 WixAssert.CompareLineByLine(new string[]
                 {
-                    "<BundlePackage Id='signed_wix314_4118_engine.exe' Cache='keep' CacheId='{C0BA713B-9CFE-42DF-B92C-883F6846B4BA}v3.14.0.4118C95FC39334E667F3DD3D' InstallSize='188426175' Size='1088640' PerMachine='yes' Permanent='no' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_signed_wix314_4118_engine.exe' RollbackLogPathVariable='WixBundleRollbackLog_signed_wix314_4118_engine.exe' BundleId='{C0BA713B-9CFE-42DF-B92C-883F6846B4BA}' Version='3.14.0.4118' InstallArguments='' UninstallArguments='' RepairArguments='' SupportsBurnProtocol='yes' Win64='no'>" +
+                    "<BundlePackage Id='signed_wix314_4118_engine.exe' Cache='keep' CacheId='{C0BA713B-9CFE-42DF-B92C-883F6846B4BA}v3.14.0.4118C95FC39334E667F3DD3D' InstallSize='188426175' Size='1088640' PerMachine='yes' Permanent='no' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_signed_wix314_4118_engine.exe' RollbackLogPathVariable='WixBundleRollbackLog_signed_wix314_4118_engine.exe' BundleCode='{C0BA713B-9CFE-42DF-B92C-883F6846B4BA}' Version='3.14.0.4118' InstallArguments='' UninstallArguments='' RepairArguments='' SupportsBurnProtocol='yes' Win64='no'>" +
                     "<Provides Key='{c0ba713b-9cfe-42df-b92c-883f6846b4ba}' Version='3.14.0.4118' DisplayName='WiX Toolset v3.14.0.4118' Imported='yes' />" +
-                    "<RelatedBundle Id='{65E893AD-EDD5-4E7D-80CA-F0F50F383532}' Action='Upgrade' />" +
+                    "<RelatedBundle Code='{65E893AD-EDD5-4E7D-80CA-F0F50F383532}' Action='Upgrade' />" +
                     "<PayloadRef Id='signed_wix314_4118_engine.exe' />" +
                     "</BundlePackage>",
                 }, msuPackages);
@@ -253,7 +253,7 @@ namespace WixToolsetTest.CoreIntegration
                 {
                     "<BundlePackage Visible='yes'>",
                     "  <BundlePackagePayload Name='v3bundle.exe' ProductName='CustomV3Theme' Description='CustomV3Theme' DownloadUrl='https://www.example.com/files/{0}' Hash='80739E7B8C31D75B4CDC48D60D74F5E481CB904212A3AE3FB0920365A163FBF32B0C5C175AB516D4124F107923E96200605DE1D560D362FEB47350FA727823B4' Size='648397' Version='1.0.0.0'>",
-                    "    <RemoteBundle BundleId='{215A70DB-AB35-48C7-BE51-D66EAAC87177}' DisplayName='CustomV3Theme' InstallSize='1135' ManifestNamespace='http://schemas.microsoft.com/wix/2008/Burn' PerMachine='yes' ProviderKey='{215a70db-ab35-48c7-be51-d66eaac87177}' ProtocolVersion='1' Version='1.0.0.0' Win64='no' UpgradeCode='{2BF4C01F-C132-4E70-97AB-2BC68C7CCD10}' />",
+                    "    <RemoteBundle BundleCode='{215A70DB-AB35-48C7-BE51-D66EAAC87177}' DisplayName='CustomV3Theme' InstallSize='1135' ManifestNamespace='http://schemas.microsoft.com/wix/2008/Burn' PerMachine='yes' ProviderKey='{215a70db-ab35-48c7-be51-d66eaac87177}' ProtocolVersion='1' Version='1.0.0.0' Win64='no' UpgradeCode='{2BF4C01F-C132-4E70-97AB-2BC68C7CCD10}' />",
                     "  </BundlePackagePayload>",
                     "</BundlePackage>",
                 }, elements);
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/DependencyExtensionFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/DependencyExtensionFixture.cs
index 2d774a70..665ae18f 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/DependencyExtensionFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/DependencyExtensionFixture.cs
@@ -139,12 +139,12 @@ namespace WixToolsetTest.CoreIntegration
 
                 var ignoreAttributesByElementName = new Dictionary<string, List<string>>
                 {
-                    { "Registration", new List<string> { "Id" } },
+                    { "Registration", new List<string> { "Id", "Code" } },
                 };
                 var registration = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Registration", ignoreAttributesByElementName);
                 WixAssert.CompareLineByLine(new string[]
                 {
-                    "<Registration Id='*' ExecutableName='test.exe' PerMachine='yes' Tag='' Version='1.0.0.0' ProviderKey='MyProviderKey,v1.0'><Arp DisplayName='BurnBundle' DisplayVersion='1.0.0.0' Publisher='Example Corporation' /></Registration>",
+                    "<Registration BundleId='WixToolsetTest.TestBundle' Code='*' ExecutableName='test.exe' PerMachine='yes' Tag='' Version='1.0.0.0' ProviderKey='MyProviderKey,v1.0'><Arp DisplayName='BurnBundle' DisplayVersion='1.0.0.0' Publisher='Example Corporation' /></Registration>",
                 }, registration);
             }
         }
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleAllUsers/BundleWithAllUsersPackage.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleAllUsers/BundleWithAllUsersPackage.wxs
index df995fc7..97463691 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleAllUsers/BundleWithAllUsersPackage.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleAllUsers/BundleWithAllUsersPackage.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Bundle Name="All Users Bundle" Version="9.9" Manufacturer="Example Corporation" UpgradeCode="{4BE34BEE-CA23-488E-96A0-B15878E3654B}" Compressed="no">
+  <Bundle Id="WixToolsetTest.TestBundle" Name="All Users Bundle" Version="9.9" Manufacturer="Example Corporation" Compressed="no">
     <BootstrapperApplication SourceFile="fakeba.dll" />
 
     <Chain>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleBackwardsCompatible/BundleWithBootstrapperApplicationDll.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleBackwardsCompatible/BundleWithBootstrapperApplicationDll.wxs
index 0178b3d3..30bea7ee 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleBackwardsCompatible/BundleWithBootstrapperApplicationDll.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleBackwardsCompatible/BundleWithBootstrapperApplicationDll.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Bundle Name="BundlePackageBundle" Version="1.0.1.0" Manufacturer="Example Corporation" UpgradeCode="{4BE34BEE-CA23-488E-96A0-B15878E3654B}" Compressed="no">
+  <Bundle Id="WixToolsetTest.TestBundle" Name="BundlePackageBundle" Version="1.0.1.0" Manufacturer="Example Corporation" Compressed="no">
     <BootstrapperApplication>
       <BootstrapperApplicationDll SourceFile="fakeba.dll" />
     </BootstrapperApplication>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleBackwardsCompatible/BundleWithBootstrapperApplicationSourceAndBootstrapperApplicationDll.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleBackwardsCompatible/BundleWithBootstrapperApplicationSourceAndBootstrapperApplicationDll.wxs
index 1807c5a8..a5e53155 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleBackwardsCompatible/BundleWithBootstrapperApplicationSourceAndBootstrapperApplicationDll.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleBackwardsCompatible/BundleWithBootstrapperApplicationSourceAndBootstrapperApplicationDll.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Bundle Name="BundlePackageBundle" Version="1.0.1.0" Manufacturer="Example Corporation" UpgradeCode="{4BE34BEE-CA23-488E-96A0-B15878E3654B}" Compressed="no">
+  <Bundle Id="WixToolsetTest.TestBundle" Name="BundlePackageBundle" Version="1.0.1.0" Manufacturer="Example Corporation" Compressed="no">
     <BootstrapperApplication SourceFile="fakeba.dll">
       <BootstrapperApplicationDll SourceFile="fakeba.dll" />
     </BootstrapperApplication>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleBindVariables/BindVarBundleVersion.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleBindVariables/BindVarBundleVersion.wxs
index 8dc3f7f4..b359b154 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleBindVariables/BindVarBundleVersion.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleBindVariables/BindVarBundleVersion.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Bundle Name="BindVarBundleVersion" Version="!(wix.BundleVersion)" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
+  <Bundle Id="WixToolsetTest.TestBundle" Name="BindVarBundleVersion" Version="!(wix.BundleVersion)" Manufacturer="Example Corporation">
     <BootstrapperApplication Id="fakeba" SourceFile="fakeba.dll" />
 
     <Chain>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleLocalized/BundleWithLocalizedUpgradeCode.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleLocalized/BundleWithLocalizedUpgradeCode.wxs
index 7a7db4db..5df14288 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleLocalized/BundleWithLocalizedUpgradeCode.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleLocalized/BundleWithLocalizedUpgradeCode.wxs
@@ -1,5 +1,6 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Bundle Name="BundleWithInvalidUpgradeCode"
+    <Bundle Id="WixToolsetTest.BundleWithInvalidUpgradeCode"
+            Name="BundleWithInvalidUpgradeCode"
             Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="!(loc.UpgradeCode)">
         <BootstrapperApplication SourceFile="fakeba.dll" />
 
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePackage/BundlePackage.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePackage/BundlePackage.wxs
index 3ac4eced..64d9e82b 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePackage/BundlePackage.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePackage/BundlePackage.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Bundle Name="BundlePackageBundle" Version="1.0.1.0" Manufacturer="Example Corporation" UpgradeCode="{4BE34BEE-CA23-488E-96A0-B15878E3654B}" Compressed="no">
+  <Bundle Id="WixToolsetTest.TestBundle" Name="BundlePackageBundle" Version="1.0.1.0" Manufacturer="Example Corporation" Compressed="no">
     <BootstrapperApplication SourceFile="fakeba.dll" />
 
     <Chain>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePackage/PermanentBundlePackage.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePackage/PermanentBundlePackage.wxs
index 8c2a4dd7..73fcddbb 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePackage/PermanentBundlePackage.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePackage/PermanentBundlePackage.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Bundle Name="PermanentBundlePackageBundle" Version="1.0.2.0" Manufacturer="Example Corporation" UpgradeCode="{1752611C-3D8C-461E-A0A0-B0F07CBBD6FC}">
+  <Bundle Id="WixToolsetTest.TestBundle" Name="PermanentBundlePackageBundle" Version="1.0.2.0" Manufacturer="Example Corporation">
     <BootstrapperApplication SourceFile="fakeba.dll" />
 
     <Chain>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePackage/RemoteBundlePackage.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePackage/RemoteBundlePackage.wxs
index 23bc12dc..ecbe6bc5 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePackage/RemoteBundlePackage.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePackage/RemoteBundlePackage.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Bundle Name="RemoteBundlePackageBundle" Version="1.0.1.0" Manufacturer="Example Corporation" UpgradeCode="{9BE68A41-FD0E-4E25-B607-D636E42AFEF6}">
+  <Bundle Id="WixToolsetTest.TestBundle" Name="RemoteBundlePackageBundle" Version="1.0.1.0" Manufacturer="Example Corporation">
     <BootstrapperApplication SourceFile="fakeba.dll" />
 
     <Chain>
@@ -9,7 +9,7 @@
                               Description="BurnBundleDescription"
                               Size="123456789"
                               Hash="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA">
-            <RemoteBundle BundleId="{216BDA7F-74BD-45E8-957B-500552F05629}"
+            <RemoteBundle BundleCode="{216BDA7F-74BD-45E8-957B-500552F05629}"
                           DisplayName="BurnBundle"
                           InstallSize="34"
                           ManifestNamespace="http://wixtoolset.org/schemas/v4/2008/Burn"
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleTag/BundleWithTag.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleTag/BundleWithTag.wxs
index 65946d5b..3f63cbc8 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleTag/BundleWithTag.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleTag/BundleWithTag.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" >
-  <Bundle Name="~TagTestBundle" Version="4.3.2.1" Manufacturer="Example Corporation" UpgradeCode="047730A5-30FE-4A62-A520-DA9381B8226A">
+  <Bundle Id="WixToolsetTest.TestBundle" Name="~TagTestBundle" Version="4.3.2.1" Manufacturer="Example Corporation">
     <BootstrapperApplication SourceFile="fakeba.dll" />
 
     <SoftwareTag Regid="wixtoolset.org" InstallPath="[ProgramFiles6432Folder]\Test\swidtag" />
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleUncompressed/UncompressedBundle.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleUncompressed/UncompressedBundle.wxs
index 766fbb66..62d14e63 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleUncompressed/UncompressedBundle.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleUncompressed/UncompressedBundle.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Bundle Name="BurnBundle" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="B94478B1-E1F3-4700-9CE8-6AA090854AEC" Compressed="no">
+    <Bundle Id="WixToolsetTest.TestBundle" Name="BurnBundle" Version="1.0.0.0" Manufacturer="Example Corporation" Compressed="no">
         <BootstrapperApplication SourceFile="fakeba.dll" />
 
         <Chain>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithApprovedExe/Bundle.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithApprovedExe/Bundle.wxs
index 78e754c1..b53d9979 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithApprovedExe/Bundle.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithApprovedExe/Bundle.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Bundle Name="BurnBundle" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="B94478B1-E1F3-4700-9CE8-6AA090854AEC">
+    <Bundle Id="WixToolsetTest.TestBundle" Name="BurnBundle" Version="1.0.0.0" Manufacturer="Example Corporation">
         <ApprovedExeForElevation Id="TestExe" Key="WixToolset\BurnTesting" Value="Test" Bitness="always32" />
     </Bundle>
-</Wix>
\ No newline at end of file
+</Wix>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithApprovedExe/Bundle64.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithApprovedExe/Bundle64.wxs
index 18cdfd32..b5ad8a15 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithApprovedExe/Bundle64.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithApprovedExe/Bundle64.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Bundle Name="BurnBundle64" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="B94478B1-E1F3-4700-9CE8-6AA090854AEC">
+    <Bundle Id="WixToolsetTest.TestBundle" Name="BurnBundle64" Version="1.0.0.0" Manufacturer="Example Corporation">
         <ApprovedExeForElevation Id="TestExe" Key="WixToolset\BurnTesting" Value="Test" Bitness="always64" />
     </Bundle>
-</Wix>
\ No newline at end of file
+</Wix>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithInvalid/BundleWithInvalidIcon.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithInvalid/BundleWithInvalidIcon.wxs
index 82ea2cda..57f6fff0 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithInvalid/BundleWithInvalidIcon.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithInvalid/BundleWithInvalidIcon.wxs
@@ -1,6 +1,6 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Bundle Name="BundleWithIcon" IconSourceFile="burn.exe"
-            Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="B94478B1-E1F3-4700-9CE8-6AA090854AEC">
+    <Bundle Id="WixToolsetTest.TestBundle" Name="BundleWithIcon" IconSourceFile="burn.exe"
+            Version="1.0.0.0" Manufacturer="Example Corporation">
         <BootstrapperApplication SourceFile="fakeba.dll" />
 
         <Chain>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithInvalid/BundleWithMissingBA.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithInvalid/BundleWithMissingBA.wxs
index e663f055..aede9ccf 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithInvalid/BundleWithMissingBA.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithInvalid/BundleWithMissingBA.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Bundle Name="BundleWithMissingBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="B94478B1-E1F3-4700-9CE8-6AA090854AEC">
+    <Bundle Id="WixToolsetTest.TestBundle" Name="BundleWithMissingBA" Version="1.0.0.0" Manufacturer="Example Corporation">
         <Chain>
             <ExePackage DetectCondition="DetectedSomething" UninstallArguments="-uninstall" SourceFile="burn.exe" />
         </Chain>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithMissingSource/BundleMissingMsiSource.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithMissingSource/BundleMissingMsiSource.wxs
index 7032567f..df1c13ad 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithMissingSource/BundleMissingMsiSource.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithMissingSource/BundleMissingMsiSource.wxs
@@ -1,6 +1,6 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Bundle Name="BundleMissingMsiSource"
-            Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="B94478B1-E1F3-4700-9CE8-6AA090854AEC">
+    <Bundle Id="WixToolsetTest.TestBundle" Name="BundleMissingMsiSource"
+            Version="1.0.0.0" Manufacturer="Example Corporation">
         <BootstrapperApplication SourceFile="fakeba.dll" />
 
         <Chain>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithMissingSource/BundleMissingMsuSource.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithMissingSource/BundleMissingMsuSource.wxs
index 04885753..b50e39f7 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithMissingSource/BundleMissingMsuSource.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithMissingSource/BundleMissingMsuSource.wxs
@@ -1,6 +1,6 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Bundle Name="BundleMissingMsuSource"
-            Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="B94478B1-E1F3-4700-9CE8-6AA090854AEC">
+    <Bundle Id="WixToolsetTest.TestBundle" Name="BundleMissingMsuSource"
+            Version="1.0.0.0" Manufacturer="Example Corporation">
         <BootstrapperApplication SourceFile="fakeba.dll" />
 
         <Chain>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithPackageGroupRef/Bundle.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithPackageGroupRef/Bundle.wxs
index 8ea74fe4..c7fe89fc 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithPackageGroupRef/Bundle.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundleWithPackageGroupRef/Bundle.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Bundle Name="BurnBundle" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="B94478B1-E1F3-4700-9CE8-6AA090854AEC">
+    <Bundle Id="WixToolsetTest.TestBundle" Name="BurnBundle" Version="1.0.0.0" Manufacturer="Example Corporation">
         <BootstrapperApplication SourceFile="fakeba.dll">
             <PayloadGroupRef Id="ExtraBootstrapperApplicationPayloads" />
         </BootstrapperApplication>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Container/LayoutPayloadInContainer.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Container/LayoutPayloadInContainer.wxs
index 3cee41d2..3ec53df4 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Container/LayoutPayloadInContainer.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Container/LayoutPayloadInContainer.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Bundle Name="BurnBundle" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="{B5B23622-239B-4E3B-BDAB-67648CB975BF}">
+    <Bundle Id="WixToolsetTest.TestBundle" Name="BurnBundle" Version="1.0.0.0" Manufacturer="Example Corporation">
         <BootstrapperApplication SourceFile="fakeba.dll" />
 
         <Chain>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Dependency/CustomProviderKeyBundle.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Dependency/CustomProviderKeyBundle.wxs
index ba871fa3..6b2499ec 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Dependency/CustomProviderKeyBundle.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Dependency/CustomProviderKeyBundle.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Bundle Name="BurnBundle" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="B94478B1-E1F3-4700-9CE8-6AA090854AEC" ProviderKey="MyProviderKey,v1.0">
+    <Bundle Id="WixToolsetTest.TestBundle" Name="BurnBundle" Version="1.0.0.0" Manufacturer="Example Corporation" ProviderKey="MyProviderKey,v1.0">
         <BootstrapperApplication SourceFile="fakeba.dll" />
 
         <Chain>
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleBundle/Bundle.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleBundle/Bundle.wxs
index 60b03b97..d5aa99ba 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleBundle/Bundle.wxs
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleBundle/Bundle.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Bundle Name="SimpleBundle" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="6670d5c9-bbec-4828-ab60-4a1c0ffeb97d">
+    <Bundle Id="WixToolsetTest.TestBundle" Name="SimpleBundle" Version="1.0.0.0" Manufacturer="Example Corporation">
         <BootstrapperApplication SourceFile="test.txt" />
 
         <Chain>
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/Bundle.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/Bundle.wxs
index e38feacb..e5b7c5ce 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/Bundle.wxs
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/Bundle.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Bundle Name="UncompressedBundle" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="{AB04C2A5-8312-4464-AE01-7F3A3D9C2BCF}" Compressed="no">
+    <Bundle Id="WixToolsetTest.TestBundle" Name="UncompressedBundle" Version="1.0.0.0" Manufacturer="Example Corporation" Compressed="no">
         <BootstrapperApplication SourceFile="test.txt" />
 
         <Chain>
diff --git a/src/wix/wix.v3.ncrunchsolution b/src/wix/wix.v3.ncrunchsolution
index 10420ac9..fe9b0700 100644
--- a/src/wix/wix.v3.ncrunchsolution
+++ b/src/wix/wix.v3.ncrunchsolution
@@ -1,6 +1,8 @@
 <SolutionConfiguration>
   <Settings>
     <AllowParallelTestExecution>True</AllowParallelTestExecution>
+    <EnableRDI>False</EnableRDI>
+    <RdiConfigured>True</RdiConfigured>
     <SolutionConfigured>True</SolutionConfigured>
   </Settings>
 </SolutionConfiguration>
\ No newline at end of file