diff --git a/core/src/main/java/org/apache/gravitino/listener/TagEventDispatcher.java b/core/src/main/java/org/apache/gravitino/listener/TagEventDispatcher.java
index da0052ea73e..e5754fc58b0 100644
--- a/core/src/main/java/org/apache/gravitino/listener/TagEventDispatcher.java
+++ b/core/src/main/java/org/apache/gravitino/listener/TagEventDispatcher.java
@@ -35,8 +35,8 @@
 import org.apache.gravitino.listener.api.event.GetTagForMetadataObjectFailureEvent;
 import org.apache.gravitino.listener.api.event.ListMetadataObjectsForTagEvent;
 import org.apache.gravitino.listener.api.event.ListMetadataObjectsForTagFailureEvent;
-import org.apache.gravitino.listener.api.event.ListTagEvent;
-import org.apache.gravitino.listener.api.event.ListTagInfoEvent;
+import org.apache.gravitino.listener.api.event.ListTagsEvent;
+import org.apache.gravitino.listener.api.event.ListTagsInfoEvent;
 import org.apache.gravitino.listener.api.event.ListTagsFailureEvent;
 import org.apache.gravitino.listener.api.event.ListTagsForMetadataObjectEvent;
 import org.apache.gravitino.listener.api.event.ListTagsForMetadataObjectFailureEvent;
@@ -69,7 +69,7 @@ public String[] listTags(String metalake) {
     // TODO: listTagsPreEvent
     try {
       String[] tagNames = dispatcher.listTags(metalake);
-      eventBus.dispatchEvent(new ListTagEvent(PrincipalUtils.getCurrentUserName(), metalake));
+      eventBus.dispatchEvent(new ListTagsEvent(PrincipalUtils.getCurrentUserName(), metalake));
       return tagNames;
     } catch (Exception e) {
       eventBus.dispatchEvent(
@@ -84,7 +84,7 @@ public Tag[] listTagsInfo(String metalake) {
     try {
       Tag[] tags = dispatcher.listTagsInfo(metalake);
       eventBus.dispatchEvent(
-          new ListTagInfoEvent(PrincipalUtils.getCurrentUserName(), metalake, tags));
+          new ListTagsInfoEvent(PrincipalUtils.getCurrentUserName(), metalake, tags));
       return tags;
     } catch (Exception e) {
       eventBus.dispatchEvent(
diff --git a/core/src/main/java/org/apache/gravitino/listener/api/event/ListTagEvent.java b/core/src/main/java/org/apache/gravitino/listener/api/event/ListTagsEvent.java
similarity index 94%
rename from core/src/main/java/org/apache/gravitino/listener/api/event/ListTagEvent.java
rename to core/src/main/java/org/apache/gravitino/listener/api/event/ListTagsEvent.java
index 6b4000e5ee2..2e38598c285 100644
--- a/core/src/main/java/org/apache/gravitino/listener/api/event/ListTagEvent.java
+++ b/core/src/main/java/org/apache/gravitino/listener/api/event/ListTagsEvent.java
@@ -24,7 +24,7 @@
 
 /** Represents an event that is triggered upon the successful listing of tags. */
 @DeveloperApi
-public final class ListTagEvent extends TagEvent {
+public final class ListTagsEvent extends TagEvent {
   private final String metalake;
 
   /**
@@ -33,7 +33,7 @@ public final class ListTagEvent extends TagEvent {
    * @param user The username of the individual who initiated the tag listing.
    * @param metalake The namespace from which tags were listed.
    */
-  public ListTagEvent(String user, String metalake) {
+  public ListTagsEvent(String user, String metalake) {
     super(user, NameIdentifier.of(metalake));
     this.metalake = metalake;
   }
diff --git a/core/src/main/java/org/apache/gravitino/listener/api/event/ListTagInfoEvent.java b/core/src/main/java/org/apache/gravitino/listener/api/event/ListTagsInfoEvent.java
similarity index 93%
rename from core/src/main/java/org/apache/gravitino/listener/api/event/ListTagInfoEvent.java
rename to core/src/main/java/org/apache/gravitino/listener/api/event/ListTagsInfoEvent.java
index 48b4074287a..092b763dde7 100644
--- a/core/src/main/java/org/apache/gravitino/listener/api/event/ListTagInfoEvent.java
+++ b/core/src/main/java/org/apache/gravitino/listener/api/event/ListTagsInfoEvent.java
@@ -25,7 +25,7 @@
 
 /** Represents an event that is triggered upon the successful listing of tags. */
 @DeveloperApi
-public final class ListTagInfoEvent extends TagEvent {
+public final class ListTagsInfoEvent extends TagEvent {
   private final Tag[] tags;
 
   /**
@@ -35,7 +35,7 @@ public final class ListTagInfoEvent extends TagEvent {
    * @param metalake The namespace from which tags were listed.
    * @param tags An array of {@link Tag} objects representing the tags.
    */
-  public ListTagInfoEvent(String user, String metalake, Tag[] tags) {
+  public ListTagsInfoEvent(String user, String metalake, Tag[] tags) {
     super(user, NameIdentifier.of(metalake));
     this.tags = tags;
   }