diff --git a/src/core/Elsa.Abstractions/Builders/IWorkflow.cs b/src/core/Elsa.Abstractions/Builders/IWorkflow.cs
index 11037d02b..f7912b150 100644
--- a/src/core/Elsa.Abstractions/Builders/IWorkflow.cs
+++ b/src/core/Elsa.Abstractions/Builders/IWorkflow.cs
@@ -2,6 +2,6 @@ namespace Elsa.Builders
 {
     public interface IWorkflow
     {
-        void Build(IWorkflowBuilder builder);
+        void Build(IWorkflowBuilder workflow);
     }
 }
\ No newline at end of file
diff --git a/src/samples/Elsa.Samples.CustomActivities/EchoQueryStringWorkflow.cs b/src/samples/Elsa.Samples.CustomActivities/EchoQueryStringWorkflow.cs
index 810175c17..89ea1071a 100644
--- a/src/samples/Elsa.Samples.CustomActivities/EchoQueryStringWorkflow.cs
+++ b/src/samples/Elsa.Samples.CustomActivities/EchoQueryStringWorkflow.cs
@@ -9,9 +9,9 @@ namespace Elsa.Samples.CustomActivities
 {
     public class EchoQueryStringWorkflow : IWorkflow
     {
-        public void Build(IWorkflowBuilder builder)
+        public void Build(IWorkflowBuilder workflow)
         {
-            builder
+            workflow
                 .ReceiveHttpRequest("/test")
                 .Then<ReadQueryString>()
                 .WriteHttpResponse(_ => HttpStatusCode.OK, GenerateSomeHtml, _ => "text/html");
diff --git a/src/samples/Elsa.Samples.DistributedLock/RecurringWorkflow.cs b/src/samples/Elsa.Samples.DistributedLock/RecurringWorkflow.cs
index 6f7b08488..0102ccdc2 100644
--- a/src/samples/Elsa.Samples.DistributedLock/RecurringWorkflow.cs
+++ b/src/samples/Elsa.Samples.DistributedLock/RecurringWorkflow.cs
@@ -9,9 +9,9 @@ namespace Elsa.Samples.DistributedLock
 {
     public class RecurringWorkflow : IWorkflow
     {
-        public void Build(IWorkflowBuilder builder)
+        public void Build(IWorkflowBuilder workflow)
         {
-            builder
+            workflow
                 .WithPersistenceBehavior(WorkflowPersistenceBehavior.ActivityExecuted)
                 .TimerEvent(Duration.FromSeconds(1))
                 .WriteLine("Hello World")
diff --git a/src/samples/Elsa.Samples.ForLoopConsole/LoopingWorkflow.cs b/src/samples/Elsa.Samples.ForLoopConsole/LoopingWorkflow.cs
index f1fd02f50..c556c6ffb 100644
--- a/src/samples/Elsa.Samples.ForLoopConsole/LoopingWorkflow.cs
+++ b/src/samples/Elsa.Samples.ForLoopConsole/LoopingWorkflow.cs
@@ -11,9 +11,9 @@ namespace Elsa.Samples.ForLoopConsole
     /// </summary>
     public class LoopingWorkflow : IWorkflow
     {
-        public void Build(IWorkflowBuilder builder)
+        public void Build(IWorkflowBuilder workflow)
         {
-            builder
+            workflow
                 .WriteLine("Enter a number:")
                 .ReadLine()
                 .SetVariable("From", context => int.Parse(((string)context.Input)!))
diff --git a/src/samples/Elsa.Samples.HelloWorldConsole/HelloWorld.cs b/src/samples/Elsa.Samples.HelloWorldConsole/HelloWorld.cs
index 96a147619..ce98a03d6 100644
--- a/src/samples/Elsa.Samples.HelloWorldConsole/HelloWorld.cs
+++ b/src/samples/Elsa.Samples.HelloWorldConsole/HelloWorld.cs
@@ -8,6 +8,6 @@ namespace Elsa.Samples.HelloWorldConsole
     /// </summary>
     public class HelloWorld : IWorkflow
     {
-        public void Build(IWorkflowBuilder builder) => builder.WriteLine("Hello World!");
+        public void Build(IWorkflowBuilder workflow) => workflow.WriteLine("Hello World!");
     }
 }
\ No newline at end of file
diff --git a/src/samples/Elsa.Samples.HelloWorldHttp/HelloHttpWorkflow.cs b/src/samples/Elsa.Samples.HelloWorldHttp/HelloHttpWorkflow.cs
index 3eae43d8a..1edbd2d57 100644
--- a/src/samples/Elsa.Samples.HelloWorldHttp/HelloHttpWorkflow.cs
+++ b/src/samples/Elsa.Samples.HelloWorldHttp/HelloHttpWorkflow.cs
@@ -9,9 +9,9 @@ namespace Elsa.Samples.HelloWorldHttp
     /// </summary>
     public class HelloHttpWorkflow : IWorkflow
     {
-        public void Build(IWorkflowBuilder builder)
+        public void Build(IWorkflowBuilder workflow)
         {
-            builder
+            workflow
                 .ReceiveHttpRequest("/hello")
                 .WriteHttpResponse(HttpStatusCode.OK, "Hello World!", "text/html");
         }
diff --git a/src/samples/Elsa.Samples.Timers/CronTaskWorkflow.cs b/src/samples/Elsa.Samples.Timers/CronTaskWorkflow.cs
index c022176c0..31bb4c690 100644
--- a/src/samples/Elsa.Samples.Timers/CronTaskWorkflow.cs
+++ b/src/samples/Elsa.Samples.Timers/CronTaskWorkflow.cs
@@ -7,9 +7,9 @@ namespace Elsa.Samples.Timers
 {
     public class CronTaskWorkflow : IWorkflow
     {
-        public void Build(IWorkflowBuilder builder)
+        public void Build(IWorkflowBuilder workflow)
         {
-            builder
+            workflow
                 .CronEvent("* * * * *")
                 .WriteLine(() => $"CRON event at {DateTime.Now}");
         }
diff --git a/src/samples/Elsa.Samples.Timers/RecurringTaskWorkflow.cs b/src/samples/Elsa.Samples.Timers/RecurringTaskWorkflow.cs
index ef2e90df5..2407d94cf 100644
--- a/src/samples/Elsa.Samples.Timers/RecurringTaskWorkflow.cs
+++ b/src/samples/Elsa.Samples.Timers/RecurringTaskWorkflow.cs
@@ -9,9 +9,9 @@ namespace Elsa.Samples.Timers
 {
     public class RecurringTaskWorkflow : IWorkflow
     {
-        public void Build(IWorkflowBuilder builder)
+        public void Build(IWorkflowBuilder workflow)
         {
-            builder
+            workflow
                 .WithPersistenceBehavior(WorkflowPersistenceBehavior.ActivityExecuted)
                 .TimerEvent(Duration.FromSeconds(1))
                 .WriteLine("Hello World")
diff --git a/src/samples/Elsa.Samples.TimesheetApproval/Workflows/TimesheetApprovalWorkflow.cs b/src/samples/Elsa.Samples.TimesheetApproval/Workflows/TimesheetApprovalWorkflow.cs
index d2784ab7e..1464863d3 100644
--- a/src/samples/Elsa.Samples.TimesheetApproval/Workflows/TimesheetApprovalWorkflow.cs
+++ b/src/samples/Elsa.Samples.TimesheetApproval/Workflows/TimesheetApprovalWorkflow.cs
@@ -8,9 +8,9 @@ namespace Elsa.Samples.TimesheetApproval.Workflows
 {
     public class TimesheetApprovalWorkflow : IWorkflow
     {
-        public void Build(IWorkflowBuilder builder)
+        public void Build(IWorkflowBuilder workflow)
         {
-            builder
+            workflow
                 .StartWith<TimesheetSubmitted>()
                 .SendEmail(email => email
                     .WithRecipient("manager@acme.com")
diff --git a/test/integration/Elsa.Core.IntegrationTests/Workflows/BasicWorkflow.cs b/test/integration/Elsa.Core.IntegrationTests/Workflows/BasicWorkflow.cs
index ad10171ea..000130272 100644
--- a/test/integration/Elsa.Core.IntegrationTests/Workflows/BasicWorkflow.cs
+++ b/test/integration/Elsa.Core.IntegrationTests/Workflows/BasicWorkflow.cs
@@ -5,9 +5,9 @@ namespace Elsa.Core.IntegrationTests.Workflows
 {
     public class BasicWorkflow : IWorkflow
     {
-        public void Build(IWorkflowBuilder builder)
+        public void Build(IWorkflowBuilder workflow)
         {
-            builder.WriteLine("Hello xUnit!");
+            workflow.WriteLine("Hello xUnit!");
         }
     }
 }
\ No newline at end of file
diff --git a/test/integration/Elsa.Core.IntegrationTests/Workflows/ForLoopWorkflow.cs b/test/integration/Elsa.Core.IntegrationTests/Workflows/ForLoopWorkflow.cs
index a7157843e..1b1a9a1cd 100644
--- a/test/integration/Elsa.Core.IntegrationTests/Workflows/ForLoopWorkflow.cs
+++ b/test/integration/Elsa.Core.IntegrationTests/Workflows/ForLoopWorkflow.cs
@@ -13,9 +13,9 @@ namespace Elsa.Core.IntegrationTests.Workflows
             _loopCount = loopCount;
         }
         
-        public void Build(IWorkflowBuilder builder)
+        public void Build(IWorkflowBuilder workflow)
         {
-            builder.For(
+            workflow.For(
                 0,
                 _loopCount,
                 iterate => iterate