diff --git a/BUILD b/BUILD
index fc3892454..30388a787 100644
--- a/BUILD
+++ b/BUILD
@@ -20,7 +20,7 @@ filegroup(
         "//verilog/tools/diff:verible-verilog-diff",
         "//verilog/tools/formatter:verible-verilog-format",
         "//verilog/tools/kythe:verible-verilog-kythe-extractor",
-        "//verilog/tools/kythe:verilog-kythe-kzip-writer",
+        "//verilog/tools/kythe:verible-verilog-kythe-kzip-writer",
         "//verilog/tools/lint:verible-verilog-lint",
         "//verilog/tools/ls:verible-verilog-ls",
         "//verilog/tools/obfuscator:verible-verilog-obfuscate",
diff --git a/verilog/tools/kythe/BUILD b/verilog/tools/kythe/BUILD
index dcdcee086..74f83bdd6 100644
--- a/verilog/tools/kythe/BUILD
+++ b/verilog/tools/kythe/BUILD
@@ -278,7 +278,7 @@ cc_library(
 )
 
 cc_binary(
-    name = "verilog-kythe-kzip-writer",
+    name = "verible-verilog-kythe-kzip-writer",
     srcs = [
         "verilog_kythe_kzip_writer.cc",
     ],
@@ -289,7 +289,7 @@ cc_binary(
         "//common/util:init_command_line",
         "//common/util:logging",
         "//third_party/proto/kythe:analysis_cc_proto",
-        "//verilog/analysis:verilog_project",
+        "//verilog/analysis:verilog_filelist",
         "@com_google_absl//absl/flags:flag",
         "@com_google_absl//absl/strings",
     ],
diff --git a/verilog/tools/kythe/verilog_kythe_kzip_writer.cc b/verilog/tools/kythe/verilog_kythe_kzip_writer.cc
index 143b73c2f..20be8542d 100644
--- a/verilog/tools/kythe/verilog_kythe_kzip_writer.cc
+++ b/verilog/tools/kythe/verilog_kythe_kzip_writer.cc
@@ -24,7 +24,7 @@
 #include "common/util/init_command_line.h"
 #include "common/util/logging.h"
 #include "third_party/proto/kythe/analysis.pb.h"
-#include "verilog/analysis/verilog_project.h"
+#include "verilog/analysis/verilog_filelist.h"
 #include "verilog/tools/kythe/kzip_creator.h"
 
 ABSL_FLAG(std::string, filelist_path, "",