diff --git a/ContentGrabbingJi-Event/src/main/java/net/lamgc/cgj/bot/event/EventHandlerRegistry.java b/ContentGrabbingJi-Event/src/main/java/net/lamgc/cgj/bot/event/HandlerRegistry.java
similarity index 94%
rename from ContentGrabbingJi-Event/src/main/java/net/lamgc/cgj/bot/event/EventHandlerRegistry.java
rename to ContentGrabbingJi-Event/src/main/java/net/lamgc/cgj/bot/event/HandlerRegistry.java
index caa71a0..c4c5cf9 100644
--- a/ContentGrabbingJi-Event/src/main/java/net/lamgc/cgj/bot/event/EventHandlerRegistry.java
+++ b/ContentGrabbingJi-Event/src/main/java/net/lamgc/cgj/bot/event/HandlerRegistry.java
@@ -25,7 +25,7 @@ import java.util.Map;
  * <p> 实现了该接口的类将允许注册事件处理方法.
  * @author LamGC
  */
-public interface EventHandlerRegistry {
+public interface HandlerRegistry {
 
     /**
      * 注册对象中的事件处理方法.
@@ -37,7 +37,7 @@ public interface EventHandlerRegistry {
     /**
      * 获取能处理指定事件的所有方法.
      * @param event 待匹配的事件对象.
-     * @return 返回一个集合, 集合存储了可处理该事件的所有方法.
+     * @return 返回一个集合, 集合存储了可处理该事件的所有方法和它所属类的对象.
      */
     Map<Method, Object> getMatchedHandlerMethod(EventObject event);
 
diff --git a/ContentGrabbingJi-core/src/main/java/net/lamgc/cgj/bot/event/DefaultEventHandlerRegistry.java b/ContentGrabbingJi-core/src/main/java/net/lamgc/cgj/bot/event/DefaultHandlerRegistry.java
similarity index 97%
rename from ContentGrabbingJi-core/src/main/java/net/lamgc/cgj/bot/event/DefaultEventHandlerRegistry.java
rename to ContentGrabbingJi-core/src/main/java/net/lamgc/cgj/bot/event/DefaultHandlerRegistry.java
index 018c6c9..085ecfe 100644
--- a/ContentGrabbingJi-core/src/main/java/net/lamgc/cgj/bot/event/DefaultEventHandlerRegistry.java
+++ b/ContentGrabbingJi-core/src/main/java/net/lamgc/cgj/bot/event/DefaultHandlerRegistry.java
@@ -25,7 +25,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
  * 默认的事件处理注册器.
  * @author LamGC
  */
-public class DefaultEventHandlerRegistry implements EventHandlerRegistry {
+public class DefaultHandlerRegistry implements HandlerRegistry {
 
     private final Map<Method, Object> instanceMap = new Hashtable<>();
     private final Map<Class<? extends EventObject>, Set<Method>> eventHandlerMap = new Hashtable<>();