diff --git a/cmd/sb51/internal/demodb/db_objects.vdl.go b/cmd/sb51/internal/demodb/db_objects.vdl.go
index 23481f8..ebdda02 100644
--- a/cmd/sb51/internal/demodb/db_objects.vdl.go
+++ b/cmd/sb51/internal/demodb/db_objects.vdl.go
@@ -25,7 +25,7 @@
 }
 
 func (AddressInfo) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/syncbase/sb51/internal/demodb.AddressInfo"`
+	Name string `vdl:"v.io/x/ref/cmd/sb51/internal/demodb.AddressInfo"`
 }) {
 }
 
@@ -77,7 +77,7 @@
 }
 
 func (CreditAgency) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/syncbase/sb51/internal/demodb.CreditAgency"`
+	Name string `vdl:"v.io/x/ref/cmd/sb51/internal/demodb.CreditAgency"`
 	Enum struct{ Equifax, Experian, TransUnion string }
 }) {
 }
@@ -124,7 +124,7 @@
 }
 
 func (ExperianRating) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/syncbase/sb51/internal/demodb.ExperianRating"`
+	Name string `vdl:"v.io/x/ref/cmd/sb51/internal/demodb.ExperianRating"`
 	Enum struct{ Good, Bad string }
 }) {
 }
@@ -134,7 +134,7 @@
 }
 
 func (EquifaxCreditReport) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/syncbase/sb51/internal/demodb.EquifaxCreditReport"`
+	Name string `vdl:"v.io/x/ref/cmd/sb51/internal/demodb.EquifaxCreditReport"`
 }) {
 }
 
@@ -143,7 +143,7 @@
 }
 
 func (ExperianCreditReport) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/syncbase/sb51/internal/demodb.ExperianCreditReport"`
+	Name string `vdl:"v.io/x/ref/cmd/sb51/internal/demodb.ExperianCreditReport"`
 }) {
 }
 
@@ -152,7 +152,7 @@
 }
 
 func (TransUnionCreditReport) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/syncbase/sb51/internal/demodb.TransUnionCreditReport"`
+	Name string `vdl:"v.io/x/ref/cmd/sb51/internal/demodb.TransUnionCreditReport"`
 }) {
 }
 
@@ -176,7 +176,7 @@
 	AgencyReportTransUnionReport struct{ Value TransUnionCreditReport }
 	// __AgencyReportReflect describes the AgencyReport union type.
 	__AgencyReportReflect struct {
-		Name  string `vdl:"v.io/syncbase/x/ref/syncbase/sb51/internal/demodb.AgencyReport"`
+		Name  string `vdl:"v.io/x/ref/cmd/sb51/internal/demodb.AgencyReport"`
 		Type  AgencyReport
 		Union struct {
 			EquifaxReport    AgencyReportEquifaxReport
@@ -207,7 +207,7 @@
 }
 
 func (CreditReport) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/syncbase/sb51/internal/demodb.CreditReport"`
+	Name string `vdl:"v.io/x/ref/cmd/sb51/internal/demodb.CreditReport"`
 }) {
 }
 
@@ -220,7 +220,7 @@
 }
 
 func (Customer) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/syncbase/sb51/internal/demodb.Customer"`
+	Name string `vdl:"v.io/x/ref/cmd/sb51/internal/demodb.Customer"`
 }) {
 }
 
@@ -232,7 +232,7 @@
 }
 
 func (Invoice) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/syncbase/sb51/internal/demodb.Invoice"`
+	Name string `vdl:"v.io/x/ref/cmd/sb51/internal/demodb.Invoice"`
 }) {
 }
 
@@ -251,7 +251,7 @@
 }
 
 func (Numbers) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/syncbase/sb51/internal/demodb.Numbers"`
+	Name string `vdl:"v.io/x/ref/cmd/sb51/internal/demodb.Numbers"`
 }) {
 }
 
@@ -260,7 +260,7 @@
 }
 
 func (FooType) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/syncbase/sb51/internal/demodb.FooType"`
