diff --git a/acceptance/rackspace/orchestration/v1/buildinfo_test.go b/acceptance/rackspace/orchestration/v1/buildinfo_test.go
index 42cc048..81e19ea 100644
--- a/acceptance/rackspace/orchestration/v1/buildinfo_test.go
+++ b/acceptance/rackspace/orchestration/v1/buildinfo_test.go
@@ -5,8 +5,8 @@
 import (
 	"testing"
 
-	"github.com/rackspace/gophercloud/rackspace/orchestration/v1/buildinfo"
-	th "github.com/rackspace/gophercloud/testhelper"
+	"github.com/gophercloud/gophercloud/rackspace/orchestration/v1/buildinfo"
+	th "github.com/gophercloud/gophercloud/testhelper"
 )
 
 func TestBuildInfo(t *testing.T) {
diff --git a/acceptance/rackspace/orchestration/v1/common.go b/acceptance/rackspace/orchestration/v1/common.go
index b9d5197..a8a8045 100644
--- a/acceptance/rackspace/orchestration/v1/common.go
+++ b/acceptance/rackspace/orchestration/v1/common.go
@@ -7,9 +7,9 @@
 	"os"
 	"testing"
 
-	"github.com/rackspace/gophercloud"
-	"github.com/rackspace/gophercloud/rackspace"
-	th "github.com/rackspace/gophercloud/testhelper"
+	"github.com/gophercloud/gophercloud"
+	"github.com/gophercloud/gophercloud/rackspace"
+	th "github.com/gophercloud/gophercloud/testhelper"
 )
 
 var template = fmt.Sprintf(`
diff --git a/acceptance/rackspace/orchestration/v1/stackevents_test.go b/acceptance/rackspace/orchestration/v1/stackevents_test.go
index 9e3fc08..b3e3bb9 100644
--- a/acceptance/rackspace/orchestration/v1/stackevents_test.go
+++ b/acceptance/rackspace/orchestration/v1/stackevents_test.go
@@ -5,13 +5,13 @@
 import (
 	"testing"
 
-	"github.com/rackspace/gophercloud"
-	osStackEvents "github.com/rackspace/gophercloud/openstack/orchestration/v1/stackevents"
-	osStacks "github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks"
-	"github.com/rackspace/gophercloud/pagination"
-	"github.com/rackspace/gophercloud/rackspace/orchestration/v1/stackevents"
-	"github.com/rackspace/gophercloud/rackspace/orchestration/v1/stacks"
-	th "github.com/rackspace/gophercloud/testhelper"
+	"github.com/gophercloud/gophercloud"
+	osStackEvents "github.com/gophercloud/gophercloud/openstack/orchestration/v1/stackevents"
+	osStacks "github.com/gophercloud/gophercloud/openstack/orchestration/v1/stacks"
+	"github.com/gophercloud/gophercloud/pagination"
+	"github.com/gophercloud/gophercloud/rackspace/orchestration/v1/stackevents"
+	"github.com/gophercloud/gophercloud/rackspace/orchestration/v1/stacks"
+	th "github.com/gophercloud/gophercloud/testhelper"
 )
 
 func TestStackEvents(t *testing.T) {
diff --git a/acceptance/rackspace/orchestration/v1/stackresources_test.go b/acceptance/rackspace/orchestration/v1/stackresources_test.go
index 65926e7..64c379c 100644
--- a/acceptance/rackspace/orchestration/v1/stackresources_test.go
+++ b/acceptance/rackspace/orchestration/v1/stackresources_test.go
@@ -5,13 +5,13 @@
 import (
 	"testing"
 
-	"github.com/rackspace/gophercloud"
-	osStackResources "github.com/rackspace/gophercloud/openstack/orchestration/v1/stackresources"
-	osStacks "github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks"
-	"github.com/rackspace/gophercloud/pagination"
-	"github.com/rackspace/gophercloud/rackspace/orchestration/v1/stackresources"
-	"github.com/rackspace/gophercloud/rackspace/orchestration/v1/stacks"
-	th "github.com/rackspace/gophercloud/testhelper"
+	"github.com/gophercloud/gophercloud"
+	osStackResources "github.com/gophercloud/gophercloud/openstack/orchestration/v1/stackresources"
+	osStacks "github.com/gophercloud/gophercloud/openstack/orchestration/v1/stacks"
+	"github.com/gophercloud/gophercloud/pagination"
+	"github.com/gophercloud/gophercloud/rackspace/orchestration/v1/stackresources"
+	"github.com/gophercloud/gophercloud/rackspace/orchestration/v1/stacks"
+	th "github.com/gophercloud/gophercloud/testhelper"
 )
 
 func TestStackResources(t *testing.T) {
diff --git a/acceptance/rackspace/orchestration/v1/stacks_test.go b/acceptance/rackspace/orchestration/v1/stacks_test.go
index 61969b5..57afb3a 100644
--- a/acceptance/rackspace/orchestration/v1/stacks_test.go
+++ b/acceptance/rackspace/orchestration/v1/stacks_test.go
@@ -5,11 +5,11 @@
 import (
 	"testing"
 
-	"github.com/rackspace/gophercloud"
-	osStacks "github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks"
-	"github.com/rackspace/gophercloud/pagination"
-	"github.com/rackspace/gophercloud/rackspace/orchestration/v1/stacks"
-	th "github.com/rackspace/gophercloud/testhelper"
+	"github.com/gophercloud/gophercloud"
+	osStacks "github.com/gophercloud/gophercloud/openstack/orchestration/v1/stacks"
+	"github.com/gophercloud/gophercloud/pagination"
+	"github.com/gophercloud/gophercloud/rackspace/orchestration/v1/stacks"
+	th "github.com/gophercloud/gophercloud/testhelper"
 )
 
 func TestStacks(t *testing.T) {
diff --git a/acceptance/rackspace/orchestration/v1/stacktemplates_test.go b/acceptance/rackspace/orchestration/v1/stacktemplates_test.go
index e4ccd9e..4f8dee2 100644
--- a/acceptance/rackspace/orchestration/v1/stacktemplates_test.go
+++ b/acceptance/rackspace/orchestration/v1/stacktemplates_test.go
@@ -5,12 +5,12 @@
 import (
 	"testing"
 
-	"github.com/rackspace/gophercloud"
-	osStacks "github.com/rackspace/gophercloud/openstack/orchestration/v1/stacks"
-	osStacktemplates "github.com/rackspace/gophercloud/openstack/orchestration/v1/stacktemplates"
-	"github.com/rackspace/gophercloud/rackspace/orchestration/v1/stacks"
-	"github.com/rackspace/gophercloud/rackspace/orchestration/v1/stacktemplates"
-	th "github.com/rackspace/gophercloud/testhelper"
+	"github.com/gophercloud/gophercloud"
+	osStacks "github.com/gophercloud/gophercloud/openstack/orchestration/v1/stacks"
+	osStacktemplates "github.com/gophercloud/gophercloud/openstack/orchestration/v1/stacktemplates"
+	"github.com/gophercloud/gophercloud/rackspace/orchestration/v1/stacks"
+	"github.com/gophercloud/gophercloud/rackspace/orchestration/v1/stacktemplates"
+	th "github.com/gophercloud/gophercloud/testhelper"
 )
 
 func TestStackTemplates(t *testing.T) {