diff --git a/WORKSPACE b/WORKSPACE
index 00e2a98..f49ed12 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,11 +3,11 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "8386b3fbf80e375f0a10c8386c0a8dfe260c5c1b",
+    commit = "d60efafe2fa2581d8b6f10aeb80beef5a77b8093",
     #local_path = "/home/<user>/projects/bazlets",
 )
 
-#Snapshot Plugin API
+# Snapshot Plugin API
 #load(
 #    "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
 #    "gerrit_api_maven_local",
diff --git a/src/main/java/com/googlesource/gerrit/plugins/importer/ListImportedProjects.java b/src/main/java/com/googlesource/gerrit/plugins/importer/ListImportedProjects.java
index 2e6379c..1381d08 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/importer/ListImportedProjects.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/importer/ListImportedProjects.java
@@ -64,7 +64,7 @@
     Collection<File> importFiles = new HashSet<>();
     File lockRoot = projects.FS_LAYOUT.getLockRoot();
     Path lockRootPath = lockRoot.toPath();
-    for (File f : Files.fileTreeTraverser().preOrderTraversal(lockRoot)) {
+    for (File f : Files.fileTraverser().depthFirstPreOrder(lockRoot)) {
       if (f.isFile()
           && !f.getName().endsWith(".lock")
           && matches(lockRootPath.relativize(f.toPath()))) {
diff --git a/tools/bzl/classpath.bzl b/tools/bzl/classpath.bzl
index d5764f7..c921d01 100644
--- a/tools/bzl/classpath.bzl
+++ b/tools/bzl/classpath.bzl
@@ -1,4 +1,6 @@
 load(
     "@com_googlesource_gerrit_bazlets//tools:classpath.bzl",
-    "classpath_collector",
+    _classpath_collector = "classpath_collector",
 )
+
+classpath_collector = _classpath_collector
diff --git a/tools/bzl/plugin.bzl b/tools/bzl/plugin.bzl
index a280a0f..9568c84 100644
--- a/tools/bzl/plugin.bzl
+++ b/tools/bzl/plugin.bzl
@@ -1,6 +1,10 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "GWT_PLUGIN_DEPS",
-    "PLUGIN_DEPS",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _gwt_plugin_deps = "GWT_PLUGIN_DEPS",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+GWT_PLUGIN_DEPS = _gwt_plugin_deps
+PLUGIN_DEPS = _plugin_deps