diff --git a/build/toolbase/BUILD.bazel b/build/toolbase/BUILD.bazel
index 6fd1489..2dea810 100644
--- a/build/toolbase/BUILD.bazel
+++ b/build/toolbase/BUILD.bazel
@@ -1,7 +1,7 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 
 go_library(
-    name = "go_default_library",
+    name = "toolbase",
     srcs = [
         "doc.go",
         "label.go",
@@ -12,8 +12,8 @@
 )
 
 go_test(
-    name = "go_default_test",
+    name = "toolbase_test",
     srcs = ["label_test.go"],
-    embed = [":go_default_library"],
-    deps = ["@com_github_google_go_cmp//cmp:go_default_library"],
+    embed = [":toolbase"],
+    deps = ["@com_github_google_go_cmp//cmp"],
 )
diff --git a/build/toolbase/gotoolchain/BUILD.bazel b/build/toolbase/gotoolchain/BUILD.bazel
index 9579e2c..42dc877 100644
--- a/build/toolbase/gotoolchain/BUILD.bazel
+++ b/build/toolbase/gotoolchain/BUILD.bazel
@@ -12,14 +12,14 @@
 
 # keep
 go_library(
-    name = "go_default_library",
+    name = "gotoolchain",
     embed = [":toolchain_library"],
     importpath = "source.monogon.dev/build/toolbase/gotoolchain",
     visibility = ["//visibility:public"],
 )
 
 go_test(
-    name = "go_default_test",
+    name = "gotoolchain_test",
     srcs = ["toolchain_test.go"],
-    embed = [":go_default_library"],  # keep
+    embed = [":gotoolchain"],  # keep
 )