diff --git a/src/core/Elsa.Abstractions/Builders/IActivityBuilder.cs b/src/core/Elsa.Abstractions/Builders/IActivityBuilder.cs
index 0d32ead08..bf73dbce0 100644
--- a/src/core/Elsa.Abstractions/Builders/IActivityBuilder.cs
+++ b/src/core/Elsa.Abstractions/Builders/IActivityBuilder.cs
@@ -16,16 +16,16 @@ namespace Elsa.Builders
         public string? Description { get; set; }
         IDictionary<string, IActivityPropertyValueProvider>? PropertyValueProviders { get; }
         bool PersistWorkflow { get; set; }
-        bool LoadWorkflowContext { get; set; }
-        bool SaveWorkflowContext { get; set; }
+        bool LoadWorkflowContextEnabled { get; set; }
+        bool SaveWorkflowContextEnabled { get; set; }
         IActivityBuilder Add<T>(Action<ISetupActivity<T>>? setup = default) where T : class, IActivity;
         IOutcomeBuilder When(string outcome);
         IActivityBuilder Then(IActivityBuilder targetActivity);
         IConnectionBuilder Then(string activityName);
         IActivityBuilder WithId(string? id);
         IActivityBuilder WithName(string? name);
-        IActivityBuilder WithLoadWorkflowContext(bool value = true);
-        IActivityBuilder WithSaveWorkflowContext(bool value = true);
+        IActivityBuilder LoadWorkflowContext(bool value = true);
+        IActivityBuilder SaveWorkflowContext(bool value = true);
         Func<ActivityExecutionContext, CancellationToken, ValueTask<IActivity>> BuildActivityAsync();
     }
 }
\ No newline at end of file
diff --git a/src/core/Elsa.Core/Builders/ActivityBuilder.cs b/src/core/Elsa.Core/Builders/ActivityBuilder.cs
index e0e96076c..0d2ba8785 100644
--- a/src/core/Elsa.Core/Builders/ActivityBuilder.cs
+++ b/src/core/Elsa.Core/Builders/ActivityBuilder.cs
@@ -30,8 +30,8 @@ namespace Elsa.Builders
         public string? Name { get; set; }
         public string? Description { get; set; }
         public bool PersistWorkflow { get; set; }
-        public bool LoadWorkflowContext { get; set; }
-        public bool SaveWorkflowContext { get; set; }
+        public bool LoadWorkflowContextEnabled { get; set; }
+        public bool SaveWorkflowContextEnabled { get; set; }
         public IDictionary<string, IActivityPropertyValueProvider>? PropertyValueProviders { get; protected set; }
 
         public IActivityBuilder Add<T>(
@@ -74,15 +74,15 @@ namespace Elsa.Builders
             return this;
         }
         
-        public IActivityBuilder WithLoadWorkflowContext(bool value)
+        public IActivityBuilder LoadWorkflowContext(bool value)
         {
-            LoadWorkflowContext = value;
+            LoadWorkflowContextEnabled = value;
             return this;
         }
         
-        public IActivityBuilder WithSaveWorkflowContext(bool value)
+        public IActivityBuilder SaveWorkflowContext(bool value)
         {
-            SaveWorkflowContext = value;
+            SaveWorkflowContextEnabled = value;
             return this;
         }
 
diff --git a/src/core/Elsa.Core/Builders/CompositeActivityBuilder.cs b/src/core/Elsa.Core/Builders/CompositeActivityBuilder.cs
index ed8a7026c..8f1b9a318 100644
--- a/src/core/Elsa.Core/Builders/CompositeActivityBuilder.cs
+++ b/src/core/Elsa.Core/Builders/CompositeActivityBuilder.cs
@@ -193,8 +193,8 @@ namespace Elsa.Builders
         {
             var isComposite = typeof(CompositeActivity).IsAssignableFrom(builder.ActivityType);
             return isComposite
-                ? new CompositeActivityBlueprint(builder.ActivityId, builder.Name, builder.ActivityType.Name, builder.PersistWorkflow, builder.LoadWorkflowContext, builder.SaveWorkflowContext, builder.BuildActivityAsync())
-                : new ActivityBlueprint(builder.ActivityId, builder.Name, builder.ActivityType.Name, builder.PersistWorkflow, builder.LoadWorkflowContext, builder.SaveWorkflowContext, builder.BuildActivityAsync());
+                ? new CompositeActivityBlueprint(builder.ActivityId, builder.Name, builder.ActivityType.Name, builder.PersistWorkflow, builder.LoadWorkflowContextEnabled, builder.SaveWorkflowContextEnabled, builder.BuildActivityAsync())
+                : new ActivityBlueprint(builder.ActivityId, builder.Name, builder.ActivityType.Name, builder.PersistWorkflow, builder.LoadWorkflowContextEnabled, builder.SaveWorkflowContextEnabled, builder.BuildActivityAsync());
         }
     }
 }
\ No newline at end of file