diff --git a/src/activities/Elsa.Activities.Timers/Extensions/ServiceCollectionExtensions.cs b/src/activities/Elsa.Activities.Timers/Extensions/ServiceCollectionExtensions.cs
index 726f9d767..6b089bf08 100644
--- a/src/activities/Elsa.Activities.Timers/Extensions/ServiceCollectionExtensions.cs
+++ b/src/activities/Elsa.Activities.Timers/Extensions/ServiceCollectionExtensions.cs
@@ -27,8 +27,8 @@ namespace Microsoft.Extensions.DependencyInjection
                 .AddActivity<Cron>()
                 .AddActivity<Timer>()
                 .AddActivity<StartAt>()
-                .AddTriggerProvider<TimerEventTriggerProvider>()
-                .AddTriggerProvider<CronEventTriggerProvider>()
+                .AddTriggerProvider<TimerTriggerProvider>()
+                .AddTriggerProvider<CronTriggerProvider>()
                 .AddTriggerProvider<StartAtTriggerProvider>();
         }
 
diff --git a/src/activities/Elsa.Activities.Timers/HostedServices/StartJobs.cs b/src/activities/Elsa.Activities.Timers/HostedServices/StartJobs.cs
index 161bd7059..81863a2e0 100644
--- a/src/activities/Elsa.Activities.Timers/HostedServices/StartJobs.cs
+++ b/src/activities/Elsa.Activities.Timers/HostedServices/StartJobs.cs
@@ -99,11 +99,11 @@ namespace Elsa.Activities.Timers.HostedServices
             }
 
             // Schedule workflow instances that are blocked on a timer event.
-            var timerEventTriggers = await workflowSelector.SelectWorkflowsAsync<TimerEventTrigger>(x => true, cancellationToken);
+            var timerEventTriggers = await workflowSelector.SelectWorkflowsAsync<TimerTrigger>(x => true, cancellationToken);
 
             foreach (var result in timerEventTriggers)
             {
-                var trigger = (TimerEventTrigger) result.Trigger;
+                var trigger = (TimerTrigger) result.Trigger;
                 var activity = result.WorkflowBlueprint.GetActivity(result.ActivityId)!;
                 await _workflowScheduler.ScheduleWorkflowAsync(result.WorkflowBlueprint, result.WorkflowInstanceId!, activity.Id, trigger.ExecuteAt, cancellationToken);
             }
@@ -129,11 +129,11 @@ namespace Elsa.Activities.Timers.HostedServices
             }
 
             // Schedule workflow instances blocked on a cron event.
-            var cronEventTriggers = await workflowSelector.SelectWorkflowsAsync<CronEventTrigger>(x => true, cancellationToken);
+            var cronEventTriggers = await workflowSelector.SelectWorkflowsAsync<CronTrigger>(x => true, cancellationToken);
 
             foreach (var result in cronEventTriggers)
             {
-                var trigger = (CronEventTrigger) result.Trigger;
+                var trigger = (CronTrigger) result.Trigger;
                 var activity = result.WorkflowBlueprint.GetActivity(result.ActivityId)!;
                 await _workflowScheduler.ScheduleWorkflowAsync(result.WorkflowBlueprint, result.WorkflowInstanceId!, activity.Id, trigger.ExecuteAt, cancellationToken);
             }
diff --git a/src/activities/Elsa.Activities.Timers/Triggers/CronEventTrigger.cs b/src/activities/Elsa.Activities.Timers/Triggers/CronTrigger.cs
similarity index 78%
rename from src/activities/Elsa.Activities.Timers/Triggers/CronEventTrigger.cs
rename to src/activities/Elsa.Activities.Timers/Triggers/CronTrigger.cs
index f3f7e5ce6..7994eaebc 100644
--- a/src/activities/Elsa.Activities.Timers/Triggers/CronEventTrigger.cs
+++ b/src/activities/Elsa.Activities.Timers/Triggers/CronTrigger.cs
@@ -4,12 +4,12 @@ using NodaTime;
 
 namespace Elsa.Activities.Timers.Triggers
 {
-    public class CronEventTrigger : Trigger
+    public class CronTrigger : Trigger
     {
         public Instant ExecuteAt { get; set; }
     }
     
-    public class CronEventTriggerProvider : TriggerProvider<CronEventTrigger, Cron>
+    public class CronTriggerProvider : TriggerProvider<CronTrigger, Cron>
     {
         public override ITrigger GetTrigger(TriggerProviderContext<Cron> context)
         {
@@ -18,7 +18,7 @@ namespace Elsa.Activities.Timers.Triggers
             if (executeAt == null || context.ActivityExecutionContext.WorkflowExecutionContext.WorkflowInstance.Status != WorkflowStatus.Suspended)
                 return NullTrigger.Instance;
 
-            return new CronEventTrigger
+            return new CronTrigger
             {
                 ExecuteAt = executeAt.Value,
             };
diff --git a/src/activities/Elsa.Activities.Timers/Triggers/TimerEventTrigger.cs b/src/activities/Elsa.Activities.Timers/Triggers/TimerTrigger.cs
similarity index 78%
rename from src/activities/Elsa.Activities.Timers/Triggers/TimerEventTrigger.cs
rename to src/activities/Elsa.Activities.Timers/Triggers/TimerTrigger.cs
index c163a902b..f9b6409cf 100644
--- a/src/activities/Elsa.Activities.Timers/Triggers/TimerEventTrigger.cs
+++ b/src/activities/Elsa.Activities.Timers/Triggers/TimerTrigger.cs
@@ -4,12 +4,12 @@ using NodaTime;
 
 namespace Elsa.Activities.Timers.Triggers
 {
-    public class TimerEventTrigger : Trigger
+    public class TimerTrigger : Trigger
     {
         public Instant ExecuteAt { get; set; }
     }
 
-    public class TimerEventTriggerProvider : TriggerProvider<TimerEventTrigger, Timer>
+    public class TimerTriggerProvider : TriggerProvider<TimerTrigger, Timer>
     {
         public override ITrigger GetTrigger(TriggerProviderContext<Timer> context)
         {
@@ -18,7 +18,7 @@ namespace Elsa.Activities.Timers.Triggers
             if (executeAt == null || context.ActivityExecutionContext.WorkflowExecutionContext.WorkflowInstance.Status != WorkflowStatus.Suspended)
                 return NullTrigger.Instance;
 
-            return new TimerEventTrigger
+            return new TimerTrigger
             {
                 ExecuteAt = executeAt.Value,
             };