diff --git a/src/main/java/com/googlesource/gerrit/plugins/kinesis/CheckpointResetter.java b/src/main/java/com/googlesource/gerrit/plugins/kinesis/CheckpointResetter.java
index df03b61..eb74695 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/kinesis/CheckpointResetter.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/kinesis/CheckpointResetter.java
@@ -14,7 +14,7 @@
 
 package com.googlesource.gerrit.plugins.kinesis;
 
-import static com.googlesource.gerrit.plugins.kinesis.Configuration.cosumerLeaseName;
+import static com.googlesource.gerrit.plugins.kinesis.Configuration.consumerLeaseName;
 import static software.amazon.kinesis.common.InitialPositionInStream.TRIM_HORIZON;
 
 import com.google.common.flogger.FluentLogger;
@@ -56,7 +56,7 @@
   }
 
   public void setAllShardsToBeginning(String streamName, String groupId) {
-    String leaseTable = cosumerLeaseName(groupId, streamName);
+    String leaseTable = consumerLeaseName(groupId, streamName);
 
     try {
       for (String shard : getAllShards(leaseTable)) {
diff --git a/src/main/java/com/googlesource/gerrit/plugins/kinesis/Configuration.java b/src/main/java/com/googlesource/gerrit/plugins/kinesis/Configuration.java
index 6291152..64fbecd 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/kinesis/Configuration.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/kinesis/Configuration.java
@@ -228,7 +228,7 @@
         : System.getProperty(name);
   }
 
-  public static String cosumerLeaseName(String groupId, String streamName) {
+  public static String consumerLeaseName(String groupId, String streamName) {
     return String.format("%s-%s", groupId, streamName);
   }
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/kinesis/SchedulerProvider.java b/src/main/java/com/googlesource/gerrit/plugins/kinesis/SchedulerProvider.java
index deffd67..ee9f688 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/kinesis/SchedulerProvider.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/kinesis/SchedulerProvider.java
@@ -14,7 +14,7 @@
 
 package com.googlesource.gerrit.plugins.kinesis;
 
-import static com.googlesource.gerrit.plugins.kinesis.Configuration.cosumerLeaseName;
+import static com.googlesource.gerrit.plugins.kinesis.Configuration.consumerLeaseName;
 
 import com.google.gerrit.server.events.Event;
 import com.google.inject.Provider;
@@ -63,7 +63,7 @@
     this.configsBuilder =
         new ConfigsBuilder(
             streamName,
-            cosumerLeaseName(groupId, streamName),
+            consumerLeaseName(groupId, streamName),
             kinesisAsyncClient,
             dynamoDbAsyncClient,
             cloudWatchAsyncClient,
