Replacing veyron.io with v.io.
diff --git a/tools/GO.PACKAGE b/tools/GO.PACKAGE
index c223251..a6dc3be 100644
--- a/tools/GO.PACKAGE
+++ b/tools/GO.PACKAGE
@@ -1,7 +1,7 @@
 {
 	"dependencies": {
 		"incoming": [
-			{"allow": "veyron.io/veyron/veyron/tools/..."},
+			{"allow": "v.io/veyron/veyron/tools/..."},
 			{"deny": "..."}
 		]
 	}
diff --git a/tools/application/impl.go b/tools/application/impl.go
index 033775b..8f33387 100644
--- a/tools/application/impl.go
+++ b/tools/application/impl.go
@@ -11,10 +11,10 @@
 	"strings"
 	"time"
 
-	"veyron.io/lib/cmdline"
-	"veyron.io/veyron/veyron/services/mgmt/repository"
-	"veyron.io/veyron/veyron2/context"
-	"veyron.io/veyron/veyron2/services/mgmt/application"
+	"v.io/lib/cmdline"
+	"v.io/veyron/veyron/services/mgmt/repository"
+	"v.io/veyron/veyron2/context"
+	"v.io/veyron/veyron2/services/mgmt/application"
 )
 
 func getEnvelopeJSON(ctx context.T, app repository.ApplicationClientMethods, profiles string) ([]byte, error) {
diff --git a/tools/application/impl_test.go b/tools/application/impl_test.go
index 696dea1..f5f685e 100644
--- a/tools/application/impl_test.go
+++ b/tools/application/impl_test.go
@@ -7,16 +7,16 @@
 	"strings"
 	"testing"
 
-	"veyron.io/veyron/veyron2"
-	"veyron.io/veyron/veyron2/ipc"
-	"veyron.io/veyron/veyron2/naming"
-	"veyron.io/veyron/veyron2/rt"
-	"veyron.io/veyron/veyron2/security"
-	"veyron.io/veyron/veyron2/services/mgmt/application"
-	"veyron.io/veyron/veyron2/vlog"
+	"v.io/veyron/veyron2"
+	"v.io/veyron/veyron2/ipc"
+	"v.io/veyron/veyron2/naming"
+	"v.io/veyron/veyron2/rt"
+	"v.io/veyron/veyron2/security"
+	"v.io/veyron/veyron2/services/mgmt/application"
+	"v.io/veyron/veyron2/vlog"
 
-	"veyron.io/veyron/veyron/profiles"
-	"veyron.io/veyron/veyron/services/mgmt/repository"
+	"v.io/veyron/veyron/profiles"
+	"v.io/veyron/veyron/services/mgmt/repository"
 )
 
 var (
diff --git a/tools/application/main.go b/tools/application/main.go
index e331d49..43e616f 100644
--- a/tools/application/main.go
+++ b/tools/application/main.go
@@ -1,13 +1,13 @@
 // The following enables go generate to generate the doc.go file.
-//go:generate go run $VANADIUM_ROOT/veyron/go/src/veyron.io/lib/cmdline/testdata/gendoc.go .
+//go:generate go run $VANADIUM_ROOT/veyron/go/src/v.io/lib/cmdline/testdata/gendoc.go .
 
 package main
 
 import (
-	"veyron.io/veyron/veyron2"
-	"veyron.io/veyron/veyron2/rt"
+	"v.io/veyron/veyron2"
+	"v.io/veyron/veyron2/rt"
 
-	_ "veyron.io/veyron/veyron/profiles"
+	_ "v.io/veyron/veyron/profiles"
 )
 
 var runtime veyron2.Runtime
diff --git a/tools/binary/impl.go b/tools/binary/impl.go
index 54d6d25..aeb5b78 100644
--- a/tools/binary/impl.go
+++ b/tools/binary/impl.go
@@ -3,8 +3,8 @@
 import (
 	"fmt"
 
-	"veyron.io/lib/cmdline"
-	"veyron.io/veyron/veyron/services/mgmt/lib/binary"
+	"v.io/lib/cmdline"
+	"v.io/veyron/veyron/services/mgmt/lib/binary"
 )
 
 var cmdDelete = &cmdline.Command{
diff --git a/tools/binary/impl_test.go b/tools/binary/impl_test.go
index 0a2554b..f727a2d 100644
--- a/tools/binary/impl_test.go
+++ b/tools/binary/impl_test.go
@@ -11,16 +11,16 @@
 	"strings"
 	"testing"
 
-	"veyron.io/veyron/veyron2"
-	"veyron.io/veyron/veyron2/ipc"
-	"veyron.io/veyron/veyron2/naming"
-	"veyron.io/veyron/veyron2/rt"
-	"veyron.io/veyron/veyron2/security"
-	"veyron.io/veyron/veyron2/services/mgmt/binary"
-	"veyron.io/veyron/veyron2/services/mgmt/repository"
-	"veyron.io/veyron/veyron2/vlog"
+	"v.io/veyron/veyron2"
+	"v.io/veyron/veyron2/ipc"
+	"v.io/veyron/veyron2/naming"
+	"v.io/veyron/veyron2/rt"
+	"v.io/veyron/veyron2/security"
+	"v.io/veyron/veyron2/services/mgmt/binary"
+	"v.io/veyron/veyron2/services/mgmt/repository"
+	"v.io/veyron/veyron2/vlog"
 
-	"veyron.io/veyron/veyron/profiles"
+	"v.io/veyron/veyron/profiles"
 )
 
 type server struct {
diff --git a/tools/binary/main.go b/tools/binary/main.go
index e331d49..43e616f 100644
--- a/tools/binary/main.go
+++ b/tools/binary/main.go
@@ -1,13 +1,13 @@
 // The following enables go generate to generate the doc.go file.
-//go:generate go run $VANADIUM_ROOT/veyron/go/src/veyron.io/lib/cmdline/testdata/gendoc.go .
+//go:generate go run $VANADIUM_ROOT/veyron/go/src/v.io/lib/cmdline/testdata/gendoc.go .
 
 package main
 
 import (
-	"veyron.io/veyron/veyron2"
-	"veyron.io/veyron/veyron2/rt"
+	"v.io/veyron/veyron2"
+	"v.io/veyron/veyron2/rt"
 
-	_ "veyron.io/veyron/veyron/profiles"
+	_ "v.io/veyron/veyron/profiles"
 )
 
 var runtime veyron2.Runtime
diff --git a/tools/build/impl.go b/tools/build/impl.go
index f684ba0..a4b8fde 100644
--- a/tools/build/impl.go
+++ b/tools/build/impl.go
@@ -10,9 +10,9 @@
 	"strings"
 	"time"
 
-	"veyron.io/lib/cmdline"
-	"veyron.io/veyron/veyron2/context"
-	vbuild "veyron.io/veyron/veyron2/services/mgmt/build"
+	"v.io/lib/cmdline"
+	"v.io/veyron/veyron2/context"
+	vbuild "v.io/veyron/veyron2/services/mgmt/build"
 )
 
 var (
diff --git a/tools/build/impl_test.go b/tools/build/impl_test.go
index 7b4958f..9b236fe 100644
--- a/tools/build/impl_test.go
+++ b/tools/build/impl_test.go
@@ -5,16 +5,16 @@
 	"strings"
 	"testing"
 
-	"veyron.io/veyron/veyron2"
-	"veyron.io/veyron/veyron2/ipc"
-	"veyron.io/veyron/veyron2/naming"
-	"veyron.io/veyron/veyron2/rt"
-	"veyron.io/veyron/veyron2/services/mgmt/binary"
-	"veyron.io/veyron/veyron2/services/mgmt/build"
-	verror "veyron.io/veyron/veyron2/verror2"
-	"veyron.io/veyron/veyron2/vlog"
+	"v.io/veyron/veyron2"
+	"v.io/veyron/veyron2/ipc"
+	"v.io/veyron/veyron2/naming"
+	"v.io/veyron/veyron2/rt"
+	"v.io/veyron/veyron2/services/mgmt/binary"
+	"v.io/veyron/veyron2/services/mgmt/build"
+	verror "v.io/veyron/veyron2/verror2"
+	"v.io/veyron/veyron2/vlog"
 
-	"veyron.io/veyron/veyron/profiles"
+	"v.io/veyron/veyron/profiles"
 )
 
 type mock struct{}
@@ -74,7 +74,7 @@
 	cmd.Init(nil, &stdout, &stderr)
 
 	// Test the 'Build' command.
-	if err := cmd.Execute([]string{"build", naming.JoinAddressName(endpoint.String(), ""), "veyron.io/veyron/veyron/tools/build"}); err != nil {
+	if err := cmd.Execute([]string{"build", naming.JoinAddressName(endpoint.String(), ""), "v.io/veyron/veyron/tools/build"}); err != nil {
 		t.Fatalf("%v", err)
 	}
 	if expected, got := "", strings.TrimSpace(stdout.String()); got != expected {
diff --git a/tools/build/main.go b/tools/build/main.go
index e331d49..43e616f 100644
--- a/tools/build/main.go
+++ b/tools/build/main.go
@@ -1,13 +1,13 @@
 // The following enables go generate to generate the doc.go file.
-//go:generate go run $VANADIUM_ROOT/veyron/go/src/veyron.io/lib/cmdline/testdata/gendoc.go .
+//go:generate go run $VANADIUM_ROOT/veyron/go/src/v.io/lib/cmdline/testdata/gendoc.go .
 
 package main
 
 import (
-	"veyron.io/veyron/veyron2"
-	"veyron.io/veyron/veyron2/rt"
+	"v.io/veyron/veyron2"
+	"v.io/veyron/veyron2/rt"
 
-	_ "veyron.io/veyron/veyron/profiles"
+	_ "v.io/veyron/veyron/profiles"
 )
 
 var runtime veyron2.Runtime
diff --git a/tools/debug/impl.go b/tools/debug/impl.go
index e998831..0e364f3 100644
--- a/tools/debug/impl.go
+++ b/tools/debug/impl.go
@@ -11,23 +11,23 @@
 	"sync"
 	"time"
 
-	"veyron.io/lib/cmdline"
-	"veyron.io/veyron/veyron/lib/glob"
-	"veyron.io/veyron/veyron/lib/signals"
-	"veyron.io/veyron/veyron/services/mgmt/pprof/client"
-	istats "veyron.io/veyron/veyron/services/mgmt/stats"
-	"veyron.io/veyron/veyron2/context"
-	"veyron.io/veyron/veyron2/naming"
-	"veyron.io/veyron/veyron2/services/mgmt/logreader"
-	logtypes "veyron.io/veyron/veyron2/services/mgmt/logreader/types"
-	"veyron.io/veyron/veyron2/services/mgmt/pprof"
-	"veyron.io/veyron/veyron2/services/mgmt/stats"
-	vtracesvc "veyron.io/veyron/veyron2/services/mgmt/vtrace"
-	"veyron.io/veyron/veyron2/services/watch"
-	watchtypes "veyron.io/veyron/veyron2/services/watch/types"
-	"veyron.io/veyron/veyron2/uniqueid"
-	"veyron.io/veyron/veyron2/vdl/vdlutil"
-	"veyron.io/veyron/veyron2/vtrace"
+	"v.io/lib/cmdline"
+	"v.io/veyron/veyron/lib/glob"
+	"v.io/veyron/veyron/lib/signals"
+	"v.io/veyron/veyron/services/mgmt/pprof/client"
+	istats "v.io/veyron/veyron/services/mgmt/stats"
+	"v.io/veyron/veyron2/context"
+	"v.io/veyron/veyron2/naming"
+	"v.io/veyron/veyron2/services/mgmt/logreader"
+	logtypes "v.io/veyron/veyron2/services/mgmt/logreader/types"
+	"v.io/veyron/veyron2/services/mgmt/pprof"
+	"v.io/veyron/veyron2/services/mgmt/stats"
+	vtracesvc "v.io/veyron/veyron2/services/mgmt/vtrace"
+	"v.io/veyron/veyron2/services/watch"
+	watchtypes "v.io/veyron/veyron2/services/watch/types"
+	"v.io/veyron/veyron2/uniqueid"
+	"v.io/veyron/veyron2/vdl/vdlutil"
+	"v.io/veyron/veyron2/vtrace"
 )
 
 var (
diff --git a/tools/debug/main.go b/tools/debug/main.go
index e331d49..43e616f 100644
--- a/tools/debug/main.go
+++ b/tools/debug/main.go
@@ -1,13 +1,13 @@
 // The following enables go generate to generate the doc.go file.
-//go:generate go run $VANADIUM_ROOT/veyron/go/src/veyron.io/lib/cmdline/testdata/gendoc.go .
+//go:generate go run $VANADIUM_ROOT/veyron/go/src/v.io/lib/cmdline/testdata/gendoc.go .
 
 package main
 
 import (
-	"veyron.io/veyron/veyron2"
-	"veyron.io/veyron/veyron2/rt"
+	"v.io/veyron/veyron2"
+	"v.io/veyron/veyron2/rt"
 
-	_ "veyron.io/veyron/veyron/profiles"
+	_ "v.io/veyron/veyron/profiles"
 )
 
 var runtime veyron2.Runtime
diff --git a/tools/debug/test.sh b/tools/debug/test.sh
index 7e6e0d8..38aca90 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}} veyron.io/veyron/shell/lib)/shell_test.sh"
+source "$(go list -f {{.Dir}} v.io/veyron/shell/lib)/shell_test.sh"
 
 # Run the test under the security agent.
 shell_test::enable_agent "$@"
