Index: Core/Common/src/Core.Common.Base/Core.Common.Base.csproj
===================================================================
diff -u -r95837098c8fbc25212797c64431f6f16496814b3 -r358f5af627a563dd5b6903b94ba6abb16df8084e
--- Core/Common/src/Core.Common.Base/Core.Common.Base.csproj	(.../Core.Common.Base.csproj)	(revision 95837098c8fbc25212797c64431f6f16496814b3)
+++ Core/Common/src/Core.Common.Base/Core.Common.Base.csproj	(.../Core.Common.Base.csproj)	(revision 358f5af627a563dd5b6903b94ba6abb16df8084e)
@@ -100,7 +100,7 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <Compile Include="Service\Activity.cs" />
-    <Compile Include="Service\ActivityStatus.cs" />
+    <Compile Include="Service\ActivityState.cs" />
     <Compile Include="Service\FileImportActivity.cs" />
     <None Include="packages.config" />
   </ItemGroup>
Index: Core/Common/src/Core.Common.Base/Service/Activity.cs
===================================================================
diff -u -rbb3a4dbfa4e43123f5b101034e90b89e8712bd41 -r358f5af627a563dd5b6903b94ba6abb16df8084e
--- Core/Common/src/Core.Common.Base/Service/Activity.cs	(.../Activity.cs)	(revision bb3a4dbfa4e43123f5b101034e90b89e8712bd41)
+++ Core/Common/src/Core.Common.Base/Service/Activity.cs	(.../Activity.cs)	(revision 358f5af627a563dd5b6903b94ba6abb16df8084e)
@@ -6,15 +6,22 @@
 namespace Core.Common.Base.Service
 {
     /// <summary>
-    /// Abstract class that can be used for performing activies (like calculations, data imports, data exports, etc.).
+    /// Abstract class that can be derived for performing activities (like calculations, data imports, data exports, etc.).
     /// The regular workflow for completely performing an <see cref="Activity"/> is: <see cref="Run"/> -> <see cref="Finish"/>.
     /// <see cref="Cancel"/> can be called for cancelling a running <see cref="Activity"/>.
     /// </summary>
+    /// <remarks>
+    /// By convention, only <see cref="Finish"/> should contain UI thread related logic.
+    /// </remarks>
     public abstract class Activity
     {
+        /// <summary>
+        /// Event handler for notifying progress changes.
+        /// </summary>
         public event EventHandler ProgressChanged;
 
         private readonly ILog log = LogManager.GetLogger(typeof(Activity));
+
         private string progressText;
 
         /// <summary>
@@ -31,9 +38,9 @@
         public virtual string Name { get; set; }
 
         /// <summary>
-        /// Gets or sets the <see cref="ActivityStatus"/> of the <see cref="Activity"/>.
+        /// Gets or sets the <see cref="ActivityState"/> of the <see cref="Activity"/>.
         /// </summary>
-        public ActivityStatus Status { get; protected set; }
+        public ActivityState State { get; protected set; }
 
         /// <summary>
         /// Gets or sets the progress text of the <see cref="Activity"/>.
@@ -54,66 +61,79 @@
         }
 
         /// <summary>
-        /// Gets or sets the collection of log messages of the <see cref="Activity"/> (which is appended while performing the <see cref="Activity"/>).
+        /// Gets or sets the collection of log messages of the <see cref="Activity"/> (which can be appended while performing the <see cref="Activity"/>).
         /// </summary>
+        /// <remarks>
+        /// Derived classes themselves are responsible for clearing the collection of log messages.
+        /// </remarks>
         public IList<string> LogMessages { get; private set; }
 
         /// <summary>
-        /// This method runs the <see cref="Activity"/>.
+        /// This method resets <see cref="State"/> to <see cref="ActivityState.None"/> and then runs the <see cref="Activity"/>.
+        /// The <see cref="State"/> of a successfully run <see cref="Activity"/> will become <see cref="ActivityState.Executed"/>.
+        /// When the <see cref="Activity"/> run fails, the <see cref="State"/> will become <see cref="ActivityState.Failed"/>.
         /// </summary>
         public void Run()
         {
-            ChangeState(OnExecute, ActivityStatus.Executed);
+            State = ActivityState.None;
 
-            if (Status == ActivityStatus.Failed)
+            ChangeState(OnRun, ActivityState.Executed);
+
+            if (State == ActivityState.Failed)
             {
                 log.ErrorFormat(Resources.Activity_Run_Execution_of_0_has_failed, Name);
             }
         }
 
         /// <summary>
         /// This method cancels a running <see cref="Activity"/>.
+        /// The <see cref="State"/> of a successfully cancelled <see cref="Activity"/> will become <see cref="ActivityState.Cancelled"/>.
+        /// When the <see cref="Activity"/> cancel action fails, the <see cref="State"/> will become <see cref="ActivityState.Failed"/>.
         /// </summary>
         public void Cancel()
         {
-            ChangeState(OnCancel, ActivityStatus.Cancelled);
+            ChangeState(OnCancel, ActivityState.Cancelled);
 
             log.WarnFormat(Resources.Activity_Run_Execution_of_0_has_been_canceled, Name);
         }
 
         /// <summary>
         /// This method finishes an <see cref="Activity"/> that successfully ran.
-        /// Successfully ran activities can be identified by a <see cref="Status"/> not equal to <see cref="ActivityStatus.Failed"/> or <see cref="ActivityStatus.Cancelled"/>.
+        /// Successfully ran activities can be identified by a <see cref="State"/> equal to <see cref="ActivityState.Executed"/>.
+        /// The <see cref="State"/> of a successfully finished <see cref="Activity"/> will become <see cref="ActivityState.Finished"/>.
+        /// When the <see cref="Activity"/> finish action fails, the <see cref="State"/> will become <see cref="ActivityState.Failed"/>.
         /// </summary>
         public void Finish()
         {
-            if (Status != ActivityStatus.Failed && Status != ActivityStatus.Cancelled)
+            if (State == ActivityState.Executed)
             {
-                ChangeState(OnFinish, ActivityStatus.Finished);
+                ChangeState(OnFinish, ActivityState.Finished);
             }
         }
 
         /// <summary>
-        /// Executes one step. This method will be called multiple times to allow for multiple
-        /// execution steps. After calling this method, <see cref="Status"/> will be set to 
-        /// <see cref="ActivityStatus.Executed"/> if no error has occurred.
+        /// This template method provides the actual run logic (it is called within <see cref="Run"/>).
         /// </summary>
         /// <remarks>
-        /// <para>Set <see cref="Status"/> to <see cref="ActivityStatus.Failed"/>
-        /// when an error has occurred while executing.</para>
+        /// <para>The <see cref="State"/> should be set to <see cref="ActivityState.Failed"/> when one or more errors occur.</para>
+        /// <para>By convention, the implementation of this method should not contain UI thread related logic.</para>
         /// </remarks>
-        protected abstract void OnExecute();
+        protected abstract void OnRun();
 
         /// <summary>
-        /// Cancels current run. <see cref="Status"/> will change to <see cref="ActivityStatus.Cancelled"/>
-        /// after this method has been called.
+        /// This template method provides the actual cancel logic (it is called within <see cref="Cancel"/>).
         /// </summary>
+        /// <remarks>
+        /// By convention, the implementation of this method should not contain UI thread related logic.
+        /// </remarks>
         protected abstract void OnCancel();
 
         /// <summary>
-        /// Activity has finished successfully. After calling this method, <see cref="Status"/> 
-        /// will be set to <see cref="ActivityStatus.Finished"/> if no error has occurred.
+        /// This template method provides the actual finish logic (it is called within <see cref="Finish"/>).
         /// </summary>
+        /// <remarks>
+        /// By convention, only the implementation of this method might contain UI thread related logic.
+        /// </remarks>
         protected abstract void OnFinish();
 
         private void OnProgressChanged()
@@ -124,26 +144,26 @@
             }
         }
 
