diff --git a/security/agent/test.sh b/security/agent/test.sh
index c90758a..2e574a6 100755
--- a/security/agent/test.sh
+++ b/security/agent/test.sh
@@ -2,7 +2,7 @@
 
 # Test running an application using the agent.
 
-source "$(go list -f {{.Dir}} v.io/veyron/shell/lib)/shell_test.sh"
+source "$(go list -f {{.Dir}} v.io/core/shell/lib)/shell_test.sh"
 
 readonly WORKDIR="${shell_test_WORK_DIR}"
 
diff --git a/security/agent/testchild.sh b/security/agent/testchild.sh
index ab01b6d..76b2124 100755
--- a/security/agent/testchild.sh
+++ b/security/agent/testchild.sh
@@ -2,7 +2,7 @@
 
 # Helper script for testing two binaries under the same agent.
 
-source "$(go list -f {{.Dir}} v.io/veyron/shell/lib)/shell_test.sh"
+source "$(go list -f {{.Dir}} v.io/core/shell/lib)/shell_test.sh"
 
 main() {
   if [[ -n "${VEYRON_CREDENTIALS}" ]]; then
diff --git a/services/identity/test.sh b/services/identity/test.sh
index 6774ddc..67ccffa 100755
--- a/services/identity/test.sh
+++ b/services/identity/test.sh
@@ -2,7 +2,7 @@
 
 # Test that tests the routes of the identityd server.
 
-source "$(go list -f {{.Dir}} v.io/veyron/shell/lib)/shell_test.sh"
+source "$(go list -f {{.Dir}} v.io/core/shell/lib)/shell_test.sh"
 
 readonly WORKDIR="${shell_test_WORK_DIR}"
 
diff --git a/services/mgmt/application/applicationd/test.sh b/services/mgmt/application/applicationd/test.sh
index ba29dbd..68cf253 100755
--- a/services/mgmt/application/applicationd/test.sh
+++ b/services/mgmt/application/applicationd/test.sh
@@ -6,7 +6,7 @@
 # application repository client to verify that <application>.Put(),
 # <application>.Match(), and <application>.Remove() work as expected.
 
-source "$(go list -f {{.Dir}} v.io/veyron/shell/lib)/shell_test.sh"
+source "$(go list -f {{.Dir}} v.io/core/shell/lib)/shell_test.sh"
 
 # Run the test under the security agent.
 shell_test::enable_agent "$@"
diff --git a/services/mgmt/binary/binaryd/test.sh b/services/mgmt/binary/binaryd/test.sh
index cb447e4..273e44c 100755
--- a/services/mgmt/binary/binaryd/test.sh
+++ b/services/mgmt/binary/binaryd/test.sh
@@ -6,7 +6,7 @@
 # repository client to verify that <binary>.Upload(),
 # <binary>.Download(), and <binary>.Delete() work as expected.
 
-source "$(go list -f {{.Dir}} v.io/veyron/shell/lib)/shell_test.sh"
+source "$(go list -f {{.Dir}} v.io/core/shell/lib)/shell_test.sh"
 
 # Run the test under the security agent.
 shell_test::enable_agent "$@"
diff --git a/services/mgmt/build/buildd/test.sh b/services/mgmt/build/buildd/test.sh
index 171f315..81d45a1 100755
--- a/services/mgmt/build/buildd/test.sh
+++ b/services/mgmt/build/buildd/test.sh
@@ -5,7 +5,7 @@
 # This test starts a build server daemon and uses the build client to
 # verify that <build>.Build() works as expected.
 
-source "$(go list -f {{.Dir}} v.io/veyron/shell/lib)/shell_test.sh"
+source "$(go list -f {{.Dir}} v.io/core/shell/lib)/shell_test.sh"
 
 # Run the test under the security agent.
 shell_test::enable_agent "$@"
diff --git a/services/mgmt/profile/profiled/test.sh b/services/mgmt/profile/profiled/test.sh
index 03070f7..756916d 100755
--- a/services/mgmt/profile/profiled/test.sh
+++ b/services/mgmt/profile/profiled/test.sh
@@ -7,7 +7,7 @@
 # <profile>.Description(), <profile>.Speficiation(), and
 # <profile>.Remove() work as expected.
 
-source "$(go list -f {{.Dir}} v.io/veyron/shell/lib)/shell_test.sh"
+source "$(go list -f {{.Dir}} v.io/core/shell/lib)/shell_test.sh"
 
 # Run the test under the security agent.
 shell_test::enable_agent "$@"
diff --git a/services/mounttable/mounttabled/test.sh b/services/mounttable/mounttabled/test.sh
index a14c2d7..8f301da 100755
--- a/services/mounttable/mounttabled/test.sh
+++ b/services/mounttable/mounttabled/test.sh
@@ -9,7 +9,7 @@
 # Then it verifies that <mounttable>.Glob(*) and <neighborhood>.Glob(nhname)
 # return the correct result.
 
-source "$(go list -f {{.Dir}} v.io/veyron/shell/lib)/shell_test.sh"
+source "$(go list -f {{.Dir}} v.io/core/shell/lib)/shell_test.sh"
 
 # Run the test under the security agent.
 shell_test::enable_agent "$@"
diff --git a/tools/application/doc.go b/tools/application/doc.go
index 50f9e94..31b8cfa 100644
--- a/tools/application/doc.go
+++ b/tools/application/doc.go
@@ -32,6 +32,8 @@
    logs at or above this threshold go to stderr
  -v=0
    log level for V logs
+ -vanadium.i18n_catalogue=
+   18n catalogue files to load, comma separated
  -veyron.credentials=
    directory to use for storing security credentials
  -veyron.namespace.root=[/ns.dev.v.io:8101]
diff --git a/tools/binary/doc.go b/tools/binary/doc.go
index 1e8ad0e..3807988 100644
--- a/tools/binary/doc.go
+++ b/tools/binary/doc.go
@@ -8,9 +8,10 @@
    binary <command>
 
 The binary commands are:
-   delete      Delete binary
-   download    Download binary
-   upload      Upload binary
+   delete      Delete a binary
+   download    Download a binary
+   upload      Upload a binary
+   url         Fetch a download URL
    help        Display help for commands or topics
 Run "binary help [command]" for command usage.
 
@@ -29,6 +30,8 @@
    logs at or above this threshold go to stderr
  -v=0
    log level for V logs
+ -vanadium.i18n_catalogue=
+   18n catalogue files to load, comma separated
  -veyron.credentials=
    directory to use for storing security credentials
  -veyron.namespace.root=[/ns.dev.v.io:8101]
@@ -73,6 +76,16 @@
 <von> is the veyron object name of the binary to upload <filename> is the name
 of the file to upload
 
+Binary Url
+
+Connect to the binary repository and fetch the download URL for the given veyron
+object name.
+
+Usage:
+   binary url <von>
+
+<von> is the veyron object name of the binary repository
+
 Binary Help
 
 Help with no args displays the usage of the parent command.
diff --git a/tools/build/doc.go b/tools/build/doc.go
index f3b7ae9..bd39613 100644
--- a/tools/build/doc.go
+++ b/tools/build/doc.go
@@ -27,6 +27,8 @@
    logs at or above this threshold go to stderr
  -v=0
    log level for V logs
+ -vanadium.i18n_catalogue=
+   18n catalogue files to load, comma separated
  -veyron.credentials=
    directory to use for storing security credentials
  -veyron.namespace.root=[/ns.dev.v.io:8101]
diff --git a/tools/debug/doc.go b/tools/debug/doc.go
index d611d34..3bf5c2f 100644
--- a/tools/debug/doc.go
+++ b/tools/debug/doc.go
@@ -31,6 +31,8 @@
    logs at or above this threshold go to stderr
  -v=0
    log level for V logs
+ -vanadium.i18n_catalogue=
+   18n catalogue files to load, comma separated
  -veyron.credentials=
    directory to use for storing security credentials
  -veyron.namespace.root=[/ns.dev.v.io:8101]
diff --git a/tools/debug/test.sh b/tools/debug/test.sh
index 62fff1d..133fed4 100755
--- a/tools/debug/test.sh
+++ b/tools/debug/test.sh
@@ -5,7 +5,7 @@
 # This test starts a mounttable server and then runs the debug command against
 # it.
 
-source "$(go list -f {{.Dir}} v.io/veyron/shell/lib)/shell_test.sh"
+source "$(go list -f {{.Dir}} v.io/core/shell/lib)/shell_test.sh"
 
 # Run the test under the security agent.
 shell_test::enable_agent "$@"
diff --git a/tools/mgmt/device/doc.go b/tools/mgmt/device/doc.go
index 13f6066..a0e39e3 100644
--- a/tools/mgmt/device/doc.go
+++ b/tools/mgmt/device/doc.go
@@ -35,6 +35,8 @@
    logs at or above this threshold go to stderr
  -v=0
    log level for V logs
+ -vanadium.i18n_catalogue=
+   18n catalogue files to load, comma separated
  -veyron.credentials=
    directory to use for storing security credentials
  -veyron.namespace.root=[/ns.dev.v.io:8101]
diff --git a/tools/mgmt/test.sh b/tools/mgmt/test.sh
index 59e4702..479cc27 100755
--- a/tools/mgmt/test.sh
+++ b/tools/mgmt/test.sh
@@ -2,7 +2,7 @@
 
 # Test the device manager and related services and tools.
 
-source "$(go list -f {{.Dir}} v.io/veyron/shell/lib)/shell_test.sh"
+source "$(go list -f {{.Dir}} v.io/core/shell/lib)/shell_test.sh"
 
 readonly WORKDIR="${shell_test_WORK_DIR}"
 
diff --git a/tools/mounttable/doc.go b/tools/mounttable/doc.go
index cc9f700..15c9ec0 100644
--- a/tools/mounttable/doc.go
+++ b/tools/mounttable/doc.go
@@ -30,6 +30,8 @@
    logs at or above this threshold go to stderr
  -v=0
    log level for V logs
+ -vanadium.i18n_catalogue=
+   18n catalogue files to load, comma separated
  -veyron.credentials=
    directory to use for storing security credentials
  -veyron.namespace.root=[/ns.dev.v.io:8101]
diff --git a/tools/namespace/doc.go b/tools/namespace/doc.go
index 2cf91fa..94e8424 100644
--- a/tools/namespace/doc.go
+++ b/tools/namespace/doc.go
@@ -37,6 +37,8 @@
    logs at or above this threshold go to stderr
  -v=0
    log level for V logs
+ -vanadium.i18n_catalogue=
+   18n catalogue files to load, comma separated
  -veyron.credentials=
    directory to use for storing security credentials
  -veyron.namespace.root=[/ns.dev.v.io:8101]
diff --git a/tools/naming/simulator/test.sh b/tools/naming/simulator/test.sh
index a9364ae..7e9e59d 100755
--- a/tools/naming/simulator/test.sh
+++ b/tools/naming/simulator/test.sh
@@ -2,7 +2,7 @@
 
 # Test the simulator command-line tool.
 
-source "$(go list -f {{.Dir}} v.io/veyron/shell/lib)/shell_test.sh"
+source "$(go list -f {{.Dir}} v.io/core/shell/lib)/shell_test.sh"
 
 # Run the test under the security agent.
 shell_test::enable_agent "$@"
diff --git a/tools/principal/test.sh b/tools/principal/test.sh
index d4355b0..73d7363 100755
--- a/tools/principal/test.sh
+++ b/tools/principal/test.sh
@@ -6,7 +6,7 @@
 # Not the "seekblessing" command yet, since that requires
 # starting a separate server.
 
-source "$(go list -f {{.Dir}} v.io/veyron/shell/lib)/shell_test.sh"
+source "$(go list -f {{.Dir}} v.io/core/shell/lib)/shell_test.sh"
 
 readonly WORKDIR=${shell_test_WORK_DIR}
 
diff --git a/tools/profile/doc.go b/tools/profile/doc.go
index 794ca1c..2a79b38 100644
--- a/tools/profile/doc.go
+++ b/tools/profile/doc.go
@@ -8,12 +8,12 @@
    profile <command>
 
 The profile commands are:
-   label       Shows a human-readable profile key for the profile.
-   description Shows a human-readable profile description for the profile.
-   spec        Shows the specification of the profile.
-   put         Sets a placeholder specification for the profile.
-   remove      removes the profile specification for the profile.
-   help        Display help for commands or topics
+   label         Shows a human-readable profile key for the profile.
+   description   Shows a human-readable profile description for the profile.
+   specification Shows the specification of the profile.
+   put           Sets a placeholder specification for the profile.
+   remove        removes the profile specification for the profile.
+   help          Display help for commands or topics
 Run "profile help [command]" for command usage.
 
 The global flags are:
@@ -31,6 +31,8 @@
    logs at or above this threshold go to stderr
  -v=0
    log level for V logs
+ -vanadium.i18n_catalogue=
+   18n catalogue files to load, comma separated
  -veyron.credentials=
    directory to use for storing security credentials
  -veyron.namespace.root=[/ns.dev.v.io:8101]
@@ -62,12 +64,12 @@
 
 <profile> is the full name of the profile.
 
-Profile Spec
+Profile Specification
 
 Shows the specification of the profile.
 
 Usage:
-   profile spec <profile>
+   profile specification <profile>
 
 <profile> is the full name of the profile.
 
diff --git a/tools/vrpc/doc.go b/tools/vrpc/doc.go
index 897c72f..ffb250a 100644
--- a/tools/vrpc/doc.go
+++ b/tools/vrpc/doc.go
@@ -16,16 +16,6 @@
 Run "vrpc help [command]" for command usage.
 
 The global flags are:
- -acl=
-   acl is an optional JSON-encoded security.ACL that is used to construct a
-   security.Authorizer. Example: {"In":{"veyron/alice/...":"RW"}} is a
-   JSON-encoded ACL that allows all delegates of "veyron/alice" to access all
-   methods with ReadLabel or WriteLabel. If this flag is provided then the
-   \"--acl_file\" must be absent.
- -acl_file=
-   acl_file is an optional path to a file containing a JSON-encoded security.ACL
-   that is used to construct a security.Authorizer. If this flag is provided
-   then the "--acl_file" flag must be absent.
  -alsologtostderr=true
    log to standard error as well as files
  -log_backtrace_at=:0
@@ -40,17 +30,12 @@
    logs at or above this threshold go to stderr
  -v=0
    log level for V logs
+ -vanadium.i18n_catalogue=
+   18n catalogue files to load, comma separated
  -veyron.credentials=
    directory to use for storing security credentials
  -veyron.namespace.root=[/ns.dev.v.io:8101]
    local namespace root; can be repeated to provided multiple roots
- -veyron.proxy=
-   object name of proxy service to use to export services across network
-   boundaries
- -veyron.tcp.address=:0
-   address to listen on
- -veyron.tcp.protocol=tcp
-   protocol to listen with
  -veyron.vtrace.cache_size=1024
    The number of vtrace traces to store in memory.
  -veyron.vtrace.dump_on_shutdown=false
diff --git a/tools/vrun/test.sh b/tools/vrun/test.sh
index 1cf5442..8191876 100755
--- a/tools/vrun/test.sh
+++ b/tools/vrun/test.sh
@@ -2,7 +2,7 @@
 
 # Test running an application using vrun under the agent.
 
-source "$(go list -f {{.Dir}} v.io/veyron/shell/lib)/shell_test.sh"
+source "$(go list -f {{.Dir}} v.io/core/shell/lib)/shell_test.sh"
 
 readonly WORKDIR="${shell_test_WORK_DIR}"
 
diff --git a/tools/vrun/testchild.sh b/tools/vrun/testchild.sh
index 9d4b856..dae88af 100755
--- a/tools/vrun/testchild.sh
+++ b/tools/vrun/testchild.sh
@@ -2,7 +2,7 @@
 
 # Helper script for testing vrun.
 
-source "$(go list -f {{.Dir}} v.io/veyron/shell/lib)/shell_test.sh"
+source "$(go list -f {{.Dir}} v.io/core/shell/lib)/shell_test.sh"
 
 main() {
   shell_test::setup_server_test