@@ -14,7 +14,7 @@
 readonly DEBUG_FLAGS="--veyron.vtrace.sample_rate=1"
 
 build() {
-  DEBUG_BIN="$(shell_test::build_go_binary 'veyron.io/veyron/veyron/tools/debug')"
+  DEBUG_BIN="$(shell_test::build_go_binary 'v.io/veyron/veyron/tools/debug')"
 }
 
 dumplogs() {
diff --git a/tools/debug/testdata/integration_test.go b/tools/debug/testdata/integration_test.go
index 7b8b579..904c6bb 100644
--- a/tools/debug/testdata/integration_test.go
+++ b/tools/debug/testdata/integration_test.go
@@ -9,10 +9,10 @@
 	"strings"
 	"testing"
 
-	"veyron.io/veyron/veyron/lib/modules"
-	"veyron.io/veyron/veyron/lib/testutil/integration"
+	"v.io/veyron/veyron/lib/modules"
+	"v.io/veyron/veyron/lib/testutil/integration"
 
-	_ "veyron.io/veyron/veyron/profiles/static"
+	_ "v.io/veyron/veyron/profiles/static"
 )
 
 func TestHelperProcess(t *testing.T) {
@@ -23,7 +23,7 @@
 	env := integration.NewTestEnvironment(t)
 	defer env.Cleanup()
 
-	binary := env.BuildGoPkg("veyron.io/veyron/veyron/tools/debug")
+	binary := env.BuildGoPkg("v.io/veyron/veyron/tools/debug")
 	inv := binary.Start("glob", env.RootMT()+"/__debug/*")
 
 	var want string
@@ -40,7 +40,7 @@
 	defer env.Cleanup()
 
 	fileName := filepath.Base(env.TempFile().Name())
-	binary := env.BuildGoPkg("veyron.io/veyron/veyron/tools/debug")
+	binary := env.BuildGoPkg("v.io/veyron/veyron/tools/debug")
 	output := binary.Start("glob", env.RootMT()+"/__debug/logs/*").Output()
 
 	// The output should contain the filename.
@@ -55,7 +55,7 @@
 	defer env.Cleanup()
 
 	path := env.RootMT() + "/__debug/stats/system/hostname"
-	binary := env.BuildGoPkg("veyron.io/veyron/veyron/tools/debug")
+	binary := env.BuildGoPkg("v.io/veyron/veyron/tools/debug")
 	got := binary.Start("stats", "read", path).Output()
 	hostname, err := os.Hostname()
 	if err != nil {
@@ -79,7 +79,7 @@
 	env := integration.NewTestEnvironment(t)
 	defer env.Cleanup()
 
-	binary := env.BuildGoPkg("veyron.io/veyron/veyron/tools/debug")
+	binary := env.BuildGoPkg("v.io/veyron/veyron/tools/debug")
 	testLogData := "This is a test log file"
 	file := createTestLogFile(t, env, testLogData)
 
@@ -99,7 +99,7 @@
 	env := integration.NewTestEnvironment(t)
 	defer env.Cleanup()
 
-	binary := env.BuildGoPkg("veyron.io/veyron/veyron/tools/debug")
+	binary := env.BuildGoPkg("v.io/veyron/veyron/tools/debug")
 	testLogData := "This is a test log file\n"
 	file := createTestLogFile(t, env, testLogData)
 	logName := filepath.Base(file.Name())
@@ -122,7 +122,7 @@
 	env := integration.NewTestEnvironment(t)
 	defer env.Cleanup()
 
-	binary := env.BuildGoPkg("veyron.io/veyron/veyron/tools/debug")
+	binary := env.BuildGoPkg("v.io/veyron/veyron/tools/debug")
 	logContent := "Hello, world!\n"
 	logPath := env.RootMT() + "/__debug/logs/" + filepath.Base(createTestLogFile(t, env, logContent).Name())
 	// Create a log file with tracing, read it and check that the resulting trace exists.
diff --git a/tools/findunusedport/main.go b/tools/findunusedport/main.go
index 7d4bda2..c984d20 100644
--- a/tools/findunusedport/main.go
+++ b/tools/findunusedport/main.go
@@ -8,7 +8,7 @@
 	"os"
 	"syscall"
 
-	"veyron.io/veyron/veyron2/vlog"
+	"v.io/veyron/veyron2/vlog"
 )
 
 func main() {
diff --git a/tools/gclogs/gclogs.go b/tools/gclogs/gclogs.go
index 6fde8af..8187b69 100644
--- a/tools/gclogs/gclogs.go
+++ b/tools/gclogs/gclogs.go
@@ -9,7 +9,7 @@
 	"regexp"
 	"time"
 
-	"veyron.io/lib/cmdline"
+	"v.io/lib/cmdline"
 )
 
 var (
diff --git a/tools/gclogs/main.go b/tools/gclogs/main.go
index 69cbd5e..32d35a7 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 $VANADIUM_ROOT/veyron/go/src/veyron.io/lib/cmdline/testdata/gendoc.go . -help
+//go:generate go run $VANADIUM_ROOT/veyron/go/src/v.io/lib/cmdline/testdata/gendoc.go . -help
 
 package main
 
diff --git a/tools/mgmt/device/acl_fmt.go b/tools/mgmt/device/acl_fmt.go
index 1690edd..45be346 100644
--- a/tools/mgmt/device/acl_fmt.go
+++ b/tools/mgmt/device/acl_fmt.go
@@ -5,7 +5,7 @@
 	"sort"
 	"strings"
 
-	"veyron.io/veyron/veyron2/security"
+	"v.io/veyron/veyron2/security"
 )
 
 // aclEntries maps blessing patterns to the kind of access they should have.
diff --git a/tools/mgmt/device/acl_impl.go b/tools/mgmt/device/acl_impl.go
index f3afeb5..9b0984d 100644
--- a/tools/mgmt/device/acl_impl.go
+++ b/tools/mgmt/device/acl_impl.go
@@ -5,11 +5,11 @@
 import (
 	"fmt"
 
-	"veyron.io/lib/cmdline"
-	"veyron.io/veyron/veyron2/security"
-	"veyron.io/veyron/veyron2/services/mgmt/device"
-	"veyron.io/veyron/veyron2/services/security/access"
-	verror "veyron.io/veyron/veyron2/verror2"
+	"v.io/lib/cmdline"
+	"v.io/veyron/veyron2/security"
+	"v.io/veyron/veyron2/services/mgmt/device"
+	"v.io/veyron/veyron2/services/security/access"
+	verror "v.io/veyron/veyron2/verror2"
 )
 
 var cmdGet = &cmdline.Command{
diff --git a/tools/mgmt/device/acl_test.go b/tools/mgmt/device/acl_test.go
index ce6fdce..650b1b6 100644
--- a/tools/mgmt/device/acl_test.go
+++ b/tools/mgmt/device/acl_test.go
@@ -7,13 +7,13 @@
 	"strings"
 	"testing"
 
-	"veyron.io/veyron/veyron2/naming"
-	"veyron.io/veyron/veyron2/security"
-	"veyron.io/veyron/veyron2/services/security/access"
-	verror "veyron.io/veyron/veyron2/verror2"
+	"v.io/veyron/veyron2/naming"
+	"v.io/veyron/veyron2/security"
+	"v.io/veyron/veyron2/services/security/access"
+	verror "v.io/veyron/veyron2/verror2"
 )
 
-const pkgPath = "veyron.io/veyron/veyron/tools/mgmt/device/main"
+const pkgPath = "v.io/veyron/veyron/tools/mgmt/device/main"
 
 var (
 	errOops    = verror.Register(pkgPath+".errOops", verror.NoRetry, "oops!")
diff --git a/tools/mgmt/device/associate_impl.go b/tools/mgmt/device/associate_impl.go
index b9900fa..71ba3be 100644
--- a/tools/mgmt/device/associate_impl.go
+++ b/tools/mgmt/device/associate_impl.go
@@ -4,8 +4,8 @@
 	"fmt"
 	"time"
 
-	"veyron.io/lib/cmdline"
-	"veyron.io/veyron/veyron2/services/mgmt/device"
+	"v.io/lib/cmdline"
+	"v.io/veyron/veyron2/services/mgmt/device"
 )
 
 var cmdList = &cmdline.Command{
diff --git a/tools/mgmt/device/devicemanager_mock_test.go b/tools/mgmt/device/devicemanager_mock_test.go
index 6bf5c37..1e0da2b 100644
--- a/tools/mgmt/device/devicemanager_mock_test.go
+++ b/tools/mgmt/device/devicemanager_mock_test.go
@@ -4,16 +4,16 @@
 	"log"
 	"testing"
 
-	"veyron.io/veyron/veyron2"
-	"veyron.io/veyron/veyron2/ipc"
-	"veyron.io/veyron/veyron2/naming"
-	"veyron.io/veyron/veyron2/security"
-	"veyron.io/veyron/veyron2/services/mgmt/binary"
-	"veyron.io/veyron/veyron2/services/mgmt/device"
-	"veyron.io/veyron/veyron2/services/security/access"
-	"veyron.io/veyron/veyron2/vlog"
+	"v.io/veyron/veyron2"
+	"v.io/veyron/veyron2/ipc"
+	"v.io/veyron/veyron2/naming"
+	"v.io/veyron/veyron2/security"
+	"v.io/veyron/veyron2/services/mgmt/binary"
+	"v.io/veyron/veyron2/services/mgmt/device"
+	"v.io/veyron/veyron2/services/security/access"
+	"v.io/veyron/veyron2/vlog"
 
-	"veyron.io/veyron/veyron/profiles"
+	"v.io/veyron/veyron/profiles"
 )
 
 type mockDeviceInvoker struct {
diff --git a/tools/mgmt/device/impl.go b/tools/mgmt/device/impl.go
index 21f4119..128c5a0 100644
--- a/tools/mgmt/device/impl.go
+++ b/tools/mgmt/device/impl.go
@@ -3,11 +3,11 @@
 import (
 	"fmt"
 
-	"veyron.io/lib/cmdline"
-	"veyron.io/veyron/veyron2/ipc"
-	"veyron.io/veyron/veyron2/naming"
-	"veyron.io/veyron/veyron2/security"
-	"veyron.io/veyron/veyron2/services/mgmt/device"
+	"v.io/lib/cmdline"
+	"v.io/veyron/veyron2/ipc"
+	"v.io/veyron/veyron2/naming"
+	"v.io/veyron/veyron2/security"
+	"v.io/veyron/veyron2/services/mgmt/device"
 )
 
 var cmdInstall = &cmdline.Command{
diff --git a/tools/mgmt/device/impl_test.go b/tools/mgmt/device/impl_test.go
index 21128e1..a512ae8 100644
--- a/tools/mgmt/device/impl_test.go
+++ b/tools/mgmt/device/impl_test.go
@@ -7,10 +7,10 @@
 	"strings"
 	"testing"
 
-	"veyron.io/veyron/veyron2/naming"
-	"veyron.io/veyron/veyron2/rt"
-	"veyron.io/veyron/veyron2/services/mgmt/device"
-	verror "veyron.io/veyron/veyron2/verror2"
+	"v.io/veyron/veyron2/naming"
+	"v.io/veyron/veyron2/rt"
+	"v.io/veyron/veyron2/services/mgmt/device"
+	verror "v.io/veyron/veyron2/verror2"
 )
 
 func init() {
diff --git a/tools/mgmt/device/instance_impl.go b/tools/mgmt/device/instance_impl.go
index ae50c85..30c32e7 100644
--- a/tools/mgmt/device/instance_impl.go
+++ b/tools/mgmt/device/instance_impl.go
@@ -5,8 +5,8 @@
 import (
 	"fmt"
 
-	"veyron.io/lib/cmdline"
-	"veyron.io/veyron/veyron2/services/mgmt/device"
+	"v.io/lib/cmdline"
+	"v.io/veyron/veyron2/services/mgmt/device"
 )
 
 var cmdStop = &cmdline.Command{
diff --git a/tools/mgmt/device/instance_impl_test.go b/tools/mgmt/device/instance_impl_test.go
index 36d909d..b4cb4b6 100644
--- a/tools/mgmt/device/instance_impl_test.go
+++ b/tools/mgmt/device/instance_impl_test.go
@@ -6,8 +6,8 @@
 	"strings"
 	"testing"
 
-	"veyron.io/veyron/veyron2/naming"
-	verror "veyron.io/veyron/veyron2/verror2"
+	"v.io/veyron/veyron2/naming"
+	verror "v.io/veyron/veyron2/verror2"
 )
 
 func TestStopCommand(t *testing.T) {
diff --git a/tools/mgmt/device/main.go b/tools/mgmt/device/main.go
index 451931b..ababcde 100644
--- a/tools/mgmt/device/main.go
+++ b/tools/mgmt/device/main.go
@@ -1,13 +1,13 @@
 // The following enables go generate to generate the doc.go file.
-//go:generate go run $VANADIUM_ROOT/veyron/go/src/veyron.io/lib/cmdline/testdata/gendoc.go .
+//go:generate go run $VANADIUM_ROOT/veyron/go/src/v.io/lib/cmdline/testdata/gendoc.go .
 
 package main
 
 import (
-	"veyron.io/veyron/veyron2"
-	"veyron.io/veyron/veyron2/rt"
+	"v.io/veyron/veyron2"
+	"v.io/veyron/veyron2/rt"
 
-	_ "veyron.io/veyron/veyron/profiles"
+	_ "v.io/veyron/veyron/profiles"
 )
 
 var runtime veyron2.Runtime
diff --git a/tools/mgmt/test.sh b/tools/mgmt/test.sh
index 0374601..cc1c04a 100755
--- a/tools/mgmt/test.sh
+++ b/tools/mgmt/test.sh
@@ -2,24 +2,24 @@
 
 # Test the device manager and related services and tools.
 
-source "$(go list -f {{.Dir}} veyron.io/veyron/shell/lib)/shell_test.sh"
+source "$(go list -f {{.Dir}} v.io/veyron/shell/lib)/shell_test.sh"
 
 readonly WORKDIR="${shell_test_WORK_DIR}"
 
 build() {
-  BINARYD_BIN="$(shell_test::build_go_binary 'veyron.io/veyron/veyron/services/mgmt/binary/binaryd')"
-  BINARY_BIN="$(shell_test::build_go_binary 'veyron.io/veyron/veyron/tools/binary')"
-  APPLICATIOND_BIN="$(shell_test::build_go_binary 'veyron.io/veyron/veyron/services/mgmt/application/applicationd')"
-  APPLICATION_BIN="$(shell_test::build_go_binary 'veyron.io/veyron/veyron/tools/application')"
-  AGENTD_BIN="$(shell_test::build_go_binary 'veyron.io/veyron/veyron/security/agent/agentd')"
-  SUIDHELPER_BIN="$(shell_test::build_go_binary 'veyron.io/veyron/veyron/services/mgmt/suidhelper')"
-  DEVICEMANAGER_BIN="$(shell_test::build_go_binary 'veyron.io/veyron/veyron/services/mgmt/device/deviced')"
-  DEVICE_BIN="$(shell_test::build_go_binary 'veyron.io/veyron/veyron/tools/mgmt/device')"
-  NAMESPACE_BIN="$(shell_test::build_go_binary 'veyron.io/veyron/veyron/tools/namespace')"
-  PRINCIPAL_BIN="$(shell_test::build_go_binary 'veyron.io/veyron/veyron/tools/principal')"
-  DEBUG_BIN="$(shell_test::build_go_binary 'veyron.io/veyron/veyron/tools/debug')"
-  DMINSTALL_SCRIPT="$(go list -f {{.Dir}} veyron.io/veyron/veyron/tools/mgmt/device)/dminstall"
-  DMUNINSTALL_SCRIPT="$(go list -f {{.Dir}} veyron.io/veyron/veyron/tools/mgmt/device)/dmuninstall"
+  BINARYD_BIN="$(shell_test::build_go_binary 'v.io/veyron/veyron/services/mgmt/binary/binaryd')"
+  BINARY_BIN="$(shell_test::build_go_binary 'v.io/veyron/veyron/tools/binary')"
+  APPLICATIOND_BIN="$(shell_test::build_go_binary 'v.io/veyron/veyron/services/mgmt/application/applicationd')"
+  APPLICATION_BIN="$(shell_test::build_go_binary 'v.io/veyron/veyron/tools/application')"
+  AGENTD_BIN="$(shell_test::build_go_binary 'v.io/veyron/veyron/security/agent/agentd')"
+  SUIDHELPER_BIN="$(shell_test::build_go_binary 'v.io/veyron/veyron/services/mgmt/suidhelper')"
+  DEVICEMANAGER_BIN="$(shell_test::build_go_binary 'v.io/veyron/veyron/services/mgmt/device/deviced')"
+  DEVICE_BIN="$(shell_test::build_go_binary 'v.io/veyron/veyron/tools/mgmt/device')"
+  NAMESPACE_BIN="$(shell_test::build_go_binary 'v.io/veyron/veyron/tools/namespace')"
+  PRINCIPAL_BIN="$(shell_test::build_go_binary 'v.io/veyron/veyron/tools/principal')"
+  DEBUG_BIN="$(shell_test::build_go_binary 'v.io/veyron/veyron/tools/debug')"
+  DMINSTALL_SCRIPT="$(go list -f {{.Dir}} v.io/veyron/veyron/tools/mgmt/device)/dminstall"
+  DMUNINSTALL_SCRIPT="$(go list -f {{.Dir}} v.io/veyron/veyron/tools/mgmt/device)/dmuninstall"
 }
 
 # TODO(caprita): Move to shell_tesh.sh
diff --git a/tools/mounttable/impl.go b/tools/mounttable/impl.go
index 9116972..4470447 100644
--- a/tools/mounttable/impl.go
+++ b/tools/mounttable/impl.go
@@ -5,10 +5,10 @@
 	"fmt"
 	"time"
 
-	"veyron.io/lib/cmdline"
-	"veyron.io/veyron/veyron2/ipc"
-	"veyron.io/veyron/veyron2/naming"
-	"veyron.io/veyron/veyron2/options"
+	"v.io/lib/cmdline"
+	"v.io/veyron/veyron2/ipc"
+	"v.io/veyron/veyron2/naming"
+	"v.io/veyron/veyron2/options"
 )
 
 var cmdGlob = &cmdline.Command{
diff --git a/tools/mounttable/impl_test.go b/tools/mounttable/impl_test.go
index 6680592..e34abfe 100644
--- a/tools/mounttable/impl_test.go
+++ b/tools/mounttable/impl_test.go
@@ -5,15 +5,15 @@
 	"strings"
 	"testing"
 
-	"veyron.io/veyron/veyron2"
-	"veyron.io/veyron/veyron2/ipc"
-	"veyron.io/veyron/veyron2/naming"
-	"veyron.io/veyron/veyron2/rt"
-	"veyron.io/veyron/veyron2/security"
-	"veyron.io/veyron/veyron2/services/mounttable"
-	"veyron.io/veyron/veyron2/vlog"
+	"v.io/veyron/veyron2"
+	"v.io/veyron/veyron2/ipc"
+	"v.io/veyron/veyron2/naming"
+	"v.io/veyron/veyron2/rt"
+	"v.io/veyron/veyron2/security"
+	"v.io/veyron/veyron2/services/mounttable"
+	"v.io/veyron/veyron2/vlog"
 
-	"veyron.io/veyron/veyron/profiles"
+	"v.io/veyron/veyron/profiles"
 )
 
 type server struct {
diff --git a/tools/mounttable/main.go b/tools/mounttable/main.go
index e331d49..43e616f 100644
--- a/tools/mounttable/main.go
+++ b/tools/mounttable/main.go
@@ -1,13 +1,13 @@
 // The following enables go generate to generate the doc.go file.
-//go:generate go run $VANADIUM_ROOT/veyron/go/src/veyron.io/lib/cmdline/testdata/gendoc.go .
+//go:generate go run $VANADIUM_ROOT/veyron/go/src/v.io/lib/cmdline/testdata/gendoc.go .
 
 package main
 
 import (
-	"veyron.io/veyron/veyron2"
-	"veyron.io/veyron/veyron2/rt"
+	"v.io/veyron/veyron2"
+	"v.io/veyron/veyron2/rt"
 
-	_ "veyron.io/veyron/veyron/profiles"
+	_ "v.io/veyron/veyron/profiles"
 )
 
 var runtime veyron2.Runtime
diff --git a/tools/namespace/impl.go b/tools/namespace/impl.go
index b4c1e03..834aa34 100644
--- a/tools/namespace/impl.go
+++ b/tools/namespace/impl.go
@@ -4,9 +4,9 @@
 	"fmt"
 	"time"
 
-	"veyron.io/lib/cmdline"
-	"veyron.io/veyron/veyron2/naming"
-	"veyron.io/veyron/veyron2/vlog"
+	"v.io/lib/cmdline"
+	"v.io/veyron/veyron2/naming"
+	"v.io/veyron/veyron2/vlog"
 )
 
 var cmdGlob = &cmdline.Command{
diff --git a/tools/namespace/main.go b/tools/namespace/main.go
index e331d49..43e616f 100644
--- a/tools/namespace/main.go
+++ b/tools/namespace/main.go
@@ -1,13 +1,13 @@
 // The following enables go generate to generate the doc.go file.
-//go:generate go run $VANADIUM_ROOT/veyron/go/src/veyron.io/lib/cmdline/testdata/gendoc.go .
+//go:generate go run $VANADIUM_ROOT/veyron/go/src/v.io/lib/cmdline/testdata/gendoc.go .
 
 package main
 
 import (
-	"veyron.io/veyron/veyron2"
-	"veyron.io/veyron/veyron2/rt"
+	"v.io/veyron/veyron2"
+	"v.io/veyron/veyron2/rt"
 
-	_ "veyron.io/veyron/veyron/profiles"
+	_ "v.io/veyron/veyron/profiles"
 )
 
 var runtime veyron2.Runtime
diff --git a/tools/naming/simulator/commands.go b/tools/naming/simulator/commands.go
index fed237a..1a1993a 100644
--- a/tools/naming/simulator/commands.go
+++ b/tools/naming/simulator/commands.go
@@ -9,7 +9,7 @@
 	"regexp"
 	"strings"
 
-	"veyron.io/veyron/veyron/lib/modules"
+	"v.io/veyron/veyron/lib/modules"
 )
 
 type builtinCmd func(sh *modules.Shell, state *cmdState, args ...string) (string, error)
diff --git a/tools/naming/simulator/driver.go b/tools/naming/simulator/driver.go
index 32e9ff9..821e644 100644
--- a/tools/naming/simulator/driver.go
+++ b/tools/naming/simulator/driver.go
@@ -16,13 +16,13 @@
 	"time"
 	"unicode"
 
-	"veyron.io/veyron/veyron2"
-	"veyron.io/veyron/veyron2/rt"
+	"v.io/veyron/veyron2"
+	"v.io/veyron/veyron2/rt"
 
-	"veyron.io/veyron/veyron/lib/expect"
-	"veyron.io/veyron/veyron/lib/modules"
-	_ "veyron.io/veyron/veyron/lib/modules/core"
-	_ "veyron.io/veyron/veyron/profiles"
+	"v.io/veyron/veyron/lib/expect"
+	"v.io/veyron/veyron/lib/modules"
+	_ "v.io/veyron/veyron/lib/modules/core"
+	_ "v.io/veyron/veyron/profiles"
 )
 
 type cmdState struct {
diff --git a/tools/naming/simulator/driver_test.go b/tools/naming/simulator/driver_test.go
index 303874a..f6510b4 100644
--- a/tools/naming/simulator/driver_test.go
+++ b/tools/naming/simulator/driver_test.go
@@ -5,7 +5,7 @@
 	"reflect"
 	"testing"
 
-	"veyron.io/veyron/veyron/lib/modules"
+	"v.io/veyron/veyron/lib/modules"
 )
 
 func TestFields(t *testing.T) {
diff --git a/tools/naming/simulator/shell_functions.go b/tools/naming/simulator/shell_functions.go
index 56875cc..09e9ee2 100644
--- a/tools/naming/simulator/shell_functions.go
+++ b/tools/naming/simulator/shell_functions.go
@@ -5,10 +5,10 @@
 	"io"
 	"time"
 
-	"veyron.io/veyron/veyron2/context"
-	"veyron.io/veyron/veyron2/naming"
+	"v.io/veyron/veyron2/context"
+	"v.io/veyron/veyron2/naming"
 
-	"veyron.io/veyron/veyron/lib/modules"
+	"v.io/veyron/veyron/lib/modules"
 )
 
 func init() {
diff --git a/tools/naming/simulator/test.sh b/tools/naming/simulator/test.sh
index 06668c7..cb30319 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}} veyron.io/veyron/shell/lib)/shell_test.sh"
+source "$(go list -f {{.Dir}} v.io/veyron/shell/lib)/shell_test.sh"
 
 # Run the test under the security agent.
 shell_test::enable_agent "$@"
