diff --git a/acceptance/openstack/storage_test.go b/acceptance/openstack/storage_test.go
index 5c835cf..0cd3c12 100644
--- a/acceptance/openstack/storage_test.go
+++ b/acceptance/openstack/storage_test.go
@@ -25,7 +25,7 @@
 		return nil, err
 	}
 
-	client, err := ao.NewClient(identity.ClientOpts{
+	client, err := ao.NewClient(identity.EndpointOpts{
 		Type: "object-store",
 	})
 	if err != nil {
diff --git a/openstack/identity/v2/client.go b/openstack/identity/v2/client.go
index d9a5b06..921ab7e 100644
--- a/openstack/identity/v2/client.go
+++ b/openstack/identity/v2/client.go
@@ -14,8 +14,8 @@
 	Options AuthOptions
 }
 
-// ClientOpts contains options for creating a generic Openstack Client.
-type ClientOpts struct {
+// EndpointOpts contains options for finding an endpoint for an Openstack Client.
+type EndpointOpts struct {
 	// Type is the service type for the client (e.g., "compute", "object-store").
 	// Type is a required field.
 	Type string
@@ -36,12 +36,12 @@
 // to create a client for the various Openstack services.
 // Example (error checking omitted for brevity):
 //		ao, err := utils.AuthOptions()
-//		c, err := ao.NewClient(identity.ClientOpts{
+//		c, err := ao.NewClient(identity.EndpointOpts{
 //			Type: "compute",
 //			Name: "nova",
 //		})
 //		serversClient := servers.NewClient(c.Endpoint, c.Authority, c.Options)
-func (ao AuthOptions) NewClient(opts ClientOpts) (Client, error) {
+func (ao AuthOptions) NewClient(opts EndpointOpts) (Client, error) {
 	client := Client{
 		Options: ao,
 	}