diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/RefUpdateListener.java b/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/RefUpdateListener.java
index 08f0e1b..19d287d 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/RefUpdateListener.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/RefUpdateListener.java
@@ -26,6 +26,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.gerrit.extensions.annotations.PluginName;
 import com.google.gerrit.extensions.events.GitReferenceUpdatedListener;
 import com.google.gerrit.reviewdb.client.Change;
 import com.google.gerrit.reviewdb.client.PatchSet;
@@ -57,6 +58,7 @@
   private final ThreadLocalRequestContext tl;
   private final SchemaFactory<ReviewDb> schemaFactory;
   private final PluginConfigFactory cfg;
+  private final String pluginName;
   private ReviewDb db;
 
   @Inject
@@ -65,7 +67,8 @@
       final IdentifiedUser.GenericFactory identifiedUserFactory,
       final ThreadLocalRequestContext tl,
       final SchemaFactory<ReviewDb> schemaFactory,
-      final PluginConfigFactory cfg) {
+      final PluginConfigFactory cfg,
+      final @PluginName String pluginName) {
     this.reviewersByBlameFactory = reviewersByBlameFactory;
     this.repoManager = repoManager;
     this.workQueue = workQueue;
@@ -73,6 +76,7 @@
     this.tl = tl;
     this.schemaFactory = schemaFactory;
     this.cfg = cfg;
+    this.pluginName = pluginName;
   }
 
   @Override
@@ -82,7 +86,7 @@
     int maxReviewers;
     try {
       maxReviewers =
-          cfg.getWithInheritance(projectName, "reviewers-by-blame")
+          cfg.getWithInheritance(projectName, pluginName)
              .getInt("maxReviewers", 3);
     } catch (NoSuchProjectException x) {
       log.error(x.getMessage(), x);
