41 files changed, 243 insertions, 243 deletions

diff --git a/src/ext/NetFx/be/NetfxBundleExtension.cpp b/src/ext/NetFx/be/NetfxBootstrapperExtension.cpp
index 838a97c1..ab30e378 100644
--- a/src/ext/NetFx/be/NetfxBundleExtension.cpp
+++ b/src/ext/NetFx/be/NetfxBootstrapperExtension.cpp
@@ -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.
 
 #include "precomp.h"
-#include "BextBaseBundleExtension.h"
+#include "BextBaseBootstrapperExtension.h"
 
-class CWixNetfxBundleExtension : public CBextBaseBundleExtension
+class CWixNetfxBootstrapperExtension : public CBextBaseBootstrapperExtension
 {
-public: // IBundleExtension
+public: // IBootstrapperExtension
     virtual STDMETHODIMP Search(
         __in LPCWSTR wzId,
         __in LPCWSTR wzVariable
@@ -18,18 +18,18 @@ public: // IBundleExtension
         return hr;
     }
 
-public: //CBextBaseBundleExtension
+public: //CBextBaseBootstrapperExtension
     virtual STDMETHODIMP Initialize(
-        __in const BUNDLE_EXTENSION_CREATE_ARGS* pCreateArgs
+        __in const BOOTSTRAPPER_EXTENSION_CREATE_ARGS* pCreateArgs
         )
     {
         HRESULT hr = S_OK;
         LPWSTR sczModulePath = NULL;
         IXMLDOMDocument* pixdManifest = NULL;
-        IXMLDOMNode* pixnBundleExtension = NULL;
+        IXMLDOMNode* pixnBootstrapperExtension = NULL;
 
         hr = __super::Initialize(pCreateArgs);
-        BextExitOnFailure(hr, "CBextBaseBundleExtension initialization failed.");
+        BextExitOnFailure(hr, "CBextBaseBootstrapperExtension initialization failed.");
 
         hr = PathForCurrentProcess(&sczModulePath, m_hInstance);
         BextExitOnFailure(hr, "Failed to get bundle extension path.");
@@ -37,17 +37,17 @@ public: //CBextBaseBundleExtension
         hr = PathGetDirectory(sczModulePath, &m_sczBaseDirectory);
         BextExitOnFailure(hr, "Failed to get bundle extension base directory.");
 
-        hr = XmlLoadDocumentFromFile(m_sczBundleExtensionDataPath, &pixdManifest);
-        BextExitOnFailure(hr, "Failed to load bundle extension manifest from path: %ls", m_sczBundleExtensionDataPath);
+        hr = XmlLoadDocumentFromFile(m_sczBootstrapperExtensionDataPath, &pixdManifest);
+        BextExitOnFailure(hr, "Failed to load bundle extension manifest from path: %ls", m_sczBootstrapperExtensionDataPath);
 
-        hr = BextGetBundleExtensionDataNode(pixdManifest, NETFX_BUNDLE_EXTENSION_ID, &pixnBundleExtension);
-        BextExitOnFailure(hr, "Failed to get BundleExtension '%ls'", NETFX_BUNDLE_EXTENSION_ID);
+        hr = BextGetBootstrapperExtensionDataNode(pixdManifest, NETFX_BOOTSTRAPPER_EXTENSION_ID, &pixnBootstrapperExtension);
+        BextExitOnFailure(hr, "Failed to get BootstrapperExtension '%ls'", NETFX_BOOTSTRAPPER_EXTENSION_ID);
 
-        hr = NetfxSearchParseFromXml(&m_searches, pixnBundleExtension);
+        hr = NetfxSearchParseFromXml(&m_searches, pixnBootstrapperExtension);
         BextExitOnFailure(hr, "Failed to parse searches from bundle extension manifest.");
 
     LExit:
-        ReleaseObject(pixnBundleExtension);
+        ReleaseObject(pixnBootstrapperExtension);
         ReleaseObject(pixdManifest);
         ReleaseStr(sczModulePath);
 
@@ -55,17 +55,17 @@ public: //CBextBaseBundleExtension
     }
 
 public:
-    CWixNetfxBundleExtension(
+    CWixNetfxBootstrapperExtension(
         __in HINSTANCE hInstance,
-        __in IBundleExtensionEngine* pEngine
-        ) : CBextBaseBundleExtension(pEngine)
+        __in IBootstrapperExtensionEngine* pEngine
+        ) : CBextBaseBootstrapperExtension(pEngine)
     {
         m_searches = { };
         m_hInstance = hInstance;
         m_sczBaseDirectory = NULL;
     }
 
-    ~CWixNetfxBundleExtension()
+    ~CWixNetfxBootstrapperExtension()
     {
         NetfxSearchUninitialize(&m_searches);
         ReleaseStr(m_sczBaseDirectory);
@@ -77,23 +77,23 @@ private:
     LPWSTR m_sczBaseDirectory;
 };
 
-HRESULT NetfxBundleExtensionCreate(
+HRESULT NetfxBootstrapperExtensionCreate(
     __in HINSTANCE hInstance,
-    __in IBundleExtensionEngine* pEngine,
-    __in const BUNDLE_EXTENSION_CREATE_ARGS* pArgs,
-    __out IBundleExtension** ppBundleExtension
+    __in IBootstrapperExtensionEngine* pEngine,
+    __in const BOOTSTRAPPER_EXTENSION_CREATE_ARGS* pArgs,
+    __out IBootstrapperExtension** ppBootstrapperExtension
     )
 {
     HRESULT hr = S_OK;
-    CWixNetfxBundleExtension* pExtension = NULL;
+    CWixNetfxBootstrapperExtension* pExtension = NULL;
 
-    pExtension = new CWixNetfxBundleExtension(hInstance, pEngine);
-    BextExitOnNull(pExtension, hr, E_OUTOFMEMORY, "Failed to create new CWixNetfxBundleExtension.");
+    pExtension = new CWixNetfxBootstrapperExtension(hInstance, pEngine);
+    BextExitOnNull(pExtension, hr, E_OUTOFMEMORY, "Failed to create new CWixNetfxBootstrapperExtension.");
 
     hr = pExtension->Initialize(pArgs);
-    BextExitOnFailure(hr, "CWixNetfxBundleExtension initialization failed.");
+    BextExitOnFailure(hr, "CWixNetfxBootstrapperExtension initialization failed.");
 
-    *ppBundleExtension = pExtension;
+    *ppBootstrapperExtension = pExtension;
     pExtension = NULL;
 
 LExit:
diff --git a/src/ext/NetFx/be/NetfxBootstrapperExtension.h b/src/ext/NetFx/be/NetfxBootstrapperExtension.h
new file mode 100644
index 00000000..36563dae
--- /dev/null
+++ b/src/ext/NetFx/be/NetfxBootstrapperExtension.h
@@ -0,0 +1,17 @@
+#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.
+
+
+// constants
+
+#define NETFX_BOOTSTRAPPER_EXTENSION_ID BOOTSTRAPPER_EXTENSION_DECORATION(L"NetfxBootstrapperExtension")
+
+
+// function declarations
+
+HRESULT NetfxBootstrapperExtensionCreate(
+    __in HINSTANCE hInstance,
+    __in IBootstrapperExtensionEngine* pEngine,
+    __in const BOOTSTRAPPER_EXTENSION_CREATE_ARGS* pArgs,
+    __out IBootstrapperExtension** ppBootstrapperExtension
+    );
diff --git a/src/ext/NetFx/be/NetfxBundleExtension.h b/src/ext/NetFx/be/NetfxBundleExtension.h
deleted file mode 100644
index 0746dbed..00000000
--- a/src/ext/NetFx/be/NetfxBundleExtension.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#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.
-
-
-// constants
-
-#define NETFX_BUNDLE_EXTENSION_ID BUNDLE_EXTENSION_DECORATION(L"NetfxBundleExtension")
-
-
-// function declarations
-
-HRESULT NetfxBundleExtensionCreate(
-    __in HINSTANCE hInstance,
-    __in IBundleExtensionEngine* pEngine,
-    __in const BUNDLE_EXTENSION_CREATE_ARGS* pArgs,
-    __out IBundleExtension** ppBundleExtension
-    );
diff --git a/src/ext/NetFx/be/detectnetcore.cpp b/src/ext/NetFx/be/detectnetcore.cpp
index 3ed26549..c20cc831 100644
--- a/src/ext/NetFx/be/detectnetcore.cpp
+++ b/src/ext/NetFx/be/detectnetcore.cpp
@@ -45,7 +45,7 @@ LExit:
 HRESULT NetfxPerformDetectNetCore(
     __in LPCWSTR wzVariable,
     __in NETFX_SEARCH* pSearch,
-    __in IBundleExtensionEngine* pEngine,
+    __in IBootstrapperExtensionEngine* pEngine,
     __in LPCWSTR wzBaseDirectory
     )
 {
diff --git a/src/ext/NetFx/be/detectnetcore.h b/src/ext/NetFx/be/detectnetcore.h
index ef93b39b..cd664b57 100644
--- a/src/ext/NetFx/be/detectnetcore.h
+++ b/src/ext/NetFx/be/detectnetcore.h
@@ -4,6 +4,6 @@
 HRESULT NetfxPerformDetectNetCore(
     __in LPCWSTR wzVariable,
     __in NETFX_SEARCH* pSearch,
-    __in IBundleExtensionEngine* pEngine,
+    __in IBootstrapperExtensionEngine* pEngine,
     __in LPCWSTR wzBaseDirectory
     );
diff --git a/src/ext/NetFx/be/detectnetcoresdk.cpp b/src/ext/NetFx/be/detectnetcoresdk.cpp
index 332d8712..03162eea 100644
--- a/src/ext/NetFx/be/detectnetcoresdk.cpp
+++ b/src/ext/NetFx/be/detectnetcoresdk.cpp
@@ -27,7 +27,7 @@ LExit:
 HRESULT NetfxPerformDetectNetCoreSdk(
     __in LPCWSTR wzVariable,
     __in NETFX_SEARCH* pSearch,
-    __in IBundleExtensionEngine* pEngine,
+    __in IBootstrapperExtensionEngine* pEngine,
     __in LPCWSTR wzBaseDirectory
     )
 {
diff --git a/src/ext/NetFx/be/detectnetcoresdk.h b/src/ext/NetFx/be/detectnetcoresdk.h
index 025deaa2..0eef945a 100644
--- a/src/ext/NetFx/be/detectnetcoresdk.h
+++ b/src/ext/NetFx/be/detectnetcoresdk.h
@@ -4,6 +4,6 @@
 HRESULT NetfxPerformDetectNetCoreSdk(
     __in LPCWSTR wzVariable,
     __in NETFX_SEARCH* pSearch,
-    __in IBundleExtensionEngine* pEngine,
+    __in IBootstrapperExtensionEngine* pEngine,
     __in LPCWSTR wzBaseDirectory
     );
diff --git a/src/ext/NetFx/be/detectnetcoresdkfeatureband.cpp b/src/ext/NetFx/be/detectnetcoresdkfeatureband.cpp
index d48c7a85..eca61fad 100644
--- a/src/ext/NetFx/be/detectnetcoresdkfeatureband.cpp
+++ b/src/ext/NetFx/be/detectnetcoresdkfeatureband.cpp
@@ -29,7 +29,7 @@ LExit:
 HRESULT NetfxPerformDetectNetCoreSdkFeatureBand(
     __in LPCWSTR wzVariable,
     __in NETFX_SEARCH* pSearch,
-    __in IBundleExtensionEngine* pEngine,
+    __in IBootstrapperExtensionEngine* pEngine,
     __in LPCWSTR wzBaseDirectory
     )
 {
diff --git a/src/ext/NetFx/be/detectnetcoresdkfeatureband.h b/src/ext/NetFx/be/detectnetcoresdkfeatureband.h
index 1f92cd58..d194c6b7 100644
--- a/src/ext/NetFx/be/detectnetcoresdkfeatureband.h
+++ b/src/ext/NetFx/be/detectnetcoresdkfeatureband.h
@@ -4,6 +4,6 @@
 HRESULT NetfxPerformDetectNetCoreSdkFeatureBand(
     __in LPCWSTR wzVariable,
     __in NETFX_SEARCH* pSearch,
-    __in IBundleExtensionEngine* pEngine,
+    __in IBootstrapperExtensionEngine* pEngine,
     __in LPCWSTR wzBaseDirectory
     );
diff --git a/src/ext/NetFx/be/netfxbe.cpp b/src/ext/NetFx/be/netfxbe.cpp
index 3a34cea3..72eda51a 100644
--- a/src/ext/NetFx/be/netfxbe.cpp
+++ b/src/ext/NetFx/be/netfxbe.cpp
@@ -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.
 
 #include "precomp.h"
-#include "BextBaseBundleExtensionProc.h"
+#include "BextBaseBootstrapperExtensionProc.h"
 
 static HINSTANCE vhInstance = NULL;
-static IBundleExtension* vpBundleExtension = NULL;
+static IBootstrapperExtension* vpBootstrapperExtension = NULL;
 
 // function definitions
 
@@ -28,13 +28,13 @@ extern "C" BOOL WINAPI DllMain(
     return TRUE;
 }
 
-extern "C" HRESULT WINAPI BundleExtensionCreate(
-    __in const BUNDLE_EXTENSION_CREATE_ARGS* pArgs,
-    __inout BUNDLE_EXTENSION_CREATE_RESULTS* pResults
+extern "C" HRESULT WINAPI BootstrapperExtensionCreate(
+    __in const BOOTSTRAPPER_EXTENSION_CREATE_ARGS* pArgs,
+    __inout BOOTSTRAPPER_EXTENSION_CREATE_RESULTS* pResults
     )
 {
     HRESULT hr = S_OK;
-    IBundleExtensionEngine* pEngine = NULL;
+    IBootstrapperExtensionEngine* pEngine = NULL;
 
     hr = XmlInitialize();
     ExitOnFailure(hr, "Failed to initialize XML.");
@@ -42,11 +42,11 @@ extern "C" HRESULT WINAPI BundleExtensionCreate(
     hr = BextInitializeFromCreateArgs(pArgs, &pEngine);
     ExitOnFailure(hr, "Failed to initialize bext");
 
-    hr = NetfxBundleExtensionCreate(vhInstance, pEngine, pArgs, &vpBundleExtension);
-    BextExitOnFailure(hr, "Failed to create WixNetfxBundleExtension");
+    hr = NetfxBootstrapperExtensionCreate(vhInstance, pEngine, pArgs, &vpBootstrapperExtension);
+    BextExitOnFailure(hr, "Failed to create WixNetfxBootstrapperExtension");
 
-    pResults->pfnBundleExtensionProc = BextBaseBundleExtensionProc;
-    pResults->pvBundleExtensionProcContext = vpBundleExtension;
+    pResults->pfnBootstrapperExtensionProc = BextBaseBootstrapperExtensionProc;
+    pResults->pvBootstrapperExtensionProcContext = vpBootstrapperExtension;
 
 LExit:
     ReleaseObject(pEngine);
@@ -54,9 +54,9 @@ LExit:
     return hr;
 }
 
-extern "C" void WINAPI BundleExtensionDestroy()
+extern "C" void WINAPI BootstrapperExtensionDestroy()
 {
     BextUninitialize();
-    ReleaseNullObject(vpBundleExtension);
+    ReleaseNullObject(vpBootstrapperExtension);
     XmlUninitialize();
 }
diff --git a/src/ext/NetFx/be/netfxbe.def b/src/ext/NetFx/be/netfxbe.def
index c6605241..2eeaf32c 100644
--- a/src/ext/NetFx/be/netfxbe.def
+++ b/src/ext/NetFx/be/netfxbe.def
@@ -4,5 +4,5 @@
 LIBRARY      "netfxbe"
 
 EXPORTS
-    BundleExtensionCreate
-    BundleExtensionDestroy
+    BootstrapperExtensionCreate
+    BootstrapperExtensionDestroy
diff --git a/src/ext/NetFx/be/netfxbe.vcxproj b/src/ext/NetFx/be/netfxbe.vcxproj
index 94026960..d157b64a 100644
--- a/src/ext/NetFx/be/netfxbe.vcxproj
+++ b/src/ext/NetFx/be/netfxbe.vcxproj
@@ -35,7 +35,7 @@
     <TargetName>netfxbe</TargetName>
     <CharacterSet>Unicode</CharacterSet>
     <ProjectModuleDefinitionFile>netfxbe.def</ProjectModuleDefinitionFile>
-    <Description>WiX Toolset Netfx BundleExtension</Description>
+    <Description>WiX Toolset Netfx BootstrapperExtension</Description>
   </PropertyGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -50,7 +50,7 @@
     <ClCompile Include="detectnetcoresdk.cpp" />
     <ClCompile Include="detectnetcoresdkfeatureband.cpp" />
     <ClCompile Include="netfxbe.cpp" />
-    <ClCompile Include="NetfxBundleExtension.cpp" />
+    <ClCompile Include="NetfxBootstrapperExtension.cpp" />
     <ClCompile Include="netfxsearch.cpp" />
     <ClCompile Include="precomp.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
@@ -62,7 +62,7 @@
     <ClInclude Include="detectnetcore.h" />
     <ClInclude Include="detectnetcoresdk.h" />
     <ClInclude Include="detectnetcoresdkfeatureband.h" />
-    <ClInclude Include="NetfxBundleExtension.h" />
+    <ClInclude Include="NetfxBootstrapperExtension.h" />
     <ClInclude Include="netfxsearch.h" />
     <ClInclude Include="precomp.h" />
     <ClInclude Include="runnetcoresearch.h" />
@@ -73,7 +73,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.BextUtil" />
+    <PackageReference Include="WixToolset.BootstrapperExtensionApi" />
 
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
   </ItemGroup>
diff --git a/src/ext/NetFx/be/netfxsearch.cpp b/src/ext/NetFx/be/netfxsearch.cpp
index ffbf6ee0..38c34e3c 100644
--- a/src/ext/NetFx/be/netfxsearch.cpp
+++ b/src/ext/NetFx/be/netfxsearch.cpp
@@ -5,7 +5,7 @@
 
 STDMETHODIMP NetfxSearchParseFromXml(
     __in NETFX_SEARCHES* pSearches,
-    __in IXMLDOMNode* pixnBundleExtension
+    __in IXMLDOMNode* pixnBootstrapperExtension
     )
 {
     HRESULT hr = S_OK;
@@ -15,7 +15,7 @@ STDMETHODIMP NetfxSearchParseFromXml(
     BSTR bstrNodeName = NULL;
 
     // Select Netfx search nodes.
-    hr = XmlSelectNodes(pixnBundleExtension, L"NetFxNetCoreSearch|NetFxNetCoreSdkSearch|NetFxNetCoreSdkFeatureBandSearch", &pixnNodes);
+    hr = XmlSelectNodes(pixnBootstrapperExtension, L"NetFxNetCoreSearch|NetFxNetCoreSdkSearch|NetFxNetCoreSdkFeatureBandSearch", &pixnNodes);
     BextExitOnFailure(hr, "Failed to select Netfx search nodes.");
 
     // Get Netfx search node count.
@@ -135,7 +135,7 @@ STDMETHODIMP NetfxSearchExecute(
     __in NETFX_SEARCHES* pSearches,
     __in LPCWSTR wzSearchId,
     __in LPCWSTR wzVariable,
-    __in IBundleExtensionEngine* pEngine,
+    __in IBootstrapperExtensionEngine* pEngine,
     __in LPCWSTR wzBaseDirectory
     )
 {
diff --git a/src/ext/NetFx/be/netfxsearch.h b/src/ext/NetFx/be/netfxsearch.h
index 5793dd55..f532a5a5 100644
--- a/src/ext/NetFx/be/netfxsearch.h
+++ b/src/ext/NetFx/be/netfxsearch.h
@@ -68,7 +68,7 @@ typedef struct _NETFX_SEARCHES
 
 STDMETHODIMP NetfxSearchParseFromXml(
     __in NETFX_SEARCHES* pSearches,
-    __in IXMLDOMNode* pixnBundleExtension
+    __in IXMLDOMNode* pixnBootstrapperExtension
     );
 
 void NetfxSearchUninitialize(
@@ -79,7 +79,7 @@ STDMETHODIMP NetfxSearchExecute(
     __in NETFX_SEARCHES* pSearches,
     __in LPCWSTR wzSearchId,
     __in LPCWSTR wzVariable,
-    __in IBundleExtensionEngine* pEngine,
+    __in IBootstrapperExtensionEngine* pEngine,
     __in LPCWSTR wzBaseDirectory
     );
 
diff --git a/src/ext/NetFx/be/precomp.h b/src/ext/NetFx/be/precomp.h
index a0ae1038..a97b3c5e 100644
--- a/src/ext/NetFx/be/precomp.h
+++ b/src/ext/NetFx/be/precomp.h
@@ -20,12 +20,12 @@
 #include <xmlutil.h>
 
 #include <bextutil.h>
-#include <BextBundleExtensionEngine.h>
+#include <BextBootstrapperExtensionEngine.h>
 
 #include "..\..\beDecor.h"
 #include "netfxsearch.h"
 #include "detectnetcore.h"
 #include "detectnetcoresdk.h"
 #include "detectnetcoresdkfeatureband.h"
-#include "NetfxBundleExtension.h"
+#include "NetfxBootstrapperExtension.h"
 #include "runnetcoresearch.h"
diff --git a/src/ext/NetFx/wixext/NetFxCompiler.cs b/src/ext/NetFx/wixext/NetFxCompiler.cs
index bfadbe07..70e83cc9 100644
--- a/src/ext/NetFx/wixext/NetFxCompiler.cs
+++ b/src/ext/NetFx/wixext/NetFxCompiler.cs
@@ -225,15 +225,15 @@ namespace WixToolset.Netfx
 
             this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
 
-            var bundleExtensionId = this.ParseHelper.CreateIdentifierValueFromPlatform("Wix4NetfxBundleExtension", this.Context.Platform, BurnPlatforms.X86 | BurnPlatforms.X64 | BurnPlatforms.ARM64);
-            if (bundleExtensionId == null)
+            var bootstrapperExtensionId = this.ParseHelper.CreateIdentifierValueFromPlatform("Wix4NetfxBootstrapperExtension", this.Context.Platform, BurnPlatforms.X86 | BurnPlatforms.X64 | BurnPlatforms.ARM64);
+            if (bootstrapperExtensionId == null)
             {
                 this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, this.Context.Platform.ToString(), element.Name.LocalName));
             }
 
             if (!this.Messaging.EncounteredError)
             {
-                this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, bundleExtensionId);
+                this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, bootstrapperExtensionId);
 
                 section.AddSymbol(new NetFxNetCoreSearchSymbol(sourceLineNumbers, id)
                 {
@@ -354,15 +354,15 @@ namespace WixToolset.Netfx
 
             this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
 
-            var bundleExtensionId = this.ParseHelper.CreateIdentifierValueFromPlatform("Wix4NetfxBundleExtension", this.Context.Platform, BurnPlatforms.X86 | BurnPlatforms.X64 | BurnPlatforms.ARM64);
-            if (bundleExtensionId == null)
+            var bootstrapperExtensionId = this.ParseHelper.CreateIdentifierValueFromPlatform("Wix4NetfxBootstrapperExtension", this.Context.Platform, BurnPlatforms.X86 | BurnPlatforms.X64 | BurnPlatforms.ARM64);
+            if (bootstrapperExtensionId == null)
             {
                 this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, this.Context.Platform.ToString(), element.Name.LocalName));
             }
 
             if (!this.Messaging.EncounteredError)
             {
-                this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, bundleExtensionId);
+                this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, bootstrapperExtensionId);
 
                 section.AddSymbol(new NetFxNetCoreSdkSearchSymbol(sourceLineNumbers, id)
                 {
@@ -503,15 +503,15 @@ namespace WixToolset.Netfx
 
             this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
 
-            var bundleExtensionId = this.ParseHelper.CreateIdentifierValueFromPlatform("Wix4NetfxBundleExtension", this.Context.Platform, BurnPlatforms.X86 | BurnPlatforms.X64 | BurnPlatforms.ARM64);
-            if (bundleExtensionId == null)
+            var bootstrapperExtensionId = this.ParseHelper.CreateIdentifierValueFromPlatform("Wix4NetfxBootstrapperExtension", this.Context.Platform, BurnPlatforms.X86 | BurnPlatforms.X64 | BurnPlatforms.ARM64);
+            if (bootstrapperExtensionId == null)
             {
                 this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, this.Context.Platform.ToString(), element.Name.LocalName));
             }
 
             if (!this.Messaging.EncounteredError)
             {
-                this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, bundleExtensionId);
+                this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, bootstrapperExtensionId);
 
                 section.AddSymbol(new NetFxNetCoreSdkFeatureBandSearchSymbol(sourceLineNumbers, id)
                 {
diff --git a/src/ext/NetFx/wixext/Symbols/NetfxSymbolDefinitions.cs b/src/ext/NetFx/wixext/Symbols/NetfxSymbolDefinitions.cs
index 6371a951..cc25a3eb 100644
--- a/src/ext/NetFx/wixext/Symbols/NetfxSymbolDefinitions.cs
+++ b/src/ext/NetFx/wixext/Symbols/NetfxSymbolDefinitions.cs
@@ -53,9 +53,9 @@ namespace WixToolset.Netfx
 
         static NetfxSymbolDefinitions()
         {
-            NetFxNetCoreSearch.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag);
-            NetFxNetCoreSdkSearch.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag);
-            NetFxNetCoreSdkFeatureBandSearch.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag);
+            NetFxNetCoreSearch.AddTag(BurnConstants.BootstrapperExtensionSearchSymbolDefinitionTag);
+            NetFxNetCoreSdkSearch.AddTag(BurnConstants.BootstrapperExtensionSearchSymbolDefinitionTag);
+            NetFxNetCoreSdkFeatureBandSearch.AddTag(BurnConstants.BootstrapperExtensionSearchSymbolDefinitionTag);
         }
     }
 }
diff --git a/src/ext/NetFx/wixlib/NetfxBundleExtension_Platform.wxi b/src/ext/NetFx/wixlib/NetfxBootstrapperExtension_Platform.wxi
index bc332efc..98fbd523 100644
--- a/src/ext/NetFx/wixlib/NetfxBundleExtension_Platform.wxi
+++ b/src/ext/NetFx/wixlib/NetfxBootstrapperExtension_Platform.wxi
@@ -5,11 +5,11 @@
     <?include ..\..\caDecor.wxi ?>
 
     <Fragment>
-        <BundleExtension Id="$(var.Prefix)NetfxBundleExtension$(var.Suffix)" SourceFile="!(bindpath.netfxbe.$(var.platform))netfxbe.dll" Name="$(var.Prefix)NetfxBundleExtension$(var.Suffix)\netfxbe.dll">
+        <BootstrapperExtension Id="$(var.Prefix)NetfxBootstrapperExtension$(var.Suffix)" SourceFile="!(bindpath.netfxbe.$(var.platform))netfxbe.dll" Name="$(var.Prefix)NetfxBootstrapperExtension$(var.Suffix)\netfxbe.dll">
             <?foreach PLATFORM in x86;x64;arm64?>
-            <Payload SourceFile="!(bindpath.netcoresearch.$(var.PLATFORM))netcoresearch.exe" Name="$(var.Prefix)NetfxBundleExtension$(var.Suffix)\$(var.PLATFORM)\netcoresearch.exe" />
-            <Payload SourceFile="!(bindpath.netcoresearch.$(var.PLATFORM))hostfxr.dll" Name="$(var.Prefix)NetfxBundleExtension$(var.Suffix)\$(var.PLATFORM)\hostfxr.dll" />
+            <Payload SourceFile="!(bindpath.netcoresearch.$(var.PLATFORM))netcoresearch.exe" Name="$(var.Prefix)NetfxBootstrapperExtension$(var.Suffix)\$(var.PLATFORM)\netcoresearch.exe" />
+            <Payload SourceFile="!(bindpath.netcoresearch.$(var.PLATFORM))hostfxr.dll" Name="$(var.Prefix)NetfxBootstrapperExtension$(var.Suffix)\$(var.PLATFORM)\hostfxr.dll" />
             <?endforeach?>
-        </BundleExtension>
+        </BootstrapperExtension>
     </Fragment>
 </Include>
diff --git a/src/ext/NetFx/wixlib/NetfxBundleExtension_arm64.wxs b/src/ext/NetFx/wixlib/NetfxBootstrapperExtension_arm64.wxs
index 13757dd8..00b607a1 100644
--- a/src/ext/NetFx/wixlib/NetfxBundleExtension_arm64.wxs
+++ b/src/ext/NetFx/wixlib/NetfxBootstrapperExtension_arm64.wxs
@@ -3,5 +3,5 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <?define platform=arm64 ?>
-    <?include NetfxBundleExtension_Platform.wxi ?>
+    <?include NetfxBootstrapperExtension_Platform.wxi ?>
 </Wix>
diff --git a/src/ext/Util/wixlib/UtilBundleExtension_x64.wxs b/src/ext/NetFx/wixlib/NetfxBootstrapperExtension_x64.wxs
index 96c85a5b..a7412e60 100644
--- a/src/ext/Util/wixlib/UtilBundleExtension_x64.wxs
+++ b/src/ext/NetFx/wixlib/NetfxBootstrapperExtension_x64.wxs
@@ -3,5 +3,5 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <?define platform=x64 ?>
-    <?include UtilBundleExtension_Platform.wxi ?>
+    <?include NetfxBootstrapperExtension_Platform.wxi ?>
 </Wix>
diff --git a/src/ext/NetFx/wixlib/NetfxBundleExtension_x86.wxs b/src/ext/NetFx/wixlib/NetfxBootstrapperExtension_x86.wxs
index 76a8358f..406f6139 100644
--- a/src/ext/NetFx/wixlib/NetfxBundleExtension_x86.wxs
+++ b/src/ext/NetFx/wixlib/NetfxBootstrapperExtension_x86.wxs
@@ -3,5 +3,5 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <?define platform=x86 ?>
-    <?include NetfxBundleExtension_Platform.wxi ?>
+    <?include NetfxBootstrapperExtension_Platform.wxi ?>
 </Wix>
diff --git a/src/ext/Util/be/UtilBootstrapperExtension.cpp b/src/ext/Util/be/UtilBootstrapperExtension.cpp
new file mode 100644
index 00000000..4d4d89c7
--- /dev/null
+++ b/src/ext/Util/be/UtilBootstrapperExtension.cpp
@@ -0,0 +1,87 @@
+// 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 "precomp.h"
+#include "BextBaseBootstrapperExtension.h"
+
+class CWixUtilBootstrapperExtension : public CBextBaseBootstrapperExtension
+{
+public: // IBootstrapperExtension
+    virtual STDMETHODIMP Search(
+        __in LPCWSTR wzId,
+        __in LPCWSTR wzVariable
+        )
+    {
+        HRESULT hr = S_OK;
+
+        hr = UtilSearchExecute(&m_searches, wzId, wzVariable, m_pEngine);
+
+        return hr;
+    }
+
+public: //CBextBaseBootstrapperExtension
+    virtual STDMETHODIMP Initialize(
+        __in const BOOTSTRAPPER_EXTENSION_CREATE_ARGS* pCreateArgs
+        )
+    {
+        HRESULT hr = S_OK;
+        IXMLDOMDocument* pixdManifest = NULL;
+        IXMLDOMNode* pixnBootstrapperExtension = NULL;
+
+        hr = __super::Initialize(pCreateArgs);
+        BextExitOnFailure(hr, "CBextBaseBootstrapperExtension initialization failed.");
+
+        hr = XmlLoadDocumentFromFile(m_sczBootstrapperExtensionDataPath, &pixdManifest);
+        BextExitOnFailure(hr, "Failed to load bundle extension manifest from path: %ls", m_sczBootstrapperExtensionDataPath);
+
+        hr = BextGetBootstrapperExtensionDataNode(pixdManifest, UTIL_BOOTSTRAPPER_EXTENSION_ID, &pixnBootstrapperExtension);
+        BextExitOnFailure(hr, "Failed to get BootstrapperExtension '%ls'", UTIL_BOOTSTRAPPER_EXTENSION_ID);
+
+        hr = UtilSearchParseFromXml(&m_searches, pixnBootstrapperExtension);
+        BextExitOnFailure(hr, "Failed to parse searches from bundle extension manifest.");
+
+    LExit:
+        ReleaseObject(pixnBootstrapperExtension);
+        ReleaseObject(pixdManifest);
+
+        return hr;
+    }
+
+public:
+    CWixUtilBootstrapperExtension(
+        __in IBootstrapperExtensionEngine* pEngine
+        ) : CBextBaseBootstrapperExtension(pEngine)
+    {
+        m_searches = { };
+    }
+
+    ~CWixUtilBootstrapperExtension()
+    {
+        UtilSearchUninitialize(&m_searches);
+    }
+
+private:
+    UTIL_SEARCHES m_searches;
+};
+
+HRESULT UtilBootstrapperExtensionCreate(
+    __in IBootstrapperExtensionEngine* pEngine,
+    __in const BOOTSTRAPPER_EXTENSION_CREATE_ARGS* pArgs,
+    __out IBootstrapperExtension** ppBootstrapperExtension
+    )
+{
+    HRESULT hr = S_OK;
+    CWixUtilBootstrapperExtension* pExtension = NULL;
+
+    pExtension = new CWixUtilBootstrapperExtension(pEngine);
+    BextExitOnNull(pExtension, hr, E_OUTOFMEMORY, "Failed to create new CWixUtilBootstrapperExtension.");
+
+    hr = pExtension->Initialize(pArgs);
+    BextExitOnFailure(hr, "CWixUtilBootstrapperExtension initialization failed.");
+
+    *ppBootstrapperExtension = pExtension;
+    pExtension = NULL;
+
+LExit:
+    ReleaseObject(pExtension);
+    return hr;
+}
diff --git a/src/ext/Util/be/UtilBootstrapperExtension.h b/src/ext/Util/be/UtilBootstrapperExtension.h
new file mode 100644
index 00000000..32cabb89
--- /dev/null
+++ b/src/ext/Util/be/UtilBootstrapperExtension.h
@@ -0,0 +1,16 @@
+#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.
+
+
+// constants
+
+#define UTIL_BOOTSTRAPPER_EXTENSION_ID BOOTSTRAPPER_EXTENSION_DECORATION(L"UtilBootstrapperExtension")
+
+
+// function declarations
+
+HRESULT UtilBootstrapperExtensionCreate(
+    __in IBootstrapperExtensionEngine* pEngine,
+    __in const BOOTSTRAPPER_EXTENSION_CREATE_ARGS* pArgs,
+    __out IBootstrapperExtension** ppBootstrapperExtension
+    );
diff --git a/src/ext/Util/be/UtilBundleExtension.cpp b/src/ext/Util/be/UtilBundleExtension.cpp
deleted file mode 100644
index 23f5d94f..00000000
--- a/src/ext/Util/be/UtilBundleExtension.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-// 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 "precomp.h"
-#include "BextBaseBundleExtension.h"
-
-class CWixUtilBundleExtension : public CBextBaseBundleExtension
-{
-public: // IBundleExtension
-    virtual STDMETHODIMP Search(
-        __in LPCWSTR wzId,
-        __in LPCWSTR wzVariable
-        )
-    {
-        HRESULT hr = S_OK;
-
-        hr = UtilSearchExecute(&m_searches, wzId, wzVariable, m_pEngine);
-
-        return hr;
-    }
-
-public: //CBextBaseBundleExtension
-    virtual STDMETHODIMP Initialize(
-        __in const BUNDLE_EXTENSION_CREATE_ARGS* pCreateArgs
-        )
-    {
-        HRESULT hr = S_OK;
-        IXMLDOMDocument* pixdManifest = NULL;
-        IXMLDOMNode* pixnBundleExtension = NULL;
-
-        hr = __super::Initialize(pCreateArgs);
-        BextExitOnFailure(hr, "CBextBaseBundleExtension initialization failed.");
-
-        hr = XmlLoadDocumentFromFile(m_sczBundleExtensionDataPath, &pixdManifest);
-        BextExitOnFailure(hr, "Failed to load bundle extension manifest from path: %ls", m_sczBundleExtensionDataPath);
-
-        hr = BextGetBundleExtensionDataNode(pixdManifest, UTIL_BUNDLE_EXTENSION_ID, &pixnBundleExtension);
-        BextExitOnFailure(hr, "Failed to get BundleExtension '%ls'", UTIL_BUNDLE_EXTENSION_ID);
-
-        hr = UtilSearchParseFromXml(&m_searches, pixnBundleExtension);
-        BextExitOnFailure(hr, "Failed to parse searches from bundle extension manifest.");
-
-    LExit:
-        ReleaseObject(pixnBundleExtension);
-        ReleaseObject(pixdManifest);
-
-        return hr;
-    }
-
-public:
-    CWixUtilBundleExtension(
-        __in IBundleExtensionEngine* pEngine
-        ) : CBextBaseBundleExtension(pEngine)
-    {
-        m_searches = { };
-    }
-
-    ~CWixUtilBundleExtension()
-    {
-        UtilSearchUninitialize(&m_searches);
-    }
-
-private:
-    UTIL_SEARCHES m_searches;
-};
-
-HRESULT UtilBundleExtensionCreate(
-    __in IBundleExtensionEngine* pEngine,
-    __in const BUNDLE_EXTENSION_CREATE_ARGS* pArgs,
-    __out IBundleExtension** ppBundleExtension
-    )
-{
-    HRESULT hr = S_OK;
-    CWixUtilBundleExtension* pExtension = NULL;
-
-    pExtension = new CWixUtilBundleExtension(pEngine);
-    BextExitOnNull(pExtension, hr, E_OUTOFMEMORY, "Failed to create new CWixUtilBundleExtension.");
-
-    hr = pExtension->Initialize(pArgs);
-    BextExitOnFailure(hr, "CWixUtilBundleExtension initialization failed.");
-
-    *ppBundleExtension = pExtension;
-    pExtension = NULL;
-
-LExit:
-    ReleaseObject(pExtension);
-    return hr;
-}
diff --git a/src/ext/Util/be/UtilBundleExtension.h b/src/ext/Util/be/UtilBundleExtension.h
deleted file mode 100644
index c55d6b85..00000000
--- a/src/ext/Util/be/UtilBundleExtension.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#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.
-
-
-// constants
-
-#define UTIL_BUNDLE_EXTENSION_ID BUNDLE_EXTENSION_DECORATION(L"UtilBundleExtension")
-
-
-// function declarations
-
-HRESULT UtilBundleExtensionCreate(
-    __in IBundleExtensionEngine* pEngine,
-    __in const BUNDLE_EXTENSION_CREATE_ARGS* pArgs,
-    __out IBundleExtension** ppBundleExtension
-    );
diff --git a/src/ext/Util/be/detectsha2support.cpp b/src/ext/Util/be/detectsha2support.cpp
index 4abfc63c..c7175a47 100644
--- a/src/ext/Util/be/detectsha2support.cpp
+++ b/src/ext/Util/be/detectsha2support.cpp
@@ -41,7 +41,7 @@ LExit:
 HRESULT UtilPerformDetectSHA2CodeSigning(
     __in LPCWSTR wzVariable,
     __in UTIL_SEARCH* /*pSearch*/,
-    __in IBundleExtensionEngine* pEngine
+    __in IBootstrapperExtensionEngine* pEngine
     )
 {
     HRESULT hr = S_OK;
diff --git a/src/ext/Util/be/detectsha2support.h b/src/ext/Util/be/detectsha2support.h
index c38a3d59..b387a3ea 100644
--- a/src/ext/Util/be/detectsha2support.h
+++ b/src/ext/Util/be/detectsha2support.h
@@ -4,5 +4,5 @@
 HRESULT UtilPerformDetectSHA2CodeSigning(
     __in LPCWSTR wzVariable,
     __in UTIL_SEARCH* pSearch,
-    __in IBundleExtensionEngine* pEngine
-    );
\ No newline at end of file
+    __in IBootstrapperExtensionEngine* pEngine
+    );
diff --git a/src/ext/Util/be/precomp.h b/src/ext/Util/be/precomp.h
index d04bf305..0cf0c761 100644
--- a/src/ext/Util/be/precomp.h
+++ b/src/ext/Util/be/precomp.h
@@ -24,9 +24,9 @@
 #include <xmlutil.h>
 
 #include <bextutil.h>
-#include <BextBundleExtensionEngine.h>
+#include <BextBootstrapperExtensionEngine.h>
 
 #include "..\..\beDecor.h"
 #include "utilsearch.h"
 #include "detectsha2support.h"
-#include "UtilBundleExtension.h"
+#include "UtilBootstrapperExtension.h"
diff --git a/src/ext/Util/be/utilbe.cpp b/src/ext/Util/be/utilbe.cpp
index d9816dc7..b4e6fda3 100644
--- a/src/ext/Util/be/utilbe.cpp
+++ b/src/ext/Util/be/utilbe.cpp
@@ -1,19 +1,19 @@
 // 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 "precomp.h"
-#include "BextBaseBundleExtensionProc.h"
+#include "BextBaseBootstrapperExtensionProc.h"
 
-static IBundleExtension* vpBundleExtension = NULL;
+static IBootstrapperExtension* vpBootstrapperExtension = NULL;
 
 // function definitions
 
-extern "C" HRESULT WINAPI BundleExtensionCreate(
-    __in const BUNDLE_EXTENSION_CREATE_ARGS* pArgs,
-    __inout BUNDLE_EXTENSION_CREATE_RESULTS* pResults
+extern "C" HRESULT WINAPI BootstrapperExtensionCreate(
+    __in const BOOTSTRAPPER_EXTENSION_CREATE_ARGS* pArgs,
+    __inout BOOTSTRAPPER_EXTENSION_CREATE_RESULTS* pResults
     )
 {
     HRESULT hr = S_OK;
-    IBundleExtensionEngine* pEngine = NULL;
+    IBootstrapperExtensionEngine* pEngine = NULL;
 
     hr = XmlInitialize();
     ExitOnFailure(hr, "Failed to initialize XML.");
@@ -21,11 +21,11 @@ extern "C" HRESULT WINAPI BundleExtensionCreate(
     hr = BextInitializeFromCreateArgs(pArgs, &pEngine);
     ExitOnFailure(hr, "Failed to initialize bext");
 
-    hr = UtilBundleExtensionCreate(pEngine, pArgs, &vpBundleExtension);
-    BextExitOnFailure(hr, "Failed to create WixUtilBundleExtension");
+    hr = UtilBootstrapperExtensionCreate(pEngine, pArgs, &vpBootstrapperExtension);
+    BextExitOnFailure(hr, "Failed to create WixUtilBootstrapperExtension");
 
-    pResults->pfnBundleExtensionProc = BextBaseBundleExtensionProc;
-    pResults->pvBundleExtensionProcContext = vpBundleExtension;
+    pResults->pfnBootstrapperExtensionProc = BextBaseBootstrapperExtensionProc;
+    pResults->pvBootstrapperExtensionProcContext = vpBootstrapperExtension;
 
 LExit:
     ReleaseObject(pEngine);
@@ -33,9 +33,9 @@ LExit:
     return hr;
 }
 
-extern "C" void WINAPI BundleExtensionDestroy()
+extern "C" void WINAPI BootstrapperExtensionDestroy()
 {
     BextUninitialize();
-    ReleaseNullObject(vpBundleExtension);
+    ReleaseNullObject(vpBootstrapperExtension);
     XmlUninitialize();
-}
\ No newline at end of file
+}
diff --git a/src/ext/Util/be/utilbe.def b/src/ext/Util/be/utilbe.def
index 711b1a5c..b4e7e893 100644
--- a/src/ext/Util/be/utilbe.def
+++ b/src/ext/Util/be/utilbe.def
@@ -4,5 +4,5 @@
 LIBRARY      "utilbe"
 
 EXPORTS
-    BundleExtensionCreate
-    BundleExtensionDestroy
+    BootstrapperExtensionCreate
+    BootstrapperExtensionDestroy
diff --git a/src/ext/Util/be/utilbe.vcxproj b/src/ext/Util/be/utilbe.vcxproj
index d2697bbd..df06cb46 100644
--- a/src/ext/Util/be/utilbe.vcxproj
+++ b/src/ext/Util/be/utilbe.vcxproj
@@ -35,7 +35,7 @@
     <TargetName>utilbe</TargetName>
     <CharacterSet>Unicode</CharacterSet>
     <ProjectModuleDefinitionFile>utilbe.def</ProjectModuleDefinitionFile>
-    <Description>WiX Toolset Util BundleExtension</Description>
+    <Description>WiX Toolset Util BootstrapperExtension</Description>
   </PropertyGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -51,14 +51,14 @@
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="utilbe.cpp" />
-    <ClCompile Include="UtilBundleExtension.cpp" />
+    <ClCompile Include="UtilBootstrapperExtension.cpp" />
     <ClCompile Include="utilsearch.cpp" />
   </ItemGroup>
 
   <ItemGroup>
     <ClInclude Include="detectsha2support.h" />
     <ClInclude Include="precomp.h" />
-    <ClInclude Include="UtilBundleExtension.h" />
+    <ClInclude Include="UtilBootstrapperExtension.h" />
     <ClInclude Include="utilsearch.h" />
   </ItemGroup>
 
@@ -67,7 +67,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.BextUtil" />
+    <PackageReference Include="WixToolset.BootstrapperExtensionApi" />
 
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
   </ItemGroup>
diff --git a/src/ext/Util/be/utilsearch.cpp b/src/ext/Util/be/utilsearch.cpp
index 20a514d8..59c497e3 100644
--- a/src/ext/Util/be/utilsearch.cpp
+++ b/src/ext/Util/be/utilsearch.cpp
@@ -5,7 +5,7 @@
 
 STDMETHODIMP UtilSearchParseFromXml(
     __in UTIL_SEARCHES* pSearches,
-    __in IXMLDOMNode* pixnBundleExtension
+    __in IXMLDOMNode* pixnBootstrapperExtension
     )
 {
     HRESULT hr = S_OK;
@@ -16,7 +16,7 @@ STDMETHODIMP UtilSearchParseFromXml(
     LPWSTR scz = NULL;
 
     // Select Util search nodes.
-    hr = XmlSelectNodes(pixnBundleExtension, L"WixWindowsFeatureSearch", &pixnNodes);
+    hr = XmlSelectNodes(pixnBootstrapperExtension, L"WixWindowsFeatureSearch", &pixnNodes);
     BextExitOnFailure(hr, "Failed to select Util search nodes.");
 
     // Get Util search node count.
@@ -103,7 +103,7 @@ STDMETHODIMP UtilSearchExecute(
     __in UTIL_SEARCHES* pSearches,
     __in LPCWSTR wzSearchId,
     __in LPCWSTR wzVariable,
-    __in IBundleExtensionEngine* pEngine
+    __in IBootstrapperExtensionEngine* pEngine
     )
 {
     HRESULT hr = S_OK;
diff --git a/src/ext/Util/be/utilsearch.h b/src/ext/Util/be/utilsearch.h
index deeab1f7..d19e240f 100644
--- a/src/ext/Util/be/utilsearch.h
+++ b/src/ext/Util/be/utilsearch.h
@@ -44,7 +44,7 @@ typedef struct _UTIL_SEARCHES
 
 STDMETHODIMP UtilSearchParseFromXml(
     __in UTIL_SEARCHES* pSearches,
-    __in IXMLDOMNode* pixnBundleExtension
+    __in IXMLDOMNode* pixnBootstrapperExtension
     );
 
 void UtilSearchUninitialize(
@@ -55,7 +55,7 @@ STDMETHODIMP UtilSearchExecute(
     __in UTIL_SEARCHES* pSearches,
     __in LPCWSTR wzSearchId,
     __in LPCWSTR wzVariable,
-    __in IBundleExtensionEngine* pEngine
+    __in IBootstrapperExtensionEngine* pEngine
     );
 
 STDMETHODIMP UtilSearchFindById(
diff --git a/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs
index 06e70dcf..0a93f3a4 100644
--- a/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs
+++ b/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs
@@ -372,11 +372,11 @@ namespace WixToolsetTest.Util
                 var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath);
                 extractResult.AssertSuccess();
 
-                var bundleExtensionDatas = extractResult.SelectBundleExtensionDataNodes("/be:BundleExtensionData/be:BundleExtension[@Id='Wix4UtilBundleExtension_X86']");
-                Assert.Equal(1, bundleExtensionDatas.Count);
-                Assert.Equal("<BundleExtension Id='Wix4UtilBundleExtension_X86'>" +
+                var bootstrapperExtensionDatas = extractResult.SelectBootstrapperExtensionDataNodes("/be:BootstrapperExtensionData/be:BootstrapperExtension[@Id='Wix4UtilBootstrapperExtension_X86']");
+                Assert.Equal(1, bootstrapperExtensionDatas.Count);
+                Assert.Equal("<BootstrapperExtension Id='Wix4UtilBootstrapperExtension_X86'>" +
                     "<WixWindowsFeatureSearch Id='DetectSHA2SupportId' Type='sha2CodeSigning' />" +
-                    "</BundleExtension>", bundleExtensionDatas[0].GetTestXml());
+                    "</BootstrapperExtension>", bootstrapperExtensionDatas[0].GetTestXml());
 
                 var utilSearches = extractResult.SelectManifestNodes("/burn:BurnManifest/*[self::burn:ExtensionSearch or self::burn:DirectorySearch or self::burn:FileSearch or self::burn:MsiProductSearch or self::burn:RegistrySearch]")
                                                 .Cast<XmlElement>()
@@ -384,7 +384,7 @@ namespace WixToolsetTest.Util
                                                 .ToArray();
                 WixAssert.CompareLineByLine(new[]
                 {
-                    @"<ExtensionSearch Id='DetectSHA2SupportId' Variable='IsSHA2Supported' ExtensionId='Wix4UtilBundleExtension_X86' />",
+                    @"<ExtensionSearch Id='DetectSHA2SupportId' Variable='IsSHA2Supported' ExtensionId='Wix4UtilBootstrapperExtension_X86' />",
                     @"<DirectorySearch Id='DirectorySearchId' Variable='DirectorySearchVariable' Path='%windir%\System32' Type='exists' DisableFileRedirection='yes' />",
                     @"<FileSearch Id='FileSearchId' Variable='FileSearchVariable' Path='%windir%\System32\mscoree.dll' Type='exists' />",
                     @"<MsiProductSearch Id='ProductSearchId' Variable='ProductSearchVariable' Condition='1 &amp; 2 &lt; 3' UpgradeCode='{738D02BF-E231-4370-8209-E9FD4E1BE2A1}' Type='version' />",
diff --git a/src/ext/Util/wixext/Symbols/UtilSymbolDefinitions.cs b/src/ext/Util/wixext/Symbols/UtilSymbolDefinitions.cs
index 3b357a96..8152868f 100644
--- a/src/ext/Util/wixext/Symbols/UtilSymbolDefinitions.cs
+++ b/src/ext/Util/wixext/Symbols/UtilSymbolDefinitions.cs
@@ -94,7 +94,7 @@ namespace WixToolset.Util
 
                 case UtilSymbolDefinitionType.WixRemoveRegistryKeyEx:
                     return UtilSymbolDefinitions.WixRemoveRegistryKeyEx;
-                    
+
                 case UtilSymbolDefinitionType.WixRestartResource:
                     return UtilSymbolDefinitions.WixRestartResource;
 
@@ -117,7 +117,7 @@ namespace WixToolset.Util
 
         static UtilSymbolDefinitions()
         {
-            WixWindowsFeatureSearch.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag);
+            WixWindowsFeatureSearch.AddTag(BurnConstants.BootstrapperExtensionSearchSymbolDefinitionTag);
         }
     }
 }
diff --git a/src/ext/Util/wixext/UtilCompiler.cs b/src/ext/Util/wixext/UtilCompiler.cs
index 6221c052..3bcd2c0b 100644
--- a/src/ext/Util/wixext/UtilCompiler.cs
+++ b/src/ext/Util/wixext/UtilCompiler.cs
@@ -611,15 +611,15 @@ namespace WixToolset.Util
 
             this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
 
-            var bundleExtensionId = this.ParseHelper.CreateIdentifierValueFromPlatform("Wix4UtilBundleExtension", this.Context.Platform, BurnPlatforms.X86 | BurnPlatforms.X64 | BurnPlatforms.ARM64);
-            if (bundleExtensionId == null)
+            var bootstrapperExtensionId = this.ParseHelper.CreateIdentifierValueFromPlatform("Wix4UtilBootstrapperExtension", this.Context.Platform, BurnPlatforms.X86 | BurnPlatforms.X64 | BurnPlatforms.ARM64);
+            if (bootstrapperExtensionId == null)
             {
                 this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, this.Context.Platform.ToString(), element.Name.LocalName));
             }
 
             if (!this.Messaging.EncounteredError)
             {
-                this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, bundleExtensionId);
+                this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, bootstrapperExtensionId);
 
                 section.AddSymbol(new WixWindowsFeatureSearchSymbol(sourceLineNumbers, id)
                 {
diff --git a/src/ext/Util/wixlib/UtilBundleExtension_Platform.wxi b/src/ext/Util/wixlib/UtilBootstrapperExtension_Platform.wxi
index 5c964d7d..cbaf3f56 100644
--- a/src/ext/Util/wixlib/UtilBundleExtension_Platform.wxi
+++ b/src/ext/Util/wixlib/UtilBootstrapperExtension_Platform.wxi
@@ -5,6 +5,6 @@
     <?include ..\..\caDecor.wxi ?>
 
     <Fragment>
-        <BundleExtension Id="$(var.Prefix)UtilBundleExtension$(var.Suffix)" SourceFile="!(bindpath.utilbe.$(var.platform))utilbe.dll" Name="$(var.Prefix)UtilBundleExtension$(var.Suffix)\utilbe.dll" />
+        <BootstrapperExtension Id="$(var.Prefix)UtilBootstrapperExtension$(var.Suffix)" SourceFile="!(bindpath.utilbe.$(var.platform))utilbe.dll" Name="$(var.Prefix)UtilBootstrapperExtension$(var.Suffix)\utilbe.dll" />
     </Fragment>
 </Include>
diff --git a/src/ext/Util/wixlib/UtilBundleExtension_arm64.wxs b/src/ext/Util/wixlib/UtilBootstrapperExtension_arm64.wxs
index b17be031..093de00d 100644
--- a/src/ext/Util/wixlib/UtilBundleExtension_arm64.wxs
+++ b/src/ext/Util/wixlib/UtilBootstrapperExtension_arm64.wxs
@@ -3,5 +3,5 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <?define platform=arm64 ?>
-    <?include UtilBundleExtension_Platform.wxi ?>
+    <?include UtilBootstrapperExtension_Platform.wxi ?>
 </Wix>
diff --git a/src/ext/NetFx/wixlib/NetfxBundleExtension_x64.wxs b/src/ext/Util/wixlib/UtilBootstrapperExtension_x64.wxs
index f6c27a8e..e778fc42 100644
--- a/src/ext/NetFx/wixlib/NetfxBundleExtension_x64.wxs
+++ b/src/ext/Util/wixlib/UtilBootstrapperExtension_x64.wxs
@@ -3,5 +3,5 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <?define platform=x64 ?>
-    <?include NetfxBundleExtension_Platform.wxi ?>
+    <?include UtilBootstrapperExtension_Platform.wxi ?>
 </Wix>
diff --git a/src/ext/Util/wixlib/UtilBundleExtension_x86.wxs b/src/ext/Util/wixlib/UtilBootstrapperExtension_x86.wxs
index 3b458687..101cf089 100644
--- a/src/ext/Util/wixlib/UtilBundleExtension_x86.wxs
+++ b/src/ext/Util/wixlib/UtilBootstrapperExtension_x86.wxs
@@ -3,5 +3,5 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <?define platform=x86 ?>
-    <?include UtilBundleExtension_Platform.wxi ?>
+    <?include UtilBootstrapperExtension_Platform.wxi ?>
 </Wix>
diff --git a/src/ext/beDecor.h b/src/ext/beDecor.h
index 2c6a8818..ecd90599 100644
--- a/src/ext/beDecor.h
+++ b/src/ext/beDecor.h
@@ -3,11 +3,11 @@
 
 
 #if defined(_M_ARM64)
-#define BUNDLE_EXTENSION_DECORATION(f) L"Wix4" f L"_A64"
+#define BOOTSTRAPPER_EXTENSION_DECORATION(f) L"Wix4" f L"_A64"
 #elif defined(_M_AMD64)
-#define BUNDLE_EXTENSION_DECORATION(f) L"Wix4" f L"_X64"
+#define BOOTSTRAPPER_EXTENSION_DECORATION(f) L"Wix4" f L"_X64"
 #elif defined(_M_ARM)
-#define BUNDLE_EXTENSION_DECORATION(f) L"Wix4" f L"_ARM"
+#define BOOTSTRAPPER_EXTENSION_DECORATION(f) L"Wix4" f L"_ARM"
 #else
-#define BUNDLE_EXTENSION_DECORATION(f) L"Wix4" f L"_X86"
+#define BOOTSTRAPPER_EXTENSION_DECORATION(f) L"Wix4" f L"_X86"
 #endif