diff --git a/WORKSPACE b/WORKSPACE
index 1cd1cc9..1412c68 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-adminSshCommand/WORKSPACE b/example-adminSshCommand/WORKSPACE
index a5abc61..8df7d92 100644
--- a/example-adminSshCommand/WORKSPACE
+++ b/example-adminSshCommand/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-changeHasOperator/WORKSPACE b/example-changeHasOperator/WORKSPACE
index 210e00f..1c53818 100644
--- a/example-changeHasOperator/WORKSPACE
+++ b/example-changeHasOperator/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-changeOperator/WORKSPACE b/example-changeOperator/WORKSPACE
index f543198..5485912 100644
--- a/example-changeOperator/WORKSPACE
+++ b/example-changeOperator/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-changeOperator/src/main/java/com/googlesource/gerrit/plugins/examples/changeoperator/SampleOperator.java b/example-changeOperator/src/main/java/com/googlesource/gerrit/plugins/examples/changeoperator/SampleOperator.java
index 093344d..6c1319c 100644
--- a/example-changeOperator/src/main/java/com/googlesource/gerrit/plugins/examples/changeoperator/SampleOperator.java
+++ b/example-changeOperator/src/main/java/com/googlesource/gerrit/plugins/examples/changeoperator/SampleOperator.java
@@ -17,7 +17,7 @@
 import com.google.gerrit.index.query.PostFilterPredicate;
 import com.google.gerrit.index.query.Predicate;
 import com.google.gerrit.index.query.QueryParseException;
-import com.google.gerrit.reviewdb.client.Change;
+import com.google.gerrit.entities.Change;
 import com.google.gerrit.server.query.change.ChangeData;
 import com.google.gerrit.server.query.change.ChangeQueryBuilder;
 import com.google.inject.Singleton;
diff --git a/example-changeQueryAttributes/WORKSPACE b/example-changeQueryAttributes/WORKSPACE
index 2fafee6..0bee67a 100644
--- a/example-changeQueryAttributes/WORKSPACE
+++ b/example-changeQueryAttributes/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-commitValidator/WORKSPACE b/example-commitValidator/WORKSPACE
index 332dd62..6696082 100644
--- a/example-commitValidator/WORKSPACE
+++ b/example-commitValidator/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-consoleMetricReporter/WORKSPACE b/example-consoleMetricReporter/WORKSPACE
index c392a47..71a98a9 100644
--- a/example-consoleMetricReporter/WORKSPACE
+++ b/example-consoleMetricReporter/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-deployedOnIncludedInExtension/WORKSPACE b/example-deployedOnIncludedInExtension/WORKSPACE
index 703939e..2aa2358 100644
--- a/example-deployedOnIncludedInExtension/WORKSPACE
+++ b/example-deployedOnIncludedInExtension/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-restApiCommandOption/WORKSPACE b/example-restApiCommandOption/WORKSPACE
index 1f5c34f..23c3393 100644
--- a/example-restApiCommandOption/WORKSPACE
+++ b/example-restApiCommandOption/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-restApiGetRevision/WORKSPACE b/example-restApiGetRevision/WORKSPACE
index c48fce8..0f354e8 100644
--- a/example-restApiGetRevision/WORKSPACE
+++ b/example-restApiGetRevision/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-restApiPostProject/WORKSPACE b/example-restApiPostProject/WORKSPACE
index bc56e4b..d58ea10 100644
--- a/example-restApiPostProject/WORKSPACE
+++ b/example-restApiPostProject/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-restApiPostProject/src/main/java/com/googlesource/gerrit/plugins/examples/restapipostproject/HelloProjectAction.java b/example-restApiPostProject/src/main/java/com/googlesource/gerrit/plugins/examples/restapipostproject/HelloProjectAction.java
index e7e0fc0..f7d41b5 100644
--- a/example-restApiPostProject/src/main/java/com/googlesource/gerrit/plugins/examples/restapipostproject/HelloProjectAction.java
+++ b/example-restApiPostProject/src/main/java/com/googlesource/gerrit/plugins/examples/restapipostproject/HelloProjectAction.java
@@ -14,6 +14,7 @@
 
 package com.googlesource.gerrit.plugins.examples.restapipostproject;
 
