diff --git a/src/AsyncQueueProducer.php b/src/AsyncQueueProducer.php
index 7d63c389..f2ae8145 100644
--- a/src/AsyncQueueProducer.php
+++ b/src/AsyncQueueProducer.php
@@ -35,7 +35,7 @@ public function __construct(
         $this->dispatcher = new PushMiddlewareDispatcher(
             middlewareFactory: $middlewareConfig->middlewareFactory,
             middlewareDefinitions: [...$middlewareConfig->commonMiddlewareDefinitions, ...$middlewareDefinitions],
-            finishHandler: new AdapterPushHandler($adapter),
+            finalHandler: new AdapterPushHandler($adapter),
         );
     }
 
diff --git a/src/Middleware/Consume/ConsumeMiddlewareDispatcher.php b/src/Middleware/Consume/ConsumeMiddlewareDispatcher.php
index 84ef6a9a..dceeec23 100644
--- a/src/Middleware/Consume/ConsumeMiddlewareDispatcher.php
+++ b/src/Middleware/Consume/ConsumeMiddlewareDispatcher.php
@@ -33,15 +33,15 @@ public function __construct(
      * Dispatch request through middleware to get response.
      *
      * @param ConsumeRequest $request Request to pass to middleware.
-     * @param ConsumeHandlerInterface $finishHandler Handler to use in case no middleware produced a response.
+     * @param ConsumeHandlerInterface $finalHandler Handler to use in case no middleware produced a response.
      */
     public function dispatch(
         ConsumeRequest $request,
-        ConsumeHandlerInterface $finishHandler,
+        ConsumeHandlerInterface $finalHandler,
     ): ConsumeRequest {
         $type = $request->getMessage()->getType();
         if (!array_key_exists($type, $this->stack)) {
-            $this->stack[$type] = new ConsumeMiddlewareStack($this->buildMiddlewares(), $finishHandler);
+            $this->stack[$type] = new ConsumeMiddlewareStack($this->buildMiddlewares(), $finalHandler);
         }
 
         return $this->stack[$type]->handleConsume($request);
diff --git a/src/Middleware/Consume/ConsumeMiddlewareStack.php b/src/Middleware/Consume/ConsumeMiddlewareStack.php
index 1403e204..2c08961e 100644
--- a/src/Middleware/Consume/ConsumeMiddlewareStack.php
+++ b/src/Middleware/Consume/ConsumeMiddlewareStack.php
@@ -18,14 +18,13 @@ final class ConsumeMiddlewareStack implements ConsumeHandlerInterface
 
     /**
      * @param Closure[] $middlewares Middlewares.
-     * @param ConsumeHandlerInterface $finishHandler Fallback handler
-     * events.
+     * @param ConsumeHandlerInterface $finalHandler Handler invoked after all middlewares are processed.
      *
      * @psalm-param list<Closure():ConsumeMiddlewareInterface> $middlewares
      */
     public function __construct(
         private readonly array $middlewares,
-        private readonly ConsumeHandlerInterface $finishHandler,
+        private readonly ConsumeHandlerInterface $finalHandler,
     ) {}
 
     public function handleConsume(ConsumeRequest $request): ConsumeRequest
@@ -36,7 +35,7 @@ public function handleConsume(ConsumeRequest $request): ConsumeRequest
 
     private function build(): ConsumeHandlerInterface
     {
-        $handler = $this->finishHandler;
+        $handler = $this->finalHandler;
 
         foreach ($this->middlewares as $middleware) {
             $handler = $this->wrap($middleware, $handler);
diff --git a/src/Middleware/FailureHandling/FailureMiddlewareDispatcher.php b/src/Middleware/FailureHandling/FailureMiddlewareDispatcher.php
index ebc1a6a5..19c9d150 100644
--- a/src/Middleware/FailureHandling/FailureMiddlewareDispatcher.php
+++ b/src/Middleware/FailureHandling/FailureMiddlewareDispatcher.php
@@ -31,11 +31,11 @@ public function __construct(
      * Dispatch request through middleware to get response.
      *
      * @param FailureHandlingRequest $request Request to pass to middleware.
-     * @param FailureHandlerInterface $finishHandler Handler to use in case no middleware produced a response.
+     * @param FailureHandlerInterface $finalHandler Handler to use in case no middleware produced a response.
      */
     public function dispatch(
         FailureHandlingRequest $request,
-        FailureHandlerInterface $finishHandler,
+        FailureHandlerInterface $finalHandler,
     ): FailureHandlingRequest {
         $queueName = $request->getQueueName();
         if (!isset($this->middlewareDefinitions[$queueName]) || $this->middlewareDefinitions[$queueName] === []) {
@@ -43,7 +43,7 @@ public function dispatch(
         }
         $definitions = array_reverse($this->middlewareDefinitions[$queueName]);
 
-        $this->stack[$queueName] ??= new FailureMiddlewareStack($this->buildMiddlewares(...$definitions), $finishHandler);
+        $this->stack[$queueName] ??= new FailureMiddlewareStack($this->buildMiddlewares(...$definitions), $finalHandler);
 
         return $this->stack[$queueName]->handleFailure($request);
     }
diff --git a/src/Middleware/FailureHandling/FailureMiddlewareStack.php b/src/Middleware/FailureHandling/FailureMiddlewareStack.php
index 6040ba7d..9235e24f 100644
--- a/src/Middleware/FailureHandling/FailureMiddlewareStack.php
+++ b/src/Middleware/FailureHandling/FailureMiddlewareStack.php
@@ -18,14 +18,13 @@ final class FailureMiddlewareStack implements FailureHandlerInterface
 
     /**
      * @param Closure[] $middlewares Middlewares.
-     * @param FailureHandlerInterface $finishHandler Fallback handler
-     * events.
+     * @param FailureHandlerInterface $finalHandler Handler invoked after all middlewares are processed.
      *
      * @psalm-param list<Closure():FailureMiddlewareInterface> $middlewares
      */
     public function __construct(
         private readonly array $middlewares,
-        private readonly FailureHandlerInterface $finishHandler,
+        private readonly FailureHandlerInterface $finalHandler,
     ) {}
 
     public function handleFailure(FailureHandlingRequest $request): FailureHandlingRequest
@@ -36,7 +35,7 @@ public function handleFailure(FailureHandlingRequest $request): FailureHandlingR
 
     private function build(): FailureHandlerInterface
     {
-        $handler = $this->finishHandler;
+        $handler = $this->finalHandler;
 
         foreach ($this->middlewares as $middleware) {
             $handler = $this->wrap($middleware, $handler);
diff --git a/src/Middleware/Push/PushMiddlewareDispatcher.php b/src/Middleware/Push/PushMiddlewareDispatcher.php
index 54e3abb5..0cafdaf1 100644
--- a/src/Middleware/Push/PushMiddlewareDispatcher.php
+++ b/src/Middleware/Push/PushMiddlewareDispatcher.php
@@ -22,12 +22,12 @@ final class PushMiddlewareDispatcher
     /**
      * @param PushMiddlewareFactoryInterface $middlewareFactory Factory used to instantiate middleware.
      * @param mixed[] $middlewareDefinitions Middleware definitions.
-     * @param PushHandlerInterface $finishHandler Finish message handler.
+     * @param PushHandlerInterface $finalHandler Handler invoked after all middlewares are processed.
      */
     public function __construct(
         private readonly PushMiddlewareFactoryInterface $middlewareFactory,
         private array $middlewareDefinitions,
-        private PushHandlerInterface $finishHandler,
+        private PushHandlerInterface $finalHandler,
     ) {}
 
     /**
@@ -37,15 +37,15 @@ public function __construct(
      */
     public function dispatch(MessageInterface $message): MessageInterface
     {
-        $this->stack ??= new PushMiddlewareStack($this->buildMiddlewares(), $this->finishHandler);
+        $this->stack ??= new PushMiddlewareStack($this->buildMiddlewares(), $this->finalHandler);
 
         return $this->stack->handlePush($message);
     }
 
-    public function withFinishHandler(PushHandlerInterface $finishHandler): self
+    public function withFinalHandler(PushHandlerInterface $finalHandler): self
     {
         $instance = clone $this;
-        $instance->finishHandler = $finishHandler;
+        $instance->finalHandler = $finalHandler;
 
         // Fixes a memory leak.
         unset($instance->stack);
diff --git a/src/Middleware/Push/PushMiddlewareStack.php b/src/Middleware/Push/PushMiddlewareStack.php
index 4ea47696..11c4e432 100644
--- a/src/Middleware/Push/PushMiddlewareStack.php
+++ b/src/Middleware/Push/PushMiddlewareStack.php
@@ -22,13 +22,13 @@ final class PushMiddlewareStack implements PushHandlerInterface
 
     /**
      * @param Closure[] $middlewares Middlewares.
-     * @param PushHandlerInterface $finishHandler Final handler invoked after all middlewares are processed.
+     * @param PushHandlerInterface $finalHandler Handler invoked after all middlewares are processed.
      *
      * @psalm-param list<Closure():PushMiddlewareInterface> $middlewares
      */
     public function __construct(
         private readonly array $middlewares,
-        private readonly PushHandlerInterface $finishHandler,
+        private readonly PushHandlerInterface $finalHandler,
     ) {}
 
     public function handlePush(MessageInterface $message): MessageInterface
@@ -39,7 +39,7 @@ public function handlePush(MessageInterface $message): MessageInterface
 
     private function build(): PushHandlerInterface
     {
-        $handler = $this->finishHandler;
+        $handler = $this->finalHandler;
 
         foreach (array_reverse($this->middlewares) as $middleware) {
             $handler = $this->wrap($middleware, $handler);
diff --git a/src/SyncQueueProducer.php b/src/SyncQueueProducer.php
index 555c21fd..24cb641d 100644
--- a/src/SyncQueueProducer.php
+++ b/src/SyncQueueProducer.php
@@ -34,7 +34,7 @@ public function __construct(
         $this->dispatcher = new PushMiddlewareDispatcher(
             middlewareFactory: $middlewareConfig->middlewareFactory,
             middlewareDefinitions: [...$middlewareConfig->commonMiddlewareDefinitions, ...$middlewareDefinitions],
-            finishHandler: new SynchronousPushHandler($worker, $this),
+            finalHandler: new SynchronousPushHandler($worker, $this),
         );
     }
 
diff --git a/src/Worker/Worker.php b/src/Worker/Worker.php
index 5b8eb8bc..4aefeeb8 100644
--- a/src/Worker/Worker.php
+++ b/src/Worker/Worker.php
@@ -45,8 +45,8 @@ public function process(
         $request = new ConsumeRequest($message, $queueName);
         try {
             $handler = $this->handlerResolver->resolve($message->getType());
-            $finishHandler = new ConsumeFinalHandler($handler->handle(...));
-            $this->consumeMiddlewareDispatcher->dispatch($request, $finishHandler);
+            $finalHandler = new ConsumeFinalHandler($handler->handle(...));
+            $this->consumeMiddlewareDispatcher->dispatch($request, $finalHandler);
         } catch (Throwable $exception) {
             $request = new FailureHandlingRequest($request->getMessage(), $exception, $request->getQueueName(), $retryProducer);