diff --git a/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/FileSystemViewHandler.java b/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/RequestHandler.java
similarity index 98%
rename from hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/FileSystemViewHandler.java
rename to hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/RequestHandler.java
index b3e860af7..22d3082c6 100644
--- a/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/FileSystemViewHandler.java
+++ b/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/RequestHandler.java
@@ -50,12 +50,12 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 /**
- * Main REST Handler class that handles local view staleness and delegates calls to slice/data-file/timeline handlers.
+ *  Main REST Handler class that handles and delegates calls to timeline relevant handlers.
  */
-public class FileSystemViewHandler {
+public class RequestHandler {
 
   private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
-  private static final Logger LOG = LogManager.getLogger(FileSystemViewHandler.class);
+  private static final Logger LOG = LogManager.getLogger(RequestHandler.class);
 
   private final FileSystemViewManager viewManager;
   private final Javalin app;
@@ -63,7 +63,7 @@ public class FileSystemViewHandler {
   private final FileSliceHandler sliceHandler;
   private final BaseFileHandler dataFileHandler;
 
-  public FileSystemViewHandler(Javalin app, Configuration conf, FileSystemViewManager viewManager) throws IOException {
+  public RequestHandler(Javalin app, Configuration conf, FileSystemViewManager viewManager) throws IOException {
     this.viewManager = viewManager;
     this.app = app;
     this.instantHandler = new TimelineHandler(conf, viewManager);
diff --git a/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/TimelineService.java b/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/TimelineService.java
index b1bec621f..47db1fda1 100644
--- a/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/TimelineService.java
+++ b/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/TimelineService.java
@@ -130,9 +130,9 @@ public class TimelineService {
 
   public int startService() throws IOException {
     app = Javalin.create();
-    FileSystemViewHandler router = new FileSystemViewHandler(app, conf, fsViewsManager);
+    RequestHandler requestHandler = new RequestHandler(app, conf, fsViewsManager);
     app.get("/", ctx -> ctx.result("Hello World"));
-    router.register();
+    requestHandler.register();
     int realServerPort = startServiceOnPort(serverPort);
     LOG.info("Starting Timeline server on port :" + realServerPort);
     this.serverPort = realServerPort;