diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraConfig.java b/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraConfig.java
index baa93be..e2bec95 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraConfig.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraConfig.java
@@ -17,8 +17,8 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.CharMatcher;
 import com.google.common.base.Strings;
+import com.google.gerrit.entities.Project;
 import com.google.gerrit.extensions.annotations.PluginName;
-import com.google.gerrit.reviewdb.client.Project;
 import com.google.gerrit.server.GerritPersonIdent;
 import com.google.gerrit.server.config.GerritServerConfig;
 import com.google.gerrit.server.config.PluginConfig;
@@ -152,7 +152,7 @@
     if (!Strings.isNullOrEmpty(projectName)) {
       try {
         return cfgFactory.getFromProjectConfigWithInheritance(
-            new Project.NameKey(projectName), pluginName);
+            Project.nameKey(projectName), pluginName);
       } catch (NoSuchProjectException e) {
         log.warn(
             "Unable to get project configuration for {}: project '{}' not found ",
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraItsServer.java b/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraItsServer.java
index 7666239..95bec2c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraItsServer.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraItsServer.java
@@ -15,7 +15,7 @@
 
 package com.googlesource.gerrit.plugins.its.jira;
 
-import com.google.gerrit.reviewdb.client.Project;
+import com.google.gerrit.entities.Project;
 import com.google.inject.Inject;
 import com.googlesource.gerrit.plugins.its.base.its.ItsFacadeFactory;
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraItsServerInfoProvider.java b/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraItsServerInfoProvider.java
index b5e0128..25b8299 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraItsServerInfoProvider.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraItsServerInfoProvider.java
@@ -14,7 +14,7 @@
 // limitations under the License.
 package com.googlesource.gerrit.plugins.its.jira;
 
-import com.google.gerrit.reviewdb.client.Project;
+import com.google.gerrit.entities.Project;
 import com.google.inject.Inject;
 
 public class JiraItsServerInfoProvider {
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraItsServerProjectCacheRefresher.java b/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraItsServerProjectCacheRefresher.java
index def23ea..f46b060 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraItsServerProjectCacheRefresher.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/jira/JiraItsServerProjectCacheRefresher.java
@@ -14,11 +14,11 @@
 
 package com.googlesource.gerrit.plugins.its.jira;
 
+import com.google.gerrit.entities.RefNames;
 import com.google.gerrit.extensions.api.GerritApi;
 import com.google.gerrit.extensions.common.ProjectInfo;
 import com.google.gerrit.extensions.events.GitReferenceUpdatedListener;
 import com.google.gerrit.extensions.restapi.RestApiException;
-import com.google.gerrit.reviewdb.client.RefNames;
 import com.google.inject.Inject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraPageRequest.java b/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraPageRequest.java
index 5e87ec3..2795d45 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraPageRequest.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/jira/restapi/JiraPageRequest.java
@@ -47,9 +47,7 @@
       parameters.put("orderBy", orderBy);
     }
     String requestParameters =
-        parameters
-            .entrySet()
-            .stream()
+        parameters.entrySet().stream()
             .map(parameter -> parameter.getKey() + "=" + parameter.getValue())
             .collect(Collectors.joining("&"));
     return "?" + requestParameters;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/jira/workflow/MarkPropertyAsReleasedVersion.java b/src/main/java/com/googlesource/gerrit/plugins/its/jira/workflow/MarkPropertyAsReleasedVersion.java
index db6de54..644b391 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/jira/workflow/MarkPropertyAsReleasedVersion.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/jira/workflow/MarkPropertyAsReleasedVersion.java
@@ -14,7 +14,7 @@
 
 package com.googlesource.gerrit.plugins.its.jira.workflow;
 
-import com.google.gerrit.reviewdb.client.Project;
+import com.google.gerrit.entities.Project;
 import com.google.inject.Inject;
 import com.googlesource.gerrit.plugins.its.base.its.ItsFacade;
 import com.googlesource.gerrit.plugins.its.base.workflow.ActionRequest;
@@ -54,7 +54,7 @@
     if (!parameters.isPresent()) {
       return;
     }
-    Project.NameKey projectName = new Project.NameKey(properties.get("project"));
+    Project.NameKey projectName = Project.nameKey(properties.get("project"));
     JiraItsServerInfo jiraItsServerInfo = serverInfoProvider.get(projectName);
     jiraClient.markVersionAsReleased(
         jiraItsServerInfo, itsProject, parameters.get().getPropertyValue());
diff --git a/src/main/resources/Documentation/build.md b/src/main/resources/Documentation/build.md
index 4e44633..a5b86f0 100644
--- a/src/main/resources/Documentation/build.md
+++ b/src/main/resources/Documentation/build.md
@@ -26,7 +26,7 @@
 The output is created in
 
 ```
-  bazel-genfiles/plugins/@PLUGIN@/@PLUGIN@.jar
+  bazel-bin/plugins/@PLUGIN@/@PLUGIN@.jar
 ```
 
 This project can be imported into the Eclipse IDE.
diff --git a/src/test/java/com/googlesource/gerrit/plugins/its/jira/JiraConfigTest.java b/src/test/java/com/googlesource/gerrit/plugins/its/jira/JiraConfigTest.java
index 5348e8f..7f5d0be 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/its/jira/JiraConfigTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/its/jira/JiraConfigTest.java
@@ -17,7 +17,7 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.when;
 
-import com.google.gerrit.reviewdb.client.Project;
+import com.google.gerrit.entities.Project;
 import com.google.gerrit.server.config.PluginConfig;
 import com.google.gerrit.server.config.PluginConfigFactory;
 import com.google.gerrit.server.git.GitRepositoryManager;
@@ -64,7 +64,7 @@
 
   @Test
   public void testGetPluginConfigFor() throws NoSuchProjectException {
-    Project.NameKey project = new Project.NameKey("$project");
+    Project.NameKey project = Project.nameKey("$project");
     PluginConfig pluginCfg = new PluginConfig(PLUGIN_NAME, new Config());
     when(cfgFactory.getFromProjectConfigWithInheritance(project, PLUGIN_NAME))
         .thenReturn(pluginCfg);
diff --git a/src/test/java/com/googlesource/gerrit/plugins/its/jira/JiraItsServerInfoProviderTest.java b/src/test/java/com/googlesource/gerrit/plugins/its/jira/JiraItsServerInfoProviderTest.java
index c8fabc7..294e18b 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/its/jira/JiraItsServerInfoProviderTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/its/jira/JiraItsServerInfoProviderTest.java
@@ -17,7 +17,7 @@
 import static org.mockito.Mockito.*;
 import static org.mockito.Mockito.when;
 
-import com.google.gerrit.reviewdb.client.Project;
+import com.google.gerrit.entities.Project;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -28,7 +28,7 @@
 @RunWith(MockitoJUnitRunner.class)
 public class JiraItsServerInfoProviderTest {
 
-  private static final Project.NameKey PROJECT_NAMEKEY = new Project.NameKey("project");
+  private static final Project.NameKey PROJECT_NAMEKEY = Project.nameKey("project");
 
   @Mock private JiraConfig jiraConfig;
   @Mock private JiraItsServerCache serverCache;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/its/jira/JiraItsServerTest.java b/src/test/java/com/googlesource/gerrit/plugins/its/jira/JiraItsServerTest.java
index 78cb0fb..93e92b1 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/its/jira/JiraItsServerTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/its/jira/JiraItsServerTest.java
@@ -17,7 +17,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import com.google.gerrit.reviewdb.client.Project;
+import com.google.gerrit.entities.Project;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -27,7 +27,7 @@
 
 @RunWith(MockitoJUnitRunner.class)
 public class JiraItsServerTest {
-  private static final Project.NameKey PROJECT_NAMEKEY = new Project.NameKey("project");
+  private static final Project.NameKey PROJECT_NAMEKEY = Project.nameKey("project");
 
   @Mock private JiraItsServerInfoProvider jiraItsserverInfoProvider;
   @Mock private JiraItsFacade itsFacade;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/its/jira/workflow/MarkPropertyAsReleasedVersionTest.java b/src/test/java/com/googlesource/gerrit/plugins/its/jira/workflow/MarkPropertyAsReleasedVersionTest.java
index ad29c2a..e6321cc 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/its/jira/workflow/MarkPropertyAsReleasedVersionTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/its/jira/workflow/MarkPropertyAsReleasedVersionTest.java
@@ -16,7 +16,7 @@
 
 import static org.mockito.Mockito.*;
 
-import com.google.gerrit.reviewdb.client.Project;
+import com.google.gerrit.entities.Project;
 import com.googlesource.gerrit.plugins.its.base.its.ItsFacade;
 import com.googlesource.gerrit.plugins.its.base.workflow.ActionRequest;
 import com.googlesource.gerrit.plugins.its.jira.JiraClient;
@@ -48,7 +48,7 @@
     its = mock(ItsFacade.class);
     JiraItsServerInfoProvider serverInfoProvider = mock(JiraItsServerInfoProvider.class);
     serverInfo = mock(JiraItsServerInfo.class);
-    when(serverInfoProvider.get(new Project.NameKey(PROJECT_NAME))).thenReturn(serverInfo);
+    when(serverInfoProvider.get(Project.nameKey(PROJECT_NAME))).thenReturn(serverInfo);
     jiraClient = mock(JiraClient.class);
     parametersExtractor = mock(MarkPropertyAsReleasedVersionParametersExtractor.class);
     markPropertyAsReleasedVersion =