diff --git a/metropolis/test/e2e/connectivity/agent/BUILD.bazel b/metropolis/test/e2e/connectivity/agent/BUILD.bazel
index b9db83c..fd11006 100644
--- a/metropolis/test/e2e/connectivity/agent/BUILD.bazel
+++ b/metropolis/test/e2e/connectivity/agent/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("@rules_oci//oci:defs.bzl", "oci_image")
-load("//build/static_binary_tarball:def.bzl", "static_binary_tarball")
+load("//build/binary_tarball:def.bzl", "binary_tarball")
 
 go_library(
     name = "agent_lib",
@@ -19,7 +19,7 @@
     visibility = ["//visibility:private"],
 )
 
-static_binary_tarball(
+binary_tarball(
     name = "agent_layer",
     executable = ":agent",
     visibility = ["//visibility:private"],
diff --git a/metropolis/test/e2e/httpserver/BUILD.bazel b/metropolis/test/e2e/httpserver/BUILD.bazel
index d32e3de..8535ece 100644
--- a/metropolis/test/e2e/httpserver/BUILD.bazel
+++ b/metropolis/test/e2e/httpserver/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("@rules_oci//oci:defs.bzl", "oci_image")
-load("//build/static_binary_tarball:def.bzl", "static_binary_tarball")
+load("//build/binary_tarball:def.bzl", "binary_tarball")
 
 go_library(
     name = "httpserver_lib",
@@ -15,7 +15,7 @@
     visibility = ["//visibility:private"],
 )
 
-static_binary_tarball(
+binary_tarball(
     name = "httpserver_layer",
     executable = ":httpserver",
     visibility = ["//visibility:private"],
diff --git a/metropolis/test/e2e/persistentvolume/BUILD.bazel b/metropolis/test/e2e/persistentvolume/BUILD.bazel
index 7c97c21..678c86f 100644
--- a/metropolis/test/e2e/persistentvolume/BUILD.bazel
+++ b/metropolis/test/e2e/persistentvolume/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("@rules_oci//oci:defs.bzl", "oci_image")
-load("//build/static_binary_tarball:def.bzl", "static_binary_tarball")
+load("//build/binary_tarball:def.bzl", "binary_tarball")
 
 go_library(
     name = "persistentvolume_lib",
@@ -19,7 +19,7 @@
     visibility = ["//visibility:private"],
 )
 
-static_binary_tarball(
+binary_tarball(
     name = "persistentvolume_layer",
     executable = ":persistentvolume",
     visibility = ["//visibility:private"],
diff --git a/metropolis/test/e2e/preseedtest/BUILD.bazel b/metropolis/test/e2e/preseedtest/BUILD.bazel
index ad43f78..c1c756b 100644
--- a/metropolis/test/e2e/preseedtest/BUILD.bazel
+++ b/metropolis/test/e2e/preseedtest/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("@rules_oci//oci:defs.bzl", "oci_image", "oci_load")
-load("//build/static_binary_tarball:def.bzl", "static_binary_tarball")
+load("//build/binary_tarball:def.bzl", "binary_tarball")
 
 go_library(
     name = "preseedtest_lib",
@@ -15,7 +15,7 @@
     visibility = ["//visibility:private"],
 )
 
-static_binary_tarball(
+binary_tarball(
     name = "preseedtest_layer",
     executable = ":preseedtest",
     visibility = ["//visibility:private"],
diff --git a/metropolis/test/e2e/selftest/BUILD.bazel b/metropolis/test/e2e/selftest/BUILD.bazel
index 31754d6..fa2c09a 100644
--- a/metropolis/test/e2e/selftest/BUILD.bazel
+++ b/metropolis/test/e2e/selftest/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("@rules_oci//oci:defs.bzl", "oci_image")
-load("//build/static_binary_tarball:def.bzl", "static_binary_tarball")
+load("//build/binary_tarball:def.bzl", "binary_tarball")
 
 go_library(
     name = "selftest_lib",
@@ -15,7 +15,7 @@
     visibility = ["//visibility:private"],
 )
 
-static_binary_tarball(
+binary_tarball(
     name = "selftest_layer",
     executable = ":selftest",
     visibility = ["//visibility:private"],