diff --git a/framework/src/main/java/org/toop/framework/eventbus/GlobalEventBus.java b/framework/src/main/java/org/toop/framework/eventbus/GlobalEventBus.java
index df71cbe..c2abf22 100644
--- a/framework/src/main/java/org/toop/framework/eventbus/GlobalEventBus.java
+++ b/framework/src/main/java/org/toop/framework/eventbus/GlobalEventBus.java
@@ -3,13 +3,13 @@ package org.toop.framework.eventbus;
 import org.apache.logging.log4j.LogManager;
 import org.toop.framework.eventbus.bus.DisruptorEventBus;
 import org.toop.framework.eventbus.bus.EventBus;
-import org.toop.framework.eventbus.holder.AsyncEventsHolder;
+import org.toop.framework.eventbus.holder.AsyncSubscriberStore;
 import org.toop.framework.eventbus.subscriber.Subscriber;
 
 public class GlobalEventBus implements EventBus {
     private static final EventBus INSTANCE = new DisruptorEventBus(
             LogManager.getLogger(DisruptorEventBus.class),
-            new AsyncEventsHolder()
+            new AsyncSubscriberStore()
     );
 
     private GlobalEventBus() {}
diff --git a/framework/src/main/java/org/toop/framework/eventbus/bus/DefaultEventBus.java b/framework/src/main/java/org/toop/framework/eventbus/bus/DefaultEventBus.java
index 43a4244..b7c0322 100644
--- a/framework/src/main/java/org/toop/framework/eventbus/bus/DefaultEventBus.java
+++ b/framework/src/main/java/org/toop/framework/eventbus/bus/DefaultEventBus.java
@@ -1,9 +1,8 @@
 package org.toop.framework.eventbus.bus;
 
-import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.toop.framework.eventbus.events.EventType;
-import org.toop.framework.eventbus.holder.EventsHolder;
+import org.toop.framework.eventbus.holder.SubscriberStore;
 import org.toop.framework.eventbus.subscriber.Subscriber;
 
 import java.util.ArrayList;
@@ -12,9 +11,9 @@ import java.util.function.Consumer;
 
 public class DefaultEventBus implements EventBus {
     private final Logger logger;
-    private final EventsHolder eventsHolder;
+    private final SubscriberStore eventsHolder;
 
-    public DefaultEventBus(Logger logger, EventsHolder eventsHolder) {
+    public DefaultEventBus(Logger logger, SubscriberStore eventsHolder) {
         this.logger = logger;
         this.eventsHolder = eventsHolder;
     }
diff --git a/framework/src/main/java/org/toop/framework/eventbus/bus/DisruptorEventBus.java b/framework/src/main/java/org/toop/framework/eventbus/bus/DisruptorEventBus.java
index 92e17f4..61dec65 100644
--- a/framework/src/main/java/org/toop/framework/eventbus/bus/DisruptorEventBus.java
+++ b/framework/src/main/java/org/toop/framework/eventbus/bus/DisruptorEventBus.java
@@ -7,7 +7,7 @@ import com.lmax.disruptor.dsl.ProducerType;
 import org.apache.logging.log4j.Logger;
 import org.toop.framework.eventbus.subscriber.Subscriber;
 import org.toop.framework.eventbus.events.EventType;
-import org.toop.framework.eventbus.holder.EventsHolder;
+import org.toop.framework.eventbus.holder.SubscriberStore;
 
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ThreadFactory;
@@ -20,12 +20,12 @@ public class DisruptorEventBus implements EventBus {
     }
 
     private final Logger logger;
-    private final EventsHolder eventsHolder;
+    private final SubscriberStore eventsHolder;
 
     private final Disruptor<EventHolder<?>> disruptor;
     private final RingBuffer<EventHolder<?>> ringBuffer;
 
-    public DisruptorEventBus(Logger logger, EventsHolder eventsHolder) {
+    public DisruptorEventBus(Logger logger, SubscriberStore eventsHolder) {
         this.logger = logger;
         this.eventsHolder = eventsHolder;
 
diff --git a/framework/src/main/java/org/toop/framework/eventbus/holder/AsyncEventsHolder.java b/framework/src/main/java/org/toop/framework/eventbus/holder/AsyncSubscriberStore.java
similarity index 93%
rename from framework/src/main/java/org/toop/framework/eventbus/holder/AsyncEventsHolder.java
rename to framework/src/main/java/org/toop/framework/eventbus/holder/AsyncSubscriberStore.java
index cd7d0d3..333ec6b 100644
--- a/framework/src/main/java/org/toop/framework/eventbus/holder/AsyncEventsHolder.java
+++ b/framework/src/main/java/org/toop/framework/eventbus/holder/AsyncSubscriberStore.java
@@ -7,7 +7,7 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-public class AsyncEventsHolder implements EventsHolder {
+public class AsyncSubscriberStore implements SubscriberStore {
     private final Map<Class<?>, CopyOnWriteArrayList<Subscriber<?, ?>>> LISTENERS = new ConcurrentHashMap<>();
 
     @Override
diff --git a/framework/src/main/java/org/toop/framework/eventbus/holder/EventsHolder.java b/framework/src/main/java/org/toop/framework/eventbus/holder/SubscriberStore.java
similarity index 89%
rename from framework/src/main/java/org/toop/framework/eventbus/holder/EventsHolder.java
rename to framework/src/main/java/org/toop/framework/eventbus/holder/SubscriberStore.java
index 51493e3..babc1f9 100644
--- a/framework/src/main/java/org/toop/framework/eventbus/holder/EventsHolder.java
+++ b/framework/src/main/java/org/toop/framework/eventbus/holder/SubscriberStore.java
@@ -4,7 +4,7 @@ import org.toop.framework.eventbus.subscriber.Subscriber;
 
 import java.util.List;
 
-public interface EventsHolder {
+public interface SubscriberStore {
     void add(Subscriber<?, ?> subscriber);
     void remove(Subscriber<?, ?> subscriber);
     List<Subscriber<?, ?>> get(Class<?> event);
diff --git a/framework/src/main/java/org/toop/framework/eventbus/holder/SyncEventsHolder.java b/framework/src/main/java/org/toop/framework/eventbus/holder/SyncSubscriberStore.java
similarity index 93%
rename from framework/src/main/java/org/toop/framework/eventbus/holder/SyncEventsHolder.java
rename to framework/src/main/java/org/toop/framework/eventbus/holder/SyncSubscriberStore.java
index 7620a33..fd21221 100644
--- a/framework/src/main/java/org/toop/framework/eventbus/holder/SyncEventsHolder.java
+++ b/framework/src/main/java/org/toop/framework/eventbus/holder/SyncSubscriberStore.java
@@ -7,7 +7,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-public class SyncEventsHolder implements EventsHolder {
+public class SyncSubscriberStore implements SubscriberStore {
     private final Map<Class<?>, List<Subscriber<?, ?>>> LISTENERS = new ConcurrentHashMap<>();
 
     @Override