+import com.google.gerrit.extensions.restapi.Response;
 import com.google.gerrit.extensions.restapi.RestModifyView;
 import com.google.gerrit.extensions.webui.UiAction;
 import com.google.gerrit.server.CurrentUser;
@@ -53,15 +54,16 @@
   }
 
   @Override
-  public String apply(ProjectResource rsrc, Input input) {
+  public Response<String> apply(ProjectResource rsrc, Input input) {
     final String greeting = input.french ? "Bonjour" : "Hello";
-    return String.format(
-        "%s %s from project %s!",
-        greeting,
-        isNullOrEmpty(input.message)
-            ? firstNonNull(user.get().getUserName().get(), "world")
-            : input.message,
-        rsrc.getName());
+    return Response.ok(
+        String.format(
+            "%s %s from project %s!",
+            greeting,
+            isNullOrEmpty(input.message)
+                ? firstNonNull(user.get().getUserName().get(), "world")
+                : input.message,
+            rsrc.getName()));
   }
 
   @Override
diff --git a/example-restApiPostRevision/WORKSPACE b/example-restApiPostRevision/WORKSPACE
index 978c4eb..d3c232c 100644
--- a/example-restApiPostRevision/WORKSPACE
+++ b/example-restApiPostRevision/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-restApiPostRevision/src/main/java/com/googlesource/gerrit/plugins/examples/restapipostrevision/HelloRevisionAction.java b/example-restApiPostRevision/src/main/java/com/googlesource/gerrit/plugins/examples/restapipostrevision/HelloRevisionAction.java
index eecaf03..d9cff27 100644
--- a/example-restApiPostRevision/src/main/java/com/googlesource/gerrit/plugins/examples/restapipostrevision/HelloRevisionAction.java
+++ b/example-restApiPostRevision/src/main/java/com/googlesource/gerrit/plugins/examples/restapipostrevision/HelloRevisionAction.java
@@ -16,6 +16,7 @@
 
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Strings;
+import com.google.gerrit.extensions.restapi.Response;
 import com.google.gerrit.extensions.restapi.RestModifyView;
 import com.google.gerrit.extensions.webui.UiAction;
 import com.google.gerrit.server.CurrentUser;
@@ -41,16 +42,17 @@
   }
 
   @Override
