4 files changed, 22 insertions, 22 deletions

diff --git a/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h b/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h
index 48bd813d..1ba25cd7 100644
--- a/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h
+++ b/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h
@@ -93,12 +93,12 @@ enum BOOTSTRAPPER_APPLICATION_MESSAGE
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDBUNDLE,
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPACKAGEBEGIN,
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDMSIPACKAGE,
-    BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTTARGETMSIPACKAGE,
+    BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPATCHTARGET,
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTMSIFEATURE,
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPACKAGECOMPLETE,
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANRELATEDBUNDLE,
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPACKAGEBEGIN,
-    BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANTARGETMSIPACKAGE,
+    BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPATCHTARGET,
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANMSIFEATURE,
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPACKAGECOMPLETE,
     BOOTSTRAPPER_APPLICATION_MESSAGE_ONAPPLYBEGIN,
@@ -571,7 +571,7 @@ struct BA_ONDETECTRELATEDMSIPACKAGE_RESULTS
     BOOL fCancel;
 };
 
-struct BA_ONDETECTTARGETMSIPACKAGE_ARGS
+struct BA_ONDETECTPATCHTARGET_ARGS
 {
     DWORD cbSize;
     LPCWSTR wzPackageId;
@@ -579,7 +579,7 @@ struct BA_ONDETECTTARGETMSIPACKAGE_ARGS
     BOOTSTRAPPER_PACKAGE_STATE patchState;
 };
 
-struct BA_ONDETECTTARGETMSIPACKAGE_RESULTS
+struct BA_ONDETECTPATCHTARGET_RESULTS
 {
     DWORD cbSize;
     BOOL fCancel;
@@ -929,7 +929,7 @@ struct BA_ONPLANRELATEDBUNDLE_RESULTS
     BOOTSTRAPPER_REQUEST_STATE requestedState;
 };
 
-struct BA_ONPLANTARGETMSIPACKAGE_ARGS
+struct BA_ONPLANPATCHTARGET_ARGS
 {
     DWORD cbSize;
     LPCWSTR wzPackageId;
@@ -937,7 +937,7 @@ struct BA_ONPLANTARGETMSIPACKAGE_ARGS
     BOOTSTRAPPER_REQUEST_STATE recommendedState;
 };
 
-struct BA_ONPLANTARGETMSIPACKAGE_RESULTS
+struct BA_ONPLANPATCHTARGET_RESULTS
 {
     DWORD cbSize;
     BOOTSTRAPPER_REQUEST_STATE requestedState;
diff --git a/src/engine/mspengine.cpp b/src/engine/mspengine.cpp
index 2c3a866a..7f591d82 100644
--- a/src/engine/mspengine.cpp
+++ b/src/engine/mspengine.cpp
@@ -268,8 +268,8 @@ extern "C" HRESULT MspEngineDetectPackage(
                 }
             }
 
-            hr = UserExperienceOnDetectTargetMsiPackage(pUserExperience, pPackage->sczId, pTargetProduct->wzTargetProductCode, pTargetProduct->patchPackageState);
-            ExitOnRootFailure(hr, "BA aborted detect target MSI package.");
+            hr = UserExperienceOnDetectPatchTarget(pUserExperience, pPackage->sczId, pTargetProduct->wzTargetProductCode, pTargetProduct->patchPackageState);
+            ExitOnRootFailure(hr, "BA aborted detect patch target.");
         }
     }
 
@@ -300,8 +300,8 @@ extern "C" HRESULT MspEnginePlanCalculatePackage(
         BOOTSTRAPPER_ACTION_STATE execute = BOOTSTRAPPER_ACTION_STATE_NONE;
         BOOTSTRAPPER_ACTION_STATE rollback = BOOTSTRAPPER_ACTION_STATE_NONE;
 
-        hr = UserExperienceOnPlanTargetMsiPackage(pUserExperience, pPackage->sczId, pTargetProduct->wzTargetProductCode, &requested);
-        ExitOnRootFailure(hr, "BA aborted plan target MSI package.");
+        hr = UserExperienceOnPlanPatchTarget(pUserExperience, pPackage->sczId, pTargetProduct->wzTargetProductCode, &requested);
+        ExitOnRootFailure(hr, "BA aborted plan patch target.");
 
         // Calculate the execute action.
         switch (pTargetProduct->patchPackageState)
diff --git a/src/engine/userexperience.cpp b/src/engine/userexperience.cpp
index a0fb341d..12c3f6df 100644
--- a/src/engine/userexperience.cpp
+++ b/src/engine/userexperience.cpp
@@ -947,7 +947,7 @@ LExit:
     return hr;
 }
 
