diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/ChangeEventRepository.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/ChangeEventRepository.java
index 7d0703f0d0d..e97d35efed6 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/ChangeEventRepository.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/ChangeEventRepository.java
@@ -17,7 +17,7 @@
 package org.openmetadata.catalog.jdbi3;
 
 import org.jdbi.v3.sqlobject.transaction.Transaction;
-import org.openmetadata.catalog.resources.events.EventsResource.ChangeEventList;
+import org.openmetadata.catalog.resources.events.EventResource.ChangeEventList;
 import org.openmetadata.catalog.type.ChangeEvent;
 import org.openmetadata.catalog.util.JsonUtils;
 import org.openmetadata.catalog.util.ResultList;
@@ -27,7 +27,6 @@ import org.slf4j.LoggerFactory;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 public class ChangeEventRepository {
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/events/EventsResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/events/EventResource.java
similarity index 97%
rename from catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/events/EventsResource.java
rename to catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/events/EventResource.java
index f2f0186ce95..573d4c7ad23 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/events/EventsResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/events/EventResource.java
@@ -55,7 +55,7 @@ import java.util.Objects;
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
 @Collection(name = "events")
-public class EventsResource {
+public class EventResource {
   private final ChangeEventRepository dao;
 
   public static class ChangeEventList extends ResultList<ChangeEvent> {
@@ -69,7 +69,7 @@ public class EventsResource {
   }
 
   @Inject
-  public EventsResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
+  public EventResource(CollectionDAO dao, CatalogAuthorizer authorizer) {
     Objects.requireNonNull(dao, "ChangeEventRepository must not be null");
     this.dao = new ChangeEventRepository(dao);
   }
diff --git a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/EntityResourceTest.java b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/EntityResourceTest.java
index 24aaa1821a3..d7913dc49ef 100644
--- a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/EntityResourceTest.java
+++ b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/EntityResourceTest.java
@@ -22,7 +22,7 @@ import org.openmetadata.catalog.exception.CatalogExceptionMessage;
 import org.openmetadata.catalog.jdbi3.DatabaseServiceRepository.DatabaseServiceEntityInterface;
 import org.openmetadata.catalog.jdbi3.MessagingServiceRepository.MessagingServiceEntityInterface;
 import org.openmetadata.catalog.jdbi3.PipelineServiceRepository.PipelineServiceEntityInterface;
-import org.openmetadata.catalog.resources.events.EventsResource.ChangeEventList;
+import org.openmetadata.catalog.resources.events.EventResource.ChangeEventList;
 import org.openmetadata.catalog.resources.services.DatabaseServiceResourceTest;
 import org.openmetadata.catalog.resources.services.MessagingServiceResourceTest;
 import org.openmetadata.catalog.resources.teams.TeamResourceTest;
@@ -53,7 +53,6 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;