+	Name string `vdl:"v.io/x/ref/cmd/sb51/internal/demodb.FooType"`
 }) {
 }
 
@@ -269,7 +269,7 @@
 }
 
 func (BarType) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/syncbase/sb51/internal/demodb.BarType"`
+	Name string `vdl:"v.io/x/ref/cmd/sb51/internal/demodb.BarType"`
 }) {
 }
 
@@ -291,7 +291,7 @@
 	TitleOrValueTypeValue struct{ Value int64 }
 	// __TitleOrValueTypeReflect describes the TitleOrValueType union type.
 	__TitleOrValueTypeReflect struct {
-		Name  string `vdl:"v.io/syncbase/x/ref/syncbase/sb51/internal/demodb.TitleOrValueType"`
+		Name  string `vdl:"v.io/x/ref/cmd/sb51/internal/demodb.TitleOrValueType"`
 		Type  TitleOrValueType
 		Union struct {
 			Title TitleOrValueTypeTitle
@@ -316,14 +316,14 @@
 }
 
 func (BazType) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/syncbase/sb51/internal/demodb.BazType"`
+	Name string `vdl:"v.io/x/ref/cmd/sb51/internal/demodb.BazType"`
 }) {
 }
 
 type Array2String [2]string
 
 func (Array2String) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/syncbase/sb51/internal/demodb.Array2String"`
+	Name string `vdl:"v.io/x/ref/cmd/sb51/internal/demodb.Array2String"`
 }) {
 }
 
@@ -335,7 +335,7 @@
 }
 
 func (Composite) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/syncbase/sb51/internal/demodb.Composite"`
+	Name string `vdl:"v.io/x/ref/cmd/sb51/internal/demodb.Composite"`
 }) {
 }
 
@@ -345,7 +345,7 @@
 }
 
 func (Times) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/syncbase/sb51/internal/demodb.Times"`
+	Name string `vdl:"v.io/x/ref/cmd/sb51/internal/demodb.Times"`
 }) {
 }
 
@@ -356,7 +356,7 @@
 }
 
 func (Recursive) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/syncbase/sb51/internal/demodb.Recursive"`
+	Name string `vdl:"v.io/x/ref/cmd/sb51/internal/demodb.Recursive"`
 }) {
 }
 
diff --git a/services/syncbase/clock/types.vdl.go b/services/syncbase/clock/types.vdl.go
index 4749d42..1478e09 100644
--- a/services/syncbase/clock/types.vdl.go
+++ b/services/syncbase/clock/types.vdl.go
@@ -26,7 +26,7 @@
 }
 
 func (ClockData) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/services/syncbase/clock.ClockData"`
+	Name string `vdl:"v.io/x/ref/services/syncbase/clock.ClockData"`
 }) {
 }
 
diff --git a/services/syncbase/server/interfaces/sync.vdl.go b/services/syncbase/server/interfaces/sync.vdl.go
index 9cd1383..4ec1eea 100644
--- a/services/syncbase/server/interfaces/sync.vdl.go
+++ b/services/syncbase/server/interfaces/sync.vdl.go
@@ -627,7 +627,7 @@
 // descSync hides the desc to keep godoc clean.
 var descSync = rpc.InterfaceDesc{
 	Name:    "Sync",
-	PkgPath: "v.io/syncbase/x/ref/services/syncbase/server/interfaces",
+	PkgPath: "v.io/x/ref/services/syncbase/server/interfaces",
 	Doc:     "// Sync defines methods for data exchange between Syncbases.\n// TODO(hpucha): Flesh this out further.",
 	Methods: []rpc.MethodDesc{
 		{
diff --git a/services/syncbase/server/interfaces/sync_types.vdl.go b/services/syncbase/server/interfaces/sync_types.vdl.go
index 8ef80a8..7d43af8 100644
--- a/services/syncbase/server/interfaces/sync_types.vdl.go
+++ b/services/syncbase/server/interfaces/sync_types.vdl.go
@@ -23,7 +23,7 @@
 type PrefixGenVector map[uint64]uint64
 
 func (PrefixGenVector) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/services/syncbase/server/interfaces.PrefixGenVector"`
+	Name string `vdl:"v.io/x/ref/services/syncbase/server/interfaces.PrefixGenVector"`
 }) {
 }
 
@@ -33,7 +33,7 @@
 type GenVector map[string]PrefixGenVector
 
 func (GenVector) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/services/syncbase/server/interfaces.GenVector"`
+	Name string `vdl:"v.io/x/ref/services/syncbase/server/interfaces.GenVector"`
 }) {
 }
 
