updating the veyron import paths

Change-Id: I5ecfec3cb57cb3825d1b53c0cbb3a672190d0923
diff --git a/tools/application/impl/impl.go b/tools/application/impl/impl.go
index 4a804f6..fccb840 100644
--- a/tools/application/impl/impl.go
+++ b/tools/application/impl/impl.go
@@ -11,12 +11,12 @@
 	"strings"
 	"time"
 
-	"veyron/lib/cmdline"
-	"veyron/services/mgmt/repository"
+	"veyron.io/veyron/veyron/lib/cmdline"
+	"veyron.io/veyron/veyron/services/mgmt/repository"
 
-	"veyron2/context"
-	"veyron2/rt"
-	"veyron2/services/mgmt/application"
+	"veyron.io/veyron/veyron2/context"
+	"veyron.io/veyron/veyron2/rt"
+	"veyron.io/veyron/veyron2/services/mgmt/application"
 )
 
 func getEnvelopeJSON(ctx context.T, app repository.Application, profiles string) ([]byte, error) {
diff --git a/tools/application/impl/impl_test.go b/tools/application/impl/impl_test.go
index b19e926..0dd191b 100644
--- a/tools/application/impl/impl_test.go
+++ b/tools/application/impl/impl_test.go
@@ -7,16 +7,16 @@
 	"strings"
 	"testing"
 
-	"veyron/services/mgmt/repository"
-	"veyron/tools/application/impl"
+	"veyron.io/veyron/veyron/services/mgmt/repository"
+	"veyron.io/veyron/veyron/tools/application/impl"
 
-	"veyron2"
-	"veyron2/ipc"
-	"veyron2/naming"
-	"veyron2/rt"
-	"veyron2/security"
-	"veyron2/services/mgmt/application"
-	"veyron2/vlog"
+	"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"
 )
 
 var (
diff --git a/tools/application/main.go b/tools/application/main.go
index a510dcc..a9ec584 100644
--- a/tools/application/main.go
+++ b/tools/application/main.go
@@ -1,9 +1,9 @@
 package main
 
 import (
-	"veyron/tools/application/impl"
+	"veyron.io/veyron/veyron/tools/application/impl"
 
-	"veyron2/rt"
+	"veyron.io/veyron/veyron2/rt"
 )
 
 func main() {
diff --git a/tools/binary/impl/impl.go b/tools/binary/impl/impl.go
index 29b26b1..f690e54 100644
--- a/tools/binary/impl/impl.go
+++ b/tools/binary/impl/impl.go
@@ -3,8 +3,8 @@
 import (
 	"fmt"
 
-	"veyron/lib/cmdline"
-	"veyron/services/mgmt/lib/binary"
+	"veyron.io/veyron/veyron/lib/cmdline"
+	"veyron.io/veyron/veyron/services/mgmt/lib/binary"
 )
 
 var cmdDelete = &cmdline.Command{
diff --git a/tools/binary/impl/impl_test.go b/tools/binary/impl/impl_test.go
index fdad6d2..78b7b5e 100644
--- a/tools/binary/impl/impl_test.go
+++ b/tools/binary/impl/impl_test.go
@@ -11,16 +11,16 @@
 	"strings"
 	"testing"
 
-	"veyron/tools/binary/impl"
+	"veyron.io/veyron/veyron/tools/binary/impl"
 
-	"veyron2"
-	"veyron2/ipc"
-	"veyron2/naming"
-	"veyron2/rt"
-	"veyron2/security"
-	"veyron2/services/mgmt/binary"
-	"veyron2/services/mgmt/repository"
-	"veyron2/vlog"
+	"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"
 )
 
 type server struct {
diff --git a/tools/binary/main.go b/tools/binary/main.go
index e03d21c..b512f32 100644
--- a/tools/binary/main.go
+++ b/tools/binary/main.go
@@ -1,9 +1,9 @@
 package main
 
 import (
-	"veyron/tools/binary/impl"
+	"veyron.io/veyron/veyron/tools/binary/impl"
 
-	"veyron2/rt"
+	"veyron.io/veyron/veyron2/rt"
 )
 
 func main() {
diff --git a/tools/build/impl/impl.go b/tools/build/impl/impl.go
index eb76237..e9e0714 100644
--- a/tools/build/impl/impl.go
+++ b/tools/build/impl/impl.go
@@ -10,11 +10,11 @@
 	"strings"
 	"time"
 
-	"veyron/lib/cmdline"
+	"veyron.io/veyron/veyron/lib/cmdline"
 
-	"veyron2/context"
-	"veyron2/rt"
-	vbuild "veyron2/services/mgmt/build"
+	"veyron.io/veyron/veyron2/context"
+	"veyron.io/veyron/veyron2/rt"
+	vbuild "veyron.io/veyron/veyron2/services/mgmt/build"
 )
 
 var (
diff --git a/tools/build/impl/impl_test.go b/tools/build/impl/impl_test.go
index 77dfabf..0cdd5f3 100644
--- a/tools/build/impl/impl_test.go
+++ b/tools/build/impl/impl_test.go
@@ -5,15 +5,15 @@
 	"strings"
 	"testing"
 
-	"veyron/tools/build/impl"
+	"veyron.io/veyron/veyron/tools/build/impl"
 
-	"veyron2/ipc"
-	"veyron2/naming"
-	"veyron2/rt"
-	"veyron2/services/mgmt/binary"
-	"veyron2/services/mgmt/build"
-	"veyron2/verror"
-	"veyron2/vlog"
+	"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"
+	"veyron.io/veyron/veyron2/verror"
+	"veyron.io/veyron/veyron2/vlog"
 )
 
 var errInternalError = verror.Internalf("internal error")
@@ -72,7 +72,7 @@
 	cmd.Init(nil, &stdout, &stderr)
 
 	// Test the 'Build' command.
-	if err := cmd.Execute([]string{"build", naming.JoinAddressName(endpoint.String(), ""), "veyron/tools/build"}); err != nil {
+	if err := cmd.Execute([]string{"build", naming.JoinAddressName(endpoint.String(), ""), "veyron.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 4e872f5..5da2faf 100644
--- a/tools/build/main.go
+++ b/tools/build/main.go
@@ -1,9 +1,9 @@
 package main
 
 import (
-	"veyron/tools/build/impl"
+	"veyron.io/veyron/veyron/tools/build/impl"
 
-	"veyron2/rt"
+	"veyron.io/veyron/veyron2/rt"
 )
 
 func main() {
diff --git a/tools/findunusedport/main.go b/tools/findunusedport/main.go
index 9d11884..7d4bda2 100644
--- a/tools/findunusedport/main.go
+++ b/tools/findunusedport/main.go
@@ -8,7 +8,7 @@
 	"os"
 	"syscall"
 
-	"veyron2/vlog"
+	"veyron.io/veyron/veyron2/vlog"
 )
 
 func main() {
diff --git a/tools/identity/googleoauth.go b/tools/identity/googleoauth.go
index d556e10..df07829 100644
--- a/tools/identity/googleoauth.go
+++ b/tools/identity/googleoauth.go
@@ -10,8 +10,8 @@
 	"os"
 	"os/exec"
 
-	"veyron/services/identity/googleoauth"
-	"veyron2/vlog"
+	"veyron.io/veyron/veyron/services/identity/googleoauth"
+	"veyron.io/veyron/veyron2/vlog"
 )
 
 func getOAuthAuthorizationCodeFromGoogle(clientID string, blessing <-chan string) (<-chan string, error) {
diff --git a/tools/identity/main.go b/tools/identity/main.go
index 13310f5..ca26c74 100644
--- a/tools/identity/main.go
+++ b/tools/identity/main.go
@@ -8,15 +8,15 @@
 	"os/user"
 	"time"
 
-	"veyron/lib/cmdline"
-	"veyron/services/identity"
-	"veyron/services/identity/util"
+	"veyron.io/veyron/veyron/lib/cmdline"
+	"veyron.io/veyron/veyron/services/identity"
+	"veyron.io/veyron/veyron/services/identity/util"
 
-	"veyron2"
-	"veyron2/rt"
-	"veyron2/security"
-	"veyron2/vdl/vdlutil"
-	"veyron2/vlog"
+	"veyron.io/veyron/veyron2"
+	"veyron.io/veyron/veyron2/rt"
+	"veyron.io/veyron/veyron2/security"
+	"veyron.io/veyron/veyron2/vdl/vdlutil"
+	"veyron.io/veyron/veyron2/vlog"
 )
 
 var (
@@ -92,7 +92,7 @@
 			}
 			id, err := r.NewIdentity(name)
 			if err != nil {
-				return fmt.Errorf("veyron2.Runtime.NewIdentity(%q) failed: %v", name, err)
+				return fmt.Errorf("NewIdentity(%q) failed: %v", name, err)
 			}
 			output, err := util.Base64VomEncode(id)
 			if err != nil {
diff --git a/tools/mounttable/impl/impl.go b/tools/mounttable/impl/impl.go
index 1a75ef6..9d9a96d 100644
--- a/tools/mounttable/impl/impl.go
+++ b/tools/mounttable/impl/impl.go
@@ -4,11 +4,11 @@
 	"fmt"
 	"time"
 
-	"veyron/lib/cmdline"
+	"veyron.io/veyron/veyron/lib/cmdline"
 
-	"veyron2/context"
-	"veyron2/rt"
-	"veyron2/services/mounttable"
+	"veyron.io/veyron/veyron2/context"
+	"veyron.io/veyron/veyron2/rt"
+	"veyron.io/veyron/veyron2/services/mounttable"
 )
 
 func bindMT(ctx context.T, name string) (mounttable.MountTable, error) {
diff --git a/tools/mounttable/impl/impl_test.go b/tools/mounttable/impl/impl_test.go
index 2f2ec09..5ce9b0f 100644
--- a/tools/mounttable/impl/impl_test.go
+++ b/tools/mounttable/impl/impl_test.go
@@ -5,16 +5,16 @@
 	"strings"
 	"testing"
 
-	"veyron/tools/mounttable/impl"
+	"veyron.io/veyron/veyron/tools/mounttable/impl"
 
-	"veyron2"
-	"veyron2/ipc"
-	"veyron2/naming"
-	"veyron2/rt"
-	"veyron2/security"
-	"veyron2/services/mounttable"
-	"veyron2/services/mounttable/types"
-	"veyron2/vlog"
+	"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/services/mounttable/types"
+	"veyron.io/veyron/veyron2/vlog"
 )
 
 type server struct {
diff --git a/tools/mounttable/main.go b/tools/mounttable/main.go
index 61a93d6..7f2c385 100644
--- a/tools/mounttable/main.go
+++ b/tools/mounttable/main.go
@@ -1,9 +1,9 @@
 package main
 
 import (
-	"veyron/tools/mounttable/impl"
+	"veyron.io/veyron/veyron/tools/mounttable/impl"
 
-	"veyron2/rt"
+	"veyron.io/veyron/veyron2/rt"
 )
 
 func main() {
diff --git a/tools/namespace/impl/impl.go b/tools/namespace/impl/impl.go
index 7fe764b..2c87e49 100644
--- a/tools/namespace/impl/impl.go
+++ b/tools/namespace/impl/impl.go
@@ -4,10 +4,10 @@
 	"fmt"
 	"time"
 
-	"veyron/lib/cmdline"
+	"veyron.io/veyron/veyron/lib/cmdline"
 
-	"veyron2/rt"
-	"veyron2/vlog"
+	"veyron.io/veyron/veyron2/rt"
+	"veyron.io/veyron/veyron2/vlog"
 )
 
 var cmdGlob = &cmdline.Command{
diff --git a/tools/namespace/main.go b/tools/namespace/main.go
index 64f046e..9fcf1cf 100644
--- a/tools/namespace/main.go
+++ b/tools/namespace/main.go
@@ -2,8 +2,8 @@
 package main
 
 import (
-	"veyron/tools/namespace/impl"
-	"veyron2/rt"
+	"veyron.io/veyron/veyron/tools/namespace/impl"
+	"veyron.io/veyron/veyron2/rt"
 )
 
 func main() {
diff --git a/tools/naming/simulator/commands.go b/tools/naming/simulator/commands.go
index 937990c..712e2e6 100644
--- a/tools/naming/simulator/commands.go
+++ b/tools/naming/simulator/commands.go
@@ -4,9 +4,9 @@
 	"fmt"
 	"time"
 
-	"veyron/lib/testutil/modules"
+	"veyron.io/veyron/veyron/lib/testutil/modules"
 
-	"veyron2/vlog"
+	"veyron.io/veyron/veyron2/vlog"
 )
 
 type tag int
diff --git a/tools/naming/simulator/driver.go b/tools/naming/simulator/driver.go
index 4206289..207c626 100644
--- a/tools/naming/simulator/driver.go
+++ b/tools/naming/simulator/driver.go
@@ -14,9 +14,9 @@
 	"strings"
 	"unicode"
 
-	"veyron/lib/testutil/modules"
+	"veyron.io/veyron/veyron/lib/testutil/modules"
 
-	"veyron2/rt"
+	"veyron.io/veyron/veyron2/rt"
 )
 
 type commandFunc func() modules.T
diff --git a/tools/playground/builder/vbuild.go b/tools/playground/builder/vbuild.go
index 2ef28c4..d0f64b4 100644
--- a/tools/playground/builder/vbuild.go
+++ b/tools/playground/builder/vbuild.go
@@ -23,7 +23,7 @@
 	"syscall"
 	"time"
 
-	"veyron/tools/playground/event"
+	"veyron.io/veyron/veyron/tools/playground/event"
 )
 
 const runTimeout = 3 * time.Second
diff --git a/tools/playground/compilerd/main.go b/tools/playground/compilerd/main.go
index 983cc33..672169f 100644
--- a/tools/playground/compilerd/main.go
+++ b/tools/playground/compilerd/main.go
@@ -17,7 +17,7 @@
 
 	"github.com/golang/groupcache/lru"
 
-	"veyron/tools/playground/event"
+	"veyron.io/veyron/veyron/tools/playground/event"
 )
 
 type ResponseBody struct {
diff --git a/tools/playground/testdata/ping/ping.go b/tools/playground/testdata/ping/ping.go
index 2372abe..0ac3a4f 100644
--- a/tools/playground/testdata/ping/ping.go
+++ b/tools/playground/testdata/ping/ping.go
@@ -4,7 +4,7 @@
 import (
 	"fmt"
 	"pingpong"
-	"veyron2/rt"
+	"veyron.io/veyron/veyron2/rt"
 )
 
 func main() {
diff --git a/tools/playground/testdata/pingpong/wire.vdl b/tools/playground/testdata/pingpong/wire.vdl
index 011afde..539231e 100644
--- a/tools/playground/testdata/pingpong/wire.vdl
+++ b/tools/playground/testdata/pingpong/wire.vdl
@@ -1,6 +1,6 @@
 package pingpong
 
-import "veyron2/security"
+import "veyron.io/veyron/veyron2/security"
 
 type PingPong interface {
 	Ping(message string) (string, error) {security.ReadLabel}
diff --git a/tools/playground/testdata/pingpong/wire.vdl.go b/tools/playground/testdata/pingpong/wire.vdl.go
index d6a9e33..e1aa5db 100644
--- a/tools/playground/testdata/pingpong/wire.vdl.go
+++ b/tools/playground/testdata/pingpong/wire.vdl.go
@@ -4,15 +4,15 @@
 package pingpong
 
 import (
-	"veyron2/security"
+	"veyron.io/veyron/veyron2/security"
 
 	// The non-user imports are prefixed with "_gen_" to prevent collisions.
-	_gen_veyron2 "veyron2"
-	_gen_context "veyron2/context"
-	_gen_ipc "veyron2/ipc"
-	_gen_naming "veyron2/naming"
-	_gen_vdlutil "veyron2/vdl/vdlutil"
-	_gen_wiretype "veyron2/wiretype"
+	_gen_veyron2 "veyron.io/veyron/veyron2"
+	_gen_context "veyron.io/veyron/veyron2/context"
+	_gen_ipc "veyron.io/veyron/veyron2/ipc"
+	_gen_naming "veyron.io/veyron/veyron2/naming"
+	_gen_vdlutil "veyron.io/veyron/veyron2/vdl/vdlutil"
+	_gen_wiretype "veyron.io/veyron/veyron2/wiretype"
 )
 
 // TODO(bprosnitz) Remove this line once signatures are updated to use typevals.
diff --git a/tools/playground/testdata/pong/pong.go b/tools/playground/testdata/pong/pong.go
index d6c5a42..8bd86b7 100644
--- a/tools/playground/testdata/pong/pong.go
+++ b/tools/playground/testdata/pong/pong.go
@@ -4,10 +4,10 @@
 import (
 	"fmt"
 	"pingpong"
-	"veyron/lib/signals"
-	sflag "veyron/security/flag"
-	"veyron2/ipc"
-	"veyron2/rt"
+	"veyron.io/veyron/veyron/lib/signals"
+	sflag "veyron.io/veyron/veyron/security/flag"
+	"veyron.io/veyron/veyron2/ipc"
+	"veyron.io/veyron/veyron2/rt"
 )
 
 type pongd struct{}
diff --git a/tools/profile/impl/impl.go b/tools/profile/impl/impl.go
index 41d19eb..1a69555 100644
--- a/tools/profile/impl/impl.go
+++ b/tools/profile/impl/impl.go
@@ -4,12 +4,12 @@
 	"fmt"
 	"time"
 
-	"veyron/lib/cmdline"
-	"veyron/services/mgmt/profile"
-	"veyron/services/mgmt/repository"
+	"veyron.io/veyron/veyron/lib/cmdline"
+	"veyron.io/veyron/veyron/services/mgmt/profile"
+	"veyron.io/veyron/veyron/services/mgmt/repository"
 
-	"veyron2/rt"
-	"veyron2/services/mgmt/build"
+	"veyron.io/veyron/veyron2/rt"
+	"veyron.io/veyron/veyron2/services/mgmt/build"
 )
 
 var cmdLabel = &cmdline.Command{
diff --git a/tools/profile/impl/impl_test.go b/tools/profile/impl/impl_test.go
index caf9248..c2c2506 100644
--- a/tools/profile/impl/impl_test.go
+++ b/tools/profile/impl/impl_test.go
@@ -6,17 +6,17 @@
 	"strings"
 	"testing"
 
-	"veyron/services/mgmt/profile"
-	"veyron/services/mgmt/repository"
-	"veyron/tools/profile/impl"
+	"veyron.io/veyron/veyron/services/mgmt/profile"
+	"veyron.io/veyron/veyron/services/mgmt/repository"
+	"veyron.io/veyron/veyron/tools/profile/impl"
 
-	"veyron2"
-	"veyron2/ipc"
-	"veyron2/naming"
-	"veyron2/rt"
-	"veyron2/security"
-	"veyron2/services/mgmt/build"
-	"veyron2/vlog"
+	"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"
 )
 
 var (
diff --git a/tools/profile/main.go b/tools/profile/main.go
index da5821b..bd2531a 100644
--- a/tools/profile/main.go
+++ b/tools/profile/main.go
@@ -1,9 +1,9 @@
 package main
 
 import (
-	"veyron/tools/profile/impl"
+	"veyron.io/veyron/veyron/tools/profile/impl"
 
-	"veyron2/rt"
+	"veyron.io/veyron/veyron2/rt"
 )
 
 func main() {
diff --git a/tools/vrpc/impl/impl.go b/tools/vrpc/impl/impl.go
index ffd6dd9..3851bac 100644
--- a/tools/vrpc/impl/impl.go
+++ b/tools/vrpc/impl/impl.go
@@ -6,20 +6,20 @@
 	"io"
 	"time"
 
-	"veyron/lib/cmdline"
-	idl_test_base "veyron/tools/vrpc/test_base"
+	"veyron.io/veyron/veyron/lib/cmdline"
+	idl_test_base "veyron.io/veyron/veyron/tools/vrpc/test_base"
 
-	"veyron2"
-	"veyron2/context"
-	"veyron2/ipc"
-	"veyron2/rt"
-	"veyron2/vdl/vdlutil"
-	"veyron2/vom"
-	"veyron2/wiretype"
+	"veyron.io/veyron/veyron2"
+	"veyron.io/veyron/veyron2/context"
+	"veyron.io/veyron/veyron2/ipc"
+	"veyron.io/veyron/veyron2/rt"
+	"veyron.io/veyron/veyron2/vdl/vdlutil"
+	"veyron.io/veyron/veyron2/vom"
+	"veyron.io/veyron/veyron2/wiretype"
 
-	idl_binary "veyron2/services/mgmt/binary"
-	idl_node "veyron2/services/mgmt/node"
-	idl_mounttable_types "veyron2/services/mounttable/types"
+	idl_binary "veyron.io/veyron/veyron2/services/mgmt/binary"
+	idl_node "veyron.io/veyron/veyron2/services/mgmt/node"
+	idl_mounttable_types "veyron.io/veyron/veyron2/services/mounttable/types"
 )
 
 const serverDesc = `
diff --git a/tools/vrpc/impl/impl_test.go b/tools/vrpc/impl/impl_test.go
index 091e606..0dd2811 100644
--- a/tools/vrpc/impl/impl_test.go
+++ b/tools/vrpc/impl/impl_test.go
@@ -6,15 +6,15 @@
 	"strings"
 	"testing"
 
-	"veyron/lib/cmdline"
-	"veyron/tools/vrpc/impl"
-	"veyron/tools/vrpc/test_base"
+	"veyron.io/veyron/veyron/lib/cmdline"
+	"veyron.io/veyron/veyron/tools/vrpc/impl"
+	"veyron.io/veyron/veyron/tools/vrpc/test_base"
 
-	"veyron2"
-	"veyron2/ipc"
-	"veyron2/naming"
-	"veyron2/rt"
-	"veyron2/vlog"
+	"veyron.io/veyron/veyron2"
+	"veyron.io/veyron/veyron2/ipc"
+	"veyron.io/veyron/veyron2/naming"
+	"veyron.io/veyron/veyron2/rt"
+	"veyron.io/veyron/veyron2/vlog"
 )
 
 type server struct{}
@@ -256,7 +256,7 @@
 		//
 		// []string{"InputSlice", "InputSlice([1 2]) = []", "[\"[]uint\",[1,2]]"},
 		[]string{"InputStruct", "InputStruct({1 2}) = [<nil>]",
-			"[\"type\",\"veyron2/vrpc/test_base.Struct struct{X int32;Y int32}\"] [\"Struct\",{\"X\":1,\"Y\":2}]"},
+			"[\"type\",\"veyron.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 1cf6021..be42ae3 100644
--- a/tools/vrpc/main.go
+++ b/tools/vrpc/main.go
@@ -1,9 +1,9 @@
 package main
 
 import (
-	"veyron/tools/vrpc/impl"
+	"veyron.io/veyron/veyron/tools/vrpc/impl"
 
-	"veyron2/rt"
+	"veyron.io/veyron/veyron2/rt"
 )
 
 func main() {
diff --git a/tools/vrpc/test_base/test_base.vdl.go b/tools/vrpc/test_base/test_base.vdl.go
index d4bf808..bac146f 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 "_gen_" to prevent collisions.
 	_gen_io "io"
-	_gen_veyron2 "veyron2"
-	_gen_context "veyron2/context"
-	_gen_ipc "veyron2/ipc"
-	_gen_naming "veyron2/naming"
-	_gen_vdlutil "veyron2/vdl/vdlutil"
-	_gen_wiretype "veyron2/wiretype"
+	_gen_veyron2 "veyron.io/veyron/veyron2"
+	_gen_context "veyron.io/veyron/veyron2/context"
+	_gen_ipc "veyron.io/veyron/veyron2/ipc"
+	_gen_naming "veyron.io/veyron/veyron2/naming"
+	_gen_vdlutil "veyron.io/veyron/veyron2/vdl/vdlutil"
+	_gen_wiretype "veyron.io/veyron/veyron2/wiretype"
 )
 
 type Struct struct {
@@ -739,7 +739,7 @@
 				_gen_wiretype.FieldType{Type: 0x24, Name: "X"},
 				_gen_wiretype.FieldType{Type: 0x24, Name: "Y"},
 			},
-			"veyron/tools/vrpc/test_base.Struct", []string(nil)},
+			"veyron.io/veyron/veyron/tools/vrpc/test_base.Struct", []string(nil)},
 	}
 
 	return result, nil