diff --git a/src/KafkaFlow.OpenTelemetry/ExtensionMethods.cs b/src/KafkaFlow.OpenTelemetry/ExtensionMethods.cs
index e62d711d6..33124a67f 100644
--- a/src/KafkaFlow.OpenTelemetry/ExtensionMethods.cs
+++ b/src/KafkaFlow.OpenTelemetry/ExtensionMethods.cs
@@ -18,32 +18,32 @@ public static IKafkaConfigurationBuilder AddOpenTelemetryInstrumentation(this IK
             {
                 hub.MessageConsumeStarted.Subscribe(eventContext =>
                 {
-                    return OpenTelemetryConsumerObserver.OnConsumeStarted(eventContext.MessageContext);
+                    return OpenTelemetryConsumerEventsHandler.OnConsumeStarted(eventContext.MessageContext);
                 });
 
                 hub.MessageConsumeError.Subscribe(eventContext =>
                 {
-                    return OpenTelemetryConsumerObserver.OnConsumeError(eventContext.MessageContext, eventContext.Exception);
+                    return OpenTelemetryConsumerEventsHandler.OnConsumeError(eventContext.MessageContext, eventContext.Exception);
                 });
 
                 hub.MessageConsumeCompleted.Subscribe(eventContext =>
                 {
-                    return OpenTelemetryConsumerObserver.OnConsumeCompleted(eventContext.MessageContext);
+                    return OpenTelemetryConsumerEventsHandler.OnConsumeCompleted(eventContext.MessageContext);
                 });
 
                 hub.MessageProduceStarted.Subscribe(eventContext =>
                 {
-                    return OpenTelemetryProducerObserver.OnProducerStarted(eventContext.MessageContext);
+                    return OpenTelemetryProducerEventsHandler.OnProducerStarted(eventContext.MessageContext);
                 });
 
                 hub.MessageProduceError.Subscribe(eventContext =>
                 {
-                    return OpenTelemetryProducerObserver.OnProducerError(eventContext.MessageContext, eventContext.Exception);
+                    return OpenTelemetryProducerEventsHandler.OnProducerError(eventContext.MessageContext, eventContext.Exception);
                 });
 
                 hub.MessageProduceCompleted.Subscribe(eventContext =>
                 {
-                    return OpenTelemetryProducerObserver.OnProducerCompleted(eventContext.MessageContext);
+                    return OpenTelemetryProducerEventsHandler.OnProducerCompleted(eventContext.MessageContext);
                 });
             });
 
diff --git a/src/KafkaFlow.OpenTelemetry/OpenTelemetryConsumerObserver.cs b/src/KafkaFlow.OpenTelemetry/OpenTelemetryConsumerEventsHandler.cs
similarity index 98%
rename from src/KafkaFlow.OpenTelemetry/OpenTelemetryConsumerObserver.cs
rename to src/KafkaFlow.OpenTelemetry/OpenTelemetryConsumerEventsHandler.cs
index a4f292a01..28f85b382 100644
--- a/src/KafkaFlow.OpenTelemetry/OpenTelemetryConsumerObserver.cs
+++ b/src/KafkaFlow.OpenTelemetry/OpenTelemetryConsumerEventsHandler.cs
@@ -8,7 +8,7 @@
     using global::OpenTelemetry;
     using global::OpenTelemetry.Context.Propagation;
 
-    internal static class OpenTelemetryConsumerObserver
+    internal static class OpenTelemetryConsumerEventsHandler
     {
         private static readonly TextMapPropagator Propagator = Propagators.DefaultTextMapPropagator;
         private static readonly string ProcessString = "process";
diff --git a/src/KafkaFlow.OpenTelemetry/OpenTelemetryProducerObserver.cs b/src/KafkaFlow.OpenTelemetry/OpenTelemetryProducerEventsHandler.cs
similarity index 98%
rename from src/KafkaFlow.OpenTelemetry/OpenTelemetryProducerObserver.cs
rename to src/KafkaFlow.OpenTelemetry/OpenTelemetryProducerEventsHandler.cs
index b0d4f4c1b..fb3f835eb 100644
--- a/src/KafkaFlow.OpenTelemetry/OpenTelemetryProducerObserver.cs
+++ b/src/KafkaFlow.OpenTelemetry/OpenTelemetryProducerEventsHandler.cs
@@ -8,7 +8,7 @@
     using global::OpenTelemetry;
     using global::OpenTelemetry.Context.Propagation;
 
-    internal static class OpenTelemetryProducerObserver
+    internal static class OpenTelemetryProducerEventsHandler
     {
         private static readonly TextMapPropagator Propagator = Propagators.DefaultTextMapPropagator;
         private static readonly string PublishString = "publish";