4 files changed, 157 insertions, 87 deletions

diff --git a/src/WixToolset.Mba.Core/BootstrapperApplication.cs b/src/WixToolset.Mba.Core/BootstrapperApplication.cs
index 9f4f6330..43e69e81 100644
--- a/src/WixToolset.Mba.Core/BootstrapperApplication.cs
+++ b/src/WixToolset.Mba.Core/BootstrapperApplication.cs
@@ -68,7 +68,7 @@ namespace WixToolset.Mba.Core
         public event EventHandler<DetectRelatedMsiPackageEventArgs> DetectRelatedMsiPackage;
 
         /// <inheritdoc/>
-        public event EventHandler<DetectTargetMsiPackageEventArgs> DetectTargetMsiPackage;
+        public event EventHandler<DetectPatchTargetEventArgs> DetectPatchTarget;
 
         /// <inheritdoc/>
         public event EventHandler<DetectMsiFeatureEventArgs> DetectMsiFeature;
@@ -89,7 +89,7 @@ namespace WixToolset.Mba.Core
         public event EventHandler<PlanPackageBeginEventArgs> PlanPackageBegin;
 
         /// <inheritdoc/>
-        public event EventHandler<PlanTargetMsiPackageEventArgs> PlanTargetMsiPackage;
+        public event EventHandler<PlanPatchTargetEventArgs> PlanPatchTarget;
 
         /// <inheritdoc/>
         public event EventHandler<PlanMsiFeatureEventArgs> PlanMsiFeature;
@@ -101,6 +101,9 @@ namespace WixToolset.Mba.Core
         public event EventHandler<PlanPackageCompleteEventArgs> PlanPackageComplete;
 
         /// <inheritdoc/>
+        public event EventHandler<PlannedPackageEventArgs> PlannedPackage;
+
+        /// <inheritdoc/>
         public event EventHandler<PlanCompleteEventArgs> PlanComplete;
 
         /// <inheritdoc/>
@@ -392,12 +395,12 @@ namespace WixToolset.Mba.Core
         }
 
         /// <summary>
-        /// Called by the engine, raises the <see cref="DetectTargetMsiPackage"/> event.
+        /// Called by the engine, raises the <see cref="DetectPatchTarget"/> event.
         /// </summary>
         /// <param name="args">Additional arguments for this event.</param>
