diff --git a/Hyperbar.Windows.Primary/WidgetComponentMapping.cs b/Hyperbar.Windows.Primary/WidgetComponentMapping.cs
index 020ac08..579c491 100644
--- a/Hyperbar.Windows.Primary/WidgetComponentMapping.cs
+++ b/Hyperbar.Windows.Primary/WidgetComponentMapping.cs
@@ -1,4 +1,5 @@
 
+
 namespace Hyperbar.Windows.Primary;
 
 public class WidgetComponentMappingHandler(PrimaryWidgetConfiguration configuration,
@@ -6,7 +7,7 @@ public class WidgetComponentMappingHandler(PrimaryWidgetConfiguration configurat
     IMediator mediator) :
     IMappingHandler<PrimaryWidgetConfiguration, IEnumerable<IWidgetComponentViewModel>>
 {
-    public IEnumerable<IWidgetComponentViewModel> Handle()
+    public IEnumerable<IWidgetComponentViewModel> Map()
     {
         foreach (IPrimaryCommandConfiguration item in configuration)
         {
diff --git a/Hyperbar/Extensions/IServiceCollectionExtensions.cs b/Hyperbar/Extensions/IServiceCollectionExtensions.cs
index a76cc09..2cc0020 100644
--- a/Hyperbar/Extensions/IServiceCollectionExtensions.cs
+++ b/Hyperbar/Extensions/IServiceCollectionExtensions.cs
@@ -50,11 +50,10 @@ public static class IServiceCollectionExtensions
         {
             if (mappingContract.GetGenericArguments() is { Length: 2 } arguments)
             {
-                Type requestType = arguments[0];
                 Type responseType = arguments[1];
 
                 services.AddTransient(typeof(THandler));
-                services.AddTransient(responseType, provider => ((dynamic)provider.GetRequiredService<THandler>()).Handle());
+                services.AddTransient(responseType, provider => ((dynamic)provider.GetRequiredService<THandler>()).Map());
             }
         }
 
diff --git a/Hyperbar/Mediators/IMappingHandler.cs b/Hyperbar/Mediators/IMappingHandler.cs
index c6045b6..b3f0a5c 100644
--- a/Hyperbar/Mediators/IMappingHandler.cs
+++ b/Hyperbar/Mediators/IMappingHandler.cs
@@ -1,7 +1,6 @@
 namespace Hyperbar;
 
-public interface IMappingHandler<TFrom, TTo> :
-    IHandler
+public interface IMappingHandler<TFrom, TTo> : IHandler 
 {
-    TTo Handle();
-}
+    TTo Map();
+}
\ No newline at end of file
diff --git a/Hyperbar/Mediators/Map.cs b/Hyperbar/Mediators/Map.cs
deleted file mode 100644
index 15d64d4..0000000
--- a/Hyperbar/Mediators/Map.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace Hyperbar;
-
-public class Map<TFrom, TTo>;