diff --git a/openstack/db/v1/instances/requests.go b/openstack/db/v1/instances/requests.go
index ecf8d46..84e4615 100644
--- a/openstack/db/v1/instances/requests.go
+++ b/openstack/db/v1/instances/requests.go
@@ -6,7 +6,7 @@
 	"github.com/racker/perigee"
 	"github.com/rackspace/gophercloud"
 	db "github.com/rackspace/gophercloud/openstack/db/v1/databases"
-	users "github.com/rackspace/gophercloud/openstack/db/v1/databases"
+	"github.com/rackspace/gophercloud/openstack/db/v1/users"
 	"github.com/rackspace/gophercloud/pagination"
 )
 
diff --git a/openstack/db/v1/instances/requests_test.go b/openstack/db/v1/instances/requests_test.go
index 600bc8b..bdda1f6 100644
--- a/openstack/db/v1/instances/requests_test.go
+++ b/openstack/db/v1/instances/requests_test.go
@@ -5,6 +5,7 @@
 
 	"github.com/rackspace/gophercloud"
 	db "github.com/rackspace/gophercloud/openstack/db/v1/databases"
+	"github.com/rackspace/gophercloud/openstack/db/v1/users"
 	"github.com/rackspace/gophercloud/pagination"
 	th "github.com/rackspace/gophercloud/testhelper"
 	fake "github.com/rackspace/gophercloud/testhelper/client"
@@ -45,8 +46,8 @@
 			db.CreateOpts{CharSet: "utf8", Collate: "utf8_general_ci", Name: "sampledb"},
 			db.CreateOpts{Name: "nextround"},
 		},
-		Users: UsersOpts{
-			UserOpts{
+		Users: users.BatchCreateOpts{
+			users.CreateOpts{
 				Name:     "demouser",
 				Password: "demopassword",
 				Databases: db.BatchCreateOpts{
@@ -138,7 +139,7 @@
 
 	HandleEnableRootUserSuccessfully(t, instanceID)
 
-	expected := &User{Name: "root", Password: "secretsecret"}
+	expected := &users.User{Name: "root", Password: "secretsecret"}
 
 	user, err := EnableRootUser(fake.ServiceClient(), instanceID).Extract()
 	th.AssertNoErr(t, err)
diff --git a/openstack/db/v1/instances/results.go b/openstack/db/v1/instances/results.go
index fa2d64e..33c68c1 100644
--- a/openstack/db/v1/instances/results.go
+++ b/openstack/db/v1/instances/results.go
@@ -140,7 +140,7 @@
 }
 
 // Extract will extract root user information from a UserRootResult.
-func (r UserRootResult) Extract() (*User, error) {
+func (r UserRootResult) Extract() (*users.User, error) {
 	if r.Err != nil {
 		return nil, r.Err
 	}