diff --git a/samples/KafkaFlow.Sample.BatchOperations/PrintConsoleMiddleware.cs b/samples/KafkaFlow.Sample.BatchOperations/PrintConsoleMiddleware.cs
index 11d38754d..438689b7a 100644
--- a/samples/KafkaFlow.Sample.BatchOperations/PrintConsoleMiddleware.cs
+++ b/samples/KafkaFlow.Sample.BatchOperations/PrintConsoleMiddleware.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using KafkaFlow.Middlewares.BatchConsume;
+using KafkaFlow.Batching;
 
 namespace KafkaFlow.Sample.BatchOperations;
 
diff --git a/samples/KafkaFlow.Sample.BatchOperations/Program.cs b/samples/KafkaFlow.Sample.BatchOperations/Program.cs
index 309445869..d2597957b 100644
--- a/samples/KafkaFlow.Sample.BatchOperations/Program.cs
+++ b/samples/KafkaFlow.Sample.BatchOperations/Program.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using KafkaFlow;
-using KafkaFlow.Middlewares.BatchConsume;
+using KafkaFlow.Batching;
 using KafkaFlow.Producers;
 using KafkaFlow.Sample.BatchOperations;
 using KafkaFlow.Serializer;
@@ -37,7 +37,7 @@
                         .AddMiddlewares(
                             middlewares => middlewares
                                 .AddDeserializer<JsonCoreDeserializer>()
-                                .BatchConsume(10, TimeSpan.FromSeconds(10))
+                                .AddBatching(10, TimeSpan.FromSeconds(10))
                                 .Add<PrintConsoleMiddleware>()
                         )
                 )
diff --git a/samples/KafkaFlow.Sample/Program.cs b/samples/KafkaFlow.Sample/Program.cs
index 4f2e313e1..54339254d 100644
--- a/samples/KafkaFlow.Sample/Program.cs
+++ b/samples/KafkaFlow.Sample/Program.cs
@@ -33,7 +33,7 @@
                         .WithWorkersCount(3)
                         .AddMiddlewares(
                             middlewares => middlewares
-                                .AddDeserializer<ProtobufNetSerializer>()
+                                .AddDeserializer<ProtobufNetDeserializer>()
                                 .AddTypedHandlers(h => h.AddHandler<PrintConsoleHandler>())
                         )
                 )