@@ -61,7 +61,7 @@
 }
 
 func (LogRecMetadata) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/services/syncbase/server/interfaces.LogRecMetadata"`
+	Name string `vdl:"v.io/x/ref/services/syncbase/server/interfaces.LogRecMetadata"`
 }) {
 }
 
@@ -73,7 +73,7 @@
 }
 
 func (LogRec) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/services/syncbase/server/interfaces.LogRec"`
+	Name string `vdl:"v.io/x/ref/services/syncbase/server/interfaces.LogRec"`
 }) {
 }
 
@@ -81,7 +81,7 @@
 type GroupId uint64
 
 func (GroupId) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/services/syncbase/server/interfaces.GroupId"`
+	Name string `vdl:"v.io/x/ref/services/syncbase/server/interfaces.GroupId"`
 }) {
 }
 
@@ -134,7 +134,7 @@
 }
 
 func (SyncGroupStatus) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/services/syncbase/server/interfaces.SyncGroupStatus"`
+	Name string `vdl:"v.io/x/ref/services/syncbase/server/interfaces.SyncGroupStatus"`
 	Enum struct{ PublishPending, PublishRejected, Running string }
 }) {
 }
@@ -153,7 +153,7 @@
 }
 
 func (SyncGroup) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/services/syncbase/server/interfaces.SyncGroup"`
+	Name string `vdl:"v.io/x/ref/services/syncbase/server/interfaces.SyncGroup"`
 }) {
 }
 
@@ -168,7 +168,7 @@
 }
 
 func (DeltaReq) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/services/syncbase/server/interfaces.DeltaReq"`
+	Name string `vdl:"v.io/x/ref/services/syncbase/server/interfaces.DeltaReq"`
 }) {
 }
 
@@ -197,7 +197,7 @@
 	DeltaRespRespVec struct{ Value GenVector }
 	// __DeltaRespReflect describes the DeltaResp union type.
 	__DeltaRespReflect struct {
-		Name  string `vdl:"v.io/syncbase/x/ref/services/syncbase/server/interfaces.DeltaResp"`
+		Name  string `vdl:"v.io/x/ref/services/syncbase/server/interfaces.DeltaResp"`
 		Type  DeltaResp
 		Union struct {
 			Start   DeltaRespStart
@@ -234,7 +234,7 @@
 }
 
 func (ChunkHash) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/services/syncbase/server/interfaces.ChunkHash"`
+	Name string `vdl:"v.io/x/ref/services/syncbase/server/interfaces.ChunkHash"`
 }) {
 }
 
@@ -244,7 +244,7 @@
 }
 
 func (ChunkData) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/services/syncbase/server/interfaces.ChunkData"`
+	Name string `vdl:"v.io/x/ref/services/syncbase/server/interfaces.ChunkData"`
 }) {
 }
 
diff --git a/services/syncbase/server/nosql/types.vdl.go b/services/syncbase/server/nosql/types.vdl.go
index bf5f346..00791d0 100644
--- a/services/syncbase/server/nosql/types.vdl.go
+++ b/services/syncbase/server/nosql/types.vdl.go
@@ -25,7 +25,7 @@
 }
 
 func (databaseData) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/services/syncbase/server/nosql.databaseData"`
+	Name string `vdl:"v.io/x/ref/services/syncbase/server/nosql.databaseData"`
 }) {
 }
 
