diff --git a/apps/bmp-streamer/pkg/bmpstreamer/BUILD.bazel b/apps/bmp-streamer/pkg/bmpstreamer/BUILD.bazel
index 2e02bcc07c5ddf814a4ec2bf1e870e4a076bdbc2..0ecf525dfd301d556c953072f02361c6a5f11184 100644
--- a/apps/bmp-streamer/pkg/bmpstreamer/BUILD.bazel
+++ b/apps/bmp-streamer/pkg/bmpstreamer/BUILD.bazel
@@ -20,7 +20,7 @@ go_proto_library(
     deps = [
         "//net/api:go_default_library",
         "//route/api:go_default_library",
-        "//vendor/google.golang.org/grpc:go_default_library",  # keep
+        "//vendor/google.golang.org/grpc:go_default_library",
     ],
 )
 
diff --git a/net/api/BUILD.bazel b/net/api/BUILD.bazel
index 627681781e6c7ceb03adf47fa05a8382aa1ecb32..720db1c0ca8d6b7e4e68a99dd6a4a23a80a6556b 100644
--- a/net/api/BUILD.bazel
+++ b/net/api/BUILD.bazel
@@ -2,13 +2,13 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
 
 proto_library(
-    name = "bio_net_proto",
+    name = "api_proto",
     srcs = ["net.proto"],
     visibility = ["//visibility:public"],
 )
 
 go_proto_library(
-    name = "bio_net_go_proto",
+    name = "api_go_proto",
     importpath = "github.com/bio-routing/bio-rd/net/api",
     proto = ":api_proto",
     visibility = ["//visibility:public"],
@@ -16,13 +16,7 @@ go_proto_library(
 
 go_library(
     name = "go_default_library",
-    embed = [":bio_net_go_proto"],
+    embed = [":api_go_proto"],
     importpath = "github.com/bio-routing/bio-rd/net/api",
     visibility = ["//visibility:public"],
 )
-
-proto_library(
-    name = "api_proto",
-    srcs = ["net.proto"],
-    visibility = ["//visibility:public"],
-)
diff --git a/route/api/BUILD.bazel b/route/api/BUILD.bazel
index 56999fb547974c6a7674e2ccd95b6a7128be2ff2..e5c00868e69a1fd2af750e36905ed3096e1c5251 100644
--- a/route/api/BUILD.bazel
+++ b/route/api/BUILD.bazel
@@ -2,16 +2,16 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
 
 proto_library(
-    name = "bio_route_proto",
+    name = "api_proto",
     srcs = ["route.proto"],
     visibility = ["//visibility:public"],
-    deps = ["//net/api:bio_net_proto"],
+    deps = ["//net/api:api_proto"],
 )
 
 go_proto_library(
-    name = "bio_route_go_proto",
-    importpath = "route/api",
-    proto = ":bio_route_proto",
+    name = "api_go_proto",
+    importpath = "github.com/bio-routing/bio-rd/route/api",
+    proto = ":api_proto",
     visibility = ["//visibility:public"],
     deps = ["//net/api:go_default_library"],
 )
@@ -22,18 +22,3 @@ go_library(
     importpath = "github.com/bio-routing/bio-rd/route/api",
     visibility = ["//visibility:public"],
 )
-
-proto_library(
-    name = "api_proto",
-    srcs = ["route.proto"],
-    visibility = ["//visibility:public"],
-    deps = ["//net/api:api_proto"],
-)
-
-go_proto_library(
-    name = "api_go_proto",
-    importpath = "github.com/bio-routing/bio-rd/route/api",
-    proto = ":api_proto",
-    visibility = ["//visibility:public"],
-    deps = ["//net/api:go_default_library"],
-)