diff --git a/sandboxed_api/sandbox2/BUILD.bazel b/sandboxed_api/sandbox2/BUILD.bazel
index 568add9..3242fd2 100644
--- a/sandboxed_api/sandbox2/BUILD.bazel
+++ b/sandboxed_api/sandbox2/BUILD.bazel
@@ -39,7 +39,7 @@ cc_library(
     copts = sapi_platform_copts(),
     deps = [
         ":syscall",
-        ":violation_proto_cc",
+        ":violation_proto_cc_cc_proto",
         "//sandboxed_api/sandbox2/util:strerror",
         "//sandboxed_api/util:status",
         "@com_google_absl//absl/base:core_headers",
@@ -105,7 +105,7 @@ cc_library(
     copts = sapi_platform_copts(),
     deps = [
         ":comms",
-        ":logserver_proto_cc",
+        ":logserver_proto_cc_cc_proto",
         "@com_google_glog//:glog",
     ],
 )
@@ -118,7 +118,7 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":comms",
-        ":logserver_proto_cc",
+        ":logserver_proto_cc_cc_proto",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/synchronization",
         "@com_google_glog//:glog",
@@ -183,7 +183,7 @@ cc_library(
         ":namespace",
         ":regs",
         ":syscall",
-        ":violation_proto_cc",
+        ":violation_proto_cc_cc_proto",
         "//sandboxed_api/sandbox2/util:bpf_helper",
         "//sandboxed_api/util:flags",
         "@com_google_absl//absl/base:core_headers",
@@ -259,7 +259,7 @@ cc_library(
     copts = sapi_platform_copts(),
     deps = [
         ":forkserver",
-        ":forkserver_proto",
+        ":forkserver_cc_proto",
         ":global_forkserver",
         ":ipc",
         ":limits",
@@ -304,9 +304,9 @@ cc_library(
         ":client",
         ":executor",
         ":comms",
-        ":violation_proto_cc",
+        ":violation_proto_cc_cc_proto",
         ":forkserver",
-        ":forkserver_proto_cc",
+        ":forkserver_proto_cc_cc_proto",
         ":global_forkserver",
         ":ipc",
         ":limits",
@@ -332,7 +332,7 @@ cc_library(
         "@com_google_absl//absl/types:optional",
         "@org_kernel_libcap//:libcap",
         "//sandboxed_api/sandbox2/unwind",
-        "//sandboxed_api/sandbox2/unwind:unwind_proto_cc",
+        "//sandboxed_api/sandbox2/unwind:unwind_proto_cc_cc_proto",
         "//sandboxed_api/sandbox2/util:bpf_helper",
         "//sandboxed_api/sandbox2/util:file_base",
         "//sandboxed_api/sandbox2/util:fileops",
@@ -383,14 +383,14 @@ cc_library(
     deps = [
         ":client",
         ":comms",
-        ":forkserver_proto_cc",
+        ":forkserver_proto_cc_cc_proto",
         ":namespace",
         ":policy",
         ":syscall",
         ":util",
         "//sandboxed_api/sandbox2/unwind",
         "//sandboxed_api/sandbox2/unwind:ptrace_hook",
-        "//sandboxed_api/sandbox2/unwind:unwind_proto_cc",
+        "//sandboxed_api/sandbox2/unwind:unwind_proto_cc_cc_proto",
         "//sandboxed_api/sandbox2/util:bpf_helper",
         "//sandboxed_api/sandbox2/util:fileops",
         "//sandboxed_api/sandbox2/util:strerror",
@@ -410,7 +410,7 @@ cc_library(
     hdrs = ["mounts.h"],
     copts = sapi_platform_copts(),
     deps = [
-        ":mounttree_proto_cc",
+        ":mounttree_proto_cc_cc_proto",
         "//sandboxed_api/sandbox2/util:file_base",
         "//sandboxed_api/sandbox2/util:fileops",
         "//sandboxed_api/sandbox2/util:minielf",
@@ -449,9 +449,9 @@ cc_library(
     copts = sapi_platform_copts(),
     deps = [
         ":mounts",
-        ":mounttree_proto_cc",
+        ":mounttree_proto_cc_cc_proto",
         ":util",
-        ":violation_proto_cc",
+        ":violation_proto_cc_cc_proto",
         "//sandboxed_api/sandbox2/util:file_base",
         "//sandboxed_api/sandbox2/util:fileops",
         "//sandboxed_api/sandbox2/util:strerror",
@@ -597,7 +597,7 @@ cc_test(
     copts = sapi_platform_copts(),
     deps = [
         ":comms",
-        ":comms_test_proto_cc",
+        ":comms_test_proto_cc_cc_proto",
         "//sandboxed_api/util:status_matchers",
         "@com_google_absl//absl/container:fixed_array",
         "@com_google_absl//absl/strings",
@@ -618,7 +618,7 @@ cc_test(
     deps = [
         ":comms",
         ":forkserver",
-        ":forkserver_proto_cc",
+        ":forkserver_proto_cc_cc_proto",
         ":sandbox2",
         ":testing",
         "@com_google_absl//absl/strings",
diff --git a/sandboxed_api/sandbox2/unwind/BUILD.bazel b/sandboxed_api/sandbox2/unwind/BUILD.bazel
index 27694b1..a41f48a 100644
--- a/sandboxed_api/sandbox2/unwind/BUILD.bazel
+++ b/sandboxed_api/sandbox2/unwind/BUILD.bazel
@@ -50,7 +50,7 @@ cc_library(
         ]
     ]),
     deps = [
-        ":unwind_proto_cc",
+        ":unwind_proto_cc_cc_proto",
         "//sandboxed_api/sandbox2:comms",
         "//sandboxed_api/sandbox2/util:maps_parser",
         "//sandboxed_api/sandbox2/util:minielf",