diff --git a/bazel/api_build_system.bzl b/bazel/api_build_system.bzl
index 6f907891..029776e6 100644
--- a/bazel/api_build_system.bzl
+++ b/bazel/api_build_system.bzl
@@ -149,11 +149,15 @@ def api_go_test(name, **kwargs):
         **kwargs
     )
 
-def api_proto_package(srcs = [], deps = [], has_services = False, visibility = ["//visibility:public"]):
+def api_proto_package(
+        name = "pkg",
+        srcs = [],
+        deps = [],
+        has_services = False,
+        visibility = ["//visibility:public"]):
     if srcs == []:
         srcs = native.glob(["*.proto"])
 
-    name = "pkg"
     api_cc_py_proto_library(
         name = name,
         visibility = visibility,
@@ -162,9 +166,9 @@ def api_proto_package(srcs = [], deps = [], has_services = False, visibility = [
         has_services = has_services,
     )
 
-    compilers = ["@io_bazel_rules_go//proto:go_proto", "//bazel:pgv_plugin_go"]
+    compilers = ["@io_bazel_rules_go//proto:go_proto", "@envoy_api//bazel:pgv_plugin_go"]
     if has_services:
-        compilers = ["@io_bazel_rules_go//proto:go_grpc", "//bazel:pgv_plugin_go"]
+        compilers = ["@io_bazel_rules_go//proto:go_grpc", "@envoy_api//bazel:pgv_plugin_go"]
 
     go_proto_library(
         name = name + _GO_PROTO_SUFFIX,
diff --git a/tools/generate_listeners_test.py b/tools/generate_listeners_test.py
index 1a163ef9..f98fc438 100644
--- a/tools/generate_listeners_test.py
+++ b/tools/generate_listeners_test.py
@@ -5,7 +5,7 @@ import os
 import generate_listeners
 
 if __name__ == "__main__":
-  srcdir = os.path.join(os.getenv("TEST_SRCDIR"), 'envoy_api')
+  srcdir = os.path.join(os.getenv("TEST_SRCDIR"), 'envoy_api_canonical')
   generate_listeners.GenerateListeners(
       os.path.join(srcdir, "examples/service_envoy/listeners.pb"), "/dev/stdout", "/dev/stdout",
       iter([os.path.join(srcdir, "examples/service_envoy/http_connection_manager.pb")]))
diff --git a/tools/tap2pcap.py b/tools/tap2pcap.py
index 29eeeb8c..db653272 100644
--- a/tools/tap2pcap.py
+++ b/tools/tap2pcap.py
@@ -8,7 +8,7 @@ tap files; it is not a literal wire tap.
 
 Usage:
 
-bazel run @envoy_api//tools:tap2pcap <tap .pb/.pb_text> <pcap path>
+bazel run @envoy_api_canonical//tools:tap2pcap <tap .pb/.pb_text> <pcap path>
 
 Known issues:
 - IPv6 PCAP generation has malformed TCP packets. This appears to be a text2pcap
diff --git a/tools/tap2pcap_test.py b/tools/tap2pcap_test.py
index b13bee0f..9f504cf6 100644
--- a/tools/tap2pcap_test.py
+++ b/tools/tap2pcap_test.py
@@ -11,7 +11,7 @@ import tap2pcap
 # a golden output file for the tshark dump. Since we run tap2pcap in a
 # subshell with a limited environment, the inferred time zone should be UTC.
 if __name__ == '__main__':
-  srcdir = os.path.join(os.getenv('TEST_SRCDIR'), 'envoy_api')
+  srcdir = os.path.join(os.getenv('TEST_SRCDIR'), 'envoy_api_canonical')
   tap_path = os.path.join(srcdir, 'tools/data/tap2pcap_h2_ipv4.pb_text')
   expected_path = os.path.join(srcdir, 'tools/data/tap2pcap_h2_ipv4.txt')
   pcap_path = os.path.join(os.getenv('TEST_TMPDIR'), 'generated.pcap')