From 69b0cf53ad81c9d27da58b236564fd7744b97ea9 Mon Sep 17 00:00:00 2001
From: Ross Light <light@google.com>
Date: Mon, 2 Jul 2018 11:50:01 -0700
Subject: [PATCH] all: move back to github.com/google/go-cloud
 (google/go-cloud#162)

Reverts changes made in google/go-cloud#120 for google/go-cloud#117
---
 README.md                                                 | 8 ++++----
 cmd/gowire/main.go                                        | 4 ++--
 internal/wire/parse.go                                    | 2 +-
 internal/wire/testdata/Chain/foo/foo.go                   | 2 +-
 internal/wire/testdata/Chain/foo/wire.go                  | 2 +-
 internal/wire/testdata/Cleanup/foo/wire.go                | 2 +-
 internal/wire/testdata/CopyOtherDecls/foo/foo.go          | 2 +-
 internal/wire/testdata/Cycle/foo/wire.go                  | 2 +-
 internal/wire/testdata/EmptyVar/foo/wire.go               | 2 +-
 internal/wire/testdata/ExportedValue/bar/bar.go           | 2 +-
 internal/wire/testdata/ExportedValue/foo/wire.go          | 2 +-
 .../testdata/ExportedValueDifferentPackage/bar/bar.go     | 2 +-
 .../testdata/ExportedValueDifferentPackage/foo/wire.go    | 2 +-
 .../wire/testdata/ImportedInterfaceBinding/bar/bar.go     | 2 +-
 .../wire/testdata/ImportedInterfaceBinding/bar/wire.go    | 2 +-
 internal/wire/testdata/InjectInput/foo/foo.go             | 2 +-
 internal/wire/testdata/InjectInput/foo/wire.go            | 2 +-
 internal/wire/testdata/InjectInputConflict/foo/foo.go     | 2 +-
 internal/wire/testdata/InjectInputConflict/foo/wire.go    | 2 +-
 internal/wire/testdata/InjectWithReturn/foo/wire.go       | 2 +-
 internal/wire/testdata/InterfaceBinding/foo/foo.go        | 2 +-
 internal/wire/testdata/InterfaceBinding/foo/wire.go       | 2 +-
 internal/wire/testdata/InterfaceBindingReuse/foo/wire.go  | 2 +-
 internal/wire/testdata/NamingWorstCase/foo/wire.go        | 2 +-
 internal/wire/testdata/NamingWorstCaseAllInOne/foo/foo.go | 2 +-
 internal/wire/testdata/NiladicIdentity/foo/wire.go        | 2 +-
 internal/wire/testdata/NiladicValue/foo/wire.go           | 2 +-
 internal/wire/testdata/NoImplicitInterface/foo/wire.go    | 2 +-
 internal/wire/testdata/NoInjectParamNames/foo/wire.go     | 2 +-
 internal/wire/testdata/PartialCleanup/foo/wire.go         | 2 +-
 internal/wire/testdata/PkgImport/foo/foo.go               | 2 +-
 internal/wire/testdata/PkgImport/foo/wire.go              | 2 +-
 internal/wire/testdata/ReturnError/foo/foo.go             | 2 +-
 internal/wire/testdata/ReturnError/foo/wire.go            | 2 +-
 internal/wire/testdata/Struct/foo/foo.go                  | 2 +-
 internal/wire/testdata/Struct/foo/wire.go                 | 2 +-
 internal/wire/testdata/StructPointer/foo/foo.go           | 2 +-
 internal/wire/testdata/StructPointer/foo/wire.go          | 2 +-
 internal/wire/testdata/TwoDeps/foo/foo.go                 | 2 +-
 internal/wire/testdata/TwoDeps/foo/wire.go                | 2 +-
 internal/wire/testdata/UnexportedValue/bar/bar.go         | 2 +-
 internal/wire/testdata/UnexportedValue/foo/wire.go        | 2 +-
 internal/wire/testdata/ValueChain/foo/foo.go              | 2 +-
 internal/wire/testdata/ValueChain/foo/wire.go             | 2 +-
 internal/wire/testdata/ValueConversion/foo/wire.go        | 2 +-
 internal/wire/testdata/VarValue/foo/wire.go               | 2 +-
 internal/wire/testdata/Vendor/foo/wire.go                 | 2 +-
 internal/wire/wire_test.go                                | 2 +-
 48 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/README.md b/README.md
index 9ddd723..eba55aa 100644
--- a/README.md
+++ b/README.md
@@ -11,10 +11,10 @@ initialization.
 
 ## Installing
 
-Install `gowire` by running the following inside the Go X Cloud repository:
+Install `gowire` by running the following inside the Go Cloud repository:
 
 ```shell
-vgo install github.com/google/go-x-cloud/wire/cmd/gowire
+vgo install github.com/google/go-cloud/wire/cmd/gowire
 ```
 
 ## Basics
@@ -93,7 +93,7 @@ package foobarbaz
 
 import (
 	// ...
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 // ...
@@ -138,7 +138,7 @@ package main
 import (
 	"context"
 
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 	"example.com/foobarbaz"
 )
 
diff --git a/cmd/gowire/main.go b/cmd/gowire/main.go
index 775ecd8..ce99fe2 100644
--- a/cmd/gowire/main.go
+++ b/cmd/gowire/main.go
@@ -14,7 +14,7 @@
 
 // gowire is a compile-time dependency injection tool.
 //
-// For an overview, see https://github.com/google/go-x-cloud/blob/master/wire/README.md
+// For an overview, see https://github.com/google/go-cloud/blob/master/wire/README.md
 package main
 
 import (
@@ -31,7 +31,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/google/go-x-cloud/wire/internal/wire"
+	"github.com/google/go-cloud/wire/internal/wire"
 	"golang.org/x/tools/go/types/typeutil"
 )
 
diff --git a/internal/wire/parse.go b/internal/wire/parse.go
index e77ba3c..91144d7 100644
--- a/internal/wire/parse.go
+++ b/internal/wire/parse.go
@@ -653,7 +653,7 @@ func isWireImport(path string) bool {
 	if i := strings.LastIndex(path, vendorPart); i != -1 && (i == 0 || path[i-1] == '/') {
 		path = path[i+len(vendorPart):]
 	}
-	return path == "github.com/google/go-x-cloud/wire"
+	return path == "github.com/google/go-cloud/wire"
 }
 
 // ProviderOrValue is a pointer to a Provider or a Value. The zero value is
diff --git a/internal/wire/testdata/Chain/foo/foo.go b/internal/wire/testdata/Chain/foo/foo.go
index 362863f..1f7046c 100644
--- a/internal/wire/testdata/Chain/foo/foo.go
+++ b/internal/wire/testdata/Chain/foo/foo.go
@@ -17,7 +17,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func main() {
diff --git a/internal/wire/testdata/Chain/foo/wire.go b/internal/wire/testdata/Chain/foo/wire.go
index 44683a8..55ba464 100644
--- a/internal/wire/testdata/Chain/foo/wire.go
+++ b/internal/wire/testdata/Chain/foo/wire.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectFooBar() FooBar {
diff --git a/internal/wire/testdata/Cleanup/foo/wire.go b/internal/wire/testdata/Cleanup/foo/wire.go
index 8f1133f..281a4d6 100644
--- a/internal/wire/testdata/Cleanup/foo/wire.go
+++ b/internal/wire/testdata/Cleanup/foo/wire.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectBar() (*Bar, func()) {
diff --git a/internal/wire/testdata/CopyOtherDecls/foo/foo.go b/internal/wire/testdata/CopyOtherDecls/foo/foo.go
index f5f5540..fc33212 100644
--- a/internal/wire/testdata/CopyOtherDecls/foo/foo.go
+++ b/internal/wire/testdata/CopyOtherDecls/foo/foo.go
@@ -22,7 +22,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func main() {
diff --git a/internal/wire/testdata/Cycle/foo/wire.go b/internal/wire/testdata/Cycle/foo/wire.go
index 60f0ac2..9aff17e 100644
--- a/internal/wire/testdata/Cycle/foo/wire.go
+++ b/internal/wire/testdata/Cycle/foo/wire.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectedBaz() Baz {
diff --git a/internal/wire/testdata/EmptyVar/foo/wire.go b/internal/wire/testdata/EmptyVar/foo/wire.go
index 68a3838..694633f 100644
--- a/internal/wire/testdata/EmptyVar/foo/wire.go
+++ b/internal/wire/testdata/EmptyVar/foo/wire.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectedMessage() string {
diff --git a/internal/wire/testdata/ExportedValue/bar/bar.go b/internal/wire/testdata/ExportedValue/bar/bar.go
index e6fa1b1..f076440 100644
--- a/internal/wire/testdata/ExportedValue/bar/bar.go
+++ b/internal/wire/testdata/ExportedValue/bar/bar.go
@@ -14,7 +14,7 @@
 
 package bar
 
-import "github.com/google/go-x-cloud/wire"
+import "github.com/google/go-cloud/wire"
 
 var Value = wire.Value(PublicMsg)
 
diff --git a/internal/wire/testdata/ExportedValue/foo/wire.go b/internal/wire/testdata/ExportedValue/foo/wire.go
index 8222627..f31b925 100644
--- a/internal/wire/testdata/ExportedValue/foo/wire.go
+++ b/internal/wire/testdata/ExportedValue/foo/wire.go
@@ -18,7 +18,7 @@ package main
 
 import (
 	"bar"
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectedMessage() string {
diff --git a/internal/wire/testdata/ExportedValueDifferentPackage/bar/bar.go b/internal/wire/testdata/ExportedValueDifferentPackage/bar/bar.go
index 40483c9..634e6ca 100644
--- a/internal/wire/testdata/ExportedValueDifferentPackage/bar/bar.go
+++ b/internal/wire/testdata/ExportedValueDifferentPackage/bar/bar.go
@@ -17,7 +17,7 @@ package bar
 import (
 	"os"
 
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 var Value = wire.Value(os.Stdout)
diff --git a/internal/wire/testdata/ExportedValueDifferentPackage/foo/wire.go b/internal/wire/testdata/ExportedValueDifferentPackage/foo/wire.go
index bde15e9..f9c12a1 100644
--- a/internal/wire/testdata/ExportedValueDifferentPackage/foo/wire.go
+++ b/internal/wire/testdata/ExportedValueDifferentPackage/foo/wire.go
@@ -20,7 +20,7 @@ import (
 	"os"
 
 	"bar"
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectedFile() *os.File {
diff --git a/internal/wire/testdata/ImportedInterfaceBinding/bar/bar.go b/internal/wire/testdata/ImportedInterfaceBinding/bar/bar.go
index 0c35543..4a053fc 100644
--- a/internal/wire/testdata/ImportedInterfaceBinding/bar/bar.go
+++ b/internal/wire/testdata/ImportedInterfaceBinding/bar/bar.go
@@ -18,7 +18,7 @@ import (
 	"fmt"
 
 	"foo"
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func main() {
diff --git a/internal/wire/testdata/ImportedInterfaceBinding/bar/wire.go b/internal/wire/testdata/ImportedInterfaceBinding/bar/wire.go
index 7441e1d..4bfcf4f 100644
--- a/internal/wire/testdata/ImportedInterfaceBinding/bar/wire.go
+++ b/internal/wire/testdata/ImportedInterfaceBinding/bar/wire.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 	"foo"
 )
 
diff --git a/internal/wire/testdata/InjectInput/foo/foo.go b/internal/wire/testdata/InjectInput/foo/foo.go
index 505cd6d..1496409 100644
--- a/internal/wire/testdata/InjectInput/foo/foo.go
+++ b/internal/wire/testdata/InjectInput/foo/foo.go
@@ -17,7 +17,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func main() {
diff --git a/internal/wire/testdata/InjectInput/foo/wire.go b/internal/wire/testdata/InjectInput/foo/wire.go
index d7044b0..32def6e 100644
--- a/internal/wire/testdata/InjectInput/foo/wire.go
+++ b/internal/wire/testdata/InjectInput/foo/wire.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectFooBar(foo Foo) FooBar {
diff --git a/internal/wire/testdata/InjectInputConflict/foo/foo.go b/internal/wire/testdata/InjectInputConflict/foo/foo.go
index f659b3d..a79cafb 100644
--- a/internal/wire/testdata/InjectInputConflict/foo/foo.go
+++ b/internal/wire/testdata/InjectInputConflict/foo/foo.go
@@ -17,7 +17,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func main() {
diff --git a/internal/wire/testdata/InjectInputConflict/foo/wire.go b/internal/wire/testdata/InjectInputConflict/foo/wire.go
index 8bb403d..f316ce1 100644
--- a/internal/wire/testdata/InjectInputConflict/foo/wire.go
+++ b/internal/wire/testdata/InjectInputConflict/foo/wire.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectBar(foo Foo) Bar {
diff --git a/internal/wire/testdata/InjectWithReturn/foo/wire.go b/internal/wire/testdata/InjectWithReturn/foo/wire.go
index 51ec814..fcaecc3 100644
--- a/internal/wire/testdata/InjectWithReturn/foo/wire.go
+++ b/internal/wire/testdata/InjectWithReturn/foo/wire.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectedMessage() string {
diff --git a/internal/wire/testdata/InterfaceBinding/foo/foo.go b/internal/wire/testdata/InterfaceBinding/foo/foo.go
index b8696ad..475e8ce 100644
--- a/internal/wire/testdata/InterfaceBinding/foo/foo.go
+++ b/internal/wire/testdata/InterfaceBinding/foo/foo.go
@@ -17,7 +17,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func main() {
diff --git a/internal/wire/testdata/InterfaceBinding/foo/wire.go b/internal/wire/testdata/InterfaceBinding/foo/wire.go
index 0e109b6..6aa286a 100644
--- a/internal/wire/testdata/InterfaceBinding/foo/wire.go
+++ b/internal/wire/testdata/InterfaceBinding/foo/wire.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectFooer() Fooer {
diff --git a/internal/wire/testdata/InterfaceBindingReuse/foo/wire.go b/internal/wire/testdata/InterfaceBindingReuse/foo/wire.go
index b97809e..e0a6143 100644
--- a/internal/wire/testdata/InterfaceBindingReuse/foo/wire.go
+++ b/internal/wire/testdata/InterfaceBindingReuse/foo/wire.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectFooBar() FooBar {
diff --git a/internal/wire/testdata/NamingWorstCase/foo/wire.go b/internal/wire/testdata/NamingWorstCase/foo/wire.go
index d89cc4a..f27f646 100644
--- a/internal/wire/testdata/NamingWorstCase/foo/wire.go
+++ b/internal/wire/testdata/NamingWorstCase/foo/wire.go
@@ -19,7 +19,7 @@ package main
 import (
 	stdcontext "context"
 
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func inject(context stdcontext.Context, err struct{}) (context, error) {
diff --git a/internal/wire/testdata/NamingWorstCaseAllInOne/foo/foo.go b/internal/wire/testdata/NamingWorstCaseAllInOne/foo/foo.go
index ba86561..0b01abe 100644
--- a/internal/wire/testdata/NamingWorstCaseAllInOne/foo/foo.go
+++ b/internal/wire/testdata/NamingWorstCaseAllInOne/foo/foo.go
@@ -25,7 +25,7 @@ import (
 	"os"
 	"reflect"
 
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 type context struct{}
diff --git a/internal/wire/testdata/NiladicIdentity/foo/wire.go b/internal/wire/testdata/NiladicIdentity/foo/wire.go
index 91e29cd..7c1e5a8 100644
--- a/internal/wire/testdata/NiladicIdentity/foo/wire.go
+++ b/internal/wire/testdata/NiladicIdentity/foo/wire.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectedMessage() string {
diff --git a/internal/wire/testdata/NiladicValue/foo/wire.go b/internal/wire/testdata/NiladicValue/foo/wire.go
index 8f097c6..d8165ee 100644
--- a/internal/wire/testdata/NiladicValue/foo/wire.go
+++ b/internal/wire/testdata/NiladicValue/foo/wire.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectedMessage() string {
diff --git a/internal/wire/testdata/NoImplicitInterface/foo/wire.go b/internal/wire/testdata/NoImplicitInterface/foo/wire.go
index 8459fa2..b73bf41 100644
--- a/internal/wire/testdata/NoImplicitInterface/foo/wire.go
+++ b/internal/wire/testdata/NoImplicitInterface/foo/wire.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectFooer() Fooer {
diff --git a/internal/wire/testdata/NoInjectParamNames/foo/wire.go b/internal/wire/testdata/NoInjectParamNames/foo/wire.go
index 537f412..354a705 100644
--- a/internal/wire/testdata/NoInjectParamNames/foo/wire.go
+++ b/internal/wire/testdata/NoInjectParamNames/foo/wire.go
@@ -19,7 +19,7 @@ package main
 import (
 	stdcontext "context"
 
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 // The notable characteristic of this test is that there are no
diff --git a/internal/wire/testdata/PartialCleanup/foo/wire.go b/internal/wire/testdata/PartialCleanup/foo/wire.go
index 944da58..62dd47a 100644
--- a/internal/wire/testdata/PartialCleanup/foo/wire.go
+++ b/internal/wire/testdata/PartialCleanup/foo/wire.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectBaz() (Baz, func(), error) {
diff --git a/internal/wire/testdata/PkgImport/foo/foo.go b/internal/wire/testdata/PkgImport/foo/foo.go
index 8834212..f5881a4 100644
--- a/internal/wire/testdata/PkgImport/foo/foo.go
+++ b/internal/wire/testdata/PkgImport/foo/foo.go
@@ -18,7 +18,7 @@ import (
 	"fmt"
 
 	"bar"
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func main() {
diff --git a/internal/wire/testdata/PkgImport/foo/wire.go b/internal/wire/testdata/PkgImport/foo/wire.go
index 44683a8..55ba464 100644
--- a/internal/wire/testdata/PkgImport/foo/wire.go
+++ b/internal/wire/testdata/PkgImport/foo/wire.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectFooBar() FooBar {
diff --git a/internal/wire/testdata/ReturnError/foo/foo.go b/internal/wire/testdata/ReturnError/foo/foo.go
index c02a975..d846923 100644
--- a/internal/wire/testdata/ReturnError/foo/foo.go
+++ b/internal/wire/testdata/ReturnError/foo/foo.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func main() {
diff --git a/internal/wire/testdata/ReturnError/foo/wire.go b/internal/wire/testdata/ReturnError/foo/wire.go
index 3caf8cc..b181e34 100644
--- a/internal/wire/testdata/ReturnError/foo/wire.go
+++ b/internal/wire/testdata/ReturnError/foo/wire.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectFoo() (Foo, error) {
diff --git a/internal/wire/testdata/Struct/foo/foo.go b/internal/wire/testdata/Struct/foo/foo.go
index 5318909..343ad37 100644
--- a/internal/wire/testdata/Struct/foo/foo.go
+++ b/internal/wire/testdata/Struct/foo/foo.go
@@ -17,7 +17,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func main() {
diff --git a/internal/wire/testdata/Struct/foo/wire.go b/internal/wire/testdata/Struct/foo/wire.go
index 44683a8..55ba464 100644
--- a/internal/wire/testdata/Struct/foo/wire.go
+++ b/internal/wire/testdata/Struct/foo/wire.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectFooBar() FooBar {
diff --git a/internal/wire/testdata/StructPointer/foo/foo.go b/internal/wire/testdata/StructPointer/foo/foo.go
index 5318909..343ad37 100644
--- a/internal/wire/testdata/StructPointer/foo/foo.go
+++ b/internal/wire/testdata/StructPointer/foo/foo.go
@@ -17,7 +17,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func main() {
diff --git a/internal/wire/testdata/StructPointer/foo/wire.go b/internal/wire/testdata/StructPointer/foo/wire.go
index e6951db..6cf4d85 100644
--- a/internal/wire/testdata/StructPointer/foo/wire.go
+++ b/internal/wire/testdata/StructPointer/foo/wire.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectFooBar() *FooBar {
diff --git a/internal/wire/testdata/TwoDeps/foo/foo.go b/internal/wire/testdata/TwoDeps/foo/foo.go
index 49896e8..1b1bea6 100644
--- a/internal/wire/testdata/TwoDeps/foo/foo.go
+++ b/internal/wire/testdata/TwoDeps/foo/foo.go
@@ -17,7 +17,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func main() {
diff --git a/internal/wire/testdata/TwoDeps/foo/wire.go b/internal/wire/testdata/TwoDeps/foo/wire.go
index 44683a8..55ba464 100644
--- a/internal/wire/testdata/TwoDeps/foo/wire.go
+++ b/internal/wire/testdata/TwoDeps/foo/wire.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectFooBar() FooBar {
diff --git a/internal/wire/testdata/UnexportedValue/bar/bar.go b/internal/wire/testdata/UnexportedValue/bar/bar.go
index be00562..112df61 100644
--- a/internal/wire/testdata/UnexportedValue/bar/bar.go
+++ b/internal/wire/testdata/UnexportedValue/bar/bar.go
@@ -14,7 +14,7 @@
 
 package bar
 
-import "github.com/google/go-x-cloud/wire"
+import "github.com/google/go-cloud/wire"
 
 var Value = wire.Value(privateMsg)
 
diff --git a/internal/wire/testdata/UnexportedValue/foo/wire.go b/internal/wire/testdata/UnexportedValue/foo/wire.go
index 8222627..f31b925 100644
--- a/internal/wire/testdata/UnexportedValue/foo/wire.go
+++ b/internal/wire/testdata/UnexportedValue/foo/wire.go
@@ -18,7 +18,7 @@ package main
 
 import (
 	"bar"
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectedMessage() string {
diff --git a/internal/wire/testdata/ValueChain/foo/foo.go b/internal/wire/testdata/ValueChain/foo/foo.go
index 28df9a8..7442bba 100644
--- a/internal/wire/testdata/ValueChain/foo/foo.go
+++ b/internal/wire/testdata/ValueChain/foo/foo.go
@@ -17,7 +17,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func main() {
diff --git a/internal/wire/testdata/ValueChain/foo/wire.go b/internal/wire/testdata/ValueChain/foo/wire.go
index 44683a8..55ba464 100644
--- a/internal/wire/testdata/ValueChain/foo/wire.go
+++ b/internal/wire/testdata/ValueChain/foo/wire.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectFooBar() FooBar {
diff --git a/internal/wire/testdata/ValueConversion/foo/wire.go b/internal/wire/testdata/ValueConversion/foo/wire.go
index a3bff4f..9178b74 100644
--- a/internal/wire/testdata/ValueConversion/foo/wire.go
+++ b/internal/wire/testdata/ValueConversion/foo/wire.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectedMessage() Foo {
diff --git a/internal/wire/testdata/VarValue/foo/wire.go b/internal/wire/testdata/VarValue/foo/wire.go
index 2fa8b9f..e8e749b 100644
--- a/internal/wire/testdata/VarValue/foo/wire.go
+++ b/internal/wire/testdata/VarValue/foo/wire.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectedMessage() string {
diff --git a/internal/wire/testdata/Vendor/foo/wire.go b/internal/wire/testdata/Vendor/foo/wire.go
index 72d9bad..2389188 100644
--- a/internal/wire/testdata/Vendor/foo/wire.go
+++ b/internal/wire/testdata/Vendor/foo/wire.go
@@ -18,7 +18,7 @@ package main
 
 import (
 	"bar"
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectedMessage() string {
diff --git a/internal/wire/wire_test.go b/internal/wire/wire_test.go
index 9019a5a..ff41144 100644
--- a/internal/wire/wire_test.go
+++ b/internal/wire/wire_test.go
@@ -309,7 +309,7 @@ func loadTestCase(root string, wireGoSrc []byte) (*testCase, error) {
 		out = nil
 	}
 	goFiles := map[string][]byte{
-		"github.com/google/go-x-cloud/wire/wire.go": wireGoSrc,
+		"github.com/google/go-cloud/wire/wire.go": wireGoSrc,
 	}
 	err = filepath.Walk(root, func(src string, info os.FileInfo, err error) error {
 		if err != nil {