diff --git a/src/dashboards/blazor/ElsaDashboard.Application/Activities/Timers/CronActivity.razor b/src/dashboards/blazor/ElsaDashboard.Application/Activities/Temporal/CronActivity.razor
similarity index 100%
rename from src/dashboards/blazor/ElsaDashboard.Application/Activities/Timers/CronActivity.razor
rename to src/dashboards/blazor/ElsaDashboard.Application/Activities/Temporal/CronActivity.razor
diff --git a/src/dashboards/blazor/ElsaDashboard.Application/Activities/Timers/StartAtActivity.razor b/src/dashboards/blazor/ElsaDashboard.Application/Activities/Temporal/StartAtActivity.razor
similarity index 100%
rename from src/dashboards/blazor/ElsaDashboard.Application/Activities/Timers/StartAtActivity.razor
rename to src/dashboards/blazor/ElsaDashboard.Application/Activities/Temporal/StartAtActivity.razor
diff --git a/src/dashboards/blazor/ElsaDashboard.Application/Activities/Timers/TimerActivity.razor b/src/dashboards/blazor/ElsaDashboard.Application/Activities/Temporal/TimerActivity.razor
similarity index 100%
rename from src/dashboards/blazor/ElsaDashboard.Application/Activities/Timers/TimerActivity.razor
rename to src/dashboards/blazor/ElsaDashboard.Application/Activities/Temporal/TimerActivity.razor
diff --git a/src/dashboards/blazor/ElsaDashboard.Application/Display/TimersDisplayProvider.cs b/src/dashboards/blazor/ElsaDashboard.Application/Display/TimersDisplayProvider.cs
index 2ebceae77..48dc26999 100644
--- a/src/dashboards/blazor/ElsaDashboard.Application/Display/TimersDisplayProvider.cs
+++ b/src/dashboards/blazor/ElsaDashboard.Application/Display/TimersDisplayProvider.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using ElsaDashboard.Application.Activities.Timers;
+using ElsaDashboard.Application.Activities.Temporal;
 using ElsaDashboard.Models;
 using ElsaDashboard.Services;
 
diff --git a/src/samples/worker/Elsa.Samples.Timers.Hangfire/CancelTimerWorkflow.cs b/src/samples/worker/Elsa.Samples.Timers.Hangfire/CancelTimerWorkflow.cs
index 20f67bc72..3466a6660 100644
--- a/src/samples/worker/Elsa.Samples.Timers.Hangfire/CancelTimerWorkflow.cs
+++ b/src/samples/worker/Elsa.Samples.Timers.Hangfire/CancelTimerWorkflow.cs
@@ -6,7 +6,7 @@ using Elsa.Activities.Temporal;
 using Elsa.Builders;
 using NodaTime;
 