-        protected virtual void OnDetectTargetMsiPackage(DetectTargetMsiPackageEventArgs args)
+        protected virtual void OnDetectPatchTarget(DetectPatchTargetEventArgs args)
         {
-            EventHandler<DetectTargetMsiPackageEventArgs> handler = this.DetectTargetMsiPackage;
+            EventHandler<DetectPatchTargetEventArgs> handler = this.DetectPatchTarget;
             if (null != handler)
             {
                 handler(this, args);
@@ -483,12 +486,12 @@ namespace WixToolset.Mba.Core
         }
 
         /// <summary>
-        /// Called by the engine, raises the <see cref="PlanTargetMsiPackage"/> event.
+        /// Called by the engine, raises the <see cref="PlanPatchTarget"/> event.
         /// </summary>
         /// <param name="args">Additional arguments for this event.</param>
-        protected virtual void OnPlanTargetMsiPackage(PlanTargetMsiPackageEventArgs args)
+        protected virtual void OnPlanPatchTarget(PlanPatchTargetEventArgs args)
         {
-            EventHandler<PlanTargetMsiPackageEventArgs> handler = this.PlanTargetMsiPackage;
+            EventHandler<PlanPatchTargetEventArgs> handler = this.PlanPatchTarget;
             if (null != handler)
             {
                 handler(this, args);
@@ -535,6 +538,19 @@ namespace WixToolset.Mba.Core
         }
 
         /// <summary>
+        /// Called by the engine, raises the <see cref="PlannedPackage"/> event.
+        /// </summary>
+        /// <param name="args">Additional arguments for this event.</param>
+        protected virtual void OnPlannedPackage(PlannedPackageEventArgs args)
+        {
+            EventHandler<PlannedPackageEventArgs> handler = this.PlannedPackage;
+            if (null != handler)
+            {
+                handler(this, args);
+            }
+        }
+
+        /// <summary>
         /// Called by the engine, raises the <see cref="PlanComplete"/> event.
         /// </summary>
         /// <param name="args">Additional arguments for this event.</param>
@@ -1170,10 +1186,10 @@ namespace WixToolset.Mba.Core
             return args.HResult;
         }
 
-        int IBootstrapperApplication.OnDetectTargetMsiPackage(string wzPackageId, string wzProductCode, PackageState patchState, ref bool fCancel)
+        int IBootstrapperApplication.OnDetectPatchTarget(string wzPackageId, string wzProductCode, PackageState patchState, ref bool fCancel)
         {
-            DetectTargetMsiPackageEventArgs args = new DetectTargetMsiPackageEventArgs(wzPackageId, wzProductCode, patchState, fCancel);
-            this.OnDetectTargetMsiPackage(args);
+            DetectPatchTargetEventArgs args = new DetectPatchTargetEventArgs(wzPackageId, wzProductCode, patchState, fCancel);
+            this.OnDetectPatchTarget(args);
 
             fCancel = args.Cancel;
             return args.HResult;
@@ -1223,9 +1239,9 @@ namespace WixToolset.Mba.Core
             return args.HResult;
         }
 
-        int IBootstrapperApplication.OnPlanPackageBegin(string wzPackageId, RequestState recommendedState, ref RequestState pRequestedState, ref bool fCancel)
+        int IBootstrapperApplication.OnPlanPackageBegin(string wzPackageId, PackageState state, bool fInstallCondition, RequestState recommendedState, ref RequestState pRequestedState, ref bool fCancel)
         {
-            PlanPackageBeginEventArgs args = new PlanPackageBeginEventArgs(wzPackageId, recommendedState, pRequestedState, fCancel);
+            PlanPackageBeginEventArgs args = new PlanPackageBeginEventArgs(wzPackageId, state, fInstallCondition, recommendedState, pRequestedState, fCancel);
             this.OnPlanPackageBegin(args);
 
             pRequestedState = args.State;
@@ -1233,10 +1249,10 @@ namespace WixToolset.Mba.Core
             return args.HResult;
         }
 
-        int IBootstrapperApplication.OnPlanTargetMsiPackage(string wzPackageId, string wzProductCode, RequestState recommendedState, ref RequestState pRequestedState, ref bool fCancel)
+        int IBootstrapperApplication.OnPlanPatchTarget(string wzPackageId, string wzProductCode, RequestState recommendedState, ref RequestState pRequestedState, ref bool fCancel)
         {
-            PlanTargetMsiPackageEventArgs args = new PlanTargetMsiPackageEventArgs(wzPackageId, wzProductCode, recommendedState, pRequestedState, fCancel);
-            this.OnPlanTargetMsiPackage(args);
+            PlanPatchTargetEventArgs args = new PlanPatchTargetEventArgs(wzPackageId, wzProductCode, recommendedState, pRequestedState, fCancel);
+            this.OnPlanPatchTarget(args);
 
             pRequestedState = args.State;
             fCancel = args.Cancel;
@@ -1265,14 +1281,22 @@ namespace WixToolset.Mba.Core
             return args.HResult;
         }
 
-        int IBootstrapperApplication.OnPlanPackageComplete(string wzPackageId, int hrStatus, PackageState state, RequestState requested, ActionState execute, ActionState rollback)
+        int IBootstrapperApplication.OnPlanPackageComplete(string wzPackageId, int hrStatus, RequestState requested)
         {
-            var args = new PlanPackageCompleteEventArgs(wzPackageId, hrStatus, state, requested, execute, rollback);
+            var args = new PlanPackageCompleteEventArgs(wzPackageId, hrStatus, requested);
             this.OnPlanPackageComplete(args);
 
             return args.HResult;
         }
 
+        int IBootstrapperApplication.OnPlannedPackage(string wzPackageId, ActionState execute, ActionState rollback)
+        {
+            var args = new PlannedPackageEventArgs(wzPackageId, execute, rollback);
+            this.OnPlannedPackage(args);
+
+            return args.HResult;
+        }
+
         int IBootstrapperApplication.OnPlanComplete(int hrStatus)
         {
             PlanCompleteEventArgs args = new PlanCompleteEventArgs(hrStatus);
diff --git a/src/WixToolset.Mba.Core/EventArgs.cs b/src/WixToolset.Mba.Core/EventArgs.cs
index 2f21b50e..953e31ee 100644
--- a/src/WixToolset.Mba.Core/EventArgs.cs
+++ b/src/WixToolset.Mba.Core/EventArgs.cs
@@ -547,18 +547,18 @@ namespace WixToolset.Mba.Core
     }
 
     /// <summary>
-    /// Additional arguments used when a target MSI package has been detected.
+    /// Event arguments for <see cref="IDefaultBootstrapperApplication.DetectPatchTarget"/>
     /// </summary>
-    public class DetectTargetMsiPackageEventArgs : CancellableHResultEventArgs
+    public class DetectPatchTargetEventArgs : CancellableHResultEventArgs
     {
         /// <summary>
-        /// Creates a new instance of the <see cref="DetectMsiFeatureEventArgs"/> class.
+        /// 
         /// </summary>
-        /// <param name="packageId">Detected package identifier.</param>
-        /// <param name="productCode">Detected product code.</param>
-        /// <param name="state">Package state detected.</param>
-        /// <param name="cancelRecommendation">The recommendation from the engine.</param>
-        public DetectTargetMsiPackageEventArgs(string packageId, string productCode, PackageState state, bool cancelRecommendation)
+        /// <param name="packageId"></param>
+        /// <param name="productCode"></param>
+        /// <param name="state"></param>
+        /// <param name="cancelRecommendation"></param>
+        public DetectPatchTargetEventArgs(string packageId, string productCode, PackageState state, bool cancelRecommendation)
             : base(cancelRecommendation)
         {
             this.PackageId = packageId;
@@ -567,17 +567,17 @@ namespace WixToolset.Mba.Core
         }
 
         /// <summary>
-        /// Gets the identity of the target's package detected.
+        /// Gets the identity of the patch's package.
         /// </summary>
         public string PackageId { get; private set; }
 
         /// <summary>
-        /// Gets the product code of the target MSI detected.
+        /// Gets the product code of the target.
         /// </summary>
         public string ProductCode { get; private set; }
 
         /// <summary>
-        /// Gets the detected patch package state.
+        /// Gets the detected patch state for the target.
         /// </summary>
         public PackageState State { get; private set; }
     }
@@ -732,22 +732,26 @@ namespace WixToolset.Mba.Core
     }
 
     /// <summary>