-  public String apply(RevisionResource rev, Input input) {
+  public Response<String> apply(RevisionResource rev, Input input) {
     final String greeting = input.french ? "Bonjour" : "Hello";
-    return String.format(
-        "%s %s from change %s, patch set %d!",
-        greeting,
-        Strings.isNullOrEmpty(input.message)
-            ? MoreObjects.firstNonNull(user.get().getUserName(), "world")
-            : input.message,
-        rev.getChange().getId().toString(),
-        rev.getPatchSet().getPatchSetId());
+    return Response.ok(
+        String.format(
+            "%s %s from change %s, patch set %d!",
+            greeting,
+            Strings.isNullOrEmpty(input.message)
+                ? MoreObjects.firstNonNull(user.get().getUserName(), "world")
+                : input.message,
+            rev.getChange().getId().toString(),
+            rev.getPatchSet().number()));
   }
 
   @Override
diff --git a/example-servlet/WORKSPACE b/example-servlet/WORKSPACE
index f901950..b4b8b7d 100644
--- a/example-servlet/WORKSPACE
+++ b/example-servlet/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-simpleSshCommand/WORKSPACE b/example-simpleSshCommand/WORKSPACE
index 26fb228..aef2088 100644
--- a/example-simpleSshCommand/WORKSPACE
+++ b/example-simpleSshCommand/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-sshAndRestCommandOptionBeanParseListener/WORKSPACE b/example-sshAndRestCommandOptionBeanParseListener/WORKSPACE
index 0c7702e..73a755d 100644
--- a/example-sshAndRestCommandOptionBeanParseListener/WORKSPACE
+++ b/example-sshAndRestCommandOptionBeanParseListener/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-sshCommandAlias/WORKSPACE b/example-sshCommandAlias/WORKSPACE
index 26fb228..aef2088 100644
--- a/example-sshCommandAlias/WORKSPACE
+++ b/example-sshCommandAlias/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-sshCommandDelegateDynamicBean/WORKSPACE b/example-sshCommandDelegateDynamicBean/WORKSPACE
index 0cd4580..b48b8c7 100644
--- a/example-sshCommandDelegateDynamicBean/WORKSPACE
+++ b/example-sshCommandDelegateDynamicBean/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-sshCommandOption/WORKSPACE b/example-sshCommandOption/WORKSPACE
index 3479e41..8fb4ced 100644
--- a/example-sshCommandOption/WORKSPACE
+++ b/example-sshCommandOption/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-topMenu/WORKSPACE b/example-topMenu/WORKSPACE
index 26fb228..aef2088 100644
--- a/example-topMenu/WORKSPACE
+++ b/example-topMenu/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-usageDataLogger/WORKSPACE b/example-usageDataLogger/WORKSPACE
index ed4388e..f8b97d0 100644
--- a/example-usageDataLogger/WORKSPACE
+++ b/example-usageDataLogger/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-validationListenerAssignee/WORKSPACE b/example-validationListenerAssignee/WORKSPACE
index 60a936f..0a6da04 100644
--- a/example-validationListenerAssignee/WORKSPACE
+++ b/example-validationListenerAssignee/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-validationListenerAssignee/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerassignee/AssigneeValidator.java b/example-validationListenerAssignee/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerassignee/AssigneeValidator.java
index 61d8926..9201419 100644
--- a/example-validationListenerAssignee/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerassignee/AssigneeValidator.java
+++ b/example-validationListenerAssignee/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerassignee/AssigneeValidator.java
@@ -16,8 +16,8 @@
 
 import com.google.gerrit.exceptions.StorageException;
 import com.google.gerrit.index.query.QueryParseException;
-import com.google.gerrit.reviewdb.client.Account;
-import com.google.gerrit.reviewdb.client.Change;
+import com.google.gerrit.entities.Account;
+import com.google.gerrit.entities.Change;
 import com.google.gerrit.server.query.change.ChangeQueryBuilder;
 import com.google.gerrit.server.query.change.ChangeQueryProcessor;
 import com.google.gerrit.server.validators.AssigneeValidationListener;
@@ -41,7 +41,7 @@
   public void validateAssignee(Change change, Account assignee) throws ValidationException {
     try {
       if (queryProcessor
-              .query(queryBuilder.assignee(assignee.getPreferredEmail()))
+              .query(queryBuilder.assignee(assignee.preferredEmail()))
               .entities()
               .size()
           > MAX_ASSIGNED_CHANGES) {
diff --git a/example-validationListenerCommit/WORKSPACE b/example-validationListenerCommit/WORKSPACE
index c11391b..1c36aba 100644
--- a/example-validationListenerCommit/WORKSPACE
+++ b/example-validationListenerCommit/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-validationListenerHashtag/WORKSPACE b/example-validationListenerHashtag/WORKSPACE
index 5515954..88fd725 100644
--- a/example-validationListenerHashtag/WORKSPACE
+++ b/example-validationListenerHashtag/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-validationListenerHashtag/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerhashtag/HashtagValidator.java b/example-validationListenerHashtag/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerhashtag/HashtagValidator.java
index bccc62e..0e0cb0a 100644
--- a/example-validationListenerHashtag/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerhashtag/HashtagValidator.java
+++ b/example-validationListenerHashtag/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerhashtag/HashtagValidator.java
@@ -14,7 +14,7 @@
 
 package com.googlesource.gerrit.plugins.examples.validationlistenerhashtag;
 
-import com.google.gerrit.reviewdb.client.Change;
+import com.google.gerrit.entities.Change;
 import com.google.gerrit.server.validators.HashtagValidationListener;
 import com.google.gerrit.server.validators.ValidationException;
 import java.util.Set;
diff --git a/example-validationListenerMerge/WORKSPACE b/example-validationListenerMerge/WORKSPACE
index 0df7caa..698bd54 100644
--- a/example-validationListenerMerge/WORKSPACE
+++ b/example-validationListenerMerge/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-validationListenerMerge/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenermerge/MergeUserValidator.java b/example-validationListenerMerge/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenermerge/MergeUserValidator.java
index 5088d29..9aaed95 100644
--- a/example-validationListenerMerge/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenermerge/MergeUserValidator.java
+++ b/example-validationListenerMerge/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenermerge/MergeUserValidator.java
@@ -14,8 +14,8 @@
 
 package com.googlesource.gerrit.plugins.examples.validationlistenermerge;
 
-import com.google.gerrit.reviewdb.client.Branch;
-import com.google.gerrit.reviewdb.client.PatchSet;
+import com.google.gerrit.entities.BranchNameKey;
+import com.google.gerrit.entities.PatchSet;
 import com.google.gerrit.server.IdentifiedUser;
 import com.google.gerrit.server.git.CodeReviewCommit;
 import com.google.gerrit.server.git.validators.MergeValidationException;
@@ -48,7 +48,7 @@
       Repository repo,
       CodeReviewCommit commit,
       ProjectState destProject,
-      Branch.NameKey destBranch,
+      BranchNameKey destBranch,
       PatchSet.Id patchSetId,
       IdentifiedUser caller)
       throws MergeValidationException {
diff --git a/example-validationListenerNewProjectCreated/WORKSPACE b/example-validationListenerNewProjectCreated/WORKSPACE
index 59b7b63..c9f2199 100644
--- a/example-validationListenerNewProjectCreated/WORKSPACE
+++ b/example-validationListenerNewProjectCreated/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-validationListenerRefOperation/WORKSPACE b/example-validationListenerRefOperation/WORKSPACE
index 158f9f4..deb7563 100644
--- a/example-validationListenerRefOperation/WORKSPACE
+++ b/example-validationListenerRefOperation/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-validationListenerRefOperation/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerrefoperation/RefOperationValidationExample.java b/example-validationListenerRefOperation/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerrefoperation/RefOperationValidationExample.java
index da7f4cb..41f299f 100644
--- a/example-validationListenerRefOperation/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerrefoperation/RefOperationValidationExample.java
+++ b/example-validationListenerRefOperation/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerrefoperation/RefOperationValidationExample.java
@@ -15,7 +15,7 @@
 package com.googlesource.gerrit.plugins.examples.validationlistenerrefoperation;
 
 import com.google.common.collect.Lists;
-import com.google.gerrit.reviewdb.client.RefNames;
+import com.google.gerrit.entities.RefNames;
 import com.google.gerrit.server.events.RefReceivedEvent;
 import com.google.gerrit.server.git.validators.RefOperationValidationListener;
 import com.google.gerrit.server.git.validators.ValidationMessage;
diff --git a/example-validationListenerUpload/WORKSPACE b/example-validationListenerUpload/WORKSPACE
index 083e583..8d9c07b 100644
--- a/example-validationListenerUpload/WORKSPACE
+++ b/example-validationListenerUpload/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-validationListenerUpload/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerupload/DenyUploadExample.java b/example-validationListenerUpload/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerupload/DenyUploadExample.java
index e2231f8..2721ebe 100644
--- a/example-validationListenerUpload/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerupload/DenyUploadExample.java
+++ b/example-validationListenerUpload/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerupload/DenyUploadExample.java
@@ -14,7 +14,7 @@
 
 package com.googlesource.gerrit.plugins.examples.validationlistenerupload;
 
-import com.google.gerrit.reviewdb.client.Project;
+import com.google.gerrit.entities.Project;
 import com.google.gerrit.server.CurrentUser;
 import com.google.gerrit.server.git.validators.UploadValidationListener;
 import com.google.gerrit.server.validators.ValidationException;
diff --git a/example-webLinkBranch/WORKSPACE b/example-webLinkBranch/WORKSPACE
index de4c8c2..25b7e45 100644
--- a/example-webLinkBranch/WORKSPACE
+++ b/example-webLinkBranch/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-webLinkFileHistory/WORKSPACE b/example-webLinkFileHistory/WORKSPACE
index 26fb228..aef2088 100644
--- a/example-webLinkFileHistory/WORKSPACE
+++ b/example-webLinkFileHistory/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-webLinkPatchSet/WORKSPACE b/example-webLinkPatchSet/WORKSPACE
index 26fb228..aef2088 100644
--- a/example-webLinkPatchSet/WORKSPACE
+++ b/example-webLinkPatchSet/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-webLinkProject/WORKSPACE b/example-webLinkProject/WORKSPACE
index 26fb228..aef2088 100644
--- a/example-webLinkProject/WORKSPACE
+++ b/example-webLinkProject/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "ca31f016a3130c3eeb032538d2832bf555559b28",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )