diff --git a/security/agent/testchild.sh b/security/agent/testchild.sh
old mode 100644
new mode 100755
diff --git a/services/mgmt/build/impl/impl_test.go b/services/mgmt/build/impl/impl_test.go
index 6c975c5..17645c4 100644
--- a/services/mgmt/build/impl/impl_test.go
+++ b/services/mgmt/build/impl/impl_test.go
@@ -29,9 +29,9 @@
 // findGoBinary returns the path to the given Go binary and
 // the GOROOT environment variable to use.
 func findGoBinary(t *testing.T, name string) (bin, goroot string) {
-	root := os.Getenv("VEYRON_ROOT")
+	root := os.Getenv("VANADIUM_ROOT")
 	if root == "" {
-		t.Fatalf("VEYRON_ROOT is not set")
+		t.Fatalf("VANADIUM_ROOT is not set")
 	}
 	envroot := filepath.Join(root, "environment", "go", runtime.GOOS, runtime.GOARCH, "go")
 	envbin := filepath.Join(envroot, "bin", name)
diff --git a/tools/application/main.go b/tools/application/main.go
index 3723981..e331d49 100644
--- a/tools/application/main.go
+++ b/tools/application/main.go
@@ -1,5 +1,5 @@
 // The following enables go generate to generate the doc.go file.
-//go:generate go run $VEYRON_ROOT/veyron/go/src/veyron.io/lib/cmdline/testdata/gendoc.go .
+//go:generate go run $VANADIUM_ROOT/veyron/go/src/veyron.io/lib/cmdline/testdata/gendoc.go .
 
 package main
 
diff --git a/tools/binary/main.go b/tools/binary/main.go
index 3723981..e331d49 100644
--- a/tools/binary/main.go
+++ b/tools/binary/main.go
@@ -1,5 +1,5 @@
 // The following enables go generate to generate the doc.go file.
-//go:generate go run $VEYRON_ROOT/veyron/go/src/veyron.io/lib/cmdline/testdata/gendoc.go .
+//go:generate go run $VANADIUM_ROOT/veyron/go/src/veyron.io/lib/cmdline/testdata/gendoc.go .
 
 package main
 
diff --git a/tools/build/main.go b/tools/build/main.go
index 3723981..e331d49 100644
--- a/tools/build/main.go
+++ b/tools/build/main.go
@@ -1,5 +1,5 @@
 // The following enables go generate to generate the doc.go file.
-//go:generate go run $VEYRON_ROOT/veyron/go/src/veyron.io/lib/cmdline/testdata/gendoc.go .
+//go:generate go run $VANADIUM_ROOT/veyron/go/src/veyron.io/lib/cmdline/testdata/gendoc.go .
 
 package main
 
diff --git a/tools/debug/main.go b/tools/debug/main.go
index 3723981..e331d49 100644
--- a/tools/debug/main.go
+++ b/tools/debug/main.go
@@ -1,5 +1,5 @@
 // The following enables go generate to generate the doc.go file.
-//go:generate go run $VEYRON_ROOT/veyron/go/src/veyron.io/lib/cmdline/testdata/gendoc.go .
+//go:generate go run $VANADIUM_ROOT/veyron/go/src/veyron.io/lib/cmdline/testdata/gendoc.go .
 
 package main
 
diff --git a/tools/gclogs/main.go b/tools/gclogs/main.go
index 5cdbead..69cbd5e 100644
--- a/tools/gclogs/main.go
+++ b/tools/gclogs/main.go
@@ -1,5 +1,5 @@
 // The following enables go generate to generate the doc.go file.
-//go:generate go run $VEYRON_ROOT/veyron/go/src/veyron.io/lib/cmdline/testdata/gendoc.go . -help
+//go:generate go run $VANADIUM_ROOT/veyron/go/src/veyron.io/lib/cmdline/testdata/gendoc.go . -help
 
 package main
 
diff --git a/tools/mgmt/device/dminstall b/tools/mgmt/device/dminstall
index 10ea4fa..629e3c0 100755
--- a/tools/mgmt/device/dminstall
+++ b/tools/mgmt/device/dminstall
@@ -61,7 +61,7 @@
 # Fetches binaries needed by device manager installation.
 # Globals:
 #   BIN_NAMES
-#   VEYRON_ROOT
+#   VANADIUM_ROOT
 # Arguments:
 #   destination for binaries
 #   source of binaries
@@ -79,11 +79,11 @@
 
   # If source is not specified, try to look for it in the repository.
   if [[ -z "${BIN_SOURCE}" ]]; then
-    if [[ -z "${VEYRON_ROOT}" ]]; then
+    if [[ -z "${VANADIUM_ROOT}" ]]; then
       echo 'ERROR: binary source not specified and no local repository available'
       exit 1
     fi
-    local -r REPO_BIN_DIR="${VEYRON_ROOT}/veyron/go/bin"
+    local -r REPO_BIN_DIR="${VANADIUM_ROOT}/veyron/go/bin"
     echo "Fetching binaries:${bin_names_str} from build repository: ${REPO_BIN_DIR} ..."
     for bin_name in "${BIN_NAMES[@]}"; do
       copy_binary "${bin_name}" "${REPO_BIN_DIR}" "${BIN_INSTALL}"
diff --git a/tools/mgmt/device/main.go b/tools/mgmt/device/main.go
index d82e3d7..451931b 100644
--- a/tools/mgmt/device/main.go
+++ b/tools/mgmt/device/main.go
@@ -1,5 +1,5 @@
 // The following enables go generate to generate the doc.go file.
-//go:generate go run $VEYRON_ROOT/veyron/go/src/veyron.io/lib/cmdline/testdata/gendoc.go .
+//go:generate go run $VANADIUM_ROOT/veyron/go/src/veyron.io/lib/cmdline/testdata/gendoc.go .
 
 package main
 
diff --git a/tools/mgmt/vbash b/tools/mgmt/vbash
index a62bd1c..d5f199a 100755
--- a/tools/mgmt/vbash
+++ b/tools/mgmt/vbash
@@ -61,7 +61,7 @@
 # Fetches binaries needed by device manager installation.
 # Globals:
 #   BIN_NAMES
-#   VEYRON_ROOT
+#   VANADIUM_ROOT
 # Arguments:
 #   destination for binaries
 #   source of binaries
@@ -79,11 +79,11 @@
 
   # If source is not specified, try to look for it in the repository.
   if [[ -z "${BIN_SOURCE}" ]]; then
-    if [[ -z "${VEYRON_ROOT}" ]]; then
+    if [[ -z "${VANADIUM_ROOT}" ]]; then
       echo 'ERROR: binary source not specified and no local repository available'
       exit 1
     fi
-    local -r REPO_BIN_DIR="${VEYRON_ROOT}/veyron/go/bin"
+    local -r REPO_BIN_DIR="${VANADIUM_ROOT}/veyron/go/bin"
     echo "Fetching binaries:${bin_names_str} from build repository: ${REPO_BIN_DIR} ..."
     for bin_name in "${BIN_NAMES[@]}"; do
       copy_binary "${bin_name}" "${REPO_BIN_DIR}" "${BIN_INSTALL}"
diff --git a/tools/mounttable/main.go b/tools/mounttable/main.go
index 3723981..e331d49 100644
--- a/tools/mounttable/main.go
+++ b/tools/mounttable/main.go
@@ -1,5 +1,5 @@
 // The following enables go generate to generate the doc.go file.
-//go:generate go run $VEYRON_ROOT/veyron/go/src/veyron.io/lib/cmdline/testdata/gendoc.go .
+//go:generate go run $VANADIUM_ROOT/veyron/go/src/veyron.io/lib/cmdline/testdata/gendoc.go .
 
 package main
 
diff --git a/tools/namespace/main.go b/tools/namespace/main.go
index 3723981..e331d49 100644
--- a/tools/namespace/main.go
+++ b/tools/namespace/main.go
@@ -1,5 +1,5 @@
 // The following enables go generate to generate the doc.go file.
-//go:generate go run $VEYRON_ROOT/veyron/go/src/veyron.io/lib/cmdline/testdata/gendoc.go .
+//go:generate go run $VANADIUM_ROOT/veyron/go/src/veyron.io/lib/cmdline/testdata/gendoc.go .
 
 package main
 
diff --git a/tools/profile/main.go b/tools/profile/main.go
index 8423078..f7a5fb7 100644
--- a/tools/profile/main.go
+++ b/tools/profile/main.go
@@ -1,5 +1,5 @@
 // The following enables go generate to generate the doc.go file.
-//go:generate go run $VEYRON_ROOT/tools/go/src/tools/lib/cmdline/testdata/gendoc.go .
+//go:generate go run $VANADIUM_ROOT/tools/go/src/tools/lib/cmdline/testdata/gendoc.go .
 
 package main
 
diff --git a/tools/vrpc/main.go b/tools/vrpc/main.go
index 3723981..e331d49 100644
--- a/tools/vrpc/main.go
+++ b/tools/vrpc/main.go
@@ -1,5 +1,5 @@
 // The following enables go generate to generate the doc.go file.
-//go:generate go run $VEYRON_ROOT/veyron/go/src/veyron.io/lib/cmdline/testdata/gendoc.go .
+//go:generate go run $VANADIUM_ROOT/veyron/go/src/veyron.io/lib/cmdline/testdata/gendoc.go .
 
 package main
 
diff --git a/tools/vrun/testchild.sh b/tools/vrun/testchild.sh
old mode 100644
new mode 100755