-    /// Additional arguments used when the engine has begun planning the installation of a specific package.
+    /// Event arguments for <see cref="IDefaultBootstrapperApplication.PlanPackageBegin"/>
     /// </summary>
     [Serializable]
     public class PlanPackageBeginEventArgs : CancellableHResultEventArgs
     {
         /// <summary>
-        /// Creates a new instance of the <see cref="PlanPackageBeginEventArgs"/> class.
+        /// 
         /// </summary>
-        /// <param name="packageId">The identity of the package to plan for.</param>
-        /// <param name="recommendedState">The recommended requested state for the package.</param>
-        /// <param name="state">The requested state for the package.</param>
-        /// <param name="cancelRecommendation">The recommendation from the engine.</param>
-        public PlanPackageBeginEventArgs(string packageId, RequestState recommendedState, RequestState state, bool cancelRecommendation)
+        /// <param name="packageId"></param>
+        /// <param name="currentState"></param>
+        /// <param name="installCondition"></param>
+        /// <param name="recommendedState"></param>
+        /// <param name="state"></param>
+        /// <param name="cancelRecommendation"></param>
+        public PlanPackageBeginEventArgs(string packageId, PackageState currentState, bool installCondition, RequestState recommendedState, RequestState state, bool cancelRecommendation)
             : base(cancelRecommendation)
         {
             this.PackageId = packageId;
+            this.CurrentState = currentState;
+            this.InstallCondition = installCondition;
             this.RecommendedState = recommendedState;
             this.State = state;
         }
@@ -758,6 +762,16 @@ namespace WixToolset.Mba.Core
         public string PackageId { get; private set; }
 
         /// <summary>
+        /// Gets the current state of the package.
+        /// </summary>
+        public PackageState CurrentState { get; private set; }
+
+        /// <summary>
+        /// Gets the evaluated result of the package's install condition.
+        /// </summary>
+        public bool InstallCondition { get; private set; }
+
+        /// <summary>
         /// Gets the recommended requested state for the package.
         /// </summary>
         public RequestState RecommendedState { get; private set; }
@@ -769,20 +783,20 @@ namespace WixToolset.Mba.Core
     }
 
     /// <summary>
-    /// Additional arguments used when engine is about to plan a MSP applied to a target MSI package.
+    /// Event arguments for <see cref="IDefaultBootstrapperApplication.PlanPatchTarget"/>
     /// </summary>
     [Serializable]
