diff --git a/src/Volo.Abp.EventBus/Volo/Abp/EventBus/EventBus.cs b/src/Volo.Abp.EventBus/Volo/Abp/EventBus/EventBus.cs
index f699f83dad..9166909881 100644
--- a/src/Volo.Abp.EventBus/Volo/Abp/EventBus/EventBus.cs
+++ b/src/Volo.Abp.EventBus/Volo/Abp/EventBus/EventBus.cs
@@ -114,7 +114,7 @@ namespace Volo.Abp.EventBus
             GetOrCreateHandlerFactories(eventType)
                 .Locking(factories => factories.Add(factory));
 
-            return new FactoryUnregistrar(this, eventType, factory);
+            return new EventHandlerFactoryUnregistrar(this, eventType, factory);
         }
 
         /// <inheritdoc/>
diff --git a/src/Volo.Abp.EventBus/Volo/Abp/EventBus/FactoryUnregistrar.cs b/src/Volo.Abp.EventBus/Volo/Abp/EventBus/EventHandlerFactoryUnregistrar.cs
similarity index 76%
rename from src/Volo.Abp.EventBus/Volo/Abp/EventBus/FactoryUnregistrar.cs
rename to src/Volo.Abp.EventBus/Volo/Abp/EventBus/EventHandlerFactoryUnregistrar.cs
index 9e08d3fd8a..671d8e4705 100644
--- a/src/Volo.Abp.EventBus/Volo/Abp/EventBus/FactoryUnregistrar.cs
+++ b/src/Volo.Abp.EventBus/Volo/Abp/EventBus/EventHandlerFactoryUnregistrar.cs
@@ -5,13 +5,13 @@ namespace Volo.Abp.EventBus
     /// <summary>
     /// Used to unregister a <see cref="IEventHandlerFactory"/> on <see cref="Dispose"/> method.
     /// </summary>
-    internal class FactoryUnregistrar : IDisposable
+    internal class EventHandlerFactoryUnregistrar : IDisposable
     {
         private readonly IEventBus _eventBus;
         private readonly Type _eventType;
         private readonly IEventHandlerFactory _factory;
 
-        public FactoryUnregistrar(IEventBus eventBus, Type eventType, IEventHandlerFactory factory)
+        public EventHandlerFactoryUnregistrar(IEventBus eventBus, Type eventType, IEventHandlerFactory factory)
         {
             _eventBus = eventBus;
             _eventType = eventType;