Better .nupkg names

324 files changed, 534 insertions, 607 deletions

diff --git a/src/api/api.cmd b/src/api/api.cmd
index c0ba7f29..42453449 100644
--- a/src/api/api.cmd
+++ b/src/api/api.cmd
@@ -28,7 +28,7 @@ msbuild api_t.proj -p:Configuration=%_C% -tl -nologo -warnaserror -bl:%_L%\api_b
 :: Test
 dotnet test ^
  %_B%\net6.0\WixToolsetTest.Data.dll ^
- %_B%\net6.0\win-x86\WixToolsetTest.Mba.Core.dll ^
+ %_B%\net6.0\win-x86\WixToolsetTest.BootstrapperApplicationApi.dll ^
  %_B%\x86\BalUtilUnitTest.dll ^
  %_B%\x86\BextUtilUnitTest.dll ^
  --nologo -l "trx;LogFileName=%_L%\TestResults\api.trx" || exit /b
@@ -37,19 +37,15 @@ dotnet test ^
 
 :clean
 @rd /s/q "..\..\build\api" 2> nul
-@del "..\..\build\artifacts\WixToolset.BalUtil.*.nupkg" 2> nul
 @del "..\..\build\artifacts\WixToolset.BextUtil.*.nupkg" 2> nul
-@del "..\..\build\artifacts\WixToolset.BootstrapperCore.Native.*.nupkg" 2> nul
 @del "..\..\build\artifacts\WixToolset.Data.*.nupkg" 2> nul
 @del "..\..\build\artifacts\WixToolset.Extensibility.*.nupkg" 2> nul
-@del "..\..\build\artifacts\WixToolset.Mba.Core.*.nupkg" 2> nul
+@del "..\..\build\artifacts\WixToolset.BootstrapperApplicationApi.*.nupkg" 2> nul
 @del "%_L%\TestResults\api.trx" 2> nul
-@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.balutil" 2> nul
 @rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.bextutil" 2> nul
-@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.bootstrappercore.native" 2> nul
 @rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.data" 2> nul
 @rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.extensibility" 2> nul
-@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.mba.core" 2> nul
+@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.bootstrapperapplicationapi" 2> nul
 @exit /b
 
 :end
