diff --git a/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/data/input/kinesis/KinesisInputReader.java b/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/data/input/kinesis/KinesisInputReader.java
index 80c358b528d2..cec7a3bc662e 100644
--- a/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/data/input/kinesis/KinesisInputReader.java
+++ b/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/data/input/kinesis/KinesisInputReader.java
@@ -95,7 +95,7 @@ public CloseableIterator<InputRowListPlusRawValues> sample() throws IOException
   private Map<String, Object> extractHeaders(KinesisRecordEntity record)
   {
     final Map<String, Object> mergedHeaderMap = new HashMap<>();
-    // Add kafka record timestamp to the mergelist, we will skip record timestamp if the same key exists already in
+    // Add kinesis record timestamp to the mergelist, we will skip record timestamp if the same key exists already in
     // the header list
     mergedHeaderMap.putIfAbsent(timestampColumnName, record.getRecord().getApproximateArrivalTimestamp().getTime());
 
@@ -112,7 +112,7 @@ private CloseableIterator<InputRow> buildBlendedRows(
           final HashSet<String> newDimensions = new HashSet<>(r.getDimensions());
           final Map<String, Object> event = buildBlendedEventMap(r::getRaw, newDimensions, headerKeyList);
           newDimensions.addAll(headerKeyList.keySet());
-          // Remove the dummy timestamp added in KafkaInputFormat
+          // Remove the dummy timestamp added in KinesisInputFormat
           newDimensions.remove(KinesisInputFormat.DEFAULT_AUTO_TIMESTAMP_STRING);
 
           final DateTime timestamp = MapInputRowParser.parseTimestamp(inputRowSchema.getTimestampSpec(), event);
@@ -160,7 +160,7 @@ private CloseableIterator<InputRowListPlusRawValues> buildBlendedRowsSample(
                   headerKeyList
               );
               newDimensions.addAll(headerKeyList.keySet());
-              // Remove the dummy timestamp added in KafkaInputFormat
+              // Remove the dummy timestamp added in KinesisInputFormat
               newDimensions.remove(KinesisInputFormat.DEFAULT_AUTO_TIMESTAMP_STRING);
               newInputRows.add(
                   new MapBasedInputRow(