diff --git a/openstack/client.go b/openstack/client.go
index a00ed72..99b3d46 100644
--- a/openstack/client.go
+++ b/openstack/client.go
@@ -145,8 +145,8 @@
 	v2Endpoint := client.IdentityBase + "v2.0/"
 
 	return &gophercloud.ServiceClient{
-		Provider: client,
-		Endpoint: v2Endpoint,
+		ProviderClient: client,
+		Endpoint:       v2Endpoint,
 	}
 }
 
@@ -155,8 +155,8 @@
 	v3Endpoint := client.IdentityBase + "v3/"
 
 	return &gophercloud.ServiceClient{
-		Provider: client,
-		Endpoint: v3Endpoint,
+		ProviderClient: client,
+		Endpoint:       v3Endpoint,
 	}
 }
 
@@ -167,7 +167,7 @@
 	if err != nil {
 		return nil, err
 	}
-	return &gophercloud.ServiceClient{Provider: client, Endpoint: url}, nil
+	return &gophercloud.ServiceClient{ProviderClient: client, Endpoint: url}, nil
 }
 
 // NewComputeV2 creates a ServiceClient that may be used with the v2 compute package.
@@ -177,7 +177,7 @@
 	if err != nil {
 		return nil, err
 	}
-	return &gophercloud.ServiceClient{Provider: client, Endpoint: url}, nil
+	return &gophercloud.ServiceClient{ProviderClient: client, Endpoint: url}, nil
 }
 
 // NewNetworkV2 creates a ServiceClient that may be used with the v2 network package.
@@ -188,9 +188,9 @@
 		return nil, err
 	}
 	return &gophercloud.ServiceClient{
-		Provider:     client,
-		Endpoint:     url,
-		ResourceBase: url + "v2.0/",
+		ProviderClient: client,
+		Endpoint:       url,
+		ResourceBase:   url + "v2.0/",
 	}, nil
 }
 
@@ -201,5 +201,5 @@
 	if err != nil {
 		return nil, err
 	}
-	return &gophercloud.ServiceClient{Provider: client, Endpoint: url}, nil
+	return &gophercloud.ServiceClient{ProviderClient: client, Endpoint: url}, nil
 }
diff --git a/pagination/pagination_test.go b/pagination/pagination_test.go
index 779bd79..f3e4de1 100644
--- a/pagination/pagination_test.go
+++ b/pagination/pagination_test.go
@@ -7,7 +7,7 @@
 
 func createClient() *gophercloud.ServiceClient {
 	return &gophercloud.ServiceClient{
-		Provider: &gophercloud.ProviderClient{TokenID: "abc123"},
-		Endpoint: testhelper.Endpoint(),
+		ProviderClient: &gophercloud.ProviderClient{TokenID: "abc123"},
+		Endpoint:       testhelper.Endpoint(),
 	}
 }