diff --git a/Samples.sln b/Samples.sln
index ccd9d4c01..6058783e7 100644
--- a/Samples.sln
+++ b/Samples.sln
@@ -112,7 +112,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Samples.ContextualWork
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Samples.RunChildWorkflowWorker", "src\samples\Elsa.Samples.RunChildWorkflowWorker\Elsa.Samples.RunChildWorkflowWorker.csproj", "{1E5E1669-AEC9-4DA9-9A3D-3D405101A246}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Samples.CompositeActivitiesConsole", "src\samples\Elsa.Samples.CompositeActivitiesConsole\Elsa.Samples.CompositeActivitiesConsole.csproj", "{CC39E9F8-72D2-4A5B-846B-E2764DFE1C19}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Samples.ProgrammaticCompositeActivitiesConsole", "src\samples\Elsa.Samples.ProgrammaticCompositeActivitiesConsole\Elsa.Samples.ProgrammaticCompositeActivitiesConsole.csproj", "{CC39E9F8-72D2-4A5B-846B-E2764DFE1C19}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/samples/Elsa.Samples.CompositeActivitiesConsole/Activities/CountDownActivity.cs b/src/samples/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Activities/CountDownActivity.cs
similarity index 61%
rename from src/samples/Elsa.Samples.CompositeActivitiesConsole/Activities/CountDownActivity.cs
rename to src/samples/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Activities/CountDownActivity.cs
index 7bb9d90c0..fe3f1093b 100644
--- a/src/samples/Elsa.Samples.CompositeActivitiesConsole/Activities/CountDownActivity.cs
+++ b/src/samples/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Activities/CountDownActivity.cs
@@ -2,8 +2,11 @@
 using Elsa.Builders;
 using Elsa.Services;
 
-namespace Elsa.Samples.CompositeActivitiesConsole.Activities
+namespace Elsa.Samples.ProgrammaticCompositeActivitiesConsole.Activities
 {
+    /// <summary>
+    /// Custom activities that inherit from <seealso cref="CompositeActivity"/> declare their own mini-workflow.
+    /// </summary>
     public class CountDownActivity : CompositeActivity
     {
         public override void Build(ICompositeActivityBuilder composite)
diff --git a/src/samples/Elsa.Samples.CompositeActivitiesConsole/Elsa.Samples.CompositeActivitiesConsole.csproj b/src/samples/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Elsa.Samples.ProgrammaticCompositeActivitiesConsole.csproj
similarity index 100%
rename from src/samples/Elsa.Samples.CompositeActivitiesConsole/Elsa.Samples.CompositeActivitiesConsole.csproj
rename to src/samples/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Elsa.Samples.ProgrammaticCompositeActivitiesConsole.csproj
diff --git a/src/samples/Elsa.Samples.CompositeActivitiesConsole/Program.cs b/src/samples/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Program.cs
similarity index 85%
rename from src/samples/Elsa.Samples.CompositeActivitiesConsole/Program.cs
rename to src/samples/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Program.cs
index e5e86f07b..b9f784494 100644
--- a/src/samples/Elsa.Samples.CompositeActivitiesConsole/Program.cs
+++ b/src/samples/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Program.cs
@@ -1,12 +1,12 @@
 using System.Data;
 using System.Threading.Tasks;
-using Elsa.Samples.CompositeActivitiesConsole.Activities;
-using Elsa.Samples.CompositeActivitiesConsole.Workflows;
+using Elsa.Samples.ProgrammaticCompositeActivitiesConsole.Activities;
+using Elsa.Samples.ProgrammaticCompositeActivitiesConsole.Workflows;
 using Elsa.Services;
 using Microsoft.Extensions.DependencyInjection;
 using YesSql.Provider.Sqlite;
 
-namespace Elsa.Samples.CompositeActivitiesConsole
+namespace Elsa.Samples.ProgrammaticCompositeActivitiesConsole
 {
     class Program
     {
diff --git a/src/samples/Elsa.Samples.CompositeActivitiesConsole/Workflows/CompositionWorkflow.cs b/src/samples/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Workflows/CompositionWorkflow.cs
similarity index 56%
rename from src/samples/Elsa.Samples.CompositeActivitiesConsole/Workflows/CompositionWorkflow.cs
rename to src/samples/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Workflows/CompositionWorkflow.cs
index 2d0332c97..9cbd4c97c 100644
--- a/src/samples/Elsa.Samples.CompositeActivitiesConsole/Workflows/CompositionWorkflow.cs
+++ b/src/samples/Elsa.Samples.ProgrammaticCompositeActivitiesConsole/Workflows/CompositionWorkflow.cs
@@ -1,17 +1,20 @@
 using Elsa.Activities.Console;
 using Elsa.Builders;
-using Elsa.Samples.CompositeActivitiesConsole.Activities;
+using Elsa.Samples.ProgrammaticCompositeActivitiesConsole.Activities;
 
-namespace Elsa.Samples.CompositeActivitiesConsole.Workflows
+namespace Elsa.Samples.ProgrammaticCompositeActivitiesConsole.Workflows
 {
     /// <summary>
-    /// A basic workflow with just one WriteLine activity.
+    /// A basic workflow demonstrating the use of composite activities.
     /// </summary>
     public class CompositionWorkflow : IWorkflow
     {
         public void Build(IWorkflowBuilder workflow) => workflow
             .WriteLine("Welcome to the Composite Activities demo workflow!")
+            
+            // A custom, composite activity
             .Then<CountDownActivity>()
+            
             .WriteLine("Done!");
     }
 }
\ No newline at end of file