@@ -37,7 +37,7 @@
 }
 
 func (tableData) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/services/syncbase/server/nosql.tableData"`
+	Name string `vdl:"v.io/x/ref/services/syncbase/server/nosql.tableData"`
 }) {
 }
 
@@ -56,7 +56,7 @@
 }
 
 func (stPrefixPerms) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/services/syncbase/server/nosql.stPrefixPerms"`
+	Name string `vdl:"v.io/x/ref/services/syncbase/server/nosql.stPrefixPerms"`
 }) {
 }
 
diff --git a/services/syncbase/server/types.vdl.go b/services/syncbase/server/types.vdl.go
index aec38cd..7b97b01 100644
--- a/services/syncbase/server/types.vdl.go
+++ b/services/syncbase/server/types.vdl.go
@@ -22,7 +22,7 @@
 }
 
 func (serviceData) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/services/syncbase/server.serviceData"`
+	Name string `vdl:"v.io/x/ref/services/syncbase/server.serviceData"`
 }) {
 }
 
@@ -34,7 +34,7 @@
 }
 
 func (appData) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/services/syncbase/server.appData"`
+	Name string `vdl:"v.io/x/ref/services/syncbase/server.appData"`
 }) {
 }
 
@@ -51,7 +51,7 @@
 }
 
 func (dbInfo) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/services/syncbase/server.dbInfo"`
+	Name string `vdl:"v.io/x/ref/services/syncbase/server.dbInfo"`
 }) {
 }
 
diff --git a/services/syncbase/server/watchable/types.vdl.go b/services/syncbase/server/watchable/types.vdl.go
index 5fd2e04..71c4b90 100644
--- a/services/syncbase/server/watchable/types.vdl.go
+++ b/services/syncbase/server/watchable/types.vdl.go
@@ -18,7 +18,7 @@
 }
 
 func (GetOp) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/services/syncbase/server/watchable.GetOp"`
+	Name string `vdl:"v.io/x/ref/services/syncbase/server/watchable.GetOp"`
 }) {
 }
 
@@ -29,7 +29,7 @@
 }
 
 func (ScanOp) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/services/syncbase/server/watchable.ScanOp"`
+	Name string `vdl:"v.io/x/ref/services/syncbase/server/watchable.ScanOp"`
 }) {
 }
 
@@ -42,7 +42,7 @@
 }
 
 func (PutOp) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/services/syncbase/server/watchable.PutOp"`
+	Name string `vdl:"v.io/x/ref/services/syncbase/server/watchable.PutOp"`
 }) {
 }
 
@@ -52,7 +52,7 @@
 }
 
 func (DeleteOp) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/services/syncbase/server/watchable.DeleteOp"`
+	Name string `vdl:"v.io/x/ref/services/syncbase/server/watchable.DeleteOp"`
 }) {
 }
 
@@ -65,7 +65,7 @@
 }
 
 func (SyncGroupOp) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/services/syncbase/server/watchable.SyncGroupOp"`
+	Name string `vdl:"v.io/x/ref/services/syncbase/server/watchable.SyncGroupOp"`
 }) {
 }
 
@@ -82,7 +82,7 @@
 }
 
 func (SyncSnapshotOp) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/services/syncbase/server/watchable.SyncSnapshotOp"`
+	Name string `vdl:"v.io/x/ref/services/syncbase/server/watchable.SyncSnapshotOp"`
 }) {
 }
 
@@ -114,7 +114,7 @@
 	OpSyncSnapshot struct{ Value SyncSnapshotOp }
 	// __OpReflect describes the Op union type.
 	__OpReflect struct {
-		Name  string `vdl:"v.io/syncbase/x/ref/services/syncbase/server/watchable.Op"`
+		Name  string `vdl:"v.io/x/ref/services/syncbase/server/watchable.Op"`
 		Type  Op
 		Union struct {
 			Get          OpGet
@@ -173,7 +173,7 @@
 }
 
 func (LogEntry) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/services/syncbase/server/watchable.LogEntry"`
+	Name string `vdl:"v.io/x/ref/services/syncbase/server/watchable.LogEntry"`
 }) {
 }
 
