diff --git a/src/main/java/com/googlesource/gerrit/modules/gitrefsfilter/ForProjectWrapper.java b/src/main/java/com/googlesource/gerrit/modules/gitrefsfilter/ForProjectWrapper.java
index 990658b..23078db 100644
--- a/src/main/java/com/googlesource/gerrit/modules/gitrefsfilter/ForProjectWrapper.java
+++ b/src/main/java/com/googlesource/gerrit/modules/gitrefsfilter/ForProjectWrapper.java
@@ -20,7 +20,6 @@
 import com.google.gerrit.common.Nullable;
 import com.google.gerrit.entities.Change;
 import com.google.gerrit.entities.Project;
-import com.google.gerrit.entities.Project.NameKey;
 import com.google.gerrit.extensions.api.access.CoreOrPluginProjectPermission;
 import com.google.gerrit.extensions.conditions.BooleanCondition;
 import com.google.gerrit.extensions.restapi.AuthException;
@@ -47,7 +46,7 @@
   private static final FluentLogger logger = FluentLogger.forEnclosingClass();
 
   private final ForProject defaultForProject;
-  private final NameKey project;
+  private final Project.NameKey project;
   private final ChangeNotes.Factory changeNotesFactory;
 
   public interface Factory {
diff --git a/src/main/java/com/googlesource/gerrit/modules/gitrefsfilter/WithUserWrapper.java b/src/main/java/com/googlesource/gerrit/modules/gitrefsfilter/WithUserWrapper.java
index 7c4521e..b54457f 100644
--- a/src/main/java/com/googlesource/gerrit/modules/gitrefsfilter/WithUserWrapper.java
+++ b/src/main/java/com/googlesource/gerrit/modules/gitrefsfilter/WithUserWrapper.java
@@ -14,7 +14,7 @@
 
 package com.googlesource.gerrit.modules.gitrefsfilter;
 
-import com.google.gerrit.entities.Project.NameKey;
+import com.google.gerrit.entities.Project;
 import com.google.gerrit.extensions.api.access.GlobalOrPluginPermission;
 import com.google.gerrit.extensions.conditions.BooleanCondition;
 import com.google.gerrit.extensions.restapi.AuthException;
@@ -46,7 +46,7 @@
   }
 
   @Override
-  public ForProject project(NameKey project) {
+  public ForProject project(Project.NameKey project) {
     ForProject defaultWithProject = defaultWithUser.project(project);
     if (defaultWithUser.testOrFalse(filterRefsPermission)) {
       return forProjectFactory.get(defaultWithProject, project);
