diff --git a/metropolis/installer/BUILD.bazel b/metropolis/installer/BUILD.bazel
index f4b125f..989a850 100644
--- a/metropolis/installer/BUILD.bazel
+++ b/metropolis/installer/BUILD.bazel
@@ -4,21 +4,21 @@
 load("//metropolis/node/build:efi.bzl", "efi_unified_kernel_image")
 
 go_library(
-    name = "go_default_library",
+    name = "installer_lib",
     srcs = ["main.go"],
     importpath = "source.monogon.dev/metropolis/installer",
     visibility = ["//visibility:private"],
     deps = [
-        "//metropolis/node/build/mkimage/osimage:go_default_library",
-        "//metropolis/pkg/efivarfs:go_default_library",
-        "//metropolis/pkg/sysfs:go_default_library",
-        "@org_golang_x_sys//unix:go_default_library",
+        "//metropolis/node/build/mkimage/osimage",
+        "//metropolis/pkg/efivarfs",
+        "//metropolis/pkg/sysfs",
+        "@org_golang_x_sys//unix",
     ],
 )
 
 go_binary(
     name = "installer",
-    embed = [":go_default_library"],
+    embed = [":installer_lib"],
     visibility = ["//visibility:private"],
 )
 
diff --git a/metropolis/installer/test/BUILD.bazel b/metropolis/installer/test/BUILD.bazel
index c958ac2..b296631 100644
--- a/metropolis/installer/test/BUILD.bazel
+++ b/metropolis/installer/test/BUILD.bazel
@@ -10,24 +10,24 @@
         "//third_party/edk2:firmware",
         "@qemu//:qemu-x86_64-softmmu",
     ],
-    embed = [":go_default_library"],
+    embed = [":test"],
     rundir = ".",
 )
 
 go_library(
-    name = "go_default_library",
+    name = "test",
     srcs = ["main.go"],
     importpath = "source.monogon.dev/metropolis/installer/test",
     visibility = ["//visibility:private"],
     deps = [
-        "//metropolis/cli/metroctl/core:go_default_library",
-        "//metropolis/cli/pkg/datafile:go_default_library",
-        "//metropolis/node/build/mkimage/osimage:go_default_library",
-        "//metropolis/pkg/logbuffer:go_default_library",
-        "//metropolis/proto/api:go_default_library",
-        "@com_github_diskfs_go_diskfs//:go_default_library",
-        "@com_github_diskfs_go_diskfs//disk:go_default_library",
-        "@com_github_diskfs_go_diskfs//partition/gpt:go_default_library",
+        "//metropolis/cli/metroctl/core",
+        "//metropolis/cli/pkg/datafile",
+        "//metropolis/node/build/mkimage/osimage",
+        "//metropolis/pkg/logbuffer",
+        "//metropolis/proto/api",
+        "@com_github_diskfs_go_diskfs//:go-diskfs",
+        "@com_github_diskfs_go_diskfs//disk",
+        "@com_github_diskfs_go_diskfs//partition/gpt",
     ],
 )
 
diff --git a/metropolis/installer/test/testos/BUILD b/metropolis/installer/test/testos/BUILD
index 0dcb8cb..9445e21 100644
--- a/metropolis/installer/test/testos/BUILD
+++ b/metropolis/installer/test/testos/BUILD
@@ -35,15 +35,15 @@
 )
 
 go_library(
-    name = "go_default_library",
+    name = "testos_lib",
     srcs = ["main.go"],
     importpath = "source.monogon.dev/metropolis/installer/test/testos",
     visibility = ["//visibility:private"],
-    deps = ["@org_golang_x_sys//unix:go_default_library"],
+    deps = ["@org_golang_x_sys//unix"],
 )
 
 go_binary(
     name = "testos",
-    embed = [":go_default_library"],
+    embed = [":testos_lib"],
     visibility = ["//visibility:public"],
 )