diff --git a/bin/cloud_provider_firestore/BUILD.gn b/bin/cloud_provider_firestore/BUILD.gn
index a8de367..4438f6a 100644
--- a/bin/cloud_provider_firestore/BUILD.gn
+++ b/bin/cloud_provider_firestore/BUILD.gn
@@ -5,8 +5,6 @@
 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/cloud_provider_firestore/app/app.cc b/bin/cloud_provider_firestore/app/app.cc
index 0af8250..5550748 100644
--- a/bin/cloud_provider_firestore/app/app.cc
+++ b/bin/cloud_provider_firestore/app/app.cc
@@ -16,6 +16,7 @@
 namespace cloud_provider_firestore {
 namespace {
 
+constexpr fxl::StringView kCobaltClientName = "cloud_provider_firestore";
 constexpr fxl::StringView kNoStatisticsReporting = "disable_reporting";
 
 struct AppParams {
@@ -30,7 +31,7 @@
         trace_provider_(loop_.dispatcher()),
         factory_impl_(
             loop_.dispatcher(), &random_, startup_context_.get(),
-            app_params.disable_statistics ? "" : "cloud_provider_firestore") {
+            app_params.disable_statistics ? "" : kCobaltClientName.ToString()) {
     FXL_DCHECK(startup_context_);
   }
 
diff --git a/bin/cloud_provider_firestore/testing/cloud_provider_factory.cc b/bin/cloud_provider_firestore/testing/cloud_provider_factory.cc
index 21f2494..0fc71fa 100644
--- a/bin/cloud_provider_firestore/testing/cloud_provider_factory.cc
+++ b/bin/cloud_provider_firestore/testing/cloud_provider_factory.cc
@@ -19,7 +19,9 @@
 namespace {
 namespace http = ::fuchsia::net::oldhttp;
 
-constexpr char kAppUrl[] = "cloud_provider_firestore";
+constexpr char kAppUrl[] =
+    "fuchsia-pkg://fuchsia.com/cloud_provider_firestore"
+    "#meta/cloud_provider_firestore.cmx";
 
 std::string GenerateUserId() {
   // Always use a real random generator for user ids.
diff --git a/bin/ledger/BUILD.gn b/bin/ledger/BUILD.gn
index 460a713..1f7c787 100644
--- a/bin/ledger/BUILD.gn
+++ b/bin/ledger/BUILD.gn
@@ -10,8 +10,6 @@
 visibility = [ "//peridot/*" ]
 
 package("ledger") {
-  deprecated_bare_package_url = "//build"
-
   deps = [
     "app",
     "cobalt:ledger_metrics_registry",
@@ -43,8 +41,6 @@
 }
 
 package("ledger_tests") {
-  deprecated_bare_package_url = "//build"
-
   testonly = true
 
   deps = [
diff --git a/bin/ledger/testing/get_ledger.cc b/bin/ledger/testing/get_ledger.cc
index b4fbef2..5115a76 100644
--- a/bin/ledger/testing/get_ledger.cc
+++ b/bin/ledger/testing/get_ledger.cc
@@ -57,7 +57,7 @@
 
   component::Services child_services;
   fuchsia::sys::LaunchInfo launch_info;
-  launch_info.url = "ledger";
+  launch_info.url = "fuchsia-pkg://fuchsia.com/ledger#meta/ledger.cmx";
   launch_info.directory_request = child_services.NewRequest();
   launch_info.arguments.push_back("--disable_reporting");
   context->launcher()->CreateComponent(std::move(launch_info),
diff --git a/bin/ledger/tests/e2e_local/ledger_e2e_test.cc b/bin/ledger/tests/e2e_local/ledger_e2e_test.cc
index 9512b2f..974a028 100644
--- a/bin/ledger/tests/e2e_local/ledger_e2e_test.cc
+++ b/bin/ledger/tests/e2e_local/ledger_e2e_test.cc
@@ -58,7 +58,7 @@
   void Init(std::vector<std::string> additional_args) {
     component::Services child_services;
     fuchsia::sys::LaunchInfo launch_info;
-    launch_info.url = "ledger";
+    launch_info.url = "fuchsia-pkg://fuchsia.com/ledger#meta/ledger.cmx";
     launch_info.directory_request = child_services.NewRequest();
     launch_info.arguments.push_back("--disable_reporting");
     for (auto& additional_arg : additional_args) {
diff --git a/bin/ledger/tests/e2e_sync/ledger_app_instance_factory_e2e.cc b/bin/ledger/tests/e2e_sync/ledger_app_instance_factory_e2e.cc
index fe48081..a884718 100644
--- a/bin/ledger/tests/e2e_sync/ledger_app_instance_factory_e2e.cc
+++ b/bin/ledger/tests/e2e_sync/ledger_app_instance_factory_e2e.cc
@@ -72,7 +72,7 @@
 
   component::Services child_services;
   fuchsia::sys::LaunchInfo launch_info;
-  launch_info.url = "ledger";
+  launch_info.url = "fuchsia-pkg://fuchsia.com/ledger#meta/ledger.cmx";
   launch_info.directory_request = child_services.NewRequest();
   launch_info.arguments.push_back("--disable_reporting");
   launch_info.arguments.push_back("--firebase_api_key=" + sync_params_.api_key);