diff --git a/Elsa.sln b/Elsa.sln
index a5537c516..b5b35f88a 100644
--- a/Elsa.sln
+++ b/Elsa.sln
@@ -174,7 +174,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.DistributedLocking.Red
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.DistributedLocking.SqlServer", "src\locking\Elsa.DistributedLocking.SqlServer\Elsa.DistributedLocking.SqlServer.csproj", "{78F2A9DC-3092-4371-ABFE-87C5DA4DE351}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.Activities.Timers", "src\activities\Elsa.Activities.Timers\Elsa.Activities.Timers.csproj", "{74E83393-50AF-41E3-A1C8-97202673CD85}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.Activities.Timers", "src\activities\Elsa.Activities.Temporal.Common\Elsa.Activities.Temporal.Common.csproj", "{74E83393-50AF-41E3-A1C8-97202673CD85}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ElsaDashboard.Abstractions", "src\dashboards\blazor\ElsaDashboard.Abstractions\ElsaDashboard.Abstractions.csproj", "{599CEC92-0EC9-4378-A1B6-E7741B1E4E57}"
 EndProject
diff --git a/src/activities/Elsa.Activities.Timers/Activities/ClearTimer/CancelTimer.cs b/src/activities/Elsa.Activities.Temporal.Common/Activities/ClearTimer/CancelTimer.cs
similarity index 100%
rename from src/activities/Elsa.Activities.Timers/Activities/ClearTimer/CancelTimer.cs
rename to src/activities/Elsa.Activities.Temporal.Common/Activities/ClearTimer/CancelTimer.cs
diff --git a/src/activities/Elsa.Activities.Timers/Activities/ClearTimer/CancelTimerExtensions.cs b/src/activities/Elsa.Activities.Temporal.Common/Activities/ClearTimer/CancelTimerExtensions.cs
similarity index 100%
rename from src/activities/Elsa.Activities.Timers/Activities/ClearTimer/CancelTimerExtensions.cs
rename to src/activities/Elsa.Activities.Temporal.Common/Activities/ClearTimer/CancelTimerExtensions.cs
diff --git a/src/activities/Elsa.Activities.Timers/Activities/Cron/Cron.cs b/src/activities/Elsa.Activities.Temporal.Common/Activities/Cron/Cron.cs
similarity index 100%
rename from src/activities/Elsa.Activities.Timers/Activities/Cron/Cron.cs
rename to src/activities/Elsa.Activities.Temporal.Common/Activities/Cron/Cron.cs
diff --git a/src/activities/Elsa.Activities.Timers/Activities/Cron/CronBuilderExtensions.cs b/src/activities/Elsa.Activities.Temporal.Common/Activities/Cron/CronBuilderExtensions.cs
similarity index 100%
rename from src/activities/Elsa.Activities.Timers/Activities/Cron/CronBuilderExtensions.cs
rename to src/activities/Elsa.Activities.Temporal.Common/Activities/Cron/CronBuilderExtensions.cs
diff --git a/src/activities/Elsa.Activities.Timers/Activities/StartAt/StartAt.cs b/src/activities/Elsa.Activities.Temporal.Common/Activities/StartAt/StartAt.cs
similarity index 100%
rename from src/activities/Elsa.Activities.Timers/Activities/StartAt/StartAt.cs
rename to src/activities/Elsa.Activities.Temporal.Common/Activities/StartAt/StartAt.cs
diff --git a/src/activities/Elsa.Activities.Timers/Activities/StartAt/StartAtBuilderExtensions.cs b/src/activities/Elsa.Activities.Temporal.Common/Activities/StartAt/StartAtBuilderExtensions.cs
similarity index 100%
rename from src/activities/Elsa.Activities.Timers/Activities/StartAt/StartAtBuilderExtensions.cs
rename to src/activities/Elsa.Activities.Temporal.Common/Activities/StartAt/StartAtBuilderExtensions.cs
diff --git a/src/activities/Elsa.Activities.Timers/Activities/Timer/Timer.cs b/src/activities/Elsa.Activities.Temporal.Common/Activities/Timer/Timer.cs
similarity index 100%
rename from src/activities/Elsa.Activities.Timers/Activities/Timer/Timer.cs
rename to src/activities/Elsa.Activities.Temporal.Common/Activities/Timer/Timer.cs
diff --git a/src/activities/Elsa.Activities.Timers/Activities/Timer/TimerBuilderExtensions.cs b/src/activities/Elsa.Activities.Temporal.Common/Activities/Timer/TimerBuilderExtensions.cs
similarity index 100%
rename from src/activities/Elsa.Activities.Timers/Activities/Timer/TimerBuilderExtensions.cs
rename to src/activities/Elsa.Activities.Temporal.Common/Activities/Timer/TimerBuilderExtensions.cs
diff --git a/src/activities/Elsa.Activities.Timers/ActivityResults/ScheduleWorkflowResult.cs b/src/activities/Elsa.Activities.Temporal.Common/ActivityResults/ScheduleWorkflowResult.cs
similarity index 100%
rename from src/activities/Elsa.Activities.Timers/ActivityResults/ScheduleWorkflowResult.cs
rename to src/activities/Elsa.Activities.Temporal.Common/ActivityResults/ScheduleWorkflowResult.cs
diff --git a/src/activities/Elsa.Activities.Timers/Bookmarks/CronBookmark.cs b/src/activities/Elsa.Activities.Temporal.Common/Bookmarks/CronBookmark.cs
similarity index 100%
rename from src/activities/Elsa.Activities.Timers/Bookmarks/CronBookmark.cs
rename to src/activities/Elsa.Activities.Temporal.Common/Bookmarks/CronBookmark.cs
diff --git a/src/activities/Elsa.Activities.Timers/Bookmarks/StartAtBookmark.cs b/src/activities/Elsa.Activities.Temporal.Common/Bookmarks/StartAtBookmark.cs
similarity index 100%
rename from src/activities/Elsa.Activities.Timers/Bookmarks/StartAtBookmark.cs
rename to src/activities/Elsa.Activities.Temporal.Common/Bookmarks/StartAtBookmark.cs
diff --git a/src/activities/Elsa.Activities.Timers/Bookmarks/TimerBookmark.cs b/src/activities/Elsa.Activities.Temporal.Common/Bookmarks/TimerBookmark.cs
similarity index 100%
rename from src/activities/Elsa.Activities.Timers/Bookmarks/TimerBookmark.cs
rename to src/activities/Elsa.Activities.Temporal.Common/Bookmarks/TimerBookmark.cs
diff --git a/src/activities/Elsa.Activities.Timers/Elsa.Activities.Timers.csproj b/src/activities/Elsa.Activities.Temporal.Common/Elsa.Activities.Temporal.Common.csproj
similarity index 100%
rename from src/activities/Elsa.Activities.Timers/Elsa.Activities.Timers.csproj
rename to src/activities/Elsa.Activities.Temporal.Common/Elsa.Activities.Temporal.Common.csproj
diff --git a/src/activities/Elsa.Activities.Timers/Extensions/DurationExtensions.cs b/src/activities/Elsa.Activities.Temporal.Common/Extensions/DurationExtensions.cs
similarity index 100%
rename from src/activities/Elsa.Activities.Timers/Extensions/DurationExtensions.cs
rename to src/activities/Elsa.Activities.Temporal.Common/Extensions/DurationExtensions.cs
diff --git a/src/activities/Elsa.Activities.Timers/Extensions/ServiceCollectionExtensions.cs b/src/activities/Elsa.Activities.Temporal.Common/Extensions/ServiceCollectionExtensions.cs
similarity index 97%
rename from src/activities/Elsa.Activities.Timers/Extensions/ServiceCollectionExtensions.cs
rename to src/activities/Elsa.Activities.Temporal.Common/Extensions/ServiceCollectionExtensions.cs
index deaea269b..158006935 100644
--- a/src/activities/Elsa.Activities.Timers/Extensions/ServiceCollectionExtensions.cs
+++ b/src/activities/Elsa.Activities.Temporal.Common/Extensions/ServiceCollectionExtensions.cs
@@ -1,34 +1,34 @@
-using System;
-using Elsa;
-using Elsa.Activities.Temporal;
-using Elsa.Activities.Temporal.Bookmarks;
-using Elsa.Activities.Temporal.Handlers;
-using Elsa.Activities.Temporal.Options;
-using Elsa.Activities.Temporal.StartupTasks;
-using Elsa.Runtime;
-
-// ReSharper disable once CheckNamespace
-namespace Microsoft.Extensions.DependencyInjection
-{
-    public static class ServiceCollectionExtensions
-    {
-        public static ElsaOptions AddTimerActivities(this ElsaOptions options, Action<TimersOptions>? configure = default)
-        {
-            var timersOptions = new TimersOptions(options.Services);
-            configure?.Invoke(timersOptions);
-
-            options.Services
-                .AddNotificationHandlers(typeof(RemoveScheduledTriggers))
-                .AddStartupTask<StartJobs>()
-                .AddBookmarkProvider<TimerBookmarkProvider>()
-                .AddBookmarkProvider<CronBookmarkProvider>()
-                .AddBookmarkProvider<StartAtBookmarkProvider>();
-
-            return options
-                .AddActivity<Cron>()
-                .AddActivity<Timer>()
-                .AddActivity<StartAt>()
-                .AddActivity<ClearTimer>();
-        }
-    }
+using System;
+using Elsa;
+using Elsa.Activities.Temporal;
+using Elsa.Activities.Temporal.Bookmarks;
+using Elsa.Activities.Temporal.Handlers;
+using Elsa.Activities.Temporal.Options;
+using Elsa.Activities.Temporal.StartupTasks;
+using Elsa.Runtime;
+
+// ReSharper disable once CheckNamespace
+namespace Microsoft.Extensions.DependencyInjection
+{
+    public static class ServiceCollectionExtensions
+    {
+        public static ElsaOptions AddTimerActivities(this ElsaOptions options, Action<TimersOptions>? configure = default)
+        {
+            var timersOptions = new TimersOptions(options.Services);
+            configure?.Invoke(timersOptions);
+
+            options.Services
+                .AddNotificationHandlers(typeof(RemoveScheduledTriggers))
+                .AddStartupTask<StartJobs>()
+                .AddBookmarkProvider<TimerBookmarkProvider>()
+                .AddBookmarkProvider<CronBookmarkProvider>()
+                .AddBookmarkProvider<StartAtBookmarkProvider>();
+
+            return options
+                .AddActivity<Cron>()
+                .AddActivity<Timer>()
+                .AddActivity<StartAt>()
+                .AddActivity<ClearTimer>();
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/activities/Elsa.Activities.Timers/FodyWeavers.xml b/src/activities/Elsa.Activities.Temporal.Common/FodyWeavers.xml
similarity index 100%
rename from src/activities/Elsa.Activities.Timers/FodyWeavers.xml
rename to src/activities/Elsa.Activities.Temporal.Common/FodyWeavers.xml
diff --git a/src/activities/Elsa.Activities.Timers/Handlers/RemoveScheduledTriggers.cs b/src/activities/Elsa.Activities.Temporal.Common/Handlers/RemoveScheduledTriggers.cs
similarity index 100%
rename from src/activities/Elsa.Activities.Timers/Handlers/RemoveScheduledTriggers.cs
rename to src/activities/Elsa.Activities.Temporal.Common/Handlers/RemoveScheduledTriggers.cs
diff --git a/src/activities/Elsa.Activities.Timers/Handlers/ScheduleWorkflows.cs b/src/activities/Elsa.Activities.Temporal.Common/Handlers/ScheduleWorkflows.cs
similarity index 100%
rename from src/activities/Elsa.Activities.Timers/Handlers/ScheduleWorkflows.cs
rename to src/activities/Elsa.Activities.Temporal.Common/Handlers/ScheduleWorkflows.cs
diff --git a/src/activities/Elsa.Activities.Timers/Options/TimersOptions.cs b/src/activities/Elsa.Activities.Temporal.Common/Options/TimersOptions.cs
similarity index 100%
rename from src/activities/Elsa.Activities.Timers/Options/TimersOptions.cs
rename to src/activities/Elsa.Activities.Temporal.Common/Options/TimersOptions.cs
diff --git a/src/activities/Elsa.Activities.Timers/Services/ICrontabParser.cs b/src/activities/Elsa.Activities.Temporal.Common/Services/ICrontabParser.cs
similarity index 100%
rename from src/activities/Elsa.Activities.Timers/Services/ICrontabParser.cs
rename to src/activities/Elsa.Activities.Temporal.Common/Services/ICrontabParser.cs
diff --git a/src/activities/Elsa.Activities.Timers/Services/IWorkflowScheduler.cs b/src/activities/Elsa.Activities.Temporal.Common/Services/IWorkflowScheduler.cs
similarity index 100%
rename from src/activities/Elsa.Activities.Timers/Services/IWorkflowScheduler.cs
rename to src/activities/Elsa.Activities.Temporal.Common/Services/IWorkflowScheduler.cs
diff --git a/src/activities/Elsa.Activities.Timers/StartupTasks/StartJobs.cs b/src/activities/Elsa.Activities.Temporal.Common/StartupTasks/StartJobs.cs
similarity index 100%
rename from src/activities/Elsa.Activities.Timers/StartupTasks/StartJobs.cs
rename to src/activities/Elsa.Activities.Temporal.Common/StartupTasks/StartJobs.cs
diff --git a/src/activities/Elsa.Activities.Timers/TimerConsts.cs b/src/activities/Elsa.Activities.Temporal.Common/TimerConsts.cs
similarity index 100%
rename from src/activities/Elsa.Activities.Timers/TimerConsts.cs
rename to src/activities/Elsa.Activities.Temporal.Common/TimerConsts.cs
diff --git a/src/activities/Elsa.Activities.Timers.Hangfire/Elsa.Activities.Timers.Hangfire.csproj b/src/activities/Elsa.Activities.Timers.Hangfire/Elsa.Activities.Timers.Hangfire.csproj
index 81d906fac..984fcb609 100644
--- a/src/activities/Elsa.Activities.Timers.Hangfire/Elsa.Activities.Timers.Hangfire.csproj
+++ b/src/activities/Elsa.Activities.Timers.Hangfire/Elsa.Activities.Timers.Hangfire.csproj
@@ -14,7 +14,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Elsa.Activities.Timers\Elsa.Activities.Timers.csproj" />
+        <ProjectReference Include="..\Elsa.Activities.Temporal.Common\Elsa.Activities.Temporal.Common.csproj" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/activities/Elsa.Activities.Timers.Quartz/Elsa.Activities.Timers.Quartz.csproj b/src/activities/Elsa.Activities.Timers.Quartz/Elsa.Activities.Timers.Quartz.csproj
index 13f28508a..490aea7eb 100644
--- a/src/activities/Elsa.Activities.Timers.Quartz/Elsa.Activities.Timers.Quartz.csproj
+++ b/src/activities/Elsa.Activities.Timers.Quartz/Elsa.Activities.Timers.Quartz.csproj
@@ -19,7 +19,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Elsa.Activities.Timers\Elsa.Activities.Timers.csproj" />
+      <ProjectReference Include="..\Elsa.Activities.Temporal.Common\Elsa.Activities.Temporal.Common.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/activities/Elsa.Activities.Timers/FodyWeavers.xsd b/src/activities/Elsa.Activities.Timers/FodyWeavers.xsd
deleted file mode 100644
index 3f3946e28..000000000
--- a/src/activities/Elsa.Activities.Timers/FodyWeavers.xsd
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
-  <xs:element name="Weavers">
-    <xs:complexType>
-      <xs:all>
-        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
-          <xs:complexType>
-            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
-          </xs:complexType>
-        </xs:element>
-      </xs:all>
-      <xs:attribute name="VerifyAssembly" type="xs:boolean">
-        <xs:annotation>
-          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
-        </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
-        </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="GenerateXsd" type="xs:boolean">
-        <xs:annotation>
-          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
-        </xs:annotation>
-      </xs:attribute>
-    </xs:complexType>
-  </xs:element>
-</xs:schema>
\ No newline at end of file
diff --git a/src/core/Elsa/Elsa.csproj b/src/core/Elsa/Elsa.csproj
index 77b387da4..09af21589 100644
--- a/src/core/Elsa/Elsa.csproj
+++ b/src/core/Elsa/Elsa.csproj
@@ -16,7 +16,7 @@
         <ProjectReference Include="..\..\activities\Elsa.Activities.Console\Elsa.Activities.Console.csproj" />
         <ProjectReference Include="..\..\activities\Elsa.Activities.Email\Elsa.Activities.Email.csproj" />
         <ProjectReference Include="..\..\activities\Elsa.Activities.Http\Elsa.Activities.Http.csproj" />
-        <ProjectReference Include="..\..\activities\Elsa.Activities.Timers\Elsa.Activities.Timers.csproj" />
+        <ProjectReference Include="..\..\activities\Elsa.Activities.Temporal.Common\Elsa.Activities.Temporal.Common.csproj" />
         <ProjectReference Include="..\..\activities\Elsa.Activities.UserTask\Elsa.Activities.UserTask.csproj" />
         <ProjectReference Include="..\..\scripting\Elsa.Scripting.Liquid\Elsa.Scripting.Liquid.csproj" />
         <ProjectReference Include="..\..\scripting\Elsa.Scripting.JavaScript\Elsa.Scripting.JavaScript.csproj" />
diff --git a/src/samples/worker/Elsa.Samples.DistributedLock/Elsa.Samples.DistributedLock.csproj b/src/samples/worker/Elsa.Samples.DistributedLock/Elsa.Samples.DistributedLock.csproj
index 0a558c816..46516e577 100644
--- a/src/samples/worker/Elsa.Samples.DistributedLock/Elsa.Samples.DistributedLock.csproj
+++ b/src/samples/worker/Elsa.Samples.DistributedLock/Elsa.Samples.DistributedLock.csproj
@@ -14,11 +14,11 @@
         <ProjectReference Include="..\..\..\activities\Elsa.Activities.Timers.Quartz\Elsa.Activities.Timers.Quartz.csproj" />
         <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj" />
         <ProjectReference Include="..\..\..\locking\Elsa.DistributedLocking.AzureBlob\Elsa.DistributedLocking.AzureBlob.csproj" />
-        <ProjectReference Include="..\..\..\activities\Elsa.Activities.Timers\Elsa.Activities.Timers.csproj" />
+        <ProjectReference Include="..\..\..\activities\Elsa.Activities.Temporal.Common\Elsa.Activities.Temporal.Common.csproj" />
         <ProjectReference Include="..\..\..\locking\Elsa.DistributedLocking.Redis\Elsa.DistributedLocking.Redis.csproj" />
         <ProjectReference Include="..\..\..\locking\Elsa.DistributedLocking.SqlServer\Elsa.DistributedLocking.SqlServer.csproj" />
         <ProjectReference Include="..\..\..\core\Elsa\Elsa.csproj"/>
-        <ProjectReference Include="..\..\..\activities\Elsa.Activities.Timers\Elsa.Activities.Timers.csproj"/>
+        <ProjectReference Include="..\..\..\activities\Elsa.Activities.Temporal.Common\Elsa.Activities.Temporal.Common.csproj"/>
         <ProjectReference Include="..\..\..\locking\Elsa.DistributedLocking.AzureBlob\Elsa.DistributedLocking.AzureBlob.csproj"/>
         <ProjectReference Include="..\..\..\locking\Elsa.DistributedLocking.Redis\Elsa.DistributedLocking.Redis.csproj"/>
         <ProjectReference Include="..\..\..\locking\Elsa.DistributedLocking.SqlServer\Elsa.DistributedLocking.SqlServer.csproj"/>