-    public class PlanTargetMsiPackageEventArgs : CancellableHResultEventArgs
+    public class PlanPatchTargetEventArgs : CancellableHResultEventArgs
     {
         /// <summary>
-        /// Creates a new instance of the <see cref="PlanMsiFeatureEventArgs"/> class.
+        /// 
         /// </summary>
-        /// <param name="packageId">Package identifier of the patch being planned.</param>
-        /// <param name="productCode">Product code identifier being planned.</param>
-        /// <param name="recommendedState">Recommended package state of the patch being planned.</param>
-        /// <param name="state">Package state of the patch being planned.</param>
-        /// <param name="cancelRecommendation">The recommendation from the engine.</param>
-        public PlanTargetMsiPackageEventArgs(string packageId, string productCode, RequestState recommendedState, RequestState state, bool cancelRecommendation)
+        /// <param name="packageId"></param>
+        /// <param name="productCode"></param>
+        /// <param name="recommendedState"></param>
+        /// <param name="state"></param>
+        /// <param name="cancelRecommendation"></param>
+        public PlanPatchTargetEventArgs(string packageId, string productCode, RequestState recommendedState, RequestState state, bool cancelRecommendation)
             : base(cancelRecommendation)
         {
             this.PackageId = packageId;
@@ -792,22 +806,22 @@ namespace WixToolset.Mba.Core
         }
 
         /// <summary>
-        /// Gets the identity of the patch package to plan.
+        /// Gets the identity of the patch's package.
         /// </summary>
         public string PackageId { get; private set; }
 
         /// <summary>
-        /// Gets the identity of the patch's target MSI to plan.
+        /// Gets the product code of the target.
         /// </summary>
         public string ProductCode { get; private set; }
 
         /// <summary>
-        /// Gets the recommended state of the patch to use by planning.
+        /// Gets the recommended state of the patch to use by planning for the target.
         /// </summary>
         public RequestState RecommendedState { get; private set; }
 
         /// <summary>
-        /// Gets or sets the state of the patch to use by planning.
+        /// Gets or sets the state of the patch to use by planning for the target.
         /// </summary>
         public RequestState State { get; set; }
     }
@@ -915,28 +929,22 @@ namespace WixToolset.Mba.Core
     }
 
     /// <summary>
-    /// Additional arguments used when then engine has completed planning the installation of a specific package.
+    /// Event arguments for <see cref="IDefaultBootstrapperApplication.PlanPackageComplete"/>
     /// </summary>
     [Serializable]
     public class PlanPackageCompleteEventArgs : StatusEventArgs
     {
         /// <summary>
-        /// Creates a new instance of the <see cref="PlanPackageCompleteEventArgs"/> class.
+        /// 
         /// </summary>
-        /// <param name="packageId">The identity of the package planned for.</param>
-        /// <param name="hrStatus">The return code of the operation.</param>
-        /// <param name="state">The current state of the package.</param>
-        /// <param name="requested">The requested state for the package</param>
-        /// <param name="execute">The execution action to take.</param>
-        /// <param name="rollback">The rollback action to take.</param>
-        public PlanPackageCompleteEventArgs(string packageId, int hrStatus, PackageState state, RequestState requested, ActionState execute, ActionState rollback)
+        /// <param name="packageId"></param>
+        /// <param name="hrStatus"></param>
+        /// <param name="requested"></param>
+        public PlanPackageCompleteEventArgs(string packageId, int hrStatus, RequestState requested)
             : base(hrStatus)
         {
             this.PackageId = packageId;
-            this.State = state;
             this.Requested = requested;
-            this.Execute = execute;
-            this.Rollback = rollback;
         }
 
         /// <summary>
@@ -945,22 +953,42 @@ namespace WixToolset.Mba.Core
         public string PackageId { get; private set; }
 
         /// <summary>
-        /// Gets the current state of the package.
+        /// Gets the requested state for the package.
         /// </summary>
-        public PackageState State { get; private set; }
+        public RequestState Requested { get; private set; }
+    }
 
+    /// <summary>
+    /// Event arguments for <see cref="IDefaultBootstrapperApplication.PlannedPackage"/>
+    /// </summary>
+    [Serializable]
+    public class PlannedPackageEventArgs : HResultEventArgs
+    {
         /// <summary>
-        /// Gets the requested state for the package.
+        /// 
         /// </summary>
-        public RequestState Requested { get; private set; }
+        /// <param name="packageId"></param>
+        /// <param name="execute"></param>
+        /// <param name="rollback"></param>
+        public PlannedPackageEventArgs(string packageId, ActionState execute, ActionState rollback)
+        {
+            this.PackageId = packageId;
+            this.Execute = execute;
+            this.Rollback = rollback;
+        }
+
+        /// <summary>
+        /// Gets the identity of the package planned for.
+        /// </summary>
+        public string PackageId { get; private set; }
 
         /// <summary>
-        /// Gets the execution action to take.
+        /// Gets the planned execution action.
         /// </summary>
         public ActionState Execute { get; private set; }
 
         /// <summary>
-        /// Gets the rollback action to take.
+        /// Gets the planned rollback action.
         /// </summary>
         public ActionState Rollback { get; private set; }
     }