-        private void ChangeState(Action transitionAction, ActivityStatus statusAfter)
+        private void ChangeState(Action transitionAction, ActivityState stateAfter)
         {
             try
             {
                 transitionAction();
 
-                if (Status == ActivityStatus.Failed || Status == ActivityStatus.Cancelled)
+                if (State == ActivityState.Failed || State == ActivityState.Cancelled)
                 {
                     return;
                 }
             }
             catch (Exception e)
             {
-                Status = ActivityStatus.Failed;
+                State = ActivityState.Failed;
                 log.Error(e.Message);
 
                 return;
             }
 
-            Status = statusAfter;
+            State = stateAfter;
         }
     }
 }
\ No newline at end of file
Index: Core/Common/src/Core.Common.Base/Service/ActivityState.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Base/Service/ActivityState.cs	(revision 0)
+++ Core/Common/src/Core.Common.Base/Service/ActivityState.cs	(revision 358f5af627a563dd5b6903b94ba6abb16df8084e)
@@ -0,0 +1,38 @@
+namespace Core.Common.Base.Service
+{
+    /// <summary>
+    /// Enumeration that defines the possible states of an <see cref="Activity"/>.
+    /// </summary>
+    public enum ActivityState
+    {
+        /// <summary>
+        /// The state of an <see cref="Activity"/> that is about to be run.
+        /// <seealso cref="Activity.Run"/>
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// The state of an <see cref="Activity"/> that is successfully ran.
+        /// <seealso cref="Activity.Run"/>
+        /// </summary>
+        Executed,
+
+        /// <summary>
+        /// The state of an <see cref="Activity"/> that is not successfully ran.
+        /// <seealso cref="Activity.Run"/>
+        /// </summary>
+        Failed,
+
+        /// <summary>
+        /// The state of an <see cref="Activity"/> that is successfully cancelled.
+        /// <seealso cref="Activity.Cancel"/>
+        /// </summary>
+        Cancelled,
+
+        /// <summary>
+        /// The state of an <see cref="Activity"/> that is successfully finished.
+        /// <seealso cref="Activity.Finish"/>
+        /// </summary>
+        Finished
+    }
+}
\ No newline at end of file
Fisheye: Tag 358f5af627a563dd5b6903b94ba6abb16df8084e refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Base/Service/ActivityStatus.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Base/Service/FileImportActivity.cs
===================================================================
diff -u -r5e6503b31c813b6f1c4d4dfbab28092bcf4809a6 -r358f5af627a563dd5b6903b94ba6abb16df8084e
--- Core/Common/src/Core.Common.Base/Service/FileImportActivity.cs	(.../FileImportActivity.cs)	(revision 5e6503b31c813b6f1c4d4dfbab28092bcf4809a6)
+++ Core/Common/src/Core.Common.Base/Service/FileImportActivity.cs	(.../FileImportActivity.cs)	(revision 358f5af627a563dd5b6903b94ba6abb16df8084e)
@@ -44,7 +44,7 @@
             }
         }
 
