diff --git a/Frank.PulseFlow.Tests.Cli/TextPulseFlow.cs b/Frank.PulseFlow.Tests.Cli/TextPulseFlow.cs
index 75a8036..a0c8f5f 100644
--- a/Frank.PulseFlow.Tests.Cli/TextPulseFlow.cs
+++ b/Frank.PulseFlow.Tests.Cli/TextPulseFlow.cs
@@ -1,6 +1,6 @@
 namespace Frank.PulseFlow.Tests.Cli;
 
-public class TextPulseFlow : IPulseFlow
+public class TextPulseFlow : IFlow
 {
     private readonly ILogger<TextPulseFlow> _logger;
 
diff --git a/Frank.PulseFlow/PulseFlowBuilder.cs b/Frank.PulseFlow/FlowBuilder.cs
similarity index 65%
rename from Frank.PulseFlow/PulseFlowBuilder.cs
rename to Frank.PulseFlow/FlowBuilder.cs
index 50fadc7..0980fcc 100644
--- a/Frank.PulseFlow/PulseFlowBuilder.cs
+++ b/Frank.PulseFlow/FlowBuilder.cs
@@ -2,11 +2,11 @@
 
 namespace Frank.PulseFlow;
 
-public class PulseFlowBuilder : IPulseFlowBuilder
+public class FlowBuilder : IFlowBuilder
 {
     private readonly IServiceCollection _services;
 
-    public PulseFlowBuilder(IServiceCollection services)
+    public FlowBuilder(IServiceCollection services)
     {
         _services = services;
     }
@@ -16,9 +16,9 @@ public PulseFlowBuilder(IServiceCollection services)
     /// </summary>
     /// <typeparam name="T">The type of the flow to be added.</typeparam>
     /// <returns>The pulse flow builder instance.</returns>
-    public IPulseFlowBuilder AddFlow<T>() where T : class, IPulseFlow
+    public IFlowBuilder AddFlow<T>() where T : class, IFlow
     {
-        _services.AddTransient<IPulseFlow, T>();
+        _services.AddTransient<IFlow, T>();
         return this;
     }
 }
\ No newline at end of file
diff --git a/Frank.PulseFlow/IPulseFlow.cs b/Frank.PulseFlow/IFlow.cs
similarity index 90%
rename from Frank.PulseFlow/IPulseFlow.cs
rename to Frank.PulseFlow/IFlow.cs
index ee90eb0..a95c268 100644
--- a/Frank.PulseFlow/IPulseFlow.cs
+++ b/Frank.PulseFlow/IFlow.cs
@@ -1,9 +1,9 @@
 namespace Frank.PulseFlow;
 
 /// <summary>
-/// Represents a component that handles pulse flows.
+/// A flow is something that handles a pulse
 /// </summary>
-public interface IPulseFlow
+public interface IFlow
 {
     /// <summary>
     /// Handles the pulse asynchronously.
diff --git a/Frank.PulseFlow/IFlowBuilder.cs b/Frank.PulseFlow/IFlowBuilder.cs
new file mode 100644
index 0000000..53cb316
--- /dev/null
+++ b/Frank.PulseFlow/IFlowBuilder.cs
@@ -0,0 +1,11 @@
+namespace Frank.PulseFlow;
+
+public interface IFlowBuilder
+{
+    /// <summary>
+    /// Adds a flow of type T to the flow builder.
+    /// </summary>
+    /// <typeparam name="T">The type of flow to add.</typeparam>
+    /// <returns>The flow builder instance with the added flow.</returns>
+    IFlowBuilder AddFlow<T>() where T : class, IFlow;
+}
\ No newline at end of file
diff --git a/Frank.PulseFlow/IPulseFlowBuilder.cs b/Frank.PulseFlow/IPulseFlowBuilder.cs
deleted file mode 100644
index 451ff07..0000000
--- a/Frank.PulseFlow/IPulseFlowBuilder.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Frank.PulseFlow;
-
-public interface IPulseFlowBuilder
-{
-    /// <summary>
-    /// Adds a flow of type T to the pulse flow builder.
-    /// </summary>
-    /// <typeparam name="T">The type of flow to add.</typeparam>
-    /// <returns>The pulse flow builder instance with the added flow.</returns>
-    IPulseFlowBuilder AddFlow<T>() where T : class, IPulseFlow;
-}
\ No newline at end of file
diff --git a/Frank.PulseFlow/Internal/PulseNexus.cs b/Frank.PulseFlow/Internal/PulseNexus.cs
index c863048..8585761 100644
--- a/Frank.PulseFlow/Internal/PulseNexus.cs
+++ b/Frank.PulseFlow/Internal/PulseNexus.cs
@@ -5,9 +5,9 @@ namespace Frank.PulseFlow.Internal;
 internal class PulseNexus : BackgroundService
 {
     private readonly IChannel _channel;
-    private readonly IEnumerable<IPulseFlow> _pulseFlows;
+    private readonly IEnumerable<IFlow> _pulseFlows;
 
-    public PulseNexus(IChannel channel, IEnumerable<IPulseFlow> pulseFlows)
+    public PulseNexus(IChannel channel, IEnumerable<IFlow> pulseFlows)
     {
         _channel = channel;
         _pulseFlows = pulseFlows;
diff --git a/Frank.PulseFlow/ServiceCollectionExtensions.cs b/Frank.PulseFlow/ServiceCollectionExtensions.cs
index f704699..bcc6e66 100644
--- a/Frank.PulseFlow/ServiceCollectionExtensions.cs
+++ b/Frank.PulseFlow/ServiceCollectionExtensions.cs
@@ -12,9 +12,9 @@ public static class ServiceCollectionExtensions
     /// <param name="services">The service collection to which the PulseFlow components will be added.</param>
     /// <param name="configure">An action delegate to configure the PulseFlow builder.</param>
     /// <returns>The updated service collection.</returns>
-    public static IServiceCollection AddPulseFlow(this IServiceCollection services, Action<IPulseFlowBuilder> configure)
+    public static IServiceCollection AddPulseFlow(this IServiceCollection services, Action<IFlowBuilder> configure)
     {
-        PulseFlowBuilder builder = new(services);
+        FlowBuilder builder = new(services);
         configure(builder);
 
         services.AddHostedService<PulseNexus>();