diff --git a/src/WixToolset.Mba.Core/IBootstrapperApplication.cs b/src/WixToolset.Mba.Core/IBootstrapperApplication.cs
index c1a32ed4..7ff243d2 100644
--- a/src/WixToolset.Mba.Core/IBootstrapperApplication.cs
+++ b/src/WixToolset.Mba.Core/IBootstrapperApplication.cs
@@ -194,7 +194,7 @@ namespace WixToolset.Mba.Core
             );
 
         /// <summary>
-        /// See <see cref="IDefaultBootstrapperApplication.DetectTargetMsiPackage"/>.
+        /// See <see cref="IDefaultBootstrapperApplication.DetectPatchTarget"/>.
         /// </summary>
         /// <param name="wzPackageId"></param>
         /// <param name="wzProductCode"></param>
@@ -203,7 +203,7 @@ namespace WixToolset.Mba.Core
         /// <returns></returns>
         [PreserveSig]
         [return: MarshalAs(UnmanagedType.I4)]
-        int OnDetectTargetMsiPackage(
+        int OnDetectPatchTarget(
             [MarshalAs(UnmanagedType.LPWStr)] string wzPackageId,
             [MarshalAs(UnmanagedType.LPWStr)] string wzProductCode,
             [MarshalAs(UnmanagedType.U4)] PackageState patchState,
@@ -289,6 +289,8 @@ namespace WixToolset.Mba.Core
         /// See <see cref="IDefaultBootstrapperApplication.PlanPackageBegin"/>.
         /// </summary>
         /// <param name="wzPackageId"></param>
+        /// <param name="state"></param>
+        /// <param name="fInstallCondition"></param>
         /// <param name="recommendedState"></param>
         /// <param name="pRequestedState"></param>
         /// <param name="fCancel"></param>
@@ -297,13 +299,15 @@ namespace WixToolset.Mba.Core
         [return: MarshalAs(UnmanagedType.I4)]
         int OnPlanPackageBegin(
             [MarshalAs(UnmanagedType.LPWStr)] string wzPackageId,
+            [MarshalAs(UnmanagedType.U4)] PackageState state,
+            [MarshalAs(UnmanagedType.Bool)] bool fInstallCondition,
             [MarshalAs(UnmanagedType.U4)] RequestState recommendedState,
             [MarshalAs(UnmanagedType.U4)] ref RequestState pRequestedState,
             [MarshalAs(UnmanagedType.Bool)] ref bool fCancel
             );
 
         /// <summary>
-        /// See <see cref="IDefaultBootstrapperApplication.PlanTargetMsiPackage"/>.
+        /// See <see cref="IDefaultBootstrapperApplication.PlanPatchTarget"/>.
         /// </summary>
         /// <param name="wzPackageId"></param>
         /// <param name="wzProductCode"></param>
@@ -313,7 +317,7 @@ namespace WixToolset.Mba.Core
         /// <returns></returns>
         [PreserveSig]
         [return: MarshalAs(UnmanagedType.I4)]
-        int OnPlanTargetMsiPackage(
+        int OnPlanPatchTarget(
             [MarshalAs(UnmanagedType.LPWStr)] string wzPackageId,
             [MarshalAs(UnmanagedType.LPWStr)] string wzProductCode,
             [MarshalAs(UnmanagedType.U4)] RequestState recommendedState,
@@ -368,18 +372,27 @@ namespace WixToolset.Mba.Core
         /// </summary>
         /// <param name="wzPackageId"></param>
         /// <param name="hrStatus"></param>
-        /// <param name="state"></param>
         /// <param name="requested"></param>
-        /// <param name="execute"></param>
-        /// <param name="rollback"></param>
         /// <returns></returns>
         [PreserveSig]
         [return: MarshalAs(UnmanagedType.I4)]
         int OnPlanPackageComplete(
             [MarshalAs(UnmanagedType.LPWStr)] string wzPackageId,
             int hrStatus,
-            [MarshalAs(UnmanagedType.U4)] PackageState state,
-            [MarshalAs(UnmanagedType.U4)] RequestState requested,
+            [MarshalAs(UnmanagedType.U4)] RequestState requested
+            );
+
+        /// <summary>
+        /// See <see cref="IDefaultBootstrapperApplication.PlannedPackage"/>.
+        /// </summary>
+        /// <param name="wzPackageId"></param>
+        /// <param name="execute"></param>
+        /// <param name="rollback"></param>
+        /// <returns></returns>
+        [PreserveSig]
+        [return: MarshalAs(UnmanagedType.I4)]
+        int OnPlannedPackage(
+            [MarshalAs(UnmanagedType.LPWStr)] string wzPackageId,
             [MarshalAs(UnmanagedType.U4)] ActionState execute,
             [MarshalAs(UnmanagedType.U4)] ActionState rollback
             );
diff --git a/src/WixToolset.Mba.Core/IDefaultBootstrapperApplication.cs b/src/WixToolset.Mba.Core/IDefaultBootstrapperApplication.cs
index 9970dc3e..d0518049 100644
--- a/src/WixToolset.Mba.Core/IDefaultBootstrapperApplication.cs
+++ b/src/WixToolset.Mba.Core/IDefaultBootstrapperApplication.cs
@@ -115,6 +115,11 @@ namespace WixToolset.Mba.Core
         event EventHandler<DetectPackageCompleteEventArgs> DetectPackageComplete;
 
         /// <summary>
+        /// Fired when the engine detects a target product for an MSP package.
+        /// </summary>
+        event EventHandler<DetectPatchTargetEventArgs> DetectPatchTarget;
+
+        /// <summary>
         /// Fired when a related bundle has been detected for a bundle.
         /// </summary>
         event EventHandler<DetectRelatedBundleEventArgs> DetectRelatedBundle;
@@ -125,11 +130,6 @@ namespace WixToolset.Mba.Core
         event EventHandler<DetectRelatedMsiPackageEventArgs> DetectRelatedMsiPackage;
 
         /// <summary>
-        /// Fired when an MSP package detects a target MSI has been detected.
-        /// </summary>
-        event EventHandler<DetectTargetMsiPackageEventArgs> DetectTargetMsiPackage;
-
-        /// <summary>
         /// Fired when the update detection has found a potential update candidate.
         /// </summary>
         event EventHandler<DetectUpdateEventArgs> DetectUpdate;
@@ -230,6 +230,11 @@ namespace WixToolset.Mba.Core
         event EventHandler<PlanCompleteEventArgs> PlanComplete;
 
         /// <summary>
+        /// Fired when the engine has completed planning a package.
+        /// </summary>
+        event EventHandler<PlannedPackageEventArgs> PlannedPackage;
+
+        /// <summary>
         /// Fired when the engine is about to plan a feature in an MSI package.
         /// </summary>
         event EventHandler<PlanMsiFeatureEventArgs> PlanMsiFeature;
@@ -240,24 +245,24 @@ namespace WixToolset.Mba.Core
         event EventHandler<PlanMsiPackageEventArgs> PlanMsiPackage;
 
         /// <summary>
-        /// Fired when the engine has begun planning the installation of a specific package.
+        /// Fired when the engine has begun getting the BA's input for planning a package.
         /// </summary>
         event EventHandler<PlanPackageBeginEventArgs> PlanPackageBegin;
 
         /// <summary>
-        /// Fired when the engine has completed planning the installation of a specific package.
+        /// Fired when the engine has completed getting the BA's input for planning a package.
         /// </summary>
         event EventHandler<PlanPackageCompleteEventArgs> PlanPackageComplete;
 
         /// <summary>
-        /// Fired when the engine has begun planning for a related bundle.
+        /// Fired when the engine is about to plan a target of an MSP package.
         /// </summary>
-        event EventHandler<PlanRelatedBundleEventArgs> PlanRelatedBundle;
+        event EventHandler<PlanPatchTargetEventArgs> PlanPatchTarget;
 
         /// <summary>
-        /// Fired when the engine is about to plan the target MSI of a MSP package.
+        /// Fired when the engine has begun planning for a related bundle.
         /// </summary>
-        event EventHandler<PlanTargetMsiPackageEventArgs> PlanTargetMsiPackage;
+        event EventHandler<PlanRelatedBundleEventArgs> PlanRelatedBundle;
 
         /// <summary>
         /// Fired when the engine has changed progress for the bundle installation.