diff --git a/services/syncbase/signing/signeddata.vdl.go b/services/syncbase/signing/signeddata.vdl.go
index f96fe50..b8e0ba3 100644
--- a/services/syncbase/signing/signeddata.vdl.go
+++ b/services/syncbase/signing/signeddata.vdl.go
@@ -56,7 +56,7 @@
 }
 
 func (DataWithSignature) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/services/syncbase/signing.DataWithSignature"`
+	Name string `vdl:"v.io/x/ref/services/syncbase/signing.DataWithSignature"`
 }) {
 }
 
@@ -90,7 +90,7 @@
 	ItemHash struct{ Value []byte } // Hash of what would have been in Data, as returned by SumByteVectorWithLength(Data).
 	// __ItemReflect describes the Item union type.
 	__ItemReflect struct {
-		Name  string `vdl:"v.io/syncbase/x/ref/services/syncbase/signing.Item"`
+		Name  string `vdl:"v.io/x/ref/services/syncbase/signing.Item"`
 		Type  Item
 		Union struct {
 			Data ItemData
@@ -117,7 +117,7 @@
 }
 
 func (WireValidatorData) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/services/syncbase/signing.WireValidatorData"`
+	Name string `vdl:"v.io/x/ref/services/syncbase/signing.WireValidatorData"`
 }) {
 }
 
diff --git a/services/syncbase/store/model.vdl.go b/services/syncbase/store/model.vdl.go
index eec8747..cf70aa3 100644
--- a/services/syncbase/store/model.vdl.go
+++ b/services/syncbase/store/model.vdl.go
@@ -17,9 +17,9 @@
 var (
 	// ConcurrentTransaction means that the current transaction failed to commit
 	// because its read set was invalidated by some other transaction.
-	ErrConcurrentTransaction = verror.Register("v.io/syncbase/x/ref/services/syncbase/store.ConcurrentTransaction", verror.NoRetry, "{1:}{2:} Concurrent transaction{:_}")
+	ErrConcurrentTransaction = verror.Register("v.io/x/ref/services/syncbase/store.ConcurrentTransaction", verror.NoRetry, "{1:}{2:} Concurrent transaction{:_}")
 	// UnknownKey means the given key does not exist in the store.
-	ErrUnknownKey = verror.Register("v.io/syncbase/x/ref/services/syncbase/store.UnknownKey", verror.NoRetry, "{1:}{2:} Unknown key{:_}")
+	ErrUnknownKey = verror.Register("v.io/x/ref/services/syncbase/store.UnknownKey", verror.NoRetry, "{1:}{2:} Unknown key{:_}")
 )
 
 func init() {
diff --git a/services/syncbase/vsync/types.vdl.go b/services/syncbase/vsync/types.vdl.go
index e9b1d7d..f875149 100644
--- a/services/syncbase/vsync/types.vdl.go
+++ b/services/syncbase/vsync/types.vdl.go
@@ -21,7 +21,7 @@
 }
 
 func (syncData) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/services/syncbase/vsync.syncData"`
+	Name string `vdl:"v.io/x/ref/services/syncbase/vsync.syncData"`
 }) {
 }
 
@@ -33,7 +33,7 @@
 }
 
 func (dbSyncState) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/services/syncbase/vsync.dbSyncState"`
+	Name string `vdl:"v.io/x/ref/services/syncbase/vsync.dbSyncState"`
 }) {
 }
 
@@ -45,7 +45,7 @@
 }
 
 func (localLogRec) __VDLReflect(struct {
-	Name string `vdl:"v.io/syncbase/x/ref/services/syncbase/vsync.localLogRec"`
+	Name string `vdl:"v.io/x/ref/services/syncbase/vsync.localLogRec"`
 }) {
 }