diff --git a/src/api/api.sln b/src/api/api.sln
index bdde8794..70df4141 100644
--- a/src/api/api.sln
+++ b/src/api/api.sln
@@ -23,9 +23,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BalUtilUnitTest", "burn\tes
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BextUtilUnitTest", "burn\test\BextUtilUnitTest\BextUtilUnitTest.vcxproj", "{B69E6422-49B0-4E28-92F9-B8A7410A6ED9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Mba.Core", "burn\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj", "{17DA3E92-40C5-4328-9BA5-1FE459A13719}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.BootstrapperApplicationApi", "burn\test\WixToolsetTest.BootstrapperApplicationApi\WixToolsetTest.BootstrapperApplicationApi.csproj", "{17DA3E92-40C5-4328-9BA5-1FE459A13719}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Mba.Core", "burn\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj", "{47029283-43EC-4F22-9417-A02B28594912}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.BootstrapperApplicationApi", "burn\WixToolset.BootstrapperApplicationApi\WixToolset.BootstrapperApplicationApi.csproj", "{47029283-43EC-4F22-9417-A02B28594912}"
 EndProject
 Global
         GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/api/burn/WixToolset.Mba.Core/BalUtil.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/BalUtil.cs
index e8b0b7c0..25257554 100644
--- a/src/api/burn/WixToolset.Mba.Core/BalUtil.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/BalUtil.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     using System;
     using System.Runtime.InteropServices;
diff --git a/src/api/burn/WixToolset.Mba.Core/BaseBootstrapperApplicationFactory.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/BaseBootstrapperApplicationFactory.cs
index 25995e27..88b136a6 100644
--- a/src/api/burn/WixToolset.Mba.Core/BaseBootstrapperApplicationFactory.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/BaseBootstrapperApplicationFactory.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     using System;
     using System.Runtime.InteropServices;
diff --git a/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/BootstrapperApplication.cs
index 98b34217..f9fca748 100644
--- a/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/BootstrapperApplication.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     using System;
     using System.Runtime.InteropServices;
diff --git a/src/api/burn/WixToolset.Mba.Core/BootstrapperApplicationData.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/BootstrapperApplicationData.cs
index 13428493..10cb863f 100644
--- a/src/api/burn/WixToolset.Mba.Core/BootstrapperApplicationData.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/BootstrapperApplicationData.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     using System;
     using System.IO;
diff --git a/src/api/burn/WixToolset.Mba.Core/BootstrapperApplicationFactoryAttribute.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/BootstrapperApplicationFactoryAttribute.cs
index 6b465408..9b64e838 100644
--- a/src/api/burn/WixToolset.Mba.Core/BootstrapperApplicationFactoryAttribute.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/BootstrapperApplicationFactoryAttribute.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     using System;
 
diff --git a/src/api/burn/WixToolset.Mba.Core/BootstrapperCommand.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/BootstrapperCommand.cs
index b96a8f95..612e8ce9 100644
--- a/src/api/burn/WixToolset.Mba.Core/BootstrapperCommand.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/BootstrapperCommand.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     using System;
     using System.CodeDom.Compiler;
diff --git a/src/api/burn/WixToolset.Mba.Core/BundleInfo.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/BundleInfo.cs
index 0039f375..14cac881 100644
--- a/src/api/burn/WixToolset.Mba.Core/BundleInfo.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/BundleInfo.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     using System;
     using System.Collections.Generic;
diff --git a/src/api/burn/WixToolset.Mba.Core/Engine.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/Engine.cs
index df412e8c..487858e0 100644
--- a/src/api/burn/WixToolset.Mba.Core/Engine.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/Engine.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     using System;
     using System.ComponentModel;
diff --git a/src/api/burn/WixToolset.Mba.Core/EventArgs.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/EventArgs.cs
index 6506c840..e1649d43 100644
--- a/src/api/burn/WixToolset.Mba.Core/EventArgs.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/EventArgs.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     using System;
     using System.Collections.Generic;
diff --git a/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperApplication.cs
index 8a255c44..ad7f8dd7 100644
--- a/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperApplication.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     using System;
     using System.Runtime.InteropServices;
diff --git a/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplicationData.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperApplicationData.cs
index 23a1c8a3..d26d89c1 100644
--- a/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplicationData.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperApplicationData.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     using System.IO;
 
@@ -19,4 +19,4 @@ namespace WixToolset.Mba.Core
         /// </summary>
         IBundleInfo Bundle { get; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplicationFactory.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperApplicationFactory.cs
index 393c7e31..ac90c0b7 100644
--- a/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplicationFactory.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperApplicationFactory.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     using System;
     using System.CodeDom.Compiler;
diff --git a/src/api/burn/WixToolset.Mba.Core/IBootstrapperCommand.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperCommand.cs
index f583e619..a1f8bfe0 100644
--- a/src/api/burn/WixToolset.Mba.Core/IBootstrapperCommand.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperCommand.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     using System;
 
diff --git a/src/api/burn/WixToolset.Mba.Core/IBootstrapperEngine.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperEngine.cs
index a175bead..1e91cd31 100644
--- a/src/api/burn/WixToolset.Mba.Core/IBootstrapperEngine.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperEngine.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     using System;
     using System.CodeDom.Compiler;
diff --git a/src/api/burn/WixToolset.Mba.Core/IBundleInfo.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/IBundleInfo.cs
index 3c52fc02..a4d07597 100644
--- a/src/api/burn/WixToolset.Mba.Core/IBundleInfo.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/IBundleInfo.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     using System.Collections.Generic;
 
diff --git a/src/api/burn/WixToolset.Mba.Core/IDefaultBootstrapperApplication.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/IDefaultBootstrapperApplication.cs
index 51ea4e4d..ad51b2be 100644
--- a/src/api/burn/WixToolset.Mba.Core/IDefaultBootstrapperApplication.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/IDefaultBootstrapperApplication.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     using System;
 
diff --git a/src/api/burn/WixToolset.Mba.Core/IEngine.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/IEngine.cs
index dde97a70..8e6a293b 100644
--- a/src/api/burn/WixToolset.Mba.Core/IEngine.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/IEngine.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     using System;
     using System.ComponentModel;
diff --git a/src/api/burn/WixToolset.Mba.Core/IMbaCommand.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/IMbaCommand.cs
index 495b2f44..37640a87 100644
--- a/src/api/burn/WixToolset.Mba.Core/IMbaCommand.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/IMbaCommand.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     using System.Collections.Generic;
 
diff --git a/src/api/burn/WixToolset.Mba.Core/IOverridableVariableInfo.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/IOverridableVariableInfo.cs
index d01dead3..173963a8 100644
--- a/src/api/burn/WixToolset.Mba.Core/IOverridableVariableInfo.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/IOverridableVariableInfo.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     /// <summary>
     /// Overridable variable from the BA manifest.
@@ -12,4 +12,4 @@ namespace WixToolset.Mba.Core
         /// </summary>
         string Name { get; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/api/burn/WixToolset.Mba.Core/IOverridableVariables.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/IOverridableVariables.cs
index 2b26d7b6..2cf7b8d9 100644
--- a/src/api/burn/WixToolset.Mba.Core/IOverridableVariables.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/IOverridableVariables.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     using System.Collections.Generic;
 
diff --git a/src/api/burn/WixToolset.Mba.Core/IPackageInfo.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/IPackageInfo.cs
index b1036143..e2512584 100644
--- a/src/api/burn/WixToolset.Mba.Core/IPackageInfo.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/IPackageInfo.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     /// <summary>
     /// Package information from the BA manifest.
@@ -68,7 +68,7 @@ namespace WixToolset.Mba.Core
         string PrereqLicenseUrl { get; }
 
         /// <summary>
-        /// See <see cref="WixToolset.Mba.Core.PrimaryPackageType"/>
+        /// See <see cref="WixToolset.BootstrapperApplicationApi.PrimaryPackageType"/>
         /// </summary>
         PrimaryPackageType PrimaryPackageType { get; }
 
diff --git a/src/api/burn/WixToolset.Mba.Core/ManagedBootstrapperApplication.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/ManagedBootstrapperApplication.cs
index 74bfbd73..77c5eaca 100644
--- a/src/api/burn/WixToolset.Mba.Core/ManagedBootstrapperApplication.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/ManagedBootstrapperApplication.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     /// <summary>
     /// Managed bootstrapper application entry point.
diff --git a/src/api/burn/WixToolset.Mba.Core/MbaCommand.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/MbaCommand.cs
index bd93b7e7..c46b5844 100644
--- a/src/api/burn/WixToolset.Mba.Core/MbaCommand.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/MbaCommand.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     using System;
     using System.Collections.Generic;
diff --git a/src/api/burn/WixToolset.Mba.Core/MbaNative.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/MbaNative.cs
index e8e9d576..6e135fc3 100644
--- a/src/api/burn/WixToolset.Mba.Core/MbaNative.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/MbaNative.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     using System;
     using System.Runtime.InteropServices;
@@ -8,7 +8,7 @@ namespace WixToolset.Mba.Core
     internal static class MbaNative
     {
         [DllImport("mbanative.dll", ExactSpelling = true, PreserveSig = false)]
-        internal static extern void BootstrapperApplicationDebuggerCheck();
+        internal static extern void BalDebuggerCheck();
 
         [DllImport("mbanative.dll", ExactSpelling = true, PreserveSig = false)]
         internal static extern void BootstrapperApplicationRun(
diff --git a/src/api/burn/WixToolset.Mba.Core/NativeMethods.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/NativeMethods.cs
index 45a0bc4d..4ef9f35e 100644
--- a/src/api/burn/WixToolset.Mba.Core/NativeMethods.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/NativeMethods.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     using System;
     using System.Runtime.InteropServices;
diff --git a/src/api/burn/WixToolset.Mba.Core/OverridableVariableInfo.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/OverridableVariableInfo.cs
index b8e85c34..8b90c588 100644
--- a/src/api/burn/WixToolset.Mba.Core/OverridableVariableInfo.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/OverridableVariableInfo.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     /// <summary>
     /// Default implementation of <see cref="IOverridableVariableInfo"/>.
diff --git a/src/api/burn/WixToolset.Mba.Core/OverridableVariables.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/OverridableVariables.cs
index 121c6aee..98f8ec81 100644
--- a/src/api/burn/WixToolset.Mba.Core/OverridableVariables.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/OverridableVariables.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     using System;
     using System.Collections.Generic;
diff --git a/src/api/burn/WixToolset.Mba.Core/PackageInfo.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/PackageInfo.cs
index b91c52c9..e835f9ea 100644
--- a/src/api/burn/WixToolset.Mba.Core/PackageInfo.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/PackageInfo.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     using System;
     using System.Collections.Generic;
diff --git a/src/api/burn/WixToolset.Mba.Core/StrUtil.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/StrUtil.cs
index 5daef8e3..aeeaac47 100644
--- a/src/api/burn/WixToolset.Mba.Core/StrUtil.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/StrUtil.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     using System;
     using System.Runtime.InteropServices;
diff --git a/src/api/burn/WixToolset.Mba.Core/VerUtil.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/VerUtil.cs
index 3573f9d3..082ee06c 100644
--- a/src/api/burn/WixToolset.Mba.Core/VerUtil.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/VerUtil.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     using System;
     using System.Runtime.InteropServices;
diff --git a/src/api/burn/WixToolset.Mba.Core/VerUtilVersion.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/VerUtilVersion.cs
index e0312474..65b195a4 100644
--- a/src/api/burn/WixToolset.Mba.Core/VerUtilVersion.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/VerUtilVersion.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     using System;
     using System.Runtime.InteropServices;
diff --git a/src/api/burn/WixToolset.Mba.Core/VerUtilVersionReleaseLabel.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/VerUtilVersionReleaseLabel.cs
index 97e8190d..03603714 100644
--- a/src/api/burn/WixToolset.Mba.Core/VerUtilVersionReleaseLabel.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/VerUtilVersionReleaseLabel.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Mba.Core
+namespace WixToolset.BootstrapperApplicationApi
 {
     using System;
     using System.Runtime.InteropServices;
diff --git a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj b/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.csproj
index 9d2e4077..2fe6d5bb 100644
--- a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.csproj
@@ -4,10 +4,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
-    <AssemblyName>WixToolset.Mba.Core</AssemblyName>
-    <RootNamespace>WixToolset.Mba.Core</RootNamespace>
+    <AssemblyName>WixToolset.BootstrapperApplicationApi</AssemblyName>
+    <RootNamespace>WixToolset.BootstrapperApplicationApi</RootNamespace>
     <DebugType>embedded</DebugType>
-    <Description>Managed Bootstrapper Application Core</Description>
+    <Description>Managed Bootstrapper Application API</Description>
     <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
     <CreateDocumentationFile>true</CreateDocumentationFile>
   </PropertyGroup>
diff --git a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec b/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec
index 0a9bcb5d..22099635 100644
--- a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.nuspec
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec
@@ -15,11 +15,18 @@
     <dependencies>
       <group targetFramework=".NETFramework4.6.2" />
       <group targetFramework=".NETStandard2.0" />
+      <group targetFramework="Native">
+        <dependency id="WixToolset.DUtil" version="[$version$,5)" />
+      </group>
     </dependencies>
   </metadata>
 
   <files>
     <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
+
+    <file src="$projectFolder$\build\WixToolset.BootstrapperApplicationApi.props" target="build\" />
+
+    <file src="$projectFolder$\build\_._" target="lib\native" />
     <file src="net462\$id$.dll" target="lib\net462" />
     <file src="net462\$id$.xml" target="lib\net462" />
     <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" />
@@ -28,5 +35,12 @@
     <file src="v143\ARM64\mbanative.dll" target="runtimes\win-arm64\native" />
     <file src="v143\x64\mbanative.dll" target="runtimes\win-x64\native" />
     <file src="v143\x86\mbanative.dll" target="runtimes\win-x86\native" />
+
+    <file src="$projectFolder$\..\balutil\inc\*" target="build\native\include" />
+    <file src="$projectFolder$\..\inc\BootstrapperApplication.h" target="build\native\include" />
+    <file src="$projectFolder$\..\inc\BootstrapperEngine.h" target="build\native\include" />
+    <file src="v141\x86\balutil.lib" target="build\native\v14\x86" />
+    <file src="v141\x64\balutil.lib" target="build\native\v14\x64" />
+    <file src="v141\ARM64\balutil.lib" target="build\native\v14\ARM64" />
   </files>
 </package>
diff --git a/src/api/burn/balutil/build/WixToolset.BalUtil.props b/src/api/burn/WixToolset.BootstrapperApplicationApi/build/WixToolset.BootstrapperApplicationApi.props
index b276574d..b276574d 100644
--- a/src/api/burn/balutil/build/WixToolset.BalUtil.props
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/build/WixToolset.BootstrapperApplicationApi.props
diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/build/_._ b/src/api/burn/WixToolset.BootstrapperApplicationApi/build/_._
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/build/_._
diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj b/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj
deleted file mode 100644
index 7f1b27c2..00000000
--- a/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
-<Project Sdk="Microsoft.Build.NoTargets">
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <PackageId>WixToolset.BootstrapperCore.Native</PackageId>
-    <Description>WiX Bootstrapper native interfaces</Description>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
-  </ItemGroup>
-
-  <Target Name="Pack"
-          DependsOnTargets="GitVersion;PackNative"
-          BeforeTargets="AfterBuild" />
-</Project>
diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/build/WixToolset.BootstrapperCore.Native.props b/src/api/burn/WixToolset.BootstrapperCore.Native/build/WixToolset.BootstrapperCore.Native.props
deleted file mode 100644
index 82f81163..00000000
--- a/src/api/burn/WixToolset.BootstrapperCore.Native/build/WixToolset.BootstrapperCore.Native.props
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-</Project>
diff --git a/src/api/burn/api_burn.sln b/src/api/burn/api_burn.sln
index 858272fb..a8854b35 100644
--- a/src/api/burn/api_burn.sln
+++ b/src/api/burn/api_burn.sln
@@ -7,11 +7,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "balutil", "balutil\balutil.
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bextutil", "bextutil\bextutil.vcxproj", "{06027492-1CB9-48BC-B31E-C1F9356ED07E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Mba.Core", "WixToolset.Mba.Core\WixToolset.Mba.Core.csproj", "{E7E1841E-A58E-4901-B9CA-4845B807D45F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.BootstrapperApplicationApi", "WixToolset.BootstrapperApplicationApi\WixToolset.BootstrapperApplicationApi.csproj", "{E7E1841E-A58E-4901-B9CA-4845B807D45F}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mbanative", "mbanative\mbanative.vcxproj", "{665E0441-17F9-4105-B202-EDF274657F6E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Mba.Core", "test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj", "{F54997F7-10D7-409B-B9F2-DB546490EDC0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.BootstrapperApplicationApi", "test\WixToolsetTest.BootstrapperApplicationApi\WixToolsetTest.BootstrapperApplicationApi.csproj", "{F54997F7-10D7-409B-B9F2-DB546490EDC0}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BalUtilUnitTest", "test\BalUtilUnitTest\BalUtilUnitTest.vcxproj", "{9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}"
 EndProject
diff --git a/src/api/burn/api_burn_t.proj b/src/api/burn/api_burn_t.proj
index f6918682..aa1bc628 100644
--- a/src/api/burn/api_burn_t.proj
+++ b/src/api/burn/api_burn_t.proj
@@ -10,10 +10,10 @@
     <!-- C++/CLI projects will try to build their dependent projects in parallel with others, so they must be built first. -->
     <ProjectReference Include="test\BalUtilUnitTest\BalUtilUnitTest.vcxproj" Properties="Platform=x86" BuildInParallel="false" />
     <ProjectReference Include="test\BextUtilUnitTest\BextUtilUnitTest.vcxproj" Properties="Platform=x86" BuildInParallel="false" />
-    
+
     <!-- Make sure that if these rebuild balutil due to the inability for incremental build, then all shipped code uses the same binaries. -->
-    <ProjectReference Include="test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj" Properties="Platform=AnyCPU" BuildInParallel="false" />
-    <ProjectReference Include="WixToolset.Mba.Core\WixToolset.Mba.Core.csproj" Properties="Platform=AnyCPU" BuildInParallel="false" />
+    <ProjectReference Include="test\WixToolsetTest.BootstrapperApplicationApi\WixToolsetTest.BootstrapperApplicationApi.csproj" Properties="Platform=AnyCPU" BuildInParallel="false" />
+    <ProjectReference Include="WixToolset.BootstrapperApplicationApi\WixToolset.BootstrapperApplicationApi.csproj" Properties="Platform=AnyCPU" BuildInParallel="false" />
 
     <!-- Build -->
 
@@ -28,9 +28,7 @@
     <!-- balutil is built by multiple projects above. -->
 
     <!-- Pack -->
-    <ProjectReference Include="balutil\balutil.vcxproj" Targets="PackNative" />
     <ProjectReference Include="bextutil\bextutil.vcxproj" Targets="PackNative" />
-    <ProjectReference Include="WixToolset.BootstrapperCore.Native\WixToolset.BootstrapperCore.Native.proj" Targets="Restore;PackNative" />
-    <ProjectReference Include="WixToolset.Mba.Core\WixToolset.Mba.Core.csproj" Properties="NoBuild=true" Targets="Pack" />
+    <ProjectReference Include="WixToolset.BootstrapperApplicationApi\WixToolset.BootstrapperApplicationApi.csproj" Properties="NoBuild=true" Targets="Pack" />
   </ItemGroup>
 </Project>
diff --git a/src/api/burn/balutil/balutil.nuspec b/src/api/burn/balutil/balutil.nuspec
deleted file mode 100644
index be51ec79..00000000
--- a/src/api/burn/balutil/balutil.nuspec
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata minClientVersion="4.0">
-    <id>$id$</id>
-    <version>$version$</version>
-    <title>$title$</title>
-    <description>$description$</description>
-    <authors>$authors$</authors>
-    <icon>wix.png</icon>
-    <license type="expression">MS-RL</license>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <copyright>$copyright$</copyright>
-    <projectUrl>$projectUrl$</projectUrl>
-    <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
-    <dependencies>
-      <dependency id="WixToolset.BootstrapperCore.Native" version="[$version$,5)" />
-      <dependency id="WixToolset.DUtil" version="[$version$,5)" />
-    </dependencies>
-  </metadata>
-
-  <files>
-    <file src="$projectFolder$\build\$id$.props" target="build\" />
-    <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
-    <file src="$projectFolder$\inc\*" target="build\native\include" />
-    <file src="..\..\v141\x86\balutil.lib" target="build\native\v14\x86" />
-    <file src="..\..\v141\x64\balutil.lib" target="build\native\v14\x64" />
-    <file src="..\..\v141\ARM64\balutil.lib" target="build\native\v14\ARM64" />
-  </files>
-</package>
diff --git a/src/api/burn/balutil/balutil.vcxproj b/src/api/burn/balutil/balutil.vcxproj
index 8f93d636..280f21b8 100644
--- a/src/api/burn/balutil/balutil.vcxproj
+++ b/src/api/burn/balutil/balutil.vcxproj
@@ -35,7 +35,6 @@
     <TargetName>balutil</TargetName>
     <CharacterSet>MultiByte</CharacterSet>
     <Description>WiX Toolset Bootstrapper Application Layer native utility library</Description>
-    <PackageId>WixToolset.BalUtil</PackageId>
   </PropertyGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -49,7 +48,7 @@
   </ImportGroup>
 
   <PropertyGroup>
-    <ProjectAdditionalIncludeDirectories>inc;..\WixToolset.BootstrapperCore.Native\inc</ProjectAdditionalIncludeDirectories>
+    <ProjectAdditionalIncludeDirectories>inc;..\inc</ProjectAdditionalIncludeDirectories>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/api/burn/bextutil/bextutil.nuspec b/src/api/burn/bextutil/bextutil.nuspec
index 125e8807..b2881354 100644
--- a/src/api/burn/bextutil/bextutil.nuspec
+++ b/src/api/burn/bextutil/bextutil.nuspec
@@ -13,7 +13,6 @@
     <projectUrl>$projectUrl$</projectUrl>
     <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
     <dependencies>
-      <dependency id="WixToolset.BootstrapperCore.Native" version="[$version$,5)" />
       <dependency id="WixToolset.DUtil" version="[$version$,5)" />
     </dependencies>
   </metadata>
@@ -22,6 +21,8 @@
     <file src="$projectFolder$\build\$id$.props" target="build\" />
     <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
     <file src="$projectFolder$\inc\*" target="build\native\include" />
+    <file src="$projectFolder$\..\inc\BundleExtension.h" target="build\native\include" />
+    <file src="$projectFolder$\..\inc\BundleExtensionEngine.h" target="build\native\include" />
     <file src="..\..\v141\x86\bextutil.lib" target="build\native\v14\x86" />
     <file src="..\..\v141\x64\bextutil.lib" target="build\native\v14\x64" />
     <file src="..\..\v141\ARM64\bextutil.lib" target="build\native\v14\ARM64" />
diff --git a/src/api/burn/bextutil/bextutil.vcxproj b/src/api/burn/bextutil/bextutil.vcxproj
index 69222b4c..467f2d56 100644
--- a/src/api/burn/bextutil/bextutil.vcxproj
+++ b/src/api/burn/bextutil/bextutil.vcxproj
@@ -49,7 +49,7 @@
   </ImportGroup>
 
   <PropertyGroup>
-    <ProjectAdditionalIncludeDirectories>inc;..\WixToolset.BootstrapperCore.Native\inc</ProjectAdditionalIncludeDirectories>
+    <ProjectAdditionalIncludeDirectories>inc;..\inc</ProjectAdditionalIncludeDirectories>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/api/burn/bextutil/inc/BextBaseBundleExtension.h b/src/api/burn/bextutil/inc/BextBaseBundleExtension.h
index a302702e..5bda04e1 100644
--- a/src/api/burn/bextutil/inc/BextBaseBundleExtension.h
+++ b/src/api/burn/bextutil/inc/BextBaseBundleExtension.h
@@ -2,11 +2,6 @@
 
 #include <windows.h>
 
-#include "BundleExtensionEngine.h"
-#include "BundleExtension.h"
-#include "IBundleExtensionEngine.h"
-#include "IBundleExtension.h"
-
 #include "bextutil.h"
 
 class CBextBaseBundleExtension : public IBundleExtension
diff --git a/src/api/burn/bextutil/inc/BextBaseBundleExtensionProc.h b/src/api/burn/bextutil/inc/BextBaseBundleExtensionProc.h
index f71e3b92..cd7e3cb3 100644
--- a/src/api/burn/bextutil/inc/BextBaseBundleExtensionProc.h
+++ b/src/api/burn/bextutil/inc/BextBaseBundleExtensionProc.h
@@ -4,10 +4,8 @@
 
 #include <windows.h>
 
-#include "BundleExtensionEngine.h"
-#include "BundleExtension.h"
-#include "IBundleExtensionEngine.h"
-#include "IBundleExtension.h"
+#include <IBundleExtensionEngine.h>
+#include <IBundleExtension.h>
 
 static HRESULT BextBaseBEProcSearch(
     __in IBundleExtension* pBE,
@@ -33,7 +31,7 @@ static HRESULT WINAPI BextBaseBundleExtensionProc(
 {
     IBundleExtension* pBE = reinterpret_cast<IBundleExtension*>(pvContext);
     HRESULT hr = pBE->BundleExtensionProc(message, pvArgs, pvResults, pvContext);
-    
+
     if (E_NOTIMPL == hr)
     {
         switch (message)
diff --git a/src/api/burn/bextutil/inc/BextBundleExtensionEngine.h b/src/api/burn/bextutil/inc/BextBundleExtensionEngine.h
index 9fdcb700..97b02f36 100644
--- a/src/api/burn/bextutil/inc/BextBundleExtensionEngine.h
+++ b/src/api/burn/bextutil/inc/BextBundleExtensionEngine.h
@@ -1,5 +1,8 @@
+#pragma once
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
+#include <IBundleExtensionEngine.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/src/api/burn/bextutil/inc/IBundleExtension.h b/src/api/burn/bextutil/inc/IBundleExtension.h
index 7516c11b..00301672 100644
--- a/src/api/burn/bextutil/inc/IBundleExtension.h
+++ b/src/api/burn/bextutil/inc/IBundleExtension.h
@@ -1,6 +1,7 @@
 #pragma once
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
+#include <BundleExtension.h>
 
 DECLARE_INTERFACE_IID_(IBundleExtension, IUnknown, "93123C9D-796B-4FCD-A507-6EDEF9A925FD")
 {
diff --git a/src/api/burn/bextutil/inc/IBundleExtensionEngine.h b/src/api/burn/bextutil/inc/IBundleExtensionEngine.h
index 0053a71e..a4a27fb1 100644
--- a/src/api/burn/bextutil/inc/IBundleExtensionEngine.h
+++ b/src/api/burn/bextutil/inc/IBundleExtensionEngine.h
@@ -1,6 +1,7 @@
 #pragma once
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
+#include <BundleExtensionEngine.h>
 
 DECLARE_INTERFACE_IID_(IBundleExtensionEngine, IUnknown, "9D027A39-F6B6-42CC-9737-C185089EB263")
 {
diff --git a/src/api/burn/bextutil/inc/bextutil.h b/src/api/burn/bextutil/inc/bextutil.h
index 356ccc47..b8536444 100644
--- a/src/api/burn/bextutil/inc/bextutil.h
+++ b/src/api/burn/bextutil/inc/bextutil.h
@@ -4,6 +4,8 @@
 
 #include "dutil.h"
 
+#include "IBundleExtensionEngine.h"
+#include "IBundleExtension.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/api/burn/bextutil/precomp.h b/src/api/burn/bextutil/precomp.h
index 5d1dd20b..d5714cc2 100644
--- a/src/api/burn/bextutil/precomp.h
+++ b/src/api/burn/bextutil/precomp.h
@@ -12,11 +12,5 @@
 #include <strutil.h>
 #include <xmlutil.h>
 
-#include <BundleExtensionEngine.h>
-#include <BundleExtension.h>
-
-#include "IBundleExtensionEngine.h"
-#include "IBundleExtension.h"
-
 #include "bextutil.h"
 #include "BextBundleExtensionEngine.h"
diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h b/src/api/burn/inc/BootstrapperApplication.h
index 79b1df80..79b1df80 100644
--- a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h
+++ b/src/api/burn/inc/BootstrapperApplication.h
diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h b/src/api/burn/inc/BootstrapperEngine.h
index 7af41d97..7af41d97 100644
--- a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h
+++ b/src/api/burn/inc/BootstrapperEngine.h
diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BundleExtension.h b/src/api/burn/inc/BundleExtension.h
index be76a1a5..17acff6e 100644
--- a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BundleExtension.h
+++ b/src/api/burn/inc/BundleExtension.h
@@ -1,6 +1,7 @@
 #pragma once
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
+#include <BundleExtensionEngine.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BundleExtensionEngine.h b/src/api/burn/inc/BundleExtensionEngine.h
index b585d1a2..b585d1a2 100644
--- a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BundleExtensionEngine.h
+++ b/src/api/burn/inc/BundleExtensionEngine.h
diff --git a/src/api/burn/mbanative/mbanative.vcxproj b/src/api/burn/mbanative/mbanative.vcxproj
index a1f79f4d..e9e72a49 100644
--- a/src/api/burn/mbanative/mbanative.vcxproj
+++ b/src/api/burn/mbanative/mbanative.vcxproj
@@ -42,7 +42,7 @@
   <Import Project="..\..\..\NativeMultiTargeting.Build.props" />
 
   <PropertyGroup>
-    <ProjectAdditionalIncludeDirectories>..\balutil\inc;..\WixToolset.BootstrapperCore.Native\inc</ProjectAdditionalIncludeDirectories>
+    <ProjectAdditionalIncludeDirectories>..\balutil\inc;..\inc</ProjectAdditionalIncludeDirectories>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj b/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj
index 94586fbd..de79fe33 100644
--- a/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj
+++ b/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj
@@ -32,7 +32,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 
   <PropertyGroup>
-    <ProjectAdditionalIncludeDirectories>..\..\balutil\inc;..\..\WixToolset.BootstrapperCore.Native\inc;..\..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories>
+    <ProjectAdditionalIncludeDirectories>..\..\balutil\inc;..\..\inc;..\..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories>
     <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;$(RootBuildFolder)libs\$(Configuration)\$(WixNativeSdkLibraryToolset)\$(PlatformTarget)\dutil.lib</ProjectAdditionalLinkLibraries>
   </PropertyGroup>
 
diff --git a/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj b/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj
index d437dc36..6e8dfee1 100644
--- a/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj
+++ b/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj
@@ -31,7 +31,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 
   <PropertyGroup>
-    <ProjectAdditionalIncludeDirectories>..\..\bextutil\inc;..\..\WixToolset.BootstrapperCore.Native\inc;..\..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories>
+    <ProjectAdditionalIncludeDirectories>..\..\bextutil\inc;..\..\inc;..\..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories>
     <ProjectAdditionalLinkLibraries>$(RootBuildFolder)libs\$(Configuration)\$(WixNativeSdkLibraryToolset)\$(PlatformTarget)\dutil.lib</ProjectAdditionalLinkLibraries>
   </PropertyGroup>
 
diff --git a/src/api/burn/test/BextUtilUnitTest/precomp.h b/src/api/burn/test/BextUtilUnitTest/precomp.h
index cf5256b8..00bf872f 100644
--- a/src/api/burn/test/BextUtilUnitTest/precomp.h
+++ b/src/api/burn/test/BextUtilUnitTest/precomp.h
@@ -7,12 +7,6 @@
 
 #include <dutil.h>
 #include <strutil.h>
-
-#include <BundleExtensionEngine.h>
-#include <BundleExtension.h>
-
-#include <IBundleExtensionEngine.h>
-#include <IBundleExtension.h>
 #include <bextutil.h>
 
 #include "TestBundleExtension.h"
diff --git a/src/api/burn/test/WixToolsetTest.Mba.Core/VerUtilFixture.cs b/src/api/burn/test/WixToolsetTest.BootstrapperApplicationApi/VerUtilFixture.cs
index 9c213945..1eeec941 100644
--- a/src/api/burn/test/WixToolsetTest.Mba.Core/VerUtilFixture.cs
+++ b/src/api/burn/test/WixToolsetTest.BootstrapperApplicationApi/VerUtilFixture.cs
@@ -1,9 +1,9 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolsetTest.Mba.Core
+namespace WixToolsetTest.BootstrapperApplicationApi
 {
     using System;
-    using WixToolset.Mba.Core;
+    using WixToolset.BootstrapperApplicationApi;
     using Xunit;
 
     public class VerUtilFixture
diff --git a/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj b/src/api/burn/test/WixToolsetTest.BootstrapperApplicationApi/WixToolsetTest.BootstrapperApplicationApi.csproj
index 21b9cfdc..a3d9930d 100644
--- a/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
+++ b/src/api/burn/test/WixToolsetTest.BootstrapperApplicationApi/WixToolsetTest.BootstrapperApplicationApi.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj" />
+    <ProjectReference Include="..\..\WixToolset.BootstrapperApplicationApi\WixToolset.BootstrapperApplicationApi.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.v3.ncrunchproject b/src/api/burn/test/WixToolsetTest.BootstrapperApplicationApi/WixToolsetTest.BootstrapperApplicationApi.v3.ncrunchproject
index 7b5b2139..7b5b2139 100644
--- a/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.v3.ncrunchproject
+++ b/src/api/burn/test/WixToolsetTest.BootstrapperApplicationApi/WixToolsetTest.BootstrapperApplicationApi.v3.ncrunchproject
diff --git a/src/burn/engine/engine.vcxproj b/src/burn/engine/engine.vcxproj
index a897140d..73985d51 100644
--- a/src/burn/engine/engine.vcxproj
+++ b/src/burn/engine/engine.vcxproj
@@ -42,7 +42,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 
   <PropertyGroup>
-    <ProjectAdditionalIncludeDirectories>..\..\api\burn\WixToolset.BootstrapperCore.Native\inc;$(BurnGeneratedHeaderDirectory);$(ProjectAdditionalIncludeDirectories)</ProjectAdditionalIncludeDirectories>
+    <ProjectAdditionalIncludeDirectories>..\..\api\burn\inc;$(BurnGeneratedHeaderDirectory);$(ProjectAdditionalIncludeDirectories)</ProjectAdditionalIncludeDirectories>
   </PropertyGroup>
 
   <ImportGroup Label="ExtensionSettings">
@@ -102,10 +102,10 @@
   <ItemGroup>
     <ClInclude Include="apply.h" />
     <ClInclude Include="approvedexe.h" />
-    <ClInclude Include="..\..\api\burn\WixToolset.BootstrapperCore.Native\inc\BootstrapperApplication.h" />
-    <ClInclude Include="..\..\api\burn\WixToolset.BootstrapperCore.Native\inc\BootstrapperEngine.h" />
-    <ClInclude Include="..\..\api\burn\WixToolset.BootstrapperCore.Native\inc\BundleExtension.h" />
-    <ClInclude Include="..\..\api\burn\WixToolset.BootstrapperCore.Native\inc\BundleExtensionEngine.h" />
+    <ClInclude Include="..\..\api\burn\inc\BootstrapperApplication.h" />
+    <ClInclude Include="..\..\api\burn\inc\BootstrapperEngine.h" />
+    <ClInclude Include="..\..\api\burn\inc\BundleExtension.h" />
+    <ClInclude Include="..\..\api\burn\inc\BundleExtensionEngine.h" />
     <ClInclude Include="ba.h" />
     <ClInclude Include="bacallback.h" />
     <ClInclude Include="bundlepackageengine.h" />
diff --git a/src/burn/engine/precomp.h b/src/burn/engine/precomp.h
index 24a01140..3b9693ff 100644
--- a/src/burn/engine/precomp.h
+++ b/src/burn/engine/precomp.h
@@ -62,8 +62,6 @@
 #include <butil.h>
 
 #include "BootstrapperApplication.h"
-
-#include "BundleExtensionEngine.h"
 #include "BundleExtension.h"
 
 #include "platform.h"
diff --git a/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj b/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj
index 46708c26..331d237b 100644
--- a/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj
+++ b/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj
@@ -39,7 +39,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 
   <PropertyGroup>
-    <ProjectAdditionalIncludeDirectories>$(ProjectAdditionalIncludeDirectories);$(BurnGeneratedHeaderDirectory);..\..\engine;..\..\..\api\burn\WixToolset.BootstrapperCore.Native\inc;..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories>
+    <ProjectAdditionalIncludeDirectories>$(ProjectAdditionalIncludeDirectories);$(BurnGeneratedHeaderDirectory);..\..\engine;..\..\..\api\burn\inc;..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories>
     <ProjectAdditionalLinkLibraries>cabinet.lib;crypt32.lib;msi.lib;rpcrt4.lib;shlwapi.lib;userenv.lib;wininet.lib;wintrust.lib;$(RootBuildFolder)libs\$(Configuration)\$(WixNativeSdkLibraryToolset)\$(PlatformTarget)\dutil.lib;engine.res</ProjectAdditionalLinkLibraries>
   </PropertyGroup>
 
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 e15ae0b3..b75899cc 100644
--- a/src/burn/test/BurnUnitTest/TestData/PlanTest/BundlePackage_Multiple_manifest.xml
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/BundlePackage_Multiple_manifest.xml
@@ -9,7 +9,7 @@
         <Payload Id="payO60IVK4ATGzPpMz3rwVbUWl6DyU" FilePath="WixToolset.Mba.Host.config" SourcePath="u0" />
         <Payload Id="payxj4zDAKL2NVlz4ohp0GvwFHepyI" FilePath="TestBA.dll" SourcePath="u1" />
         <Payload Id="pay1hOSAUC8_D633cD2TXpIXCL30OU" FilePath="mbanative.dll" SourcePath="u2" />
-        <Payload Id="payujy6Izl_BlUNfHt2eI.ADfjYAv4" FilePath="WixToolset.Mba.Core.dll" SourcePath="u3" />
+        <Payload Id="payujy6Izl_BlUNfHt2eI.ADfjYAv4" FilePath="WixToolset.BootstrapperApplicationApi.dll" SourcePath="u3" />
         <Payload Id="payR4EbR4OTDZpPEycWaSSM_gZRBWM" FilePath="mbapreq.thm" SourcePath="u4" />
         <Payload Id="paylVCy2Ecl8pHPdJTCQZryUG4T9us" FilePath="mbapreq.png" SourcePath="u5" />
         <Payload Id="payTaG4B_lob1aLcKFaOqSSG3MPMpU" FilePath="mbapreq.wxl" SourcePath="u6" />
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 12648bf6..680f6c5f 100644
--- a/src/burn/test/BurnUnitTest/TestData/PlanTest/ExePackage_PerUserArpEntry_manifest.xml
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/ExePackage_PerUserArpEntry_manifest.xml
@@ -9,7 +9,7 @@
         <Payload Id="payO60IVK4ATGzPpMz3rwVbUWl6DyU" FilePath="WixToolset.Mba.Host.config" SourcePath="u0" />
         <Payload Id="payxj4zDAKL2NVlz4ohp0GvwFHepyI" FilePath="TestBA.dll" SourcePath="u1" />
         <Payload Id="pay1hOSAUC8_D633cD2TXpIXCL30OU" FilePath="mbanative.dll" SourcePath="u2" />
-        <Payload Id="payujy6Izl_BlUNfHt2eI.ADfjYAv4" FilePath="WixToolset.Mba.Core.dll" SourcePath="u3" />
+        <Payload Id="payujy6Izl_BlUNfHt2eI.ADfjYAv4" FilePath="WixToolset.BootstrapperApplicationApi.dll" SourcePath="u3" />
         <Payload Id="payR4EbR4OTDZpPEycWaSSM_gZRBWM" FilePath="mbapreq.thm" SourcePath="u4" />
         <Payload Id="paylVCy2Ecl8pHPdJTCQZryUG4T9us" FilePath="mbapreq.png" SourcePath="u5" />
         <Payload Id="payTaG4B_lob1aLcKFaOqSSG3MPMpU" FilePath="mbapreq.wxl" SourcePath="u6" />
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 1ebf0062..bfe1dfee 100644
--- a/src/burn/test/BurnUnitTest/TestData/PlanTest/Failure_BundleD_manifest.xml
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/Failure_BundleD_manifest.xml
@@ -10,7 +10,7 @@
         <Payload Id="payO60IVK4ATGzPpMz3rwVbUWl6DyU" FilePath="WixToolset.Mba.Host.config" SourcePath="u0" />
         <Payload Id="payxj4zDAKL2NVlz4ohp0GvwFHepyI" FilePath="TestBA.dll" SourcePath="u1" />
         <Payload Id="pay1hOSAUC8_D633cD2TXpIXCL30OU" FilePath="mbanative.dll" SourcePath="u2" />
-        <Payload Id="payujy6Izl_BlUNfHt2eI.ADfjYAv4" FilePath="WixToolset.Mba.Core.dll" SourcePath="u3" />
+        <Payload Id="payujy6Izl_BlUNfHt2eI.ADfjYAv4" FilePath="WixToolset.BootstrapperApplicationApi.dll" SourcePath="u3" />
         <Payload Id="payR4EbR4OTDZpPEycWaSSM_gZRBWM" FilePath="mbapreq.thm" SourcePath="u4" />
         <Payload Id="paylVCy2Ecl8pHPdJTCQZryUG4T9us" FilePath="mbapreq.png" SourcePath="u5" />
         <Payload Id="payTaG4B_lob1aLcKFaOqSSG3MPMpU" FilePath="mbapreq.wxl" SourcePath="u6" />
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 abf1b03a..c5ca03b6 100644
--- a/src/burn/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_manifest.xml
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_manifest.xml
@@ -9,7 +9,7 @@
         <Payload Id="payO60IVK4ATGzPpMz3rwVbUWl6DyU" FilePath="WixToolset.Mba.Host.config" FileSize="783" Hash="B5BDD5E7179A94C2C817069913CA8C099DF811B9" Packaging="embedded" SourcePath="u0" />
         <Payload Id="payxj4zDAKL2NVlz4ohp0GvwFHepyI" FilePath="TestBA.dll" FileSize="25088" Hash="DB12DB6565CDBC4E9705204830E421ACEB710129" Packaging="embedded" SourcePath="u1" />
         <Payload Id="pay1hOSAUC8_D633cD2TXpIXCL30OU" FilePath="mbanative.dll" FileSize="118272" Hash="3A7A20D97B0546A23A025EE5774BE237C14D2957" Packaging="embedded" SourcePath="u2" />
-        <Payload Id="payujy6Izl_BlUNfHt2eI.ADfjYAv4" FilePath="WixToolset.Mba.Core.dll" FileSize="114688" Hash="56BA3EA94BEBF8EB562C914495E1594E74F05DBE" Packaging="embedded" SourcePath="u3" />
+        <Payload Id="payujy6Izl_BlUNfHt2eI.ADfjYAv4" FilePath="WixToolset.BootstrapperApplicationApi.dll" FileSize="114688" Hash="56BA3EA94BEBF8EB562C914495E1594E74F05DBE" Packaging="embedded" SourcePath="u3" />
         <Payload Id="payR4EbR4OTDZpPEycWaSSM_gZRBWM" FilePath="mbapreq.thm" FileSize="3599" Hash="8D9797C1E1A50AECB8B85FFCEA6A2A2EF611BD7F" Packaging="embedded" SourcePath="u4" />
         <Payload Id="paylVCy2Ecl8pHPdJTCQZryUG4T9us" FilePath="mbapreq.png" FileSize="797" Hash="75AE41181581FD6376CA9CA88147011E48BF9A30" Packaging="embedded" SourcePath="u5" />
         <Payload Id="payTaG4B_lob1aLcKFaOqSSG3MPMpU" FilePath="mbapreq.wxl" FileSize="2237" Hash="068B3C5E27AECE7987EABAA2802C9EB07B39EAF8" Packaging="embedded" SourcePath="u6" />
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 96c6b173..52091ebd 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
@@ -9,7 +9,7 @@
         <Payload Id="payO60IVK4ATGzPpMz3rwVbUWl6DyU" FilePath="WixToolset.Mba.Host.config" FileSize="783" Hash="B5BDD5E7179A94C2C817069913CA8C099DF811B9" Packaging="embedded" SourcePath="u0" />
         <Payload Id="payxj4zDAKL2NVlz4ohp0GvwFHepyI" FilePath="TestBA.dll" FileSize="25088" Hash="DB12DB6565CDBC4E9705204830E421ACEB710129" Packaging="embedded" SourcePath="u1" />
         <Payload Id="pay1hOSAUC8_D633cD2TXpIXCL30OU" FilePath="mbanative.dll" FileSize="118272" Hash="3A7A20D97B0546A23A025EE5774BE237C14D2957" Packaging="embedded" SourcePath="u2" />
-        <Payload Id="payujy6Izl_BlUNfHt2eI.ADfjYAv4" FilePath="WixToolset.Mba.Core.dll" FileSize="114688" Hash="56BA3EA94BEBF8EB562C914495E1594E74F05DBE" Packaging="embedded" SourcePath="u3" />
+        <Payload Id="payujy6Izl_BlUNfHt2eI.ADfjYAv4" FilePath="WixToolset.BootstrapperApplicationApi.dll" FileSize="114688" Hash="56BA3EA94BEBF8EB562C914495E1594E74F05DBE" Packaging="embedded" SourcePath="u3" />
         <Payload Id="payR4EbR4OTDZpPEycWaSSM_gZRBWM" FilePath="mbapreq.thm" FileSize="3599" Hash="8D9797C1E1A50AECB8B85FFCEA6A2A2EF611BD7F" Packaging="embedded" SourcePath="u4" />
         <Payload Id="paylVCy2Ecl8pHPdJTCQZryUG4T9us" FilePath="mbapreq.png" FileSize="797" Hash="75AE41181581FD6376CA9CA88147011E48BF9A30" Packaging="embedded" SourcePath="u5" />
         <Payload Id="payTaG4B_lob1aLcKFaOqSSG3MPMpU" FilePath="mbapreq.wxl" FileSize="2237" Hash="068B3C5E27AECE7987EABAA2802C9EB07B39EAF8" Packaging="embedded" SourcePath="u6" />
diff --git a/src/burn/test/BurnUnitTest/precomp.h b/src/burn/test/BurnUnitTest/precomp.h
index 1b297429..0f98480a 100644
--- a/src/burn/test/BurnUnitTest/precomp.h
+++ b/src/burn/test/BurnUnitTest/precomp.h
@@ -38,7 +38,6 @@
 #include <butil.h>
 
 #include "BootstrapperApplication.h"
-#include "BundleExtensionEngine.h"
 #include "BundleExtension.h"
 
 #include "platform.h"
diff --git a/src/clean.cmd b/src/clean.cmd
index 3bc95dd5..f2f10cd3 100644
--- a/src/clean.cmd
+++ b/src/clean.cmd
@@ -21,9 +21,8 @@ if exist "%_NUGET_CACHE%\wixinternal.basebuildtasks.sources" rd /s/q "%_NUGET_CA
 if exist "%_NUGET_CACHE%\wixinternal.testsupport" rd /s/q "%_NUGET_CACHE%\wixinternal.testsupport"
 if exist "%_NUGET_CACHE%\wixinternal.core.testpackage" rd /s/q "%_NUGET_CACHE%\wixinternal.core.testpackage"
 if exist "%_NUGET_CACHE%\wixtoolset.bal.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.bal.wixext"
-if exist "%_NUGET_CACHE%\wixtoolset.balutil" rd /s/q "%_NUGET_CACHE%\wixtoolset.balutil"
+if exist "%_NUGET_CACHE%\wixtoolset.bootstrapperapplications.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.bootstrapperapplications.wixext"
 if exist "%_NUGET_CACHE%\wixtoolset.bextutil" rd /s/q "%_NUGET_CACHE%\wixtoolset.bextutil"
-if exist "%_NUGET_CACHE%\wixtoolset.bootstrappercore.native" rd /s/q "%_NUGET_CACHE%\wixtoolset.bootstrappercore.native"
 if exist "%_NUGET_CACHE%\wixtoolset.burn" rd /s/q "%_NUGET_CACHE%\wixtoolset.burn"
 if exist "%_NUGET_CACHE%\wixtoolset.complus.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.complus.wixext"
 if exist "%_NUGET_CACHE%\wixtoolset.converters" rd /s/q "%_NUGET_CACHE%\wixtoolset.converters"
@@ -49,7 +48,7 @@ if exist "%_NUGET_CACHE%\wixtoolset.firewall.wixext" rd /s/q "%_NUGET_CACHE%\wix
 if exist "%_NUGET_CACHE%\wixtoolset.heat" rd /s/q "%_NUGET_CACHE%\wixtoolset.heat"
 if exist "%_NUGET_CACHE%\wixtoolset.http.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.http.wixext"
 if exist "%_NUGET_CACHE%\wixtoolset.iis.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.iis.wixext"
-if exist "%_NUGET_CACHE%\wixtoolset.mba.core" rd /s/q "%_NUGET_CACHE%\wixtoolset.mba.core"
+if exist "%_NUGET_CACHE%\wixtoolset.bootstrapperapplicationapi" rd /s/q "%_NUGET_CACHE%\wixtoolset.bootstrapperapplicationapi"
 if exist "%_NUGET_CACHE%\wixtoolset.msmq.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.msmq.wixext"
 if exist "%_NUGET_CACHE%\wixtoolset.netfx.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.netfx.wixext"
 if exist "%_NUGET_CACHE%\wixtoolset.powershell.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.powershell.wixext"
diff --git a/src/ext/Bal/Bal.wixext.sln b/src/ext/Bal/Bal.wixext.sln
index f341a7be..48eb190e 100644
--- a/src/ext/Bal/Bal.wixext.sln
+++ b/src/ext/Bal/Bal.wixext.sln
@@ -7,11 +7,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bafunctions", "Samples\bafu
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wixstdba", "wixstdba\wixstdba.vcxproj", "{41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}"
 EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "bal", "wixlib\bal.wixproj", "{3444D952-F21C-496F-AB6B-56435BFD0787}"
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "bas", "wixlib\bas.wixproj", "{3444D952-F21C-496F-AB6B-56435BFD0787}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Bal.wixext", "wixext\WixToolset.Bal.wixext.csproj", "{BF720A63-9D7B-456E-B60C-8122852D9FED}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.BootstrapperApplications.wixext", "wixext\WixToolset.BootstrapperApplications.wixext.csproj", "{BF720A63-9D7B-456E-B60C-8122852D9FED}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Bal", "test\WixToolsetTest.Bal\WixToolsetTest.Bal.csproj", "{89D479FC-20DA-44D8-AE38-48F063223498}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.BootstrapperApplications", "test\WixToolsetTest.BootstrapperApplications\WixToolsetTest.BootstrapperApplications.csproj", "{89D479FC-20DA-44D8-AE38-48F063223498}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wixiuiba", "wixiuiba\wixiuiba.vcxproj", "{0F73E566-925C-448D-99CB-3A7F5DF399C8}"
 EndProject
diff --git a/src/ext/Bal/README.md b/src/ext/Bal/README.md
index cc5d9b34..4a14b1a2 100644
--- a/src/ext/Bal/README.md
+++ b/src/ext/Bal/README.md
@@ -1,2 +1,2 @@
-# Bal.wixext
-WixToolset.Bal.wixext - Bootstrapper Application Layer WiX Toolset Extension 
+# WixToolset.BootstrapperApplications.wixext
+WixToolset.BootstrapperApplications.wixext - Bootstrapper Applications WiX Toolset Extension
diff --git a/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj b/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj
index 7e41313f..13ead500 100644
--- a/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj
+++ b/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj
@@ -60,7 +60,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.BalUtil" />
+    <PackageReference Include="WixToolset.BootstrapperApplicationApi" />
 
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
   </ItemGroup>
diff --git a/src/ext/Bal/bal.cmd b/src/ext/Bal/bal.cmd
index 23a53a91..7a48f6fc 100644
--- a/src/ext/Bal/bal.cmd
+++ b/src/ext/Bal/bal.cmd
@@ -17,31 +17,34 @@
 @if "%_INC%"=="" call :clean
 @if NOT "%_CLEAN%"=="" goto :end
 
-@echo Building ext\Bal %_C% using %_N%
+@echo Building ext\BootstrapperApplications %_C% using %_N%
 
 :: Restore
 
 :: Build
-msbuild -Restore -p:Configuration=%_C% -tl -nologo -m -warnaserror test\WixToolsetTest.Bal\WixToolsetTest.Bal.csproj -bl:%_L%\ext_bal_build.binlog || exit /b
+msbuild -Restore -p:Configuration=%_C% -tl -nologo -m -warnaserror test\WixToolsetTest.BootstrapperApplications\WixToolsetTest.BootstrapperApplications.csproj -bl:%_L%\ext_bal_build.binlog || exit /b
 
 msbuild -Restore -p:Configuration=%_C% -tl -nologo -m -warnaserror test\examples\examples.proj -bl:%_L%\bal_examples_build.binlog  || exit /b
 
 :: Test
 dotnet test ^
-  %_B%\net6.0\WixToolsetTest.Bal.dll ^
+  %_B%\net6.0\WixToolsetTest.BootstrapperApplications.dll ^
   --nologo -l "trx;LogFileName=%_L%\TestResults\bal.wixext.trx" || exit /b
 
 :: Pack
-msbuild -t:Pack -p:Configuration=%_C% -tl -nologo -warnaserror -p:NoBuild=true wixext\WixToolset.Bal.wixext.csproj || exit /b
+msbuild -t:Pack -p:Configuration=%_C% -tl -nologo -warnaserror -p:NoBuild=true wixext\WixToolset.BootstrapperApplications.wixext.csproj || exit /b
+msbuild -t:Pack -Restore -p:Configuration=%_C% -tl -nologo -warnaserror wixext-backward-compatible\WixToolset.Bal.wixext.csproj || exit /b
 
 @goto :end
 
 :clean
 @rd /s/q "..\..\..\build\Bal.wixext" 2> nul
 @del "..\..\..\build\artifacts\WixToolset.Bal.wixext.*.nupkg" 2> nul
+@del "..\..\..\build\artifacts\WixToolset.BootstrapperApplications.wixext.*.nupkg" 2> nul
 @del "%_L%\ext_bal_build.binlog" 2> nul
 @del "%_L%\TestResults\bal.wixext.trx" 2> nul
 @rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.bal.wixext" 2> nul
+@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.bootstrapperapplications.wixext" 2> nul
 @exit /b
 
 :end
diff --git a/src/ext/Bal/stdbas/stdbas.vcxproj b/src/ext/Bal/stdbas/stdbas.vcxproj
index 3722b40a..c9b1451b 100644
--- a/src/ext/Bal/stdbas/stdbas.vcxproj
+++ b/src/ext/Bal/stdbas/stdbas.vcxproj
@@ -71,7 +71,7 @@ rc.exe -fo "$(OutDir)stdbas.res" "$(IntDir)stdbas.messages.rc"</Command>
   </ItemDefinitionGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.BalUtil" />
+    <PackageReference Include="WixToolset.BootstrapperApplicationApi" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
   </ItemGroup>
 
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/BalExtensionFixture.cs
index 217fdfb1..a9460008 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs
+++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/BalExtensionFixture.cs
@@ -1,12 +1,12 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolsetTest.Bal
+namespace WixToolsetTest.BootstrapperApplications
 {
     using System;
     using System.IO;
     using System.Linq;
     using System.Xml;
-    using WixToolset.Bal;
+    using WixToolset.BootstrapperApplications;
     using WixInternal.Core.TestPackage;
     using WixInternal.TestSupport;
     using Xunit;
@@ -29,7 +29,7 @@ namespace WixToolsetTest.Bal
                 {
                     "build",
                     Path.Combine(bundleSourceFolder, "DisplayInternalUIConditionBundle.wxs"),
-                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-bindpath", Path.Combine(bundleSourceFolder, "data"),
                     "-o", bundleFile,
@@ -67,7 +67,7 @@ namespace WixToolsetTest.Bal
                 {
                     "build",
                     Path.Combine(bundleSourceFolder, "Bundle.wxs"),
-                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-o", bundleFile,
                 });
@@ -106,7 +106,7 @@ namespace WixToolsetTest.Bal
                 {
                     "build",
                     Path.Combine(bundleSourceFolder, "Bundle.wxs"),
-                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-o", bundleFile,
                 });
@@ -132,7 +132,7 @@ namespace WixToolsetTest.Bal
         //        {
         //            "build",
         //            Path.Combine(bundleSourceFolder, "AlwaysInstallPrereqsBundle.wxs"),
-        //            "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+        //            "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),
         //            "-intermediateFolder", intermediateFolder,
         //            "-o", bundleFile,
         //        });
@@ -173,7 +173,7 @@ namespace WixToolsetTest.Bal
                 {
                     "build",
                     Path.Combine(bundleSourceFolder, "Bundle.wxs"),
-                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-bindpath", dataFolder,
                     "-o", bundleFile,
@@ -204,7 +204,7 @@ namespace WixToolsetTest.Bal
                 {
                     "build",
                     Path.Combine(bundleSourceFolder, "Bundle.wxs"),
-                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-o", bundleFile,
                 });
@@ -239,7 +239,7 @@ namespace WixToolsetTest.Bal
                     Path.Combine(bundleSourceFolder, "Overridable", "WrongCaseBundle.wxs"),
                     "-loc", Path.Combine(bundleSourceFolder, "Overridable", "WrongCaseBundle.wxl"),
                     "-bindpath", Path.Combine(bundleSourceFolder, "WixStdBa", "Data"),
-                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-o", bundleFile,
                 });
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/InternalUIBAFixture.cs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/InternalUIBAFixture.cs
index 22e2fec1..7e64c13f 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/InternalUIBAFixture.cs
+++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/InternalUIBAFixture.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolsetTest.Bal
+namespace WixToolsetTest.BootstrapperApplications
 {
     using System;
     using System.IO;
@@ -27,7 +27,7 @@ namespace WixToolsetTest.Bal
                 {
                     "build",
                     Path.Combine(bundleSourceFolder, "SinglePrimaryPackage.wxs"),
-                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"),
                     "-o", bundleFile,
@@ -66,7 +66,7 @@ namespace WixToolsetTest.Bal
                 {
                     "build",
                     Path.Combine(bundleSourceFolder, "UrlPrereqPackage.wxs"),
-                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"),
                     "-o", bundleFile,
@@ -111,7 +111,7 @@ namespace WixToolsetTest.Bal
                 {
                     "build",
                     Path.Combine(bundleSourceFolder, "ImplicitPrimaryPackage.wxs"),
-                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"),
                     "-o", bundleFile,
@@ -156,7 +156,7 @@ namespace WixToolsetTest.Bal
                 {
                     "build",
                     Path.Combine(bundleSourceFolder, "IuiBaWarnings.wxs"),
-                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"),
                     "-o", bundleFile,
@@ -208,7 +208,7 @@ namespace WixToolsetTest.Bal
                 {
                     "build",
                     Path.Combine(bundleSourceFolder, "AllPrereqPackages.wxs"),
-                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"),
                     "-o", bundleFile,
@@ -237,7 +237,7 @@ namespace WixToolsetTest.Bal
                 {
                     "build",
                     Path.Combine(bundleSourceFolder, "ImplicitNonMsiPrimaryPackage.wxs"),
-                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"),
                     "-o", bundleFile,
@@ -266,7 +266,7 @@ namespace WixToolsetTest.Bal
                 {
                     "build",
                     Path.Combine(bundleSourceFolder, "ImplicitPrimaryPackageEnableFeatureSelection.wxs"),
-                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"),
                     "-o", bundleFile,
@@ -295,7 +295,7 @@ namespace WixToolsetTest.Bal
                 {
                     "build",
                     Path.Combine(bundleSourceFolder, "MultipleNonPermanentNonPrimaryPackages.wxs"),
-                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"),
                     "-o", bundleFile,
@@ -325,7 +325,7 @@ namespace WixToolsetTest.Bal
                 {
                     "build",
                     Path.Combine(bundleSourceFolder, "MultipleDefaultPrimaryPackages.wxs"),
-                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"),
                     "-o", bundleFile,
@@ -355,7 +355,7 @@ namespace WixToolsetTest.Bal
                 {
                     "build",
                     Path.Combine(bundleSourceFolder, "NoDefaultPrimaryPackage.wxs"),
-                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"),
                     "-o", bundleFile,
@@ -384,7 +384,7 @@ namespace WixToolsetTest.Bal
                 {
                     "build",
                     Path.Combine(bundleSourceFolder, "NonMsiPrimaryPackage.wxs"),
-                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"),
                     "-o", bundleFile,
@@ -413,7 +413,7 @@ namespace WixToolsetTest.Bal
                 {
                     "build",
                     Path.Combine(bundleSourceFolder, "NonPermanentPrereqPackage.wxs"),
-                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"),
                     "-o", bundleFile,
@@ -442,7 +442,7 @@ namespace WixToolsetTest.Bal
                 {
                     "build",
                     Path.Combine(bundleSourceFolder, "PermanentPrimaryPackage.wxs"),
-                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"),
                     "-o", bundleFile,
@@ -472,7 +472,7 @@ namespace WixToolsetTest.Bal
                 {
                     "build",
                     Path.Combine(bundleSourceFolder, "PrimaryPackageEnableFeatureSelection.wxs"),
-                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"),
                     "-o", bundleFile,
@@ -502,7 +502,7 @@ namespace WixToolsetTest.Bal
                 {
                     "build",
                     Path.Combine(bundleSourceFolder, "PrimaryPrereqPackage.wxs"),
-                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-o", wixlibFile,
                 });
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/.Data/fake.exe b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/.Data/fake.exe
index f27639e9..f27639e9 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/.Data/fake.exe
+++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/.Data/fake.exe
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Dncba/Bundle.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Dncba/Bundle.wxs
index 5b25da8c..5b25da8c 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Dncba/Bundle.wxs
+++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Dncba/Bundle.wxs
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/MBA/AlwaysInstallPrereqsBundle.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/MBA/AlwaysInstallPrereqsBundle.wxs
index 685fef7b..685fef7b 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/MBA/AlwaysInstallPrereqsBundle.wxs
+++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/MBA/AlwaysInstallPrereqsBundle.wxs
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/MBA/Bundle.wxs
index 59be4bd4..59be4bd4 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs
+++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/MBA/Bundle.wxs
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Overridable/Bundle.wxs
index 1274826f..1274826f 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs
+++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Overridable/Bundle.wxs
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Overridable/WrongCaseBundle.wxl b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Overridable/WrongCaseBundle.wxl
index 0667c3cb..0667c3cb 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Overridable/WrongCaseBundle.wxl
+++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Overridable/WrongCaseBundle.wxl
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Overridable/WrongCaseBundle.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Overridable/WrongCaseBundle.wxs
index 67dfc589..67dfc589 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Overridable/WrongCaseBundle.wxs
+++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Overridable/WrongCaseBundle.wxs
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/AllPrereqPackages.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/AllPrereqPackages.wxs
index 17f1ee77..17f1ee77 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/AllPrereqPackages.wxs
+++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/AllPrereqPackages.wxs
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/ImplicitNonMsiPrimaryPackage.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/ImplicitNonMsiPrimaryPackage.wxs
index ca1f9358..ca1f9358 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/ImplicitNonMsiPrimaryPackage.wxs
+++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/ImplicitNonMsiPrimaryPackage.wxs
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/ImplicitPrimaryPackage.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/ImplicitPrimaryPackage.wxs
index 16a99e92..16a99e92 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/ImplicitPrimaryPackage.wxs
+++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/ImplicitPrimaryPackage.wxs
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/ImplicitPrimaryPackageEnableFeatureSelection.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/ImplicitPrimaryPackageEnableFeatureSelection.wxs
index 85b9df65..85b9df65 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/ImplicitPrimaryPackageEnableFeatureSelection.wxs
+++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/ImplicitPrimaryPackageEnableFeatureSelection.wxs
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/IuibaWarnings.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/IuibaWarnings.wxs
index 2cf9787d..2cf9787d 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/IuibaWarnings.wxs
+++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/IuibaWarnings.wxs
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/MultipleDefaultPrimaryPackages.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/MultipleDefaultPrimaryPackages.wxs
index 11736fbb..11736fbb 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/MultipleDefaultPrimaryPackages.wxs
+++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/MultipleDefaultPrimaryPackages.wxs
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/MultipleNonPermanentNonPrimaryPackages.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/MultipleNonPermanentNonPrimaryPackages.wxs
index c5b923df..c5b923df 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/MultipleNonPermanentNonPrimaryPackages.wxs
+++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/MultipleNonPermanentNonPrimaryPackages.wxs
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/NoDefaultPrimaryPackage.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/NoDefaultPrimaryPackage.wxs
index 7f7528d0..7f7528d0 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/NoDefaultPrimaryPackage.wxs
+++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/NoDefaultPrimaryPackage.wxs
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/NonMsiPrimaryPackage.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/NonMsiPrimaryPackage.wxs
index a6f93bcb..a6f93bcb 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/NonMsiPrimaryPackage.wxs
+++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/NonMsiPrimaryPackage.wxs
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/NonPermanentPrereqPackage.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/NonPermanentPrereqPackage.wxs
index a60943b0..a60943b0 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/NonPermanentPrereqPackage.wxs
+++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/NonPermanentPrereqPackage.wxs
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/PermanentPrimaryPackage.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/PermanentPrimaryPackage.wxs
index 43caaf86..43caaf86 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/PermanentPrimaryPackage.wxs
+++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/PermanentPrimaryPackage.wxs
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/PrimaryPackageEnableFeatureSelection.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/PrimaryPackageEnableFeatureSelection.wxs
index 4f1c40dd..4f1c40dd 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/PrimaryPackageEnableFeatureSelection.wxs
+++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/PrimaryPackageEnableFeatureSelection.wxs
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/PrimaryPrereqPackage.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/PrimaryPrereqPackage.wxs
index bdb8c470..bdb8c470 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/PrimaryPrereqPackage.wxs
+++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/PrimaryPrereqPackage.wxs
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/SinglePrimaryPackage.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/SinglePrimaryPackage.wxs
index 1e9a87c2..1e9a87c2 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/SinglePrimaryPackage.wxs
+++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/SinglePrimaryPackage.wxs
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/UrlPrereqPackage.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/UrlPrereqPackage.wxs
index 0c68908c..0c68908c 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/UrlPrereqPackage.wxs
+++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/UrlPrereqPackage.wxs
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/Bundle.wxs
index c17b53ff..c17b53ff 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs
+++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/Bundle.wxs
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/Data/test.msi b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/Data/test.msi
index 94aacd1a..94aacd1a 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/Data/test.msi
+++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/Data/test.msi
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs
index f08cfe6a..f08cfe6a 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs
+++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/WixToolsetTest.BootstrapperApplications.csproj
index 644fb625..64fc297c 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj
+++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/WixToolsetTest.BootstrapperApplications.csproj
@@ -16,7 +16,7 @@
   </Target>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\wixext\WixToolset.Bal.wixext.csproj" />
+    <ProjectReference Include="..\..\wixext\WixToolset.BootstrapperApplications.wixext.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.v3.ncrunchproject b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/WixToolsetTest.BootstrapperApplications.v3.ncrunchproject
index 7b5b2139..7b5b2139 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.v3.ncrunchproject
+++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/WixToolsetTest.BootstrapperApplications.v3.ncrunchproject
diff --git a/src/ext/Bal/test/examples/Directory.wixproj.targets b/src/ext/Bal/test/examples/Directory.wixproj.targets
index f126c632..a50ebcf4 100644
--- a/src/ext/Bal/test/examples/Directory.wixproj.targets
+++ b/src/ext/Bal/test/examples/Directory.wixproj.targets
@@ -3,6 +3,6 @@
 <Project>
   <ItemGroup>
     <BindPath Include="$(OutputPath)" />
-    <WixExtension Include="$(OutputPath)..\netstandard2.0\WixToolset.Bal.wixext.dll" />
+    <WixExtension Include="$(OutputPath)..\netstandard2.0\WixToolset.BootstrapperApplications.wixext.dll" />
   </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs
index bb83568f..3d92eb55 100644
--- a/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs
+++ b/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs
@@ -5,7 +5,7 @@
             <!-- <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.dll" Name="Example.EarliestCoreMBA.dll" bal:BAFactoryAssembly="yes" /> -->
             <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.runtimeconfig.json" Name="Example.EarliestCoreMBA.runtimeconfig.json" />
             <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\mbanative.dll" Name="mbanative.dll" />
-            <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" />
+            <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\WixToolset.BootstrapperApplicationApi.dll" Name="WixToolset.BootstrapperApplicationApi.dll" />
             <!-- <bal:WixDotNetCoreBootstrapperApplicationHost /> -->
         </BootstrapperApplication>
         <Chain>
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleFDDx86/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/EarliestCoreBundleFDDx86/FrameworkDependentBundle.wxs
index ca3d4cf0..071b21fc 100644
--- a/src/ext/Bal/test/examples/EarliestCoreBundleFDDx86/FrameworkDependentBundle.wxs
+++ b/src/ext/Bal/test/examples/EarliestCoreBundleFDDx86/FrameworkDependentBundle.wxs
@@ -5,7 +5,7 @@
             <!-- <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\Example.EarliestCoreMBA.dll" Name="Example.EarliestCoreMBA.dll" bal:BAFactoryAssembly="yes" /> -->
             <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\Example.EarliestCoreMBA.runtimeconfig.json" Name="Example.EarliestCoreMBA.runtimeconfig.json" />
             <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\mbanative.dll" Name="mbanative.dll" />
-            <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" />
+            <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\WixToolset.BootstrapperApplicationApi.dll" Name="WixToolset.BootstrapperApplicationApi.dll" />
             <!-- <bal:WixDotNetCoreBootstrapperApplicationHost /> -->
         </BootstrapperApplication>
         <Chain>
diff --git a/src/ext/Bal/test/examples/EarliestCoreMBA/EarliestCoreBA.cs b/src/ext/Bal/test/examples/EarliestCoreMBA/EarliestCoreBA.cs
index 490f4051..2e92f911 100644
--- a/src/ext/Bal/test/examples/EarliestCoreMBA/EarliestCoreBA.cs
+++ b/src/ext/Bal/test/examples/EarliestCoreMBA/EarliestCoreBA.cs
@@ -2,7 +2,7 @@
 
 namespace Example.EarliestCoreMBA
 {
-    using WixToolset.Mba.Core;
+    using WixToolset.BootstrapperApplicationApi;
 
     public class EarliestCoreBA : BootstrapperApplication
     {
diff --git a/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj b/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj
index 958381c3..93ceb7d4 100644
--- a/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj
+++ b/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj
@@ -9,6 +9,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.Mba.Core" />
+    <PackageReference Include="WixToolset.BootstrapperApplicationApi" />
   </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/test/examples/EarliestCoreMBA/Program.cs b/src/ext/Bal/test/examples/EarliestCoreMBA/Program.cs
index 11cc46f0..97d471bf 100644
--- a/src/ext/Bal/test/examples/EarliestCoreMBA/Program.cs
+++ b/src/ext/Bal/test/examples/EarliestCoreMBA/Program.cs
@@ -2,7 +2,7 @@
 
 namespace Example.EarliestCoreMBA
 {
-    using WixToolset.Mba.Core;
+    using WixToolset.BootstrapperApplicationApi;
 
     internal class Program
     {
diff --git a/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs b/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs
index 9ca93c7f..3bc823e9 100644
--- a/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs
+++ b/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs
@@ -3,7 +3,7 @@
         <BootstrapperApplication SourceFile="Example.FullFramework2MBA\net462\win-x64\Example.FullFramework2MBA.exe">
             <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\Example.FullFramework2MBA.exe.config" />
             <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\mbanative.dll" />
-            <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\WixToolset.Mba.Core.dll" />
+            <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\WixToolset.BootstrapperApplicationApi.dll" />
             <!-- <bal:WixManagedBootstrapperApplicationHost /> -->
         </BootstrapperApplication>
         <Chain>
diff --git a/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj b/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
index 7c4db8c1..ff4df6fb 100644
--- a/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
+++ b/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
@@ -12,10 +12,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.Mba.Core" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\api\burn\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj" />
+    <PackageReference Include="WixToolset.BootstrapperApplicationApi" />
   </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/test/examples/FullFramework2MBA/FullFramework2BA.cs b/src/ext/Bal/test/examples/FullFramework2MBA/FullFramework2BA.cs
index c6d478af..ab93a796 100644
--- a/src/ext/Bal/test/examples/FullFramework2MBA/FullFramework2BA.cs
+++ b/src/ext/Bal/test/examples/FullFramework2MBA/FullFramework2BA.cs
@@ -2,7 +2,7 @@
 
 namespace Example.FullFramework2MBA
 {
-    using WixToolset.Mba.Core;
+    using WixToolset.BootstrapperApplicationApi;
 
     public class FullFramework2BA : BootstrapperApplication
     {
diff --git a/src/ext/Bal/test/examples/FullFramework2MBA/Program.cs b/src/ext/Bal/test/examples/FullFramework2MBA/Program.cs
index 067fefe8..bfa62666 100644
--- a/src/ext/Bal/test/examples/FullFramework2MBA/Program.cs
+++ b/src/ext/Bal/test/examples/FullFramework2MBA/Program.cs
@@ -2,7 +2,7 @@
 
 namespace Example.FullFramework2MBA
 {
-    using WixToolset.Mba.Core;
+    using WixToolset.BootstrapperApplicationApi;
 
     internal class Program
     {
diff --git a/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs b/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs
index 7cac54f2..48668c19 100644
--- a/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs
+++ b/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs
@@ -4,7 +4,7 @@
             <!-- <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\Example.FullFramework4MBA.dll" /> -->
             <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\Example.FullFramework4MBA.exe.config" />
             <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\mbanative.dll" />
-            <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\WixToolset.Mba.Core.dll" />
+            <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\WixToolset.BootstrapperApplicationApi.dll" />
             <!-- <bal:WixManagedBootstrapperApplicationHost /> -->
         </BootstrapperApplication>
         <Chain>
diff --git a/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj b/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj
index 09665180..e17e7525 100644
--- a/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj
+++ b/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj
@@ -11,6 +11,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.Mba.Core" />
+    <PackageReference Include="WixToolset.BootstrapperApplicationApi" />
   </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/test/examples/FullFramework4MBA/FullFramework4BA.cs b/src/ext/Bal/test/examples/FullFramework4MBA/FullFramework4BA.cs
index 8a91195a..3c6fa13b 100644
--- a/src/ext/Bal/test/examples/FullFramework4MBA/FullFramework4BA.cs
+++ b/src/ext/Bal/test/examples/FullFramework4MBA/FullFramework4BA.cs
@@ -2,7 +2,7 @@
 
 namespace Example.FullFramework4MBA
 {
-    using WixToolset.Mba.Core;
+    using WixToolset.BootstrapperApplicationApi;
 
     public class FullFramework4BA : BootstrapperApplication
     {
diff --git a/src/ext/Bal/test/examples/FullFramework4MBA/Program.cs b/src/ext/Bal/test/examples/FullFramework4MBA/Program.cs
index 23fb6851..3e21a0fd 100644
--- a/src/ext/Bal/test/examples/FullFramework4MBA/Program.cs
+++ b/src/ext/Bal/test/examples/FullFramework4MBA/Program.cs
@@ -2,7 +2,7 @@
 
 namespace Example.FullFramework4MBA
 {
-    using WixToolset.Mba.Core;
+    using WixToolset.BootstrapperApplicationApi;
 
     internal class Program
     {
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs
index 74f82d99..07fb4ac3 100644
--- a/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs
+++ b/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs
@@ -5,7 +5,7 @@
             <!-- <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.dll" Name="Example.LatestCoreMBA.dll" bal:BAFactoryAssembly="yes" /> -->
             <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.runtimeconfig.json" Name="Example.LatestCoreMBA.runtimeconfig.json" />
             <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\mbanative.dll" Name="mbanative.dll" />
-            <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" />
+            <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\WixToolset.BootstrapperApplicationApi.dll" Name="WixToolset.BootstrapperApplicationApi.dll" />
             <!-- <bal:WixDotNetCoreBootstrapperApplicationHost /> -->
         </BootstrapperApplication>
         <Chain>
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleFDDx86/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/LatestCoreBundleFDDx86/FrameworkDependentBundle.wxs
index ab40a543..928cfb3b 100644
--- a/src/ext/Bal/test/examples/LatestCoreBundleFDDx86/FrameworkDependentBundle.wxs
+++ b/src/ext/Bal/test/examples/LatestCoreBundleFDDx86/FrameworkDependentBundle.wxs
@@ -5,7 +5,7 @@
             <!-- <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\Example.LatestCoreMBA.dll" Name="Example.LatestCoreMBA.dll" bal:BAFactoryAssembly="yes" /> -->
             <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\Example.LatestCoreMBA.runtimeconfig.json" Name="Example.LatestCoreMBA.runtimeconfig.json" />
             <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\mbanative.dll" Name="mbanative.dll" />
-            <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" />
+            <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\WixToolset.BootstrapperApplicationApi.dll" Name="WixToolset.BootstrapperApplicationApi.dll" />
             <!-- <bal:WixDotNetCoreBootstrapperApplicationHost /> -->
         </BootstrapperApplication>
         <Chain>
diff --git a/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj b/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj
index c4d31151..96587d26 100644
--- a/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj
+++ b/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj
@@ -9,6 +9,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.Mba.Core" />
+    <PackageReference Include="WixToolset.BootstrapperApplicationApi" />
   </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/test/examples/LatestCoreMBA/LatestCoreBA.cs b/src/ext/Bal/test/examples/LatestCoreMBA/LatestCoreBA.cs
index bd5378eb..f3195bfe 100644
--- a/src/ext/Bal/test/examples/LatestCoreMBA/LatestCoreBA.cs
+++ b/src/ext/Bal/test/examples/LatestCoreMBA/LatestCoreBA.cs
@@ -2,7 +2,7 @@
 
 namespace Example.LatestCoreMBA
 {
-    using WixToolset.Mba.Core;
+    using WixToolset.BootstrapperApplicationApi;
 
     public class LatestCoreBA : BootstrapperApplication
     {
diff --git a/src/ext/Bal/test/examples/LatestCoreMBA/Program.cs b/src/ext/Bal/test/examples/LatestCoreMBA/Program.cs
index 94da360b..d8205b62 100644
--- a/src/ext/Bal/test/examples/LatestCoreMBA/Program.cs
+++ b/src/ext/Bal/test/examples/LatestCoreMBA/Program.cs
@@ -2,7 +2,7 @@
 
 namespace Example.LatestCoreMBA
 {
-    using WixToolset.Mba.Core;
+    using WixToolset.BootstrapperApplicationApi;
 
     internal class Program
     {
diff --git a/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj
index 42c51c9e..8a3b8120 100644
--- a/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj
+++ b/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj
@@ -61,7 +61,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.BalUtil" />
+    <PackageReference Include="WixToolset.BootstrapperApplicationApi" />
 
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
   </ItemGroup>
diff --git a/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs
index e95fbba0..f35f9251 100644
--- a/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs
+++ b/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs
@@ -5,7 +5,7 @@
             <!-- <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.dll" Name="Example.WPFCoreMBA.dll" bal:BAFactoryAssembly="yes" /> -->
             <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.runtimeconfig.json" Name="Example.WPFCoreMBA.runtimeconfig.json" />
             <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\mbanative.dll" Name="mbanative.dll" />
-            <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" />
+            <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\WixToolset.BootstrapperApplicationApi.dll" Name="WixToolset.BootstrapperApplicationApi.dll" />
             <!-- <bal:WixDotNetCoreBootstrapperApplicationHost /> -->
         </BootstrapperApplication>
         <Chain>
diff --git a/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj b/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj
index 279b498f..37639021 100644
--- a/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj
+++ b/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj
@@ -9,6 +9,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.Mba.Core" />
+    <PackageReference Include="WixToolset.BootstrapperApplicationApi" />
   </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/test/examples/WPFCoreMBA/Program.cs b/src/ext/Bal/test/examples/WPFCoreMBA/Program.cs
index 185e92cc..17a3a7ca 100644
--- a/src/ext/Bal/test/examples/WPFCoreMBA/Program.cs
+++ b/src/ext/Bal/test/examples/WPFCoreMBA/Program.cs
@@ -2,7 +2,7 @@
 
 namespace Example.WPFCoreMBA
 {
-    using WixToolset.Mba.Core;
+    using WixToolset.BootstrapperApplicationApi;
     // using WixToolset.BootstrapperApplications.Managed;
 
     public class Program
diff --git a/src/ext/Bal/test/examples/WPFCoreMBA/WPFCoreBA.cs b/src/ext/Bal/test/examples/WPFCoreMBA/WPFCoreBA.cs
index 7bc06094..c9bcef23 100644
--- a/src/ext/Bal/test/examples/WPFCoreMBA/WPFCoreBA.cs
+++ b/src/ext/Bal/test/examples/WPFCoreMBA/WPFCoreBA.cs
@@ -3,7 +3,7 @@
 namespace Example.WPFCoreMBA
 {
     using System.Windows.Threading;
-    using WixToolset.Mba.Core;
+    using WixToolset.BootstrapperApplicationApi;
 
     public class WPFCoreBA : BootstrapperApplication
     {
diff --git a/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.csproj b/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.csproj
new file mode 100644
index 00000000..91253621
--- /dev/null
+++ b/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.csproj
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\..\WixExt.props" />
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <Title>WiX Toolset BootstrapperApplications extension</Title>
+    <Description>WiX Toolset BootstrapperApplications extension</Description>
+    <PackageId>WixToolset.Bal.wixext</PackageId>
+    <NuspecBasePath>$(OutputPath)netstandard2.0</NuspecBasePath>
+    <NuspecProperties>$(NuspecProperties);WixExtensionPackageFolder=$(WixExtensionPackageFolder)</NuspecProperties>
+  </PropertyGroup>
+</Project>
diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.nuspec b/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.nuspec
index 37757d7c..7a681707 100644
--- a/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.nuspec
+++ b/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.nuspec
@@ -1,6 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata minClientVersion="4.0">
+  <metadata>
     <id>$id$</id>
     <version>$version$</version>
     <title>$title$</title>
@@ -15,8 +15,8 @@
   </metadata>
 
   <files>
-    <file src="$projectFolder$\build\$id$.props" target="build\" />
     <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
-    <file src="$projectFolder$\inc\*" target="build\native\include" />
+    <file src="$projectFolder$\WixToolset.Bal.wixext.targets"  target="build" />
+    <file src="WixToolset.BootstrapperApplications.wixext.dll" target="$wixExtensionPackageFolder$" />
   </files>
 </package>
diff --git a/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.targets b/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.targets
new file mode 100644
index 00000000..8203d95b
--- /dev/null
+++ b/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.targets
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Project>
+  <ItemGroup>
+    <WixExtension Include="$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\WixToolset.BootstrapperApplications.wixext.dll"
+       Condition=" Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\WixToolset.BootstrapperApplications.wixext.dll') " />
+    <UnsupportedWixExtension Include="WixToolset.BootstrapperApplications.wixext"
+      Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\WixToolset.BootstrapperApplications.wixext.dll') " />
+  </ItemGroup>
+</Project>
diff --git a/src/ext/Bal/wixext/BalBurnBackendExtension.cs b/src/ext/Bal/wixext/BalBurnBackendExtension.cs
index 84e4323e..82195549 100644
--- a/src/ext/Bal/wixext/BalBurnBackendExtension.cs
+++ b/src/ext/Bal/wixext/BalBurnBackendExtension.cs
@@ -1,13 +1,13 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Bal
+namespace WixToolset.BootstrapperApplications
 {
     using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Text;
     using System.Xml;
-    using WixToolset.Bal.Symbols;
+    using WixToolset.BootstrapperApplications.Symbols;
     using WixToolset.Data;
     using WixToolset.Data.Burn;
     using WixToolset.Data.Symbols;
diff --git a/src/ext/Bal/wixext/BalCompiler.cs b/src/ext/Bal/wixext/BalCompiler.cs
index 829da0e6..35c86233 100644
--- a/src/ext/Bal/wixext/BalCompiler.cs
+++ b/src/ext/Bal/wixext/BalCompiler.cs
@@ -1,11 +1,11 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Bal
+namespace WixToolset.BootstrapperApplications
 {
     using System;
     using System.Collections.Generic;
     using System.Xml.Linq;
-    using WixToolset.Bal.Symbols;
+    using WixToolset.BootstrapperApplications.Symbols;
     using WixToolset.Data;
     using WixToolset.Data.Burn;
     using WixToolset.Data.Symbols;
diff --git a/src/ext/Bal/wixext/BalErrors.cs b/src/ext/Bal/wixext/BalErrors.cs
index 10986f0e..4c719091 100644
--- a/src/ext/Bal/wixext/BalErrors.cs
+++ b/src/ext/Bal/wixext/BalErrors.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Bal
+namespace WixToolset.BootstrapperApplications
 {
     using System;
     using System.Resources;
diff --git a/src/ext/Bal/wixext/BalExtensionData.cs b/src/ext/Bal/wixext/BalExtensionData.cs
index 9dc99705..a005d695 100644
--- a/src/ext/Bal/wixext/BalExtensionData.cs
+++ b/src/ext/Bal/wixext/BalExtensionData.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Bal
+namespace WixToolset.BootstrapperApplications
 {
     using WixToolset.Data;
     using WixToolset.Extensibility;
@@ -18,7 +18,7 @@ namespace WixToolset.Bal
 
         public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions)
         {
-            return Intermediate.Load(typeof(BalExtensionData).Assembly, "WixToolset.Bal.bal.wixlib", symbolDefinitions);
+            return Intermediate.Load(typeof(BalExtensionData).Assembly, "WixToolset.BootstrapperApplications.bas.wixlib", symbolDefinitions);
         }
     }
 }
diff --git a/src/ext/Bal/wixext/BalExtensionFactory.cs b/src/ext/Bal/wixext/BalExtensionFactory.cs
index 0bfb6c5f..88b59a4c 100644
--- a/src/ext/Bal/wixext/BalExtensionFactory.cs
+++ b/src/ext/Bal/wixext/BalExtensionFactory.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Bal
+namespace WixToolset.BootstrapperApplications
 {
     using System;
     using System.Collections.Generic;
diff --git a/src/ext/Bal/wixext/BalWarnings.cs b/src/ext/Bal/wixext/BalWarnings.cs
index 73a19d07..8c5d892f 100644
--- a/src/ext/Bal/wixext/BalWarnings.cs
+++ b/src/ext/Bal/wixext/BalWarnings.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Bal
+namespace WixToolset.BootstrapperApplications
 {
     using System;
     using System.Resources;
diff --git a/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs b/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs
index 5e9fb936..8179e38b 100644
--- a/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs
+++ b/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Bal
+namespace WixToolset.BootstrapperApplications
 {
     using System;
     using WixToolset.Data;
diff --git a/src/ext/Bal/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs b/src/ext/Bal/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs
index 3ce535a3..c418843b 100644
--- a/src/ext/Bal/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs
+++ b/src/ext/Bal/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs
@@ -1,10 +1,10 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Bal
+namespace WixToolset.BootstrapperApplications
 {
     using System;
     using WixToolset.Data;
-    using WixToolset.Bal.Symbols;
+    using WixToolset.BootstrapperApplications.Symbols;
 
     public static partial class BalSymbolDefinitions
     {
@@ -20,7 +20,7 @@ namespace WixToolset.Bal
     }
 }
 
-namespace WixToolset.Bal.Symbols
+namespace WixToolset.BootstrapperApplications.Symbols
 {
     using System;
     using WixToolset.Data;
diff --git a/src/ext/Bal/wixext/Symbols/WixBalBAFunctionsSymbol.cs b/src/ext/Bal/wixext/Symbols/WixBalBAFunctionsSymbol.cs
index 83dd20b0..0cd80de1 100644
--- a/src/ext/Bal/wixext/Symbols/WixBalBAFunctionsSymbol.cs
+++ b/src/ext/Bal/wixext/Symbols/WixBalBAFunctionsSymbol.cs
@@ -1,9 +1,9 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Bal
+namespace WixToolset.BootstrapperApplications
 {
     using WixToolset.Data;
-    using WixToolset.Bal.Symbols;
+    using WixToolset.BootstrapperApplications.Symbols;
 
     public static partial class BalSymbolDefinitions
     {
@@ -18,7 +18,7 @@ namespace WixToolset.Bal
     }
 }
 
-namespace WixToolset.Bal.Symbols
+namespace WixToolset.BootstrapperApplications.Symbols
 {
     using WixToolset.Data;
 
@@ -52,4 +52,4 @@ namespace WixToolset.Bal.Symbols
             set => this.Set((int)WixBalBAFunctionsSymbolFields.FilePath, value);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/ext/Bal/wixext/Symbols/WixBalBootstrapperApplicationSymbol.cs b/src/ext/Bal/wixext/Symbols/WixBalBootstrapperApplicationSymbol.cs
index 47e930c2..4f6dfd91 100644
--- a/src/ext/Bal/wixext/Symbols/WixBalBootstrapperApplicationSymbol.cs
+++ b/src/ext/Bal/wixext/Symbols/WixBalBootstrapperApplicationSymbol.cs
@@ -1,9 +1,9 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Bal
+namespace WixToolset.BootstrapperApplications
 {
     using WixToolset.Data;
-    using WixToolset.Bal.Symbols;
+    using WixToolset.BootstrapperApplications.Symbols;
 
     public static partial class BalSymbolDefinitions
     {
@@ -17,7 +17,7 @@ namespace WixToolset.Bal
     }
 }
 
-namespace WixToolset.Bal.Symbols
+namespace WixToolset.BootstrapperApplications.Symbols
 {
     using System;
     using WixToolset.Data;
diff --git a/src/ext/Bal/wixext/Symbols/WixBalConditionSymbol.cs b/src/ext/Bal/wixext/Symbols/WixBalConditionSymbol.cs
index c2527fbc..40976c5a 100644
--- a/src/ext/Bal/wixext/Symbols/WixBalConditionSymbol.cs
+++ b/src/ext/Bal/wixext/Symbols/WixBalConditionSymbol.cs
@@ -1,9 +1,9 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Bal
+namespace WixToolset.BootstrapperApplications
 {
     using WixToolset.Data;
-    using WixToolset.Bal.Symbols;
+    using WixToolset.BootstrapperApplications.Symbols;
 
     public static partial class BalSymbolDefinitions
     {
@@ -18,7 +18,7 @@ namespace WixToolset.Bal
     }
 }
 
-namespace WixToolset.Bal.Symbols
+namespace WixToolset.BootstrapperApplications.Symbols
 {
     using WixToolset.Data;
 
@@ -52,4 +52,4 @@ namespace WixToolset.Bal.Symbols
             set => this.Set((int)WixBalConditionSymbolFields.Message, value);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/ext/Bal/wixext/Symbols/WixBalPackageInfoSymbol.cs b/src/ext/Bal/wixext/Symbols/WixBalPackageInfoSymbol.cs
index 08d4ce4e..e2636d33 100644
--- a/src/ext/Bal/wixext/Symbols/WixBalPackageInfoSymbol.cs
+++ b/src/ext/Bal/wixext/Symbols/WixBalPackageInfoSymbol.cs
@@ -1,9 +1,9 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Bal
+namespace WixToolset.BootstrapperApplications
 {
     using WixToolset.Data;
-    using WixToolset.Bal.Symbols;
+    using WixToolset.BootstrapperApplications.Symbols;
 
     public static partial class BalSymbolDefinitions
     {
@@ -19,7 +19,7 @@ namespace WixToolset.Bal
     }
 }
 
-namespace WixToolset.Bal.Symbols
+namespace WixToolset.BootstrapperApplications.Symbols
 {
     using WixToolset.Data;
 
diff --git a/src/ext/Bal/wixext/Symbols/WixPrereqInformationSymbol.cs b/src/ext/Bal/wixext/Symbols/WixPrereqInformationSymbol.cs
index 4b5e301e..9ab492e6 100644
--- a/src/ext/Bal/wixext/Symbols/WixPrereqInformationSymbol.cs
+++ b/src/ext/Bal/wixext/Symbols/WixPrereqInformationSymbol.cs
@@ -1,9 +1,9 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Bal
+namespace WixToolset.BootstrapperApplications
 {
     using WixToolset.Data;
-    using WixToolset.Bal.Symbols;
+    using WixToolset.BootstrapperApplications.Symbols;
 
     public static partial class BalSymbolDefinitions
     {
@@ -19,7 +19,7 @@ namespace WixToolset.Bal
     }
 }
 
-namespace WixToolset.Bal.Symbols
+namespace WixToolset.BootstrapperApplications.Symbols
 {
     using WixToolset.Data;
 
diff --git a/src/ext/Bal/wixext/Symbols/WixPrereqOptionsSymbol.cs b/src/ext/Bal/wixext/Symbols/WixPrereqOptionsSymbol.cs
index a351d7da..9fc2a8fc 100644
--- a/src/ext/Bal/wixext/Symbols/WixPrereqOptionsSymbol.cs
+++ b/src/ext/Bal/wixext/Symbols/WixPrereqOptionsSymbol.cs
@@ -1,9 +1,9 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Bal
+namespace WixToolset.BootstrapperApplications
 {
     using WixToolset.Data;
-    using WixToolset.Bal.Symbols;
+    using WixToolset.BootstrapperApplications.Symbols;
 
     public static partial class BalSymbolDefinitions
     {
@@ -19,7 +19,7 @@ namespace WixToolset.Bal
     }
 }
 
-namespace WixToolset.Bal.Symbols
+namespace WixToolset.BootstrapperApplications.Symbols
 {
     using WixToolset.Data;
 
diff --git a/src/ext/Bal/wixext/Symbols/WixStdbaCommandLineSymbol.cs b/src/ext/Bal/wixext/Symbols/WixStdbaCommandLineSymbol.cs
index 3b3823f3..17f0afaa 100644
--- a/src/ext/Bal/wixext/Symbols/WixStdbaCommandLineSymbol.cs
+++ b/src/ext/Bal/wixext/Symbols/WixStdbaCommandLineSymbol.cs
@@ -1,9 +1,9 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Bal
+namespace WixToolset.BootstrapperApplications
 {
     using WixToolset.Data;
-    using WixToolset.Bal.Symbols;
+    using WixToolset.BootstrapperApplications.Symbols;
 
     public static partial class BalSymbolDefinitions
     {
@@ -17,7 +17,7 @@ namespace WixToolset.Bal
     }
 }
 
-namespace WixToolset.Bal.Symbols
+namespace WixToolset.BootstrapperApplications.Symbols
 {
     using System;
     using WixToolset.Data;
diff --git a/src/ext/Bal/wixext/Symbols/WixStdbaOptionsSymbol.cs b/src/ext/Bal/wixext/Symbols/WixStdbaOptionsSymbol.cs
index cb2694da..43f634ea 100644
--- a/src/ext/Bal/wixext/Symbols/WixStdbaOptionsSymbol.cs
+++ b/src/ext/Bal/wixext/Symbols/WixStdbaOptionsSymbol.cs
@@ -1,9 +1,9 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Bal
+namespace WixToolset.BootstrapperApplications
 {
     using WixToolset.Data;
-    using WixToolset.Bal.Symbols;
+    using WixToolset.BootstrapperApplications.Symbols;
 
     public static partial class BalSymbolDefinitions
     {
@@ -21,7 +21,7 @@ namespace WixToolset.Bal
     }
 }
 
-namespace WixToolset.Bal.Symbols
+namespace WixToolset.BootstrapperApplications.Symbols
 {
     using WixToolset.Data;
 
@@ -76,4 +76,4 @@ namespace WixToolset.Bal.Symbols
             set => this.Set((int)WixStdbaOptionsSymbolFields.SupportCacheOnly, value);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/ext/Bal/wixext/Symbols/WixStdbaOverridableVariableSymbol.cs b/src/ext/Bal/wixext/Symbols/WixStdbaOverridableVariableSymbol.cs
index 1d84d1aa..2b5f2a9c 100644
--- a/src/ext/Bal/wixext/Symbols/WixStdbaOverridableVariableSymbol.cs
+++ b/src/ext/Bal/wixext/Symbols/WixStdbaOverridableVariableSymbol.cs
@@ -1,9 +1,9 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Bal
+namespace WixToolset.BootstrapperApplications
 {
     using WixToolset.Data;
-    using WixToolset.Bal.Symbols;
+    using WixToolset.BootstrapperApplications.Symbols;
 
     public static partial class BalSymbolDefinitions
     {
@@ -17,7 +17,7 @@ namespace WixToolset.Bal
     }
 }
 
-namespace WixToolset.Bal.Symbols
+namespace WixToolset.BootstrapperApplications.Symbols
 {
     using WixToolset.Data;
 
@@ -44,4 +44,4 @@ namespace WixToolset.Bal.Symbols
             set => this.Set((int)WixStdbaOverridableVariableSymbolFields.Name, value);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj b/src/ext/Bal/wixext/WixToolset.BootstrapperApplications.wixext.csproj
index 5591abde..3dd8d306 100644
--- a/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj
+++ b/src/ext/Bal/wixext/WixToolset.BootstrapperApplications.wixext.csproj
@@ -4,19 +4,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace>WixToolset.Bal</RootNamespace>
-    <Description>WiX Toolset Bundle extension</Description>
-    <Title>WiX Toolset Bundle extension</Title>
+    <RootNamespace>WixToolset.BootstrapperApplications</RootNamespace>
+    <Description>WiX Toolset BootstrapperApplications extension</Description>
+    <Title>WiX Toolset BootstrapperApplications extension</Title>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
   <Import Project="..\..\WixExt.props" />
 
   <ItemGroup>
-    <EmbeddedResource Include="$(OutputPath)..\bal.wixlib" />
+    <EmbeddedResource Include="$(OutputPath)..\bas.wixlib" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
-    <ProjectReference Include="..\wixlib\bal.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
+    <ProjectReference Include="..\wixlib\bas.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/wixext/WixToolset.Bal.wixext.targets b/src/ext/Bal/wixext/WixToolset.BootstrapperApplications.wixext.targets
index bf6df083..bf6df083 100644
--- a/src/ext/Bal/wixext/WixToolset.Bal.wixext.targets
+++ b/src/ext/Bal/wixext/WixToolset.BootstrapperApplications.wixext.targets
diff --git a/src/ext/Bal/wixiuiba/wixiuiba.vcxproj b/src/ext/Bal/wixiuiba/wixiuiba.vcxproj
index 6b20db30..8d47c39a 100644
--- a/src/ext/Bal/wixiuiba/wixiuiba.vcxproj
+++ b/src/ext/Bal/wixiuiba/wixiuiba.vcxproj
@@ -82,7 +82,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.BalUtil" />
+    <PackageReference Include="WixToolset.BootstrapperApplicationApi" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
   </ItemGroup>
 
diff --git a/src/ext/Bal/wixlib/bal.wixproj b/src/ext/Bal/wixlib/bas.wixproj
index 31369115..31369115 100644
--- a/src/ext/Bal/wixlib/bal.wixproj
+++ b/src/ext/Bal/wixlib/bas.wixproj
diff --git a/src/ext/Bal/wixlib/bal_arm64.wxs b/src/ext/Bal/wixlib/bas_arm64.wxs
index 4ddbfc47..ba6c5d82 100644
--- a/src/ext/Bal/wixlib/bal_arm64.wxs
+++ b/src/ext/Bal/wixlib/bas_arm64.wxs
@@ -2,5 +2,5 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <?define platform=arm64 ?>
-    <?include bal_platform.wxi ?>
+    <?include bas_platform.wxi ?>
 </Wix>
diff --git a/src/ext/Bal/wixlib/bal_platform.wxi b/src/ext/Bal/wixlib/bas_platform.wxi
index af58f4c3..af58f4c3 100644
--- a/src/ext/Bal/wixlib/bal_platform.wxi
+++ b/src/ext/Bal/wixlib/bas_platform.wxi
diff --git a/src/ext/Bal/wixlib/bal_x64.wxs b/src/ext/Bal/wixlib/bas_x64.wxs
index f2c62418..7a8cade5 100644
--- a/src/ext/Bal/wixlib/bal_x64.wxs
+++ b/src/ext/Bal/wixlib/bas_x64.wxs
@@ -3,5 +3,5 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <?define platform=x64 ?>
-    <?include bal_platform.wxi ?>
+    <?include bas_platform.wxi ?>
 </Wix>
diff --git a/src/ext/Bal/wixlib/bal_x86.wxs b/src/ext/Bal/wixlib/bas_x86.wxs
index e00115b2..419702db 100644
--- a/src/ext/Bal/wixlib/bal_x86.wxs
+++ b/src/ext/Bal/wixlib/bas_x86.wxs
@@ -3,5 +3,5 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <?define platform=x86 ?>
-    <?include bal_platform.wxi ?>
+    <?include bas_platform.wxi ?>
 </Wix>
diff --git a/src/ext/Bal/wixprqba/wixprqba.vcxproj b/src/ext/Bal/wixprqba/wixprqba.vcxproj
index b992fe14..8c838fb5 100644
--- a/src/ext/Bal/wixprqba/wixprqba.vcxproj
+++ b/src/ext/Bal/wixprqba/wixprqba.vcxproj
@@ -82,7 +82,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.BalUtil" />
+    <PackageReference Include="WixToolset.BootstrapperApplicationApi" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
   </ItemGroup>
 
diff --git a/src/ext/Bal/wixstdba/wixstdba.vcxproj b/src/ext/Bal/wixstdba/wixstdba.vcxproj
index e8317fbf..1f961018 100644
--- a/src/ext/Bal/wixstdba/wixstdba.vcxproj
+++ b/src/ext/Bal/wixstdba/wixstdba.vcxproj
@@ -82,7 +82,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.BalUtil" />
+    <PackageReference Include="WixToolset.BootstrapperApplicationApi" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
   </ItemGroup>
 
diff --git a/src/ext/NetFx/be/precomp.h b/src/ext/NetFx/be/precomp.h
index c164834d..a0ae1038 100644
--- a/src/ext/NetFx/be/precomp.h
+++ b/src/ext/NetFx/be/precomp.h
@@ -19,11 +19,6 @@
 #include <procutil.h>
 #include <xmlutil.h>
 
-#include <BundleExtensionEngine.h>
-#include <BundleExtension.h>
-
-#include <IBundleExtensionEngine.h>
-#include <IBundleExtension.h>
 #include <bextutil.h>
 #include <BextBundleExtensionEngine.h>
 
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
index 27a19116..a78a5617 100644
--- a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
+++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
@@ -24,7 +24,7 @@ namespace WixToolsetTest.Netfx
                 var extensionResult = WixRunner.Execute(new[]
                 {
                     "extension", "add",
-                    "WixToolset.Bal.wixext"
+                    "WixToolset.BootstrapperApplications.wixext"
                 });
 
                 var compileResult = WixRunner.Execute(new[]
@@ -33,7 +33,7 @@ namespace WixToolsetTest.Netfx
                     Path.Combine(bundleSourceFolder, "BundleLatest.wxs"),
                     Path.Combine(bundleSourceFolder, "NetCore3.1.12_x86.wxs"),
                     Path.Combine(bundleSourceFolder, "NetCore3.1.12_x64.wxs"),
-                    "-ext", "WixToolset.Bal.wixext",
+                    "-ext", "WixToolset.BootstrapperApplications.wixext",
                     "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-o", bundleFile,
@@ -57,7 +57,7 @@ namespace WixToolsetTest.Netfx
                 var extensionResult = WixRunner.Execute(new[]
                 {
                     "extension", "add",
-                    "WixToolset.Bal.wixext"
+                    "WixToolset.BootstrapperApplications.wixext"
                 });
 
                 var compileResult = WixRunner.Execute(new[]
@@ -65,7 +65,7 @@ namespace WixToolsetTest.Netfx
                     "build",
                     Path.Combine(bundleSourceFolder, "BundleLatest_x64.wxs"),
                     Path.Combine(bundleSourceFolder, "NetCore3.1.12_x64.wxs"),
-                    "-ext", "WixToolset.Bal.wixext",
+                    "-ext", "WixToolset.BootstrapperApplications.wixext",
                     "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-o", bundleFile,
@@ -89,14 +89,14 @@ namespace WixToolsetTest.Netfx
                 var extensionResult = WixRunner.Execute(new[]
                 {
                     "extension", "add",
-                    "WixToolset.Bal.wixext"
+                    "WixToolset.BootstrapperApplications.wixext"
                 });
 
                 var compileResult = WixRunner.Execute(new[]
                 {
                     "build",
                     Path.Combine(bundleSourceFolder, "BundleLatest.wxs"),
-                    "-ext", "WixToolset.Bal.wixext",
+                    "-ext", "WixToolset.BootstrapperApplications.wixext",
                     "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-o", bundleFile,
@@ -121,7 +121,7 @@ namespace WixToolsetTest.Netfx
                 var extensionResult = WixRunner.Execute(warningsAsErrors: true, new[]
                 {
                     "extension", "add",
-                    "WixToolset.Bal.wixext",
+                    "WixToolset.BootstrapperApplications.wixext",
                     "extension", "add",
                     "WixToolset.Util.wixext",
                 });
@@ -130,7 +130,7 @@ namespace WixToolsetTest.Netfx
                 {
                     "build",
                     Path.Combine(bundleSourceFolder, "BundleLatest.wxs"),
-                    "-ext", "WixToolset.Bal.wixext",
+                    "-ext", "WixToolset.BootstrapperApplications.wixext",
                     "-ext", "WixToolset.Util.wixext",
                     "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
diff --git a/src/ext/NetFx/wixlib/netfx.wixproj b/src/ext/NetFx/wixlib/netfx.wixproj
index 2bd09d95..4327257a 100644
--- a/src/ext/NetFx/wixlib/netfx.wixproj
+++ b/src/ext/NetFx/wixlib/netfx.wixproj
@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.Util.wixext" />
   </ItemGroup>
 
diff --git a/src/ext/Util/be/precomp.h b/src/ext/Util/be/precomp.h
index 5ce5744f..d04bf305 100644
--- a/src/ext/Util/be/precomp.h
+++ b/src/ext/Util/be/precomp.h
@@ -23,11 +23,6 @@
 #include <pathutil.h>
 #include <xmlutil.h>
 
-#include <BundleExtensionEngine.h>
-#include <BundleExtension.h>
-
-#include <IBundleExtensionEngine.h>
-#include <IBundleExtension.h>
 #include <bextutil.h>
 #include <BextBundleExtensionEngine.h>
 
diff --git a/src/ext/WixExt.props b/src/ext/WixExt.props
index 19a96254..4babfb7c 100644
--- a/src/ext/WixExt.props
+++ b/src/ext/WixExt.props
@@ -6,11 +6,12 @@
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
     <NoWarn>NU5100</NoWarn>
+    <WixExtensionPackageFolder>wixext5</WixExtensionPackageFolder>
   </PropertyGroup>
 
   <ItemGroup>
     <Content Include="$(MSBuildProjectName).targets" PackagePath="build" />
-    <Content Include="$(TargetPath)" PackagePath="wixext5" />
+    <Content Include="$(TargetPath)" PackagePath="$(WixExtensionPackageFolder)" />
 
     <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
   </ItemGroup>
diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp
index 35f96eb6..2189a371 100644
--- a/src/internal/SetBuildNumber/Directory.Packages.props.pp
+++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp
@@ -13,10 +13,8 @@
     <PackageVersion Include="WixToolset.DUtil" Version="{packageversion}" />
     <PackageVersion Include="WixToolset.WcaUtil" Version="{packageversion}" />
 
-    <PackageVersion Include="WixToolset.BootstrapperCore.Native" Version="{packageversion}" />
-    <PackageVersion Include="WixToolset.BalUtil" Version="{packageversion}" />
     <PackageVersion Include="WixToolset.BextUtil" Version="{packageversion}" />
-    <PackageVersion Include="WixToolset.Mba.Core" Version="{packageversion}" />
+    <PackageVersion Include="WixToolset.BootstrapperApplicationApi" Version="{packageversion}" />
 
     <PackageVersion Include="WixToolset.Data" Version="{packageversion}" />
     <PackageVersion Include="WixToolset.Extensibility" Version="{packageversion}" />
@@ -32,6 +30,7 @@
     <PackageVersion Include="WixToolset.Heat" Version="{packageversion}" />
 
     <PackageVersion Include="WixToolset.Bal.wixext" Version="{packageversion}" />
+    <PackageVersion Include="WixToolset.BootstrapperApplications.wixext" Version="{packageversion}" />
     <PackageVersion Include="WixToolset.Dependency.wixext" Version="{packageversion}" />
     <PackageVersion Include="WixToolset.NetFx.wixext" Version="{packageversion}" />
     <PackageVersion Include="WixToolset.UI.wixext" Version="{packageversion}" />
diff --git a/src/setup/WixAdditionalTools/WixAdditionalTools.wixproj b/src/setup/WixAdditionalTools/WixAdditionalTools.wixproj
index 847e144a..bb1764fb 100644
--- a/src/setup/WixAdditionalTools/WixAdditionalTools.wixproj
+++ b/src/setup/WixAdditionalTools/WixAdditionalTools.wixproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
   </ItemGroup>
 
   <UsingTask TaskName="GenerateMetadata" AssemblyFile="$(BaseOutputPath)$(Configuration)\net472\MetadataTask.dll" />
diff --git a/src/test/burn/TestBA/Program.cs b/src/test/burn/TestBA/Program.cs
index 6986a057..c6777b89 100644
--- a/src/test/burn/TestBA/Program.cs
+++ b/src/test/burn/TestBA/Program.cs
@@ -2,7 +2,7 @@
 
 namespace WixToolset.Test.BA
 {
-    using WixToolset.Mba.Core;
+    using WixToolset.BootstrapperApplicationApi;
 
     internal class Program
     {
diff --git a/src/test/burn/TestBA/TestBA.cs b/src/test/burn/TestBA/TestBA.cs
index 8a116957..1556acd0 100644
--- a/src/test/burn/TestBA/TestBA.cs
+++ b/src/test/burn/TestBA/TestBA.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Test.BA
     using System.Threading;
     using System.Windows.Forms;
     using Microsoft.Win32;
-    using WixToolset.Mba.Core;
+    using WixToolset.BootstrapperApplicationApi;
 
     /// <summary>
     /// A minimal UX used for testing.
diff --git a/src/test/burn/TestBA/TestBA.csproj b/src/test/burn/TestBA/TestBA.csproj
index 715ac5bc..6db83b20 100644
--- a/src/test/burn/TestBA/TestBA.csproj
+++ b/src/test/burn/TestBA/TestBA.csproj
@@ -20,6 +20,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.Mba.Core" />
+    <PackageReference Include="WixToolset.BootstrapperApplicationApi" />
   </ItemGroup>
 </Project>
diff --git a/src/test/burn/TestBA/TestBA_x64.csproj b/src/test/burn/TestBA/TestBA_x64.csproj
index 1f8659a0..9d8dc330 100644
--- a/src/test/burn/TestBA/TestBA_x64.csproj
+++ b/src/test/burn/TestBA/TestBA_x64.csproj
@@ -20,6 +20,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.Mba.Core" />
+    <PackageReference Include="WixToolset.BootstrapperApplicationApi" />
   </ItemGroup>
 </Project>
diff --git a/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/BafRelatedBundleVariableTesting.vcxproj b/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/BafRelatedBundleVariableTesting.vcxproj
index 94d44ac3..58db7048 100644
--- a/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/BafRelatedBundleVariableTesting.vcxproj
+++ b/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/BafRelatedBundleVariableTesting.vcxproj
@@ -59,7 +59,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.BalUtil" />
+    <PackageReference Include="WixToolset.BootstrapperApplicationApi" />
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/test/burn/TestData/BAFunctionsTests/BundleAv1/BundleAv1.wixproj b/src/test/burn/TestData/BAFunctionsTests/BundleAv1/BundleAv1.wixproj
index b2045deb..d2688a00 100644
--- a/src/test/burn/TestData/BAFunctionsTests/BundleAv1/BundleAv1.wixproj
+++ b/src/test/burn/TestData/BAFunctionsTests/BundleAv1/BundleAv1.wixproj
@@ -5,6 +5,7 @@
     <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
   </ItemGroup>
   <ItemGroup>
+    <!-- For testing purposes: Use old Bal WiX extension instead of new BoostrapperApplications.wixext -->
     <PackageReference Include="WixToolset.Bal.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/BAFunctionsTests/BundleAv2/BundleAv2.wixproj b/src/test/burn/TestData/BAFunctionsTests/BundleAv2/BundleAv2.wixproj
index dee120d7..63d8079e 100644
--- a/src/test/burn/TestData/BAFunctionsTests/BundleAv2/BundleAv2.wixproj
+++ b/src/test/burn/TestData/BAFunctionsTests/BundleAv2/BundleAv2.wixproj
@@ -8,6 +8,6 @@
     <ProjectReference Include="..\PackageAv2\PackageAv2.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj
index dcd38527..c643fe9f 100644
--- a/src/test/burn/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj
+++ b/src/test/burn/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj
@@ -12,6 +12,6 @@
     <ProjectReference Include="..\PackageA\PackageA.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/BasicFunctionalityTests/BundleA_arm64/BundleA_arm64.wixproj b/src/test/burn/TestData/BasicFunctionalityTests/BundleA_arm64/BundleA_arm64.wixproj
index 535129df..b3c0f4fd 100644
--- a/src/test/burn/TestData/BasicFunctionalityTests/BundleA_arm64/BundleA_arm64.wixproj
+++ b/src/test/burn/TestData/BasicFunctionalityTests/BundleA_arm64/BundleA_arm64.wixproj
@@ -13,6 +13,6 @@
     <ProjectReference Include="..\PackageA_arm64\PackageA_arm64.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/BasicFunctionalityTests/BundleA_x64/BundleA_x64.wixproj b/src/test/burn/TestData/BasicFunctionalityTests/BundleA_x64/BundleA_x64.wixproj
index 7e29856f..43bc988c 100644
--- a/src/test/burn/TestData/BasicFunctionalityTests/BundleA_x64/BundleA_x64.wixproj
+++ b/src/test/burn/TestData/BasicFunctionalityTests/BundleA_x64/BundleA_x64.wixproj
@@ -13,6 +13,6 @@
     <ProjectReference Include="..\PackageA_x64\PackageA_x64.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/BasicFunctionalityTests/BundleApu_x64/BundleApu_x64.wixproj b/src/test/burn/TestData/BasicFunctionalityTests/BundleApu_x64/BundleApu_x64.wixproj
index 3cbedc3d..5841cf09 100644
--- a/src/test/burn/TestData/BasicFunctionalityTests/BundleApu_x64/BundleApu_x64.wixproj
+++ b/src/test/burn/TestData/BasicFunctionalityTests/BundleApu_x64/BundleApu_x64.wixproj
@@ -13,6 +13,6 @@
     <ProjectReference Include="..\PackageApu_x64\PackageApu_x64.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/BasicFunctionalityTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/BasicFunctionalityTests/BundleB/BundleB.wixproj
index 6f39097a..06b07dcb 100644
--- a/src/test/burn/TestData/BasicFunctionalityTests/BundleB/BundleB.wixproj
+++ b/src/test/burn/TestData/BasicFunctionalityTests/BundleB/BundleB.wixproj
@@ -13,7 +13,8 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
+    <!-- For testing purposes: Use old Bal WiX extension instead of new BoostrapperApplications.wixext -->
     <PackageReference Include="WixToolset.Bal.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/BasicFunctionalityTests/BundleB_x64/BundleB_x64.wixproj b/src/test/burn/TestData/BasicFunctionalityTests/BundleB_x64/BundleB_x64.wixproj
index c940f02a..bf3a8efb 100644
--- a/src/test/burn/TestData/BasicFunctionalityTests/BundleB_x64/BundleB_x64.wixproj
+++ b/src/test/burn/TestData/BasicFunctionalityTests/BundleB_x64/BundleB_x64.wixproj
@@ -15,7 +15,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/BasicFunctionalityTests/BundleC/BundleC.wixproj b/src/test/burn/TestData/BasicFunctionalityTests/BundleC/BundleC.wixproj
index 0eb66ee3..d025a728 100644
--- a/src/test/burn/TestData/BasicFunctionalityTests/BundleC/BundleC.wixproj
+++ b/src/test/burn/TestData/BasicFunctionalityTests/BundleC/BundleC.wixproj
@@ -14,7 +14,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/BasicFunctionalityTests/BundleC_x64/BundleC_x64.wixproj b/src/test/burn/TestData/BasicFunctionalityTests/BundleC_x64/BundleC_x64.wixproj
index af028ed4..1c036ed5 100644
--- a/src/test/burn/TestData/BasicFunctionalityTests/BundleC_x64/BundleC_x64.wixproj
+++ b/src/test/burn/TestData/BasicFunctionalityTests/BundleC_x64/BundleC_x64.wixproj
@@ -15,7 +15,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/BasicFunctionalityTests/BundleD/BundleD.wixproj b/src/test/burn/TestData/BasicFunctionalityTests/BundleD/BundleD.wixproj
index a2af1aa5..5972dc7e 100644
--- a/src/test/burn/TestData/BasicFunctionalityTests/BundleD/BundleD.wixproj
+++ b/src/test/burn/TestData/BasicFunctionalityTests/BundleD/BundleD.wixproj
@@ -14,7 +14,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/BasicFunctionalityTests/BundleD_x64/BundleD_x64.wixproj b/src/test/burn/TestData/BasicFunctionalityTests/BundleD_x64/BundleD_x64.wixproj
index 338d523d..4071910c 100644
--- a/src/test/burn/TestData/BasicFunctionalityTests/BundleD_x64/BundleD_x64.wixproj
+++ b/src/test/burn/TestData/BasicFunctionalityTests/BundleD_x64/BundleD_x64.wixproj
@@ -15,7 +15,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/BundlePackageTests/BundlePackageUninstallFailureBundle/BundlePackageUninstallFailureBundle.wixproj b/src/test/burn/TestData/BundlePackageTests/BundlePackageUninstallFailureBundle/BundlePackageUninstallFailureBundle.wixproj
index 276d9dcb..c7d97ed1 100644
--- a/src/test/burn/TestData/BundlePackageTests/BundlePackageUninstallFailureBundle/BundlePackageUninstallFailureBundle.wixproj
+++ b/src/test/burn/TestData/BundlePackageTests/BundlePackageUninstallFailureBundle/BundlePackageUninstallFailureBundle.wixproj
@@ -13,7 +13,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/BundlePackageTests/MultipleBundlePackagesBundle/MultipleBundlePackagesBundle.wixproj b/src/test/burn/TestData/BundlePackageTests/MultipleBundlePackagesBundle/MultipleBundlePackagesBundle.wixproj
index a9639014..872fab7c 100644
--- a/src/test/burn/TestData/BundlePackageTests/MultipleBundlePackagesBundle/MultipleBundlePackagesBundle.wixproj
+++ b/src/test/burn/TestData/BundlePackageTests/MultipleBundlePackagesBundle/MultipleBundlePackagesBundle.wixproj
@@ -13,7 +13,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/BundlePackageTests/MultipleBundlePackagesWithRemoteBundle/MultipleBundlePackagesWithRemoteBundle.wixproj b/src/test/burn/TestData/BundlePackageTests/MultipleBundlePackagesWithRemoteBundle/MultipleBundlePackagesWithRemoteBundle.wixproj
index 0a6ef51e..ad9766cc 100644
--- a/src/test/burn/TestData/BundlePackageTests/MultipleBundlePackagesWithRemoteBundle/MultipleBundlePackagesWithRemoteBundle.wixproj
+++ b/src/test/burn/TestData/BundlePackageTests/MultipleBundlePackagesWithRemoteBundle/MultipleBundlePackagesWithRemoteBundle.wixproj
@@ -11,7 +11,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
 </Project>
diff --git a/src/test/burn/TestData/BundlePackageTests/UpgradeBundlePackageBundlev1/UpgradeBundlePackageBundle.props b/src/test/burn/TestData/BundlePackageTests/UpgradeBundlePackageBundlev1/UpgradeBundlePackageBundle.props
index 1c761dfc..d187d093 100644
--- a/src/test/burn/TestData/BundlePackageTests/UpgradeBundlePackageBundlev1/UpgradeBundlePackageBundle.props
+++ b/src/test/burn/TestData/BundlePackageTests/UpgradeBundlePackageBundlev1/UpgradeBundlePackageBundle.props
@@ -9,6 +9,6 @@
     <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
   </ItemGroup>
 </Project>
diff --git a/src/test/burn/TestData/BundlePackageTests/V3BundlePackageBundle/V3BundlePackageBundle.wixproj b/src/test/burn/TestData/BundlePackageTests/V3BundlePackageBundle/V3BundlePackageBundle.wixproj
index a7930a09..4a9305ff 100644
--- a/src/test/burn/TestData/BundlePackageTests/V3BundlePackageBundle/V3BundlePackageBundle.wixproj
+++ b/src/test/burn/TestData/BundlePackageTests/V3BundlePackageBundle/V3BundlePackageBundle.wixproj
@@ -17,7 +17,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/CacheTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/CacheTests/BundleA/BundleA.wixproj
index 4fe00693..fc5e1443 100644
--- a/src/test/burn/TestData/CacheTests/BundleA/BundleA.wixproj
+++ b/src/test/burn/TestData/CacheTests/BundleA/BundleA.wixproj
@@ -13,7 +13,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/CacheTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/CacheTests/BundleB/BundleB.wixproj
index ab711157..01a488d3 100644
--- a/src/test/burn/TestData/CacheTests/BundleB/BundleB.wixproj
+++ b/src/test/burn/TestData/CacheTests/BundleB/BundleB.wixproj
@@ -13,7 +13,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj b/src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj
index a0776d08..a5a8c6e3 100644
--- a/src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj
+++ b/src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj
@@ -12,7 +12,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
   <!-- We do this dynamically to avoid committing such a large file to source control. -->
@@ -24,4 +24,4 @@
     <Delete Files="$(OutputPath)fivegb.file" />
     <Delete Files="$(MSBuildProjectDirectory)\fivegb.file" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/ContainerTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/ContainerTests/BundleA/BundleA.wixproj
index 1c2f1651..8202491c 100644
--- a/src/test/burn/TestData/ContainerTests/BundleA/BundleA.wixproj
+++ b/src/test/burn/TestData/ContainerTests/BundleA/BundleA.wixproj
@@ -13,7 +13,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/ContainerTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/ContainerTests/BundleB/BundleB.wixproj
index a91e6317..b6d3d123 100644
--- a/src/test/burn/TestData/ContainerTests/BundleB/BundleB.wixproj
+++ b/src/test/burn/TestData/ContainerTests/BundleB/BundleB.wixproj
@@ -13,7 +13,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/BundleAv1/BundleAv1.wixproj b/src/test/burn/TestData/DependencyTests/BundleAv1/BundleAv1.wixproj
index 8a5c9594..4f0f4bed 100644
--- a/src/test/burn/TestData/DependencyTests/BundleAv1/BundleAv1.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleAv1/BundleAv1.wixproj
@@ -9,8 +9,8 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
     <PackageReference Include="WixToolset.Util.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wixproj b/src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wixproj
index 4c6a0993..82646d2d 100644
--- a/src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wixproj
@@ -9,8 +9,8 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
     <PackageReference Include="WixToolset.Util.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/BundleAv2/BundleAv2.wixproj b/src/test/burn/TestData/DependencyTests/BundleAv2/BundleAv2.wixproj
index eab737f8..0c1ac068 100644
--- a/src/test/burn/TestData/DependencyTests/BundleAv2/BundleAv2.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleAv2/BundleAv2.wixproj
@@ -9,8 +9,8 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
     <PackageReference Include="WixToolset.Util.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/DependencyTests/BundleB/BundleB.wixproj
index 2d2f4eaa..4a659ab1 100644
--- a/src/test/burn/TestData/DependencyTests/BundleB/BundleB.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleB/BundleB.wixproj
@@ -11,8 +11,8 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
     <PackageReference Include="WixToolset.Util.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/BundleC/BundleC.wixproj b/src/test/burn/TestData/DependencyTests/BundleC/BundleC.wixproj
index cd65ea69..0ec02f6a 100644
--- a/src/test/burn/TestData/DependencyTests/BundleC/BundleC.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleC/BundleC.wixproj
@@ -15,8 +15,8 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
     <PackageReference Include="WixToolset.Util.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/BundleD/BundleD.wixproj b/src/test/burn/TestData/DependencyTests/BundleD/BundleD.wixproj
index 25af31de..f44759a6 100644
--- a/src/test/burn/TestData/DependencyTests/BundleD/BundleD.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleD/BundleD.wixproj
@@ -15,8 +15,8 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
     <PackageReference Include="WixToolset.Util.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wixproj b/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wixproj
index 3fddc2d4..32ef2b42 100644
--- a/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wixproj
@@ -14,8 +14,8 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
     <PackageReference Include="WixToolset.Util.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wixproj b/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wixproj
index 75481940..62617f5e 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wixproj
@@ -11,11 +11,11 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
     <PackageReference Include="WixToolset.Util.wixext" />
   </ItemGroup>
   <ItemGroup>
     <WixExtension Include="$(ForTestingUseOnlyWixextPath)" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj b/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj
index 14072fed..ea71ae07 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj
@@ -13,11 +13,11 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
     <PackageReference Include="WixToolset.Util.wixext" />
   </ItemGroup>
   <ItemGroup>
     <WixExtension Include="$(ForTestingUseOnlyWixextPath)" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wixproj b/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wixproj
index c467222f..ed46e89c 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wixproj
@@ -13,11 +13,11 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
     <PackageReference Include="WixToolset.Util.wixext" />
   </ItemGroup>
   <ItemGroup>
     <WixExtension Include="$(ForTestingUseOnlyWixextPath)" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wixproj b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wixproj
index 1c8ad4d3..89c9441a 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wixproj
@@ -9,8 +9,8 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
     <PackageReference Include="WixToolset.Util.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wixproj b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wixproj
index dcc89f67..5861f538 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wixproj
@@ -10,8 +10,8 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
     <PackageReference Include="WixToolset.Util.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wixproj b/src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wixproj
index 7b6aa9f3..a8b3c894 100644
--- a/src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wixproj
@@ -10,8 +10,8 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
     <PackageReference Include="WixToolset.Util.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/BundleHv1/BundleHv1.wixproj b/src/test/burn/TestData/DependencyTests/BundleHv1/BundleHv1.wixproj
index 14817b3a..da763f89 100644
--- a/src/test/burn/TestData/DependencyTests/BundleHv1/BundleHv1.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleHv1/BundleHv1.wixproj
@@ -7,7 +7,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/BundleHv2/BundleHv2.wixproj b/src/test/burn/TestData/DependencyTests/BundleHv2/BundleHv2.wixproj
index 6a96e230..5a0a0d8f 100644
--- a/src/test/burn/TestData/DependencyTests/BundleHv2/BundleHv2.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleHv2/BundleHv2.wixproj
@@ -10,7 +10,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wixproj b/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wixproj
index 5a418642..afe4d72c 100644
--- a/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wixproj
@@ -14,8 +14,8 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
     <PackageReference Include="WixToolset.Util.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj b/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj
index e31d3423..19dbd4d5 100644
--- a/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj
@@ -14,8 +14,8 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
     <PackageReference Include="WixToolset.Util.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/BundleKv1/BundleKv1.wixproj b/src/test/burn/TestData/DependencyTests/BundleKv1/BundleKv1.wixproj
index ff9db038..8cf03ae6 100644
--- a/src/test/burn/TestData/DependencyTests/BundleKv1/BundleKv1.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleKv1/BundleKv1.wixproj
@@ -6,7 +6,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/BundleKv2/BundleKv2.wixproj b/src/test/burn/TestData/DependencyTests/BundleKv2/BundleKv2.wixproj
index 9f55fa9a..c234c54f 100644
--- a/src/test/burn/TestData/DependencyTests/BundleKv2/BundleKv2.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleKv2/BundleKv2.wixproj
@@ -9,7 +9,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/BundleL/BundleL.wixproj b/src/test/burn/TestData/DependencyTests/BundleL/BundleL.wixproj
index e1a60b4e..6f28e222 100644
--- a/src/test/burn/TestData/DependencyTests/BundleL/BundleL.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleL/BundleL.wixproj
@@ -13,8 +13,8 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
     <PackageReference Include="WixToolset.Util.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/BundleM/BundleM.wixproj b/src/test/burn/TestData/DependencyTests/BundleM/BundleM.wixproj
index 3aee3643..9f135e71 100644
--- a/src/test/burn/TestData/DependencyTests/BundleM/BundleM.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleM/BundleM.wixproj
@@ -13,8 +13,8 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
     <PackageReference Include="WixToolset.Util.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/BundleNv1/BundleNv1.wixproj b/src/test/burn/TestData/DependencyTests/BundleNv1/BundleNv1.wixproj
index 3bcd8c0c..6b8fb17c 100644
--- a/src/test/burn/TestData/DependencyTests/BundleNv1/BundleNv1.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleNv1/BundleNv1.wixproj
@@ -7,7 +7,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/BundleNv1_0_1/BundleNv1_0_1.wixproj b/src/test/burn/TestData/DependencyTests/BundleNv1_0_1/BundleNv1_0_1.wixproj
index 68a0d0d3..f90d8177 100644
--- a/src/test/burn/TestData/DependencyTests/BundleNv1_0_1/BundleNv1_0_1.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleNv1_0_1/BundleNv1_0_1.wixproj
@@ -11,7 +11,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/DependencyTests/BundleNv2/BundleNv2.wixproj b/src/test/burn/TestData/DependencyTests/BundleNv2/BundleNv2.wixproj
index a66c39f8..e87d9914 100644
--- a/src/test/burn/TestData/DependencyTests/BundleNv2/BundleNv2.wixproj
+++ b/src/test/burn/TestData/DependencyTests/BundleNv2/BundleNv2.wixproj
@@ -11,7 +11,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/ElevationTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/ElevationTests/BundleA/BundleA.wixproj
index 27c6e583..88146f06 100644
--- a/src/test/burn/TestData/ElevationTests/BundleA/BundleA.wixproj
+++ b/src/test/burn/TestData/ElevationTests/BundleA/BundleA.wixproj
@@ -12,7 +12,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/ExePackageTests/BrokenPerUserArpEntryExePackage/BrokenPerUserArpEntryExePackage.wixproj b/src/test/burn/TestData/ExePackageTests/BrokenPerUserArpEntryExePackage/BrokenPerUserArpEntryExePackage.wixproj
index bcb447b0..f164886b 100644
--- a/src/test/burn/TestData/ExePackageTests/BrokenPerUserArpEntryExePackage/BrokenPerUserArpEntryExePackage.wixproj
+++ b/src/test/burn/TestData/ExePackageTests/BrokenPerUserArpEntryExePackage/BrokenPerUserArpEntryExePackage.wixproj
@@ -11,7 +11,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/ExePackageTests/CustomExitCodeExePackage/CustomExitCodeExePackage.wixproj b/src/test/burn/TestData/ExePackageTests/CustomExitCodeExePackage/CustomExitCodeExePackage.wixproj
index 403f3320..d87407f2 100644
--- a/src/test/burn/TestData/ExePackageTests/CustomExitCodeExePackage/CustomExitCodeExePackage.wixproj
+++ b/src/test/burn/TestData/ExePackageTests/CustomExitCodeExePackage/CustomExitCodeExePackage.wixproj
@@ -11,7 +11,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/ExePackageTests/PerMachineArpEntryExePackage/PerMachineArpEntryExePackage.wixproj b/src/test/burn/TestData/ExePackageTests/PerMachineArpEntryExePackage/PerMachineArpEntryExePackage.wixproj
index ed46e6a5..c298711c 100644
--- a/src/test/burn/TestData/ExePackageTests/PerMachineArpEntryExePackage/PerMachineArpEntryExePackage.wixproj
+++ b/src/test/burn/TestData/ExePackageTests/PerMachineArpEntryExePackage/PerMachineArpEntryExePackage.wixproj
@@ -13,7 +13,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/ExePackageTests/PerMachineArpEntryExePackageFailure/PerMachineArpEntryExePackageFailure.wixproj b/src/test/burn/TestData/ExePackageTests/PerMachineArpEntryExePackageFailure/PerMachineArpEntryExePackageFailure.wixproj
index e4219565..dd8007e9 100644
--- a/src/test/burn/TestData/ExePackageTests/PerMachineArpEntryExePackageFailure/PerMachineArpEntryExePackageFailure.wixproj
+++ b/src/test/burn/TestData/ExePackageTests/PerMachineArpEntryExePackageFailure/PerMachineArpEntryExePackageFailure.wixproj
@@ -12,7 +12,7 @@
     <ProjectReference Include="..\PackageFail\PackageFail.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/ExePackageTests/PerMachineArpEntryExePackageUninstallFailure/PerMachineArpEntryExePackageUninstallFailure.wixproj b/src/test/burn/TestData/ExePackageTests/PerMachineArpEntryExePackageUninstallFailure/PerMachineArpEntryExePackageUninstallFailure.wixproj
index bbab2b75..1072365c 100644
--- a/src/test/burn/TestData/ExePackageTests/PerMachineArpEntryExePackageUninstallFailure/PerMachineArpEntryExePackageUninstallFailure.wixproj
+++ b/src/test/burn/TestData/ExePackageTests/PerMachineArpEntryExePackageUninstallFailure/PerMachineArpEntryExePackageUninstallFailure.wixproj
@@ -12,7 +12,7 @@
     <ProjectReference Include="..\PackageTestExe\PackageTestExe.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/ExePackageTests/PerMachineArpEntryWithUninstallStringExePackage/PerMachineArpEntryWithUninstallStringExePackage.wixproj b/src/test/burn/TestData/ExePackageTests/PerMachineArpEntryWithUninstallStringExePackage/PerMachineArpEntryWithUninstallStringExePackage.wixproj
index afdd9e5b..cf32e269 100644
--- a/src/test/burn/TestData/ExePackageTests/PerMachineArpEntryWithUninstallStringExePackage/PerMachineArpEntryWithUninstallStringExePackage.wixproj
+++ b/src/test/burn/TestData/ExePackageTests/PerMachineArpEntryWithUninstallStringExePackage/PerMachineArpEntryWithUninstallStringExePackage.wixproj
@@ -13,7 +13,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
 </Project>
diff --git a/src/test/burn/TestData/ExePackageTests/PerUserArpEntryExePackage/PerUserArpEntryExePackage.wixproj b/src/test/burn/TestData/ExePackageTests/PerUserArpEntryExePackage/PerUserArpEntryExePackage.wixproj
index 06395843..4141cc8f 100644
--- a/src/test/burn/TestData/ExePackageTests/PerUserArpEntryExePackage/PerUserArpEntryExePackage.wixproj
+++ b/src/test/burn/TestData/ExePackageTests/PerUserArpEntryExePackage/PerUserArpEntryExePackage.wixproj
@@ -11,7 +11,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/FailureTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/FailureTests/BundleA/BundleA.wixproj
index 9cd861af..768644a2 100644
--- a/src/test/burn/TestData/FailureTests/BundleA/BundleA.wixproj
+++ b/src/test/burn/TestData/FailureTests/BundleA/BundleA.wixproj
@@ -13,7 +13,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/FailureTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/FailureTests/BundleB/BundleB.wixproj
index 4b2da9fd..34ab1aef 100644
--- a/src/test/burn/TestData/FailureTests/BundleB/BundleB.wixproj
+++ b/src/test/burn/TestData/FailureTests/BundleB/BundleB.wixproj
@@ -10,7 +10,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/FailureTests/BundleC/BundleC.wixproj b/src/test/burn/TestData/FailureTests/BundleC/BundleC.wixproj
index cdabf5ca..97b6ce0c 100644
--- a/src/test/burn/TestData/FailureTests/BundleC/BundleC.wixproj
+++ b/src/test/burn/TestData/FailureTests/BundleC/BundleC.wixproj
@@ -13,10 +13,10 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
   <Target Name="RemovePackageThatShouldBeMissing" AfterTargets="AfterBuild">
     <Delete Files="$(OutputPath)MissingNonVital.msi" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/FailureTests/BundleD/BundleD.wixproj b/src/test/burn/TestData/FailureTests/BundleD/BundleD.wixproj
index 7b7408c6..38748d4a 100644
--- a/src/test/burn/TestData/FailureTests/BundleD/BundleD.wixproj
+++ b/src/test/burn/TestData/FailureTests/BundleD/BundleD.wixproj
@@ -12,8 +12,8 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
     <PackageReference Include="WixToolset.Util.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/FeatureTests/BundleAv1/BundleAv1.wixproj b/src/test/burn/TestData/FeatureTests/BundleAv1/BundleAv1.wixproj
index 8a5c9594..4f0f4bed 100644
--- a/src/test/burn/TestData/FeatureTests/BundleAv1/BundleAv1.wixproj
+++ b/src/test/burn/TestData/FeatureTests/BundleAv1/BundleAv1.wixproj
@@ -9,8 +9,8 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
     <PackageReference Include="WixToolset.Util.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/FeatureTests/BundleAv1_0_1/BundleAv1_0_1.wixproj b/src/test/burn/TestData/FeatureTests/BundleAv1_0_1/BundleAv1_0_1.wixproj
index 4c6a0993..82646d2d 100644
--- a/src/test/burn/TestData/FeatureTests/BundleAv1_0_1/BundleAv1_0_1.wixproj
+++ b/src/test/burn/TestData/FeatureTests/BundleAv1_0_1/BundleAv1_0_1.wixproj
@@ -9,8 +9,8 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
     <PackageReference Include="WixToolset.Util.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/FilesInUseTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/FilesInUseTests/BundleA/BundleA.wixproj
index c71410c2..838f37db 100644
--- a/src/test/burn/TestData/FilesInUseTests/BundleA/BundleA.wixproj
+++ b/src/test/burn/TestData/FilesInUseTests/BundleA/BundleA.wixproj
@@ -12,7 +12,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/FilesInUseTests/WixStdBaBundle/WixStdBaBundle.wixproj b/src/test/burn/TestData/FilesInUseTests/WixStdBaBundle/WixStdBaBundle.wixproj
index e0860665..445f4eda 100644
--- a/src/test/burn/TestData/FilesInUseTests/WixStdBaBundle/WixStdBaBundle.wixproj
+++ b/src/test/burn/TestData/FilesInUseTests/WixStdBaBundle/WixStdBaBundle.wixproj
@@ -12,6 +12,6 @@
     <ProjectReference Include="..\PackageA\PackageA.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv1/BundleAv1.wixproj b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv1/BundleAv1.wixproj
index ee0e38cb..0dea1e40 100644
--- a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv1/BundleAv1.wixproj
+++ b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv1/BundleAv1.wixproj
@@ -6,7 +6,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv2/BundleAv2.wixproj b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv2/BundleAv2.wixproj
index b094f48a..595c9160 100644
--- a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv2/BundleAv2.wixproj
+++ b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv2/BundleAv2.wixproj
@@ -12,7 +12,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv1/BundleCv1.wixproj b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv1/BundleCv1.wixproj
index 18a3e364..f21da8ef 100644
--- a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv1/BundleCv1.wixproj
+++ b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv1/BundleCv1.wixproj
@@ -6,7 +6,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv2/BundleCv2.wixproj b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv2/BundleCv2.wixproj
index e3fc3a86..5e00b79e 100644
--- a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv2/BundleCv2.wixproj
+++ b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv2/BundleCv2.wixproj
@@ -12,7 +12,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wixproj
index 5796178b..7b3e9250 100644
--- a/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wixproj
+++ b/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wixproj
@@ -9,7 +9,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/LayoutTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/LayoutTests/BundleB/BundleB.wixproj
index 2ce22ea1..c19f3f25 100644
--- a/src/test/burn/TestData/LayoutTests/BundleB/BundleB.wixproj
+++ b/src/test/burn/TestData/LayoutTests/BundleB/BundleB.wixproj
@@ -12,6 +12,6 @@
     <ProjectReference Include="..\PackageA\PackageA.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/LongPathTests/NonCompressedBundle/NonCompressedBundle.wixproj b/src/test/burn/TestData/LongPathTests/NonCompressedBundle/NonCompressedBundle.wixproj
index 3686200c..eb84c6b4 100644
--- a/src/test/burn/TestData/LongPathTests/NonCompressedBundle/NonCompressedBundle.wixproj
+++ b/src/test/burn/TestData/LongPathTests/NonCompressedBundle/NonCompressedBundle.wixproj
@@ -13,7 +13,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj b/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj
index 88bb083b..b6de5844 100644
--- a/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj
+++ b/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj
@@ -62,7 +62,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.BalUtil" />
+    <PackageReference Include="WixToolset.BootstrapperApplicationApi" />
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/test/burn/TestData/Manual/BundleA/BundleA.wixproj b/src/test/burn/TestData/Manual/BundleA/BundleA.wixproj
index 225664b9..3d539908 100644
--- a/src/test/burn/TestData/Manual/BundleA/BundleA.wixproj
+++ b/src/test/burn/TestData/Manual/BundleA/BundleA.wixproj
@@ -14,9 +14,9 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
   </ItemGroup>
   <Target Name="CopyManualInstructions" AfterTargets="AfterBuild">
     <Copy SourceFiles="ManualTests.txt" DestinationFiles="$(OutputPath)ManualTests.txt" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj b/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj
index e7d029a3..b37138e0 100644
--- a/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj
+++ b/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj
@@ -26,7 +26,7 @@
 
   <ItemGroup>
     <PackageReference Include="WixToolset.Heat" />
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
   </ItemGroup>
 
   <!-- We do this dynamically to avoid committing so many files to source control. -->
diff --git a/src/test/burn/TestData/Manual/BundleC/BundleC.wixproj b/src/test/burn/TestData/Manual/BundleC/BundleC.wixproj
index eabd529c..abb9f506 100644
--- a/src/test/burn/TestData/Manual/BundleC/BundleC.wixproj
+++ b/src/test/burn/TestData/Manual/BundleC/BundleC.wixproj
@@ -13,6 +13,6 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj b/src/test/burn/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj
index 2a284491..c70f191c 100644
--- a/src/test/burn/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj
+++ b/src/test/burn/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj
@@ -7,6 +7,6 @@
     <ProjectReference Include="..\PackageCv1\PackageCv1.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj b/src/test/burn/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj
index a259ed2e..c2978b3d 100644
--- a/src/test/burn/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj
+++ b/src/test/burn/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj
@@ -10,6 +10,6 @@
     <ProjectReference Include="..\PackageD\PackageD.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj b/src/test/burn/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj
index 8ee83380..1ea9d30d 100644
--- a/src/test/burn/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj
+++ b/src/test/burn/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj
@@ -5,7 +5,7 @@
     <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj b/src/test/burn/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj
index 70bec122..6cf88241 100644
--- a/src/test/burn/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj
+++ b/src/test/burn/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj
@@ -12,7 +12,7 @@
     <ProjectReference Include="..\PackageF\PackageF.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/PatchTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/PatchTests/BundleA/BundleA.wixproj
index 8ca41da7..c3c09a4b 100644
--- a/src/test/burn/TestData/PatchTests/BundleA/BundleA.wixproj
+++ b/src/test/burn/TestData/PatchTests/BundleA/BundleA.wixproj
@@ -13,7 +13,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj b/src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj
index 5eeaff59..b0787ad7 100644
--- a/src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj
+++ b/src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj
@@ -16,7 +16,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj b/src/test/burn/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj
index b80d5613..c4bfbe01 100644
--- a/src/test/burn/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj
+++ b/src/test/burn/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj
@@ -14,7 +14,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj
index b084997c..06916058 100644
--- a/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj
+++ b/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj
@@ -18,7 +18,7 @@
     <ProjectReference Include="..\ReplaceConfig\ReplaceConfig.vcxproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.Util.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wxs b/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wxs
index f56a7f8a..a86f498f 100644
--- a/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wxs
+++ b/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wxs
@@ -9,7 +9,7 @@
       <Payload Name="good.runtimeconfig.json" SourceFile="!(bindpath.dncx86)\TestBA.runtimeconfig.json" />
       <Payload Name="TestBA.runtimeconfig.json" SourceFile="bad.runtimeconfig.json" />
       <Payload SourceFile="!(bindpath.dncx86)\mbanative.dll" />
-      <Payload SourceFile="!(bindpath.dncx86)\WixToolset.Mba.Core.dll" />
+      <Payload SourceFile="!(bindpath.dncx86)\WixToolset.BootstrapperApplicationApi.dll" />
       <Payload SourceFile="$(var.PrereqBaf.TargetPath)" bal:BAFunctions="yes" />
 
       <bal:WixPrerequisiteBootstrapperApplication />
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj
index ade73a52..cc99a817 100644
--- a/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj
+++ b/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj
@@ -18,7 +18,7 @@
     <ProjectReference Include="..\ReplaceConfig\ReplaceConfig.vcxproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.Util.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wxs b/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wxs
index 87b8be36..7a84bd5b 100644
--- a/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wxs
+++ b/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wxs
@@ -8,7 +8,7 @@
       <Payload Name="good.config" SourceFile="!(bindpath.net2x86)\TestBA.exe.config" />
       <Payload Name="TestBA.exe.config" SourceFile="bad.config" />
       <Payload SourceFile="!(bindpath.net2x86)\mbanative.dll" />
-      <Payload SourceFile="!(bindpath.net2x86)\WixToolset.Mba.Core.dll" />
+      <Payload SourceFile="!(bindpath.net2x86)\WixToolset.BootstrapperApplicationApi.dll" />
       <Payload SourceFile="$(var.PrereqBaf.TargetPath)" bal:BAFunctions="yes" />
 
       <bal:WixPrerequisiteBootstrapperApplication />
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wixproj b/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wixproj
index 81641f66..7ed34aa5 100644
--- a/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wixproj
+++ b/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wixproj
@@ -18,7 +18,7 @@
     <ProjectReference Include="..\ReplaceConfig\ReplaceConfig.vcxproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.Util.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wxs b/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wxs
index 9bf7932b..e03cad62 100644
--- a/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wxs
+++ b/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wxs
@@ -8,7 +8,7 @@
       <Payload Name="good.runtimeconfig.json" SourceFile="!(bindpath.dncx86)\TestBA.runtimeconfig.json" />
       <Payload Name="TestBA.runtimeconfig.json" SourceFile="bad.runtimeconfig.json" />
       <Payload SourceFile="!(bindpath.dncx86)\mbanative.dll" />
-      <Payload SourceFile="!(bindpath.dncx86)\WixToolset.Mba.Core.dll" />
+      <Payload SourceFile="!(bindpath.dncx86)\WixToolset.BootstrapperApplicationApi.dll" />
       <Payload SourceFile="$(var.PrereqBaf.TargetPath)" bal:BAFunctions="yes" />
 
       <bal:WixPrerequisiteBootstrapperApplication />
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wixproj b/src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wixproj
index b3ba4987..280193df 100644
--- a/src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wixproj
+++ b/src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wixproj
@@ -18,7 +18,7 @@
     <ProjectReference Include="..\ReplaceConfig\ReplaceConfig.vcxproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.Util.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wxs b/src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wxs
index 68baba22..2eed4bd1 100644
--- a/src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wxs
+++ b/src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wxs
@@ -7,7 +7,7 @@
       <Payload Name="good.config" SourceFile="!(bindpath.net2x86)\TestBA.exe.config" />
       <Payload Name="TestBA.exe.config" SourceFile="bad.config" />
       <Payload SourceFile="!(bindpath.net2x86)\mbanative.dll" />
-      <Payload SourceFile="!(bindpath.net2x86)\WixToolset.Mba.Core.dll" />
+      <Payload SourceFile="!(bindpath.net2x86)\WixToolset.BootstrapperApplicationApi.dll" />
       <Payload SourceFile="$(var.PrereqBaf.TargetPath)" bal:BAFunctions="yes" />
 
       <bal:WixPrerequisiteBootstrapperApplication />
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleE/BundleE.wixproj b/src/test/burn/TestData/PrereqBaTests/BundleE/BundleE.wixproj
index 5d271f55..6e3bbfa5 100644
--- a/src/test/burn/TestData/PrereqBaTests/BundleE/BundleE.wixproj
+++ b/src/test/burn/TestData/PrereqBaTests/BundleE/BundleE.wixproj
@@ -16,7 +16,7 @@
     <ProjectReference Include="..\ReplaceConfig\ReplaceConfig.vcxproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.Util.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleE/BundleE.wxs b/src/test/burn/TestData/PrereqBaTests/BundleE/BundleE.wxs
index 4855c66e..b6962b65 100644
--- a/src/test/burn/TestData/PrereqBaTests/BundleE/BundleE.wxs
+++ b/src/test/burn/TestData/PrereqBaTests/BundleE/BundleE.wxs
@@ -8,7 +8,7 @@
       <Payload SourceFile="!(bindpath.dncx86)\TestBA.dll" />
       <Payload SourceFile="!(bindpath.dncx86)\TestBA.runtimeconfig.json" />
       <Payload SourceFile="!(bindpath.dncx86)\mbanative.dll" />
-      <Payload SourceFile="!(bindpath.dncx86)\WixToolset.Mba.Core.dll" />
+      <Payload SourceFile="!(bindpath.dncx86)\WixToolset.BootstrapperApplicationApi.dll" />
       <Payload SourceFile="$(var.PrereqBaf.TargetPath)" bal:BAFunctions="yes" />
     </BootstrapperApplication>
   </Fragment>
diff --git a/src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.vcxproj b/src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.vcxproj
index 0d8d63be..4156a8f5 100644
--- a/src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.vcxproj
+++ b/src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.vcxproj
@@ -59,7 +59,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.BalUtil" />
+    <PackageReference Include="WixToolset.BootstrapperApplicationApi" />
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/test/burn/TestData/RegistrationTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/RegistrationTests/BundleA/BundleA.wixproj
index 1a1df1b6..26119b20 100644
--- a/src/test/burn/TestData/RegistrationTests/BundleA/BundleA.wixproj
+++ b/src/test/burn/TestData/RegistrationTests/BundleA/BundleA.wixproj
@@ -12,7 +12,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj
index 5d7e7756..ba23c2b2 100644
--- a/src/test/burn/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj
+++ b/src/test/burn/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj
@@ -15,6 +15,6 @@
     <ProjectReference Include="..\PackageF\PackageF.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/SlipstreamTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/SlipstreamTests/BundleA/BundleA.wixproj
index 80c91e07..57aeab6e 100644
--- a/src/test/burn/TestData/SlipstreamTests/BundleA/BundleA.wixproj
+++ b/src/test/burn/TestData/SlipstreamTests/BundleA/BundleA.wixproj
@@ -13,7 +13,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/SlipstreamTests/BundleAReverse/BundleAReverse.wixproj b/src/test/burn/TestData/SlipstreamTests/BundleAReverse/BundleAReverse.wixproj
index 0a320fa5..d5fc3e1f 100644
--- a/src/test/burn/TestData/SlipstreamTests/BundleAReverse/BundleAReverse.wixproj
+++ b/src/test/burn/TestData/SlipstreamTests/BundleAReverse/BundleAReverse.wixproj
@@ -13,7 +13,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/SlipstreamTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/SlipstreamTests/BundleB/BundleB.wixproj
index e489a5cf..71ffb1a6 100644
--- a/src/test/burn/TestData/SlipstreamTests/BundleB/BundleB.wixproj
+++ b/src/test/burn/TestData/SlipstreamTests/BundleB/BundleB.wixproj
@@ -14,7 +14,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/SlipstreamTests/BundleC/BundleC.wixproj b/src/test/burn/TestData/SlipstreamTests/BundleC/BundleC.wixproj
index 5e8f6d13..38cdae50 100644
--- a/src/test/burn/TestData/SlipstreamTests/BundleC/BundleC.wixproj
+++ b/src/test/burn/TestData/SlipstreamTests/BundleC/BundleC.wixproj
@@ -15,7 +15,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/SlipstreamTests/BundleD/BundleD.wixproj b/src/test/burn/TestData/SlipstreamTests/BundleD/BundleD.wixproj
index 7a3a99a7..e0850f95 100644
--- a/src/test/burn/TestData/SlipstreamTests/BundleD/BundleD.wixproj
+++ b/src/test/burn/TestData/SlipstreamTests/BundleD/BundleD.wixproj
@@ -13,7 +13,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/SlipstreamTests/BundleOnlyA/BundleOnlyA.wixproj b/src/test/burn/TestData/SlipstreamTests/BundleOnlyA/BundleOnlyA.wixproj
index 72634a2f..450b699d 100644
--- a/src/test/burn/TestData/SlipstreamTests/BundleOnlyA/BundleOnlyA.wixproj
+++ b/src/test/burn/TestData/SlipstreamTests/BundleOnlyA/BundleOnlyA.wixproj
@@ -12,7 +12,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/SlipstreamTests/BundleOnlyPatchA/BundleOnlyPatchA.wixproj b/src/test/burn/TestData/SlipstreamTests/BundleOnlyPatchA/BundleOnlyPatchA.wixproj
index 1f950289..f48ce034 100644
--- a/src/test/burn/TestData/SlipstreamTests/BundleOnlyPatchA/BundleOnlyPatchA.wixproj
+++ b/src/test/burn/TestData/SlipstreamTests/BundleOnlyPatchA/BundleOnlyPatchA.wixproj
@@ -12,7 +12,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs b/src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs
index 98c3acb2..13f32146 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs
@@ -6,7 +6,7 @@
       <Payload SourceFile="!(bindpath.dncx86)\TestBA.dll" />
       <Payload SourceFile="!(bindpath.dncx86)\TestBA.runtimeconfig.json" />
       <Payload SourceFile="!(bindpath.dncx86)\mbanative.dll" />
-      <Payload SourceFile="!(bindpath.dncx86)\WixToolset.Mba.Core.dll" />
+      <Payload SourceFile="!(bindpath.dncx86)\WixToolset.BootstrapperApplicationApi.dll" />
     </BootstrapperApplication>
 
     <PackageGroup Id="TestBAdnc">
@@ -17,7 +17,7 @@
     <BootstrapperApplication SourceFile="!(bindpath.net2x86)\TestBA.exe">
       <Payload SourceFile="!(bindpath.net2x86)\TestBA.exe.config" />
       <Payload SourceFile="!(bindpath.net2x86)\mbanative.dll" />
-      <Payload SourceFile="!(bindpath.net2x86)\WixToolset.Mba.Core.dll" />
+      <Payload SourceFile="!(bindpath.net2x86)\WixToolset.BootstrapperApplicationApi.dll" />
     </BootstrapperApplication>
 
     <PackageGroup Id="TestBA">
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib/WixBA.wxs b/src/test/burn/TestData/TestBA/TestBAWixlib/WixBA.wxs
index 3d4eb274..372dbd9b 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib/WixBA.wxs
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib/WixBA.wxs
@@ -4,7 +4,7 @@
     <BootstrapperApplication SourceFile="!(bindpath.net4x86)\WixToolset.WixBA.exe">
       <Payload SourceFile="!(bindpath.net4x86)\WixToolset.WixBA.exe.config" />
       <Payload SourceFile="!(bindpath.net4x86)\mbanative.dll" />
-      <Payload SourceFile="!(bindpath.net4x86)\WixToolset.Mba.Core.dll" />
+      <Payload SourceFile="!(bindpath.net4x86)\WixToolset.BootstrapperApplicationApi.dll" />
       <Payload SourceFile='..\..\..\..\..\..\License.txt' />
     </BootstrapperApplication>
 
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj b/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
index 788353d6..f80dc6cc 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
@@ -16,7 +16,7 @@
     <ProjectReference Include="..\..\..\WixToolset.WixBA\WixToolset.WixBA.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.Netfx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/TestBA_x64.wxs b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/TestBA_x64.wxs
index 08d428a1..1cf70162 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/TestBA_x64.wxs
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/TestBA_x64.wxs
@@ -6,7 +6,7 @@
       <Payload SourceFile="!(bindpath.dncx64)\TestBA.dll" />
       <Payload SourceFile="!(bindpath.dncx64)\TestBA.runtimeconfig.json" />
       <Payload SourceFile="!(bindpath.dncx64)\mbanative.dll" />
-      <Payload SourceFile="!(bindpath.dncx64)\WixToolset.Mba.Core.dll" />
+      <Payload SourceFile="!(bindpath.dncx64)\WixToolset.BootstrapperApplicationApi.dll" />
     </BootstrapperApplication>
 
     <PackageGroup Id="TestBAdnc_x64">
@@ -17,7 +17,7 @@
     <BootstrapperApplication SourceFile="!(bindpath.net2x64)\TestBA.exe">
       <Payload SourceFile="!(bindpath.net2x64)\TestBA.exe.config" />
       <Payload SourceFile="!(bindpath.net2x64)\mbanative.dll" />
-      <Payload SourceFile="!(bindpath.net2x64)\WixToolset.Mba.Core.dll" />
+      <Payload SourceFile="!(bindpath.net2x64)\WixToolset.BootstrapperApplicationApi.dll" />
     </BootstrapperApplication>
 
     <PackageGroup Id="TestBA_x64">
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/WixBA_x64.wxs b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/WixBA_x64.wxs
index ef465e23..97b41651 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/WixBA_x64.wxs
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/WixBA_x64.wxs
@@ -6,7 +6,7 @@
       <Payload SourceFile="!(bindpath.dncx64)\WixToolset.WixBA.dll" />
       <Payload SourceFile="!(bindpath.dncx64)\WixToolset.WixBA.runtimeconfig.json" />
       <Payload SourceFile="!(bindpath.dncx64)\mbanative.dll" />
-      <Payload SourceFile="!(bindpath.dncx64)\WixToolset.Mba.Core.dll" />
+      <Payload SourceFile="!(bindpath.dncx64)\WixToolset.BootstrapperApplicationApi.dll" />
       <Payload SourceFile='..\..\..\..\..\..\License.txt' />
     </BootstrapperApplication>
 
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj
index 154367e3..86edc0e1 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj
@@ -13,7 +13,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\TestBA\TestBA_x64.csproj" />
-    <!-- An alternative to the above line is to explicitly reference projects with 
+    <!-- An alternative to the above line is to explicitly reference projects with
          the required target framework. Since we want all target frameworks built,
          the above line is shorter.
     <ProjectReference Include="..\..\..\TestBA\TestBA_x64.csproj">
@@ -28,7 +28,7 @@
     <ProjectReference Include="..\..\..\WixToolset.WixBA\WixToolset.WixBA_x64.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.Netfx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/UpdateBundleTests/BundleAv1/BundleAv1.wixproj b/src/test/burn/TestData/UpdateBundleTests/BundleAv1/BundleAv1.wixproj
index ee0e38cb..0dea1e40 100644
--- a/src/test/burn/TestData/UpdateBundleTests/BundleAv1/BundleAv1.wixproj
+++ b/src/test/burn/TestData/UpdateBundleTests/BundleAv1/BundleAv1.wixproj
@@ -6,7 +6,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/UpdateBundleTests/BundleAv2/BundleAv2.wixproj b/src/test/burn/TestData/UpdateBundleTests/BundleAv2/BundleAv2.wixproj
index 13001858..3c678f95 100644
--- a/src/test/burn/TestData/UpdateBundleTests/BundleAv2/BundleAv2.wixproj
+++ b/src/test/burn/TestData/UpdateBundleTests/BundleAv2/BundleAv2.wixproj
@@ -9,7 +9,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/UpdateBundleTests/BundleBv1/BundleBv1.wixproj b/src/test/burn/TestData/UpdateBundleTests/BundleBv1/BundleBv1.wixproj
index 93a1dae6..1ca64c0b 100644
--- a/src/test/burn/TestData/UpdateBundleTests/BundleBv1/BundleBv1.wixproj
+++ b/src/test/burn/TestData/UpdateBundleTests/BundleBv1/BundleBv1.wixproj
@@ -9,10 +9,10 @@
     <Feeds Include="*.xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
   <Target Name="CopyFeeds" AfterTargets="AfterBuild">
     <Copy SourceFiles="@(Feeds)" DestinationFolder="$(OutputPath)" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/UpdateBundleTests/BundleBv2/BundleBv2.wixproj b/src/test/burn/TestData/UpdateBundleTests/BundleBv2/BundleBv2.wixproj
index 877b4971..8f21192f 100644
--- a/src/test/burn/TestData/UpdateBundleTests/BundleBv2/BundleBv2.wixproj
+++ b/src/test/burn/TestData/UpdateBundleTests/BundleBv2/BundleBv2.wixproj
@@ -12,7 +12,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv1/BundleAv1.wixproj b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv1/BundleAv1.wixproj
index ee0e38cb..0dea1e40 100644
--- a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv1/BundleAv1.wixproj
+++ b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv1/BundleAv1.wixproj
@@ -6,7 +6,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv1x64/BundleAv1x64.wixproj b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv1x64/BundleAv1x64.wixproj
index 44bf9772..ddeb24cb 100644
--- a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv1x64/BundleAv1x64.wixproj
+++ b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv1x64/BundleAv1x64.wixproj
@@ -7,10 +7,10 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
-    <ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" /> 
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2/BundleAv2.wixproj b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2/BundleAv2.wixproj
index 13001858..3c678f95 100644
--- a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2/BundleAv2.wixproj
+++ b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2/BundleAv2.wixproj
@@ -9,7 +9,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2wixstdba/BundleAv2wixstdba.wixproj b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2wixstdba/BundleAv2wixstdba.wixproj
index e92c5200..afee7005 100644
--- a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2wixstdba/BundleAv2wixstdba.wixproj
+++ b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2wixstdba/BundleAv2wixstdba.wixproj
@@ -9,7 +9,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2x64/BundleAv2x64.wixproj b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2x64/BundleAv2x64.wixproj
index fb7d592b..1cb94b43 100644
--- a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2x64/BundleAv2x64.wixproj
+++ b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2x64/BundleAv2x64.wixproj
@@ -8,10 +8,10 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\PackageAv2\PackageAv2.wixproj" />
-    <ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" /> 
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv3/BundleAv3.wixproj b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv3/BundleAv3.wixproj
index 958ceb47..a59e6767 100644
--- a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv3/BundleAv3.wixproj
+++ b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv3/BundleAv3.wixproj
@@ -10,7 +10,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv3wixstdba/BundleAv3wixstdba.wixproj b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv3wixstdba/BundleAv3wixstdba.wixproj
index 2eb881ab..7b385e47 100644
--- a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv3wixstdba/BundleAv3wixstdba.wixproj
+++ b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv3wixstdba/BundleAv3wixstdba.wixproj
@@ -10,7 +10,7 @@
     <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
     <PackageReference Include="WixToolset.NetFx.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/VariableTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/VariableTests/BundleA/BundleA.wixproj
index b318e40a..69dab5f5 100644
--- a/src/test/burn/TestData/VariableTests/BundleA/BundleA.wixproj
+++ b/src/test/burn/TestData/VariableTests/BundleA/BundleA.wixproj
@@ -9,6 +9,6 @@
     <ProjectReference Include="..\PackageA\PackageA.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/VariableTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/VariableTests/BundleB/BundleB.wixproj
index 866891a5..39d05f2a 100644
--- a/src/test/burn/TestData/VariableTests/BundleB/BundleB.wixproj
+++ b/src/test/burn/TestData/VariableTests/BundleB/BundleB.wixproj
@@ -12,6 +12,6 @@
     <ProjectReference Include="..\PackageA\PackageA.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/WixIuiBaTests/ArchSpecificBundle/ArchSpecificBundle.wixproj b/src/test/burn/TestData/WixIuiBaTests/ArchSpecificBundle/ArchSpecificBundle.wixproj
index 9e3cba8b..3ac8eedf 100644
--- a/src/test/burn/TestData/WixIuiBaTests/ArchSpecificBundle/ArchSpecificBundle.wixproj
+++ b/src/test/burn/TestData/WixIuiBaTests/ArchSpecificBundle/ArchSpecificBundle.wixproj
@@ -12,6 +12,6 @@
     <ProjectReference Include="..\InternalUIx86Package\InternalUIx86Package.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/WixIuiBaTests/EmbeddedUIBundle/EmbeddedUIBundle.wixproj b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUIBundle/EmbeddedUIBundle.wixproj
index 7c856200..5646463d 100644
--- a/src/test/burn/TestData/WixIuiBaTests/EmbeddedUIBundle/EmbeddedUIBundle.wixproj
+++ b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUIBundle/EmbeddedUIBundle.wixproj
@@ -10,6 +10,6 @@
     <ProjectReference Include="..\InternalUIPackage\InternalUIPackage.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/WixIuiBaTests/InternalUIBundle/InternalUIBundle.wixproj b/src/test/burn/TestData/WixIuiBaTests/InternalUIBundle/InternalUIBundle.wixproj
index 193d0ca6..62c5ceea 100644
--- a/src/test/burn/TestData/WixIuiBaTests/InternalUIBundle/InternalUIBundle.wixproj
+++ b/src/test/burn/TestData/WixIuiBaTests/InternalUIBundle/InternalUIBundle.wixproj
@@ -9,6 +9,6 @@
     <ProjectReference Include="..\InternalUIPackage\InternalUIPackage.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_BadUpdateFeed.wixproj b/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_BadUpdateFeed.wixproj
index 0abf0077..7c8c152d 100644
--- a/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_BadUpdateFeed.wixproj
+++ b/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_BadUpdateFeed.wixproj
@@ -10,6 +10,6 @@
     <ProjectReference Include="..\PackageA\PackageA.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v11.wixproj b/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v11.wixproj
index 5fa77495..23129fd9 100644
--- a/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v11.wixproj
+++ b/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v11.wixproj
@@ -10,6 +10,6 @@
     <ProjectReference Include="..\PackageA\PackageA.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v12.wixproj b/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v12.wixproj
index 5918df51..5ae4b6cc 100644
--- a/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v12.wixproj
+++ b/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v12.wixproj
@@ -10,6 +10,6 @@
     <ProjectReference Include="..\PackageA\PackageA.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v13.wixproj b/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v13.wixproj
index 0aeb6157..5f35d432 100644
--- a/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v13.wixproj
+++ b/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v13.wixproj
@@ -10,6 +10,6 @@
     <ProjectReference Include="..\PackageA\PackageA.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/WixStdBaTests/BundleA_v10/BundleA_v10.wixproj b/src/test/burn/TestData/WixStdBaTests/BundleA_v10/BundleA_v10.wixproj
index 602dc4bc..6d31e417 100644
--- a/src/test/burn/TestData/WixStdBaTests/BundleA_v10/BundleA_v10.wixproj
+++ b/src/test/burn/TestData/WixStdBaTests/BundleA_v10/BundleA_v10.wixproj
@@ -15,6 +15,6 @@
     <ProjectReference Include="..\PackageA\PackageA.wixproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/burn/WixTestTools/WixTestTools.csproj b/src/test/burn/WixTestTools/WixTestTools.csproj
index 8d8f11cc..19c09294 100644
--- a/src/test/burn/WixTestTools/WixTestTools.csproj
+++ b/src/test/burn/WixTestTools/WixTestTools.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="System.Security.Principal.Windows" />
     <PackageReference Include="WixInternal.TestSupport" />
     <PackageReference Include="WixToolset.Data" />
-    <PackageReference Include="WixToolset.Mba.Core" />
+    <PackageReference Include="WixToolset.BootstrapperApplicationApi" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/test/burn/WixToolset.WixBA/InstallationViewModel.cs b/src/test/burn/WixToolset.WixBA/InstallationViewModel.cs
index e67783bc..72cef778 100644
--- a/src/test/burn/WixToolset.WixBA/InstallationViewModel.cs
+++ b/src/test/burn/WixToolset.WixBA/InstallationViewModel.cs
@@ -10,7 +10,7 @@ namespace WixToolset.WixBA
     using System.Windows;
     using System.Windows.Input;
     using IO = System.IO;
-    using WixToolset.Mba.Core;
+    using WixToolset.BootstrapperApplicationApi;
 
     /// <summary>
     /// The states of detection.
diff --git a/src/test/burn/WixToolset.WixBA/Model.cs b/src/test/burn/WixToolset.WixBA/Model.cs
index 5eaad8f3..0ca7fd83 100644
--- a/src/test/burn/WixToolset.WixBA/Model.cs
+++ b/src/test/burn/WixToolset.WixBA/Model.cs
@@ -5,7 +5,7 @@ namespace WixToolset.WixBA
     using System;
     using System.Collections.Generic;
     using System.Net;
-    using WixToolset.Mba.Core;
+    using WixToolset.BootstrapperApplicationApi;
 
     /// <summary>
     /// The model.
diff --git a/src/test/burn/WixToolset.WixBA/Program.cs b/src/test/burn/WixToolset.WixBA/Program.cs
index 670d8313..5e264345 100644
--- a/src/test/burn/WixToolset.WixBA/Program.cs
+++ b/src/test/burn/WixToolset.WixBA/Program.cs
@@ -2,7 +2,7 @@
 
 namespace WixToolset.WixBA
 {
-    using WixToolset.Mba.Core;
+    using WixToolset.BootstrapperApplicationApi;
 
     internal class Program
     {
diff --git a/src/test/burn/WixToolset.WixBA/ProgressViewModel.cs b/src/test/burn/WixToolset.WixBA/ProgressViewModel.cs
index 6f7bb028..f40c80de 100644
--- a/src/test/burn/WixToolset.WixBA/ProgressViewModel.cs
+++ b/src/test/burn/WixToolset.WixBA/ProgressViewModel.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Text.RegularExpressions;
-using WixToolset.Mba.Core;
+using WixToolset.BootstrapperApplicationApi;
 
 namespace WixToolset.WixBA
 {
diff --git a/src/test/burn/WixToolset.WixBA/RootViewModel.cs b/src/test/burn/WixToolset.WixBA/RootViewModel.cs
index 2dfd214e..14fc766a 100644
--- a/src/test/burn/WixToolset.WixBA/RootViewModel.cs
+++ b/src/test/burn/WixToolset.WixBA/RootViewModel.cs
@@ -6,7 +6,7 @@ namespace WixToolset.WixBA
     using System.Windows;
     using System.Windows.Input;
     using System.Windows.Threading;
-    using WixToolset.Mba.Core;
+    using WixToolset.BootstrapperApplicationApi;
 
     /// <summary>
     /// The errors returned from the engine
diff --git a/src/test/burn/WixToolset.WixBA/UpdateViewModel.cs b/src/test/burn/WixToolset.WixBA/UpdateViewModel.cs
index 2bb92d51..a98fac9c 100644
--- a/src/test/burn/WixToolset.WixBA/UpdateViewModel.cs
+++ b/src/test/burn/WixToolset.WixBA/UpdateViewModel.cs
@@ -5,7 +5,7 @@ namespace WixToolset.WixBA
     using System;
     using System.ComponentModel;
     using System.Windows.Input;
-    using WixToolset.Mba.Core;
+    using WixToolset.BootstrapperApplicationApi;
 
     /// <summary>
     /// The states of the update view model.
diff --git a/src/test/burn/WixToolset.WixBA/WixBA.BootstrapperCore.config b/src/test/burn/WixToolset.WixBA/WixBA.BootstrapperCore.config
deleted file mode 100644
index da8f8028..00000000
--- a/src/test/burn/WixToolset.WixBA/WixBA.BootstrapperCore.config
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
-<configuration>
-    <configSections>
-        <sectionGroup name="wix.bootstrapper" type="WixToolset.Mba.Host.BootstrapperSectionGroup, WixToolset.Mba.Host">
-            <section name="host" type="WixToolset.Mba.Host.HostSection, WixToolset.Mba.Host" />
-        </sectionGroup>
-    </configSections>
-    <startup useLegacyV2RuntimeActivationPolicy="true">
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
-    </startup>
-    <wix.bootstrapper>
-        <host assemblyName="WixToolset.WixBA" />
-    </wix.bootstrapper>
-</configuration>
diff --git a/src/test/burn/WixToolset.WixBA/WixBA.cs b/src/test/burn/WixToolset.WixBA/WixBA.cs
index 5b7444c4..dca12ce8 100644
--- a/src/test/burn/WixToolset.WixBA/WixBA.cs
+++ b/src/test/burn/WixToolset.WixBA/WixBA.cs
@@ -8,7 +8,7 @@ namespace WixToolset.WixBA
     using System.IO;
     using System.Net;
     using System.Text;
-    using WixToolset.Mba.Core;
+    using WixToolset.BootstrapperApplicationApi;
 
     using Threading = System.Windows.Threading;
     using WinForms = System.Windows.Forms;
diff --git a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj
index a0b47744..e87501e9 100644
--- a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj
+++ b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj
@@ -23,10 +23,6 @@
     <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFrameworkIdentifier)'=='.NETFramework' ">
-    <Content Include="WixBA.BootstrapperCore.config" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
   <ItemGroup>
     <Resource Include="Resources\logo-white-hollow.png" />
     <Resource Include="Resources\logo-black-hollow.png" />
@@ -41,6 +37,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.Mba.Core" />
+    <PackageReference Include="WixToolset.BootstrapperApplicationApi" />
   </ItemGroup>
 </Project>
diff --git a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj
index b17622a6..3437119c 100644
--- a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj
+++ b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj
@@ -23,10 +23,6 @@
     <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFrameworkIdentifier)'=='.NETFramework' ">
-    <Content Include="WixBA.BootstrapperCore.config" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
   <ItemGroup>
     <Resource Include="Resources\logo-white-hollow.png" />
     <Resource Include="Resources\logo-black-hollow.png" />
@@ -41,6 +37,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.Mba.Core" />
+    <PackageReference Include="WixToolset.BootstrapperApplicationApi" />
   </ItemGroup>
 </Project>
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/BundlePackageTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/BundlePackageTests.cs
index 228c95c6..dc793cf0 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/BundlePackageTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/BundlePackageTests.cs
@@ -5,7 +5,7 @@ namespace WixToolsetTest.BurnE2E
     using System;
     using System.IO;
     using WixTestTools;
-    using WixToolset.Mba.Core;
+    using WixToolset.BootstrapperApplicationApi;
     using Xunit;
     using Xunit.Abstractions;
 
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/CacheTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/CacheTests.cs
index 3622e2e6..05144e8d 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/CacheTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/CacheTests.cs
@@ -8,7 +8,7 @@ namespace WixToolsetTest.BurnE2E
     using Microsoft.Win32;
     using WixInternal.TestSupport;
     using WixTestTools;
-    using WixToolset.Mba.Core;
+    using WixToolset.BootstrapperApplicationApi;
     using Xunit;
     using Xunit.Abstractions;
 
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs
index e47a49d9..b14b227e 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs
@@ -4,7 +4,7 @@ namespace WixToolsetTest.BurnE2E
 {
     using System;
     using WixTestTools;
-    using WixToolset.Mba.Core;
+    using WixToolset.BootstrapperApplicationApi;
     using Xunit;
     using Xunit.Abstractions;
 
@@ -170,7 +170,7 @@ namespace WixToolsetTest.BurnE2E
             packageAv2.VerifyInstalled(true);
             bundleAv2.VerifyPackageIsCached("PackageA");
             bundleAv1.VerifyExeTestRegistryValue(testRegistryValueExe, "2.0.0.0");
-            
+
             // Verify https://github.com/wixtoolset/issues/issues/3190
             bundleB.Uninstall();
 
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/ExePackageTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/ExePackageTests.cs
index dc0b6b5a..a7438564 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/ExePackageTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/ExePackageTests.cs
@@ -3,7 +3,7 @@
 namespace WixToolsetTest.BurnE2E
 {
     using WixTestTools;
-    using WixToolset.Mba.Core;
+    using WixToolset.BootstrapperApplicationApi;
     using Xunit;
     using Xunit.Abstractions;
 
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/FailureTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/FailureTests.cs
index cb758131..bd3762ed 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/FailureTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/FailureTests.cs
@@ -4,7 +4,7 @@ namespace WixToolsetTest.BurnE2E
 {
     using System.Threading;
     using WixTestTools;
-    using WixToolset.Mba.Core;
+    using WixToolset.BootstrapperApplicationApi;
     using Xunit;
     using Xunit.Abstractions;
 
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/FeatureTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/FeatureTests.cs
index b3d0dfe1..b078c979 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/FeatureTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/FeatureTests.cs
@@ -5,7 +5,7 @@ namespace WixToolsetTest.BurnE2E
     using System;
     using System.IO;
     using WixTestTools;
-    using WixToolset.Mba.Core;
+    using WixToolset.BootstrapperApplicationApi;
     using Xunit;
     using Xunit.Abstractions;
 
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/LongPathTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/LongPathTests.cs
index 58b8ae18..0c58e676 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/LongPathTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/LongPathTests.cs
@@ -9,7 +9,7 @@ namespace WixToolsetTest.BurnE2E
     using Microsoft.Win32;
     using WixInternal.TestSupport;
     using WixTestTools;
-    using WixToolset.Mba.Core;
+    using WixToolset.BootstrapperApplicationApi;
     using Xunit;
     using Xunit.Abstractions;
 
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/RegistrationTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/RegistrationTests.cs
index 65d0c9cd..8f97ae0e 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/RegistrationTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/RegistrationTests.cs
@@ -4,7 +4,7 @@ namespace WixToolsetTest.BurnE2E
 {
     using System;
     using WixTestTools;
-    using WixToolset.Mba.Core;
+    using WixToolset.BootstrapperApplicationApi;
     using Xunit;
     using Xunit.Abstractions;
 
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/SlipstreamTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/SlipstreamTests.cs
index aa005cb1..d07e80f1 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/SlipstreamTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/SlipstreamTests.cs
@@ -5,7 +5,7 @@ namespace WixToolsetTest.BurnE2E
     using System;
     using System.IO;
     using WixTestTools;
-    using WixToolset.Mba.Core;
+    using WixToolset.BootstrapperApplicationApi;
     using Xunit;
     using Xunit.Abstractions;
 
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/Utilities/TestBAController.cs b/src/test/burn/WixToolsetTest.BurnE2E/Utilities/TestBAController.cs
index 115f3b54..a378545e 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/Utilities/TestBAController.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/Utilities/TestBAController.cs
@@ -5,7 +5,7 @@ namespace WixToolsetTest.BurnE2E
     using System;
     using Microsoft.Win32;
     using WixTestTools;
-    using WixToolset.Mba.Core;
+    using WixToolset.BootstrapperApplicationApi;
 
     public class TestBAController : IDisposable
     {
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/VariableTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/VariableTests.cs
index fcd46e0b..57224c68 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/VariableTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/VariableTests.cs
@@ -6,7 +6,7 @@ namespace WixToolsetTest.BurnE2E
     using System.IO;
     using WixInternal.TestSupport;
     using WixTestTools;
-    using WixToolset.Mba.Core;
+    using WixToolset.BootstrapperApplicationApi;
     using Xunit;
     using Xunit.Abstractions;
 
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj b/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj
index a5099d9b..751b7748 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj
+++ b/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj
@@ -22,6 +22,6 @@
     <PackageReference Include="System.Security.Principal.Windows" />
     <PackageReference Include="WixInternal.TestSupport" />
     <PackageReference Include="WixToolset.Data" />
-    <PackageReference Include="WixToolset.Mba.Core" />
+    <PackageReference Include="WixToolset.BootstrapperApplicationApi" />
   </ItemGroup>
 </Project>