@@ -12,7 +12,7 @@
 main() {
   # Build binaries.
   cd "${WORKDIR}"
-  PKG="veyron.io/veyron/veyron/tools/naming/simulator"
+  PKG="v.io/veyron/veyron/tools/naming/simulator"
   SIMULATOR_BIN="$(shell_test::build_go_binary ${PKG})"
 
   local -r DIR=$(go list -f {{.Dir}} "${PKG}")
diff --git a/tools/principal/bless.go b/tools/principal/bless.go
index be171b2..491c223 100644
--- a/tools/principal/bless.go
+++ b/tools/principal/bless.go
@@ -12,8 +12,8 @@
 	"os/exec"
 	"strings"
 
-	"veyron.io/veyron/veyron/services/identity/oauth"
-	"veyron.io/veyron/veyron2/vlog"
+	"v.io/veyron/veyron/services/identity/oauth"
+	"v.io/veyron/veyron2/vlog"
 )
 
 func getMacaroonForBlessRPC(blessServerURL string, blessedChan <-chan string, browser bool) (<-chan string, error) {
diff --git a/tools/principal/main.go b/tools/principal/main.go
index 3f9ed67..6765689 100644
--- a/tools/principal/main.go
+++ b/tools/principal/main.go
@@ -12,16 +12,16 @@
 	"os/user"
 	"time"
 
-	"veyron.io/lib/cmdline"
-	profile "veyron.io/veyron/veyron/profiles/static"
-	vsecurity "veyron.io/veyron/veyron/security"
-	"veyron.io/veyron/veyron/services/identity"
-	"veyron.io/veyron/veyron2"
-	"veyron.io/veyron/veyron2/ipc"
-	"veyron.io/veyron/veyron2/naming"
-	"veyron.io/veyron/veyron2/rt"
-	"veyron.io/veyron/veyron2/security"
-	"veyron.io/veyron/veyron2/vom"
+	"v.io/lib/cmdline"
+	profile "v.io/veyron/veyron/profiles/static"
+	vsecurity "v.io/veyron/veyron/security"
+	"v.io/veyron/veyron/services/identity"
+	"v.io/veyron/veyron2"
+	"v.io/veyron/veyron2/ipc"
+	"v.io/veyron/veyron2/naming"
+	"v.io/veyron/veyron2/rt"
+	"v.io/veyron/veyron2/security"
+	"v.io/veyron/veyron2/vom"
 )
 
 var (
diff --git a/tools/principal/test.sh b/tools/principal/test.sh
index b6404df..3b318d3 100755
--- a/tools/principal/test.sh
+++ b/tools/principal/test.sh
@@ -6,12 +6,12 @@
 # Not the "seekblessing" command yet, since that requires
 # starting a separate server.
 
-source "$(go list -f {{.Dir}} veyron.io/veyron/shell/lib)/shell_test.sh"
+source "$(go list -f {{.Dir}} v.io/veyron/shell/lib)/shell_test.sh"
 
 readonly WORKDIR=${shell_test_WORK_DIR}
 
 build() {
-  PRINCIPAL_BIN="$(shell_test::build_go_binary 'veyron.io/veyron/veyron/tools/principal')"
+  PRINCIPAL_BIN="$(shell_test::build_go_binary 'v.io/veyron/veyron/tools/principal')"
 }
 
 # rmpublickey replaces public keys (16 hex bytes, :-separated) with XX:....
diff --git a/tools/profile/impl.go b/tools/profile/impl.go
index ce7924d..9cdb0ab 100644
--- a/tools/profile/impl.go
+++ b/tools/profile/impl.go
@@ -4,10 +4,10 @@
 	"fmt"
 	"time"
 
-	"veyron.io/lib/cmdline"
-	"veyron.io/veyron/veyron/services/mgmt/profile"
-	"veyron.io/veyron/veyron/services/mgmt/repository"
-	"veyron.io/veyron/veyron2/services/mgmt/build"
+	"v.io/lib/cmdline"
+	"v.io/veyron/veyron/services/mgmt/profile"
+	"v.io/veyron/veyron/services/mgmt/repository"
+	"v.io/veyron/veyron2/services/mgmt/build"
 )
 
 var cmdLabel = &cmdline.Command{
diff --git a/tools/profile/impl_test.go b/tools/profile/impl_test.go
index e8925e9..6e5eafb 100644
--- a/tools/profile/impl_test.go
+++ b/tools/profile/impl_test.go
@@ -6,17 +6,17 @@
 	"strings"
 	"testing"
 
-	"veyron.io/veyron/veyron2"
-	"veyron.io/veyron/veyron2/ipc"
-	"veyron.io/veyron/veyron2/naming"
-	"veyron.io/veyron/veyron2/rt"
-	"veyron.io/veyron/veyron2/security"
-	"veyron.io/veyron/veyron2/services/mgmt/build"
-	"veyron.io/veyron/veyron2/vlog"
+	"v.io/veyron/veyron2"
+	"v.io/veyron/veyron2/ipc"
+	"v.io/veyron/veyron2/naming"
+	"v.io/veyron/veyron2/rt"
+	"v.io/veyron/veyron2/security"
+	"v.io/veyron/veyron2/services/mgmt/build"
+	"v.io/veyron/veyron2/vlog"
 
-	"veyron.io/veyron/veyron/profiles"
-	"veyron.io/veyron/veyron/services/mgmt/profile"
-	"veyron.io/veyron/veyron/services/mgmt/repository"
+	"v.io/veyron/veyron/profiles"
+	"v.io/veyron/veyron/services/mgmt/profile"
+	"v.io/veyron/veyron/services/mgmt/repository"
 )
 
 var (
diff --git a/tools/profile/main.go b/tools/profile/main.go
index f7a5fb7..bd53c6c 100644
--- a/tools/profile/main.go
+++ b/tools/profile/main.go
@@ -4,10 +4,10 @@
 package main
 
 import (
-	"veyron.io/veyron/veyron2"
-	"veyron.io/veyron/veyron2/rt"
+	"v.io/veyron/veyron2"
+	"v.io/veyron/veyron2/rt"
 
-	_ "veyron.io/veyron/veyron/profiles"
+	_ "v.io/veyron/veyron/profiles"
 )
 
 var runtime veyron2.Runtime
diff --git a/tools/servicerunner/main.go b/tools/servicerunner/main.go
index 28a0ac8..f44624d 100644
--- a/tools/servicerunner/main.go
+++ b/tools/servicerunner/main.go
@@ -9,13 +9,13 @@
 	"strings"
 	"time"
 
-	"veyron.io/veyron/veyron2/rt"
+	"v.io/veyron/veyron2/rt"
 
-	"veyron.io/veyron/veyron/lib/expect"
-	"veyron.io/veyron/veyron/lib/flags/consts"
-	"veyron.io/veyron/veyron/lib/modules"
-	_ "veyron.io/veyron/veyron/lib/modules/core"
-	_ "veyron.io/veyron/veyron/profiles"
+	"v.io/veyron/veyron/lib/expect"
+	"v.io/veyron/veyron/lib/flags/consts"
+	"v.io/veyron/veyron/lib/modules"
+	_ "v.io/veyron/veyron/lib/modules/core"
+	_ "v.io/veyron/veyron/profiles"
 )
 
 func panicOnError(err error) {
diff --git a/tools/servicerunner/servicerunner_test.go b/tools/servicerunner/servicerunner_test.go
index 4549150..6fb516c 100644
--- a/tools/servicerunner/servicerunner_test.go
+++ b/tools/servicerunner/servicerunner_test.go
@@ -27,7 +27,7 @@
 
 	bin := path.Join(tmpdir, "servicerunner")
 	fmt.Println("Building", bin)
-	check(t, exec.Command("v23", "go", "build", "-o", bin, "veyron.io/veyron/veyron/tools/servicerunner").Run())
+	check(t, exec.Command("v23", "go", "build", "-o", bin, "v.io/veyron/veyron/tools/servicerunner").Run())
 
 	cmd := exec.Command(bin)
 	stdout, err := cmd.StdoutPipe()
diff --git a/tools/vrpc/impl.go b/tools/vrpc/impl.go
index 868a0fe..864e435 100644
--- a/tools/vrpc/impl.go
+++ b/tools/vrpc/impl.go
@@ -6,18 +6,18 @@
 	"io"
 	"time"
 
-	"veyron.io/lib/cmdline"
-	idl_test_base "veyron.io/veyron/veyron/tools/vrpc/test_base"
-	"veyron.io/veyron/veyron2"
-	"veyron.io/veyron/veyron2/context"
-	"veyron.io/veyron/veyron2/ipc"
-	"veyron.io/veyron/veyron2/naming"
-	"veyron.io/veyron/veyron2/vdl/vdlutil"
-	"veyron.io/veyron/veyron2/vom"
-	"veyron.io/veyron/veyron2/wiretype"
+	"v.io/lib/cmdline"
+	idl_test_base "v.io/veyron/veyron/tools/vrpc/test_base"
+	"v.io/veyron/veyron2"
+	"v.io/veyron/veyron2/context"
+	"v.io/veyron/veyron2/ipc"
+	"v.io/veyron/veyron2/naming"
+	"v.io/veyron/veyron2/vdl/vdlutil"
+	"v.io/veyron/veyron2/vom"
+	"v.io/veyron/veyron2/wiretype"
 
-	idl_binary "veyron.io/veyron/veyron2/services/mgmt/binary"
-	idl_device "veyron.io/veyron/veyron2/services/mgmt/device"
+	idl_binary "v.io/veyron/veyron2/services/mgmt/binary"
+	idl_device "v.io/veyron/veyron2/services/mgmt/device"
 )
 
 const serverDesc = `
diff --git a/tools/vrpc/impl_test.go b/tools/vrpc/impl_test.go
index 6e3561c..5cec6de 100644
--- a/tools/vrpc/impl_test.go
+++ b/tools/vrpc/impl_test.go
@@ -6,15 +6,15 @@
 	"strings"
 	"testing"
 
-	"veyron.io/veyron/veyron2"
-	"veyron.io/veyron/veyron2/ipc"
-	"veyron.io/veyron/veyron2/naming"
-	"veyron.io/veyron/veyron2/rt"
-	"veyron.io/veyron/veyron2/vlog"
+	"v.io/veyron/veyron2"
+	"v.io/veyron/veyron2/ipc"
+	"v.io/veyron/veyron2/naming"
+	"v.io/veyron/veyron2/rt"
+	"v.io/veyron/veyron2/vlog"
 
-	"veyron.io/lib/cmdline"
-	"veyron.io/veyron/veyron/profiles"
-	"veyron.io/veyron/veyron/tools/vrpc/test_base"
+	"v.io/lib/cmdline"
+	"v.io/veyron/veyron/profiles"
+	"v.io/veyron/veyron/tools/vrpc/test_base"
 )
 
 type server struct{}
@@ -263,7 +263,7 @@
 		//
 		// []string{"InputSlice", "InputSlice([1 2]) = []", "[\"[]uint\",[1,2]]"},
 		[]string{"InputStruct", "InputStruct({1 2}) = [<nil>]",
-			"[\"type\",\"veyron.io/veyron/veyron2/vrpc/test_base.Struct struct{X int32;Y int32}\"] [\"Struct\",{\"X\":1,\"Y\":2}]"},
+			"[\"type\",\"v.io/veyron/veyron2/vrpc/test_base.Struct struct{X int32;Y int32}\"] [\"Struct\",{\"X\":1,\"Y\":2}]"},
 		// TODO(jsimsa): The OutputArray currently triggers an error in the
 		// vom decoder. Benj is looking into this.
 		//
diff --git a/tools/vrpc/main.go b/tools/vrpc/main.go
index e331d49..43e616f 100644
--- a/tools/vrpc/main.go
+++ b/tools/vrpc/main.go
@@ -1,13 +1,13 @@
 // The following enables go generate to generate the doc.go file.
-//go:generate go run $VANADIUM_ROOT/veyron/go/src/veyron.io/lib/cmdline/testdata/gendoc.go .
+//go:generate go run $VANADIUM_ROOT/veyron/go/src/v.io/lib/cmdline/testdata/gendoc.go .
 
 package main
 
 import (
-	"veyron.io/veyron/veyron2"
-	"veyron.io/veyron/veyron2/rt"
+	"v.io/veyron/veyron2"
+	"v.io/veyron/veyron2/rt"
 
-	_ "veyron.io/veyron/veyron/profiles"
+	_ "v.io/veyron/veyron/profiles"
 )
 
 var runtime veyron2.Runtime
diff --git a/tools/vrpc/test_base/test_base.vdl.go b/tools/vrpc/test_base/test_base.vdl.go
index fe9a2df..5a3d95a 100644
--- a/tools/vrpc/test_base/test_base.vdl.go
+++ b/tools/vrpc/test_base/test_base.vdl.go
@@ -6,12 +6,12 @@
 import (
 	// The non-user imports are prefixed with "__" to prevent collisions.
 	__io "io"
-	__veyron2 "veyron.io/veyron/veyron2"
-	__context "veyron.io/veyron/veyron2/context"
-	__ipc "veyron.io/veyron/veyron2/ipc"
-	__vdl "veyron.io/veyron/veyron2/vdl"
-	__vdlutil "veyron.io/veyron/veyron2/vdl/vdlutil"
-	__wiretype "veyron.io/veyron/veyron2/wiretype"
+	__veyron2 "v.io/veyron/veyron2"
+	__context "v.io/veyron/veyron2/context"
+	__ipc "v.io/veyron/veyron2/ipc"
+	__vdl "v.io/veyron/veyron2/vdl"
+	__vdlutil "v.io/veyron/veyron2/vdl/vdlutil"
+	__wiretype "v.io/veyron/veyron2/wiretype"
 )
 
 // TODO(toddw): Remove this line once the new signature support is done.
@@ -25,7 +25,7 @@
 }
 
 func (Struct) __VDLReflect(struct {
-	Name string "veyron.io/veyron/veyron/tools/vrpc/test_base.Struct"
+	Name string "v.io/veyron/veyron/tools/vrpc/test_base.Struct"
 }) {
 }
 
@@ -575,7 +575,7 @@
 // descTypeTester hides the desc to keep godoc clean.
 var descTypeTester = __ipc.InterfaceDesc{
 	Name:    "TypeTester",
-	PkgPath: "veyron.io/veyron/veyron/tools/vrpc/test_base",
+	PkgPath: "v.io/veyron/veyron/tools/vrpc/test_base",
 	Methods: []__ipc.MethodDesc{
 		{
 			Name: "EchoBool",
@@ -945,7 +945,7 @@
 				__wiretype.FieldType{Type: 0x24, Name: "X"},
 				__wiretype.FieldType{Type: 0x24, Name: "Y"},
 			},
-			"veyron.io/veyron/veyron/tools/vrpc/test_base.Struct", []string(nil)},
+			"v.io/veyron/veyron/tools/vrpc/test_base.Struct", []string(nil)},
 	}
 
 	return result, nil
diff --git a/tools/vrun/test.sh b/tools/vrun/test.sh
index 312ace2..df9a705 100755
--- a/tools/vrun/test.sh
+++ b/tools/vrun/test.sh
@@ -2,12 +2,12 @@
 
 # Test running an application using vrun under the agent.
 
-source "$(go list -f {{.Dir}} veyron.io/veyron/shell/lib)/shell_test.sh"
+source "$(go list -f {{.Dir}} v.io/veyron/shell/lib)/shell_test.sh"
 
 readonly WORKDIR="${shell_test_WORK_DIR}"
 
 build() {
-  AGENTD_BIN="$(shell_test::build_go_binary 'veyron.io/veyron/veyron/security/agent/agentd')"
+  AGENTD_BIN="$(shell_test::build_go_binary 'v.io/veyron/veyron/security/agent/agentd')"
 }
 
 main() {
@@ -18,7 +18,7 @@
 
   # Make sure the testchild.sh script gets the same shell_test_BIN_DIR as the main script.
   export shell_test_BIN_DIR
-  "${AGENTD_BIN}" --no_passphrase --additional_principals="$(shell::tmp_dir)" bash "$(go list -f {{.Dir}} veyron.io/veyron/veyron/tools/vrun)/testchild.sh" || shell_test::fail "${LINENO}: testchild.sh failed"
+  "${AGENTD_BIN}" --no_passphrase --additional_principals="$(shell::tmp_dir)" bash "$(go list -f {{.Dir}} v.io/veyron/veyron/tools/vrun)/testchild.sh" || shell_test::fail "${LINENO}: testchild.sh failed"
 
   shell_test::pass
 }
diff --git a/tools/vrun/testchild.sh b/tools/vrun/testchild.sh
index ea61261..04a6cbd 100755
--- a/tools/vrun/testchild.sh
+++ b/tools/vrun/testchild.sh
@@ -2,13 +2,13 @@
 
 # Helper script for testing vrun.
 
-source "$(go list -f {{.Dir}} veyron.io/veyron/shell/lib)/shell_test.sh"
+source "$(go list -f {{.Dir}} v.io/veyron/shell/lib)/shell_test.sh"
 
 main() {
   shell_test::setup_server_test
-  local -r PINGPONG="$(shell_test::build_go_binary 'veyron.io/veyron/veyron/security/agent/pingpong')"
-  local -r VRUN="$(shell_test::build_go_binary 'veyron.io/veyron/veyron/tools/vrun')"
-  local -r PRINCIPAL="$(shell_test::build_go_binary 'veyron.io/veyron/veyron/tools/principal')"
+  local -r PINGPONG="$(shell_test::build_go_binary 'v.io/veyron/veyron/security/agent/pingpong')"
+  local -r VRUN="$(shell_test::build_go_binary 'v.io/veyron/veyron/tools/vrun')"
+  local -r PRINCIPAL="$(shell_test::build_go_binary 'v.io/veyron/veyron/tools/principal')"
 
   local blessing=$("${PRINCIPAL}" dump | grep Default|cut -d: -f2)
   shell_test::assert_eq "${blessing}" " agent_principal" $LINENO
diff --git a/tools/vrun/vrun.go b/tools/vrun/vrun.go
index 8fb8555..6cd702f 100644
--- a/tools/vrun/vrun.go
+++ b/tools/vrun/vrun.go
@@ -7,18 +7,18 @@
 	"syscall"
 	"time"
 
-	"veyron.io/lib/cmdline"
-	"veyron.io/veyron/veyron/lib/flags/consts"
-	"veyron.io/veyron/veyron/security/agent"
-	"veyron.io/veyron/veyron/security/agent/keymgr"
+	"v.io/lib/cmdline"
+	"v.io/veyron/veyron/lib/flags/consts"
+	"v.io/veyron/veyron/security/agent"
+	"v.io/veyron/veyron/security/agent/keymgr"
 
-	"veyron.io/veyron/veyron2"
-	"veyron.io/veyron/veyron2/options"
-	"veyron.io/veyron/veyron2/rt"
-	"veyron.io/veyron/veyron2/security"
-	"veyron.io/veyron/veyron2/vlog"
+	"v.io/veyron/veyron2"
+	"v.io/veyron/veyron2/options"
+	"v.io/veyron/veyron2/rt"
+	"v.io/veyron/veyron2/security"
+	"v.io/veyron/veyron2/vlog"
 
-	_ "veyron.io/veyron/veyron/profiles"
+	_ "v.io/veyron/veyron/profiles"
 )
 
 var runtime veyron2.Runtime