diff --git a/src/KafkaFlow.Admin/Extensions/ClusterConfigurationBuilderExtensions.cs b/src/KafkaFlow.Admin/Extensions/ClusterConfigurationBuilderExtensions.cs
index cefd11e59..a705233d7 100644
--- a/src/KafkaFlow.Admin/Extensions/ClusterConfigurationBuilderExtensions.cs
+++ b/src/KafkaFlow.Admin/Extensions/ClusterConfigurationBuilderExtensions.cs
@@ -54,7 +54,7 @@ public static IClusterConfigurationBuilder EnableAdminMessages(
                         .DisableManagement()
                         .AddMiddlewares(
                             middlewares => middlewares
-                                .AddDeserializer<ProtobufNetSerializer>()
+                                .AddDeserializer<ProtobufNetDeserializer>()
                                 .AddTypedHandlers(
                                     handlers => handlers
                                         .WithHandlerLifetime(InstanceLifetime.Singleton)
@@ -123,7 +123,7 @@ public static IClusterConfigurationBuilder EnableTelemetry(
                         .WithAutoOffsetReset(AutoOffsetReset.Latest)
                         .AddMiddlewares(
                             middlewares => middlewares
-                                .AddDeserializer<ProtobufNetSerializer>()
+                                .AddDeserializer<ProtobufNetDeserializer>()
                                 .AddTypedHandlers(
                                     handlers => handlers
                                         .WithHandlerLifetime(InstanceLifetime.Singleton)
diff --git a/src/KafkaFlow.IntegrationTests/Core/Bootstrapper.cs b/src/KafkaFlow.IntegrationTests/Core/Bootstrapper.cs
index 5c83c6ac9..a50c44516 100644
--- a/src/KafkaFlow.IntegrationTests/Core/Bootstrapper.cs
+++ b/src/KafkaFlow.IntegrationTests/Core/Bootstrapper.cs
@@ -208,7 +208,7 @@ private static void SetupServices(HostBuilderContext context, IServiceCollection
                                     .WithAutoOffsetReset(AutoOffsetReset.Latest)
                                     .AddMiddlewares(
                                         middlewares => middlewares
-                                            .AddSingleTypeSerializer<ProtobufNetSerializer>(typeof(TestMessage1))
+                                            .AddSingleTypeDeserializer<ProtobufNetDeserializer>(typeof(TestMessage1))
                                             .AddTypedHandlers(
                                                 handlers =>
                                                     handlers
@@ -229,7 +229,7 @@ private static void SetupServices(HostBuilderContext context, IServiceCollection
                                         })
                                     .AddMiddlewares(
                                         middlewares => middlewares
-                                            .AddSingleTypeDeserializer<PauseResumeMessage, ProtobufNetSerializer>()
+                                            .AddSingleTypeDeserializer<PauseResumeMessage, ProtobufNetDeserializer>()
                                             .AddTypedHandlers(
                                                 handlers =>
                                                     handlers
@@ -287,7 +287,7 @@ private static void SetupServices(HostBuilderContext context, IServiceCollection
                                     .AddMiddlewares(
                                         middlewares => middlewares
                                             .AddDecompressor<GzipMessageDecompressor>()
-                                            .AddDeserializer<ProtobufNetSerializer>()
+                                            .AddDeserializer<ProtobufNetDeserializer>()
                                             .AddTypedHandlers(
                                                 handlers =>
                                                     handlers
diff --git a/src/KafkaFlow/Serializer/Configuration/ConsumerMiddlewareConfigurationBuilder.cs b/src/KafkaFlow/Serializer/Configuration/ConsumerMiddlewareConfigurationBuilder.cs
index 0000a6642..487731d1f 100644
--- a/src/KafkaFlow/Serializer/Configuration/ConsumerMiddlewareConfigurationBuilder.cs
+++ b/src/KafkaFlow/Serializer/Configuration/ConsumerMiddlewareConfigurationBuilder.cs
@@ -94,7 +94,7 @@ public static IConsumerMiddlewareConfigurationBuilder AddDeserializer<TDeseriali
         /// <typeparam name="TMessage">The message type</typeparam>
         /// <typeparam name="TDeserializer">A class that implements <see cref="IDeserializer"/></typeparam>
         /// <returns></returns>
-        public static IConsumerMiddlewareConfigurationBuilder AddSingleTypeSerializer<TMessage, TDeserializer>(
+        public static IConsumerMiddlewareConfigurationBuilder AddSingleTypeDeserializer<TMessage, TDeserializer>(
             this IConsumerMiddlewareConfigurationBuilder middlewares,
             Factory<TDeserializer> serializerFactory)
             where TDeserializer : class, IDeserializer
@@ -115,7 +115,7 @@ public static IConsumerMiddlewareConfigurationBuilder AddSingleTypeDeserializer<
             this IConsumerMiddlewareConfigurationBuilder middlewares)
             where TDeserializer : class, IDeserializer
         {
-            return middlewares.AddSingleTypeSerializer<TDeserializer>(typeof(TMessage));
+            return middlewares.AddSingleTypeDeserializer<TDeserializer>(typeof(TMessage));
         }
 
         /// <summary>
@@ -125,7 +125,7 @@ public static IConsumerMiddlewareConfigurationBuilder AddSingleTypeDeserializer<
         /// <param name="messageType">The message type</param>
         /// <typeparam name="TDeserializer">A class that implements <see cref="IDeserializer"/></typeparam>
         /// <returns></returns>
-        public static IConsumerMiddlewareConfigurationBuilder AddSingleTypeSerializer<TDeserializer>(
+        public static IConsumerMiddlewareConfigurationBuilder AddSingleTypeDeserializer<TDeserializer>(
             this IConsumerMiddlewareConfigurationBuilder middlewares,
             Type messageType)
             where TDeserializer : class, IDeserializer
@@ -145,7 +145,7 @@ public static IConsumerMiddlewareConfigurationBuilder AddSingleTypeSerializer<TD
         /// <param name="messageType">The message type</param>
         /// <typeparam name="TDeserializer">A class that implements <see cref="IDeserializer"/></typeparam>
         /// <returns></returns>
-        public static IConsumerMiddlewareConfigurationBuilder AddSingleTypeSerializer<TDeserializer>(
+        public static IConsumerMiddlewareConfigurationBuilder AddSingleTypeDeserializer<TDeserializer>(
             this IConsumerMiddlewareConfigurationBuilder middlewares,
             Factory<TDeserializer> serializerFactory,
             Type messageType)