-namespace Elsa.Samples.Timers
+namespace Elsa.Samples.Temporal
 {
     public class CancelTimerWorkflow : IWorkflow
     {
diff --git a/src/samples/worker/Elsa.Samples.Timers.Hangfire/CronTaskWorkflow.cs b/src/samples/worker/Elsa.Samples.Timers.Hangfire/CronTaskWorkflow.cs
index 361c34f1d..90fe29a34 100644
--- a/src/samples/worker/Elsa.Samples.Timers.Hangfire/CronTaskWorkflow.cs
+++ b/src/samples/worker/Elsa.Samples.Timers.Hangfire/CronTaskWorkflow.cs
@@ -3,7 +3,7 @@ using Elsa.Activities.Console;
 using Elsa.Activities.Temporal;
 using Elsa.Builders;
 
-namespace Elsa.Samples.Timers
+namespace Elsa.Samples.Temporal
 {
     public class CronTaskWorkflow : IWorkflow
     {
diff --git a/src/samples/worker/Elsa.Samples.Timers.Hangfire/OneOffWorkflow.cs b/src/samples/worker/Elsa.Samples.Timers.Hangfire/OneOffWorkflow.cs
index d6a4eefb1..98357f104 100644
--- a/src/samples/worker/Elsa.Samples.Timers.Hangfire/OneOffWorkflow.cs
+++ b/src/samples/worker/Elsa.Samples.Timers.Hangfire/OneOffWorkflow.cs
@@ -3,7 +3,7 @@ using Elsa.Activities.Temporal;
 using Elsa.Builders;
 using NodaTime;
 
-namespace Elsa.Samples.Timers
+namespace Elsa.Samples.Temporal
 {
     /// <summary>
     /// A workflow that executes only once in the near future.
diff --git a/src/samples/worker/Elsa.Samples.Timers.Hangfire/Program.cs b/src/samples/worker/Elsa.Samples.Timers.Hangfire/Program.cs
index a591618cc..9a2cd76cb 100644
--- a/src/samples/worker/Elsa.Samples.Timers.Hangfire/Program.cs
+++ b/src/samples/worker/Elsa.Samples.Timers.Hangfire/Program.cs
@@ -4,7 +4,7 @@ using Microsoft.Extensions.Hosting;
 using NodaTime;
 using Hangfire;
 
-namespace Elsa.Samples.Timers
+namespace Elsa.Samples.Temporal
 {
     internal class Program
     {
diff --git a/src/samples/worker/Elsa.Samples.Timers.Hangfire/RecurringTaskWorkflow.cs b/src/samples/worker/Elsa.Samples.Timers.Hangfire/RecurringTaskWorkflow.cs
index b06f95646..6ac5861a5 100644
--- a/src/samples/worker/Elsa.Samples.Timers.Hangfire/RecurringTaskWorkflow.cs
+++ b/src/samples/worker/Elsa.Samples.Timers.Hangfire/RecurringTaskWorkflow.cs
@@ -3,7 +3,7 @@ using Elsa.Activities.Temporal;
 using Elsa.Builders;
 using NodaTime;
 
-namespace Elsa.Samples.Timers
+namespace Elsa.Samples.Temporal
 {
     public class RecurringTaskWorkflow : IWorkflow
     {
diff --git a/src/samples/worker/Elsa.Samples.Timers.Quartz/Activities/MyContainer1.cs b/src/samples/worker/Elsa.Samples.Timers.Quartz/Activities/MyContainer1.cs
index 754c91d5a..f592cd4f9 100644
--- a/src/samples/worker/Elsa.Samples.Timers.Quartz/Activities/MyContainer1.cs
+++ b/src/samples/worker/Elsa.Samples.Timers.Quartz/Activities/MyContainer1.cs
@@ -5,7 +5,7 @@ using Elsa.Builders;
 using Elsa.Services;
 using NodaTime;
 
-namespace Elsa.Samples.Timers.Activities
+namespace Elsa.Samples.Temporal.Activities
 {
     public class MyContainer1 : CompositeActivity
     {
diff --git a/src/samples/worker/Elsa.Samples.Timers.Quartz/Activities/MyContainer2.cs b/src/samples/worker/Elsa.Samples.Timers.Quartz/Activities/MyContainer2.cs
index 66d718d1d..42e33d4f1 100644
--- a/src/samples/worker/Elsa.Samples.Timers.Quartz/Activities/MyContainer2.cs
+++ b/src/samples/worker/Elsa.Samples.Timers.Quartz/Activities/MyContainer2.cs
@@ -5,7 +5,7 @@ using Elsa.Builders;
 using Elsa.Services;
 using NodaTime;
 
-namespace Elsa.Samples.Timers.Activities
+namespace Elsa.Samples.Temporal.Activities
 {
     public class MyContainer2 : CompositeActivity
     {
diff --git a/src/samples/worker/Elsa.Samples.Timers.Quartz/Program.cs b/src/samples/worker/Elsa.Samples.Timers.Quartz/Program.cs
index 85d380490..34fd16b63 100644
--- a/src/samples/worker/Elsa.Samples.Timers.Quartz/Program.cs
+++ b/src/samples/worker/Elsa.Samples.Timers.Quartz/Program.cs
@@ -1,12 +1,12 @@
 using System.Threading.Tasks;
 using Elsa.Persistence.EntityFramework.Core.Extensions;
 using Elsa.Persistence.EntityFramework.Sqlite;
-using Elsa.Samples.Timers.Activities;
-using Elsa.Samples.Timers.Workflows;
+using Elsa.Samples.Temporal.Activities;
+using Elsa.Samples.Temporal.Workflows;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
-namespace Elsa.Samples.Timers
+namespace Elsa.Samples.Temporal
 {
     internal static class Program
     {
diff --git a/src/samples/worker/Elsa.Samples.Timers.Quartz/Workflows/CancelTimerWorkflow.cs b/src/samples/worker/Elsa.Samples.Timers.Quartz/Workflows/CancelTimerWorkflow.cs
index b1f1b00aa..f23e2eb2a 100644
--- a/src/samples/worker/Elsa.Samples.Timers.Quartz/Workflows/CancelTimerWorkflow.cs
+++ b/src/samples/worker/Elsa.Samples.Timers.Quartz/Workflows/CancelTimerWorkflow.cs
@@ -5,7 +5,7 @@ using Elsa.Activities.Temporal;
 using Elsa.Builders;
 using NodaTime;
 
-namespace Elsa.Samples.Timers.Workflows
+namespace Elsa.Samples.Temporal.Workflows
 {
     public class CancelTimerWorkflow : IWorkflow
     {
diff --git a/src/samples/worker/Elsa.Samples.Timers.Quartz/Workflows/ComplicatedWorkflow.cs b/src/samples/worker/Elsa.Samples.Timers.Quartz/Workflows/ComplicatedWorkflow.cs
index 68b805583..998c925f6 100644
--- a/src/samples/worker/Elsa.Samples.Timers.Quartz/Workflows/ComplicatedWorkflow.cs
+++ b/src/samples/worker/Elsa.Samples.Timers.Quartz/Workflows/ComplicatedWorkflow.cs
@@ -4,7 +4,7 @@ using Elsa.Activities.Temporal;
 using Elsa.Builders;
 using NodaTime;
 
-namespace Elsa.Samples.Timers.Workflows
+namespace Elsa.Samples.Temporal.Workflows
 {
     public class ComplicatedWorkflow : IWorkflow
     {
diff --git a/src/samples/worker/Elsa.Samples.Timers.Quartz/Workflows/CronTaskWorkflow.cs b/src/samples/worker/Elsa.Samples.Timers.Quartz/Workflows/CronTaskWorkflow.cs
index db9bd32a1..dcb9a97b7 100644
--- a/src/samples/worker/Elsa.Samples.Timers.Quartz/Workflows/CronTaskWorkflow.cs
+++ b/src/samples/worker/Elsa.Samples.Timers.Quartz/Workflows/CronTaskWorkflow.cs
@@ -3,7 +3,7 @@ using Elsa.Activities.Console;
 using Elsa.Activities.Temporal;
 using Elsa.Builders;
 
-namespace Elsa.Samples.Timers.Workflows
+namespace Elsa.Samples.Temporal.Workflows
 {
     public class CronTaskWorkflow : IWorkflow
     {
diff --git a/src/samples/worker/Elsa.Samples.Timers.Quartz/Workflows/OneOffWorkflow.cs b/src/samples/worker/Elsa.Samples.Timers.Quartz/Workflows/OneOffWorkflow.cs
index e7573231e..7d6a44450 100644
--- a/src/samples/worker/Elsa.Samples.Timers.Quartz/Workflows/OneOffWorkflow.cs
+++ b/src/samples/worker/Elsa.Samples.Timers.Quartz/Workflows/OneOffWorkflow.cs
@@ -3,7 +3,7 @@ using Elsa.Activities.Temporal;
 using Elsa.Builders;
 using NodaTime;
 
-namespace Elsa.Samples.Timers.Workflows
+namespace Elsa.Samples.Temporal.Workflows
 {
     /// <summary>
     /// A workflow that executes only once in the near future.
diff --git a/src/samples/worker/Elsa.Samples.Timers.Quartz/Workflows/SingletonTimerWorkflow.cs b/src/samples/worker/Elsa.Samples.Timers.Quartz/Workflows/SingletonTimerWorkflow.cs
index 1c3a30912..dc2cd79d7 100644
--- a/src/samples/worker/Elsa.Samples.Timers.Quartz/Workflows/SingletonTimerWorkflow.cs
+++ b/src/samples/worker/Elsa.Samples.Timers.Quartz/Workflows/SingletonTimerWorkflow.cs
@@ -4,7 +4,7 @@ using Elsa.Activities.Temporal;
 using Elsa.Builders;
 using NodaTime;
 
-namespace Elsa.Samples.Timers.Workflows
+namespace Elsa.Samples.Temporal.Workflows
 {
     public class SingletonTimerWorkflow : IWorkflow
     {
diff --git a/src/samples/worker/Elsa.Samples.Timers.Quartz/Workflows/TimerWorkflow.cs b/src/samples/worker/Elsa.Samples.Timers.Quartz/Workflows/TimerWorkflow.cs
index 8095a2726..33402727c 100644
--- a/src/samples/worker/Elsa.Samples.Timers.Quartz/Workflows/TimerWorkflow.cs
+++ b/src/samples/worker/Elsa.Samples.Timers.Quartz/Workflows/TimerWorkflow.cs
@@ -4,7 +4,7 @@ using Elsa.Activities.Temporal;
 using Elsa.Builders;
 using NodaTime;
 
-namespace Elsa.Samples.Timers.Workflows
+namespace Elsa.Samples.Temporal.Workflows
 {
     public class TimerWorkflow : IWorkflow
     {