diff --git a/Samples.sln b/Samples.sln
index fc4741eeb..8b032a469 100644
--- a/Samples.sln
+++ b/Samples.sln
@@ -162,7 +162,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Samples.WhileLoopWorke
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Samples.CustomAttributesChildWorker", "src\samples\worker\Elsa.Samples.CustomAttributesChildWorker\Elsa.Samples.CustomAttributesChildWorker.csproj", "{AEA00027-F280-43A4-AC60-E2AF3014CF34}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Samples.CustomActivityTypeProviders", "src\samples\aspnet\Elsa.Samples.CustomActivityTypeProviders\Elsa.Samples.CustomActivityTypeProviders.csproj", "{E0090EF3-C4A7-4262-9300-1D395BE25DD0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Samples.Interrupts", "src\samples\aspnet\Elsa.Samples.Interrupts\Elsa.Samples.Interrupts.csproj", "{E0090EF3-C4A7-4262-9300-1D395BE25DD0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/samples/aspnet/Elsa.Samples.CustomActivityTypeProviders/Activities/Sleep.cs b/src/samples/aspnet/Elsa.Samples.Interrupts/Activities/Sleep.cs
similarity index 81%
rename from src/samples/aspnet/Elsa.Samples.CustomActivityTypeProviders/Activities/Sleep.cs
rename to src/samples/aspnet/Elsa.Samples.Interrupts/Activities/Sleep.cs
index 0b11ddd6c..76a497141 100644
--- a/src/samples/aspnet/Elsa.Samples.CustomActivityTypeProviders/Activities/Sleep.cs
+++ b/src/samples/aspnet/Elsa.Samples.Interrupts/Activities/Sleep.cs
@@ -1,10 +1,12 @@
 using Elsa.Activities.Timers;
 using Elsa.Activities.Timers.Services;
+using Elsa.Attributes;
 using Elsa.Services;
 using NodaTime;
 
-namespace Elsa.Samples.CustomActivityTypeProviders.Activities
+namespace Elsa.Samples.Interrupts.Activities
 {
+    [Activity]
     public class Sleep : TimerEvent
     {
         public Sleep(IWorkflowInstanceManager workflowInstanceManager, IWorkflowScheduler workflowScheduler, IClock clock) : base(workflowInstanceManager, workflowScheduler, clock)
diff --git a/src/samples/aspnet/Elsa.Samples.CustomActivityTypeProviders/Elsa.Samples.CustomActivityTypeProviders.csproj b/src/samples/aspnet/Elsa.Samples.Interrupts/Elsa.Samples.Interrupts.csproj
similarity index 100%
rename from src/samples/aspnet/Elsa.Samples.CustomActivityTypeProviders/Elsa.Samples.CustomActivityTypeProviders.csproj
rename to src/samples/aspnet/Elsa.Samples.Interrupts/Elsa.Samples.Interrupts.csproj
diff --git a/src/samples/aspnet/Elsa.Samples.CustomActivityTypeProviders/Endpoints/WakeUp.cs b/src/samples/aspnet/Elsa.Samples.Interrupts/Endpoints/WakeUp.cs
similarity index 87%
rename from src/samples/aspnet/Elsa.Samples.CustomActivityTypeProviders/Endpoints/WakeUp.cs
rename to src/samples/aspnet/Elsa.Samples.Interrupts/Endpoints/WakeUp.cs
index f5e2435e0..8f7d9eec0 100644
--- a/src/samples/aspnet/Elsa.Samples.CustomActivityTypeProviders/Endpoints/WakeUp.cs
+++ b/src/samples/aspnet/Elsa.Samples.Interrupts/Endpoints/WakeUp.cs
@@ -1,11 +1,11 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Elsa.Samples.CustomActivityTypeProviders.Activities;
+using Elsa.Samples.Interrupts.Activities;
 using Elsa.Services;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Elsa.Samples.CustomActivityTypeProviders.Endpoints
+namespace Elsa.Samples.Interrupts.Endpoints
 {
     [ApiController]
     [Route("wakeup")]
diff --git a/src/samples/aspnet/Elsa.Samples.CustomActivityTypeProviders/Program.cs b/src/samples/aspnet/Elsa.Samples.Interrupts/Program.cs
similarity index 89%
rename from src/samples/aspnet/Elsa.Samples.CustomActivityTypeProviders/Program.cs
rename to src/samples/aspnet/Elsa.Samples.Interrupts/Program.cs
index 6a51a0b7b..ebe7adf9f 100644
--- a/src/samples/aspnet/Elsa.Samples.CustomActivityTypeProviders/Program.cs
+++ b/src/samples/aspnet/Elsa.Samples.Interrupts/Program.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
 
-namespace Elsa.Samples.CustomActivityTypeProviders
+namespace Elsa.Samples.Interrupts
 {
     public class Program
     {
diff --git a/src/samples/aspnet/Elsa.Samples.CustomActivityTypeProviders/Properties/launchSettings.json b/src/samples/aspnet/Elsa.Samples.Interrupts/Properties/launchSettings.json
similarity index 100%
rename from src/samples/aspnet/Elsa.Samples.CustomActivityTypeProviders/Properties/launchSettings.json
rename to src/samples/aspnet/Elsa.Samples.Interrupts/Properties/launchSettings.json
diff --git a/src/samples/aspnet/Elsa.Samples.CustomActivityTypeProviders/Startup.cs b/src/samples/aspnet/Elsa.Samples.Interrupts/Startup.cs
similarity index 84%
rename from src/samples/aspnet/Elsa.Samples.CustomActivityTypeProviders/Startup.cs
rename to src/samples/aspnet/Elsa.Samples.Interrupts/Startup.cs
index 05397a808..19bb61269 100644
--- a/src/samples/aspnet/Elsa.Samples.CustomActivityTypeProviders/Startup.cs
+++ b/src/samples/aspnet/Elsa.Samples.Interrupts/Startup.cs
@@ -1,10 +1,10 @@
-using Elsa.Samples.CustomActivityTypeProviders.Activities;
-using Elsa.Samples.CustomActivityTypeProviders.Workflows;
+using Elsa.Samples.Interrupts.Activities;
+using Elsa.Samples.Interrupts.Workflows;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Elsa.Samples.CustomActivityTypeProviders
+namespace Elsa.Samples.Interrupts
 {
     public class Startup
     {
diff --git a/src/samples/aspnet/Elsa.Samples.CustomActivityTypeProviders/Workflows/InterruptableWorkflow.cs b/src/samples/aspnet/Elsa.Samples.Interrupts/Workflows/InterruptableWorkflow.cs
similarity index 82%
rename from src/samples/aspnet/Elsa.Samples.CustomActivityTypeProviders/Workflows/InterruptableWorkflow.cs
rename to src/samples/aspnet/Elsa.Samples.Interrupts/Workflows/InterruptableWorkflow.cs
index dcf20342b..4161f83c7 100644
--- a/src/samples/aspnet/Elsa.Samples.CustomActivityTypeProviders/Workflows/InterruptableWorkflow.cs
+++ b/src/samples/aspnet/Elsa.Samples.Interrupts/Workflows/InterruptableWorkflow.cs
@@ -1,9 +1,9 @@
 using Elsa.Activities.Console;
 using Elsa.Builders;
-using Elsa.Samples.CustomActivityTypeProviders.Activities;
+using Elsa.Samples.Interrupts.Activities;
 using NodaTime;
 
-namespace Elsa.Samples.CustomActivityTypeProviders.Workflows
+namespace Elsa.Samples.Interrupts.Workflows
 {
     public class InterruptableWorkflow : IWorkflow
     {
diff --git a/src/samples/aspnet/Elsa.Samples.CustomActivityTypeProviders/appsettings.json b/src/samples/aspnet/Elsa.Samples.Interrupts/appsettings.json
similarity index 100%
rename from src/samples/aspnet/Elsa.Samples.CustomActivityTypeProviders/appsettings.json
rename to src/samples/aspnet/Elsa.Samples.Interrupts/appsettings.json
diff --git a/src/samples/aspnet/Elsa.Samples.CustomActivityTypeProviders/interrupt.http b/src/samples/aspnet/Elsa.Samples.Interrupts/interrupt.http
similarity index 100%
rename from src/samples/aspnet/Elsa.Samples.CustomActivityTypeProviders/interrupt.http
rename to src/samples/aspnet/Elsa.Samples.Interrupts/interrupt.http