-EXTERN_C BAAPI UserExperienceOnDetectTargetMsiPackage(
+EXTERN_C BAAPI UserExperienceOnDetectPatchTarget(
     __in BURN_USER_EXPERIENCE* pUserExperience,
     __in_z LPCWSTR wzPackageId,
     __in_z LPCWSTR wzProductCode,
@@ -955,8 +955,8 @@ EXTERN_C BAAPI UserExperienceOnDetectTargetMsiPackage(
     )
 {
     HRESULT hr = S_OK;
-    BA_ONDETECTTARGETMSIPACKAGE_ARGS args = { };
-    BA_ONDETECTTARGETMSIPACKAGE_RESULTS results = { };
+    BA_ONDETECTPATCHTARGET_ARGS args = { };
+    BA_ONDETECTPATCHTARGET_RESULTS results = { };
 
     args.cbSize = sizeof(args);
     args.wzPackageId = wzPackageId;
@@ -965,8 +965,8 @@ EXTERN_C BAAPI UserExperienceOnDetectTargetMsiPackage(
 
     results.cbSize = sizeof(results);
 
-    hr = SendBAMessage(pUserExperience, BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTTARGETMSIPACKAGE, &args, &results);
-    ExitOnFailure(hr, "BA OnDetectTargetMsiPackage failed.");
+    hr = SendBAMessage(pUserExperience, BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPATCHTARGET, &args, &results);
+    ExitOnFailure(hr, "BA OnDetectPatchTarget failed.");
 
     if (results.fCancel)
     {
@@ -1697,7 +1697,7 @@ LExit:
     return hr;
 }
 
-EXTERN_C BAAPI UserExperienceOnPlanTargetMsiPackage(
+EXTERN_C BAAPI UserExperienceOnPlanPatchTarget(
     __in BURN_USER_EXPERIENCE* pUserExperience,
     __in_z LPCWSTR wzPackageId,
     __in_z LPCWSTR wzProductCode,
@@ -1705,8 +1705,8 @@ EXTERN_C BAAPI UserExperienceOnPlanTargetMsiPackage(
     )
 {
     HRESULT hr = S_OK;
-    BA_ONPLANTARGETMSIPACKAGE_ARGS args = { };
-    BA_ONPLANTARGETMSIPACKAGE_RESULTS results = { };
+    BA_ONPLANPATCHTARGET_ARGS args = { };
+    BA_ONPLANPATCHTARGET_RESULTS results = { };
 
     args.cbSize = sizeof(args);
     args.wzPackageId = wzPackageId;
@@ -1716,8 +1716,8 @@ EXTERN_C BAAPI UserExperienceOnPlanTargetMsiPackage(
     results.cbSize = sizeof(results);
     results.requestedState = *pRequestedState;
 
-    hr = SendBAMessage(pUserExperience, BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANTARGETMSIPACKAGE, &args, &results);
-    ExitOnFailure(hr, "BA OnPlanTargetMsiPackage failed.");
+    hr = SendBAMessage(pUserExperience, BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPATCHTARGET, &args, &results);
+    ExitOnFailure(hr, "BA OnPlanPatchTarget failed.");
 
     if (results.fCancel)
     {
diff --git a/src/engine/userexperience.h b/src/engine/userexperience.h
index 363c0f06..930e7268 100644
--- a/src/engine/userexperience.h
+++ b/src/engine/userexperience.h
@@ -237,7 +237,7 @@ BAAPI UserExperienceOnDetectRelatedMsiPackage(
     __in VERUTIL_VERSION* pVersion,
     __in BOOTSTRAPPER_RELATED_OPERATION operation
     );
-BAAPI UserExperienceOnDetectTargetMsiPackage(
+BAAPI UserExperienceOnDetectPatchTarget(
     __in BURN_USER_EXPERIENCE* pUserExperience,
     __in_z LPCWSTR wzPackageId,
     __in_z LPCWSTR wzProductCode,
@@ -391,7 +391,7 @@ BAAPI UserExperienceOnPlanRelatedBundle(
     __in_z LPCWSTR wzBundleId,
     __inout BOOTSTRAPPER_REQUEST_STATE* pRequestedState
     );
-BAAPI UserExperienceOnPlanTargetMsiPackage(
+BAAPI UserExperienceOnPlanPatchTarget(
     __in BURN_USER_EXPERIENCE* pUserExperience,
     __in_z LPCWSTR wzPackageId,
     __in_z LPCWSTR wzProductCode,