-        protected override void OnExecute()
+        protected override void OnRun()
         {
             foreach (var fileName in files)
             {
Index: Core/Common/test/Core.Common.Base.Test/Service/ActivityTest.cs
===================================================================
diff -u -r5e6503b31c813b6f1c4d4dfbab28092bcf4809a6 -r358f5af627a563dd5b6903b94ba6abb16df8084e
--- Core/Common/test/Core.Common.Base.Test/Service/ActivityTest.cs	(.../ActivityTest.cs)	(revision 5e6503b31c813b6f1c4d4dfbab28092bcf4809a6)
+++ Core/Common/test/Core.Common.Base.Test/Service/ActivityTest.cs	(.../ActivityTest.cs)	(revision 358f5af627a563dd5b6903b94ba6abb16df8084e)
@@ -14,7 +14,7 @@
 
             // assert
             Assert.IsNull(activity.Name);
-            Assert.AreEqual(ActivityStatus.None, activity.Status);
+            Assert.AreEqual(ActivityState.None, activity.State);
             Assert.IsNull(activity.ProgressText);
         }
 
@@ -35,7 +35,7 @@
 
         private class SimpleActivity : Activity
         {
-            protected override void OnExecute()
+            protected override void OnRun()
             {
             }
 
Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationActivity.cs
===================================================================
diff -u -r5e6503b31c813b6f1c4d4dfbab28092bcf4809a6 -r358f5af627a563dd5b6903b94ba6abb16df8084e
--- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationActivity.cs	(.../PipingCalculationActivity.cs)	(revision 5e6503b31c813b6f1c4d4dfbab28092bcf4809a6)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationActivity.cs	(.../PipingCalculationActivity.cs)	(revision 358f5af627a563dd5b6903b94ba6abb16df8084e)
@@ -27,11 +27,11 @@
             }
         }
 
-        protected override void OnExecute()
+        protected override void OnRun()
         {
             if (!PipingCalculationService.Validate(calculation))
             {
-                Status = ActivityStatus.Failed;
+                State = ActivityState.Failed;
                 return;
             }
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs
===================================================================
diff -u -rbb3a4dbfa4e43123f5b101034e90b89e8712bd41 -r358f5af627a563dd5b6903b94ba6abb16df8084e
--- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs	(.../PipingCalculationActivityTest.cs)	(revision bb3a4dbfa4e43123f5b101034e90b89e8712bd41)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs	(.../PipingCalculationActivityTest.cs)	(revision 358f5af627a563dd5b6903b94ba6abb16df8084e)
@@ -29,7 +29,7 @@
             Assert.IsInstanceOf<Activity>(activity);
             Assert.AreEqual(calculation.Name, activity.Name);
             Assert.IsNull(activity.ProgressText);
-            Assert.AreEqual(ActivityStatus.None, activity.Status);
+            Assert.AreEqual(ActivityState.None, activity.State);
         }
 
         [Test]
@@ -57,7 +57,7 @@
                 StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", invalidPipingCalculation.Name), msgs[3]);
                 StringAssert.StartsWith(String.Format("Uitvoering van '{0}' is mislukt.", invalidPipingCalculation.Name), msgs[4]);
             });
-            Assert.AreEqual(ActivityStatus.Failed, activity.Status);
+            Assert.AreEqual(ActivityState.Failed, activity.State);
             Assert.AreEqual(originalOutput, invalidPipingCalculation.Output);
         }
 
@@ -84,7 +84,7 @@
                 StringAssert.StartsWith(String.Format("Berekening van '{0}' gestart om: ", validPipingCalculation.Name), msgs[2]);
                 StringAssert.StartsWith(String.Format("Berekening van '{0}' beëindigd om: ", validPipingCalculation.Name), msgs[3]);
             });
-            Assert.AreEqual(ActivityStatus.Executed, activity.Status);
+            Assert.AreEqual(ActivityState.Executed, activity.State);
             Assert.IsNotNull(validPipingCalculation.Output);
         }