diff --git a/bin/acquirers/story_info/BUILD.gn b/bin/acquirers/story_info/BUILD.gn
index 6962e50..d0a3e1a 100644
--- a/bin/acquirers/story_info/BUILD.gn
+++ b/bin/acquirers/story_info/BUILD.gn
@@ -6,6 +6,8 @@
 import("//peridot/build/executable_package.gni")
 
 executable_package("story_info") {
+  deprecated_bare_package_url = "//build"
+
   meta = [
     {
       path = "meta/story_info.cmx"
diff --git a/bin/agents/clipboard/BUILD.gn b/bin/agents/clipboard/BUILD.gn
index 95b6e16..0dc2a28 100644
--- a/bin/agents/clipboard/BUILD.gn
+++ b/bin/agents/clipboard/BUILD.gn
@@ -6,6 +6,8 @@
 import("//peridot/build/tests_package.gni")
 
 executable_package("clipboard_agent") {
+  deprecated_bare_package_url = "//build"
+
   meta = [
     {
       path = "meta/clipboard_agent.cmx"
diff --git a/bin/basemgr/BUILD.gn b/bin/basemgr/BUILD.gn
index d98ba4c..39b6b7c 100644
--- a/bin/basemgr/BUILD.gn
+++ b/bin/basemgr/BUILD.gn
@@ -13,6 +13,8 @@
 }
 
 executable_package("basemgr") {
+  deprecated_bare_package_url = "//build"
+
   meta = [
     {
       path = "meta/basemgr.cmx"
@@ -112,6 +114,8 @@
 }
 
 executable_package("dev_base_shell") {
+  deprecated_bare_package_url = "//build"
+
   meta = [
     {
       path = "meta/dev_base_shell.cmx"
diff --git a/bin/cloud_provider_firestore/BUILD.gn b/bin/cloud_provider_firestore/BUILD.gn
index 4438f6a..a8de367 100644
--- a/bin/cloud_provider_firestore/BUILD.gn
+++ b/bin/cloud_provider_firestore/BUILD.gn
@@ -5,6 +5,8 @@
 import("//build/package.gni")
 
 package("cloud_provider_firestore") {
+  deprecated_bare_package_url = "//build"
+
   deps = [
     "app",
     "//peridot/bin/ledger/cobalt:ledger_metrics_registry",
diff --git a/bin/context_engine/BUILD.gn b/bin/context_engine/BUILD.gn
index da1d90a..520cce6 100644
--- a/bin/context_engine/BUILD.gn
+++ b/bin/context_engine/BUILD.gn
@@ -6,6 +6,8 @@
 import("//peridot/build/tests_package.gni")
 
 executable_package("context_engine") {
+  deprecated_bare_package_url = "//build"
+
   meta = [
     {
       path = "meta/context_engine.cmx"
diff --git a/bin/ledger/BUILD.gn b/bin/ledger/BUILD.gn
index 6e998fd..a9d2c3e 100644
--- a/bin/ledger/BUILD.gn
+++ b/bin/ledger/BUILD.gn
@@ -10,6 +10,8 @@
 visibility = [ "//peridot/*" ]
 
 package("ledger") {
+  deprecated_bare_package_url = "//build"
+
   deps = [
     "app",
     "cobalt:ledger_metrics_registry",
@@ -41,6 +43,8 @@
 }
 
 package("ledger_tests") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   deps = [
diff --git a/bin/ledger/tests/benchmark/BUILD.gn b/bin/ledger/tests/benchmark/BUILD.gn
index 8cf9355..e2937ae 100644
--- a/bin/ledger/tests/benchmark/BUILD.gn
+++ b/bin/ledger/tests/benchmark/BUILD.gn
@@ -8,6 +8,8 @@
 visibility = [ "//peridot/bin/ledger/*" ]
 
 package("ledger_benchmarks") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   deps = [
diff --git a/bin/module_resolver/BUILD.gn b/bin/module_resolver/BUILD.gn
index f4682bc..5a6cd41 100644
--- a/bin/module_resolver/BUILD.gn
+++ b/bin/module_resolver/BUILD.gn
@@ -7,6 +7,8 @@
 import("//peridot/build/tests_package.gni")
 
 executable_package("module_resolver") {
+  deprecated_bare_package_url = "//build"
+
   meta = [
     {
       path = "meta/module_resolver.cmx"
diff --git a/bin/module_resolver/module_package_indexer/BUILD.gn b/bin/module_resolver/module_package_indexer/BUILD.gn
index c7bc507..843726f 100644
--- a/bin/module_resolver/module_package_indexer/BUILD.gn
+++ b/bin/module_resolver/module_package_indexer/BUILD.gn
@@ -5,6 +5,8 @@
 import("//peridot/build/executable_package.gni")
 
 executable_package("module_package_indexer") {
+  deprecated_bare_package_url = "//build"
+
   sources = [
     "main.cc",
   ]
diff --git a/bin/sessionmgr/BUILD.gn b/bin/sessionmgr/BUILD.gn
index 2ebab59..b05e909 100644
--- a/bin/sessionmgr/BUILD.gn
+++ b/bin/sessionmgr/BUILD.gn
@@ -5,6 +5,8 @@
 import("//peridot/build/executable_package.gni")
 
 executable_package("sessionmgr") {
+  deprecated_bare_package_url = "//build"
+
   meta = [
     {
       path = "meta/sessionmgr.cmx"
@@ -92,6 +94,8 @@
 }
 
 executable_package("dev_session_shell") {
+  deprecated_bare_package_url = "//build"
+
   meta = [
     {
       path = "meta/dev_session_shell.cmx"
diff --git a/bin/sessionmgr/story_runner/BUILD.gn b/bin/sessionmgr/story_runner/BUILD.gn
index 8b6d296..d119481 100644
--- a/bin/sessionmgr/story_runner/BUILD.gn
+++ b/bin/sessionmgr/story_runner/BUILD.gn
@@ -91,6 +91,8 @@
 }
 
 executable_package("dev_story_shell") {
+  deprecated_bare_package_url = "//build"
+
   meta = [
     {
       path = "meta/dev_story_shell.cmx"
diff --git a/bin/suggestion_engine/BUILD.gn b/bin/suggestion_engine/BUILD.gn
index bbf2ae8..c031a18 100644
--- a/bin/suggestion_engine/BUILD.gn
+++ b/bin/suggestion_engine/BUILD.gn
@@ -6,6 +6,8 @@
 import("//peridot/build/tests_package.gni")
 
 executable_package("suggestion_engine") {
+  deprecated_bare_package_url = "//build"
+
   meta = [
     {
       path = "meta/suggestion_engine.cmx"
diff --git a/bin/token_manager/BUILD.gn b/bin/token_manager/BUILD.gn
index b632f45..65e850e 100644
--- a/bin/token_manager/BUILD.gn
+++ b/bin/token_manager/BUILD.gn
@@ -5,6 +5,8 @@
 import("//peridot/build/executable_package.gni")
 
 executable_package("dev_token_manager") {
+  deprecated_bare_package_url = "//build"
+
   meta = [
     {
       path = "meta/dev_token_manager.cmx"
diff --git a/build/executable_package.gni b/build/executable_package.gni
index cae93e6..94a9753 100644
--- a/build/executable_package.gni
+++ b/build/executable_package.gni
@@ -33,7 +33,7 @@
                              "meta",
                              "tests",
                              "resources",
-                             "deprecated_no_cmx",
+                             "deprecated_bare_package_url",
                            ])
     if (defined(deps)) {
       deps += [ ":${binary_rule}" ]
diff --git a/examples/simple/BUILD.gn b/examples/simple/BUILD.gn
index 5de45dd..026419b 100644
--- a/examples/simple/BUILD.gn
+++ b/examples/simple/BUILD.gn
@@ -6,6 +6,8 @@
 import("//peridot/build/executable_package.gni")
 
 executable_package("simple_agent") {
+  deprecated_bare_package_url = "//build"
+
   meta = [
     {
       path = "meta/simple_agent.cmx"
@@ -28,6 +30,8 @@
 }
 
 executable_package("simple_module") {
+  deprecated_bare_package_url = "//build"
+
   meta = [
     {
       path = "meta/simple_module.cmx"
diff --git a/examples/swap_cpp/BUILD.gn b/examples/swap_cpp/BUILD.gn
index eaa5ac3..b6110a8 100644
--- a/examples/swap_cpp/BUILD.gn
+++ b/examples/swap_cpp/BUILD.gn
@@ -5,6 +5,8 @@
 import("//peridot/build/executable_package.gni")
 
 executable_package("swap_module1") {
+  deprecated_bare_package_url = "//build"
+
   meta = [
     {
       path = "meta/swap_module1.cmx"
@@ -24,6 +26,8 @@
 }
 
 executable_package("swap_module2") {
+  deprecated_bare_package_url = "//build"
+
   meta = [
     {
       path = "meta/swap_module2.cmx"
@@ -60,6 +64,8 @@
 }
 
 executable_package("swap_recipe") {
+  deprecated_bare_package_url = "//build"
+
   meta = [
     {
       path = "meta/swap_recipe.cmx"
diff --git a/examples/todo_cpp/BUILD.gn b/examples/todo_cpp/BUILD.gn
index 7449036..73a0a08 100644
--- a/examples/todo_cpp/BUILD.gn
+++ b/examples/todo_cpp/BUILD.gn
@@ -5,6 +5,8 @@
 import("//peridot/build/executable_package.gni")
 
 executable_package("todo_cpp") {
+  deprecated_bare_package_url = "//build"
+
   meta = [
     {
       path = "meta/todo_cpp.cmx"
diff --git a/tests/benchmarks/story/BUILD.gn b/tests/benchmarks/story/BUILD.gn
index 609c483..ffabe06 100644
--- a/tests/benchmarks/story/BUILD.gn
+++ b/tests/benchmarks/story/BUILD.gn
@@ -5,6 +5,8 @@
 import("//peridot/build/executable_package.gni")
 
 executable_package("modular_benchmark_story_module") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [
@@ -27,6 +29,8 @@
 }
 
 executable_package("modular_benchmark_story_session_shell") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [
diff --git a/tests/chain/BUILD.gn b/tests/chain/BUILD.gn
index 3219166..2001b7a 100644
--- a/tests/chain/BUILD.gn
+++ b/tests/chain/BUILD.gn
@@ -5,6 +5,8 @@
 import("//peridot/build/executable_package.gni")
 
 executable_package("chain_test_session_shell") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [
@@ -40,6 +42,8 @@
 }
 
 executable_package("chain_test_module") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [
@@ -66,9 +70,11 @@
 }
 
 executable_package("chain_test_child_module") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
-    meta = [
+  meta = [
     {
       path = "meta/chain_test_child_module.cmx"
       dest = "chain_test_child_module.cmx"
diff --git a/tests/clipboard/BUILD.gn b/tests/clipboard/BUILD.gn
index b87ad19..ab1b9d1 100644
--- a/tests/clipboard/BUILD.gn
+++ b/tests/clipboard/BUILD.gn
@@ -5,6 +5,8 @@
 import("//peridot/build/executable_package.gni")
 
 executable_package("clipboard_test_module") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   sources = [
diff --git a/tests/common/BUILD.gn b/tests/common/BUILD.gn
index 09e099d..9c5fe26 100644
--- a/tests/common/BUILD.gn
+++ b/tests/common/BUILD.gn
@@ -34,6 +34,8 @@
 }
 
 package("common_null_module") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   deps = [
@@ -71,6 +73,8 @@
 }
 
 package("common_active_module") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   deps = [
diff --git a/tests/component_context/BUILD.gn b/tests/component_context/BUILD.gn
index ff55743..d0d769f 100644
--- a/tests/component_context/BUILD.gn
+++ b/tests/component_context/BUILD.gn
@@ -6,6 +6,8 @@
 import("//peridot/build/executable_package.gni")
 
 executable_package("component_context_test_module") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
     meta = [
@@ -33,6 +35,8 @@
 }
 
 executable_package("component_context_test_one_agent") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
     meta = [
@@ -60,6 +64,8 @@
 }
 
 executable_package("component_context_test_two_agent") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
     meta = [
@@ -84,6 +90,8 @@
 }
 
 executable_package("component_context_test_unstoppable_agent") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
     meta = [
diff --git a/tests/embed_shell/BUILD.gn b/tests/embed_shell/BUILD.gn
index 36716cc..6f7caf2 100644
--- a/tests/embed_shell/BUILD.gn
+++ b/tests/embed_shell/BUILD.gn
@@ -13,6 +13,8 @@
 }
 
 executable_package("embed_shell_test_child_module") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [
@@ -38,6 +40,8 @@
 }
 
 executable_package("embed_shell_test_parent_module") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [
@@ -64,6 +68,8 @@
 }
 
 executable_package("embed_shell_test_story_shell") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [
diff --git a/tests/intents/BUILD.gn b/tests/intents/BUILD.gn
index 7dd6eaf..46e783b 100644
--- a/tests/intents/BUILD.gn
+++ b/tests/intents/BUILD.gn
@@ -13,6 +13,8 @@
 }
 
 executable_package("intent_test_parent_module") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [
@@ -38,6 +40,8 @@
 }
 
 executable_package("intent_test_child_module") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [
diff --git a/tests/last_focus_time/BUILD.gn b/tests/last_focus_time/BUILD.gn
index 5ca94bc..4f3e494 100644
--- a/tests/last_focus_time/BUILD.gn
+++ b/tests/last_focus_time/BUILD.gn
@@ -13,6 +13,8 @@
 }
 
 executable_package("last_focus_time_test_session_shell") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [
diff --git a/tests/link_context_entities/BUILD.gn b/tests/link_context_entities/BUILD.gn
index 732e8dc..ef9018c 100644
--- a/tests/link_context_entities/BUILD.gn
+++ b/tests/link_context_entities/BUILD.gn
@@ -13,6 +13,8 @@
 }
 
 executable_package("link_context_entities_test_session_shell") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [
@@ -47,6 +49,8 @@
 }
 
 executable_package("link_context_entities_test_module") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [
diff --git a/tests/link_data/BUILD.gn b/tests/link_data/BUILD.gn
index c82eb0d..3dcb92d 100644
--- a/tests/link_data/BUILD.gn
+++ b/tests/link_data/BUILD.gn
@@ -13,6 +13,8 @@
 }
 
 executable_package("link_data_test_session_shell") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   sources = [
@@ -45,6 +47,8 @@
 }
 
 executable_package("link_data_test_module0") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   sources = [
@@ -71,6 +75,8 @@
 }
 
 executable_package("link_data_test_module1") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   sources = [
@@ -97,6 +103,8 @@
 }
 
 executable_package("link_data_test_module2") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   sources = [
diff --git a/tests/link_passing/BUILD.gn b/tests/link_passing/BUILD.gn
index a6d7c0b..ca8ef08 100644
--- a/tests/link_passing/BUILD.gn
+++ b/tests/link_passing/BUILD.gn
@@ -13,6 +13,8 @@
 }
 
 executable_package("link_passing_test_module1") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [
@@ -38,6 +40,8 @@
 }
 
 executable_package("link_passing_test_module2") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [
@@ -63,6 +67,8 @@
 }
 
 executable_package("link_passing_test_module3") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [
diff --git a/tests/module_context/BUILD.gn b/tests/module_context/BUILD.gn
index 2ba172a..133fe82 100644
--- a/tests/module_context/BUILD.gn
+++ b/tests/module_context/BUILD.gn
@@ -5,6 +5,8 @@
 import("//peridot/build/executable_package.gni")
 
 executable_package("module_context_test_session_shell") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [
@@ -38,6 +40,8 @@
 }
 
 executable_package("module_context_test_module") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [
@@ -66,6 +70,8 @@
 }
 
 executable_package("module_context_test_entity_module") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [
diff --git a/tests/parent_child/BUILD.gn b/tests/parent_child/BUILD.gn
index 0a971b2..5e6f22c 100644
--- a/tests/parent_child/BUILD.gn
+++ b/tests/parent_child/BUILD.gn
@@ -13,6 +13,8 @@
 }
 
 executable_package("parent_child_test_child_module1") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [
@@ -38,6 +40,8 @@
 }
 
 executable_package("parent_child_test_child_module2") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [
@@ -63,6 +67,8 @@
 }
 
 executable_package("parent_child_test_parent_module") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [
diff --git a/tests/queue_persistence/BUILD.gn b/tests/queue_persistence/BUILD.gn
index bc0a5ab..748245e 100644
--- a/tests/queue_persistence/BUILD.gn
+++ b/tests/queue_persistence/BUILD.gn
@@ -14,6 +14,8 @@
 }
 
 executable_package("queue_persistence_test_module") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [
@@ -41,6 +43,8 @@
 }
 
 executable_package("queue_persistence_test_agent") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [
diff --git a/tests/session_shell/BUILD.gn b/tests/session_shell/BUILD.gn
index 2f98ed8..27496da 100644
--- a/tests/session_shell/BUILD.gn
+++ b/tests/session_shell/BUILD.gn
@@ -13,6 +13,8 @@
 }
 
 executable_package("session_shell_test_session_shell") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [
diff --git a/tests/story_shell/BUILD.gn b/tests/story_shell/BUILD.gn
index 2537f77..443161c 100644
--- a/tests/story_shell/BUILD.gn
+++ b/tests/story_shell/BUILD.gn
@@ -13,6 +13,8 @@
 }
 
 executable_package("story_shell_test_story_shell") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [
@@ -48,6 +50,8 @@
 }
 
 executable_package("story_shell_test_session_shell") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [
diff --git a/tests/suggestion/BUILD.gn b/tests/suggestion/BUILD.gn
index ec5a925..6ff9cdc 100644
--- a/tests/suggestion/BUILD.gn
+++ b/tests/suggestion/BUILD.gn
@@ -13,6 +13,8 @@
 }
 
 executable_package("suggestion_test_module") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [
@@ -39,6 +41,8 @@
 }
 
 executable_package("suggestion_test_session_shell") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [
diff --git a/tests/trigger/BUILD.gn b/tests/trigger/BUILD.gn
index d04f6ee..ef2e882 100644
--- a/tests/trigger/BUILD.gn
+++ b/tests/trigger/BUILD.gn
@@ -14,6 +14,8 @@
 }
 
 executable_package("trigger_test_session_shell") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [
@@ -43,6 +45,8 @@
 }
 
 executable_package("trigger_test_module") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [
@@ -70,6 +74,8 @@
 }
 
 executable_package("trigger_test_agent") {
+  deprecated_bare_package_url = "//build"
+
   testonly = true
 
   meta = [