Index: Core/Common/src/Core.Common.Base/Service/Activity.cs
===================================================================
diff -u -r5e6503b31c813b6f1c4d4dfbab28092bcf4809a6 -rf0848e8a2e86a7c762a119f7d21c0e8c0223f85e
--- Core/Common/src/Core.Common.Base/Service/Activity.cs	(.../Activity.cs)	(revision 5e6503b31c813b6f1c4d4dfbab28092bcf4809a6)
+++ Core/Common/src/Core.Common.Base/Service/Activity.cs	(.../Activity.cs)	(revision f0848e8a2e86a7c762a119f7d21c0e8c0223f85e)
@@ -7,7 +7,7 @@
 {
     /// <summary>
     /// Abstract class that can be used for performing activies (like calculations, data imports, data exports, etc.).
-    /// The regular workflow for completely performing an <see cref="Activity"/> is: <see cref="Execute"/> -> <see cref="Finish"/>.
+    /// 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>
     public abstract class Activity
@@ -65,8 +65,6 @@
         {
             try
             {
-                Status = ActivityStatus.Executing;
-
                 OnExecute();
 
                 if (Status == ActivityStatus.Failed ||
@@ -98,7 +96,7 @@
         /// </summary>
         public void Cancel()
         {
-            ChangeState(OnCancel, ActivityStatus.Cancelling, ActivityStatus.Cancelled);
+            ChangeState(OnCancel, ActivityStatus.Cancelled);
         }
 
         /// <summary>
@@ -109,7 +107,7 @@
         {
             if (Status != ActivityStatus.Failed && Status != ActivityStatus.Cancelled)
             {
-                ChangeState(OnFinish, ActivityStatus.Finishing, ActivityStatus.Finished);
+                ChangeState(OnFinish, ActivityStatus.Finished);
             }
         }
 
@@ -144,11 +142,10 @@
             }
         }
 
-        private void ChangeState(Action transitionAction, ActivityStatus statusBefore, ActivityStatus statusAfter)
+        private void ChangeState(Action transitionAction, ActivityStatus statusAfter)
         {
             try
             {
-                Status = statusBefore;
                 transitionAction();
 
                 if (Status == ActivityStatus.Failed)
Index: Core/Common/src/Core.Common.Base/Service/ActivityStatus.cs
===================================================================
diff -u -r5e6503b31c813b6f1c4d4dfbab28092bcf4809a6 -rf0848e8a2e86a7c762a119f7d21c0e8c0223f85e
--- Core/Common/src/Core.Common.Base/Service/ActivityStatus.cs	(.../ActivityStatus.cs)	(revision 5e6503b31c813b6f1c4d4dfbab28092bcf4809a6)
+++ Core/Common/src/Core.Common.Base/Service/ActivityStatus.cs	(.../ActivityStatus.cs)	(revision f0848e8a2e86a7c762a119f7d21c0e8c0223f85e)
@@ -1,48 +1,37 @@
 namespace Core.Common.Base.Service
 {
     /// <summary>
-    /// Defines possible states of the activity.
+    /// Enumeration that defines the possible states of an <see cref="Activity"/>.
     /// </summary>
     public enum ActivityStatus
     {
         /// <summary>
-        /// Activity has been just created and not used yet.
+        /// The state of an <see cref="Activity"/> that has been just created and is not used yet.
         /// </summary>
         None,
 
         /// <summary>
-        /// Activity is currently executing.
+        /// The state of an <see cref="Activity"/> that is successfully ran.
+        /// <seealso cref="Activity.Run"/>
         /// </summary>
-        Executing,
-
-        /// <summary>
-        /// Activity has executed.
-        /// </summary>
         Executed,
 
         /// <summary>
-        /// Activity is finishing.
+        /// The state of an <see cref="Activity"/> that is not successfully ran.
+        /// <seealso cref="Activity.Run"/>
         /// </summary>
-        Finishing,
-
-        /// <summary>
-        /// Activity has finished successfully.
-        /// </summary>
-        Finished,
-
-        /// <summary>
-        /// Activity has run but failed to complete.
-        /// </summary>
         Failed,
 
         /// <summary>
-        /// Activite execution is being cancelled.
+        /// The state of an <see cref="Activity"/> that has been cancelled.
+        /// <seealso cref="Activity.Cancel"/>
         /// </summary>
-        Cancelling,
+        Cancelled,
 
         /// <summary>
-        /// Activity execution has been cancelled.
+        /// The state of an <see cref="Activity"/> that is successfully finished.
+        /// <seealso cref="Activity.Finish"/>
         /// </summary>
-        Cancelled
+        Finished
     }
 }
\ No newline at end of file