93 files changed, 179 insertions, 140 deletions

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/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.nuspec b/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.nuspec
new file mode 100644
index 00000000..7a681707
--- /dev/null
+++ b/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.nuspec
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <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$" />
+  </metadata>
+
+  <files>
+    <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
+    <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>