diff --git a/.sidekick.toml b/.sidekick.toml
index ef0ff8045..d5cdcc26f 100644
--- a/.sidekick.toml
+++ b/.sidekick.toml
@@ -45,7 +45,7 @@ disabled-rustdoc-warnings = "redundant_explicit_links,broken_intra_doc_links"
 # These are used by crates with services.
 'package:async-trait' = 'used-if=services,package=async-trait,version=0.1'
 'package:gax'         = 'used-if=services,package=google-cloud-gax,path=src/gax,feature=unstable-sdk-client,version=0.21'
-'package:gclient'     = 'used-if=services,package=google-cloud-http-client,path=src/http-client,version=0.1'
+'package:gaxi'        = 'used-if=services,package=google-cloud-http-client,path=src/http-client,version=0.1'
 'package:lazy_static' = 'used-if=services,package=lazy_static,version=1'
 'package:reqwest'     = 'used-if=services,package=reqwest,version=0.12,feature=json'
 'package:serde_json'  = 'used-if=services,package=serde_json,version=1'
diff --git a/generator/internal/rust/annotate_test.go b/generator/internal/rust/annotate_test.go
index 4664a09cd..c214c9e24 100644
--- a/generator/internal/rust/annotate_test.go
+++ b/generator/internal/rust/annotate_test.go
@@ -242,7 +242,7 @@ func TestOneOfAnnotations(t *testing.T) {
 		},
 		FieldType:          "std::collections::HashMap<i32,i32>",
 		PrimitiveFieldType: "std::collections::HashMap<i32,i32>",
-		AddQueryParameter:  `let builder = req.get_oneof_field_map().map(|p| serde_json::to_value(p).map_err(Error::serde) ).transpose()?.into_iter().fold(builder, |builder, p| { use gclient::query_parameter::QueryParameter; p.add(builder, "oneofFieldMap") });`,
+		AddQueryParameter:  `let builder = req.get_oneof_field_map().map(|p| serde_json::to_value(p).map_err(Error::serde) ).transpose()?.into_iter().fold(builder, |builder, p| { use gaxi::query_parameter::QueryParameter; p.add(builder, "oneofFieldMap") });`,
 		KeyType:            "i32",
 		ValueType:          "i32",
 		IsBoxed:            true,
@@ -661,7 +661,7 @@ func TestFieldAnnotations(t *testing.T) {
 		},
 		FieldType:          "std::collections::HashMap<i32,i64>",
 		PrimitiveFieldType: "std::collections::HashMap<i32,i64>",
-		AddQueryParameter:  `let builder = { use gclient::query_parameter::QueryParameter; serde_json::to_value(&req.map_field).map_err(Error::serde)?.add(builder, "mapField") };`,
+		AddQueryParameter:  `let builder = { use gaxi::query_parameter::QueryParameter; serde_json::to_value(&req.map_field).map_err(Error::serde)?.add(builder, "mapField") };`,
 		KeyType:            "i32",
 		ValueType:          "i64",
 		ToProto:            "cnv",
@@ -682,7 +682,7 @@ func TestFieldAnnotations(t *testing.T) {
 		},
 		FieldType:          "std::option::Option<std::boxed::Box<crate::model::TestMessage>>",
 		PrimitiveFieldType: "crate::model::TestMessage",
-		AddQueryParameter:  `let builder = req.boxed_field.as_ref().map(|p| serde_json::to_value(p).map_err(Error::serde) ).transpose()?.into_iter().fold(builder, |builder, v| { use gclient::query_parameter::QueryParameter; v.add(builder, "boxedField") });`,
+		AddQueryParameter:  `let builder = req.boxed_field.as_ref().map(|p| serde_json::to_value(p).map_err(Error::serde) ).transpose()?.into_iter().fold(builder, |builder, v| { use gaxi::query_parameter::QueryParameter; v.add(builder, "boxedField") });`,
 		IsBoxed:            true,
 		ToProto:            "cnv",
 	}
@@ -871,7 +871,7 @@ func TestEnumFieldAnnotations(t *testing.T) {
 		},
 		FieldType:          "std::collections::HashMap<std::string::String,crate::model::TestEnum>",
 		PrimitiveFieldType: "std::collections::HashMap<std::string::String,crate::model::TestEnum>",
-		AddQueryParameter:  `let builder = { use gclient::query_parameter::QueryParameter; serde_json::to_value(&req.map_field).map_err(Error::serde)?.add(builder, "mapField") };`,
+		AddQueryParameter:  `let builder = { use gaxi::query_parameter::QueryParameter; serde_json::to_value(&req.map_field).map_err(Error::serde)?.add(builder, "mapField") };`,
 		KeyType:            "std::string::String",
 		ValueType:          "crate::model::TestEnum",
 		ToProto:            "cnv",
diff --git a/generator/internal/rust/codec.go b/generator/internal/rust/codec.go
index 008e86b9d..9029ae641 100644
--- a/generator/internal/rust/codec.go
+++ b/generator/internal/rust/codec.go
@@ -631,9 +631,9 @@ func addQueryParameter(f *api.Field) string {
 		// few requests use nested objects as query parameters. Furthermore,
 		// the conversion is skipped if the object field is `None`.`
 		if f.Optional || f.Repeated {
-			return fmt.Sprintf(`let builder = req.%s.as_ref().map(|p| serde_json::to_value(p).map_err(Error::serde) ).transpose()?.into_iter().fold(builder, |builder, v| { use gclient::query_parameter::QueryParameter; v.add(builder, "%s") });`, fieldName, f.JSONName)
+			return fmt.Sprintf(`let builder = req.%s.as_ref().map(|p| serde_json::to_value(p).map_err(Error::serde) ).transpose()?.into_iter().fold(builder, |builder, v| { use gaxi::query_parameter::QueryParameter; v.add(builder, "%s") });`, fieldName, f.JSONName)
 		}
-		return fmt.Sprintf(`let builder = { use gclient::query_parameter::QueryParameter; serde_json::to_value(&req.%s).map_err(Error::serde)?.add(builder, "%s") };`, fieldName, f.JSONName)
+		return fmt.Sprintf(`let builder = { use gaxi::query_parameter::QueryParameter; serde_json::to_value(&req.%s).map_err(Error::serde)?.add(builder, "%s") };`, fieldName, f.JSONName)
 	default:
 		if f.Optional || f.Repeated {
 			return fmt.Sprintf(`let builder = req.%s.iter().fold(builder, |builder, p| builder.query(&[("%s", p)]));`, fieldName, f.JSONName)
@@ -653,7 +653,7 @@ func addQueryParameterOneOf(f *api.Field) string {
 		// query. The conversion to `serde_json::Value` is expensive, but very
 		// few requests use nested objects as query parameters. Furthermore,
 		// the conversion is skipped if the object field is `None`.`
-		return fmt.Sprintf(`let builder = req.get_%s().map(|p| serde_json::to_value(p).map_err(Error::serde) ).transpose()?.into_iter().fold(builder, |builder, p| { use gclient::query_parameter::QueryParameter; p.add(builder, "%s") });`, fieldName, f.JSONName)
+		return fmt.Sprintf(`let builder = req.get_%s().map(|p| serde_json::to_value(p).map_err(Error::serde) ).transpose()?.into_iter().fold(builder, |builder, p| { use gaxi::query_parameter::QueryParameter; p.add(builder, "%s") });`, fieldName, f.JSONName)
 	default:
 		return fmt.Sprintf(`let builder = req.get_%s().iter().fold(builder, |builder, p| builder.query(&[("%s", p)]));`, fieldName, f.JSONName)
 	}
@@ -755,7 +755,7 @@ func httpPathFmt(m *api.PathInfo) string {
 
 func derefFieldExpr(name string, optional bool, nextMessage *api.Message) (string, *api.Message) {
 	const (
-		optionalFmt = `.%s.as_ref().ok_or_else(|| gclient::path_parameter::missing("%s"))?`
+		optionalFmt = `.%s.as_ref().ok_or_else(|| gaxi::path_parameter::missing("%s"))?`
 	)
 	if optional {
 		return fmt.Sprintf(optionalFmt, name, name), nextMessage
diff --git a/generator/internal/rust/codec_test.go b/generator/internal/rust/codec_test.go
index 8515f951f..65f4d281d 100644
--- a/generator/internal/rust/codec_test.go
+++ b/generator/internal/rust/codec_test.go
@@ -1172,15 +1172,15 @@ func TestAsQueryParameter(t *testing.T) {
 		field *api.Field
 		want  string
 	}{
-		{optionsField, `let builder = req.options_field.as_ref().map(|p| serde_json::to_value(p).map_err(Error::serde) ).transpose()?.into_iter().fold(builder, |builder, v| { use gclient::query_parameter::QueryParameter; v.add(builder, "optionsField") });`},
+		{optionsField, `let builder = req.options_field.as_ref().map(|p| serde_json::to_value(p).map_err(Error::serde) ).transpose()?.into_iter().fold(builder, |builder, v| { use gaxi::query_parameter::QueryParameter; v.add(builder, "optionsField") });`},
 		{requiredField, `let builder = builder.query(&[("requiredField", &req.required_field)]);`},
 		{optionalField, `let builder = req.optional_field.iter().fold(builder, |builder, p| builder.query(&[("optionalField", p)]));`},
 		{repeatedField, `let builder = req.repeated_field.iter().fold(builder, |builder, p| builder.query(&[("repeatedField", p)]));`},
 		{requiredEnumField, `let builder = builder.query(&[("requiredEnumField", &req.required_enum_field.value())]);`},
 		{optionalEnumField, `let builder = req.optional_enum_field.iter().fold(builder, |builder, p| builder.query(&[("optionalEnumField", p.value())]));`},
 		{repeatedEnumField, `let builder = req.repeated_enum_field.iter().fold(builder, |builder, p| builder.query(&[("repeatedEnumField", p.value())]));`},
-		{requiredFieldMaskField, `let builder = { use gclient::query_parameter::QueryParameter; serde_json::to_value(&req.required_field_mask).map_err(Error::serde)?.add(builder, "requiredFieldMask") };`},
-		{optionalFieldMaskField, `let builder = req.optional_field_mask.as_ref().map(|p| serde_json::to_value(p).map_err(Error::serde) ).transpose()?.into_iter().fold(builder, |builder, v| { use gclient::query_parameter::QueryParameter; v.add(builder, "optionalFieldMask") });`},
+		{requiredFieldMaskField, `let builder = { use gaxi::query_parameter::QueryParameter; serde_json::to_value(&req.required_field_mask).map_err(Error::serde)?.add(builder, "requiredFieldMask") };`},
+		{optionalFieldMaskField, `let builder = req.optional_field_mask.as_ref().map(|p| serde_json::to_value(p).map_err(Error::serde) ).transpose()?.into_iter().fold(builder, |builder, v| { use gaxi::query_parameter::QueryParameter; v.add(builder, "optionalFieldMask") });`},
 	} {
 		got := addQueryParameter(test.field)
 		if test.want != got {
@@ -1273,13 +1273,13 @@ func TestOneOfAsQueryParameter(t *testing.T) {
 		field *api.Field
 		want  string
 	}{
-		{optionsField, `let builder = req.get_options_field().map(|p| serde_json::to_value(p).map_err(Error::serde) ).transpose()?.into_iter().fold(builder, |builder, p| { use gclient::query_parameter::QueryParameter; p.add(builder, "optionsField") });`},
+		{optionsField, `let builder = req.get_options_field().map(|p| serde_json::to_value(p).map_err(Error::serde) ).transpose()?.into_iter().fold(builder, |builder, p| { use gaxi::query_parameter::QueryParameter; p.add(builder, "optionsField") });`},
 		{typeField, `let builder = req.get_type().iter().fold(builder, |builder, p| builder.query(&[("type", p)]));`},
 		{singularField, `let builder = req.get_singular_field().iter().fold(builder, |builder, p| builder.query(&[("singularField", p)]));`},
 		{repeatedField, `let builder = req.get_repeated_field().iter().fold(builder, |builder, p| builder.query(&[("repeatedField", p)]));`},
 		{singularEnumField, `let builder = req.get_singular_enum_field().iter().fold(builder, |builder, p| builder.query(&[("singularEnumField", p.value())]));`},
 		{repeatedEnumField, `let builder = req.get_repeated_enum_field().iter().fold(builder, |builder, p| builder.query(&[("repeatedEnumField", p.value())]));`},
-		{singularFieldMaskField, `let builder = req.get_singular_field_mask().map(|p| serde_json::to_value(p).map_err(Error::serde) ).transpose()?.into_iter().fold(builder, |builder, p| { use gclient::query_parameter::QueryParameter; p.add(builder, "singularFieldMask") });`},
+		{singularFieldMaskField, `let builder = req.get_singular_field_mask().map(|p| serde_json::to_value(p).map_err(Error::serde) ).transpose()?.into_iter().fold(builder, |builder, p| { use gaxi::query_parameter::QueryParameter; p.add(builder, "singularFieldMask") });`},
 	} {
 		got := addQueryParameter(test.field)
 		if test.want != got {
@@ -2124,7 +2124,7 @@ func TestPathArgs(t *testing.T) {
 			[]pathArg{
 				{
 					Name:     "b",
-					Accessor: `.b.as_ref().ok_or_else(|| gclient::path_parameter::missing("b"))?`,
+					Accessor: `.b.as_ref().ok_or_else(|| gaxi::path_parameter::missing("b"))?`,
 				},
 			},
 			&api.PathInfo{
@@ -2147,7 +2147,7 @@ func TestPathArgs(t *testing.T) {
 			[]pathArg{
 				{
 					Name:     "d",
-					Accessor: `.d.as_ref().ok_or_else(|| gclient::path_parameter::missing("d"))?.value()`,
+					Accessor: `.d.as_ref().ok_or_else(|| gaxi::path_parameter::missing("d"))?.value()`,
 				},
 			},
 			&api.PathInfo{
@@ -2161,7 +2161,7 @@ func TestPathArgs(t *testing.T) {
 			[]pathArg{
 				{
 					Name:     "e.a",
-					Accessor: `.e.as_ref().ok_or_else(|| gclient::path_parameter::missing("e"))?.a`,
+					Accessor: `.e.as_ref().ok_or_else(|| gaxi::path_parameter::missing("e"))?.a`,
 				},
 			},
 			&api.PathInfo{
@@ -2175,8 +2175,8 @@ func TestPathArgs(t *testing.T) {
 			[]pathArg{
 				{
 					Name: "e.b",
-					Accessor: `.e.as_ref().ok_or_else(|| gclient::path_parameter::missing("e"))?` +
-						`.b.as_ref().ok_or_else(|| gclient::path_parameter::missing("b"))?`,
+					Accessor: `.e.as_ref().ok_or_else(|| gaxi::path_parameter::missing("e"))?` +
+						`.b.as_ref().ok_or_else(|| gaxi::path_parameter::missing("b"))?`,
 				},
 			},
 			&api.PathInfo{
@@ -2190,7 +2190,7 @@ func TestPathArgs(t *testing.T) {
 			[]pathArg{
 				{
 					Name: "e.c",
-					Accessor: `.e.as_ref().ok_or_else(|| gclient::path_parameter::missing("e"))?` +
+					Accessor: `.e.as_ref().ok_or_else(|| gaxi::path_parameter::missing("e"))?` +
 						`.c.value()`,
 				},
 			},
@@ -2205,8 +2205,8 @@ func TestPathArgs(t *testing.T) {
 			[]pathArg{
 				{
 					Name: "e.d",
-					Accessor: `.e.as_ref().ok_or_else(|| gclient::path_parameter::missing("e"))?` +
-						`.d.as_ref().ok_or_else(|| gclient::path_parameter::missing("d"))?` +
+					Accessor: `.e.as_ref().ok_or_else(|| gaxi::path_parameter::missing("e"))?` +
+						`.d.as_ref().ok_or_else(|| gaxi::path_parameter::missing("d"))?` +
 						`.value()`,
 				},
 			},
@@ -2225,7 +2225,7 @@ func TestPathArgs(t *testing.T) {
 				},
 				{
 					Name:     "b",
-					Accessor: `.b.as_ref().ok_or_else(|| gclient::path_parameter::missing("b"))?`,
+					Accessor: `.b.as_ref().ok_or_else(|| gaxi::path_parameter::missing("b"))?`,
 				},
 			},
 			&api.PathInfo{
diff --git a/generator/internal/rust/templates/crate/src/transport.rs.mustache b/generator/internal/rust/templates/crate/src/transport.rs.mustache
index f606619bb..d9a3bf007 100644
--- a/generator/internal/rust/templates/crate/src/transport.rs.mustache
+++ b/generator/internal/rust/templates/crate/src/transport.rs.mustache
@@ -26,10 +26,10 @@ use gax::error::Error;
 
 {{/Codec.HasServices}}
 {{#Codec.Services}}
-/// Implements [{{Codec.Name}}](super::stubs::{{Codec.Name}}) using a [gclient::ReqwestClient].
+/// Implements [{{Codec.Name}}](super::stubs::{{Codec.Name}}) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct {{Codec.Name}} {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for {{Codec.Name}} {
@@ -41,8 +41,8 @@ impl std::fmt::Debug for {{Codec.Name}} {
 }
 
 impl {{Codec.Name}} {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -81,7 +81,7 @@ impl super::stubs::{{Codec.Name}} for {{Codec.Name}} {
         self.inner.execute(
             builder,
             {{#PathInfo.Codec.HasBody}}Some(req{{Codec.BodyAccessor}}){{/PathInfo.Codec.HasBody}}
-            {{^PathInfo.Codec.HasBody}}None::<gclient::NoBody>{{/PathInfo.Codec.HasBody}},
+            {{^PathInfo.Codec.HasBody}}None::<gaxi::NoBody>{{/PathInfo.Codec.HasBody}},
             options,
         ).await
     }
diff --git a/generator/testdata/rust/openapi/golden/src/transport.rs b/generator/testdata/rust/openapi/golden/src/transport.rs
index a245b3e9f..277804a5f 100755
--- a/generator/testdata/rust/openapi/golden/src/transport.rs
+++ b/generator/testdata/rust/openapi/golden/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [SecretManagerService](super::stubs::SecretManagerService) using a [gclient::ReqwestClient].
+/// Implements [SecretManagerService](super::stubs::SecretManagerService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct SecretManagerService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for SecretManagerService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for SecretManagerService {
 }
 
 impl SecretManagerService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -87,7 +87,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -114,7 +114,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -167,7 +167,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -269,7 +269,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -295,7 +295,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -317,7 +317,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
             )
             .query(&[("$alt", "json")])
             .header("x-goog-api-client", reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER));
-        let builder = { use gclient::query_parameter::QueryParameter; serde_json::to_value(&req.update_mask).map_err(Error::serde)?.add(builder, "updateMask") };
+        let builder = { use gaxi::query_parameter::QueryParameter; serde_json::to_value(&req.update_mask).map_err(Error::serde)?.add(builder, "updateMask") };
         self.inner.execute(
             builder,
             Some(req.request_body)
@@ -347,7 +347,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -374,7 +374,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -397,7 +397,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
             )
             .query(&[("$alt", "json")])
             .header("x-goog-api-client", reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER));
-        let builder = { use gclient::query_parameter::QueryParameter; serde_json::to_value(&req.update_mask).map_err(Error::serde)?.add(builder, "updateMask") };
+        let builder = { use gaxi::query_parameter::QueryParameter; serde_json::to_value(&req.update_mask).map_err(Error::serde)?.add(builder, "updateMask") };
         self.inner.execute(
             builder,
             Some(req.request_body)
@@ -429,7 +429,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -458,7 +458,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -484,7 +484,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -511,7 +511,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -537,7 +537,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -564,7 +564,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -800,7 +800,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -827,7 +827,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
diff --git a/generator/testdata/rust/protobuf/golden/iam/v1/src/transport.rs b/generator/testdata/rust/protobuf/golden/iam/v1/src/transport.rs
index 1048c5360..a79b5cfac 100755
--- a/generator/testdata/rust/protobuf/golden/iam/v1/src/transport.rs
+++ b/generator/testdata/rust/protobuf/golden/iam/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [IAMPolicy](super::stubs::IAMPolicy) using a [gclient::ReqwestClient].
+/// Implements [IAMPolicy](super::stubs::IAMPolicy) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct IAMPolicy {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for IAMPolicy {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for IAMPolicy {
 }
 
 impl IAMPolicy {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
diff --git a/generator/testdata/rust/protobuf/golden/location/src/transport.rs b/generator/testdata/rust/protobuf/golden/location/src/transport.rs
index 94402bbaf..2b12c2bef 100755
--- a/generator/testdata/rust/protobuf/golden/location/src/transport.rs
+++ b/generator/testdata/rust/protobuf/golden/location/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [Locations](super::stubs::Locations) using a [gclient::ReqwestClient].
+/// Implements [Locations](super::stubs::Locations) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Locations {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Locations {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for Locations {
 }
 
 impl Locations {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::Locations for Locations {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -86,7 +86,7 @@ impl super::stubs::Locations for Locations {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
diff --git a/generator/testdata/rust/protobuf/golden/secretmanager/src/transport.rs b/generator/testdata/rust/protobuf/golden/secretmanager/src/transport.rs
index 9129351aa..dd198901b 100755
--- a/generator/testdata/rust/protobuf/golden/secretmanager/src/transport.rs
+++ b/generator/testdata/rust/protobuf/golden/secretmanager/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [SecretManagerService](super::stubs::SecretManagerService) using a [gclient::ReqwestClient].
+/// Implements [SecretManagerService](super::stubs::SecretManagerService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct SecretManagerService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for SecretManagerService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for SecretManagerService {
 }
 
 impl SecretManagerService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -135,7 +135,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -151,12 +151,12 @@ impl super::stubs::SecretManagerService for SecretManagerService {
             .builder(
                 reqwest::Method::PATCH,
                 format!("/v1/{}"
-                        , req.secret.as_ref().ok_or_else(|| gclient::path_parameter::missing("secret"))?.name
+                        , req.secret.as_ref().ok_or_else(|| gaxi::path_parameter::missing("secret"))?.name
                 )
             )
             .query(&[("$alt", "json;enum-encoding=int")])
             .header("x-goog-api-client", reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER));
-        let builder = req.update_mask.as_ref().map(|p| serde_json::to_value(p).map_err(Error::serde) ).transpose()?.into_iter().fold(builder, |builder, v| { use gclient::query_parameter::QueryParameter; v.add(builder, "updateMask") });
+        let builder = req.update_mask.as_ref().map(|p| serde_json::to_value(p).map_err(Error::serde) ).transpose()?.into_iter().fold(builder, |builder, v| { use gaxi::query_parameter::QueryParameter; v.add(builder, "updateMask") });
         self.inner.execute(
             builder,
             Some(req.secret)
@@ -185,7 +185,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -212,7 +212,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -236,7 +236,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -260,7 +260,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -377,11 +377,11 @@ impl super::stubs::SecretManagerService for SecretManagerService {
             )
             .query(&[("$alt", "json;enum-encoding=int")])
             .header("x-goog-api-client", reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER));
-        let builder = req.options.as_ref().map(|p| serde_json::to_value(p).map_err(Error::serde) ).transpose()?.into_iter().fold(builder, |builder, v| { use gclient::query_parameter::QueryParameter; v.add(builder, "options") });
+        let builder = req.options.as_ref().map(|p| serde_json::to_value(p).map_err(Error::serde) ).transpose()?.into_iter().fold(builder, |builder, v| { use gaxi::query_parameter::QueryParameter; v.add(builder, "options") });
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -432,7 +432,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -456,7 +456,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
diff --git a/src/generated/api/apikeys/v2/Cargo.toml b/src/generated/api/apikeys/v2/Cargo.toml
index 9cf9737bc..199bea618 100644
--- a/src/generated/api/apikeys/v2/Cargo.toml
+++ b/src/generated/api/apikeys/v2/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
 lro        = { version = "0.1", path = "../../../../../src/lro", package = "google-cloud-lro" }
diff --git a/src/generated/api/apikeys/v2/src/model.rs b/src/generated/api/apikeys/v2/src/model.rs
index 934ae1749..dd8905269 100755
--- a/src/generated/api/apikeys/v2/src/model.rs
+++ b/src/generated/api/apikeys/v2/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate longrunning;
 extern crate lro;
diff --git a/src/generated/api/apikeys/v2/src/transport.rs b/src/generated/api/apikeys/v2/src/transport.rs
index 385171010..9ddf0cd41 100755
--- a/src/generated/api/apikeys/v2/src/transport.rs
+++ b/src/generated/api/apikeys/v2/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [ApiKeys](super::stubs::ApiKeys) using a [gclient::ReqwestClient].
+/// Implements [ApiKeys](super::stubs::ApiKeys) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ApiKeys {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ApiKeys {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for ApiKeys {
 }
 
 impl ApiKeys {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -76,7 +76,7 @@ impl super::stubs::ApiKeys for ApiKeys {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("showDeleted", &req.show_deleted)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -95,7 +95,7 @@ impl super::stubs::ApiKeys for ApiKeys {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -114,7 +114,7 @@ impl super::stubs::ApiKeys for ApiKeys {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -132,7 +132,7 @@ impl super::stubs::ApiKeys for ApiKeys {
                     "/v2/{}",
                     req.key
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("key"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("key"))?
                         .name
                 ),
             )
@@ -148,7 +148,7 @@ impl super::stubs::ApiKeys for ApiKeys {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.key), options).await
@@ -170,7 +170,7 @@ impl super::stubs::ApiKeys for ApiKeys {
             );
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -207,7 +207,7 @@ impl super::stubs::ApiKeys for ApiKeys {
             );
         let builder = builder.query(&[("keyString", &req.key_string)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -226,7 +226,7 @@ impl super::stubs::ApiKeys for ApiKeys {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/api/servicecontrol/v1/Cargo.toml b/src/generated/api/servicecontrol/v1/Cargo.toml
index abd8baf50..1798fb7cf 100644
--- a/src/generated/api/servicecontrol/v1/Cargo.toml
+++ b/src/generated/api/servicecontrol/v1/Cargo.toml
@@ -30,7 +30,7 @@ api        = { version = "0.2", path = "../../../../../src/generated/api/types",
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 logging_type = { version = "0.2", path = "../../../../../src/generated/logging/type", package = "google-cloud-logging-type" }
 reqwest    = { version = "0.12", features = ["json"] }
diff --git a/src/generated/api/servicecontrol/v1/src/model.rs b/src/generated/api/servicecontrol/v1/src/model.rs
index 8a1cfe75d..b57656182 100755
--- a/src/generated/api/servicecontrol/v1/src/model.rs
+++ b/src/generated/api/servicecontrol/v1/src/model.rs
@@ -21,7 +21,7 @@ extern crate api;
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate logging_type;
 extern crate reqwest;
diff --git a/src/generated/api/servicecontrol/v1/src/transport.rs b/src/generated/api/servicecontrol/v1/src/transport.rs
index 963c65ca6..3a257765f 100755
--- a/src/generated/api/servicecontrol/v1/src/transport.rs
+++ b/src/generated/api/servicecontrol/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [QuotaController](super::stubs::QuotaController) using a [gclient::ReqwestClient].
+/// Implements [QuotaController](super::stubs::QuotaController) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct QuotaController {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for QuotaController {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for QuotaController {
 }
 
 impl QuotaController {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -61,10 +61,10 @@ impl super::stubs::QuotaController for QuotaController {
     }
 }
 
-/// Implements [ServiceController](super::stubs::ServiceController) using a [gclient::ReqwestClient].
+/// Implements [ServiceController](super::stubs::ServiceController) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ServiceController {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ServiceController {
@@ -76,8 +76,8 @@ impl std::fmt::Debug for ServiceController {
 }
 
 impl ServiceController {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
diff --git a/src/generated/api/servicecontrol/v2/Cargo.toml b/src/generated/api/servicecontrol/v2/Cargo.toml
index cbb8c1bea..607d316ac 100644
--- a/src/generated/api/servicecontrol/v2/Cargo.toml
+++ b/src/generated/api/servicecontrol/v2/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
 rpc        = { version = "0.2", path = "../../../../../src/generated/rpc/types", package = "google-cloud-rpc" }
diff --git a/src/generated/api/servicecontrol/v2/src/model.rs b/src/generated/api/servicecontrol/v2/src/model.rs
index 9a7a16ba3..0e7a3c574 100755
--- a/src/generated/api/servicecontrol/v2/src/model.rs
+++ b/src/generated/api/servicecontrol/v2/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate reqwest;
 extern crate rpc;
diff --git a/src/generated/api/servicecontrol/v2/src/transport.rs b/src/generated/api/servicecontrol/v2/src/transport.rs
index 6c2d53ec5..b6e04f718 100755
--- a/src/generated/api/servicecontrol/v2/src/transport.rs
+++ b/src/generated/api/servicecontrol/v2/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [ServiceController](super::stubs::ServiceController) using a [gclient::ReqwestClient].
+/// Implements [ServiceController](super::stubs::ServiceController) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ServiceController {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ServiceController {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for ServiceController {
 }
 
 impl ServiceController {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
diff --git a/src/generated/api/servicemanagement/v1/Cargo.toml b/src/generated/api/servicemanagement/v1/Cargo.toml
index 44e1264e7..91422c3ef 100644
--- a/src/generated/api/servicemanagement/v1/Cargo.toml
+++ b/src/generated/api/servicemanagement/v1/Cargo.toml
@@ -30,7 +30,7 @@ api        = { version = "0.2", path = "../../../../../src/generated/api/types",
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/api/servicemanagement/v1/src/model.rs b/src/generated/api/servicemanagement/v1/src/model.rs
index 4644c5635..cbc81383d 100755
--- a/src/generated/api/servicemanagement/v1/src/model.rs
+++ b/src/generated/api/servicemanagement/v1/src/model.rs
@@ -21,7 +21,7 @@ extern crate api;
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate longrunning;
diff --git a/src/generated/api/servicemanagement/v1/src/transport.rs b/src/generated/api/servicemanagement/v1/src/transport.rs
index 17129bff6..df608ad05 100755
--- a/src/generated/api/servicemanagement/v1/src/transport.rs
+++ b/src/generated/api/servicemanagement/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [ServiceManager](super::stubs::ServiceManager) using a [gclient::ReqwestClient].
+/// Implements [ServiceManager](super::stubs::ServiceManager) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ServiceManager {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ServiceManager {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for ServiceManager {
 }
 
 impl ServiceManager {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -59,7 +59,7 @@ impl super::stubs::ServiceManager for ServiceManager {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("consumerId", &req.consumer_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -81,7 +81,7 @@ impl super::stubs::ServiceManager for ServiceManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -122,7 +122,7 @@ impl super::stubs::ServiceManager for ServiceManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -144,7 +144,7 @@ impl super::stubs::ServiceManager for ServiceManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -168,7 +168,7 @@ impl super::stubs::ServiceManager for ServiceManager {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -194,7 +194,7 @@ impl super::stubs::ServiceManager for ServiceManager {
             );
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -261,7 +261,7 @@ impl super::stubs::ServiceManager for ServiceManager {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -286,7 +286,7 @@ impl super::stubs::ServiceManager for ServiceManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -411,7 +411,7 @@ impl super::stubs::ServiceManager for ServiceManager {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -430,7 +430,7 @@ impl super::stubs::ServiceManager for ServiceManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/api/serviceusage/v1/Cargo.toml b/src/generated/api/serviceusage/v1/Cargo.toml
index 39d99379b..6f00d4be3 100644
--- a/src/generated/api/serviceusage/v1/Cargo.toml
+++ b/src/generated/api/serviceusage/v1/Cargo.toml
@@ -30,7 +30,7 @@ api        = { version = "0.2", path = "../../../../../src/generated/api/types",
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
 lro        = { version = "0.1", path = "../../../../../src/lro", package = "google-cloud-lro" }
diff --git a/src/generated/api/serviceusage/v1/src/model.rs b/src/generated/api/serviceusage/v1/src/model.rs
index a64b34e6f..357dbc76b 100755
--- a/src/generated/api/serviceusage/v1/src/model.rs
+++ b/src/generated/api/serviceusage/v1/src/model.rs
@@ -21,7 +21,7 @@ extern crate api;
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate longrunning;
 extern crate lro;
diff --git a/src/generated/api/serviceusage/v1/src/transport.rs b/src/generated/api/serviceusage/v1/src/transport.rs
index 91a2a3a69..663fc4a5a 100755
--- a/src/generated/api/serviceusage/v1/src/transport.rs
+++ b/src/generated/api/serviceusage/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [ServiceUsage](super::stubs::ServiceUsage) using a [gclient::ReqwestClient].
+/// Implements [ServiceUsage](super::stubs::ServiceUsage) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ServiceUsage {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ServiceUsage {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for ServiceUsage {
 }
 
 impl ServiceUsage {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -89,7 +89,7 @@ impl super::stubs::ServiceUsage for ServiceUsage {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -111,7 +111,7 @@ impl super::stubs::ServiceUsage for ServiceUsage {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -157,7 +157,7 @@ impl super::stubs::ServiceUsage for ServiceUsage {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("names", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -180,7 +180,7 @@ impl super::stubs::ServiceUsage for ServiceUsage {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -199,7 +199,7 @@ impl super::stubs::ServiceUsage for ServiceUsage {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/appengine/v1/Cargo.toml b/src/generated/appengine/v1/Cargo.toml
index 9688b903d..74a3e9f02 100644
--- a/src/generated/appengine/v1/Cargo.toml
+++ b/src/generated/appengine/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
 lro        = { version = "0.1", path = "../../../../src/lro", package = "google-cloud-lro" }
diff --git a/src/generated/appengine/v1/src/model.rs b/src/generated/appengine/v1/src/model.rs
index 1e8941488..fb5ff6a67 100755
--- a/src/generated/appengine/v1/src/model.rs
+++ b/src/generated/appengine/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate longrunning;
 extern crate lro;
diff --git a/src/generated/appengine/v1/src/transport.rs b/src/generated/appengine/v1/src/transport.rs
index 5fd914820..38e99585a 100755
--- a/src/generated/appengine/v1/src/transport.rs
+++ b/src/generated/appengine/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [Applications](super::stubs::Applications) using a [gclient::ReqwestClient].
+/// Implements [Applications](super::stubs::Applications) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Applications {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Applications {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for Applications {
 }
 
 impl Applications {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -55,7 +55,7 @@ impl super::stubs::Applications for Applications {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -99,7 +99,7 @@ impl super::stubs::Applications for Applications {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -142,7 +142,7 @@ impl super::stubs::Applications for Applications {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -161,7 +161,7 @@ impl super::stubs::Applications for Applications {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -180,10 +180,10 @@ impl super::stubs::Applications for Applications {
     }
 }
 
-/// Implements [Services](super::stubs::Services) using a [gclient::ReqwestClient].
+/// Implements [Services](super::stubs::Services) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Services {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Services {
@@ -195,8 +195,8 @@ impl std::fmt::Debug for Services {
 }
 
 impl Services {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -219,7 +219,7 @@ impl super::stubs::Services for Services {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -238,7 +238,7 @@ impl super::stubs::Services for Services {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -263,7 +263,7 @@ impl super::stubs::Services for Services {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("migrateTraffic", &req.migrate_traffic)]);
@@ -287,7 +287,7 @@ impl super::stubs::Services for Services {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -309,7 +309,7 @@ impl super::stubs::Services for Services {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -328,7 +328,7 @@ impl super::stubs::Services for Services {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -347,10 +347,10 @@ impl super::stubs::Services for Services {
     }
 }
 
-/// Implements [Versions](super::stubs::Versions) using a [gclient::ReqwestClient].
+/// Implements [Versions](super::stubs::Versions) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Versions {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Versions {
@@ -362,8 +362,8 @@ impl std::fmt::Debug for Versions {
 }
 
 impl Versions {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -387,7 +387,7 @@ impl super::stubs::Versions for Versions {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -407,7 +407,7 @@ impl super::stubs::Versions for Versions {
             );
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -454,7 +454,7 @@ impl super::stubs::Versions for Versions {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -477,7 +477,7 @@ impl super::stubs::Versions for Versions {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -499,7 +499,7 @@ impl super::stubs::Versions for Versions {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -518,7 +518,7 @@ impl super::stubs::Versions for Versions {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -537,10 +537,10 @@ impl super::stubs::Versions for Versions {
     }
 }
 
-/// Implements [Instances](super::stubs::Instances) using a [gclient::ReqwestClient].
+/// Implements [Instances](super::stubs::Instances) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Instances {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Instances {
@@ -552,8 +552,8 @@ impl std::fmt::Debug for Instances {
 }
 
 impl Instances {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -579,7 +579,7 @@ impl super::stubs::Instances for Instances {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -598,7 +598,7 @@ impl super::stubs::Instances for Instances {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -617,7 +617,7 @@ impl super::stubs::Instances for Instances {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -656,7 +656,7 @@ impl super::stubs::Instances for Instances {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -675,7 +675,7 @@ impl super::stubs::Instances for Instances {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -694,10 +694,10 @@ impl super::stubs::Instances for Instances {
     }
 }
 
-/// Implements [Firewall](super::stubs::Firewall) using a [gclient::ReqwestClient].
+/// Implements [Firewall](super::stubs::Firewall) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Firewall {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Firewall {
@@ -709,8 +709,8 @@ impl std::fmt::Debug for Firewall {
 }
 
 impl Firewall {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -737,7 +737,7 @@ impl super::stubs::Firewall for Firewall {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("matchingAddress", &req.matching_address)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -796,7 +796,7 @@ impl super::stubs::Firewall for Firewall {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -821,7 +821,7 @@ impl super::stubs::Firewall for Firewall {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.rule), options).await
@@ -842,7 +842,7 @@ impl super::stubs::Firewall for Firewall {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -864,7 +864,7 @@ impl super::stubs::Firewall for Firewall {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -883,15 +883,15 @@ impl super::stubs::Firewall for Firewall {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [AuthorizedDomains](super::stubs::AuthorizedDomains) using a [gclient::ReqwestClient].
+/// Implements [AuthorizedDomains](super::stubs::AuthorizedDomains) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct AuthorizedDomains {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for AuthorizedDomains {
@@ -903,8 +903,8 @@ impl std::fmt::Debug for AuthorizedDomains {
 }
 
 impl AuthorizedDomains {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -930,7 +930,7 @@ impl super::stubs::AuthorizedDomains for AuthorizedDomains {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -952,7 +952,7 @@ impl super::stubs::AuthorizedDomains for AuthorizedDomains {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -971,15 +971,15 @@ impl super::stubs::AuthorizedDomains for AuthorizedDomains {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [AuthorizedCertificates](super::stubs::AuthorizedCertificates) using a [gclient::ReqwestClient].
+/// Implements [AuthorizedCertificates](super::stubs::AuthorizedCertificates) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct AuthorizedCertificates {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for AuthorizedCertificates {
@@ -991,8 +991,8 @@ impl std::fmt::Debug for AuthorizedCertificates {
 }
 
 impl AuthorizedCertificates {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1019,7 +1019,7 @@ impl super::stubs::AuthorizedCertificates for AuthorizedCertificates {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1039,7 +1039,7 @@ impl super::stubs::AuthorizedCertificates for AuthorizedCertificates {
             );
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1086,7 +1086,7 @@ impl super::stubs::AuthorizedCertificates for AuthorizedCertificates {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1109,7 +1109,7 @@ impl super::stubs::AuthorizedCertificates for AuthorizedCertificates {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1131,7 +1131,7 @@ impl super::stubs::AuthorizedCertificates for AuthorizedCertificates {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1150,15 +1150,15 @@ impl super::stubs::AuthorizedCertificates for AuthorizedCertificates {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [DomainMappings](super::stubs::DomainMappings) using a [gclient::ReqwestClient].
+/// Implements [DomainMappings](super::stubs::DomainMappings) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct DomainMappings {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for DomainMappings {
@@ -1170,8 +1170,8 @@ impl std::fmt::Debug for DomainMappings {
 }
 
 impl DomainMappings {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1197,7 +1197,7 @@ impl super::stubs::DomainMappings for DomainMappings {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1216,7 +1216,7 @@ impl super::stubs::DomainMappings for DomainMappings {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1264,7 +1264,7 @@ impl super::stubs::DomainMappings for DomainMappings {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1287,7 +1287,7 @@ impl super::stubs::DomainMappings for DomainMappings {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1309,7 +1309,7 @@ impl super::stubs::DomainMappings for DomainMappings {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1328,7 +1328,7 @@ impl super::stubs::DomainMappings for DomainMappings {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/bigtable/admin/v2/Cargo.toml b/src/generated/bigtable/admin/v2/Cargo.toml
index 9bc6faac4..7cacb4db3 100644
--- a/src/generated/bigtable/admin/v2/Cargo.toml
+++ b/src/generated/bigtable/admin/v2/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/bigtable/admin/v2/src/model.rs b/src/generated/bigtable/admin/v2/src/model.rs
index 5af90dc96..b5fa785ef 100755
--- a/src/generated/bigtable/admin/v2/src/model.rs
+++ b/src/generated/bigtable/admin/v2/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate longrunning;
diff --git a/src/generated/bigtable/admin/v2/src/transport.rs b/src/generated/bigtable/admin/v2/src/transport.rs
index 1074b6cf3..ecbbdb27b 100755
--- a/src/generated/bigtable/admin/v2/src/transport.rs
+++ b/src/generated/bigtable/admin/v2/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [BigtableInstanceAdmin](super::stubs::BigtableInstanceAdmin) using a [gclient::ReqwestClient].
+/// Implements [BigtableInstanceAdmin](super::stubs::BigtableInstanceAdmin) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct BigtableInstanceAdmin {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for BigtableInstanceAdmin {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for BigtableInstanceAdmin {
 }
 
 impl BigtableInstanceAdmin {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -75,7 +75,7 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -98,7 +98,7 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
             );
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -133,7 +133,7 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     "/v2/{}",
                     req.instance
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("instance"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("instance"))?
                         .name
                 ),
             )
@@ -149,7 +149,7 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -172,7 +172,7 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -214,7 +214,7 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -234,7 +234,7 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
             );
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -269,7 +269,7 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     "/v2/{}",
                     req.cluster
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("cluster"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("cluster"))?
                         .name
                 ),
             )
@@ -285,7 +285,7 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -308,7 +308,7 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -351,7 +351,7 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -375,7 +375,7 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -393,7 +393,7 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     "/v2/{}",
                     req.app_profile
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("app_profile"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("app_profile"))?
                         .name
                 ),
             )
@@ -409,7 +409,7 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("ignoreWarnings", &req.ignore_warnings)]);
@@ -434,7 +434,7 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
             );
         let builder = builder.query(&[("ignoreWarnings", &req.ignore_warnings)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -522,7 +522,7 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "startTime")
             });
         let builder = req
@@ -532,13 +532,13 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "endTime")
             });
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -580,7 +580,7 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -604,7 +604,7 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -622,7 +622,7 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     "/v2/{}",
                     req.logical_view
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("logical_view"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("logical_view"))?
                         .name
                 ),
             )
@@ -638,7 +638,7 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -662,7 +662,7 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
             );
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -704,7 +704,7 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -728,7 +728,7 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -746,7 +746,7 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
                     "/v2/{}",
                     req.materialized_view
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("materialized_view"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("materialized_view"))?
                         .name
                 ),
             )
@@ -762,7 +762,7 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -786,7 +786,7 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
             );
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -808,7 +808,7 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -827,7 +827,7 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -846,7 +846,7 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -865,7 +865,7 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -884,10 +884,10 @@ impl super::stubs::BigtableInstanceAdmin for BigtableInstanceAdmin {
     }
 }
 
-/// Implements [BigtableTableAdmin](super::stubs::BigtableTableAdmin) using a [gclient::ReqwestClient].
+/// Implements [BigtableTableAdmin](super::stubs::BigtableTableAdmin) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct BigtableTableAdmin {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for BigtableTableAdmin {
@@ -899,8 +899,8 @@ impl std::fmt::Debug for BigtableTableAdmin {
 }
 
 impl BigtableTableAdmin {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -961,7 +961,7 @@ impl super::stubs::BigtableTableAdmin for BigtableTableAdmin {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -981,7 +981,7 @@ impl super::stubs::BigtableTableAdmin for BigtableTableAdmin {
             );
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -999,7 +999,7 @@ impl super::stubs::BigtableTableAdmin for BigtableTableAdmin {
                     "/v2/{}",
                     req.table
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("table"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("table"))?
                         .name
                 ),
             )
@@ -1015,7 +1015,7 @@ impl super::stubs::BigtableTableAdmin for BigtableTableAdmin {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("ignoreWarnings", &req.ignore_warnings)]);
@@ -1037,7 +1037,7 @@ impl super::stubs::BigtableTableAdmin for BigtableTableAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1102,7 +1102,7 @@ impl super::stubs::BigtableTableAdmin for BigtableTableAdmin {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1122,7 +1122,7 @@ impl super::stubs::BigtableTableAdmin for BigtableTableAdmin {
             );
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1140,7 +1140,7 @@ impl super::stubs::BigtableTableAdmin for BigtableTableAdmin {
                     "/v2/{}",
                     req.authorized_view
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("authorized_view"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("authorized_view"))?
                         .name
                 ),
             )
@@ -1156,7 +1156,7 @@ impl super::stubs::BigtableTableAdmin for BigtableTableAdmin {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("ignoreWarnings", &req.ignore_warnings)]);
@@ -1181,7 +1181,7 @@ impl super::stubs::BigtableTableAdmin for BigtableTableAdmin {
             );
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1297,7 +1297,7 @@ impl super::stubs::BigtableTableAdmin for BigtableTableAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1321,7 +1321,7 @@ impl super::stubs::BigtableTableAdmin for BigtableTableAdmin {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1340,7 +1340,7 @@ impl super::stubs::BigtableTableAdmin for BigtableTableAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1377,7 +1377,7 @@ impl super::stubs::BigtableTableAdmin for BigtableTableAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1395,7 +1395,7 @@ impl super::stubs::BigtableTableAdmin for BigtableTableAdmin {
                     "/v2/{}",
                     req.backup
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("backup"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("backup"))?
                         .name
                 ),
             )
@@ -1411,7 +1411,7 @@ impl super::stubs::BigtableTableAdmin for BigtableTableAdmin {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.backup), options).await
@@ -1432,7 +1432,7 @@ impl super::stubs::BigtableTableAdmin for BigtableTableAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1455,7 +1455,7 @@ impl super::stubs::BigtableTableAdmin for BigtableTableAdmin {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1577,7 +1577,7 @@ impl super::stubs::BigtableTableAdmin for BigtableTableAdmin {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1596,7 +1596,7 @@ impl super::stubs::BigtableTableAdmin for BigtableTableAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1615,7 +1615,7 @@ impl super::stubs::BigtableTableAdmin for BigtableTableAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1634,7 +1634,7 @@ impl super::stubs::BigtableTableAdmin for BigtableTableAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/accessapproval/v1/Cargo.toml b/src/generated/cloud/accessapproval/v1/Cargo.toml
index cc6da36ca..9252f172b 100644
--- a/src/generated/cloud/accessapproval/v1/Cargo.toml
+++ b/src/generated/cloud/accessapproval/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
 serde      = { version = "1", features = ["serde_derive"] }
diff --git a/src/generated/cloud/accessapproval/v1/src/model.rs b/src/generated/cloud/accessapproval/v1/src/model.rs
index 680c4a4dc..5a34e7de0 100755
--- a/src/generated/cloud/accessapproval/v1/src/model.rs
+++ b/src/generated/cloud/accessapproval/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate reqwest;
 extern crate serde;
diff --git a/src/generated/cloud/accessapproval/v1/src/transport.rs b/src/generated/cloud/accessapproval/v1/src/transport.rs
index dbf8a9ffd..b6afa8a89 100755
--- a/src/generated/cloud/accessapproval/v1/src/transport.rs
+++ b/src/generated/cloud/accessapproval/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [AccessApproval](super::stubs::AccessApproval) using a [gclient::ReqwestClient].
+/// Implements [AccessApproval](super::stubs::AccessApproval) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct AccessApproval {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for AccessApproval {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for AccessApproval {
 }
 
 impl AccessApproval {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -61,7 +61,7 @@ impl super::stubs::AccessApproval for AccessApproval {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -80,7 +80,7 @@ impl super::stubs::AccessApproval for AccessApproval {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -153,7 +153,7 @@ impl super::stubs::AccessApproval for AccessApproval {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -171,7 +171,7 @@ impl super::stubs::AccessApproval for AccessApproval {
                     "/v1/{}",
                     req.settings
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("settings"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("settings"))?
                         .name
                 ),
             )
@@ -187,7 +187,7 @@ impl super::stubs::AccessApproval for AccessApproval {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -210,7 +210,7 @@ impl super::stubs::AccessApproval for AccessApproval {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -229,7 +229,7 @@ impl super::stubs::AccessApproval for AccessApproval {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/cloud/advisorynotifications/v1/Cargo.toml b/src/generated/cloud/advisorynotifications/v1/Cargo.toml
index 62e630b39..31193de99 100644
--- a/src/generated/cloud/advisorynotifications/v1/Cargo.toml
+++ b/src/generated/cloud/advisorynotifications/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
 serde      = { version = "1", features = ["serde_derive"] }
diff --git a/src/generated/cloud/advisorynotifications/v1/src/model.rs b/src/generated/cloud/advisorynotifications/v1/src/model.rs
index 5fae98135..1f464f5da 100755
--- a/src/generated/cloud/advisorynotifications/v1/src/model.rs
+++ b/src/generated/cloud/advisorynotifications/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate reqwest;
 extern crate serde;
diff --git a/src/generated/cloud/advisorynotifications/v1/src/transport.rs b/src/generated/cloud/advisorynotifications/v1/src/transport.rs
index 5021e3271..9d537a4cc 100755
--- a/src/generated/cloud/advisorynotifications/v1/src/transport.rs
+++ b/src/generated/cloud/advisorynotifications/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [AdvisoryNotificationsService](super::stubs::AdvisoryNotificationsService) using a [gclient::ReqwestClient].
+/// Implements [AdvisoryNotificationsService](super::stubs::AdvisoryNotificationsService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct AdvisoryNotificationsService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for AdvisoryNotificationsService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for AdvisoryNotificationsService {
 }
 
 impl AdvisoryNotificationsService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::AdvisoryNotificationsService for AdvisoryNotificationsService
         let builder = builder.query(&[("view", &req.view.value())]);
         let builder = builder.query(&[("languageCode", &req.language_code)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -82,7 +82,7 @@ impl super::stubs::AdvisoryNotificationsService for AdvisoryNotificationsService
             );
         let builder = builder.query(&[("languageCode", &req.language_code)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -101,7 +101,7 @@ impl super::stubs::AdvisoryNotificationsService for AdvisoryNotificationsService
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -119,7 +119,7 @@ impl super::stubs::AdvisoryNotificationsService for AdvisoryNotificationsService
                     "/v1/{}",
                     req.settings
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("settings"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("settings"))?
                         .name
                 ),
             )
diff --git a/src/generated/cloud/aiplatform/v1/Cargo.toml b/src/generated/cloud/aiplatform/v1/Cargo.toml
index 2bbff542e..d3e19f9ce 100644
--- a/src/generated/cloud/aiplatform/v1/Cargo.toml
+++ b/src/generated/cloud/aiplatform/v1/Cargo.toml
@@ -30,7 +30,7 @@ api        = { version = "0.2", path = "../../../../../src/generated/api/types",
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
diff --git a/src/generated/cloud/aiplatform/v1/src/model.rs b/src/generated/cloud/aiplatform/v1/src/model.rs
index 71fc2a486..7fc21dda5 100755
--- a/src/generated/cloud/aiplatform/v1/src/model.rs
+++ b/src/generated/cloud/aiplatform/v1/src/model.rs
@@ -22,7 +22,7 @@ extern crate api;
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate iam_v1;
 extern crate lazy_static;
diff --git a/src/generated/cloud/aiplatform/v1/src/transport.rs b/src/generated/cloud/aiplatform/v1/src/transport.rs
index 238bc1b75..0535c6a06 100755
--- a/src/generated/cloud/aiplatform/v1/src/transport.rs
+++ b/src/generated/cloud/aiplatform/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [DatasetService](super::stubs::DatasetService) using a [gclient::ReqwestClient].
+/// Implements [DatasetService](super::stubs::DatasetService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct DatasetService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for DatasetService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for DatasetService {
 }
 
 impl DatasetService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -83,11 +83,11 @@ impl super::stubs::DatasetService for DatasetService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -105,7 +105,7 @@ impl super::stubs::DatasetService for DatasetService {
                     "/v1/{}",
                     req.dataset
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("dataset"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("dataset"))?
                         .name
                 ),
             )
@@ -121,7 +121,7 @@ impl super::stubs::DatasetService for DatasetService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -153,12 +153,12 @@ impl super::stubs::DatasetService for DatasetService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -177,7 +177,7 @@ impl super::stubs::DatasetService for DatasetService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -251,7 +251,7 @@ impl super::stubs::DatasetService for DatasetService {
                     "/v1/{}",
                     req.dataset_version
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("dataset_version"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("dataset_version"))?
                         .name
                 ),
             )
@@ -267,7 +267,7 @@ impl super::stubs::DatasetService for DatasetService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -290,7 +290,7 @@ impl super::stubs::DatasetService for DatasetService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -315,11 +315,11 @@ impl super::stubs::DatasetService for DatasetService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -350,12 +350,12 @@ impl super::stubs::DatasetService for DatasetService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -374,7 +374,7 @@ impl super::stubs::DatasetService for DatasetService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -405,12 +405,12 @@ impl super::stubs::DatasetService for DatasetService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -443,7 +443,7 @@ impl super::stubs::DatasetService for DatasetService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, p| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 p.add(builder, "orderByAnnotation")
             });
         let builder = builder.query(&[("savedQuery", &req.saved_query)]);
@@ -460,7 +460,7 @@ impl super::stubs::DatasetService for DatasetService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "fieldMask")
             });
         let builder = builder.query(&[("annotationsLimit", &req.annotations_limit)]);
@@ -468,7 +468,7 @@ impl super::stubs::DatasetService for DatasetService {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -499,12 +499,12 @@ impl super::stubs::DatasetService for DatasetService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -523,7 +523,7 @@ impl super::stubs::DatasetService for DatasetService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -548,11 +548,11 @@ impl super::stubs::DatasetService for DatasetService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -583,12 +583,12 @@ impl super::stubs::DatasetService for DatasetService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -610,7 +610,7 @@ impl super::stubs::DatasetService for DatasetService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -629,7 +629,7 @@ impl super::stubs::DatasetService for DatasetService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -677,11 +677,11 @@ impl super::stubs::DatasetService for DatasetService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -707,7 +707,7 @@ impl super::stubs::DatasetService for DatasetService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -729,7 +729,7 @@ impl super::stubs::DatasetService for DatasetService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -748,7 +748,7 @@ impl super::stubs::DatasetService for DatasetService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -767,7 +767,7 @@ impl super::stubs::DatasetService for DatasetService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -786,7 +786,7 @@ impl super::stubs::DatasetService for DatasetService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -811,11 +811,11 @@ impl super::stubs::DatasetService for DatasetService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -834,10 +834,10 @@ impl super::stubs::DatasetService for DatasetService {
     }
 }
 
-/// Implements [DeploymentResourcePoolService](super::stubs::DeploymentResourcePoolService) using a [gclient::ReqwestClient].
+/// Implements [DeploymentResourcePoolService](super::stubs::DeploymentResourcePoolService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct DeploymentResourcePoolService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for DeploymentResourcePoolService {
@@ -849,8 +849,8 @@ impl std::fmt::Debug for DeploymentResourcePoolService {
 }
 
 impl DeploymentResourcePoolService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -891,7 +891,7 @@ impl super::stubs::DeploymentResourcePoolService for DeploymentResourcePoolServi
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -915,7 +915,7 @@ impl super::stubs::DeploymentResourcePoolService for DeploymentResourcePoolServi
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -933,9 +933,7 @@ impl super::stubs::DeploymentResourcePoolService for DeploymentResourcePoolServi
                     "/v1/{}",
                     req.deployment_resource_pool
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing(
-                            "deployment_resource_pool"
-                        ))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("deployment_resource_pool"))?
                         .name
                 ),
             )
@@ -951,7 +949,7 @@ impl super::stubs::DeploymentResourcePoolService for DeploymentResourcePoolServi
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -974,7 +972,7 @@ impl super::stubs::DeploymentResourcePoolService for DeploymentResourcePoolServi
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -998,7 +996,7 @@ impl super::stubs::DeploymentResourcePoolService for DeploymentResourcePoolServi
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1020,7 +1018,7 @@ impl super::stubs::DeploymentResourcePoolService for DeploymentResourcePoolServi
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1039,7 +1037,7 @@ impl super::stubs::DeploymentResourcePoolService for DeploymentResourcePoolServi
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1087,11 +1085,11 @@ impl super::stubs::DeploymentResourcePoolService for DeploymentResourcePoolServi
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1117,7 +1115,7 @@ impl super::stubs::DeploymentResourcePoolService for DeploymentResourcePoolServi
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1139,7 +1137,7 @@ impl super::stubs::DeploymentResourcePoolService for DeploymentResourcePoolServi
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1158,7 +1156,7 @@ impl super::stubs::DeploymentResourcePoolService for DeploymentResourcePoolServi
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1177,7 +1175,7 @@ impl super::stubs::DeploymentResourcePoolService for DeploymentResourcePoolServi
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1196,7 +1194,7 @@ impl super::stubs::DeploymentResourcePoolService for DeploymentResourcePoolServi
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1221,11 +1219,11 @@ impl super::stubs::DeploymentResourcePoolService for DeploymentResourcePoolServi
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1244,10 +1242,10 @@ impl super::stubs::DeploymentResourcePoolService for DeploymentResourcePoolServi
     }
 }
 
-/// Implements [EndpointService](super::stubs::EndpointService) using a [gclient::ReqwestClient].
+/// Implements [EndpointService](super::stubs::EndpointService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct EndpointService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for EndpointService {
@@ -1259,8 +1257,8 @@ impl std::fmt::Debug for EndpointService {
 }
 
 impl EndpointService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1304,7 +1302,7 @@ impl super::stubs::EndpointService for EndpointService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1335,12 +1333,12 @@ impl super::stubs::EndpointService for EndpointService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1358,7 +1356,7 @@ impl super::stubs::EndpointService for EndpointService {
                     "/v1/{}",
                     req.endpoint
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("endpoint"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("endpoint"))?
                         .name
                 ),
             )
@@ -1374,7 +1372,7 @@ impl super::stubs::EndpointService for EndpointService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1396,7 +1394,7 @@ impl super::stubs::EndpointService for EndpointService {
                     "/v1/{}:update",
                     req.endpoint
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("endpoint"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("endpoint"))?
                         .name
                 ),
             )
@@ -1423,7 +1421,7 @@ impl super::stubs::EndpointService for EndpointService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1505,7 +1503,7 @@ impl super::stubs::EndpointService for EndpointService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1524,7 +1522,7 @@ impl super::stubs::EndpointService for EndpointService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1572,11 +1570,11 @@ impl super::stubs::EndpointService for EndpointService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1602,7 +1600,7 @@ impl super::stubs::EndpointService for EndpointService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1624,7 +1622,7 @@ impl super::stubs::EndpointService for EndpointService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1643,7 +1641,7 @@ impl super::stubs::EndpointService for EndpointService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1662,7 +1660,7 @@ impl super::stubs::EndpointService for EndpointService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1681,7 +1679,7 @@ impl super::stubs::EndpointService for EndpointService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1706,11 +1704,11 @@ impl super::stubs::EndpointService for EndpointService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1729,10 +1727,10 @@ impl super::stubs::EndpointService for EndpointService {
     }
 }
 
-/// Implements [EvaluationService](super::stubs::EvaluationService) using a [gclient::ReqwestClient].
+/// Implements [EvaluationService](super::stubs::EvaluationService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct EvaluationService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for EvaluationService {
@@ -1744,8 +1742,8 @@ impl std::fmt::Debug for EvaluationService {
 }
 
 impl EvaluationService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1789,7 +1787,7 @@ impl super::stubs::EvaluationService for EvaluationService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1808,7 +1806,7 @@ impl super::stubs::EvaluationService for EvaluationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1856,11 +1854,11 @@ impl super::stubs::EvaluationService for EvaluationService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1886,7 +1884,7 @@ impl super::stubs::EvaluationService for EvaluationService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1908,7 +1906,7 @@ impl super::stubs::EvaluationService for EvaluationService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1927,7 +1925,7 @@ impl super::stubs::EvaluationService for EvaluationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1946,7 +1944,7 @@ impl super::stubs::EvaluationService for EvaluationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1965,7 +1963,7 @@ impl super::stubs::EvaluationService for EvaluationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1990,19 +1988,19 @@ impl super::stubs::EvaluationService for EvaluationService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [FeatureOnlineStoreAdminService](super::stubs::FeatureOnlineStoreAdminService) using a [gclient::ReqwestClient].
+/// Implements [FeatureOnlineStoreAdminService](super::stubs::FeatureOnlineStoreAdminService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct FeatureOnlineStoreAdminService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for FeatureOnlineStoreAdminService {
@@ -2014,8 +2012,8 @@ impl std::fmt::Debug for FeatureOnlineStoreAdminService {
 }
 
 impl FeatureOnlineStoreAdminService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -2059,7 +2057,7 @@ impl super::stubs::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminSer
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2085,7 +2083,7 @@ impl super::stubs::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminSer
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2103,7 +2101,7 @@ impl super::stubs::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminSer
                     "/v1/{}",
                     req.feature_online_store
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("feature_online_store"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("feature_online_store"))?
                         .name
                 ),
             )
@@ -2119,7 +2117,7 @@ impl super::stubs::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminSer
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -2143,7 +2141,7 @@ impl super::stubs::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminSer
             );
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2186,7 +2184,7 @@ impl super::stubs::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminSer
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2212,7 +2210,7 @@ impl super::stubs::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminSer
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2230,7 +2228,7 @@ impl super::stubs::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminSer
                     "/v1/{}",
                     req.feature_view
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("feature_view"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("feature_view"))?
                         .name
                 ),
             )
@@ -2246,7 +2244,7 @@ impl super::stubs::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminSer
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -2269,7 +2267,7 @@ impl super::stubs::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminSer
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2308,7 +2306,7 @@ impl super::stubs::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminSer
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2334,7 +2332,7 @@ impl super::stubs::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminSer
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2356,7 +2354,7 @@ impl super::stubs::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminSer
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2375,7 +2373,7 @@ impl super::stubs::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminSer
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2423,11 +2421,11 @@ impl super::stubs::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminSer
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2453,7 +2451,7 @@ impl super::stubs::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminSer
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2475,7 +2473,7 @@ impl super::stubs::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminSer
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2494,7 +2492,7 @@ impl super::stubs::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminSer
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2513,7 +2511,7 @@ impl super::stubs::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminSer
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2532,7 +2530,7 @@ impl super::stubs::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminSer
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2557,11 +2555,11 @@ impl super::stubs::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminSer
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2580,10 +2578,10 @@ impl super::stubs::FeatureOnlineStoreAdminService for FeatureOnlineStoreAdminSer
     }
 }
 
-/// Implements [FeatureOnlineStoreService](super::stubs::FeatureOnlineStoreService) using a [gclient::ReqwestClient].
+/// Implements [FeatureOnlineStoreService](super::stubs::FeatureOnlineStoreService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct FeatureOnlineStoreService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for FeatureOnlineStoreService {
@@ -2595,8 +2593,8 @@ impl std::fmt::Debug for FeatureOnlineStoreService {
 }
 
 impl FeatureOnlineStoreService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -2660,7 +2658,7 @@ impl super::stubs::FeatureOnlineStoreService for FeatureOnlineStoreService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2679,7 +2677,7 @@ impl super::stubs::FeatureOnlineStoreService for FeatureOnlineStoreService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2727,11 +2725,11 @@ impl super::stubs::FeatureOnlineStoreService for FeatureOnlineStoreService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2757,7 +2755,7 @@ impl super::stubs::FeatureOnlineStoreService for FeatureOnlineStoreService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2779,7 +2777,7 @@ impl super::stubs::FeatureOnlineStoreService for FeatureOnlineStoreService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2798,7 +2796,7 @@ impl super::stubs::FeatureOnlineStoreService for FeatureOnlineStoreService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2817,7 +2815,7 @@ impl super::stubs::FeatureOnlineStoreService for FeatureOnlineStoreService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2836,7 +2834,7 @@ impl super::stubs::FeatureOnlineStoreService for FeatureOnlineStoreService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2861,19 +2859,19 @@ impl super::stubs::FeatureOnlineStoreService for FeatureOnlineStoreService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [FeatureRegistryService](super::stubs::FeatureRegistryService) using a [gclient::ReqwestClient].
+/// Implements [FeatureRegistryService](super::stubs::FeatureRegistryService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct FeatureRegistryService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for FeatureRegistryService {
@@ -2885,8 +2883,8 @@ impl std::fmt::Debug for FeatureRegistryService {
 }
 
 impl FeatureRegistryService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -2930,7 +2928,7 @@ impl super::stubs::FeatureRegistryService for FeatureRegistryService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2956,7 +2954,7 @@ impl super::stubs::FeatureRegistryService for FeatureRegistryService {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2974,7 +2972,7 @@ impl super::stubs::FeatureRegistryService for FeatureRegistryService {
                     "/v1/{}",
                     req.feature_group
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("feature_group"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("feature_group"))?
                         .name
                 ),
             )
@@ -2990,7 +2988,7 @@ impl super::stubs::FeatureRegistryService for FeatureRegistryService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -3014,7 +3012,7 @@ impl super::stubs::FeatureRegistryService for FeatureRegistryService {
             );
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3076,7 +3074,7 @@ impl super::stubs::FeatureRegistryService for FeatureRegistryService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3105,12 +3103,12 @@ impl super::stubs::FeatureRegistryService for FeatureRegistryService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         let builder = builder.query(&[("latestStatsCount", &req.latest_stats_count)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3128,7 +3126,7 @@ impl super::stubs::FeatureRegistryService for FeatureRegistryService {
                     "/v1/{}",
                     req.feature
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("feature"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("feature"))?
                         .name
                 ),
             )
@@ -3144,7 +3142,7 @@ impl super::stubs::FeatureRegistryService for FeatureRegistryService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -3167,7 +3165,7 @@ impl super::stubs::FeatureRegistryService for FeatureRegistryService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3189,7 +3187,7 @@ impl super::stubs::FeatureRegistryService for FeatureRegistryService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3208,7 +3206,7 @@ impl super::stubs::FeatureRegistryService for FeatureRegistryService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3256,11 +3254,11 @@ impl super::stubs::FeatureRegistryService for FeatureRegistryService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3286,7 +3284,7 @@ impl super::stubs::FeatureRegistryService for FeatureRegistryService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3308,7 +3306,7 @@ impl super::stubs::FeatureRegistryService for FeatureRegistryService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3327,7 +3325,7 @@ impl super::stubs::FeatureRegistryService for FeatureRegistryService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3346,7 +3344,7 @@ impl super::stubs::FeatureRegistryService for FeatureRegistryService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3365,7 +3363,7 @@ impl super::stubs::FeatureRegistryService for FeatureRegistryService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3390,11 +3388,11 @@ impl super::stubs::FeatureRegistryService for FeatureRegistryService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3413,10 +3411,10 @@ impl super::stubs::FeatureRegistryService for FeatureRegistryService {
     }
 }
 
-/// Implements [FeaturestoreOnlineServingService](super::stubs::FeaturestoreOnlineServingService) using a [gclient::ReqwestClient].
+/// Implements [FeaturestoreOnlineServingService](super::stubs::FeaturestoreOnlineServingService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct FeaturestoreOnlineServingService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for FeaturestoreOnlineServingService {
@@ -3428,8 +3426,8 @@ impl std::fmt::Debug for FeaturestoreOnlineServingService {
 }
 
 impl FeaturestoreOnlineServingService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -3493,7 +3491,7 @@ impl super::stubs::FeaturestoreOnlineServingService for FeaturestoreOnlineServin
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3512,7 +3510,7 @@ impl super::stubs::FeaturestoreOnlineServingService for FeaturestoreOnlineServin
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3560,11 +3558,11 @@ impl super::stubs::FeaturestoreOnlineServingService for FeaturestoreOnlineServin
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3590,7 +3588,7 @@ impl super::stubs::FeaturestoreOnlineServingService for FeaturestoreOnlineServin
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3612,7 +3610,7 @@ impl super::stubs::FeaturestoreOnlineServingService for FeaturestoreOnlineServin
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3631,7 +3629,7 @@ impl super::stubs::FeaturestoreOnlineServingService for FeaturestoreOnlineServin
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3650,7 +3648,7 @@ impl super::stubs::FeaturestoreOnlineServingService for FeaturestoreOnlineServin
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3669,7 +3667,7 @@ impl super::stubs::FeaturestoreOnlineServingService for FeaturestoreOnlineServin
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3694,19 +3692,19 @@ impl super::stubs::FeaturestoreOnlineServingService for FeaturestoreOnlineServin
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [FeaturestoreService](super::stubs::FeaturestoreService) using a [gclient::ReqwestClient].
+/// Implements [FeaturestoreService](super::stubs::FeaturestoreService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct FeaturestoreService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for FeaturestoreService {
@@ -3718,8 +3716,8 @@ impl std::fmt::Debug for FeaturestoreService {
 }
 
 impl FeaturestoreService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -3763,7 +3761,7 @@ impl super::stubs::FeaturestoreService for FeaturestoreService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3795,11 +3793,11 @@ impl super::stubs::FeaturestoreService for FeaturestoreService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3817,7 +3815,7 @@ impl super::stubs::FeaturestoreService for FeaturestoreService {
                     "/v1/{}",
                     req.featurestore
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("featurestore"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("featurestore"))?
                         .name
                 ),
             )
@@ -3833,7 +3831,7 @@ impl super::stubs::FeaturestoreService for FeaturestoreService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -3857,7 +3855,7 @@ impl super::stubs::FeaturestoreService for FeaturestoreService {
             );
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3899,7 +3897,7 @@ impl super::stubs::FeaturestoreService for FeaturestoreService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3931,11 +3929,11 @@ impl super::stubs::FeaturestoreService for FeaturestoreService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3953,7 +3951,7 @@ impl super::stubs::FeaturestoreService for FeaturestoreService {
                     "/v1/{}",
                     req.entity_type
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("entity_type"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("entity_type"))?
                         .name
                 ),
             )
@@ -3969,7 +3967,7 @@ impl super::stubs::FeaturestoreService for FeaturestoreService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -3993,7 +3991,7 @@ impl super::stubs::FeaturestoreService for FeaturestoreService {
             );
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4055,7 +4053,7 @@ impl super::stubs::FeaturestoreService for FeaturestoreService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4084,12 +4082,12 @@ impl super::stubs::FeaturestoreService for FeaturestoreService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         let builder = builder.query(&[("latestStatsCount", &req.latest_stats_count)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4107,7 +4105,7 @@ impl super::stubs::FeaturestoreService for FeaturestoreService {
                     "/v1/{}",
                     req.feature
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("feature"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("feature"))?
                         .name
                 ),
             )
@@ -4123,7 +4121,7 @@ impl super::stubs::FeaturestoreService for FeaturestoreService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -4146,7 +4144,7 @@ impl super::stubs::FeaturestoreService for FeaturestoreService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4251,7 +4249,7 @@ impl super::stubs::FeaturestoreService for FeaturestoreService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4273,7 +4271,7 @@ impl super::stubs::FeaturestoreService for FeaturestoreService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4292,7 +4290,7 @@ impl super::stubs::FeaturestoreService for FeaturestoreService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4340,11 +4338,11 @@ impl super::stubs::FeaturestoreService for FeaturestoreService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4370,7 +4368,7 @@ impl super::stubs::FeaturestoreService for FeaturestoreService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4392,7 +4390,7 @@ impl super::stubs::FeaturestoreService for FeaturestoreService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4411,7 +4409,7 @@ impl super::stubs::FeaturestoreService for FeaturestoreService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4430,7 +4428,7 @@ impl super::stubs::FeaturestoreService for FeaturestoreService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4449,7 +4447,7 @@ impl super::stubs::FeaturestoreService for FeaturestoreService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4474,11 +4472,11 @@ impl super::stubs::FeaturestoreService for FeaturestoreService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4497,10 +4495,10 @@ impl super::stubs::FeaturestoreService for FeaturestoreService {
     }
 }
 
-/// Implements [GenAiCacheService](super::stubs::GenAiCacheService) using a [gclient::ReqwestClient].
+/// Implements [GenAiCacheService](super::stubs::GenAiCacheService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct GenAiCacheService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for GenAiCacheService {
@@ -4512,8 +4510,8 @@ impl std::fmt::Debug for GenAiCacheService {
 }
 
 impl GenAiCacheService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -4556,7 +4554,7 @@ impl super::stubs::GenAiCacheService for GenAiCacheService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4574,7 +4572,7 @@ impl super::stubs::GenAiCacheService for GenAiCacheService {
                     "/v1/{}",
                     req.cached_content
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("cached_content"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("cached_content"))?
                         .name
                 ),
             )
@@ -4590,7 +4588,7 @@ impl super::stubs::GenAiCacheService for GenAiCacheService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -4613,7 +4611,7 @@ impl super::stubs::GenAiCacheService for GenAiCacheService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4637,7 +4635,7 @@ impl super::stubs::GenAiCacheService for GenAiCacheService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4659,7 +4657,7 @@ impl super::stubs::GenAiCacheService for GenAiCacheService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4678,7 +4676,7 @@ impl super::stubs::GenAiCacheService for GenAiCacheService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4726,11 +4724,11 @@ impl super::stubs::GenAiCacheService for GenAiCacheService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4756,7 +4754,7 @@ impl super::stubs::GenAiCacheService for GenAiCacheService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4778,7 +4776,7 @@ impl super::stubs::GenAiCacheService for GenAiCacheService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4797,7 +4795,7 @@ impl super::stubs::GenAiCacheService for GenAiCacheService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4816,7 +4814,7 @@ impl super::stubs::GenAiCacheService for GenAiCacheService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4835,7 +4833,7 @@ impl super::stubs::GenAiCacheService for GenAiCacheService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4860,19 +4858,19 @@ impl super::stubs::GenAiCacheService for GenAiCacheService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [GenAiTuningService](super::stubs::GenAiTuningService) using a [gclient::ReqwestClient].
+/// Implements [GenAiTuningService](super::stubs::GenAiTuningService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct GenAiTuningService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for GenAiTuningService {
@@ -4884,8 +4882,8 @@ impl std::fmt::Debug for GenAiTuningService {
 }
 
 impl GenAiTuningService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -4928,7 +4926,7 @@ impl super::stubs::GenAiTuningService for GenAiTuningService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4953,7 +4951,7 @@ impl super::stubs::GenAiTuningService for GenAiTuningService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5012,7 +5010,7 @@ impl super::stubs::GenAiTuningService for GenAiTuningService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5031,7 +5029,7 @@ impl super::stubs::GenAiTuningService for GenAiTuningService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5079,11 +5077,11 @@ impl super::stubs::GenAiTuningService for GenAiTuningService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5109,7 +5107,7 @@ impl super::stubs::GenAiTuningService for GenAiTuningService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5131,7 +5129,7 @@ impl super::stubs::GenAiTuningService for GenAiTuningService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5150,7 +5148,7 @@ impl super::stubs::GenAiTuningService for GenAiTuningService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5169,7 +5167,7 @@ impl super::stubs::GenAiTuningService for GenAiTuningService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5188,7 +5186,7 @@ impl super::stubs::GenAiTuningService for GenAiTuningService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5213,11 +5211,11 @@ impl super::stubs::GenAiTuningService for GenAiTuningService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5236,10 +5234,10 @@ impl super::stubs::GenAiTuningService for GenAiTuningService {
     }
 }
 
-/// Implements [IndexEndpointService](super::stubs::IndexEndpointService) using a [gclient::ReqwestClient].
+/// Implements [IndexEndpointService](super::stubs::IndexEndpointService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct IndexEndpointService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for IndexEndpointService {
@@ -5251,8 +5249,8 @@ impl std::fmt::Debug for IndexEndpointService {
 }
 
 impl IndexEndpointService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -5295,7 +5293,7 @@ impl super::stubs::IndexEndpointService for IndexEndpointService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5326,11 +5324,11 @@ impl super::stubs::IndexEndpointService for IndexEndpointService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5348,7 +5346,7 @@ impl super::stubs::IndexEndpointService for IndexEndpointService {
                     "/v1/{}",
                     req.index_endpoint
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("index_endpoint"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("index_endpoint"))?
                         .name
                 ),
             )
@@ -5364,7 +5362,7 @@ impl super::stubs::IndexEndpointService for IndexEndpointService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -5387,7 +5385,7 @@ impl super::stubs::IndexEndpointService for IndexEndpointService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5471,7 +5469,7 @@ impl super::stubs::IndexEndpointService for IndexEndpointService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5490,7 +5488,7 @@ impl super::stubs::IndexEndpointService for IndexEndpointService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5538,11 +5536,11 @@ impl super::stubs::IndexEndpointService for IndexEndpointService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5568,7 +5566,7 @@ impl super::stubs::IndexEndpointService for IndexEndpointService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5590,7 +5588,7 @@ impl super::stubs::IndexEndpointService for IndexEndpointService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5609,7 +5607,7 @@ impl super::stubs::IndexEndpointService for IndexEndpointService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5628,7 +5626,7 @@ impl super::stubs::IndexEndpointService for IndexEndpointService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5647,7 +5645,7 @@ impl super::stubs::IndexEndpointService for IndexEndpointService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5672,11 +5670,11 @@ impl super::stubs::IndexEndpointService for IndexEndpointService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5695,10 +5693,10 @@ impl super::stubs::IndexEndpointService for IndexEndpointService {
     }
 }
 
-/// Implements [IndexService](super::stubs::IndexService) using a [gclient::ReqwestClient].
+/// Implements [IndexService](super::stubs::IndexService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct IndexService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for IndexService {
@@ -5710,8 +5708,8 @@ impl std::fmt::Debug for IndexService {
 }
 
 impl IndexService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -5749,7 +5747,7 @@ impl super::stubs::IndexService for IndexService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5777,11 +5775,11 @@ impl super::stubs::IndexService for IndexService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5799,7 +5797,7 @@ impl super::stubs::IndexService for IndexService {
                     "/v1/{}",
                     req.index
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("index"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("index"))?
                         .name
                 ),
             )
@@ -5815,7 +5813,7 @@ impl super::stubs::IndexService for IndexService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.index), options).await
@@ -5836,7 +5834,7 @@ impl super::stubs::IndexService for IndexService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5898,7 +5896,7 @@ impl super::stubs::IndexService for IndexService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5917,7 +5915,7 @@ impl super::stubs::IndexService for IndexService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5965,11 +5963,11 @@ impl super::stubs::IndexService for IndexService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5995,7 +5993,7 @@ impl super::stubs::IndexService for IndexService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -6017,7 +6015,7 @@ impl super::stubs::IndexService for IndexService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -6036,7 +6034,7 @@ impl super::stubs::IndexService for IndexService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -6055,7 +6053,7 @@ impl super::stubs::IndexService for IndexService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -6074,7 +6072,7 @@ impl super::stubs::IndexService for IndexService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -6099,11 +6097,11 @@ impl super::stubs::IndexService for IndexService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -6122,10 +6120,10 @@ impl super::stubs::IndexService for IndexService {
     }
 }
 
-/// Implements [JobService](super::stubs::JobService) using a [gclient::ReqwestClient].
+/// Implements [JobService](super::stubs::JobService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct JobService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for JobService {
@@ -6137,8 +6135,8 @@ impl std::fmt::Debug for JobService {
 }
 
 impl JobService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -6181,7 +6179,7 @@ impl super::stubs::JobService for JobService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -6212,11 +6210,11 @@ impl super::stubs::JobService for JobService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -6235,7 +6233,7 @@ impl super::stubs::JobService for JobService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -6293,7 +6291,7 @@ impl super::stubs::JobService for JobService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -6324,12 +6322,12 @@ impl super::stubs::JobService for JobService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -6348,7 +6346,7 @@ impl super::stubs::JobService for JobService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -6406,7 +6404,7 @@ impl super::stubs::JobService for JobService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -6437,11 +6435,11 @@ impl super::stubs::JobService for JobService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -6460,7 +6458,7 @@ impl super::stubs::JobService for JobService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -6515,7 +6513,7 @@ impl super::stubs::JobService for JobService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -6543,11 +6541,11 @@ impl super::stubs::JobService for JobService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -6566,7 +6564,7 @@ impl super::stubs::JobService for JobService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -6602,7 +6600,7 @@ impl super::stubs::JobService for JobService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -6626,7 +6624,7 @@ impl super::stubs::JobService for JobService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -6667,7 +6665,7 @@ impl super::stubs::JobService for JobService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -6698,11 +6696,11 @@ impl super::stubs::JobService for JobService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -6721,7 +6719,7 @@ impl super::stubs::JobService for JobService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -6802,7 +6800,7 @@ impl super::stubs::JobService for JobService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -6833,11 +6831,11 @@ impl super::stubs::JobService for JobService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -6855,7 +6853,7 @@ impl super::stubs::JobService for JobService {
                     "/v1/{}",
                     req.model_deployment_monitoring_job
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing(
+                        .ok_or_else(|| gaxi::path_parameter::missing(
                             "model_deployment_monitoring_job"
                         ))?
                         .name
@@ -6873,7 +6871,7 @@ impl super::stubs::JobService for JobService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -6896,7 +6894,7 @@ impl super::stubs::JobService for JobService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -6952,7 +6950,7 @@ impl super::stubs::JobService for JobService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -6971,7 +6969,7 @@ impl super::stubs::JobService for JobService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -7019,11 +7017,11 @@ impl super::stubs::JobService for JobService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -7049,7 +7047,7 @@ impl super::stubs::JobService for JobService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -7071,7 +7069,7 @@ impl super::stubs::JobService for JobService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -7090,7 +7088,7 @@ impl super::stubs::JobService for JobService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -7109,7 +7107,7 @@ impl super::stubs::JobService for JobService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -7128,7 +7126,7 @@ impl super::stubs::JobService for JobService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -7153,11 +7151,11 @@ impl super::stubs::JobService for JobService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -7176,10 +7174,10 @@ impl super::stubs::JobService for JobService {
     }
 }
 
-/// Implements [LlmUtilityService](super::stubs::LlmUtilityService) using a [gclient::ReqwestClient].
+/// Implements [LlmUtilityService](super::stubs::LlmUtilityService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct LlmUtilityService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for LlmUtilityService {
@@ -7191,8 +7189,8 @@ impl std::fmt::Debug for LlmUtilityService {
 }
 
 impl LlmUtilityService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -7256,7 +7254,7 @@ impl super::stubs::LlmUtilityService for LlmUtilityService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -7275,7 +7273,7 @@ impl super::stubs::LlmUtilityService for LlmUtilityService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -7323,11 +7321,11 @@ impl super::stubs::LlmUtilityService for LlmUtilityService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -7353,7 +7351,7 @@ impl super::stubs::LlmUtilityService for LlmUtilityService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -7375,7 +7373,7 @@ impl super::stubs::LlmUtilityService for LlmUtilityService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -7394,7 +7392,7 @@ impl super::stubs::LlmUtilityService for LlmUtilityService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -7413,7 +7411,7 @@ impl super::stubs::LlmUtilityService for LlmUtilityService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -7432,7 +7430,7 @@ impl super::stubs::LlmUtilityService for LlmUtilityService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -7457,19 +7455,19 @@ impl super::stubs::LlmUtilityService for LlmUtilityService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [MatchService](super::stubs::MatchService) using a [gclient::ReqwestClient].
+/// Implements [MatchService](super::stubs::MatchService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct MatchService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for MatchService {
@@ -7481,8 +7479,8 @@ impl std::fmt::Debug for MatchService {
 }
 
 impl MatchService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -7546,7 +7544,7 @@ impl super::stubs::MatchService for MatchService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -7565,7 +7563,7 @@ impl super::stubs::MatchService for MatchService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -7613,11 +7611,11 @@ impl super::stubs::MatchService for MatchService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -7643,7 +7641,7 @@ impl super::stubs::MatchService for MatchService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -7665,7 +7663,7 @@ impl super::stubs::MatchService for MatchService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -7684,7 +7682,7 @@ impl super::stubs::MatchService for MatchService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -7703,7 +7701,7 @@ impl super::stubs::MatchService for MatchService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -7722,7 +7720,7 @@ impl super::stubs::MatchService for MatchService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -7747,19 +7745,19 @@ impl super::stubs::MatchService for MatchService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [MetadataService](super::stubs::MetadataService) using a [gclient::ReqwestClient].
+/// Implements [MetadataService](super::stubs::MetadataService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct MetadataService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for MetadataService {
@@ -7771,8 +7769,8 @@ impl std::fmt::Debug for MetadataService {
 }
 
 impl MetadataService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -7816,7 +7814,7 @@ impl super::stubs::MetadataService for MetadataService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -7840,7 +7838,7 @@ impl super::stubs::MetadataService for MetadataService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -7860,7 +7858,7 @@ impl super::stubs::MetadataService for MetadataService {
             );
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -7902,7 +7900,7 @@ impl super::stubs::MetadataService for MetadataService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -7928,7 +7926,7 @@ impl super::stubs::MetadataService for MetadataService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -7946,7 +7944,7 @@ impl super::stubs::MetadataService for MetadataService {
                     "/v1/{}",
                     req.artifact
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("artifact"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("artifact"))?
                         .name
                 ),
             )
@@ -7962,7 +7960,7 @@ impl super::stubs::MetadataService for MetadataService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("allowMissing", &req.allow_missing)]);
@@ -7987,7 +7985,7 @@ impl super::stubs::MetadataService for MetadataService {
             );
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -8049,7 +8047,7 @@ impl super::stubs::MetadataService for MetadataService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -8072,7 +8070,7 @@ impl super::stubs::MetadataService for MetadataService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -8090,7 +8088,7 @@ impl super::stubs::MetadataService for MetadataService {
                     "/v1/{}",
                     req.context
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("context"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("context"))?
                         .name
                 ),
             )
@@ -8106,7 +8104,7 @@ impl super::stubs::MetadataService for MetadataService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("allowMissing", &req.allow_missing)]);
@@ -8132,7 +8130,7 @@ impl super::stubs::MetadataService for MetadataService {
         let builder = builder.query(&[("force", &req.force)]);
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -8234,7 +8232,7 @@ impl super::stubs::MetadataService for MetadataService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -8276,7 +8274,7 @@ impl super::stubs::MetadataService for MetadataService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -8302,7 +8300,7 @@ impl super::stubs::MetadataService for MetadataService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -8320,7 +8318,7 @@ impl super::stubs::MetadataService for MetadataService {
                     "/v1/{}",
                     req.execution
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("execution"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("execution"))?
                         .name
                 ),
             )
@@ -8336,7 +8334,7 @@ impl super::stubs::MetadataService for MetadataService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("allowMissing", &req.allow_missing)]);
@@ -8361,7 +8359,7 @@ impl super::stubs::MetadataService for MetadataService {
             );
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -8423,7 +8421,7 @@ impl super::stubs::MetadataService for MetadataService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -8465,7 +8463,7 @@ impl super::stubs::MetadataService for MetadataService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -8490,7 +8488,7 @@ impl super::stubs::MetadataService for MetadataService {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -8514,7 +8512,7 @@ impl super::stubs::MetadataService for MetadataService {
         let builder = builder.query(&[("maxHops", &req.max_hops)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -8536,7 +8534,7 @@ impl super::stubs::MetadataService for MetadataService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -8555,7 +8553,7 @@ impl super::stubs::MetadataService for MetadataService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -8603,11 +8601,11 @@ impl super::stubs::MetadataService for MetadataService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -8633,7 +8631,7 @@ impl super::stubs::MetadataService for MetadataService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -8655,7 +8653,7 @@ impl super::stubs::MetadataService for MetadataService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -8674,7 +8672,7 @@ impl super::stubs::MetadataService for MetadataService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -8693,7 +8691,7 @@ impl super::stubs::MetadataService for MetadataService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -8712,7 +8710,7 @@ impl super::stubs::MetadataService for MetadataService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -8737,11 +8735,11 @@ impl super::stubs::MetadataService for MetadataService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -8760,10 +8758,10 @@ impl super::stubs::MetadataService for MetadataService {
     }
 }
 
-/// Implements [MigrationService](super::stubs::MigrationService) using a [gclient::ReqwestClient].
+/// Implements [MigrationService](super::stubs::MigrationService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct MigrationService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for MigrationService {
@@ -8775,8 +8773,8 @@ impl std::fmt::Debug for MigrationService {
 }
 
 impl MigrationService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -8840,7 +8838,7 @@ impl super::stubs::MigrationService for MigrationService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -8859,7 +8857,7 @@ impl super::stubs::MigrationService for MigrationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -8907,11 +8905,11 @@ impl super::stubs::MigrationService for MigrationService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -8937,7 +8935,7 @@ impl super::stubs::MigrationService for MigrationService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -8959,7 +8957,7 @@ impl super::stubs::MigrationService for MigrationService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -8978,7 +8976,7 @@ impl super::stubs::MigrationService for MigrationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -8997,7 +8995,7 @@ impl super::stubs::MigrationService for MigrationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -9016,7 +9014,7 @@ impl super::stubs::MigrationService for MigrationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -9041,11 +9039,11 @@ impl super::stubs::MigrationService for MigrationService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -9064,10 +9062,10 @@ impl super::stubs::MigrationService for MigrationService {
     }
 }
 
-/// Implements [ModelGardenService](super::stubs::ModelGardenService) using a [gclient::ReqwestClient].
+/// Implements [ModelGardenService](super::stubs::ModelGardenService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ModelGardenService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ModelGardenService {
@@ -9079,8 +9077,8 @@ impl std::fmt::Debug for ModelGardenService {
 }
 
 impl ModelGardenService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -9105,7 +9103,7 @@ impl super::stubs::ModelGardenService for ModelGardenService {
         let builder = builder.query(&[("isHuggingFaceModel", &req.is_hugging_face_model)]);
         let builder = builder.query(&[("huggingFaceToken", &req.hugging_face_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -9127,7 +9125,7 @@ impl super::stubs::ModelGardenService for ModelGardenService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -9146,7 +9144,7 @@ impl super::stubs::ModelGardenService for ModelGardenService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -9194,11 +9192,11 @@ impl super::stubs::ModelGardenService for ModelGardenService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -9224,7 +9222,7 @@ impl super::stubs::ModelGardenService for ModelGardenService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -9246,7 +9244,7 @@ impl super::stubs::ModelGardenService for ModelGardenService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -9265,7 +9263,7 @@ impl super::stubs::ModelGardenService for ModelGardenService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -9284,7 +9282,7 @@ impl super::stubs::ModelGardenService for ModelGardenService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -9303,7 +9301,7 @@ impl super::stubs::ModelGardenService for ModelGardenService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -9328,19 +9326,19 @@ impl super::stubs::ModelGardenService for ModelGardenService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [ModelService](super::stubs::ModelService) using a [gclient::ReqwestClient].
+/// Implements [ModelService](super::stubs::ModelService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ModelService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ModelService {
@@ -9352,8 +9350,8 @@ impl std::fmt::Debug for ModelService {
 }
 
 impl ModelService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -9394,7 +9392,7 @@ impl super::stubs::ModelService for ModelService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -9422,12 +9420,12 @@ impl super::stubs::ModelService for ModelService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -9458,12 +9456,12 @@ impl super::stubs::ModelService for ModelService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -9487,7 +9485,7 @@ impl super::stubs::ModelService for ModelService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -9505,7 +9503,7 @@ impl super::stubs::ModelService for ModelService {
                     "/v1/{}",
                     req.model
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("model"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("model"))?
                         .name
                 ),
             )
@@ -9521,7 +9519,7 @@ impl super::stubs::ModelService for ModelService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.model), options).await
@@ -9562,7 +9560,7 @@ impl super::stubs::ModelService for ModelService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -9584,7 +9582,7 @@ impl super::stubs::ModelService for ModelService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -9720,7 +9718,7 @@ impl super::stubs::ModelService for ModelService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -9751,11 +9749,11 @@ impl super::stubs::ModelService for ModelService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -9774,7 +9772,7 @@ impl super::stubs::ModelService for ModelService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -9802,11 +9800,11 @@ impl super::stubs::ModelService for ModelService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -9828,7 +9826,7 @@ impl super::stubs::ModelService for ModelService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -9847,7 +9845,7 @@ impl super::stubs::ModelService for ModelService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -9895,11 +9893,11 @@ impl super::stubs::ModelService for ModelService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -9925,7 +9923,7 @@ impl super::stubs::ModelService for ModelService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -9947,7 +9945,7 @@ impl super::stubs::ModelService for ModelService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -9966,7 +9964,7 @@ impl super::stubs::ModelService for ModelService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -9985,7 +9983,7 @@ impl super::stubs::ModelService for ModelService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -10004,7 +10002,7 @@ impl super::stubs::ModelService for ModelService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -10029,11 +10027,11 @@ impl super::stubs::ModelService for ModelService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -10052,10 +10050,10 @@ impl super::stubs::ModelService for ModelService {
     }
 }
 
-/// Implements [NotebookService](super::stubs::NotebookService) using a [gclient::ReqwestClient].
+/// Implements [NotebookService](super::stubs::NotebookService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct NotebookService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for NotebookService {
@@ -10067,8 +10065,8 @@ impl std::fmt::Debug for NotebookService {
 }
 
 impl NotebookService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -10115,7 +10113,7 @@ impl super::stubs::NotebookService for NotebookService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -10146,12 +10144,12 @@ impl super::stubs::NotebookService for NotebookService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -10170,7 +10168,7 @@ impl super::stubs::NotebookService for NotebookService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -10188,9 +10186,7 @@ impl super::stubs::NotebookService for NotebookService {
                     "/v1/{}",
                     req.notebook_runtime_template
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing(
-                            "notebook_runtime_template"
-                        ))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("notebook_runtime_template"))?
                         .name
                 ),
             )
@@ -10206,7 +10202,7 @@ impl super::stubs::NotebookService for NotebookService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -10249,7 +10245,7 @@ impl super::stubs::NotebookService for NotebookService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -10280,12 +10276,12 @@ impl super::stubs::NotebookService for NotebookService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -10304,7 +10300,7 @@ impl super::stubs::NotebookService for NotebookService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -10398,7 +10394,7 @@ impl super::stubs::NotebookService for NotebookService {
             );
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -10425,7 +10421,7 @@ impl super::stubs::NotebookService for NotebookService {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -10444,7 +10440,7 @@ impl super::stubs::NotebookService for NotebookService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -10466,7 +10462,7 @@ impl super::stubs::NotebookService for NotebookService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -10485,7 +10481,7 @@ impl super::stubs::NotebookService for NotebookService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -10533,11 +10529,11 @@ impl super::stubs::NotebookService for NotebookService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -10563,7 +10559,7 @@ impl super::stubs::NotebookService for NotebookService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -10585,7 +10581,7 @@ impl super::stubs::NotebookService for NotebookService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -10604,7 +10600,7 @@ impl super::stubs::NotebookService for NotebookService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -10623,7 +10619,7 @@ impl super::stubs::NotebookService for NotebookService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -10642,7 +10638,7 @@ impl super::stubs::NotebookService for NotebookService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -10667,11 +10663,11 @@ impl super::stubs::NotebookService for NotebookService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -10690,10 +10686,10 @@ impl super::stubs::NotebookService for NotebookService {
     }
 }
 
-/// Implements [PersistentResourceService](super::stubs::PersistentResourceService) using a [gclient::ReqwestClient].
+/// Implements [PersistentResourceService](super::stubs::PersistentResourceService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct PersistentResourceService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for PersistentResourceService {
@@ -10705,8 +10701,8 @@ impl std::fmt::Debug for PersistentResourceService {
 }
 
 impl PersistentResourceService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -10750,7 +10746,7 @@ impl super::stubs::PersistentResourceService for PersistentResourceService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -10774,7 +10770,7 @@ impl super::stubs::PersistentResourceService for PersistentResourceService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -10793,7 +10789,7 @@ impl super::stubs::PersistentResourceService for PersistentResourceService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -10811,7 +10807,7 @@ impl super::stubs::PersistentResourceService for PersistentResourceService {
                     "/v1/{}",
                     req.persistent_resource
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("persistent_resource"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("persistent_resource"))?
                         .name
                 ),
             )
@@ -10827,7 +10823,7 @@ impl super::stubs::PersistentResourceService for PersistentResourceService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -10870,7 +10866,7 @@ impl super::stubs::PersistentResourceService for PersistentResourceService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -10889,7 +10885,7 @@ impl super::stubs::PersistentResourceService for PersistentResourceService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -10937,11 +10933,11 @@ impl super::stubs::PersistentResourceService for PersistentResourceService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -10967,7 +10963,7 @@ impl super::stubs::PersistentResourceService for PersistentResourceService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -10989,7 +10985,7 @@ impl super::stubs::PersistentResourceService for PersistentResourceService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -11008,7 +11004,7 @@ impl super::stubs::PersistentResourceService for PersistentResourceService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -11027,7 +11023,7 @@ impl super::stubs::PersistentResourceService for PersistentResourceService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -11046,7 +11042,7 @@ impl super::stubs::PersistentResourceService for PersistentResourceService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -11071,11 +11067,11 @@ impl super::stubs::PersistentResourceService for PersistentResourceService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -11094,10 +11090,10 @@ impl super::stubs::PersistentResourceService for PersistentResourceService {
     }
 }
 
-/// Implements [PipelineService](super::stubs::PipelineService) using a [gclient::ReqwestClient].
+/// Implements [PipelineService](super::stubs::PipelineService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct PipelineService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for PipelineService {
@@ -11109,8 +11105,8 @@ impl std::fmt::Debug for PipelineService {
 }
 
 impl PipelineService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -11153,7 +11149,7 @@ impl super::stubs::PipelineService for PipelineService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -11184,11 +11180,11 @@ impl super::stubs::PipelineService for PipelineService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -11207,7 +11203,7 @@ impl super::stubs::PipelineService for PipelineService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -11266,7 +11262,7 @@ impl super::stubs::PipelineService for PipelineService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -11298,11 +11294,11 @@ impl super::stubs::PipelineService for PipelineService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -11321,7 +11317,7 @@ impl super::stubs::PipelineService for PipelineService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -11400,7 +11396,7 @@ impl super::stubs::PipelineService for PipelineService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -11419,7 +11415,7 @@ impl super::stubs::PipelineService for PipelineService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -11467,11 +11463,11 @@ impl super::stubs::PipelineService for PipelineService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -11497,7 +11493,7 @@ impl super::stubs::PipelineService for PipelineService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -11519,7 +11515,7 @@ impl super::stubs::PipelineService for PipelineService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -11538,7 +11534,7 @@ impl super::stubs::PipelineService for PipelineService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -11557,7 +11553,7 @@ impl super::stubs::PipelineService for PipelineService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -11576,7 +11572,7 @@ impl super::stubs::PipelineService for PipelineService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -11601,11 +11597,11 @@ impl super::stubs::PipelineService for PipelineService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -11624,10 +11620,10 @@ impl super::stubs::PipelineService for PipelineService {
     }
 }
 
-/// Implements [PredictionService](super::stubs::PredictionService) using a [gclient::ReqwestClient].
+/// Implements [PredictionService](super::stubs::PredictionService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct PredictionService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for PredictionService {
@@ -11639,8 +11635,8 @@ impl std::fmt::Debug for PredictionService {
 }
 
 impl PredictionService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -11784,7 +11780,7 @@ impl super::stubs::PredictionService for PredictionService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -11803,7 +11799,7 @@ impl super::stubs::PredictionService for PredictionService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -11851,11 +11847,11 @@ impl super::stubs::PredictionService for PredictionService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -11881,7 +11877,7 @@ impl super::stubs::PredictionService for PredictionService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -11903,7 +11899,7 @@ impl super::stubs::PredictionService for PredictionService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -11922,7 +11918,7 @@ impl super::stubs::PredictionService for PredictionService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -11941,7 +11937,7 @@ impl super::stubs::PredictionService for PredictionService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -11960,7 +11956,7 @@ impl super::stubs::PredictionService for PredictionService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -11985,19 +11981,19 @@ impl super::stubs::PredictionService for PredictionService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [ReasoningEngineExecutionService](super::stubs::ReasoningEngineExecutionService) using a [gclient::ReqwestClient].
+/// Implements [ReasoningEngineExecutionService](super::stubs::ReasoningEngineExecutionService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ReasoningEngineExecutionService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ReasoningEngineExecutionService {
@@ -12009,8 +12005,8 @@ impl std::fmt::Debug for ReasoningEngineExecutionService {
 }
 
 impl ReasoningEngineExecutionService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -12051,7 +12047,7 @@ impl super::stubs::ReasoningEngineExecutionService for ReasoningEngineExecutionS
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -12070,7 +12066,7 @@ impl super::stubs::ReasoningEngineExecutionService for ReasoningEngineExecutionS
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -12118,11 +12114,11 @@ impl super::stubs::ReasoningEngineExecutionService for ReasoningEngineExecutionS
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -12148,7 +12144,7 @@ impl super::stubs::ReasoningEngineExecutionService for ReasoningEngineExecutionS
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -12170,7 +12166,7 @@ impl super::stubs::ReasoningEngineExecutionService for ReasoningEngineExecutionS
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -12189,7 +12185,7 @@ impl super::stubs::ReasoningEngineExecutionService for ReasoningEngineExecutionS
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -12208,7 +12204,7 @@ impl super::stubs::ReasoningEngineExecutionService for ReasoningEngineExecutionS
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -12227,7 +12223,7 @@ impl super::stubs::ReasoningEngineExecutionService for ReasoningEngineExecutionS
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -12252,19 +12248,19 @@ impl super::stubs::ReasoningEngineExecutionService for ReasoningEngineExecutionS
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [ReasoningEngineService](super::stubs::ReasoningEngineService) using a [gclient::ReqwestClient].
+/// Implements [ReasoningEngineService](super::stubs::ReasoningEngineService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ReasoningEngineService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ReasoningEngineService {
@@ -12276,8 +12272,8 @@ impl std::fmt::Debug for ReasoningEngineService {
 }
 
 impl ReasoningEngineService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -12320,7 +12316,7 @@ impl super::stubs::ReasoningEngineService for ReasoningEngineService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -12345,7 +12341,7 @@ impl super::stubs::ReasoningEngineService for ReasoningEngineService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -12363,7 +12359,7 @@ impl super::stubs::ReasoningEngineService for ReasoningEngineService {
                     "/v1/{}",
                     req.reasoning_engine
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("reasoning_engine"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("reasoning_engine"))?
                         .name
                 ),
             )
@@ -12379,7 +12375,7 @@ impl super::stubs::ReasoningEngineService for ReasoningEngineService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -12402,7 +12398,7 @@ impl super::stubs::ReasoningEngineService for ReasoningEngineService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -12424,7 +12420,7 @@ impl super::stubs::ReasoningEngineService for ReasoningEngineService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -12443,7 +12439,7 @@ impl super::stubs::ReasoningEngineService for ReasoningEngineService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -12491,11 +12487,11 @@ impl super::stubs::ReasoningEngineService for ReasoningEngineService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -12521,7 +12517,7 @@ impl super::stubs::ReasoningEngineService for ReasoningEngineService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -12543,7 +12539,7 @@ impl super::stubs::ReasoningEngineService for ReasoningEngineService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -12562,7 +12558,7 @@ impl super::stubs::ReasoningEngineService for ReasoningEngineService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -12581,7 +12577,7 @@ impl super::stubs::ReasoningEngineService for ReasoningEngineService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -12600,7 +12596,7 @@ impl super::stubs::ReasoningEngineService for ReasoningEngineService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -12625,11 +12621,11 @@ impl super::stubs::ReasoningEngineService for ReasoningEngineService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -12648,10 +12644,10 @@ impl super::stubs::ReasoningEngineService for ReasoningEngineService {
     }
 }
 
-/// Implements [ScheduleService](super::stubs::ScheduleService) using a [gclient::ReqwestClient].
+/// Implements [ScheduleService](super::stubs::ScheduleService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ScheduleService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ScheduleService {
@@ -12663,8 +12659,8 @@ impl std::fmt::Debug for ScheduleService {
 }
 
 impl ScheduleService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -12707,7 +12703,7 @@ impl super::stubs::ScheduleService for ScheduleService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -12726,7 +12722,7 @@ impl super::stubs::ScheduleService for ScheduleService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -12752,7 +12748,7 @@ impl super::stubs::ScheduleService for ScheduleService {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -12804,7 +12800,7 @@ impl super::stubs::ScheduleService for ScheduleService {
                     "/v1/{}",
                     req.schedule
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("schedule"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("schedule"))?
                         .name
                 ),
             )
@@ -12820,7 +12816,7 @@ impl super::stubs::ScheduleService for ScheduleService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -12846,7 +12842,7 @@ impl super::stubs::ScheduleService for ScheduleService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -12865,7 +12861,7 @@ impl super::stubs::ScheduleService for ScheduleService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -12913,11 +12909,11 @@ impl super::stubs::ScheduleService for ScheduleService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -12943,7 +12939,7 @@ impl super::stubs::ScheduleService for ScheduleService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -12965,7 +12961,7 @@ impl super::stubs::ScheduleService for ScheduleService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -12984,7 +12980,7 @@ impl super::stubs::ScheduleService for ScheduleService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -13003,7 +12999,7 @@ impl super::stubs::ScheduleService for ScheduleService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -13022,7 +13018,7 @@ impl super::stubs::ScheduleService for ScheduleService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -13047,11 +13043,11 @@ impl super::stubs::ScheduleService for ScheduleService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -13070,10 +13066,10 @@ impl super::stubs::ScheduleService for ScheduleService {
     }
 }
 
-/// Implements [SpecialistPoolService](super::stubs::SpecialistPoolService) using a [gclient::ReqwestClient].
+/// Implements [SpecialistPoolService](super::stubs::SpecialistPoolService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct SpecialistPoolService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for SpecialistPoolService {
@@ -13085,8 +13081,8 @@ impl std::fmt::Debug for SpecialistPoolService {
 }
 
 impl SpecialistPoolService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -13129,7 +13125,7 @@ impl super::stubs::SpecialistPoolService for SpecialistPoolService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -13159,11 +13155,11 @@ impl super::stubs::SpecialistPoolService for SpecialistPoolService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -13183,7 +13179,7 @@ impl super::stubs::SpecialistPoolService for SpecialistPoolService {
             );
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -13201,7 +13197,7 @@ impl super::stubs::SpecialistPoolService for SpecialistPoolService {
                     "/v1/{}",
                     req.specialist_pool
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("specialist_pool"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("specialist_pool"))?
                         .name
                 ),
             )
@@ -13217,7 +13213,7 @@ impl super::stubs::SpecialistPoolService for SpecialistPoolService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -13243,7 +13239,7 @@ impl super::stubs::SpecialistPoolService for SpecialistPoolService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -13262,7 +13258,7 @@ impl super::stubs::SpecialistPoolService for SpecialistPoolService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -13310,11 +13306,11 @@ impl super::stubs::SpecialistPoolService for SpecialistPoolService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -13340,7 +13336,7 @@ impl super::stubs::SpecialistPoolService for SpecialistPoolService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -13362,7 +13358,7 @@ impl super::stubs::SpecialistPoolService for SpecialistPoolService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -13381,7 +13377,7 @@ impl super::stubs::SpecialistPoolService for SpecialistPoolService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -13400,7 +13396,7 @@ impl super::stubs::SpecialistPoolService for SpecialistPoolService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -13419,7 +13415,7 @@ impl super::stubs::SpecialistPoolService for SpecialistPoolService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -13444,11 +13440,11 @@ impl super::stubs::SpecialistPoolService for SpecialistPoolService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -13467,10 +13463,10 @@ impl super::stubs::SpecialistPoolService for SpecialistPoolService {
     }
 }
 
-/// Implements [TensorboardService](super::stubs::TensorboardService) using a [gclient::ReqwestClient].
+/// Implements [TensorboardService](super::stubs::TensorboardService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct TensorboardService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for TensorboardService {
@@ -13482,8 +13478,8 @@ impl std::fmt::Debug for TensorboardService {
 }
 
 impl TensorboardService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -13526,7 +13522,7 @@ impl super::stubs::TensorboardService for TensorboardService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -13544,7 +13540,7 @@ impl super::stubs::TensorboardService for TensorboardService {
                     "/v1/{}",
                     req.tensorboard
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("tensorboard"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("tensorboard"))?
                         .name
                 ),
             )
@@ -13560,7 +13556,7 @@ impl super::stubs::TensorboardService for TensorboardService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -13596,11 +13592,11 @@ impl super::stubs::TensorboardService for TensorboardService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -13619,7 +13615,7 @@ impl super::stubs::TensorboardService for TensorboardService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -13641,7 +13637,7 @@ impl super::stubs::TensorboardService for TensorboardService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -13663,7 +13659,7 @@ impl super::stubs::TensorboardService for TensorboardService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -13705,7 +13701,7 @@ impl super::stubs::TensorboardService for TensorboardService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -13723,7 +13719,7 @@ impl super::stubs::TensorboardService for TensorboardService {
                     "/v1/{}",
                     req.tensorboard_experiment
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("tensorboard_experiment"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("tensorboard_experiment"))?
                         .name
                 ),
             )
@@ -13739,7 +13735,7 @@ impl super::stubs::TensorboardService for TensorboardService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -13775,11 +13771,11 @@ impl super::stubs::TensorboardService for TensorboardService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -13798,7 +13794,7 @@ impl super::stubs::TensorboardService for TensorboardService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -13857,7 +13853,7 @@ impl super::stubs::TensorboardService for TensorboardService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -13875,7 +13871,7 @@ impl super::stubs::TensorboardService for TensorboardService {
                     "/v1/{}",
                     req.tensorboard_run
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("tensorboard_run"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("tensorboard_run"))?
                         .name
                 ),
             )
@@ -13891,7 +13887,7 @@ impl super::stubs::TensorboardService for TensorboardService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -13924,11 +13920,11 @@ impl super::stubs::TensorboardService for TensorboardService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -13947,7 +13943,7 @@ impl super::stubs::TensorboardService for TensorboardService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -14010,7 +14006,7 @@ impl super::stubs::TensorboardService for TensorboardService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -14028,7 +14024,7 @@ impl super::stubs::TensorboardService for TensorboardService {
                     "/v1/{}",
                     req.tensorboard_time_series
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("tensorboard_time_series"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("tensorboard_time_series"))?
                         .name
                 ),
             )
@@ -14044,7 +14040,7 @@ impl super::stubs::TensorboardService for TensorboardService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -14080,11 +14076,11 @@ impl super::stubs::TensorboardService for TensorboardService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -14103,7 +14099,7 @@ impl super::stubs::TensorboardService for TensorboardService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -14129,7 +14125,7 @@ impl super::stubs::TensorboardService for TensorboardService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("timeSeries", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -14153,7 +14149,7 @@ impl super::stubs::TensorboardService for TensorboardService {
         let builder = builder.query(&[("maxDataPoints", &req.max_data_points)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -14238,7 +14234,7 @@ impl super::stubs::TensorboardService for TensorboardService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -14257,7 +14253,7 @@ impl super::stubs::TensorboardService for TensorboardService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -14305,11 +14301,11 @@ impl super::stubs::TensorboardService for TensorboardService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -14335,7 +14331,7 @@ impl super::stubs::TensorboardService for TensorboardService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -14357,7 +14353,7 @@ impl super::stubs::TensorboardService for TensorboardService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -14376,7 +14372,7 @@ impl super::stubs::TensorboardService for TensorboardService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -14395,7 +14391,7 @@ impl super::stubs::TensorboardService for TensorboardService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -14414,7 +14410,7 @@ impl super::stubs::TensorboardService for TensorboardService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -14439,11 +14435,11 @@ impl super::stubs::TensorboardService for TensorboardService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -14462,10 +14458,10 @@ impl super::stubs::TensorboardService for TensorboardService {
     }
 }
 
-/// Implements [VertexRagDataService](super::stubs::VertexRagDataService) using a [gclient::ReqwestClient].
+/// Implements [VertexRagDataService](super::stubs::VertexRagDataService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct VertexRagDataService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for VertexRagDataService {
@@ -14477,8 +14473,8 @@ impl std::fmt::Debug for VertexRagDataService {
 }
 
 impl VertexRagDataService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -14520,7 +14516,7 @@ impl super::stubs::VertexRagDataService for VertexRagDataService {
                     "/v1/{}",
                     req.rag_corpus
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("rag_corpus"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("rag_corpus"))?
                         .name
                 ),
             )
@@ -14549,7 +14545,7 @@ impl super::stubs::VertexRagDataService for VertexRagDataService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -14573,7 +14569,7 @@ impl super::stubs::VertexRagDataService for VertexRagDataService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -14593,7 +14589,7 @@ impl super::stubs::VertexRagDataService for VertexRagDataService {
             );
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -14652,7 +14648,7 @@ impl super::stubs::VertexRagDataService for VertexRagDataService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -14673,7 +14669,7 @@ impl super::stubs::VertexRagDataService for VertexRagDataService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -14692,7 +14688,7 @@ impl super::stubs::VertexRagDataService for VertexRagDataService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -14714,7 +14710,7 @@ impl super::stubs::VertexRagDataService for VertexRagDataService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -14733,7 +14729,7 @@ impl super::stubs::VertexRagDataService for VertexRagDataService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -14781,11 +14777,11 @@ impl super::stubs::VertexRagDataService for VertexRagDataService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -14811,7 +14807,7 @@ impl super::stubs::VertexRagDataService for VertexRagDataService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -14833,7 +14829,7 @@ impl super::stubs::VertexRagDataService for VertexRagDataService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -14852,7 +14848,7 @@ impl super::stubs::VertexRagDataService for VertexRagDataService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -14871,7 +14867,7 @@ impl super::stubs::VertexRagDataService for VertexRagDataService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -14890,7 +14886,7 @@ impl super::stubs::VertexRagDataService for VertexRagDataService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -14915,11 +14911,11 @@ impl super::stubs::VertexRagDataService for VertexRagDataService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -14938,10 +14934,10 @@ impl super::stubs::VertexRagDataService for VertexRagDataService {
     }
 }
 
-/// Implements [VertexRagService](super::stubs::VertexRagService) using a [gclient::ReqwestClient].
+/// Implements [VertexRagService](super::stubs::VertexRagService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct VertexRagService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for VertexRagService {
@@ -14953,8 +14949,8 @@ impl std::fmt::Debug for VertexRagService {
 }
 
 impl VertexRagService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -15038,7 +15034,7 @@ impl super::stubs::VertexRagService for VertexRagService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -15057,7 +15053,7 @@ impl super::stubs::VertexRagService for VertexRagService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -15105,11 +15101,11 @@ impl super::stubs::VertexRagService for VertexRagService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -15135,7 +15131,7 @@ impl super::stubs::VertexRagService for VertexRagService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -15157,7 +15153,7 @@ impl super::stubs::VertexRagService for VertexRagService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -15176,7 +15172,7 @@ impl super::stubs::VertexRagService for VertexRagService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -15195,7 +15191,7 @@ impl super::stubs::VertexRagService for VertexRagService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -15214,7 +15210,7 @@ impl super::stubs::VertexRagService for VertexRagService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -15239,19 +15235,19 @@ impl super::stubs::VertexRagService for VertexRagService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [VizierService](super::stubs::VizierService) using a [gclient::ReqwestClient].
+/// Implements [VizierService](super::stubs::VizierService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct VizierService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for VizierService {
@@ -15263,8 +15259,8 @@ impl std::fmt::Debug for VizierService {
 }
 
 impl VizierService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -15302,7 +15298,7 @@ impl super::stubs::VizierService for VizierService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -15323,7 +15319,7 @@ impl super::stubs::VizierService for VizierService {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -15342,7 +15338,7 @@ impl super::stubs::VizierService for VizierService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -15418,7 +15414,7 @@ impl super::stubs::VizierService for VizierService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -15439,7 +15435,7 @@ impl super::stubs::VizierService for VizierService {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -15495,7 +15491,7 @@ impl super::stubs::VizierService for VizierService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -15574,7 +15570,7 @@ impl super::stubs::VizierService for VizierService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -15593,7 +15589,7 @@ impl super::stubs::VizierService for VizierService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -15641,11 +15637,11 @@ impl super::stubs::VizierService for VizierService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -15671,7 +15667,7 @@ impl super::stubs::VizierService for VizierService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("permissions", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -15693,7 +15689,7 @@ impl super::stubs::VizierService for VizierService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -15712,7 +15708,7 @@ impl super::stubs::VizierService for VizierService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -15731,7 +15727,7 @@ impl super::stubs::VizierService for VizierService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -15750,7 +15746,7 @@ impl super::stubs::VizierService for VizierService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -15775,11 +15771,11 @@ impl super::stubs::VizierService for VizierService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "timeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/alloydb/v1/Cargo.toml b/src/generated/cloud/alloydb/v1/Cargo.toml
index f00a9c984..7953a2c75 100644
--- a/src/generated/cloud/alloydb/v1/Cargo.toml
+++ b/src/generated/cloud/alloydb/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/alloydb/v1/src/model.rs b/src/generated/cloud/alloydb/v1/src/model.rs
index 4d0d8d3b1..88576558a 100755
--- a/src/generated/cloud/alloydb/v1/src/model.rs
+++ b/src/generated/cloud/alloydb/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/alloydb/v1/src/transport.rs b/src/generated/cloud/alloydb/v1/src/transport.rs
index 4e0f35870..b59e2e65d 100755
--- a/src/generated/cloud/alloydb/v1/src/transport.rs
+++ b/src/generated/cloud/alloydb/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [AlloyDBAdmin](super::stubs::AlloyDBAdmin) using a [gclient::ReqwestClient].
+/// Implements [AlloyDBAdmin](super::stubs::AlloyDBAdmin) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct AlloyDBAdmin {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for AlloyDBAdmin {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for AlloyDBAdmin {
 }
 
 impl AlloyDBAdmin {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -59,7 +59,7 @@ impl super::stubs::AlloyDBAdmin for AlloyDBAdmin {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -79,7 +79,7 @@ impl super::stubs::AlloyDBAdmin for AlloyDBAdmin {
             );
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -122,7 +122,7 @@ impl super::stubs::AlloyDBAdmin for AlloyDBAdmin {
                     "/v1/{}",
                     req.cluster
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("cluster"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("cluster"))?
                         .name
                 ),
             )
@@ -138,7 +138,7 @@ impl super::stubs::AlloyDBAdmin for AlloyDBAdmin {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -168,7 +168,7 @@ impl super::stubs::AlloyDBAdmin for AlloyDBAdmin {
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -276,7 +276,7 @@ impl super::stubs::AlloyDBAdmin for AlloyDBAdmin {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -296,7 +296,7 @@ impl super::stubs::AlloyDBAdmin for AlloyDBAdmin {
             );
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -387,7 +387,7 @@ impl super::stubs::AlloyDBAdmin for AlloyDBAdmin {
                     "/v1/{}",
                     req.instance
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("instance"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("instance"))?
                         .name
                 ),
             )
@@ -403,7 +403,7 @@ impl super::stubs::AlloyDBAdmin for AlloyDBAdmin {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -432,7 +432,7 @@ impl super::stubs::AlloyDBAdmin for AlloyDBAdmin {
         let builder = builder.query(&[("etag", &req.etag)]);
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -529,7 +529,7 @@ impl super::stubs::AlloyDBAdmin for AlloyDBAdmin {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -548,7 +548,7 @@ impl super::stubs::AlloyDBAdmin for AlloyDBAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -586,7 +586,7 @@ impl super::stubs::AlloyDBAdmin for AlloyDBAdmin {
                     "/v1/{}",
                     req.backup
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("backup"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("backup"))?
                         .name
                 ),
             )
@@ -602,7 +602,7 @@ impl super::stubs::AlloyDBAdmin for AlloyDBAdmin {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -629,7 +629,7 @@ impl super::stubs::AlloyDBAdmin for AlloyDBAdmin {
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -653,7 +653,7 @@ impl super::stubs::AlloyDBAdmin for AlloyDBAdmin {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -696,7 +696,7 @@ impl super::stubs::AlloyDBAdmin for AlloyDBAdmin {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -719,7 +719,7 @@ impl super::stubs::AlloyDBAdmin for AlloyDBAdmin {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -738,7 +738,7 @@ impl super::stubs::AlloyDBAdmin for AlloyDBAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -776,7 +776,7 @@ impl super::stubs::AlloyDBAdmin for AlloyDBAdmin {
                     "/v1/{}",
                     req.user
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("user"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("user"))?
                         .name
                 ),
             )
@@ -792,7 +792,7 @@ impl super::stubs::AlloyDBAdmin for AlloyDBAdmin {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -818,7 +818,7 @@ impl super::stubs::AlloyDBAdmin for AlloyDBAdmin {
         let builder = builder.query(&[("requestId", &req.request_id)]);
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -843,7 +843,7 @@ impl super::stubs::AlloyDBAdmin for AlloyDBAdmin {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -865,7 +865,7 @@ impl super::stubs::AlloyDBAdmin for AlloyDBAdmin {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -884,7 +884,7 @@ impl super::stubs::AlloyDBAdmin for AlloyDBAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -906,7 +906,7 @@ impl super::stubs::AlloyDBAdmin for AlloyDBAdmin {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -925,7 +925,7 @@ impl super::stubs::AlloyDBAdmin for AlloyDBAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -944,7 +944,7 @@ impl super::stubs::AlloyDBAdmin for AlloyDBAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/apigateway/v1/Cargo.toml b/src/generated/cloud/apigateway/v1/Cargo.toml
index b854c5ee6..8a2fad342 100644
--- a/src/generated/cloud/apigateway/v1/Cargo.toml
+++ b/src/generated/cloud/apigateway/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
 lro        = { version = "0.1", path = "../../../../../src/lro", package = "google-cloud-lro" }
diff --git a/src/generated/cloud/apigateway/v1/src/model.rs b/src/generated/cloud/apigateway/v1/src/model.rs
index 97eb23add..d34d5ffda 100755
--- a/src/generated/cloud/apigateway/v1/src/model.rs
+++ b/src/generated/cloud/apigateway/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate longrunning;
 extern crate lro;
diff --git a/src/generated/cloud/apigateway/v1/src/transport.rs b/src/generated/cloud/apigateway/v1/src/transport.rs
index 064368389..26872c0b5 100755
--- a/src/generated/cloud/apigateway/v1/src/transport.rs
+++ b/src/generated/cloud/apigateway/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [ApiGatewayService](super::stubs::ApiGatewayService) using a [gclient::ReqwestClient].
+/// Implements [ApiGatewayService](super::stubs::ApiGatewayService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ApiGatewayService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ApiGatewayService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for ApiGatewayService {
 }
 
 impl ApiGatewayService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -59,7 +59,7 @@ impl super::stubs::ApiGatewayService for ApiGatewayService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -78,7 +78,7 @@ impl super::stubs::ApiGatewayService for ApiGatewayService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -119,7 +119,7 @@ impl super::stubs::ApiGatewayService for ApiGatewayService {
                     "/v1/{}",
                     req.gateway
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("gateway"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("gateway"))?
                         .name
                 ),
             )
@@ -135,7 +135,7 @@ impl super::stubs::ApiGatewayService for ApiGatewayService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -158,7 +158,7 @@ impl super::stubs::ApiGatewayService for ApiGatewayService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -181,7 +181,7 @@ impl super::stubs::ApiGatewayService for ApiGatewayService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -200,7 +200,7 @@ impl super::stubs::ApiGatewayService for ApiGatewayService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -236,7 +236,7 @@ impl super::stubs::ApiGatewayService for ApiGatewayService {
                     "/v1/{}",
                     req.api
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("api"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("api"))?
                         .name
                 ),
             )
@@ -252,7 +252,7 @@ impl super::stubs::ApiGatewayService for ApiGatewayService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.api), options).await
@@ -273,7 +273,7 @@ impl super::stubs::ApiGatewayService for ApiGatewayService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -296,7 +296,7 @@ impl super::stubs::ApiGatewayService for ApiGatewayService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -316,7 +316,7 @@ impl super::stubs::ApiGatewayService for ApiGatewayService {
             );
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -354,7 +354,7 @@ impl super::stubs::ApiGatewayService for ApiGatewayService {
                     "/v1/{}",
                     req.api_config
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("api_config"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("api_config"))?
                         .name
                 ),
             )
@@ -370,7 +370,7 @@ impl super::stubs::ApiGatewayService for ApiGatewayService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -393,7 +393,7 @@ impl super::stubs::ApiGatewayService for ApiGatewayService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -415,7 +415,7 @@ impl super::stubs::ApiGatewayService for ApiGatewayService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -434,7 +434,7 @@ impl super::stubs::ApiGatewayService for ApiGatewayService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -453,7 +453,7 @@ impl super::stubs::ApiGatewayService for ApiGatewayService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/apigeeconnect/v1/Cargo.toml b/src/generated/cloud/apigeeconnect/v1/Cargo.toml
index db4e403f1..ec50b6f22 100644
--- a/src/generated/cloud/apigeeconnect/v1/Cargo.toml
+++ b/src/generated/cloud/apigeeconnect/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
 rpc        = { version = "0.2", path = "../../../../../src/generated/rpc/types", package = "google-cloud-rpc" }
diff --git a/src/generated/cloud/apigeeconnect/v1/src/model.rs b/src/generated/cloud/apigeeconnect/v1/src/model.rs
index 0f284cb0f..639bc1566 100755
--- a/src/generated/cloud/apigeeconnect/v1/src/model.rs
+++ b/src/generated/cloud/apigeeconnect/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate reqwest;
 extern crate rpc;
diff --git a/src/generated/cloud/apigeeconnect/v1/src/transport.rs b/src/generated/cloud/apigeeconnect/v1/src/transport.rs
index a50c03bf7..f3b3d40bb 100755
--- a/src/generated/cloud/apigeeconnect/v1/src/transport.rs
+++ b/src/generated/cloud/apigeeconnect/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [ConnectionService](super::stubs::ConnectionService) using a [gclient::ReqwestClient].
+/// Implements [ConnectionService](super::stubs::ConnectionService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ConnectionService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ConnectionService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for ConnectionService {
 }
 
 impl ConnectionService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -60,7 +60,7 @@ impl super::stubs::ConnectionService for ConnectionService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/cloud/apihub/v1/Cargo.toml b/src/generated/cloud/apihub/v1/Cargo.toml
index b0a8a0d42..147b23044 100644
--- a/src/generated/cloud/apihub/v1/Cargo.toml
+++ b/src/generated/cloud/apihub/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/apihub/v1/src/model.rs b/src/generated/cloud/apihub/v1/src/model.rs
index d29e69d51..4521adb26 100755
--- a/src/generated/cloud/apihub/v1/src/model.rs
+++ b/src/generated/cloud/apihub/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate location;
 extern crate longrunning;
diff --git a/src/generated/cloud/apihub/v1/src/transport.rs b/src/generated/cloud/apihub/v1/src/transport.rs
index b982bb3eb..0d8e0fcae 100755
--- a/src/generated/cloud/apihub/v1/src/transport.rs
+++ b/src/generated/cloud/apihub/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [ApiHub](super::stubs::ApiHub) using a [gclient::ReqwestClient].
+/// Implements [ApiHub](super::stubs::ApiHub) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ApiHub {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ApiHub {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for ApiHub {
 }
 
 impl ApiHub {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -73,7 +73,7 @@ impl super::stubs::ApiHub for ApiHub {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -95,7 +95,7 @@ impl super::stubs::ApiHub for ApiHub {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -113,7 +113,7 @@ impl super::stubs::ApiHub for ApiHub {
                     "/v1/{}",
                     req.api
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("api"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("api"))?
                         .name
                 ),
             )
@@ -129,7 +129,7 @@ impl super::stubs::ApiHub for ApiHub {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.api), options).await
@@ -151,7 +151,7 @@ impl super::stubs::ApiHub for ApiHub {
             );
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -193,7 +193,7 @@ impl super::stubs::ApiHub for ApiHub {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -215,7 +215,7 @@ impl super::stubs::ApiHub for ApiHub {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -233,7 +233,7 @@ impl super::stubs::ApiHub for ApiHub {
                     "/v1/{}",
                     req.version
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("version"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("version"))?
                         .name
                 ),
             )
@@ -249,7 +249,7 @@ impl super::stubs::ApiHub for ApiHub {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -273,7 +273,7 @@ impl super::stubs::ApiHub for ApiHub {
             );
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -310,7 +310,7 @@ impl super::stubs::ApiHub for ApiHub {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -329,7 +329,7 @@ impl super::stubs::ApiHub for ApiHub {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -351,7 +351,7 @@ impl super::stubs::ApiHub for ApiHub {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -369,7 +369,7 @@ impl super::stubs::ApiHub for ApiHub {
                     "/v1/{}",
                     req.spec
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("spec"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("spec"))?
                         .name
                 ),
             )
@@ -385,7 +385,7 @@ impl super::stubs::ApiHub for ApiHub {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.spec), options).await
@@ -406,7 +406,7 @@ impl super::stubs::ApiHub for ApiHub {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -425,7 +425,7 @@ impl super::stubs::ApiHub for ApiHub {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -450,7 +450,7 @@ impl super::stubs::ApiHub for ApiHub {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -469,7 +469,7 @@ impl super::stubs::ApiHub for ApiHub {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -511,7 +511,7 @@ impl super::stubs::ApiHub for ApiHub {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -536,7 +536,7 @@ impl super::stubs::ApiHub for ApiHub {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -554,7 +554,7 @@ impl super::stubs::ApiHub for ApiHub {
                     "/v1/{}",
                     req.deployment
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("deployment"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("deployment"))?
                         .name
                 ),
             )
@@ -570,7 +570,7 @@ impl super::stubs::ApiHub for ApiHub {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -593,7 +593,7 @@ impl super::stubs::ApiHub for ApiHub {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -635,7 +635,7 @@ impl super::stubs::ApiHub for ApiHub {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -653,7 +653,7 @@ impl super::stubs::ApiHub for ApiHub {
                     "/v1/{}",
                     req.attribute
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("attribute"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("attribute"))?
                         .name
                 ),
             )
@@ -669,7 +669,7 @@ impl super::stubs::ApiHub for ApiHub {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -692,7 +692,7 @@ impl super::stubs::ApiHub for ApiHub {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -717,7 +717,7 @@ impl super::stubs::ApiHub for ApiHub {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -779,7 +779,7 @@ impl super::stubs::ApiHub for ApiHub {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -797,7 +797,7 @@ impl super::stubs::ApiHub for ApiHub {
                     "/v1/{}",
                     req.external_api
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("external_api"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("external_api"))?
                         .name
                 ),
             )
@@ -813,7 +813,7 @@ impl super::stubs::ApiHub for ApiHub {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -836,7 +836,7 @@ impl super::stubs::ApiHub for ApiHub {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -860,7 +860,7 @@ impl super::stubs::ApiHub for ApiHub {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -882,7 +882,7 @@ impl super::stubs::ApiHub for ApiHub {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -901,7 +901,7 @@ impl super::stubs::ApiHub for ApiHub {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -923,7 +923,7 @@ impl super::stubs::ApiHub for ApiHub {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -942,7 +942,7 @@ impl super::stubs::ApiHub for ApiHub {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -961,7 +961,7 @@ impl super::stubs::ApiHub for ApiHub {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -983,10 +983,10 @@ impl super::stubs::ApiHub for ApiHub {
     }
 }
 
-/// Implements [ApiHubDependencies](super::stubs::ApiHubDependencies) using a [gclient::ReqwestClient].
+/// Implements [ApiHubDependencies](super::stubs::ApiHubDependencies) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ApiHubDependencies {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ApiHubDependencies {
@@ -998,8 +998,8 @@ impl std::fmt::Debug for ApiHubDependencies {
 }
 
 impl ApiHubDependencies {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1043,7 +1043,7 @@ impl super::stubs::ApiHubDependencies for ApiHubDependencies {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1061,7 +1061,7 @@ impl super::stubs::ApiHubDependencies for ApiHubDependencies {
                     "/v1/{}",
                     req.dependency
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("dependency"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("dependency"))?
                         .name
                 ),
             )
@@ -1077,7 +1077,7 @@ impl super::stubs::ApiHubDependencies for ApiHubDependencies {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1100,7 +1100,7 @@ impl super::stubs::ApiHubDependencies for ApiHubDependencies {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1125,7 +1125,7 @@ impl super::stubs::ApiHubDependencies for ApiHubDependencies {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1147,7 +1147,7 @@ impl super::stubs::ApiHubDependencies for ApiHubDependencies {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1166,7 +1166,7 @@ impl super::stubs::ApiHubDependencies for ApiHubDependencies {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1188,7 +1188,7 @@ impl super::stubs::ApiHubDependencies for ApiHubDependencies {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1207,7 +1207,7 @@ impl super::stubs::ApiHubDependencies for ApiHubDependencies {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1226,7 +1226,7 @@ impl super::stubs::ApiHubDependencies for ApiHubDependencies {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1248,10 +1248,10 @@ impl super::stubs::ApiHubDependencies for ApiHubDependencies {
     }
 }
 
-/// Implements [HostProjectRegistrationService](super::stubs::HostProjectRegistrationService) using a [gclient::ReqwestClient].
+/// Implements [HostProjectRegistrationService](super::stubs::HostProjectRegistrationService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct HostProjectRegistrationService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for HostProjectRegistrationService {
@@ -1263,8 +1263,8 @@ impl std::fmt::Debug for HostProjectRegistrationService {
 }
 
 impl HostProjectRegistrationService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1311,7 +1311,7 @@ impl super::stubs::HostProjectRegistrationService for HostProjectRegistrationSer
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1337,7 +1337,7 @@ impl super::stubs::HostProjectRegistrationService for HostProjectRegistrationSer
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1359,7 +1359,7 @@ impl super::stubs::HostProjectRegistrationService for HostProjectRegistrationSer
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1378,7 +1378,7 @@ impl super::stubs::HostProjectRegistrationService for HostProjectRegistrationSer
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1400,7 +1400,7 @@ impl super::stubs::HostProjectRegistrationService for HostProjectRegistrationSer
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1419,7 +1419,7 @@ impl super::stubs::HostProjectRegistrationService for HostProjectRegistrationSer
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1438,7 +1438,7 @@ impl super::stubs::HostProjectRegistrationService for HostProjectRegistrationSer
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1460,10 +1460,10 @@ impl super::stubs::HostProjectRegistrationService for HostProjectRegistrationSer
     }
 }
 
-/// Implements [LintingService](super::stubs::LintingService) using a [gclient::ReqwestClient].
+/// Implements [LintingService](super::stubs::LintingService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct LintingService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for LintingService {
@@ -1475,8 +1475,8 @@ impl std::fmt::Debug for LintingService {
 }
 
 impl LintingService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1497,7 +1497,7 @@ impl super::stubs::LintingService for LintingService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1515,7 +1515,7 @@ impl super::stubs::LintingService for LintingService {
                     "/v1/{}",
                     req.style_guide
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("style_guide"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("style_guide"))?
                         .name
                 ),
             )
@@ -1531,7 +1531,7 @@ impl super::stubs::LintingService for LintingService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1554,7 +1554,7 @@ impl super::stubs::LintingService for LintingService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1593,7 +1593,7 @@ impl super::stubs::LintingService for LintingService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1612,7 +1612,7 @@ impl super::stubs::LintingService for LintingService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1634,7 +1634,7 @@ impl super::stubs::LintingService for LintingService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1653,7 +1653,7 @@ impl super::stubs::LintingService for LintingService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1672,7 +1672,7 @@ impl super::stubs::LintingService for LintingService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1694,10 +1694,10 @@ impl super::stubs::LintingService for LintingService {
     }
 }
 
-/// Implements [ApiHubPlugin](super::stubs::ApiHubPlugin) using a [gclient::ReqwestClient].
+/// Implements [ApiHubPlugin](super::stubs::ApiHubPlugin) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ApiHubPlugin {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ApiHubPlugin {
@@ -1709,8 +1709,8 @@ impl std::fmt::Debug for ApiHubPlugin {
 }
 
 impl ApiHubPlugin {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1731,7 +1731,7 @@ impl super::stubs::ApiHubPlugin for ApiHubPlugin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1787,7 +1787,7 @@ impl super::stubs::ApiHubPlugin for ApiHubPlugin {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1806,7 +1806,7 @@ impl super::stubs::ApiHubPlugin for ApiHubPlugin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1828,7 +1828,7 @@ impl super::stubs::ApiHubPlugin for ApiHubPlugin {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1847,7 +1847,7 @@ impl super::stubs::ApiHubPlugin for ApiHubPlugin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1866,7 +1866,7 @@ impl super::stubs::ApiHubPlugin for ApiHubPlugin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1888,10 +1888,10 @@ impl super::stubs::ApiHubPlugin for ApiHubPlugin {
     }
 }
 
-/// Implements [Provisioning](super::stubs::Provisioning) using a [gclient::ReqwestClient].
+/// Implements [Provisioning](super::stubs::Provisioning) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Provisioning {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Provisioning {
@@ -1903,8 +1903,8 @@ impl std::fmt::Debug for Provisioning {
 }
 
 impl Provisioning {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1948,7 +1948,7 @@ impl super::stubs::Provisioning for Provisioning {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1970,7 +1970,7 @@ impl super::stubs::Provisioning for Provisioning {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1992,7 +1992,7 @@ impl super::stubs::Provisioning for Provisioning {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2011,7 +2011,7 @@ impl super::stubs::Provisioning for Provisioning {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2033,7 +2033,7 @@ impl super::stubs::Provisioning for Provisioning {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2052,7 +2052,7 @@ impl super::stubs::Provisioning for Provisioning {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2071,7 +2071,7 @@ impl super::stubs::Provisioning for Provisioning {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2107,10 +2107,10 @@ impl super::stubs::Provisioning for Provisioning {
     }
 }
 
-/// Implements [RuntimeProjectAttachmentService](super::stubs::RuntimeProjectAttachmentService) using a [gclient::ReqwestClient].
+/// Implements [RuntimeProjectAttachmentService](super::stubs::RuntimeProjectAttachmentService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct RuntimeProjectAttachmentService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for RuntimeProjectAttachmentService {
@@ -2122,8 +2122,8 @@ impl std::fmt::Debug for RuntimeProjectAttachmentService {
 }
 
 impl RuntimeProjectAttachmentService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -2170,7 +2170,7 @@ impl super::stubs::RuntimeProjectAttachmentService for RuntimeProjectAttachmentS
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2196,7 +2196,7 @@ impl super::stubs::RuntimeProjectAttachmentService for RuntimeProjectAttachmentS
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2215,7 +2215,7 @@ impl super::stubs::RuntimeProjectAttachmentService for RuntimeProjectAttachmentS
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2237,7 +2237,7 @@ impl super::stubs::RuntimeProjectAttachmentService for RuntimeProjectAttachmentS
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2259,7 +2259,7 @@ impl super::stubs::RuntimeProjectAttachmentService for RuntimeProjectAttachmentS
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2278,7 +2278,7 @@ impl super::stubs::RuntimeProjectAttachmentService for RuntimeProjectAttachmentS
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2300,7 +2300,7 @@ impl super::stubs::RuntimeProjectAttachmentService for RuntimeProjectAttachmentS
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2319,7 +2319,7 @@ impl super::stubs::RuntimeProjectAttachmentService for RuntimeProjectAttachmentS
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2338,7 +2338,7 @@ impl super::stubs::RuntimeProjectAttachmentService for RuntimeProjectAttachmentS
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/apphub/v1/Cargo.toml b/src/generated/cloud/apphub/v1/Cargo.toml
index 34410b59a..09ea313db 100644
--- a/src/generated/cloud/apphub/v1/Cargo.toml
+++ b/src/generated/cloud/apphub/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/apphub/v1/src/model.rs b/src/generated/cloud/apphub/v1/src/model.rs
index a3b1f2c85..6b5cd95c5 100755
--- a/src/generated/cloud/apphub/v1/src/model.rs
+++ b/src/generated/cloud/apphub/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/apphub/v1/src/transport.rs b/src/generated/cloud/apphub/v1/src/transport.rs
index 27ff777e4..f6c83f449 100755
--- a/src/generated/cloud/apphub/v1/src/transport.rs
+++ b/src/generated/cloud/apphub/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [AppHub](super::stubs::AppHub) using a [gclient::ReqwestClient].
+/// Implements [AppHub](super::stubs::AppHub) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct AppHub {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for AppHub {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for AppHub {
 }
 
 impl AppHub {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -58,7 +58,7 @@ impl super::stubs::AppHub for AppHub {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -84,7 +84,7 @@ impl super::stubs::AppHub for AppHub {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -130,7 +130,7 @@ impl super::stubs::AppHub for AppHub {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -150,7 +150,7 @@ impl super::stubs::AppHub for AppHub {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -196,7 +196,7 @@ impl super::stubs::AppHub for AppHub {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -215,7 +215,7 @@ impl super::stubs::AppHub for AppHub {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -238,7 +238,7 @@ impl super::stubs::AppHub for AppHub {
             );
         let builder = builder.query(&[("uri", &req.uri)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -261,7 +261,7 @@ impl super::stubs::AppHub for AppHub {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -304,7 +304,7 @@ impl super::stubs::AppHub for AppHub {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -322,7 +322,7 @@ impl super::stubs::AppHub for AppHub {
                     "/v1/{}",
                     req.service
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("service"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("service"))?
                         .name
                 ),
             )
@@ -338,7 +338,7 @@ impl super::stubs::AppHub for AppHub {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -363,7 +363,7 @@ impl super::stubs::AppHub for AppHub {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -389,7 +389,7 @@ impl super::stubs::AppHub for AppHub {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -408,7 +408,7 @@ impl super::stubs::AppHub for AppHub {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -431,7 +431,7 @@ impl super::stubs::AppHub for AppHub {
             );
         let builder = builder.query(&[("uri", &req.uri)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -457,7 +457,7 @@ impl super::stubs::AppHub for AppHub {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -500,7 +500,7 @@ impl super::stubs::AppHub for AppHub {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -518,7 +518,7 @@ impl super::stubs::AppHub for AppHub {
                     "/v1/{}",
                     req.workload
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("workload"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("workload"))?
                         .name
                 ),
             )
@@ -534,7 +534,7 @@ impl super::stubs::AppHub for AppHub {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -559,7 +559,7 @@ impl super::stubs::AppHub for AppHub {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -585,7 +585,7 @@ impl super::stubs::AppHub for AppHub {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -628,7 +628,7 @@ impl super::stubs::AppHub for AppHub {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -646,7 +646,7 @@ impl super::stubs::AppHub for AppHub {
                     "/v1/{}",
                     req.application
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("application"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("application"))?
                         .name
                 ),
             )
@@ -662,7 +662,7 @@ impl super::stubs::AppHub for AppHub {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -687,7 +687,7 @@ impl super::stubs::AppHub for AppHub {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -709,7 +709,7 @@ impl super::stubs::AppHub for AppHub {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -728,7 +728,7 @@ impl super::stubs::AppHub for AppHub {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -776,11 +776,11 @@ impl super::stubs::AppHub for AppHub {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -822,7 +822,7 @@ impl super::stubs::AppHub for AppHub {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -841,7 +841,7 @@ impl super::stubs::AppHub for AppHub {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -860,7 +860,7 @@ impl super::stubs::AppHub for AppHub {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/asset/v1/Cargo.toml b/src/generated/cloud/asset/v1/Cargo.toml
index 043dd6f4b..d05874e98 100644
--- a/src/generated/cloud/asset/v1/Cargo.toml
+++ b/src/generated/cloud/asset/v1/Cargo.toml
@@ -30,7 +30,7 @@ accesscontextmanager_v1 = { version = "0.2", path = "../../../../../src/generate
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
diff --git a/src/generated/cloud/asset/v1/src/model.rs b/src/generated/cloud/asset/v1/src/model.rs
index a20f655c0..b0ce98fda 100755
--- a/src/generated/cloud/asset/v1/src/model.rs
+++ b/src/generated/cloud/asset/v1/src/model.rs
@@ -21,7 +21,7 @@ extern crate accesscontextmanager_v1;
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate iam_v1;
 extern crate lazy_static;
diff --git a/src/generated/cloud/asset/v1/src/transport.rs b/src/generated/cloud/asset/v1/src/transport.rs
index 4f7ca51d2..5afcf116f 100755
--- a/src/generated/cloud/asset/v1/src/transport.rs
+++ b/src/generated/cloud/asset/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [AssetService](super::stubs::AssetService) using a [gclient::ReqwestClient].
+/// Implements [AssetService](super::stubs::AssetService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct AssetService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for AssetService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for AssetService {
 }
 
 impl AssetService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -81,7 +81,7 @@ impl super::stubs::AssetService for AssetService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readTime")
             });
         let builder = req
@@ -95,7 +95,7 @@ impl super::stubs::AssetService for AssetService {
             builder.query(&[("relationshipTypes", p)])
         });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -128,14 +128,14 @@ impl super::stubs::AssetService for AssetService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readTimeWindow")
             });
         let builder = req.relationship_types.iter().fold(builder, |builder, p| {
             builder.query(&[("relationshipTypes", p)])
         });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -171,7 +171,7 @@ impl super::stubs::AssetService for AssetService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -190,7 +190,7 @@ impl super::stubs::AssetService for AssetService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -208,7 +208,7 @@ impl super::stubs::AssetService for AssetService {
                     "/v1/{}",
                     req.feed
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("feed"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("feed"))?
                         .name
                 ),
             )
@@ -235,7 +235,7 @@ impl super::stubs::AssetService for AssetService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -271,11 +271,11 @@ impl super::stubs::AssetService for AssetService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -305,7 +305,7 @@ impl super::stubs::AssetService for AssetService {
             .fold(builder, |builder, p| builder.query(&[("assetTypes", p)]));
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -323,7 +323,7 @@ impl super::stubs::AssetService for AssetService {
                     "/v1/{}:analyzeIamPolicy",
                     req.analysis_query
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("analysis_query"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("analysis_query"))?
                         .scope
                 ),
             )
@@ -339,7 +339,7 @@ impl super::stubs::AssetService for AssetService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "analysisQuery")
             });
         let builder = builder.query(&[("savedAnalysisQuery", &req.saved_analysis_query)]);
@@ -350,11 +350,11 @@ impl super::stubs::AssetService for AssetService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "executionTimeout")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -372,7 +372,7 @@ impl super::stubs::AssetService for AssetService {
                     "/v1/{}:analyzeIamPolicyLongrunning",
                     req.analysis_query
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("analysis_query"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("analysis_query"))?
                         .scope
                 ),
             )
@@ -404,7 +404,7 @@ impl super::stubs::AssetService for AssetService {
         let builder = builder.query(&[("destinationParent", &req.destination_parent)]);
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -466,7 +466,7 @@ impl super::stubs::AssetService for AssetService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -491,7 +491,7 @@ impl super::stubs::AssetService for AssetService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -509,7 +509,7 @@ impl super::stubs::AssetService for AssetService {
                     "/v1/{}",
                     req.saved_query
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("saved_query"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("saved_query"))?
                         .name
                 ),
             )
@@ -525,7 +525,7 @@ impl super::stubs::AssetService for AssetService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -548,7 +548,7 @@ impl super::stubs::AssetService for AssetService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -574,7 +574,7 @@ impl super::stubs::AssetService for AssetService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("names", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -603,7 +603,7 @@ impl super::stubs::AssetService for AssetService {
             .fold(builder, |builder, p| builder.query(&[("pageSize", p)]));
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -632,7 +632,7 @@ impl super::stubs::AssetService for AssetService {
             .fold(builder, |builder, p| builder.query(&[("pageSize", p)]));
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -661,7 +661,7 @@ impl super::stubs::AssetService for AssetService {
             .fold(builder, |builder, p| builder.query(&[("pageSize", p)]));
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -680,7 +680,7 @@ impl super::stubs::AssetService for AssetService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/assuredworkloads/v1/Cargo.toml b/src/generated/cloud/assuredworkloads/v1/Cargo.toml
index 8b213a7d1..9973047d8 100644
--- a/src/generated/cloud/assuredworkloads/v1/Cargo.toml
+++ b/src/generated/cloud/assuredworkloads/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
 lro        = { version = "0.1", path = "../../../../../src/lro", package = "google-cloud-lro" }
diff --git a/src/generated/cloud/assuredworkloads/v1/src/model.rs b/src/generated/cloud/assuredworkloads/v1/src/model.rs
index 65b97428c..e59ff0863 100755
--- a/src/generated/cloud/assuredworkloads/v1/src/model.rs
+++ b/src/generated/cloud/assuredworkloads/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate longrunning;
 extern crate lro;
diff --git a/src/generated/cloud/assuredworkloads/v1/src/transport.rs b/src/generated/cloud/assuredworkloads/v1/src/transport.rs
index acf2be49e..e19723319 100755
--- a/src/generated/cloud/assuredworkloads/v1/src/transport.rs
+++ b/src/generated/cloud/assuredworkloads/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [AssuredWorkloadsService](super::stubs::AssuredWorkloadsService) using a [gclient::ReqwestClient].
+/// Implements [AssuredWorkloadsService](super::stubs::AssuredWorkloadsService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct AssuredWorkloadsService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for AssuredWorkloadsService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for AssuredWorkloadsService {
 }
 
 impl AssuredWorkloadsService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -77,7 +77,7 @@ impl super::stubs::AssuredWorkloadsService for AssuredWorkloadsService {
                     "/v1/{}",
                     req.workload
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("workload"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("workload"))?
                         .name
                 ),
             )
@@ -93,7 +93,7 @@ impl super::stubs::AssuredWorkloadsService for AssuredWorkloadsService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -137,7 +137,7 @@ impl super::stubs::AssuredWorkloadsService for AssuredWorkloadsService {
             );
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -156,7 +156,7 @@ impl super::stubs::AssuredWorkloadsService for AssuredWorkloadsService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -181,7 +181,7 @@ impl super::stubs::AssuredWorkloadsService for AssuredWorkloadsService {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -203,7 +203,7 @@ impl super::stubs::AssuredWorkloadsService for AssuredWorkloadsService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -222,7 +222,7 @@ impl super::stubs::AssuredWorkloadsService for AssuredWorkloadsService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/backupdr/v1/Cargo.toml b/src/generated/cloud/backupdr/v1/Cargo.toml
index 7de2b280f..11652cf84 100644
--- a/src/generated/cloud/backupdr/v1/Cargo.toml
+++ b/src/generated/cloud/backupdr/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
diff --git a/src/generated/cloud/backupdr/v1/src/model.rs b/src/generated/cloud/backupdr/v1/src/model.rs
index 3e715747e..65e2edb68 100755
--- a/src/generated/cloud/backupdr/v1/src/model.rs
+++ b/src/generated/cloud/backupdr/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate iam_v1;
 extern crate lazy_static;
diff --git a/src/generated/cloud/backupdr/v1/src/transport.rs b/src/generated/cloud/backupdr/v1/src/transport.rs
index 5e81d0f3f..c2e7535e1 100755
--- a/src/generated/cloud/backupdr/v1/src/transport.rs
+++ b/src/generated/cloud/backupdr/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [BackupDR](super::stubs::BackupDR) using a [gclient::ReqwestClient].
+/// Implements [BackupDR](super::stubs::BackupDR) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct BackupDR {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for BackupDR {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for BackupDR {
 }
 
 impl BackupDR {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -68,7 +68,7 @@ impl super::stubs::BackupDR for BackupDR {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("orderBy", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -87,7 +87,7 @@ impl super::stubs::BackupDR for BackupDR {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -131,7 +131,7 @@ impl super::stubs::BackupDR for BackupDR {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -183,7 +183,7 @@ impl super::stubs::BackupDR for BackupDR {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -209,7 +209,7 @@ impl super::stubs::BackupDR for BackupDR {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -229,7 +229,7 @@ impl super::stubs::BackupDR for BackupDR {
             );
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -247,7 +247,7 @@ impl super::stubs::BackupDR for BackupDR {
                     "/v1/{}",
                     req.backup_vault
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("backup_vault"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("backup_vault"))?
                         .name
                 ),
             )
@@ -263,7 +263,7 @@ impl super::stubs::BackupDR for BackupDR {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -298,7 +298,7 @@ impl super::stubs::BackupDR for BackupDR {
             &req.ignore_backup_plan_references,
         )]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -324,7 +324,7 @@ impl super::stubs::BackupDR for BackupDR {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -343,7 +343,7 @@ impl super::stubs::BackupDR for BackupDR {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -361,7 +361,7 @@ impl super::stubs::BackupDR for BackupDR {
                     "/v1/{}",
                     req.data_source
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("data_source"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("data_source"))?
                         .name
                 ),
             )
@@ -377,7 +377,7 @@ impl super::stubs::BackupDR for BackupDR {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -407,7 +407,7 @@ impl super::stubs::BackupDR for BackupDR {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -427,7 +427,7 @@ impl super::stubs::BackupDR for BackupDR {
             );
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -445,7 +445,7 @@ impl super::stubs::BackupDR for BackupDR {
                     "/v1/{}",
                     req.backup
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("backup"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("backup"))?
                         .name
                 ),
             )
@@ -461,7 +461,7 @@ impl super::stubs::BackupDR for BackupDR {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -484,7 +484,7 @@ impl super::stubs::BackupDR for BackupDR {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -544,7 +544,7 @@ impl super::stubs::BackupDR for BackupDR {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -570,7 +570,7 @@ impl super::stubs::BackupDR for BackupDR {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -590,7 +590,7 @@ impl super::stubs::BackupDR for BackupDR {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -634,7 +634,7 @@ impl super::stubs::BackupDR for BackupDR {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -659,7 +659,7 @@ impl super::stubs::BackupDR for BackupDR {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -679,7 +679,7 @@ impl super::stubs::BackupDR for BackupDR {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -741,7 +741,7 @@ impl super::stubs::BackupDR for BackupDR {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -760,7 +760,7 @@ impl super::stubs::BackupDR for BackupDR {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -808,11 +808,11 @@ impl super::stubs::BackupDR for BackupDR {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -854,7 +854,7 @@ impl super::stubs::BackupDR for BackupDR {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -873,7 +873,7 @@ impl super::stubs::BackupDR for BackupDR {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -892,7 +892,7 @@ impl super::stubs::BackupDR for BackupDR {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/baremetalsolution/v2/Cargo.toml b/src/generated/cloud/baremetalsolution/v2/Cargo.toml
index 85c75eda8..5f4b88f17 100644
--- a/src/generated/cloud/baremetalsolution/v2/Cargo.toml
+++ b/src/generated/cloud/baremetalsolution/v2/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/baremetalsolution/v2/src/model.rs b/src/generated/cloud/baremetalsolution/v2/src/model.rs
index 847b62e25..2ac4cf80b 100755
--- a/src/generated/cloud/baremetalsolution/v2/src/model.rs
+++ b/src/generated/cloud/baremetalsolution/v2/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate location;
 extern crate longrunning;
diff --git a/src/generated/cloud/baremetalsolution/v2/src/transport.rs b/src/generated/cloud/baremetalsolution/v2/src/transport.rs
index 5c03618e0..ef7907ebf 100755
--- a/src/generated/cloud/baremetalsolution/v2/src/transport.rs
+++ b/src/generated/cloud/baremetalsolution/v2/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [BareMetalSolution](super::stubs::BareMetalSolution) using a [gclient::ReqwestClient].
+/// Implements [BareMetalSolution](super::stubs::BareMetalSolution) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct BareMetalSolution {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for BareMetalSolution {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for BareMetalSolution {
 }
 
 impl BareMetalSolution {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -61,7 +61,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -80,7 +80,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -98,7 +98,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
                     "/v2/{}",
                     req.instance
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("instance"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("instance"))?
                         .name
                 ),
             )
@@ -114,7 +114,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -267,7 +267,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -306,7 +306,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -328,7 +328,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -347,7 +347,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -365,7 +365,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
                     "/v2/{}",
                     req.volume
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("volume"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("volume"))?
                         .name
                 ),
             )
@@ -381,7 +381,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.volume), options).await
@@ -456,7 +456,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -478,7 +478,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -497,7 +497,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -515,7 +515,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
                     "/v2/{}",
                     req.network
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("network"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("network"))?
                         .name
                 ),
             )
@@ -531,7 +531,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -596,7 +596,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -615,7 +615,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -639,7 +639,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -658,7 +658,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -679,7 +679,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -715,7 +715,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -740,7 +740,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -758,7 +758,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
                     "/v2/{}",
                     req.nfs_share
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("nfs_share"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("nfs_share"))?
                         .name
                 ),
             )
@@ -774,7 +774,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -836,7 +836,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -860,7 +860,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -899,7 +899,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -940,7 +940,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
                     "/v2/{}",
                     req.provisioning_config
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("provisioning_config"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("provisioning_config"))?
                         .name
                 ),
             )
@@ -956,7 +956,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("email", &req.email)]);
@@ -999,7 +999,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1021,7 +1021,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1040,7 +1040,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1059,7 +1059,7 @@ impl super::stubs::BareMetalSolution for BareMetalSolution {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/beyondcorp/appconnections/v1/Cargo.toml b/src/generated/cloud/beyondcorp/appconnections/v1/Cargo.toml
index 0de8df417..b901bd8b3 100644
--- a/src/generated/cloud/beyondcorp/appconnections/v1/Cargo.toml
+++ b/src/generated/cloud/beyondcorp/appconnections/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/beyondcorp/appconnections/v1/src/model.rs b/src/generated/cloud/beyondcorp/appconnections/v1/src/model.rs
index 672c7c83d..30afa4701 100755
--- a/src/generated/cloud/beyondcorp/appconnections/v1/src/model.rs
+++ b/src/generated/cloud/beyondcorp/appconnections/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/beyondcorp/appconnections/v1/src/transport.rs b/src/generated/cloud/beyondcorp/appconnections/v1/src/transport.rs
index d49bacb66..6be8391de 100755
--- a/src/generated/cloud/beyondcorp/appconnections/v1/src/transport.rs
+++ b/src/generated/cloud/beyondcorp/appconnections/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [AppConnectionsService](super::stubs::AppConnectionsService) using a [gclient::ReqwestClient].
+/// Implements [AppConnectionsService](super::stubs::AppConnectionsService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct AppConnectionsService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for AppConnectionsService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for AppConnectionsService {
 }
 
 impl AppConnectionsService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::AppConnectionsService for AppConnectionsService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -81,7 +81,7 @@ impl super::stubs::AppConnectionsService for AppConnectionsService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -124,7 +124,7 @@ impl super::stubs::AppConnectionsService for AppConnectionsService {
                     "/v1/{}",
                     req.app_connection
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("app_connection"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("app_connection"))?
                         .name
                 ),
             )
@@ -140,7 +140,7 @@ impl super::stubs::AppConnectionsService for AppConnectionsService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -168,7 +168,7 @@ impl super::stubs::AppConnectionsService for AppConnectionsService {
         let builder = builder.query(&[("requestId", &req.request_id)]);
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -193,7 +193,7 @@ impl super::stubs::AppConnectionsService for AppConnectionsService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -215,7 +215,7 @@ impl super::stubs::AppConnectionsService for AppConnectionsService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -234,7 +234,7 @@ impl super::stubs::AppConnectionsService for AppConnectionsService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -282,11 +282,11 @@ impl super::stubs::AppConnectionsService for AppConnectionsService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -328,7 +328,7 @@ impl super::stubs::AppConnectionsService for AppConnectionsService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -347,7 +347,7 @@ impl super::stubs::AppConnectionsService for AppConnectionsService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -366,7 +366,7 @@ impl super::stubs::AppConnectionsService for AppConnectionsService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/beyondcorp/appconnectors/v1/Cargo.toml b/src/generated/cloud/beyondcorp/appconnectors/v1/Cargo.toml
index 3c81a1424..8fe530f82 100644
--- a/src/generated/cloud/beyondcorp/appconnectors/v1/Cargo.toml
+++ b/src/generated/cloud/beyondcorp/appconnectors/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/beyondcorp/appconnectors/v1/src/model.rs b/src/generated/cloud/beyondcorp/appconnectors/v1/src/model.rs
index f285e2ebb..0a993c7ee 100755
--- a/src/generated/cloud/beyondcorp/appconnectors/v1/src/model.rs
+++ b/src/generated/cloud/beyondcorp/appconnectors/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/beyondcorp/appconnectors/v1/src/transport.rs b/src/generated/cloud/beyondcorp/appconnectors/v1/src/transport.rs
index 1828e7eb5..83710b404 100755
--- a/src/generated/cloud/beyondcorp/appconnectors/v1/src/transport.rs
+++ b/src/generated/cloud/beyondcorp/appconnectors/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [AppConnectorsService](super::stubs::AppConnectorsService) using a [gclient::ReqwestClient].
+/// Implements [AppConnectorsService](super::stubs::AppConnectorsService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct AppConnectorsService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for AppConnectorsService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for AppConnectorsService {
 }
 
 impl AppConnectorsService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::AppConnectorsService for AppConnectorsService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -81,7 +81,7 @@ impl super::stubs::AppConnectorsService for AppConnectorsService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -124,7 +124,7 @@ impl super::stubs::AppConnectorsService for AppConnectorsService {
                     "/v1/{}",
                     req.app_connector
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("app_connector"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("app_connector"))?
                         .name
                 ),
             )
@@ -140,7 +140,7 @@ impl super::stubs::AppConnectorsService for AppConnectorsService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -167,7 +167,7 @@ impl super::stubs::AppConnectorsService for AppConnectorsService {
         let builder = builder.query(&[("requestId", &req.request_id)]);
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -209,7 +209,7 @@ impl super::stubs::AppConnectorsService for AppConnectorsService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -228,7 +228,7 @@ impl super::stubs::AppConnectorsService for AppConnectorsService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -276,11 +276,11 @@ impl super::stubs::AppConnectorsService for AppConnectorsService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -322,7 +322,7 @@ impl super::stubs::AppConnectorsService for AppConnectorsService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -341,7 +341,7 @@ impl super::stubs::AppConnectorsService for AppConnectorsService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -360,7 +360,7 @@ impl super::stubs::AppConnectorsService for AppConnectorsService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/beyondcorp/appgateways/v1/Cargo.toml b/src/generated/cloud/beyondcorp/appgateways/v1/Cargo.toml
index b308e5fa5..a527cb9f5 100644
--- a/src/generated/cloud/beyondcorp/appgateways/v1/Cargo.toml
+++ b/src/generated/cloud/beyondcorp/appgateways/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/beyondcorp/appgateways/v1/src/model.rs b/src/generated/cloud/beyondcorp/appgateways/v1/src/model.rs
index 1f4a29816..a9683dcbe 100755
--- a/src/generated/cloud/beyondcorp/appgateways/v1/src/model.rs
+++ b/src/generated/cloud/beyondcorp/appgateways/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/beyondcorp/appgateways/v1/src/transport.rs b/src/generated/cloud/beyondcorp/appgateways/v1/src/transport.rs
index 72c1eb9ff..b9dfc91de 100755
--- a/src/generated/cloud/beyondcorp/appgateways/v1/src/transport.rs
+++ b/src/generated/cloud/beyondcorp/appgateways/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [AppGatewaysService](super::stubs::AppGatewaysService) using a [gclient::ReqwestClient].
+/// Implements [AppGatewaysService](super::stubs::AppGatewaysService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct AppGatewaysService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for AppGatewaysService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for AppGatewaysService {
 }
 
 impl AppGatewaysService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::AppGatewaysService for AppGatewaysService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -81,7 +81,7 @@ impl super::stubs::AppGatewaysService for AppGatewaysService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -127,7 +127,7 @@ impl super::stubs::AppGatewaysService for AppGatewaysService {
         let builder = builder.query(&[("requestId", &req.request_id)]);
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -149,7 +149,7 @@ impl super::stubs::AppGatewaysService for AppGatewaysService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -168,7 +168,7 @@ impl super::stubs::AppGatewaysService for AppGatewaysService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -216,11 +216,11 @@ impl super::stubs::AppGatewaysService for AppGatewaysService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -262,7 +262,7 @@ impl super::stubs::AppGatewaysService for AppGatewaysService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -281,7 +281,7 @@ impl super::stubs::AppGatewaysService for AppGatewaysService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -300,7 +300,7 @@ impl super::stubs::AppGatewaysService for AppGatewaysService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/beyondcorp/clientconnectorservices/v1/Cargo.toml b/src/generated/cloud/beyondcorp/clientconnectorservices/v1/Cargo.toml
index 71a94e071..355c0ed8b 100644
--- a/src/generated/cloud/beyondcorp/clientconnectorservices/v1/Cargo.toml
+++ b/src/generated/cloud/beyondcorp/clientconnectorservices/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/model.rs b/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/model.rs
index 69e223ceb..b59705754 100755
--- a/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/model.rs
+++ b/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/transport.rs b/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/transport.rs
index 19c49f5dd..36841f73c 100755
--- a/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/transport.rs
+++ b/src/generated/cloud/beyondcorp/clientconnectorservices/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [ClientConnectorServicesService](super::stubs::ClientConnectorServicesService) using a [gclient::ReqwestClient].
+/// Implements [ClientConnectorServicesService](super::stubs::ClientConnectorServicesService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ClientConnectorServicesService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ClientConnectorServicesService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for ClientConnectorServicesService {
 }
 
 impl ClientConnectorServicesService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::ClientConnectorServicesService for ClientConnectorServicesSer
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -81,7 +81,7 @@ impl super::stubs::ClientConnectorServicesService for ClientConnectorServicesSer
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -125,9 +125,7 @@ impl super::stubs::ClientConnectorServicesService for ClientConnectorServicesSer
                     "/v1/{}",
                     req.client_connector_service
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing(
-                            "client_connector_service"
-                        ))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("client_connector_service"))?
                         .name
                 ),
             )
@@ -143,7 +141,7 @@ impl super::stubs::ClientConnectorServicesService for ClientConnectorServicesSer
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -171,7 +169,7 @@ impl super::stubs::ClientConnectorServicesService for ClientConnectorServicesSer
         let builder = builder.query(&[("requestId", &req.request_id)]);
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -193,7 +191,7 @@ impl super::stubs::ClientConnectorServicesService for ClientConnectorServicesSer
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -212,7 +210,7 @@ impl super::stubs::ClientConnectorServicesService for ClientConnectorServicesSer
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -260,11 +258,11 @@ impl super::stubs::ClientConnectorServicesService for ClientConnectorServicesSer
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -306,7 +304,7 @@ impl super::stubs::ClientConnectorServicesService for ClientConnectorServicesSer
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -325,7 +323,7 @@ impl super::stubs::ClientConnectorServicesService for ClientConnectorServicesSer
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -344,7 +342,7 @@ impl super::stubs::ClientConnectorServicesService for ClientConnectorServicesSer
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/beyondcorp/clientgateways/v1/Cargo.toml b/src/generated/cloud/beyondcorp/clientgateways/v1/Cargo.toml
index 3a53bd6b3..d05607216 100644
--- a/src/generated/cloud/beyondcorp/clientgateways/v1/Cargo.toml
+++ b/src/generated/cloud/beyondcorp/clientgateways/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/beyondcorp/clientgateways/v1/src/model.rs b/src/generated/cloud/beyondcorp/clientgateways/v1/src/model.rs
index 2bf9e8009..c97cc06fb 100755
--- a/src/generated/cloud/beyondcorp/clientgateways/v1/src/model.rs
+++ b/src/generated/cloud/beyondcorp/clientgateways/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/beyondcorp/clientgateways/v1/src/transport.rs b/src/generated/cloud/beyondcorp/clientgateways/v1/src/transport.rs
index 0acf983f6..ab7079e28 100755
--- a/src/generated/cloud/beyondcorp/clientgateways/v1/src/transport.rs
+++ b/src/generated/cloud/beyondcorp/clientgateways/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [ClientGatewaysService](super::stubs::ClientGatewaysService) using a [gclient::ReqwestClient].
+/// Implements [ClientGatewaysService](super::stubs::ClientGatewaysService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ClientGatewaysService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ClientGatewaysService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for ClientGatewaysService {
 }
 
 impl ClientGatewaysService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::ClientGatewaysService for ClientGatewaysService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -81,7 +81,7 @@ impl super::stubs::ClientGatewaysService for ClientGatewaysService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -127,7 +127,7 @@ impl super::stubs::ClientGatewaysService for ClientGatewaysService {
         let builder = builder.query(&[("requestId", &req.request_id)]);
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -149,7 +149,7 @@ impl super::stubs::ClientGatewaysService for ClientGatewaysService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -168,7 +168,7 @@ impl super::stubs::ClientGatewaysService for ClientGatewaysService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -216,11 +216,11 @@ impl super::stubs::ClientGatewaysService for ClientGatewaysService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -262,7 +262,7 @@ impl super::stubs::ClientGatewaysService for ClientGatewaysService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -281,7 +281,7 @@ impl super::stubs::ClientGatewaysService for ClientGatewaysService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -300,7 +300,7 @@ impl super::stubs::ClientGatewaysService for ClientGatewaysService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/bigquery/analyticshub/v1/Cargo.toml b/src/generated/cloud/bigquery/analyticshub/v1/Cargo.toml
index f29682fa1..ee9a4dda0 100644
--- a/src/generated/cloud/bigquery/analyticshub/v1/Cargo.toml
+++ b/src/generated/cloud/bigquery/analyticshub/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/bigquery/analyticshub/v1/src/model.rs b/src/generated/cloud/bigquery/analyticshub/v1/src/model.rs
index 69d335338..3ae48ddb2 100755
--- a/src/generated/cloud/bigquery/analyticshub/v1/src/model.rs
+++ b/src/generated/cloud/bigquery/analyticshub/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate longrunning;
diff --git a/src/generated/cloud/bigquery/analyticshub/v1/src/transport.rs b/src/generated/cloud/bigquery/analyticshub/v1/src/transport.rs
index 77c7d9b2c..abc8fc32e 100755
--- a/src/generated/cloud/bigquery/analyticshub/v1/src/transport.rs
+++ b/src/generated/cloud/bigquery/analyticshub/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [AnalyticsHubService](super::stubs::AnalyticsHubService) using a [gclient::ReqwestClient].
+/// Implements [AnalyticsHubService](super::stubs::AnalyticsHubService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct AnalyticsHubService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for AnalyticsHubService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for AnalyticsHubService {
 }
 
 impl AnalyticsHubService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -60,7 +60,7 @@ impl super::stubs::AnalyticsHubService for AnalyticsHubService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -84,7 +84,7 @@ impl super::stubs::AnalyticsHubService for AnalyticsHubService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -103,7 +103,7 @@ impl super::stubs::AnalyticsHubService for AnalyticsHubService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -144,7 +144,7 @@ impl super::stubs::AnalyticsHubService for AnalyticsHubService {
                     "/v1/{}",
                     req.data_exchange
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("data_exchange"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("data_exchange"))?
                         .name
                 ),
             )
@@ -160,7 +160,7 @@ impl super::stubs::AnalyticsHubService for AnalyticsHubService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -183,7 +183,7 @@ impl super::stubs::AnalyticsHubService for AnalyticsHubService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -204,7 +204,7 @@ impl super::stubs::AnalyticsHubService for AnalyticsHubService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -223,7 +223,7 @@ impl super::stubs::AnalyticsHubService for AnalyticsHubService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -264,7 +264,7 @@ impl super::stubs::AnalyticsHubService for AnalyticsHubService {
                     "/v1/{}",
                     req.listing
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("listing"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("listing"))?
                         .name
                 ),
             )
@@ -280,7 +280,7 @@ impl super::stubs::AnalyticsHubService for AnalyticsHubService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -303,7 +303,7 @@ impl super::stubs::AnalyticsHubService for AnalyticsHubService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -373,7 +373,7 @@ impl super::stubs::AnalyticsHubService for AnalyticsHubService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -398,7 +398,7 @@ impl super::stubs::AnalyticsHubService for AnalyticsHubService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -426,7 +426,7 @@ impl super::stubs::AnalyticsHubService for AnalyticsHubService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -462,7 +462,7 @@ impl super::stubs::AnalyticsHubService for AnalyticsHubService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -541,7 +541,7 @@ impl super::stubs::AnalyticsHubService for AnalyticsHubService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/bigquery/connection/v1/Cargo.toml b/src/generated/cloud/bigquery/connection/v1/Cargo.toml
index edcd89047..56c5e6322 100644
--- a/src/generated/cloud/bigquery/connection/v1/Cargo.toml
+++ b/src/generated/cloud/bigquery/connection/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
diff --git a/src/generated/cloud/bigquery/connection/v1/src/model.rs b/src/generated/cloud/bigquery/connection/v1/src/model.rs
index f9f5cfc0f..58c3d84cd 100755
--- a/src/generated/cloud/bigquery/connection/v1/src/model.rs
+++ b/src/generated/cloud/bigquery/connection/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate reqwest;
diff --git a/src/generated/cloud/bigquery/connection/v1/src/transport.rs b/src/generated/cloud/bigquery/connection/v1/src/transport.rs
index 0bbb6e8f9..b3016a319 100755
--- a/src/generated/cloud/bigquery/connection/v1/src/transport.rs
+++ b/src/generated/cloud/bigquery/connection/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [ConnectionService](super::stubs::ConnectionService) using a [gclient::ReqwestClient].
+/// Implements [ConnectionService](super::stubs::ConnectionService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ConnectionService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ConnectionService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for ConnectionService {
 }
 
 impl ConnectionService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -78,7 +78,7 @@ impl super::stubs::ConnectionService for ConnectionService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -102,7 +102,7 @@ impl super::stubs::ConnectionService for ConnectionService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -127,7 +127,7 @@ impl super::stubs::ConnectionService for ConnectionService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -150,7 +150,7 @@ impl super::stubs::ConnectionService for ConnectionService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/bigquery/datapolicies/v1/Cargo.toml b/src/generated/cloud/bigquery/datapolicies/v1/Cargo.toml
index 7d7c34254..ad6d6a080 100644
--- a/src/generated/cloud/bigquery/datapolicies/v1/Cargo.toml
+++ b/src/generated/cloud/bigquery/datapolicies/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
diff --git a/src/generated/cloud/bigquery/datapolicies/v1/src/model.rs b/src/generated/cloud/bigquery/datapolicies/v1/src/model.rs
index fb8c4a2b6..1b790ebd7 100755
--- a/src/generated/cloud/bigquery/datapolicies/v1/src/model.rs
+++ b/src/generated/cloud/bigquery/datapolicies/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate reqwest;
diff --git a/src/generated/cloud/bigquery/datapolicies/v1/src/transport.rs b/src/generated/cloud/bigquery/datapolicies/v1/src/transport.rs
index f0cee26c1..d03492b58 100755
--- a/src/generated/cloud/bigquery/datapolicies/v1/src/transport.rs
+++ b/src/generated/cloud/bigquery/datapolicies/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [DataPolicyService](super::stubs::DataPolicyService) using a [gclient::ReqwestClient].
+/// Implements [DataPolicyService](super::stubs::DataPolicyService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct DataPolicyService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for DataPolicyService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for DataPolicyService {
 }
 
 impl DataPolicyService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -76,7 +76,7 @@ impl super::stubs::DataPolicyService for DataPolicyService {
                     "/v1/{}",
                     req.data_policy
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("data_policy"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("data_policy"))?
                         .name
                 ),
             )
@@ -92,7 +92,7 @@ impl super::stubs::DataPolicyService for DataPolicyService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -132,7 +132,7 @@ impl super::stubs::DataPolicyService for DataPolicyService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -151,7 +151,7 @@ impl super::stubs::DataPolicyService for DataPolicyService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -176,7 +176,7 @@ impl super::stubs::DataPolicyService for DataPolicyService {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/bigquery/datatransfer/v1/Cargo.toml b/src/generated/cloud/bigquery/datatransfer/v1/Cargo.toml
index 7339b87fa..0ee18a224 100644
--- a/src/generated/cloud/bigquery/datatransfer/v1/Cargo.toml
+++ b/src/generated/cloud/bigquery/datatransfer/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../../src/generated/cloud/location", package = "google-cloud-location" }
 reqwest    = { version = "0.12", features = ["json"] }
diff --git a/src/generated/cloud/bigquery/datatransfer/v1/src/model.rs b/src/generated/cloud/bigquery/datatransfer/v1/src/model.rs
index d36d48b18..864efbe44 100755
--- a/src/generated/cloud/bigquery/datatransfer/v1/src/model.rs
+++ b/src/generated/cloud/bigquery/datatransfer/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate location;
 extern crate reqwest;
diff --git a/src/generated/cloud/bigquery/datatransfer/v1/src/transport.rs b/src/generated/cloud/bigquery/datatransfer/v1/src/transport.rs
index 65f11bc92..9278b67ac 100755
--- a/src/generated/cloud/bigquery/datatransfer/v1/src/transport.rs
+++ b/src/generated/cloud/bigquery/datatransfer/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [DataTransferService](super::stubs::DataTransferService) using a [gclient::ReqwestClient].
+/// Implements [DataTransferService](super::stubs::DataTransferService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct DataTransferService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for DataTransferService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for DataTransferService {
 }
 
 impl DataTransferService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -55,7 +55,7 @@ impl super::stubs::DataTransferService for DataTransferService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -79,7 +79,7 @@ impl super::stubs::DataTransferService for DataTransferService {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -122,7 +122,7 @@ impl super::stubs::DataTransferService for DataTransferService {
                     "/v1/{}",
                     req.transfer_config
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("transfer_config"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("transfer_config"))?
                         .name
                 ),
             )
@@ -139,7 +139,7 @@ impl super::stubs::DataTransferService for DataTransferService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("versionInfo", &req.version_info)]);
@@ -164,7 +164,7 @@ impl super::stubs::DataTransferService for DataTransferService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -183,7 +183,7 @@ impl super::stubs::DataTransferService for DataTransferService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -211,7 +211,7 @@ impl super::stubs::DataTransferService for DataTransferService {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -270,7 +270,7 @@ impl super::stubs::DataTransferService for DataTransferService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -289,7 +289,7 @@ impl super::stubs::DataTransferService for DataTransferService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -314,7 +314,7 @@ impl super::stubs::DataTransferService for DataTransferService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("runAttempt", &req.run_attempt.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -341,7 +341,7 @@ impl super::stubs::DataTransferService for DataTransferService {
             builder.query(&[("messageTypes", p.value())])
         });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -423,7 +423,7 @@ impl super::stubs::DataTransferService for DataTransferService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -442,7 +442,7 @@ impl super::stubs::DataTransferService for DataTransferService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/cloud/bigquery/migration/v2/Cargo.toml b/src/generated/cloud/bigquery/migration/v2/Cargo.toml
index 11648ff0b..2fbf59beb 100644
--- a/src/generated/cloud/bigquery/migration/v2/Cargo.toml
+++ b/src/generated/cloud/bigquery/migration/v2/Cargo.toml
@@ -30,7 +30,7 @@ api        = { version = "0.2", path = "../../../../../../src/generated/api/type
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
 rpc        = { version = "0.2", path = "../../../../../../src/generated/rpc/types", package = "google-cloud-rpc" }
diff --git a/src/generated/cloud/bigquery/migration/v2/src/model.rs b/src/generated/cloud/bigquery/migration/v2/src/model.rs
index 21575bc9f..336799880 100755
--- a/src/generated/cloud/bigquery/migration/v2/src/model.rs
+++ b/src/generated/cloud/bigquery/migration/v2/src/model.rs
@@ -21,7 +21,7 @@ extern crate api;
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate reqwest;
 extern crate rpc;
diff --git a/src/generated/cloud/bigquery/migration/v2/src/transport.rs b/src/generated/cloud/bigquery/migration/v2/src/transport.rs
index 640c3ae15..7be492f70 100755
--- a/src/generated/cloud/bigquery/migration/v2/src/transport.rs
+++ b/src/generated/cloud/bigquery/migration/v2/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [MigrationService](super::stubs::MigrationService) using a [gclient::ReqwestClient].
+/// Implements [MigrationService](super::stubs::MigrationService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct MigrationService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for MigrationService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for MigrationService {
 }
 
 impl MigrationService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -83,11 +83,11 @@ impl super::stubs::MigrationService for MigrationService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -115,13 +115,13 @@ impl super::stubs::MigrationService for MigrationService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -140,7 +140,7 @@ impl super::stubs::MigrationService for MigrationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -182,11 +182,11 @@ impl super::stubs::MigrationService for MigrationService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -211,14 +211,14 @@ impl super::stubs::MigrationService for MigrationService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/cloud/bigquery/reservation/v1/Cargo.toml b/src/generated/cloud/bigquery/reservation/v1/Cargo.toml
index 027560f15..39a2d5c6d 100644
--- a/src/generated/cloud/bigquery/reservation/v1/Cargo.toml
+++ b/src/generated/cloud/bigquery/reservation/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
 rpc        = { version = "0.2", path = "../../../../../../src/generated/rpc/types", package = "google-cloud-rpc" }
diff --git a/src/generated/cloud/bigquery/reservation/v1/src/model.rs b/src/generated/cloud/bigquery/reservation/v1/src/model.rs
index f61e39300..a252d0db7 100755
--- a/src/generated/cloud/bigquery/reservation/v1/src/model.rs
+++ b/src/generated/cloud/bigquery/reservation/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate reqwest;
 extern crate rpc;
diff --git a/src/generated/cloud/bigquery/reservation/v1/src/transport.rs b/src/generated/cloud/bigquery/reservation/v1/src/transport.rs
index 0db9c2012..0e20e973d 100755
--- a/src/generated/cloud/bigquery/reservation/v1/src/transport.rs
+++ b/src/generated/cloud/bigquery/reservation/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [ReservationService](super::stubs::ReservationService) using a [gclient::ReqwestClient].
+/// Implements [ReservationService](super::stubs::ReservationService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ReservationService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ReservationService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for ReservationService {
 }
 
 impl ReservationService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -83,7 +83,7 @@ impl super::stubs::ReservationService for ReservationService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -102,7 +102,7 @@ impl super::stubs::ReservationService for ReservationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -121,7 +121,7 @@ impl super::stubs::ReservationService for ReservationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -139,7 +139,7 @@ impl super::stubs::ReservationService for ReservationService {
                     "/v1/{}",
                     req.reservation
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("reservation"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("reservation"))?
                         .name
                 ),
             )
@@ -155,7 +155,7 @@ impl super::stubs::ReservationService for ReservationService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -230,7 +230,7 @@ impl super::stubs::ReservationService for ReservationService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -249,7 +249,7 @@ impl super::stubs::ReservationService for ReservationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -269,7 +269,7 @@ impl super::stubs::ReservationService for ReservationService {
             );
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -287,7 +287,7 @@ impl super::stubs::ReservationService for ReservationService {
                     "/v1/{}",
                     req.capacity_commitment
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("capacity_commitment"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("capacity_commitment"))?
                         .name
                 ),
             )
@@ -303,7 +303,7 @@ impl super::stubs::ReservationService for ReservationService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -391,7 +391,7 @@ impl super::stubs::ReservationService for ReservationService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -410,7 +410,7 @@ impl super::stubs::ReservationService for ReservationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -435,7 +435,7 @@ impl super::stubs::ReservationService for ReservationService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -460,7 +460,7 @@ impl super::stubs::ReservationService for ReservationService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -495,7 +495,7 @@ impl super::stubs::ReservationService for ReservationService {
                     "/v1/{}",
                     req.assignment
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("assignment"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("assignment"))?
                         .name
                 ),
             )
@@ -511,7 +511,7 @@ impl super::stubs::ReservationService for ReservationService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -534,7 +534,7 @@ impl super::stubs::ReservationService for ReservationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -552,7 +552,7 @@ impl super::stubs::ReservationService for ReservationService {
                     "/v1/{}",
                     req.bi_reservation
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("bi_reservation"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("bi_reservation"))?
                         .name
                 ),
             )
@@ -568,7 +568,7 @@ impl super::stubs::ReservationService for ReservationService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
diff --git a/src/generated/cloud/billing/v1/Cargo.toml b/src/generated/cloud/billing/v1/Cargo.toml
index d509d8b0f..04e81f1d8 100644
--- a/src/generated/cloud/billing/v1/Cargo.toml
+++ b/src/generated/cloud/billing/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
diff --git a/src/generated/cloud/billing/v1/src/model.rs b/src/generated/cloud/billing/v1/src/model.rs
index d9111c840..b55dadc73 100755
--- a/src/generated/cloud/billing/v1/src/model.rs
+++ b/src/generated/cloud/billing/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate iam_v1;
 extern crate lazy_static;
diff --git a/src/generated/cloud/billing/v1/src/transport.rs b/src/generated/cloud/billing/v1/src/transport.rs
index 55ce4363b..4d64143b1 100755
--- a/src/generated/cloud/billing/v1/src/transport.rs
+++ b/src/generated/cloud/billing/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [CloudBilling](super::stubs::CloudBilling) using a [gclient::ReqwestClient].
+/// Implements [CloudBilling](super::stubs::CloudBilling) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct CloudBilling {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for CloudBilling {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for CloudBilling {
 }
 
 impl CloudBilling {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -55,7 +55,7 @@ impl super::stubs::CloudBilling for CloudBilling {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -78,7 +78,7 @@ impl super::stubs::CloudBilling for CloudBilling {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("parent", &req.parent)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -103,7 +103,7 @@ impl super::stubs::CloudBilling for CloudBilling {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -148,7 +148,7 @@ impl super::stubs::CloudBilling for CloudBilling {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -170,7 +170,7 @@ impl super::stubs::CloudBilling for CloudBilling {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -220,11 +220,11 @@ impl super::stubs::CloudBilling for CloudBilling {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -286,10 +286,10 @@ impl super::stubs::CloudBilling for CloudBilling {
     }
 }
 
-/// Implements [CloudCatalog](super::stubs::CloudCatalog) using a [gclient::ReqwestClient].
+/// Implements [CloudCatalog](super::stubs::CloudCatalog) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct CloudCatalog {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for CloudCatalog {
@@ -301,8 +301,8 @@ impl std::fmt::Debug for CloudCatalog {
 }
 
 impl CloudCatalog {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -325,7 +325,7 @@ impl super::stubs::CloudCatalog for CloudCatalog {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -350,7 +350,7 @@ impl super::stubs::CloudCatalog for CloudCatalog {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "startTime")
             });
         let builder = req
@@ -360,14 +360,14 @@ impl super::stubs::CloudCatalog for CloudCatalog {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "endTime")
             });
         let builder = builder.query(&[("currencyCode", &req.currency_code)]);
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/cloud/binaryauthorization/v1/Cargo.toml b/src/generated/cloud/binaryauthorization/v1/Cargo.toml
index 9d3ca1bf4..8069b4d4b 100644
--- a/src/generated/cloud/binaryauthorization/v1/Cargo.toml
+++ b/src/generated/cloud/binaryauthorization/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 grafeas    = { version = "0.2", path = "../../../../../src/generated/grafeas/v1", package = "google-cloud-grafeas-v1" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
diff --git a/src/generated/cloud/binaryauthorization/v1/src/model.rs b/src/generated/cloud/binaryauthorization/v1/src/model.rs
index 2d1a31d93..dafe99ace 100755
--- a/src/generated/cloud/binaryauthorization/v1/src/model.rs
+++ b/src/generated/cloud/binaryauthorization/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate grafeas;
 extern crate lazy_static;
 extern crate reqwest;
diff --git a/src/generated/cloud/binaryauthorization/v1/src/transport.rs b/src/generated/cloud/binaryauthorization/v1/src/transport.rs
index 00cd9c5fa..bed191c07 100755
--- a/src/generated/cloud/binaryauthorization/v1/src/transport.rs
+++ b/src/generated/cloud/binaryauthorization/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [BinauthzManagementServiceV1](super::stubs::BinauthzManagementServiceV1) using a [gclient::ReqwestClient].
+/// Implements [BinauthzManagementServiceV1](super::stubs::BinauthzManagementServiceV1) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct BinauthzManagementServiceV1 {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for BinauthzManagementServiceV1 {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for BinauthzManagementServiceV1 {
 }
 
 impl BinauthzManagementServiceV1 {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -55,7 +55,7 @@ impl super::stubs::BinauthzManagementServiceV1 for BinauthzManagementServiceV1 {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -73,7 +73,7 @@ impl super::stubs::BinauthzManagementServiceV1 for BinauthzManagementServiceV1 {
                     "/v1/{}",
                     req.policy
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("policy"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("policy"))?
                         .name
                 ),
             )
@@ -123,7 +123,7 @@ impl super::stubs::BinauthzManagementServiceV1 for BinauthzManagementServiceV1 {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -141,7 +141,7 @@ impl super::stubs::BinauthzManagementServiceV1 for BinauthzManagementServiceV1 {
                     "/v1/{}",
                     req.attestor
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("attestor"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("attestor"))?
                         .name
                 ),
             )
@@ -175,7 +175,7 @@ impl super::stubs::BinauthzManagementServiceV1 for BinauthzManagementServiceV1 {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -194,15 +194,15 @@ impl super::stubs::BinauthzManagementServiceV1 for BinauthzManagementServiceV1 {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [SystemPolicyV1](super::stubs::SystemPolicyV1) using a [gclient::ReqwestClient].
+/// Implements [SystemPolicyV1](super::stubs::SystemPolicyV1) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct SystemPolicyV1 {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for SystemPolicyV1 {
@@ -214,8 +214,8 @@ impl std::fmt::Debug for SystemPolicyV1 {
 }
 
 impl SystemPolicyV1 {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -236,15 +236,15 @@ impl super::stubs::SystemPolicyV1 for SystemPolicyV1 {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [ValidationHelperV1](super::stubs::ValidationHelperV1) using a [gclient::ReqwestClient].
+/// Implements [ValidationHelperV1](super::stubs::ValidationHelperV1) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ValidationHelperV1 {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ValidationHelperV1 {
@@ -256,8 +256,8 @@ impl std::fmt::Debug for ValidationHelperV1 {
 }
 
 impl ValidationHelperV1 {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
diff --git a/src/generated/cloud/certificatemanager/v1/Cargo.toml b/src/generated/cloud/certificatemanager/v1/Cargo.toml
index 679c65557..1870c1549 100644
--- a/src/generated/cloud/certificatemanager/v1/Cargo.toml
+++ b/src/generated/cloud/certificatemanager/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/certificatemanager/v1/src/model.rs b/src/generated/cloud/certificatemanager/v1/src/model.rs
index 0d6cb99bb..b4d8565f8 100755
--- a/src/generated/cloud/certificatemanager/v1/src/model.rs
+++ b/src/generated/cloud/certificatemanager/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate location;
 extern crate longrunning;
diff --git a/src/generated/cloud/certificatemanager/v1/src/transport.rs b/src/generated/cloud/certificatemanager/v1/src/transport.rs
index f930f5423..3e2e9987e 100755
--- a/src/generated/cloud/certificatemanager/v1/src/transport.rs
+++ b/src/generated/cloud/certificatemanager/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [CertificateManager](super::stubs::CertificateManager) using a [gclient::ReqwestClient].
+/// Implements [CertificateManager](super::stubs::CertificateManager) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct CertificateManager {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for CertificateManager {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for CertificateManager {
 }
 
 impl CertificateManager {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::CertificateManager for CertificateManager {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -81,7 +81,7 @@ impl super::stubs::CertificateManager for CertificateManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -122,7 +122,7 @@ impl super::stubs::CertificateManager for CertificateManager {
                     "/v1/{}",
                     req.certificate
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("certificate"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("certificate"))?
                         .name
                 ),
             )
@@ -138,7 +138,7 @@ impl super::stubs::CertificateManager for CertificateManager {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -161,7 +161,7 @@ impl super::stubs::CertificateManager for CertificateManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -187,7 +187,7 @@ impl super::stubs::CertificateManager for CertificateManager {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -206,7 +206,7 @@ impl super::stubs::CertificateManager for CertificateManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -247,7 +247,7 @@ impl super::stubs::CertificateManager for CertificateManager {
                     "/v1/{}",
                     req.certificate_map
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("certificate_map"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("certificate_map"))?
                         .name
                 ),
             )
@@ -263,7 +263,7 @@ impl super::stubs::CertificateManager for CertificateManager {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -286,7 +286,7 @@ impl super::stubs::CertificateManager for CertificateManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -312,7 +312,7 @@ impl super::stubs::CertificateManager for CertificateManager {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -331,7 +331,7 @@ impl super::stubs::CertificateManager for CertificateManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -372,7 +372,7 @@ impl super::stubs::CertificateManager for CertificateManager {
                     "/v1/{}",
                     req.certificate_map_entry
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("certificate_map_entry"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("certificate_map_entry"))?
                         .name
                 ),
             )
@@ -388,7 +388,7 @@ impl super::stubs::CertificateManager for CertificateManager {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -411,7 +411,7 @@ impl super::stubs::CertificateManager for CertificateManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -437,7 +437,7 @@ impl super::stubs::CertificateManager for CertificateManager {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -456,7 +456,7 @@ impl super::stubs::CertificateManager for CertificateManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -497,7 +497,7 @@ impl super::stubs::CertificateManager for CertificateManager {
                     "/v1/{}",
                     req.dns_authorization
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("dns_authorization"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("dns_authorization"))?
                         .name
                 ),
             )
@@ -513,7 +513,7 @@ impl super::stubs::CertificateManager for CertificateManager {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -536,7 +536,7 @@ impl super::stubs::CertificateManager for CertificateManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -562,7 +562,7 @@ impl super::stubs::CertificateManager for CertificateManager {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -581,7 +581,7 @@ impl super::stubs::CertificateManager for CertificateManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -626,7 +626,7 @@ impl super::stubs::CertificateManager for CertificateManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -652,7 +652,7 @@ impl super::stubs::CertificateManager for CertificateManager {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -671,7 +671,7 @@ impl super::stubs::CertificateManager for CertificateManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -712,7 +712,7 @@ impl super::stubs::CertificateManager for CertificateManager {
                     "/v1/{}",
                     req.trust_config
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("trust_config"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("trust_config"))?
                         .name
                 ),
             )
@@ -728,7 +728,7 @@ impl super::stubs::CertificateManager for CertificateManager {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -752,7 +752,7 @@ impl super::stubs::CertificateManager for CertificateManager {
             );
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -774,7 +774,7 @@ impl super::stubs::CertificateManager for CertificateManager {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -793,7 +793,7 @@ impl super::stubs::CertificateManager for CertificateManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -815,7 +815,7 @@ impl super::stubs::CertificateManager for CertificateManager {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -834,7 +834,7 @@ impl super::stubs::CertificateManager for CertificateManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -853,7 +853,7 @@ impl super::stubs::CertificateManager for CertificateManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/cloudcontrolspartner/v1/Cargo.toml b/src/generated/cloud/cloudcontrolspartner/v1/Cargo.toml
index b8058ce0d..2fb356813 100644
--- a/src/generated/cloud/cloudcontrolspartner/v1/Cargo.toml
+++ b/src/generated/cloud/cloudcontrolspartner/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
diff --git a/src/generated/cloud/cloudcontrolspartner/v1/src/model.rs b/src/generated/cloud/cloudcontrolspartner/v1/src/model.rs
index e2d075904..f2da2384f 100755
--- a/src/generated/cloud/cloudcontrolspartner/v1/src/model.rs
+++ b/src/generated/cloud/cloudcontrolspartner/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate reqwest;
diff --git a/src/generated/cloud/cloudcontrolspartner/v1/src/transport.rs b/src/generated/cloud/cloudcontrolspartner/v1/src/transport.rs
index db1720853..ae9fd7738 100755
--- a/src/generated/cloud/cloudcontrolspartner/v1/src/transport.rs
+++ b/src/generated/cloud/cloudcontrolspartner/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [CloudControlsPartnerCore](super::stubs::CloudControlsPartnerCore) using a [gclient::ReqwestClient].
+/// Implements [CloudControlsPartnerCore](super::stubs::CloudControlsPartnerCore) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct CloudControlsPartnerCore {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for CloudControlsPartnerCore {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for CloudControlsPartnerCore {
 }
 
 impl CloudControlsPartnerCore {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -55,7 +55,7 @@ impl super::stubs::CloudControlsPartnerCore for CloudControlsPartnerCore {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -81,7 +81,7 @@ impl super::stubs::CloudControlsPartnerCore for CloudControlsPartnerCore {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -100,7 +100,7 @@ impl super::stubs::CloudControlsPartnerCore for CloudControlsPartnerCore {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -126,7 +126,7 @@ impl super::stubs::CloudControlsPartnerCore for CloudControlsPartnerCore {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -145,7 +145,7 @@ impl super::stubs::CloudControlsPartnerCore for CloudControlsPartnerCore {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -164,7 +164,7 @@ impl super::stubs::CloudControlsPartnerCore for CloudControlsPartnerCore {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -190,7 +190,7 @@ impl super::stubs::CloudControlsPartnerCore for CloudControlsPartnerCore {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -209,15 +209,15 @@ impl super::stubs::CloudControlsPartnerCore for CloudControlsPartnerCore {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [CloudControlsPartnerMonitoring](super::stubs::CloudControlsPartnerMonitoring) using a [gclient::ReqwestClient].
+/// Implements [CloudControlsPartnerMonitoring](super::stubs::CloudControlsPartnerMonitoring) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct CloudControlsPartnerMonitoring {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for CloudControlsPartnerMonitoring {
@@ -229,8 +229,8 @@ impl std::fmt::Debug for CloudControlsPartnerMonitoring {
 }
 
 impl CloudControlsPartnerMonitoring {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -264,11 +264,11 @@ impl super::stubs::CloudControlsPartnerMonitoring for CloudControlsPartnerMonito
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "interval")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -287,7 +287,7 @@ impl super::stubs::CloudControlsPartnerMonitoring for CloudControlsPartnerMonito
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/cloud/clouddms/v1/Cargo.toml b/src/generated/cloud/clouddms/v1/Cargo.toml
index da8143bca..01b943467 100644
--- a/src/generated/cloud/clouddms/v1/Cargo.toml
+++ b/src/generated/cloud/clouddms/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/clouddms/v1/src/model.rs b/src/generated/cloud/clouddms/v1/src/model.rs
index 3fa293314..f1ff61c05 100755
--- a/src/generated/cloud/clouddms/v1/src/model.rs
+++ b/src/generated/cloud/clouddms/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/clouddms/v1/src/transport.rs b/src/generated/cloud/clouddms/v1/src/transport.rs
index 2006c1d16..d36107ddc 100755
--- a/src/generated/cloud/clouddms/v1/src/transport.rs
+++ b/src/generated/cloud/clouddms/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [DataMigrationService](super::stubs::DataMigrationService) using a [gclient::ReqwestClient].
+/// Implements [DataMigrationService](super::stubs::DataMigrationService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct DataMigrationService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for DataMigrationService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for DataMigrationService {
 }
 
 impl DataMigrationService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::DataMigrationService for DataMigrationService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -81,7 +81,7 @@ impl super::stubs::DataMigrationService for DataMigrationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -123,7 +123,7 @@ impl super::stubs::DataMigrationService for DataMigrationService {
                     "/v1/{}",
                     req.migration_job
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("migration_job"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("migration_job"))?
                         .name
                 ),
             )
@@ -139,7 +139,7 @@ impl super::stubs::DataMigrationService for DataMigrationService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -165,7 +165,7 @@ impl super::stubs::DataMigrationService for DataMigrationService {
         let builder = builder.query(&[("requestId", &req.request_id)]);
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -333,7 +333,7 @@ impl super::stubs::DataMigrationService for DataMigrationService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -352,7 +352,7 @@ impl super::stubs::DataMigrationService for DataMigrationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -396,7 +396,7 @@ impl super::stubs::DataMigrationService for DataMigrationService {
                     "/v1/{}",
                     req.connection_profile
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("connection_profile"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("connection_profile"))?
                         .name
                 ),
             )
@@ -412,7 +412,7 @@ impl super::stubs::DataMigrationService for DataMigrationService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -440,7 +440,7 @@ impl super::stubs::DataMigrationService for DataMigrationService {
         let builder = builder.query(&[("requestId", &req.request_id)]);
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -484,7 +484,7 @@ impl super::stubs::DataMigrationService for DataMigrationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -510,7 +510,7 @@ impl super::stubs::DataMigrationService for DataMigrationService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -530,7 +530,7 @@ impl super::stubs::DataMigrationService for DataMigrationService {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -549,7 +549,7 @@ impl super::stubs::DataMigrationService for DataMigrationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -574,7 +574,7 @@ impl super::stubs::DataMigrationService for DataMigrationService {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -616,7 +616,7 @@ impl super::stubs::DataMigrationService for DataMigrationService {
                     "/v1/{}",
                     req.conversion_workspace
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("conversion_workspace"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("conversion_workspace"))?
                         .name
                 ),
             )
@@ -632,7 +632,7 @@ impl super::stubs::DataMigrationService for DataMigrationService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -658,7 +658,7 @@ impl super::stubs::DataMigrationService for DataMigrationService {
         let builder = builder.query(&[("requestId", &req.request_id)]);
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -702,7 +702,7 @@ impl super::stubs::DataMigrationService for DataMigrationService {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -726,7 +726,7 @@ impl super::stubs::DataMigrationService for DataMigrationService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -745,7 +745,7 @@ impl super::stubs::DataMigrationService for DataMigrationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -879,7 +879,7 @@ impl super::stubs::DataMigrationService for DataMigrationService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -912,11 +912,11 @@ impl super::stubs::DataMigrationService for DataMigrationService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "completedUntilTime")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -942,7 +942,7 @@ impl super::stubs::DataMigrationService for DataMigrationService {
             );
         let builder = builder.query(&[("commitId", &req.commit_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -966,7 +966,7 @@ impl super::stubs::DataMigrationService for DataMigrationService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -988,7 +988,7 @@ impl super::stubs::DataMigrationService for DataMigrationService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1007,7 +1007,7 @@ impl super::stubs::DataMigrationService for DataMigrationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1055,11 +1055,11 @@ impl super::stubs::DataMigrationService for DataMigrationService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1101,7 +1101,7 @@ impl super::stubs::DataMigrationService for DataMigrationService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1120,7 +1120,7 @@ impl super::stubs::DataMigrationService for DataMigrationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1139,7 +1139,7 @@ impl super::stubs::DataMigrationService for DataMigrationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/commerce/consumer/procurement/v1/Cargo.toml b/src/generated/cloud/commerce/consumer/procurement/v1/Cargo.toml
index fc23cb76b..d275c128c 100644
--- a/src/generated/cloud/commerce/consumer/procurement/v1/Cargo.toml
+++ b/src/generated/cloud/commerce/consumer/procurement/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
 lro        = { version = "0.1", path = "../../../../../../../src/lro", package = "google-cloud-lro" }
diff --git a/src/generated/cloud/commerce/consumer/procurement/v1/src/model.rs b/src/generated/cloud/commerce/consumer/procurement/v1/src/model.rs
index 1a57f98fb..6a4881df8 100755
--- a/src/generated/cloud/commerce/consumer/procurement/v1/src/model.rs
+++ b/src/generated/cloud/commerce/consumer/procurement/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate longrunning;
 extern crate lro;
diff --git a/src/generated/cloud/commerce/consumer/procurement/v1/src/transport.rs b/src/generated/cloud/commerce/consumer/procurement/v1/src/transport.rs
index b5c5f6a68..0a23f9192 100755
--- a/src/generated/cloud/commerce/consumer/procurement/v1/src/transport.rs
+++ b/src/generated/cloud/commerce/consumer/procurement/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [LicenseManagementService](super::stubs::LicenseManagementService) using a [gclient::ReqwestClient].
+/// Implements [LicenseManagementService](super::stubs::LicenseManagementService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct LicenseManagementService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for LicenseManagementService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for LicenseManagementService {
 }
 
 impl LicenseManagementService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -55,7 +55,7 @@ impl super::stubs::LicenseManagementService for LicenseManagementService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -73,7 +73,7 @@ impl super::stubs::LicenseManagementService for LicenseManagementService {
                     "/v1/{}",
                     req.license_pool
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("license_pool"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("license_pool"))?
                         .name
                 ),
             )
@@ -89,7 +89,7 @@ impl super::stubs::LicenseManagementService for LicenseManagementService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -154,7 +154,7 @@ impl super::stubs::LicenseManagementService for LicenseManagementService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -173,15 +173,15 @@ impl super::stubs::LicenseManagementService for LicenseManagementService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [ConsumerProcurementService](super::stubs::ConsumerProcurementService) using a [gclient::ReqwestClient].
+/// Implements [ConsumerProcurementService](super::stubs::ConsumerProcurementService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ConsumerProcurementService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ConsumerProcurementService {
@@ -193,8 +193,8 @@ impl std::fmt::Debug for ConsumerProcurementService {
 }
 
 impl ConsumerProcurementService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -235,7 +235,7 @@ impl super::stubs::ConsumerProcurementService for ConsumerProcurementService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -257,7 +257,7 @@ impl super::stubs::ConsumerProcurementService for ConsumerProcurementService {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -310,7 +310,7 @@ impl super::stubs::ConsumerProcurementService for ConsumerProcurementService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/confidentialcomputing/v1/Cargo.toml b/src/generated/cloud/confidentialcomputing/v1/Cargo.toml
index 8ab2a5ce9..4df991ed0 100644
--- a/src/generated/cloud/confidentialcomputing/v1/Cargo.toml
+++ b/src/generated/cloud/confidentialcomputing/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
 reqwest    = { version = "0.12", features = ["json"] }
diff --git a/src/generated/cloud/confidentialcomputing/v1/src/model.rs b/src/generated/cloud/confidentialcomputing/v1/src/model.rs
index c9e0cebcc..4c2367a53 100755
--- a/src/generated/cloud/confidentialcomputing/v1/src/model.rs
+++ b/src/generated/cloud/confidentialcomputing/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate location;
 extern crate reqwest;
diff --git a/src/generated/cloud/confidentialcomputing/v1/src/transport.rs b/src/generated/cloud/confidentialcomputing/v1/src/transport.rs
index aed0a266f..855b59456 100755
--- a/src/generated/cloud/confidentialcomputing/v1/src/transport.rs
+++ b/src/generated/cloud/confidentialcomputing/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [ConfidentialComputing](super::stubs::ConfidentialComputing) using a [gclient::ReqwestClient].
+/// Implements [ConfidentialComputing](super::stubs::ConfidentialComputing) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ConfidentialComputing {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ConfidentialComputing {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for ConfidentialComputing {
 }
 
 impl ConfidentialComputing {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -100,7 +100,7 @@ impl super::stubs::ConfidentialComputing for ConfidentialComputing {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -119,7 +119,7 @@ impl super::stubs::ConfidentialComputing for ConfidentialComputing {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/cloud/config/v1/Cargo.toml b/src/generated/cloud/config/v1/Cargo.toml
index 89ec556b2..ea4deb98d 100644
--- a/src/generated/cloud/config/v1/Cargo.toml
+++ b/src/generated/cloud/config/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/config/v1/src/model.rs b/src/generated/cloud/config/v1/src/model.rs
index bcfccadda..e7dccc2cd 100755
--- a/src/generated/cloud/config/v1/src/model.rs
+++ b/src/generated/cloud/config/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/config/v1/src/transport.rs b/src/generated/cloud/config/v1/src/transport.rs
index b94985ab5..4c7e7d95d 100755
--- a/src/generated/cloud/config/v1/src/transport.rs
+++ b/src/generated/cloud/config/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [Config](super::stubs::Config) using a [gclient::ReqwestClient].
+/// Implements [Config](super::stubs::Config) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Config {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Config {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for Config {
 }
 
 impl Config {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::Config for Config {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -81,7 +81,7 @@ impl super::stubs::Config for Config {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -123,7 +123,7 @@ impl super::stubs::Config for Config {
                     "/v1/{}",
                     req.deployment
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("deployment"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("deployment"))?
                         .name
                 ),
             )
@@ -139,7 +139,7 @@ impl super::stubs::Config for Config {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -166,7 +166,7 @@ impl super::stubs::Config for Config {
         let builder = builder.query(&[("force", &req.force)]);
         let builder = builder.query(&[("deletePolicy", &req.delete_policy.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -192,7 +192,7 @@ impl super::stubs::Config for Config {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -211,7 +211,7 @@ impl super::stubs::Config for Config {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -230,7 +230,7 @@ impl super::stubs::Config for Config {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -256,7 +256,7 @@ impl super::stubs::Config for Config {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -389,7 +389,7 @@ impl super::stubs::Config for Config {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -432,7 +432,7 @@ impl super::stubs::Config for Config {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -455,7 +455,7 @@ impl super::stubs::Config for Config {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -475,7 +475,7 @@ impl super::stubs::Config for Config {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -518,7 +518,7 @@ impl super::stubs::Config for Config {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -537,7 +537,7 @@ impl super::stubs::Config for Config {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -559,7 +559,7 @@ impl super::stubs::Config for Config {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -578,7 +578,7 @@ impl super::stubs::Config for Config {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -626,11 +626,11 @@ impl super::stubs::Config for Config {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -672,7 +672,7 @@ impl super::stubs::Config for Config {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -691,7 +691,7 @@ impl super::stubs::Config for Config {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -710,7 +710,7 @@ impl super::stubs::Config for Config {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/connectors/v1/Cargo.toml b/src/generated/cloud/connectors/v1/Cargo.toml
index 30161013a..7a74ba196 100644
--- a/src/generated/cloud/connectors/v1/Cargo.toml
+++ b/src/generated/cloud/connectors/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/connectors/v1/src/model.rs b/src/generated/cloud/connectors/v1/src/model.rs
index 2bb623092..1c52eb22e 100755
--- a/src/generated/cloud/connectors/v1/src/model.rs
+++ b/src/generated/cloud/connectors/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/connectors/v1/src/transport.rs b/src/generated/cloud/connectors/v1/src/transport.rs
index 86f6ebe2a..b397d8301 100755
--- a/src/generated/cloud/connectors/v1/src/transport.rs
+++ b/src/generated/cloud/connectors/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [Connectors](super::stubs::Connectors) using a [gclient::ReqwestClient].
+/// Implements [Connectors](super::stubs::Connectors) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Connectors {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Connectors {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for Connectors {
 }
 
 impl Connectors {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -63,7 +63,7 @@ impl super::stubs::Connectors for Connectors {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -83,7 +83,7 @@ impl super::stubs::Connectors for Connectors {
             );
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -124,7 +124,7 @@ impl super::stubs::Connectors for Connectors {
                     "/v1/{}",
                     req.connection
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("connection"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("connection"))?
                         .name
                 ),
             )
@@ -140,7 +140,7 @@ impl super::stubs::Connectors for Connectors {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -163,7 +163,7 @@ impl super::stubs::Connectors for Connectors {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -187,7 +187,7 @@ impl super::stubs::Connectors for Connectors {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -206,7 +206,7 @@ impl super::stubs::Connectors for Connectors {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -230,7 +230,7 @@ impl super::stubs::Connectors for Connectors {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -249,7 +249,7 @@ impl super::stubs::Connectors for Connectors {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -271,7 +271,7 @@ impl super::stubs::Connectors for Connectors {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -291,7 +291,7 @@ impl super::stubs::Connectors for Connectors {
             );
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -310,7 +310,7 @@ impl super::stubs::Connectors for Connectors {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -352,7 +352,7 @@ impl super::stubs::Connectors for Connectors {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -377,7 +377,7 @@ impl super::stubs::Connectors for Connectors {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -396,7 +396,7 @@ impl super::stubs::Connectors for Connectors {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -415,7 +415,7 @@ impl super::stubs::Connectors for Connectors {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -437,7 +437,7 @@ impl super::stubs::Connectors for Connectors {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -456,7 +456,7 @@ impl super::stubs::Connectors for Connectors {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -504,11 +504,11 @@ impl super::stubs::Connectors for Connectors {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -550,7 +550,7 @@ impl super::stubs::Connectors for Connectors {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -569,7 +569,7 @@ impl super::stubs::Connectors for Connectors {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -588,7 +588,7 @@ impl super::stubs::Connectors for Connectors {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/contactcenterinsights/v1/Cargo.toml b/src/generated/cloud/contactcenterinsights/v1/Cargo.toml
index 911b27522..8a1445701 100644
--- a/src/generated/cloud/contactcenterinsights/v1/Cargo.toml
+++ b/src/generated/cloud/contactcenterinsights/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/contactcenterinsights/v1/src/model.rs b/src/generated/cloud/contactcenterinsights/v1/src/model.rs
index d01dcbc4f..d5ba98405 100755
--- a/src/generated/cloud/contactcenterinsights/v1/src/model.rs
+++ b/src/generated/cloud/contactcenterinsights/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate longrunning;
diff --git a/src/generated/cloud/contactcenterinsights/v1/src/transport.rs b/src/generated/cloud/contactcenterinsights/v1/src/transport.rs
index c34e6c837..94922a364 100755
--- a/src/generated/cloud/contactcenterinsights/v1/src/transport.rs
+++ b/src/generated/cloud/contactcenterinsights/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [ContactCenterInsights](super::stubs::ContactCenterInsights) using a [gclient::ReqwestClient].
+/// Implements [ContactCenterInsights](super::stubs::ContactCenterInsights) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ContactCenterInsights {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ContactCenterInsights {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for ContactCenterInsights {
 }
 
 impl ContactCenterInsights {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -97,7 +97,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                     "/v1/{}",
                     req.conversation
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("conversation"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("conversation"))?
                         .name
                 ),
             )
@@ -113,7 +113,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -137,7 +137,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
             );
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -164,7 +164,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -184,7 +184,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
             );
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -225,7 +225,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -247,7 +247,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -266,7 +266,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -386,7 +386,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                     "/v1/{}",
                     req.issue_model
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("issue_model"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("issue_model"))?
                         .name
                 ),
             )
@@ -402,7 +402,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -425,7 +425,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -447,7 +447,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -466,7 +466,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -556,7 +556,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -575,7 +575,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -593,7 +593,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                     "/v1/{}",
                     req.issue
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("issue"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("issue"))?
                         .name
                 ),
             )
@@ -609,7 +609,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.issue), options).await
@@ -630,7 +630,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -652,7 +652,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -693,7 +693,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -718,7 +718,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -737,7 +737,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -755,7 +755,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                     "/v1/{}",
                     req.phrase_matcher
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("phrase_matcher"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("phrase_matcher"))?
                         .name
                 ),
             )
@@ -771,7 +771,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -798,7 +798,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
             );
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -817,7 +817,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -835,7 +835,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                     "/v1/{}",
                     req.settings
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("settings"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("settings"))?
                         .name
                 ),
             )
@@ -851,7 +851,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -896,7 +896,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -920,7 +920,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -938,7 +938,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                     "/v1/{}",
                     req.analysis_rule
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("analysis_rule"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("analysis_rule"))?
                         .name
                 ),
             )
@@ -954,7 +954,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -977,7 +977,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -996,7 +996,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1014,7 +1014,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                     "/v1/{}:initialize",
                     req.encryption_spec
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("encryption_spec"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("encryption_spec"))?
                         .name
                 ),
             )
@@ -1058,7 +1058,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1079,7 +1079,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1097,7 +1097,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                     "/v1/{}",
                     req.view
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("view"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("view"))?
                         .name
                 ),
             )
@@ -1113,7 +1113,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.view), options).await
@@ -1134,7 +1134,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1196,7 +1196,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1214,7 +1214,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                     "/v1/{}",
                     req.qa_question
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("qa_question"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("qa_question"))?
                         .name
                 ),
             )
@@ -1230,7 +1230,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1253,7 +1253,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1277,7 +1277,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1319,7 +1319,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1337,7 +1337,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                     "/v1/{}",
                     req.qa_scorecard
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("qa_scorecard"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("qa_scorecard"))?
                         .name
                 ),
             )
@@ -1353,7 +1353,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1377,7 +1377,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
             );
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1401,7 +1401,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1443,7 +1443,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1517,7 +1517,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
             );
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1542,7 +1542,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1590,7 +1590,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1609,7 +1609,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1627,7 +1627,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                     "/v1/{}",
                     req.feedback_label
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("feedback_label"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("feedback_label"))?
                         .name
                 ),
             )
@@ -1643,7 +1643,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1666,7 +1666,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1691,7 +1691,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1753,7 +1753,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1772,7 +1772,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1791,7 +1791,7 @@ impl super::stubs::ContactCenterInsights for ContactCenterInsights {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/datacatalog/lineage/v1/Cargo.toml b/src/generated/cloud/datacatalog/lineage/v1/Cargo.toml
index 018b3c65c..0082cfb64 100644
--- a/src/generated/cloud/datacatalog/lineage/v1/Cargo.toml
+++ b/src/generated/cloud/datacatalog/lineage/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
 lro        = { version = "0.1", path = "../../../../../../src/lro", package = "google-cloud-lro" }
diff --git a/src/generated/cloud/datacatalog/lineage/v1/src/model.rs b/src/generated/cloud/datacatalog/lineage/v1/src/model.rs
index 932572b44..62f320d3e 100755
--- a/src/generated/cloud/datacatalog/lineage/v1/src/model.rs
+++ b/src/generated/cloud/datacatalog/lineage/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate longrunning;
 extern crate lro;
diff --git a/src/generated/cloud/datacatalog/lineage/v1/src/transport.rs b/src/generated/cloud/datacatalog/lineage/v1/src/transport.rs
index 51951bcb4..d13bce8f4 100755
--- a/src/generated/cloud/datacatalog/lineage/v1/src/transport.rs
+++ b/src/generated/cloud/datacatalog/lineage/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [Lineage](super::stubs::Lineage) using a [gclient::ReqwestClient].
+/// Implements [Lineage](super::stubs::Lineage) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Lineage {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Lineage {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for Lineage {
 }
 
 impl Lineage {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -100,7 +100,7 @@ impl super::stubs::Lineage for Lineage {
                     "/v1/{}",
                     req.process
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("process"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("process"))?
                         .name
                 ),
             )
@@ -116,7 +116,7 @@ impl super::stubs::Lineage for Lineage {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("allowMissing", &req.allow_missing)]);
@@ -140,7 +140,7 @@ impl super::stubs::Lineage for Lineage {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -164,7 +164,7 @@ impl super::stubs::Lineage for Lineage {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -184,7 +184,7 @@ impl super::stubs::Lineage for Lineage {
             );
         let builder = builder.query(&[("allowMissing", &req.allow_missing)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -220,7 +220,7 @@ impl super::stubs::Lineage for Lineage {
                     "/v1/{}",
                     req.run
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("run"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("run"))?
                         .name
                 ),
             )
@@ -236,7 +236,7 @@ impl super::stubs::Lineage for Lineage {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("allowMissing", &req.allow_missing)]);
@@ -258,7 +258,7 @@ impl super::stubs::Lineage for Lineage {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -279,7 +279,7 @@ impl super::stubs::Lineage for Lineage {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -299,7 +299,7 @@ impl super::stubs::Lineage for Lineage {
             );
         let builder = builder.query(&[("allowMissing", &req.allow_missing)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -341,7 +341,7 @@ impl super::stubs::Lineage for Lineage {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -365,7 +365,7 @@ impl super::stubs::Lineage for Lineage {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -385,7 +385,7 @@ impl super::stubs::Lineage for Lineage {
             );
         let builder = builder.query(&[("allowMissing", &req.allow_missing)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -447,7 +447,7 @@ impl super::stubs::Lineage for Lineage {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -466,7 +466,7 @@ impl super::stubs::Lineage for Lineage {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -485,7 +485,7 @@ impl super::stubs::Lineage for Lineage {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/datacatalog/v1/Cargo.toml b/src/generated/cloud/datacatalog/v1/Cargo.toml
index f72bd3845..ae6ce7e81 100644
--- a/src/generated/cloud/datacatalog/v1/Cargo.toml
+++ b/src/generated/cloud/datacatalog/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/datacatalog/v1/src/model.rs b/src/generated/cloud/datacatalog/v1/src/model.rs
index f35e0e0a8..8ef9c7008 100755
--- a/src/generated/cloud/datacatalog/v1/src/model.rs
+++ b/src/generated/cloud/datacatalog/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate longrunning;
diff --git a/src/generated/cloud/datacatalog/v1/src/transport.rs b/src/generated/cloud/datacatalog/v1/src/transport.rs
index 51d59297c..c433d1f11 100755
--- a/src/generated/cloud/datacatalog/v1/src/transport.rs
+++ b/src/generated/cloud/datacatalog/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [DataCatalog](super::stubs::DataCatalog) using a [gclient::ReqwestClient].
+/// Implements [DataCatalog](super::stubs::DataCatalog) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct DataCatalog {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for DataCatalog {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for DataCatalog {
 }
 
 impl DataCatalog {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -101,11 +101,11 @@ impl super::stubs::DataCatalog for DataCatalog {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -123,7 +123,7 @@ impl super::stubs::DataCatalog for DataCatalog {
                     "/v1/{}",
                     req.entry_group
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("entry_group"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("entry_group"))?
                         .name
                 ),
             )
@@ -139,7 +139,7 @@ impl super::stubs::DataCatalog for DataCatalog {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -163,7 +163,7 @@ impl super::stubs::DataCatalog for DataCatalog {
             );
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -187,7 +187,7 @@ impl super::stubs::DataCatalog for DataCatalog {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -223,7 +223,7 @@ impl super::stubs::DataCatalog for DataCatalog {
                     "/v1/{}",
                     req.entry
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("entry"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("entry"))?
                         .name
                 ),
             )
@@ -239,7 +239,7 @@ impl super::stubs::DataCatalog for DataCatalog {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.entry), options).await
@@ -260,7 +260,7 @@ impl super::stubs::DataCatalog for DataCatalog {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -279,7 +279,7 @@ impl super::stubs::DataCatalog for DataCatalog {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -316,7 +316,7 @@ impl super::stubs::DataCatalog for DataCatalog {
         let builder = builder.query(&[("project", &req.project)]);
         let builder = builder.query(&[("location", &req.location)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -343,11 +343,11 @@ impl super::stubs::DataCatalog for DataCatalog {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -429,7 +429,7 @@ impl super::stubs::DataCatalog for DataCatalog {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -447,7 +447,7 @@ impl super::stubs::DataCatalog for DataCatalog {
                     "/v1/{}",
                     req.tag_template
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("tag_template"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("tag_template"))?
                         .name
                 ),
             )
@@ -463,7 +463,7 @@ impl super::stubs::DataCatalog for DataCatalog {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -487,7 +487,7 @@ impl super::stubs::DataCatalog for DataCatalog {
             );
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -532,7 +532,7 @@ impl super::stubs::DataCatalog for DataCatalog {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -590,7 +590,7 @@ impl super::stubs::DataCatalog for DataCatalog {
             );
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -625,7 +625,7 @@ impl super::stubs::DataCatalog for DataCatalog {
                     "/v1/{}",
                     req.tag
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("tag"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("tag"))?
                         .name
                 ),
             )
@@ -641,7 +641,7 @@ impl super::stubs::DataCatalog for DataCatalog {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.tag), options).await
@@ -662,7 +662,7 @@ impl super::stubs::DataCatalog for DataCatalog {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -683,7 +683,7 @@ impl super::stubs::DataCatalog for DataCatalog {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -856,7 +856,7 @@ impl super::stubs::DataCatalog for DataCatalog {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -878,7 +878,7 @@ impl super::stubs::DataCatalog for DataCatalog {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -900,7 +900,7 @@ impl super::stubs::DataCatalog for DataCatalog {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -919,7 +919,7 @@ impl super::stubs::DataCatalog for DataCatalog {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -938,7 +938,7 @@ impl super::stubs::DataCatalog for DataCatalog {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -957,7 +957,7 @@ impl super::stubs::DataCatalog for DataCatalog {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -976,10 +976,10 @@ impl super::stubs::DataCatalog for DataCatalog {
     }
 }
 
-/// Implements [PolicyTagManager](super::stubs::PolicyTagManager) using a [gclient::ReqwestClient].
+/// Implements [PolicyTagManager](super::stubs::PolicyTagManager) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct PolicyTagManager {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for PolicyTagManager {
@@ -991,8 +991,8 @@ impl std::fmt::Debug for PolicyTagManager {
 }
 
 impl PolicyTagManager {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1035,7 +1035,7 @@ impl super::stubs::PolicyTagManager for PolicyTagManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1053,7 +1053,7 @@ impl super::stubs::PolicyTagManager for PolicyTagManager {
                     "/v1/{}",
                     req.taxonomy
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("taxonomy"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("taxonomy"))?
                         .name
                 ),
             )
@@ -1069,7 +1069,7 @@ impl super::stubs::PolicyTagManager for PolicyTagManager {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1098,7 +1098,7 @@ impl super::stubs::PolicyTagManager for PolicyTagManager {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1117,7 +1117,7 @@ impl super::stubs::PolicyTagManager for PolicyTagManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1158,7 +1158,7 @@ impl super::stubs::PolicyTagManager for PolicyTagManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1176,7 +1176,7 @@ impl super::stubs::PolicyTagManager for PolicyTagManager {
                     "/v1/{}",
                     req.policy_tag
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("policy_tag"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("policy_tag"))?
                         .name
                 ),
             )
@@ -1192,7 +1192,7 @@ impl super::stubs::PolicyTagManager for PolicyTagManager {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1220,7 +1220,7 @@ impl super::stubs::PolicyTagManager for PolicyTagManager {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1239,7 +1239,7 @@ impl super::stubs::PolicyTagManager for PolicyTagManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1321,7 +1321,7 @@ impl super::stubs::PolicyTagManager for PolicyTagManager {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1340,7 +1340,7 @@ impl super::stubs::PolicyTagManager for PolicyTagManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1359,7 +1359,7 @@ impl super::stubs::PolicyTagManager for PolicyTagManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1378,15 +1378,15 @@ impl super::stubs::PolicyTagManager for PolicyTagManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [PolicyTagManagerSerialization](super::stubs::PolicyTagManagerSerialization) using a [gclient::ReqwestClient].
+/// Implements [PolicyTagManagerSerialization](super::stubs::PolicyTagManagerSerialization) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct PolicyTagManagerSerialization {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for PolicyTagManagerSerialization {
@@ -1398,8 +1398,8 @@ impl std::fmt::Debug for PolicyTagManagerSerialization {
 }
 
 impl PolicyTagManagerSerialization {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1470,7 +1470,7 @@ impl super::stubs::PolicyTagManagerSerialization for PolicyTagManagerSerializati
                 builder.query(&[("serializedTaxonomies", p)])
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1492,7 +1492,7 @@ impl super::stubs::PolicyTagManagerSerialization for PolicyTagManagerSerializati
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1511,7 +1511,7 @@ impl super::stubs::PolicyTagManagerSerialization for PolicyTagManagerSerializati
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1530,7 +1530,7 @@ impl super::stubs::PolicyTagManagerSerialization for PolicyTagManagerSerializati
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1549,7 +1549,7 @@ impl super::stubs::PolicyTagManagerSerialization for PolicyTagManagerSerializati
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/cloud/datafusion/v1/Cargo.toml b/src/generated/cloud/datafusion/v1/Cargo.toml
index de3a8b28f..790439604 100644
--- a/src/generated/cloud/datafusion/v1/Cargo.toml
+++ b/src/generated/cloud/datafusion/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
 lro        = { version = "0.1", path = "../../../../../src/lro", package = "google-cloud-lro" }
diff --git a/src/generated/cloud/datafusion/v1/src/model.rs b/src/generated/cloud/datafusion/v1/src/model.rs
index 8e2fdb0ee..80f6001df 100755
--- a/src/generated/cloud/datafusion/v1/src/model.rs
+++ b/src/generated/cloud/datafusion/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate longrunning;
 extern crate lro;
diff --git a/src/generated/cloud/datafusion/v1/src/transport.rs b/src/generated/cloud/datafusion/v1/src/transport.rs
index 8ed6b58cc..97383bd0a 100755
--- a/src/generated/cloud/datafusion/v1/src/transport.rs
+++ b/src/generated/cloud/datafusion/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [DataFusion](super::stubs::DataFusion) using a [gclient::ReqwestClient].
+/// Implements [DataFusion](super::stubs::DataFusion) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct DataFusion {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for DataFusion {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for DataFusion {
 }
 
 impl DataFusion {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -58,7 +58,7 @@ impl super::stubs::DataFusion for DataFusion {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("latestPatchOnly", &req.latest_patch_only)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -84,7 +84,7 @@ impl super::stubs::DataFusion for DataFusion {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -103,7 +103,7 @@ impl super::stubs::DataFusion for DataFusion {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -145,7 +145,7 @@ impl super::stubs::DataFusion for DataFusion {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -163,7 +163,7 @@ impl super::stubs::DataFusion for DataFusion {
                     "/v1/{}",
                     req.instance
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("instance"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("instance"))?
                         .name
                 ),
             )
@@ -179,7 +179,7 @@ impl super::stubs::DataFusion for DataFusion {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -222,7 +222,7 @@ impl super::stubs::DataFusion for DataFusion {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -241,7 +241,7 @@ impl super::stubs::DataFusion for DataFusion {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -260,7 +260,7 @@ impl super::stubs::DataFusion for DataFusion {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/dataproc/v1/Cargo.toml b/src/generated/cloud/dataproc/v1/Cargo.toml
index aea963c20..43d048eec 100644
--- a/src/generated/cloud/dataproc/v1/Cargo.toml
+++ b/src/generated/cloud/dataproc/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
diff --git a/src/generated/cloud/dataproc/v1/src/model.rs b/src/generated/cloud/dataproc/v1/src/model.rs
index 3898f1f28..26bf9919c 100755
--- a/src/generated/cloud/dataproc/v1/src/model.rs
+++ b/src/generated/cloud/dataproc/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate iam_v1;
 extern crate lazy_static;
diff --git a/src/generated/cloud/dataproc/v1/src/transport.rs b/src/generated/cloud/dataproc/v1/src/transport.rs
index 3374bac0a..7c13a05c5 100755
--- a/src/generated/cloud/dataproc/v1/src/transport.rs
+++ b/src/generated/cloud/dataproc/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [AutoscalingPolicyService](super::stubs::AutoscalingPolicyService) using a [gclient::ReqwestClient].
+/// Implements [AutoscalingPolicyService](super::stubs::AutoscalingPolicyService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct AutoscalingPolicyService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for AutoscalingPolicyService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for AutoscalingPolicyService {
 }
 
 impl AutoscalingPolicyService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -74,7 +74,7 @@ impl super::stubs::AutoscalingPolicyService for AutoscalingPolicyService {
                     "/v1/{}",
                     req.policy
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("policy"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("policy"))?
                         .name
                 ),
             )
@@ -101,7 +101,7 @@ impl super::stubs::AutoscalingPolicyService for AutoscalingPolicyService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -125,7 +125,7 @@ impl super::stubs::AutoscalingPolicyService for AutoscalingPolicyService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -144,7 +144,7 @@ impl super::stubs::AutoscalingPolicyService for AutoscalingPolicyService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -226,7 +226,7 @@ impl super::stubs::AutoscalingPolicyService for AutoscalingPolicyService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -245,7 +245,7 @@ impl super::stubs::AutoscalingPolicyService for AutoscalingPolicyService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -264,7 +264,7 @@ impl super::stubs::AutoscalingPolicyService for AutoscalingPolicyService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -283,15 +283,15 @@ impl super::stubs::AutoscalingPolicyService for AutoscalingPolicyService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [BatchController](super::stubs::BatchController) using a [gclient::ReqwestClient].
+/// Implements [BatchController](super::stubs::BatchController) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct BatchController {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for BatchController {
@@ -303,8 +303,8 @@ impl std::fmt::Debug for BatchController {
 }
 
 impl BatchController {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -344,7 +344,7 @@ impl super::stubs::BatchController for BatchController {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -367,7 +367,7 @@ impl super::stubs::BatchController for BatchController {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -386,7 +386,7 @@ impl super::stubs::BatchController for BatchController {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -468,7 +468,7 @@ impl super::stubs::BatchController for BatchController {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -487,7 +487,7 @@ impl super::stubs::BatchController for BatchController {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -506,7 +506,7 @@ impl super::stubs::BatchController for BatchController {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -525,7 +525,7 @@ impl super::stubs::BatchController for BatchController {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -544,10 +544,10 @@ impl super::stubs::BatchController for BatchController {
     }
 }
 
-/// Implements [ClusterController](super::stubs::ClusterController) using a [gclient::ReqwestClient].
+/// Implements [ClusterController](super::stubs::ClusterController) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ClusterController {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ClusterController {
@@ -559,8 +559,8 @@ impl std::fmt::Debug for ClusterController {
 }
 
 impl ClusterController {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -623,7 +623,7 @@ impl super::stubs::ClusterController for ClusterController {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "gracefulDecommissionTimeout")
             });
         let builder = req
@@ -633,7 +633,7 @@ impl super::stubs::ClusterController for ClusterController {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -711,7 +711,7 @@ impl super::stubs::ClusterController for ClusterController {
         let builder = builder.query(&[("clusterUuid", &req.cluster_uuid)]);
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -736,7 +736,7 @@ impl super::stubs::ClusterController for ClusterController {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -764,7 +764,7 @@ impl super::stubs::ClusterController for ClusterController {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -869,7 +869,7 @@ impl super::stubs::ClusterController for ClusterController {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -888,7 +888,7 @@ impl super::stubs::ClusterController for ClusterController {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -907,7 +907,7 @@ impl super::stubs::ClusterController for ClusterController {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -926,7 +926,7 @@ impl super::stubs::ClusterController for ClusterController {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -945,10 +945,10 @@ impl super::stubs::ClusterController for ClusterController {
     }
 }
 
-/// Implements [JobController](super::stubs::JobController) using a [gclient::ReqwestClient].
+/// Implements [JobController](super::stubs::JobController) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct JobController {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for JobController {
@@ -960,8 +960,8 @@ impl std::fmt::Debug for JobController {
 }
 
 impl JobController {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1034,7 +1034,7 @@ impl super::stubs::JobController for JobController {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1064,7 +1064,7 @@ impl super::stubs::JobController for JobController {
         let builder = builder.query(&[("jobStateMatcher", &req.job_state_matcher.value())]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1095,7 +1095,7 @@ impl super::stubs::JobController for JobController {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.job), options).await
@@ -1145,7 +1145,7 @@ impl super::stubs::JobController for JobController {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1227,7 +1227,7 @@ impl super::stubs::JobController for JobController {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1246,7 +1246,7 @@ impl super::stubs::JobController for JobController {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1265,7 +1265,7 @@ impl super::stubs::JobController for JobController {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1284,7 +1284,7 @@ impl super::stubs::JobController for JobController {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1303,10 +1303,10 @@ impl super::stubs::JobController for JobController {
     }
 }
 
-/// Implements [NodeGroupController](super::stubs::NodeGroupController) using a [gclient::ReqwestClient].
+/// Implements [NodeGroupController](super::stubs::NodeGroupController) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct NodeGroupController {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for NodeGroupController {
@@ -1318,8 +1318,8 @@ impl std::fmt::Debug for NodeGroupController {
 }
 
 impl NodeGroupController {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1381,7 +1381,7 @@ impl super::stubs::NodeGroupController for NodeGroupController {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1463,7 +1463,7 @@ impl super::stubs::NodeGroupController for NodeGroupController {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1482,7 +1482,7 @@ impl super::stubs::NodeGroupController for NodeGroupController {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1501,7 +1501,7 @@ impl super::stubs::NodeGroupController for NodeGroupController {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1520,7 +1520,7 @@ impl super::stubs::NodeGroupController for NodeGroupController {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1539,10 +1539,10 @@ impl super::stubs::NodeGroupController for NodeGroupController {
     }
 }
 
-/// Implements [SessionTemplateController](super::stubs::SessionTemplateController) using a [gclient::ReqwestClient].
+/// Implements [SessionTemplateController](super::stubs::SessionTemplateController) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct SessionTemplateController {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for SessionTemplateController {
@@ -1554,8 +1554,8 @@ impl std::fmt::Debug for SessionTemplateController {
 }
 
 impl SessionTemplateController {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1597,7 +1597,7 @@ impl super::stubs::SessionTemplateController for SessionTemplateController {
                     "/v1/{}",
                     req.session_template
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("session_template"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("session_template"))?
                         .name
                 ),
             )
@@ -1626,7 +1626,7 @@ impl super::stubs::SessionTemplateController for SessionTemplateController {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1651,7 +1651,7 @@ impl super::stubs::SessionTemplateController for SessionTemplateController {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1670,7 +1670,7 @@ impl super::stubs::SessionTemplateController for SessionTemplateController {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1752,7 +1752,7 @@ impl super::stubs::SessionTemplateController for SessionTemplateController {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1771,7 +1771,7 @@ impl super::stubs::SessionTemplateController for SessionTemplateController {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1790,7 +1790,7 @@ impl super::stubs::SessionTemplateController for SessionTemplateController {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1809,15 +1809,15 @@ impl super::stubs::SessionTemplateController for SessionTemplateController {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [SessionController](super::stubs::SessionController) using a [gclient::ReqwestClient].
+/// Implements [SessionController](super::stubs::SessionController) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct SessionController {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for SessionController {
@@ -1829,8 +1829,8 @@ impl std::fmt::Debug for SessionController {
 }
 
 impl SessionController {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1875,7 +1875,7 @@ impl super::stubs::SessionController for SessionController {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1897,7 +1897,7 @@ impl super::stubs::SessionController for SessionController {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1934,7 +1934,7 @@ impl super::stubs::SessionController for SessionController {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2016,7 +2016,7 @@ impl super::stubs::SessionController for SessionController {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2035,7 +2035,7 @@ impl super::stubs::SessionController for SessionController {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2054,7 +2054,7 @@ impl super::stubs::SessionController for SessionController {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2073,7 +2073,7 @@ impl super::stubs::SessionController for SessionController {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2092,10 +2092,10 @@ impl super::stubs::SessionController for SessionController {
     }
 }
 
-/// Implements [WorkflowTemplateService](super::stubs::WorkflowTemplateService) using a [gclient::ReqwestClient].
+/// Implements [WorkflowTemplateService](super::stubs::WorkflowTemplateService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct WorkflowTemplateService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for WorkflowTemplateService {
@@ -2107,8 +2107,8 @@ impl std::fmt::Debug for WorkflowTemplateService {
 }
 
 impl WorkflowTemplateService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -2152,7 +2152,7 @@ impl super::stubs::WorkflowTemplateService for WorkflowTemplateService {
             );
         let builder = builder.query(&[("version", &req.version)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2213,7 +2213,7 @@ impl super::stubs::WorkflowTemplateService for WorkflowTemplateService {
                     "/v1/{}",
                     req.template
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("template"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("template"))?
                         .name
                 ),
             )
@@ -2247,7 +2247,7 @@ impl super::stubs::WorkflowTemplateService for WorkflowTemplateService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2267,7 +2267,7 @@ impl super::stubs::WorkflowTemplateService for WorkflowTemplateService {
             );
         let builder = builder.query(&[("version", &req.version)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2349,7 +2349,7 @@ impl super::stubs::WorkflowTemplateService for WorkflowTemplateService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2368,7 +2368,7 @@ impl super::stubs::WorkflowTemplateService for WorkflowTemplateService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2387,7 +2387,7 @@ impl super::stubs::WorkflowTemplateService for WorkflowTemplateService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2406,7 +2406,7 @@ impl super::stubs::WorkflowTemplateService for WorkflowTemplateService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/datastream/v1/Cargo.toml b/src/generated/cloud/datastream/v1/Cargo.toml
index 129425dcf..dfbd3e6a9 100644
--- a/src/generated/cloud/datastream/v1/Cargo.toml
+++ b/src/generated/cloud/datastream/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/datastream/v1/src/model.rs b/src/generated/cloud/datastream/v1/src/model.rs
index 5136dbb34..e581d9d86 100755
--- a/src/generated/cloud/datastream/v1/src/model.rs
+++ b/src/generated/cloud/datastream/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate location;
 extern crate longrunning;
diff --git a/src/generated/cloud/datastream/v1/src/transport.rs b/src/generated/cloud/datastream/v1/src/transport.rs
index 8c5768392..c07377f83 100755
--- a/src/generated/cloud/datastream/v1/src/transport.rs
+++ b/src/generated/cloud/datastream/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [Datastream](super::stubs::Datastream) using a [gclient::ReqwestClient].
+/// Implements [Datastream](super::stubs::Datastream) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Datastream {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Datastream {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for Datastream {
 }
 
 impl Datastream {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::Datastream for Datastream {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -81,7 +81,7 @@ impl super::stubs::Datastream for Datastream {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -125,7 +125,7 @@ impl super::stubs::Datastream for Datastream {
                     "/v1/{}",
                     req.connection_profile
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("connection_profile"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("connection_profile"))?
                         .name
                 ),
             )
@@ -141,7 +141,7 @@ impl super::stubs::Datastream for Datastream {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -168,7 +168,7 @@ impl super::stubs::Datastream for Datastream {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -211,7 +211,7 @@ impl super::stubs::Datastream for Datastream {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -230,7 +230,7 @@ impl super::stubs::Datastream for Datastream {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -269,7 +269,7 @@ impl super::stubs::Datastream for Datastream {
                     "/v1/{}",
                     req.stream
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("stream"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("stream"))?
                         .name
                 ),
             )
@@ -285,7 +285,7 @@ impl super::stubs::Datastream for Datastream {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -310,7 +310,7 @@ impl super::stubs::Datastream for Datastream {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -346,7 +346,7 @@ impl super::stubs::Datastream for Datastream {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -387,7 +387,7 @@ impl super::stubs::Datastream for Datastream {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -451,7 +451,7 @@ impl super::stubs::Datastream for Datastream {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -495,7 +495,7 @@ impl super::stubs::Datastream for Datastream {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -521,7 +521,7 @@ impl super::stubs::Datastream for Datastream {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -542,7 +542,7 @@ impl super::stubs::Datastream for Datastream {
         let builder = builder.query(&[("requestId", &req.request_id)]);
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -580,7 +580,7 @@ impl super::stubs::Datastream for Datastream {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -603,7 +603,7 @@ impl super::stubs::Datastream for Datastream {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -623,7 +623,7 @@ impl super::stubs::Datastream for Datastream {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -645,7 +645,7 @@ impl super::stubs::Datastream for Datastream {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -664,7 +664,7 @@ impl super::stubs::Datastream for Datastream {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -686,7 +686,7 @@ impl super::stubs::Datastream for Datastream {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -705,7 +705,7 @@ impl super::stubs::Datastream for Datastream {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -724,7 +724,7 @@ impl super::stubs::Datastream for Datastream {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/deploy/v1/Cargo.toml b/src/generated/cloud/deploy/v1/Cargo.toml
index 05b9f58ee..4b96aa823 100644
--- a/src/generated/cloud/deploy/v1/Cargo.toml
+++ b/src/generated/cloud/deploy/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
diff --git a/src/generated/cloud/deploy/v1/src/model.rs b/src/generated/cloud/deploy/v1/src/model.rs
index d0cd169eb..d186d1bd8 100755
--- a/src/generated/cloud/deploy/v1/src/model.rs
+++ b/src/generated/cloud/deploy/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate iam_v1;
 extern crate lazy_static;
diff --git a/src/generated/cloud/deploy/v1/src/transport.rs b/src/generated/cloud/deploy/v1/src/transport.rs
index df8102b9a..bdc69b41c 100755
--- a/src/generated/cloud/deploy/v1/src/transport.rs
+++ b/src/generated/cloud/deploy/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [CloudDeploy](super::stubs::CloudDeploy) using a [gclient::ReqwestClient].
+/// Implements [CloudDeploy](super::stubs::CloudDeploy) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct CloudDeploy {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for CloudDeploy {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for CloudDeploy {
 }
 
 impl CloudDeploy {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -81,7 +81,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -124,7 +124,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
                     "/v1/{}",
                     req.delivery_pipeline
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("delivery_pipeline"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("delivery_pipeline"))?
                         .name
                 ),
             )
@@ -140,7 +140,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -171,7 +171,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
         let builder = builder.query(&[("force", &req.force)]);
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -194,7 +194,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -233,7 +233,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -271,7 +271,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
                     "/v1/{}",
                     req.target
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("target"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("target"))?
                         .name
                 ),
             )
@@ -287,7 +287,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -315,7 +315,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -341,7 +341,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -360,7 +360,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -403,7 +403,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
                     "/v1/{}",
                     req.custom_target_type
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("custom_target_type"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("custom_target_type"))?
                         .name
                 ),
             )
@@ -419,7 +419,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -449,7 +449,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -472,7 +472,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -491,7 +491,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -582,7 +582,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
                     "/v1/{}",
                     req.deploy_policy
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("deploy_policy"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("deploy_policy"))?
                         .name
                 ),
             )
@@ -598,7 +598,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -628,7 +628,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -654,7 +654,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -673,7 +673,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -747,7 +747,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -766,7 +766,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -861,7 +861,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -880,7 +880,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -916,7 +916,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -959,7 +959,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
                     "/v1/{}",
                     req.automation
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("automation"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("automation"))?
                         .name
                 ),
             )
@@ -975,7 +975,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -1005,7 +1005,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1024,7 +1024,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1050,7 +1050,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1069,7 +1069,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1095,7 +1095,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1134,7 +1134,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1153,7 +1153,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1201,11 +1201,11 @@ impl super::stubs::CloudDeploy for CloudDeploy {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1247,7 +1247,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1266,7 +1266,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1285,7 +1285,7 @@ impl super::stubs::CloudDeploy for CloudDeploy {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/developerconnect/v1/Cargo.toml b/src/generated/cloud/developerconnect/v1/Cargo.toml
index 34a379ab0..ca1cb0319 100644
--- a/src/generated/cloud/developerconnect/v1/Cargo.toml
+++ b/src/generated/cloud/developerconnect/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/developerconnect/v1/src/model.rs b/src/generated/cloud/developerconnect/v1/src/model.rs
index 0cf31e96a..6a6432dde 100755
--- a/src/generated/cloud/developerconnect/v1/src/model.rs
+++ b/src/generated/cloud/developerconnect/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate location;
 extern crate longrunning;
diff --git a/src/generated/cloud/developerconnect/v1/src/transport.rs b/src/generated/cloud/developerconnect/v1/src/transport.rs
index 9988b4436..d01f97db1 100755
--- a/src/generated/cloud/developerconnect/v1/src/transport.rs
+++ b/src/generated/cloud/developerconnect/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [DeveloperConnect](super::stubs::DeveloperConnect) using a [gclient::ReqwestClient].
+/// Implements [DeveloperConnect](super::stubs::DeveloperConnect) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct DeveloperConnect {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for DeveloperConnect {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for DeveloperConnect {
 }
 
 impl DeveloperConnect {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::DeveloperConnect for DeveloperConnect {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -81,7 +81,7 @@ impl super::stubs::DeveloperConnect for DeveloperConnect {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -124,7 +124,7 @@ impl super::stubs::DeveloperConnect for DeveloperConnect {
                     "/v1/{}",
                     req.connection
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("connection"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("connection"))?
                         .name
                 ),
             )
@@ -140,7 +140,7 @@ impl super::stubs::DeveloperConnect for DeveloperConnect {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -169,7 +169,7 @@ impl super::stubs::DeveloperConnect for DeveloperConnect {
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -216,7 +216,7 @@ impl super::stubs::DeveloperConnect for DeveloperConnect {
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -242,7 +242,7 @@ impl super::stubs::DeveloperConnect for DeveloperConnect {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -261,7 +261,7 @@ impl super::stubs::DeveloperConnect for DeveloperConnect {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -325,7 +325,7 @@ impl super::stubs::DeveloperConnect for DeveloperConnect {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -347,7 +347,7 @@ impl super::stubs::DeveloperConnect for DeveloperConnect {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -372,7 +372,7 @@ impl super::stubs::DeveloperConnect for DeveloperConnect {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -394,7 +394,7 @@ impl super::stubs::DeveloperConnect for DeveloperConnect {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -413,7 +413,7 @@ impl super::stubs::DeveloperConnect for DeveloperConnect {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -435,7 +435,7 @@ impl super::stubs::DeveloperConnect for DeveloperConnect {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -454,7 +454,7 @@ impl super::stubs::DeveloperConnect for DeveloperConnect {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -473,7 +473,7 @@ impl super::stubs::DeveloperConnect for DeveloperConnect {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/dialogflow/cx/v3/Cargo.toml b/src/generated/cloud/dialogflow/cx/v3/Cargo.toml
index 27b7ba4bd..68e457595 100644
--- a/src/generated/cloud/dialogflow/cx/v3/Cargo.toml
+++ b/src/generated/cloud/dialogflow/cx/v3/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/dialogflow/cx/v3/src/model.rs b/src/generated/cloud/dialogflow/cx/v3/src/model.rs
index d0895a175..a8c81f457 100755
--- a/src/generated/cloud/dialogflow/cx/v3/src/model.rs
+++ b/src/generated/cloud/dialogflow/cx/v3/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/dialogflow/cx/v3/src/transport.rs b/src/generated/cloud/dialogflow/cx/v3/src/transport.rs
index 5712d61f0..d0d8f152a 100755
--- a/src/generated/cloud/dialogflow/cx/v3/src/transport.rs
+++ b/src/generated/cloud/dialogflow/cx/v3/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [Agents](super::stubs::Agents) using a [gclient::ReqwestClient].
+/// Implements [Agents](super::stubs::Agents) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Agents {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Agents {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for Agents {
 }
 
 impl Agents {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -57,7 +57,7 @@ impl super::stubs::Agents for Agents {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -76,7 +76,7 @@ impl super::stubs::Agents for Agents {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -111,7 +111,7 @@ impl super::stubs::Agents for Agents {
                     "/v3/{}",
                     req.agent
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("agent"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("agent"))?
                         .name
                 ),
             )
@@ -127,7 +127,7 @@ impl super::stubs::Agents for Agents {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.agent), options).await
@@ -148,7 +148,7 @@ impl super::stubs::Agents for Agents {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -219,7 +219,7 @@ impl super::stubs::Agents for Agents {
             );
         let builder = builder.query(&[("languageCode", &req.language_code)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -239,7 +239,7 @@ impl super::stubs::Agents for Agents {
             );
         let builder = builder.query(&[("languageCode", &req.language_code)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -257,7 +257,7 @@ impl super::stubs::Agents for Agents {
                     "/v3/{}",
                     req.generative_settings
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("generative_settings"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("generative_settings"))?
                         .name
                 ),
             )
@@ -273,7 +273,7 @@ impl super::stubs::Agents for Agents {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -299,7 +299,7 @@ impl super::stubs::Agents for Agents {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -318,7 +318,7 @@ impl super::stubs::Agents for Agents {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -340,7 +340,7 @@ impl super::stubs::Agents for Agents {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -359,7 +359,7 @@ impl super::stubs::Agents for Agents {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -378,7 +378,7 @@ impl super::stubs::Agents for Agents {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -397,10 +397,10 @@ impl super::stubs::Agents for Agents {
     }
 }
 
-/// Implements [Changelogs](super::stubs::Changelogs) using a [gclient::ReqwestClient].
+/// Implements [Changelogs](super::stubs::Changelogs) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Changelogs {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Changelogs {
@@ -412,8 +412,8 @@ impl std::fmt::Debug for Changelogs {
 }
 
 impl Changelogs {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -440,7 +440,7 @@ impl super::stubs::Changelogs for Changelogs {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -459,7 +459,7 @@ impl super::stubs::Changelogs for Changelogs {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -481,7 +481,7 @@ impl super::stubs::Changelogs for Changelogs {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -500,7 +500,7 @@ impl super::stubs::Changelogs for Changelogs {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -522,7 +522,7 @@ impl super::stubs::Changelogs for Changelogs {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -541,7 +541,7 @@ impl super::stubs::Changelogs for Changelogs {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -560,15 +560,15 @@ impl super::stubs::Changelogs for Changelogs {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [Deployments](super::stubs::Deployments) using a [gclient::ReqwestClient].
+/// Implements [Deployments](super::stubs::Deployments) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Deployments {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Deployments {
@@ -580,8 +580,8 @@ impl std::fmt::Debug for Deployments {
 }
 
 impl Deployments {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -607,7 +607,7 @@ impl super::stubs::Deployments for Deployments {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -626,7 +626,7 @@ impl super::stubs::Deployments for Deployments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -648,7 +648,7 @@ impl super::stubs::Deployments for Deployments {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -667,7 +667,7 @@ impl super::stubs::Deployments for Deployments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -689,7 +689,7 @@ impl super::stubs::Deployments for Deployments {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -708,7 +708,7 @@ impl super::stubs::Deployments for Deployments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -727,15 +727,15 @@ impl super::stubs::Deployments for Deployments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [EntityTypes](super::stubs::EntityTypes) using a [gclient::ReqwestClient].
+/// Implements [EntityTypes](super::stubs::EntityTypes) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct EntityTypes {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for EntityTypes {
@@ -747,8 +747,8 @@ impl std::fmt::Debug for EntityTypes {
 }
 
 impl EntityTypes {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -770,7 +770,7 @@ impl super::stubs::EntityTypes for EntityTypes {
             );
         let builder = builder.query(&[("languageCode", &req.language_code)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -811,7 +811,7 @@ impl super::stubs::EntityTypes for EntityTypes {
                     "/v3/{}",
                     req.entity_type
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("entity_type"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("entity_type"))?
                         .name
                 ),
             )
@@ -828,7 +828,7 @@ impl super::stubs::EntityTypes for EntityTypes {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -852,7 +852,7 @@ impl super::stubs::EntityTypes for EntityTypes {
             );
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -877,7 +877,7 @@ impl super::stubs::EntityTypes for EntityTypes {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -939,7 +939,7 @@ impl super::stubs::EntityTypes for EntityTypes {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -958,7 +958,7 @@ impl super::stubs::EntityTypes for EntityTypes {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -980,7 +980,7 @@ impl super::stubs::EntityTypes for EntityTypes {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -999,7 +999,7 @@ impl super::stubs::EntityTypes for EntityTypes {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1018,7 +1018,7 @@ impl super::stubs::EntityTypes for EntityTypes {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1037,10 +1037,10 @@ impl super::stubs::EntityTypes for EntityTypes {
     }
 }
 
-/// Implements [Environments](super::stubs::Environments) using a [gclient::ReqwestClient].
+/// Implements [Environments](super::stubs::Environments) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Environments {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Environments {
@@ -1052,8 +1052,8 @@ impl std::fmt::Debug for Environments {
 }
 
 impl Environments {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1079,7 +1079,7 @@ impl super::stubs::Environments for Environments {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1098,7 +1098,7 @@ impl super::stubs::Environments for Environments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1138,7 +1138,7 @@ impl super::stubs::Environments for Environments {
                     "/v3/{}",
                     req.environment
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("environment"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("environment"))?
                         .name
                 ),
             )
@@ -1154,7 +1154,7 @@ impl super::stubs::Environments for Environments {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1177,7 +1177,7 @@ impl super::stubs::Environments for Environments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1201,7 +1201,7 @@ impl super::stubs::Environments for Environments {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1245,7 +1245,7 @@ impl super::stubs::Environments for Environments {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1287,7 +1287,7 @@ impl super::stubs::Environments for Environments {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1306,7 +1306,7 @@ impl super::stubs::Environments for Environments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1328,7 +1328,7 @@ impl super::stubs::Environments for Environments {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1347,7 +1347,7 @@ impl super::stubs::Environments for Environments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1366,7 +1366,7 @@ impl super::stubs::Environments for Environments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1385,10 +1385,10 @@ impl super::stubs::Environments for Environments {
     }
 }
 
-/// Implements [Experiments](super::stubs::Experiments) using a [gclient::ReqwestClient].
+/// Implements [Experiments](super::stubs::Experiments) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Experiments {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Experiments {
@@ -1400,8 +1400,8 @@ impl std::fmt::Debug for Experiments {
 }
 
 impl Experiments {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1427,7 +1427,7 @@ impl super::stubs::Experiments for Experiments {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1446,7 +1446,7 @@ impl super::stubs::Experiments for Experiments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1486,7 +1486,7 @@ impl super::stubs::Experiments for Experiments {
                     "/v3/{}",
                     req.experiment
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("experiment"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("experiment"))?
                         .name
                 ),
             )
@@ -1502,7 +1502,7 @@ impl super::stubs::Experiments for Experiments {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1525,7 +1525,7 @@ impl super::stubs::Experiments for Experiments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1581,7 +1581,7 @@ impl super::stubs::Experiments for Experiments {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1600,7 +1600,7 @@ impl super::stubs::Experiments for Experiments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1622,7 +1622,7 @@ impl super::stubs::Experiments for Experiments {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1641,7 +1641,7 @@ impl super::stubs::Experiments for Experiments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1660,15 +1660,15 @@ impl super::stubs::Experiments for Experiments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [Flows](super::stubs::Flows) using a [gclient::ReqwestClient].
+/// Implements [Flows](super::stubs::Flows) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Flows {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Flows {
@@ -1678,8 +1678,8 @@ impl std::fmt::Debug for Flows {
 }
 
 impl Flows {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1719,7 +1719,7 @@ impl super::stubs::Flows for Flows {
             );
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1741,7 +1741,7 @@ impl super::stubs::Flows for Flows {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("languageCode", &req.language_code)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1761,7 +1761,7 @@ impl super::stubs::Flows for Flows {
             );
         let builder = builder.query(&[("languageCode", &req.language_code)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1779,7 +1779,7 @@ impl super::stubs::Flows for Flows {
                     "/v3/{}",
                     req.flow
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("flow"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("flow"))?
                         .name
                 ),
             )
@@ -1795,7 +1795,7 @@ impl super::stubs::Flows for Flows {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("languageCode", &req.language_code)]);
@@ -1852,7 +1852,7 @@ impl super::stubs::Flows for Flows {
             );
         let builder = builder.query(&[("languageCode", &req.language_code)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1911,7 +1911,7 @@ impl super::stubs::Flows for Flows {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1930,7 +1930,7 @@ impl super::stubs::Flows for Flows {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1952,7 +1952,7 @@ impl super::stubs::Flows for Flows {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1971,7 +1971,7 @@ impl super::stubs::Flows for Flows {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1990,7 +1990,7 @@ impl super::stubs::Flows for Flows {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2009,10 +2009,10 @@ impl super::stubs::Flows for Flows {
     }
 }
 
-/// Implements [Generators](super::stubs::Generators) using a [gclient::ReqwestClient].
+/// Implements [Generators](super::stubs::Generators) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Generators {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Generators {
@@ -2024,8 +2024,8 @@ impl std::fmt::Debug for Generators {
 }
 
 impl Generators {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -2052,7 +2052,7 @@ impl super::stubs::Generators for Generators {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2072,7 +2072,7 @@ impl super::stubs::Generators for Generators {
             );
         let builder = builder.query(&[("languageCode", &req.language_code)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2113,7 +2113,7 @@ impl super::stubs::Generators for Generators {
                     "/v3/{}",
                     req.generator
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("generator"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("generator"))?
                         .name
                 ),
             )
@@ -2130,7 +2130,7 @@ impl super::stubs::Generators for Generators {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -2154,7 +2154,7 @@ impl super::stubs::Generators for Generators {
             );
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2176,7 +2176,7 @@ impl super::stubs::Generators for Generators {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2195,7 +2195,7 @@ impl super::stubs::Generators for Generators {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2217,7 +2217,7 @@ impl super::stubs::Generators for Generators {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2236,7 +2236,7 @@ impl super::stubs::Generators for Generators {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2255,15 +2255,15 @@ impl super::stubs::Generators for Generators {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [Intents](super::stubs::Intents) using a [gclient::ReqwestClient].
+/// Implements [Intents](super::stubs::Intents) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Intents {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Intents {
@@ -2275,8 +2275,8 @@ impl std::fmt::Debug for Intents {
 }
 
 impl Intents {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -2301,7 +2301,7 @@ impl super::stubs::Intents for Intents {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2321,7 +2321,7 @@ impl super::stubs::Intents for Intents {
             );
         let builder = builder.query(&[("languageCode", &req.language_code)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2357,7 +2357,7 @@ impl super::stubs::Intents for Intents {
                     "/v3/{}",
                     req.intent
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("intent"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("intent"))?
                         .name
                 ),
             )
@@ -2374,7 +2374,7 @@ impl super::stubs::Intents for Intents {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.intent), options).await
@@ -2395,7 +2395,7 @@ impl super::stubs::Intents for Intents {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2457,7 +2457,7 @@ impl super::stubs::Intents for Intents {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2476,7 +2476,7 @@ impl super::stubs::Intents for Intents {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2498,7 +2498,7 @@ impl super::stubs::Intents for Intents {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2517,7 +2517,7 @@ impl super::stubs::Intents for Intents {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2536,7 +2536,7 @@ impl super::stubs::Intents for Intents {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2555,10 +2555,10 @@ impl super::stubs::Intents for Intents {
     }
 }
 
-/// Implements [Pages](super::stubs::Pages) using a [gclient::ReqwestClient].
+/// Implements [Pages](super::stubs::Pages) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Pages {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Pages {
@@ -2568,8 +2568,8 @@ impl std::fmt::Debug for Pages {
 }
 
 impl Pages {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -2593,7 +2593,7 @@ impl super::stubs::Pages for Pages {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2613,7 +2613,7 @@ impl super::stubs::Pages for Pages {
             );
         let builder = builder.query(&[("languageCode", &req.language_code)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2649,7 +2649,7 @@ impl super::stubs::Pages for Pages {
                     "/v3/{}",
                     req.page
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("page"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("page"))?
                         .name
                 ),
             )
@@ -2666,7 +2666,7 @@ impl super::stubs::Pages for Pages {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.page), options).await
@@ -2688,7 +2688,7 @@ impl super::stubs::Pages for Pages {
             );
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2710,7 +2710,7 @@ impl super::stubs::Pages for Pages {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2729,7 +2729,7 @@ impl super::stubs::Pages for Pages {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2751,7 +2751,7 @@ impl super::stubs::Pages for Pages {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2770,7 +2770,7 @@ impl super::stubs::Pages for Pages {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2789,15 +2789,15 @@ impl super::stubs::Pages for Pages {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [SecuritySettingsService](super::stubs::SecuritySettingsService) using a [gclient::ReqwestClient].
+/// Implements [SecuritySettingsService](super::stubs::SecuritySettingsService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct SecuritySettingsService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for SecuritySettingsService {
@@ -2809,8 +2809,8 @@ impl std::fmt::Debug for SecuritySettingsService {
 }
 
 impl SecuritySettingsService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -2853,7 +2853,7 @@ impl super::stubs::SecuritySettingsService for SecuritySettingsService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2871,7 +2871,7 @@ impl super::stubs::SecuritySettingsService for SecuritySettingsService {
                     "/v3/{}",
                     req.security_settings
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("security_settings"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("security_settings"))?
                         .name
                 ),
             )
@@ -2887,7 +2887,7 @@ impl super::stubs::SecuritySettingsService for SecuritySettingsService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -2915,7 +2915,7 @@ impl super::stubs::SecuritySettingsService for SecuritySettingsService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2934,7 +2934,7 @@ impl super::stubs::SecuritySettingsService for SecuritySettingsService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2956,7 +2956,7 @@ impl super::stubs::SecuritySettingsService for SecuritySettingsService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2975,7 +2975,7 @@ impl super::stubs::SecuritySettingsService for SecuritySettingsService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2997,7 +2997,7 @@ impl super::stubs::SecuritySettingsService for SecuritySettingsService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3016,7 +3016,7 @@ impl super::stubs::SecuritySettingsService for SecuritySettingsService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3035,15 +3035,15 @@ impl super::stubs::SecuritySettingsService for SecuritySettingsService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [Sessions](super::stubs::Sessions) using a [gclient::ReqwestClient].
+/// Implements [Sessions](super::stubs::Sessions) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Sessions {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Sessions {
@@ -3055,8 +3055,8 @@ impl std::fmt::Debug for Sessions {
 }
 
 impl Sessions {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -3116,7 +3116,7 @@ impl super::stubs::Sessions for Sessions {
                     "/v3/{}:fulfillIntent",
                     req.match_intent_request
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("match_intent_request"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("match_intent_request"))?
                         .session
                 ),
             )
@@ -3166,7 +3166,7 @@ impl super::stubs::Sessions for Sessions {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3185,7 +3185,7 @@ impl super::stubs::Sessions for Sessions {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3207,7 +3207,7 @@ impl super::stubs::Sessions for Sessions {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3226,7 +3226,7 @@ impl super::stubs::Sessions for Sessions {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3245,15 +3245,15 @@ impl super::stubs::Sessions for Sessions {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [SessionEntityTypes](super::stubs::SessionEntityTypes) using a [gclient::ReqwestClient].
+/// Implements [SessionEntityTypes](super::stubs::SessionEntityTypes) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct SessionEntityTypes {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for SessionEntityTypes {
@@ -3265,8 +3265,8 @@ impl std::fmt::Debug for SessionEntityTypes {
 }
 
 impl SessionEntityTypes {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -3292,7 +3292,7 @@ impl super::stubs::SessionEntityTypes for SessionEntityTypes {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3311,7 +3311,7 @@ impl super::stubs::SessionEntityTypes for SessionEntityTypes {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3351,7 +3351,7 @@ impl super::stubs::SessionEntityTypes for SessionEntityTypes {
                     "/v3/{}",
                     req.session_entity_type
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("session_entity_type"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("session_entity_type"))?
                         .name
                 ),
             )
@@ -3367,7 +3367,7 @@ impl super::stubs::SessionEntityTypes for SessionEntityTypes {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -3390,7 +3390,7 @@ impl super::stubs::SessionEntityTypes for SessionEntityTypes {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3412,7 +3412,7 @@ impl super::stubs::SessionEntityTypes for SessionEntityTypes {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3431,7 +3431,7 @@ impl super::stubs::SessionEntityTypes for SessionEntityTypes {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3453,7 +3453,7 @@ impl super::stubs::SessionEntityTypes for SessionEntityTypes {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3472,7 +3472,7 @@ impl super::stubs::SessionEntityTypes for SessionEntityTypes {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3491,15 +3491,15 @@ impl super::stubs::SessionEntityTypes for SessionEntityTypes {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [TestCases](super::stubs::TestCases) using a [gclient::ReqwestClient].
+/// Implements [TestCases](super::stubs::TestCases) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct TestCases {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for TestCases {
@@ -3511,8 +3511,8 @@ impl std::fmt::Debug for TestCases {
 }
 
 impl TestCases {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -3539,7 +3539,7 @@ impl super::stubs::TestCases for TestCases {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3578,7 +3578,7 @@ impl super::stubs::TestCases for TestCases {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3618,7 +3618,7 @@ impl super::stubs::TestCases for TestCases {
                     "/v3/{}",
                     req.test_case
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("test_case"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("test_case"))?
                         .name
                 ),
             )
@@ -3634,7 +3634,7 @@ impl super::stubs::TestCases for TestCases {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -3698,7 +3698,7 @@ impl super::stubs::TestCases for TestCases {
             );
         let builder = builder.query(&[("type", &req.r#type.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3760,7 +3760,7 @@ impl super::stubs::TestCases for TestCases {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3779,7 +3779,7 @@ impl super::stubs::TestCases for TestCases {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3801,7 +3801,7 @@ impl super::stubs::TestCases for TestCases {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3820,7 +3820,7 @@ impl super::stubs::TestCases for TestCases {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3842,7 +3842,7 @@ impl super::stubs::TestCases for TestCases {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3861,7 +3861,7 @@ impl super::stubs::TestCases for TestCases {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3880,7 +3880,7 @@ impl super::stubs::TestCases for TestCases {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3899,10 +3899,10 @@ impl super::stubs::TestCases for TestCases {
     }
 }
 
-/// Implements [TransitionRouteGroups](super::stubs::TransitionRouteGroups) using a [gclient::ReqwestClient].
+/// Implements [TransitionRouteGroups](super::stubs::TransitionRouteGroups) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct TransitionRouteGroups {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for TransitionRouteGroups {
@@ -3914,8 +3914,8 @@ impl std::fmt::Debug for TransitionRouteGroups {
 }
 
 impl TransitionRouteGroups {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -3942,7 +3942,7 @@ impl super::stubs::TransitionRouteGroups for TransitionRouteGroups {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("languageCode", &req.language_code)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3962,7 +3962,7 @@ impl super::stubs::TransitionRouteGroups for TransitionRouteGroups {
             );
         let builder = builder.query(&[("languageCode", &req.language_code)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4003,7 +4003,7 @@ impl super::stubs::TransitionRouteGroups for TransitionRouteGroups {
                     "/v3/{}",
                     req.transition_route_group
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("transition_route_group"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("transition_route_group"))?
                         .name
                 ),
             )
@@ -4019,7 +4019,7 @@ impl super::stubs::TransitionRouteGroups for TransitionRouteGroups {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("languageCode", &req.language_code)]);
@@ -4044,7 +4044,7 @@ impl super::stubs::TransitionRouteGroups for TransitionRouteGroups {
             );
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4066,7 +4066,7 @@ impl super::stubs::TransitionRouteGroups for TransitionRouteGroups {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4085,7 +4085,7 @@ impl super::stubs::TransitionRouteGroups for TransitionRouteGroups {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4107,7 +4107,7 @@ impl super::stubs::TransitionRouteGroups for TransitionRouteGroups {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4126,7 +4126,7 @@ impl super::stubs::TransitionRouteGroups for TransitionRouteGroups {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4145,15 +4145,15 @@ impl super::stubs::TransitionRouteGroups for TransitionRouteGroups {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [Versions](super::stubs::Versions) using a [gclient::ReqwestClient].
+/// Implements [Versions](super::stubs::Versions) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Versions {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Versions {
@@ -4165,8 +4165,8 @@ impl std::fmt::Debug for Versions {
 }
 
 impl Versions {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -4189,7 +4189,7 @@ impl super::stubs::Versions for Versions {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4208,7 +4208,7 @@ impl super::stubs::Versions for Versions {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4248,7 +4248,7 @@ impl super::stubs::Versions for Versions {
                     "/v3/{}",
                     req.version
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("version"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("version"))?
                         .name
                 ),
             )
@@ -4264,7 +4264,7 @@ impl super::stubs::Versions for Versions {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -4287,7 +4287,7 @@ impl super::stubs::Versions for Versions {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4346,7 +4346,7 @@ impl super::stubs::Versions for Versions {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4365,7 +4365,7 @@ impl super::stubs::Versions for Versions {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4387,7 +4387,7 @@ impl super::stubs::Versions for Versions {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4406,7 +4406,7 @@ impl super::stubs::Versions for Versions {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4425,7 +4425,7 @@ impl super::stubs::Versions for Versions {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4444,10 +4444,10 @@ impl super::stubs::Versions for Versions {
     }
 }
 
-/// Implements [Webhooks](super::stubs::Webhooks) using a [gclient::ReqwestClient].
+/// Implements [Webhooks](super::stubs::Webhooks) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Webhooks {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Webhooks {
@@ -4459,8 +4459,8 @@ impl std::fmt::Debug for Webhooks {
 }
 
 impl Webhooks {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -4483,7 +4483,7 @@ impl super::stubs::Webhooks for Webhooks {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4502,7 +4502,7 @@ impl super::stubs::Webhooks for Webhooks {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4542,7 +4542,7 @@ impl super::stubs::Webhooks for Webhooks {
                     "/v3/{}",
                     req.webhook
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("webhook"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("webhook"))?
                         .name
                 ),
             )
@@ -4558,7 +4558,7 @@ impl super::stubs::Webhooks for Webhooks {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -4582,7 +4582,7 @@ impl super::stubs::Webhooks for Webhooks {
             );
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4604,7 +4604,7 @@ impl super::stubs::Webhooks for Webhooks {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4623,7 +4623,7 @@ impl super::stubs::Webhooks for Webhooks {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4645,7 +4645,7 @@ impl super::stubs::Webhooks for Webhooks {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4664,7 +4664,7 @@ impl super::stubs::Webhooks for Webhooks {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4683,7 +4683,7 @@ impl super::stubs::Webhooks for Webhooks {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/cloud/dialogflow/v2/Cargo.toml b/src/generated/cloud/dialogflow/v2/Cargo.toml
index 28d50fd82..02f564a4a 100644
--- a/src/generated/cloud/dialogflow/v2/Cargo.toml
+++ b/src/generated/cloud/dialogflow/v2/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/dialogflow/v2/src/model.rs b/src/generated/cloud/dialogflow/v2/src/model.rs
index 9feac8061..609e9b0c8 100755
--- a/src/generated/cloud/dialogflow/v2/src/model.rs
+++ b/src/generated/cloud/dialogflow/v2/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/dialogflow/v2/src/transport.rs b/src/generated/cloud/dialogflow/v2/src/transport.rs
index 3abb7cf37..21c9613b9 100755
--- a/src/generated/cloud/dialogflow/v2/src/transport.rs
+++ b/src/generated/cloud/dialogflow/v2/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [Agents](super::stubs::Agents) using a [gclient::ReqwestClient].
+/// Implements [Agents](super::stubs::Agents) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Agents {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Agents {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for Agents {
 }
 
 impl Agents {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -55,7 +55,7 @@ impl super::stubs::Agents for Agents {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -73,7 +73,7 @@ impl super::stubs::Agents for Agents {
                     "/v2/{}/agent",
                     req.agent
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("agent"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("agent"))?
                         .parent
                 ),
             )
@@ -89,7 +89,7 @@ impl super::stubs::Agents for Agents {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.agent), options).await
@@ -110,7 +110,7 @@ impl super::stubs::Agents for Agents {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -134,7 +134,7 @@ impl super::stubs::Agents for Agents {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -237,7 +237,7 @@ impl super::stubs::Agents for Agents {
             );
         let builder = builder.query(&[("languageCode", &req.language_code)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -259,7 +259,7 @@ impl super::stubs::Agents for Agents {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -278,7 +278,7 @@ impl super::stubs::Agents for Agents {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -300,7 +300,7 @@ impl super::stubs::Agents for Agents {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -319,7 +319,7 @@ impl super::stubs::Agents for Agents {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -338,7 +338,7 @@ impl super::stubs::Agents for Agents {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -357,10 +357,10 @@ impl super::stubs::Agents for Agents {
     }
 }
 
-/// Implements [AnswerRecords](super::stubs::AnswerRecords) using a [gclient::ReqwestClient].
+/// Implements [AnswerRecords](super::stubs::AnswerRecords) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct AnswerRecords {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for AnswerRecords {
@@ -372,8 +372,8 @@ impl std::fmt::Debug for AnswerRecords {
 }
 
 impl AnswerRecords {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -400,7 +400,7 @@ impl super::stubs::AnswerRecords for AnswerRecords {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -418,7 +418,7 @@ impl super::stubs::AnswerRecords for AnswerRecords {
                     "/v2/{}",
                     req.answer_record
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("answer_record"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("answer_record"))?
                         .name
                 ),
             )
@@ -434,7 +434,7 @@ impl super::stubs::AnswerRecords for AnswerRecords {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -460,7 +460,7 @@ impl super::stubs::AnswerRecords for AnswerRecords {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -479,7 +479,7 @@ impl super::stubs::AnswerRecords for AnswerRecords {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -501,7 +501,7 @@ impl super::stubs::AnswerRecords for AnswerRecords {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -520,7 +520,7 @@ impl super::stubs::AnswerRecords for AnswerRecords {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -539,15 +539,15 @@ impl super::stubs::AnswerRecords for AnswerRecords {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [Contexts](super::stubs::Contexts) using a [gclient::ReqwestClient].
+/// Implements [Contexts](super::stubs::Contexts) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Contexts {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Contexts {
@@ -559,8 +559,8 @@ impl std::fmt::Debug for Contexts {
 }
 
 impl Contexts {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -583,7 +583,7 @@ impl super::stubs::Contexts for Contexts {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -602,7 +602,7 @@ impl super::stubs::Contexts for Contexts {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -642,7 +642,7 @@ impl super::stubs::Contexts for Contexts {
                     "/v2/{}",
                     req.context
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("context"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("context"))?
                         .name
                 ),
             )
@@ -658,7 +658,7 @@ impl super::stubs::Contexts for Contexts {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -681,7 +681,7 @@ impl super::stubs::Contexts for Contexts {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -703,7 +703,7 @@ impl super::stubs::Contexts for Contexts {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -725,7 +725,7 @@ impl super::stubs::Contexts for Contexts {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -744,7 +744,7 @@ impl super::stubs::Contexts for Contexts {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -766,7 +766,7 @@ impl super::stubs::Contexts for Contexts {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -785,7 +785,7 @@ impl super::stubs::Contexts for Contexts {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -804,15 +804,15 @@ impl super::stubs::Contexts for Contexts {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [Conversations](super::stubs::Conversations) using a [gclient::ReqwestClient].
+/// Implements [Conversations](super::stubs::Conversations) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Conversations {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Conversations {
@@ -824,8 +824,8 @@ impl std::fmt::Debug for Conversations {
 }
 
 impl Conversations {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -875,7 +875,7 @@ impl super::stubs::Conversations for Conversations {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -894,7 +894,7 @@ impl super::stubs::Conversations for Conversations {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -953,7 +953,7 @@ impl super::stubs::Conversations for Conversations {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -994,7 +994,7 @@ impl super::stubs::Conversations for Conversations {
                     "/v2/{}/suggestions:generateStatelessSummary",
                     req.stateless_conversation
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("stateless_conversation"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("stateless_conversation"))?
                         .parent
                 ),
             )
@@ -1084,7 +1084,7 @@ impl super::stubs::Conversations for Conversations {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1103,7 +1103,7 @@ impl super::stubs::Conversations for Conversations {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1125,7 +1125,7 @@ impl super::stubs::Conversations for Conversations {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1144,7 +1144,7 @@ impl super::stubs::Conversations for Conversations {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1163,15 +1163,15 @@ impl super::stubs::Conversations for Conversations {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [ConversationDatasets](super::stubs::ConversationDatasets) using a [gclient::ReqwestClient].
+/// Implements [ConversationDatasets](super::stubs::ConversationDatasets) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ConversationDatasets {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ConversationDatasets {
@@ -1183,8 +1183,8 @@ impl std::fmt::Debug for ConversationDatasets {
 }
 
 impl ConversationDatasets {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1227,7 +1227,7 @@ impl super::stubs::ConversationDatasets for ConversationDatasets {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1251,7 +1251,7 @@ impl super::stubs::ConversationDatasets for ConversationDatasets {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1270,7 +1270,7 @@ impl super::stubs::ConversationDatasets for ConversationDatasets {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1312,7 +1312,7 @@ impl super::stubs::ConversationDatasets for ConversationDatasets {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1331,7 +1331,7 @@ impl super::stubs::ConversationDatasets for ConversationDatasets {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1353,7 +1353,7 @@ impl super::stubs::ConversationDatasets for ConversationDatasets {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1372,7 +1372,7 @@ impl super::stubs::ConversationDatasets for ConversationDatasets {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1391,7 +1391,7 @@ impl super::stubs::ConversationDatasets for ConversationDatasets {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1410,10 +1410,10 @@ impl super::stubs::ConversationDatasets for ConversationDatasets {
     }
 }
 
-/// Implements [ConversationModels](super::stubs::ConversationModels) using a [gclient::ReqwestClient].
+/// Implements [ConversationModels](super::stubs::ConversationModels) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ConversationModels {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ConversationModels {
@@ -1425,8 +1425,8 @@ impl std::fmt::Debug for ConversationModels {
 }
 
 impl ConversationModels {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1469,7 +1469,7 @@ impl super::stubs::ConversationModels for ConversationModels {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1493,7 +1493,7 @@ impl super::stubs::ConversationModels for ConversationModels {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1512,7 +1512,7 @@ impl super::stubs::ConversationModels for ConversationModels {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1565,7 +1565,7 @@ impl super::stubs::ConversationModels for ConversationModels {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1589,7 +1589,7 @@ impl super::stubs::ConversationModels for ConversationModels {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1631,7 +1631,7 @@ impl super::stubs::ConversationModels for ConversationModels {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1650,7 +1650,7 @@ impl super::stubs::ConversationModels for ConversationModels {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1672,7 +1672,7 @@ impl super::stubs::ConversationModels for ConversationModels {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1691,7 +1691,7 @@ impl super::stubs::ConversationModels for ConversationModels {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1710,7 +1710,7 @@ impl super::stubs::ConversationModels for ConversationModels {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1729,10 +1729,10 @@ impl super::stubs::ConversationModels for ConversationModels {
     }
 }
 
-/// Implements [ConversationProfiles](super::stubs::ConversationProfiles) using a [gclient::ReqwestClient].
+/// Implements [ConversationProfiles](super::stubs::ConversationProfiles) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ConversationProfiles {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ConversationProfiles {
@@ -1744,8 +1744,8 @@ impl std::fmt::Debug for ConversationProfiles {
 }
 
 impl ConversationProfiles {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1771,7 +1771,7 @@ impl super::stubs::ConversationProfiles for ConversationProfiles {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1790,7 +1790,7 @@ impl super::stubs::ConversationProfiles for ConversationProfiles {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1830,7 +1830,7 @@ impl super::stubs::ConversationProfiles for ConversationProfiles {
                     "/v2/{}",
                     req.conversation_profile
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("conversation_profile"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("conversation_profile"))?
                         .name
                 ),
             )
@@ -1846,7 +1846,7 @@ impl super::stubs::ConversationProfiles for ConversationProfiles {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1869,7 +1869,7 @@ impl super::stubs::ConversationProfiles for ConversationProfiles {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1937,7 +1937,7 @@ impl super::stubs::ConversationProfiles for ConversationProfiles {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1956,7 +1956,7 @@ impl super::stubs::ConversationProfiles for ConversationProfiles {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1978,7 +1978,7 @@ impl super::stubs::ConversationProfiles for ConversationProfiles {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1997,7 +1997,7 @@ impl super::stubs::ConversationProfiles for ConversationProfiles {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2016,7 +2016,7 @@ impl super::stubs::ConversationProfiles for ConversationProfiles {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2035,10 +2035,10 @@ impl super::stubs::ConversationProfiles for ConversationProfiles {
     }
 }
 
-/// Implements [Documents](super::stubs::Documents) using a [gclient::ReqwestClient].
+/// Implements [Documents](super::stubs::Documents) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Documents {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Documents {
@@ -2050,8 +2050,8 @@ impl std::fmt::Debug for Documents {
 }
 
 impl Documents {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -2078,7 +2078,7 @@ impl super::stubs::Documents for Documents {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2097,7 +2097,7 @@ impl super::stubs::Documents for Documents {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2158,7 +2158,7 @@ impl super::stubs::Documents for Documents {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2176,7 +2176,7 @@ impl super::stubs::Documents for Documents {
                     "/v2/{}",
                     req.document
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("document"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("document"))?
                         .name
                 ),
             )
@@ -2192,7 +2192,7 @@ impl super::stubs::Documents for Documents {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -2252,7 +2252,7 @@ impl super::stubs::Documents for Documents {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2271,7 +2271,7 @@ impl super::stubs::Documents for Documents {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2293,7 +2293,7 @@ impl super::stubs::Documents for Documents {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2312,7 +2312,7 @@ impl super::stubs::Documents for Documents {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2331,7 +2331,7 @@ impl super::stubs::Documents for Documents {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2350,10 +2350,10 @@ impl super::stubs::Documents for Documents {
     }
 }
 
-/// Implements [EncryptionSpecService](super::stubs::EncryptionSpecService) using a [gclient::ReqwestClient].
+/// Implements [EncryptionSpecService](super::stubs::EncryptionSpecService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct EncryptionSpecService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for EncryptionSpecService {
@@ -2365,8 +2365,8 @@ impl std::fmt::Debug for EncryptionSpecService {
 }
 
 impl EncryptionSpecService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -2387,7 +2387,7 @@ impl super::stubs::EncryptionSpecService for EncryptionSpecService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2405,7 +2405,7 @@ impl super::stubs::EncryptionSpecService for EncryptionSpecService {
                     "/v2/{}:initialize",
                     req.encryption_spec
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("encryption_spec"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("encryption_spec"))?
                         .name
                 ),
             )
@@ -2435,7 +2435,7 @@ impl super::stubs::EncryptionSpecService for EncryptionSpecService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2454,7 +2454,7 @@ impl super::stubs::EncryptionSpecService for EncryptionSpecService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2476,7 +2476,7 @@ impl super::stubs::EncryptionSpecService for EncryptionSpecService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2495,7 +2495,7 @@ impl super::stubs::EncryptionSpecService for EncryptionSpecService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2514,7 +2514,7 @@ impl super::stubs::EncryptionSpecService for EncryptionSpecService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2533,10 +2533,10 @@ impl super::stubs::EncryptionSpecService for EncryptionSpecService {
     }
 }
 
-/// Implements [EntityTypes](super::stubs::EntityTypes) using a [gclient::ReqwestClient].
+/// Implements [EntityTypes](super::stubs::EntityTypes) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct EntityTypes {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for EntityTypes {
@@ -2548,8 +2548,8 @@ impl std::fmt::Debug for EntityTypes {
 }
 
 impl EntityTypes {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -2576,7 +2576,7 @@ impl super::stubs::EntityTypes for EntityTypes {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2596,7 +2596,7 @@ impl super::stubs::EntityTypes for EntityTypes {
             );
         let builder = builder.query(&[("languageCode", &req.language_code)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2637,7 +2637,7 @@ impl super::stubs::EntityTypes for EntityTypes {
                     "/v2/{}",
                     req.entity_type
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("entity_type"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("entity_type"))?
                         .name
                 ),
             )
@@ -2654,7 +2654,7 @@ impl super::stubs::EntityTypes for EntityTypes {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -2677,7 +2677,7 @@ impl super::stubs::EntityTypes for EntityTypes {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2799,7 +2799,7 @@ impl super::stubs::EntityTypes for EntityTypes {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2818,7 +2818,7 @@ impl super::stubs::EntityTypes for EntityTypes {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2840,7 +2840,7 @@ impl super::stubs::EntityTypes for EntityTypes {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2859,7 +2859,7 @@ impl super::stubs::EntityTypes for EntityTypes {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2878,7 +2878,7 @@ impl super::stubs::EntityTypes for EntityTypes {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2897,10 +2897,10 @@ impl super::stubs::EntityTypes for EntityTypes {
     }
 }
 
-/// Implements [Environments](super::stubs::Environments) using a [gclient::ReqwestClient].
+/// Implements [Environments](super::stubs::Environments) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Environments {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Environments {
@@ -2912,8 +2912,8 @@ impl std::fmt::Debug for Environments {
 }
 
 impl Environments {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -2939,7 +2939,7 @@ impl super::stubs::Environments for Environments {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2958,7 +2958,7 @@ impl super::stubs::Environments for Environments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2999,7 +2999,7 @@ impl super::stubs::Environments for Environments {
                     "/v2/{}",
                     req.environment
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("environment"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("environment"))?
                         .name
                 ),
             )
@@ -3015,7 +3015,7 @@ impl super::stubs::Environments for Environments {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[(
@@ -3042,7 +3042,7 @@ impl super::stubs::Environments for Environments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3063,7 +3063,7 @@ impl super::stubs::Environments for Environments {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3085,7 +3085,7 @@ impl super::stubs::Environments for Environments {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3104,7 +3104,7 @@ impl super::stubs::Environments for Environments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3126,7 +3126,7 @@ impl super::stubs::Environments for Environments {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3145,7 +3145,7 @@ impl super::stubs::Environments for Environments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3164,15 +3164,15 @@ impl super::stubs::Environments for Environments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [Fulfillments](super::stubs::Fulfillments) using a [gclient::ReqwestClient].
+/// Implements [Fulfillments](super::stubs::Fulfillments) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Fulfillments {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Fulfillments {
@@ -3184,8 +3184,8 @@ impl std::fmt::Debug for Fulfillments {
 }
 
 impl Fulfillments {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -3206,7 +3206,7 @@ impl super::stubs::Fulfillments for Fulfillments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3224,7 +3224,7 @@ impl super::stubs::Fulfillments for Fulfillments {
                     "/v2/{}",
                     req.fulfillment
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("fulfillment"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("fulfillment"))?
                         .name
                 ),
             )
@@ -3240,7 +3240,7 @@ impl super::stubs::Fulfillments for Fulfillments {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -3266,7 +3266,7 @@ impl super::stubs::Fulfillments for Fulfillments {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3285,7 +3285,7 @@ impl super::stubs::Fulfillments for Fulfillments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3307,7 +3307,7 @@ impl super::stubs::Fulfillments for Fulfillments {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3326,7 +3326,7 @@ impl super::stubs::Fulfillments for Fulfillments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3345,15 +3345,15 @@ impl super::stubs::Fulfillments for Fulfillments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [Generators](super::stubs::Generators) using a [gclient::ReqwestClient].
+/// Implements [Generators](super::stubs::Generators) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Generators {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Generators {
@@ -3365,8 +3365,8 @@ impl std::fmt::Debug for Generators {
 }
 
 impl Generators {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -3410,7 +3410,7 @@ impl super::stubs::Generators for Generators {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3434,7 +3434,7 @@ impl super::stubs::Generators for Generators {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3453,7 +3453,7 @@ impl super::stubs::Generators for Generators {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3471,7 +3471,7 @@ impl super::stubs::Generators for Generators {
                     "/v2/{}",
                     req.generator
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("generator"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("generator"))?
                         .name
                 ),
             )
@@ -3487,7 +3487,7 @@ impl super::stubs::Generators for Generators {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -3513,7 +3513,7 @@ impl super::stubs::Generators for Generators {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3532,7 +3532,7 @@ impl super::stubs::Generators for Generators {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3554,7 +3554,7 @@ impl super::stubs::Generators for Generators {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3573,7 +3573,7 @@ impl super::stubs::Generators for Generators {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3592,15 +3592,15 @@ impl super::stubs::Generators for Generators {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [Intents](super::stubs::Intents) using a [gclient::ReqwestClient].
+/// Implements [Intents](super::stubs::Intents) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Intents {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Intents {
@@ -3612,8 +3612,8 @@ impl std::fmt::Debug for Intents {
 }
 
 impl Intents {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -3638,7 +3638,7 @@ impl super::stubs::Intents for Intents {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3659,7 +3659,7 @@ impl super::stubs::Intents for Intents {
         let builder = builder.query(&[("languageCode", &req.language_code)]);
         let builder = builder.query(&[("intentView", &req.intent_view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3696,7 +3696,7 @@ impl super::stubs::Intents for Intents {
                     "/v2/{}",
                     req.intent
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("intent"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("intent"))?
                         .name
                 ),
             )
@@ -3713,7 +3713,7 @@ impl super::stubs::Intents for Intents {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("intentView", &req.intent_view.value())]);
@@ -3735,7 +3735,7 @@ impl super::stubs::Intents for Intents {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3797,7 +3797,7 @@ impl super::stubs::Intents for Intents {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3816,7 +3816,7 @@ impl super::stubs::Intents for Intents {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3838,7 +3838,7 @@ impl super::stubs::Intents for Intents {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3857,7 +3857,7 @@ impl super::stubs::Intents for Intents {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3876,7 +3876,7 @@ impl super::stubs::Intents for Intents {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3895,10 +3895,10 @@ impl super::stubs::Intents for Intents {
     }
 }
 
-/// Implements [KnowledgeBases](super::stubs::KnowledgeBases) using a [gclient::ReqwestClient].
+/// Implements [KnowledgeBases](super::stubs::KnowledgeBases) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct KnowledgeBases {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for KnowledgeBases {
@@ -3910,8 +3910,8 @@ impl std::fmt::Debug for KnowledgeBases {
 }
 
 impl KnowledgeBases {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -3938,7 +3938,7 @@ impl super::stubs::KnowledgeBases for KnowledgeBases {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3957,7 +3957,7 @@ impl super::stubs::KnowledgeBases for KnowledgeBases {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -3999,7 +3999,7 @@ impl super::stubs::KnowledgeBases for KnowledgeBases {
             );
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4017,7 +4017,7 @@ impl super::stubs::KnowledgeBases for KnowledgeBases {
                     "/v2/{}",
                     req.knowledge_base
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("knowledge_base"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("knowledge_base"))?
                         .name
                 ),
             )
@@ -4033,7 +4033,7 @@ impl super::stubs::KnowledgeBases for KnowledgeBases {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -4059,7 +4059,7 @@ impl super::stubs::KnowledgeBases for KnowledgeBases {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4078,7 +4078,7 @@ impl super::stubs::KnowledgeBases for KnowledgeBases {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4100,7 +4100,7 @@ impl super::stubs::KnowledgeBases for KnowledgeBases {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4119,7 +4119,7 @@ impl super::stubs::KnowledgeBases for KnowledgeBases {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4138,15 +4138,15 @@ impl super::stubs::KnowledgeBases for KnowledgeBases {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [Participants](super::stubs::Participants) using a [gclient::ReqwestClient].
+/// Implements [Participants](super::stubs::Participants) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Participants {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Participants {
@@ -4158,8 +4158,8 @@ impl std::fmt::Debug for Participants {
 }
 
 impl Participants {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -4202,7 +4202,7 @@ impl super::stubs::Participants for Participants {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4226,7 +4226,7 @@ impl super::stubs::Participants for Participants {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4244,7 +4244,7 @@ impl super::stubs::Participants for Participants {
                     "/v2/{}",
                     req.participant
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("participant"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("participant"))?
                         .name
                 ),
             )
@@ -4260,7 +4260,7 @@ impl super::stubs::Participants for Participants {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -4386,7 +4386,7 @@ impl super::stubs::Participants for Participants {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4405,7 +4405,7 @@ impl super::stubs::Participants for Participants {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4427,7 +4427,7 @@ impl super::stubs::Participants for Participants {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4446,7 +4446,7 @@ impl super::stubs::Participants for Participants {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4465,15 +4465,15 @@ impl super::stubs::Participants for Participants {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [Sessions](super::stubs::Sessions) using a [gclient::ReqwestClient].
+/// Implements [Sessions](super::stubs::Sessions) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Sessions {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Sessions {
@@ -4485,8 +4485,8 @@ impl std::fmt::Debug for Sessions {
 }
 
 impl Sessions {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -4530,7 +4530,7 @@ impl super::stubs::Sessions for Sessions {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4549,7 +4549,7 @@ impl super::stubs::Sessions for Sessions {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4571,7 +4571,7 @@ impl super::stubs::Sessions for Sessions {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4590,7 +4590,7 @@ impl super::stubs::Sessions for Sessions {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4609,15 +4609,15 @@ impl super::stubs::Sessions for Sessions {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [SessionEntityTypes](super::stubs::SessionEntityTypes) using a [gclient::ReqwestClient].
+/// Implements [SessionEntityTypes](super::stubs::SessionEntityTypes) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct SessionEntityTypes {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for SessionEntityTypes {
@@ -4629,8 +4629,8 @@ impl std::fmt::Debug for SessionEntityTypes {
 }
 
 impl SessionEntityTypes {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -4656,7 +4656,7 @@ impl super::stubs::SessionEntityTypes for SessionEntityTypes {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4675,7 +4675,7 @@ impl super::stubs::SessionEntityTypes for SessionEntityTypes {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4715,7 +4715,7 @@ impl super::stubs::SessionEntityTypes for SessionEntityTypes {
                     "/v2/{}",
                     req.session_entity_type
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("session_entity_type"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("session_entity_type"))?
                         .name
                 ),
             )
@@ -4731,7 +4731,7 @@ impl super::stubs::SessionEntityTypes for SessionEntityTypes {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -4754,7 +4754,7 @@ impl super::stubs::SessionEntityTypes for SessionEntityTypes {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4776,7 +4776,7 @@ impl super::stubs::SessionEntityTypes for SessionEntityTypes {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4795,7 +4795,7 @@ impl super::stubs::SessionEntityTypes for SessionEntityTypes {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4817,7 +4817,7 @@ impl super::stubs::SessionEntityTypes for SessionEntityTypes {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4836,7 +4836,7 @@ impl super::stubs::SessionEntityTypes for SessionEntityTypes {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4855,15 +4855,15 @@ impl super::stubs::SessionEntityTypes for SessionEntityTypes {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [Versions](super::stubs::Versions) using a [gclient::ReqwestClient].
+/// Implements [Versions](super::stubs::Versions) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Versions {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Versions {
@@ -4875,8 +4875,8 @@ impl std::fmt::Debug for Versions {
 }
 
 impl Versions {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -4899,7 +4899,7 @@ impl super::stubs::Versions for Versions {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4918,7 +4918,7 @@ impl super::stubs::Versions for Versions {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -4958,7 +4958,7 @@ impl super::stubs::Versions for Versions {
                     "/v2/{}",
                     req.version
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("version"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("version"))?
                         .name
                 ),
             )
@@ -4974,7 +4974,7 @@ impl super::stubs::Versions for Versions {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -4997,7 +4997,7 @@ impl super::stubs::Versions for Versions {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5019,7 +5019,7 @@ impl super::stubs::Versions for Versions {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5038,7 +5038,7 @@ impl super::stubs::Versions for Versions {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5060,7 +5060,7 @@ impl super::stubs::Versions for Versions {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5079,7 +5079,7 @@ impl super::stubs::Versions for Versions {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -5098,7 +5098,7 @@ impl super::stubs::Versions for Versions {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/cloud/discoveryengine/v1/Cargo.toml b/src/generated/cloud/discoveryengine/v1/Cargo.toml
index 7a17e7ad8..cc4d068d4 100644
--- a/src/generated/cloud/discoveryengine/v1/Cargo.toml
+++ b/src/generated/cloud/discoveryengine/v1/Cargo.toml
@@ -30,7 +30,7 @@ api        = { version = "0.2", path = "../../../../../src/generated/api/types",
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/discoveryengine/v1/src/model.rs b/src/generated/cloud/discoveryengine/v1/src/model.rs
index a70a00429..7b9823c09 100755
--- a/src/generated/cloud/discoveryengine/v1/src/model.rs
+++ b/src/generated/cloud/discoveryengine/v1/src/model.rs
@@ -21,7 +21,7 @@ extern crate api;
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate longrunning;
diff --git a/src/generated/cloud/discoveryengine/v1/src/transport.rs b/src/generated/cloud/discoveryengine/v1/src/transport.rs
index 6745e5eb6..48fa61389 100755
--- a/src/generated/cloud/discoveryengine/v1/src/transport.rs
+++ b/src/generated/cloud/discoveryengine/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [CompletionService](super::stubs::CompletionService) using a [gclient::ReqwestClient].
+/// Implements [CompletionService](super::stubs::CompletionService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct CompletionService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for CompletionService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for CompletionService {
 }
 
 impl CompletionService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::CompletionService for CompletionService {
         let builder = builder.query(&[("userPseudoId", &req.user_pseudo_id)]);
         let builder = builder.query(&[("includeTailSuggestions", &req.include_tail_suggestions)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -164,7 +164,7 @@ impl super::stubs::CompletionService for CompletionService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -183,7 +183,7 @@ impl super::stubs::CompletionService for CompletionService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -219,10 +219,10 @@ impl super::stubs::CompletionService for CompletionService {
     }
 }
 
-/// Implements [ControlService](super::stubs::ControlService) using a [gclient::ReqwestClient].
+/// Implements [ControlService](super::stubs::ControlService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ControlService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ControlService {
@@ -234,8 +234,8 @@ impl std::fmt::Debug for ControlService {
 }
 
 impl ControlService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -279,7 +279,7 @@ impl super::stubs::ControlService for ControlService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -297,7 +297,7 @@ impl super::stubs::ControlService for ControlService {
                     "/v1/{}",
                     req.control
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("control"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("control"))?
                         .name
                 ),
             )
@@ -313,7 +313,7 @@ impl super::stubs::ControlService for ControlService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -336,7 +336,7 @@ impl super::stubs::ControlService for ControlService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -358,7 +358,7 @@ impl super::stubs::ControlService for ControlService {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -380,7 +380,7 @@ impl super::stubs::ControlService for ControlService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -399,7 +399,7 @@ impl super::stubs::ControlService for ControlService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -421,10 +421,10 @@ impl super::stubs::ControlService for ControlService {
     }
 }
 
-/// Implements [ConversationalSearchService](super::stubs::ConversationalSearchService) using a [gclient::ReqwestClient].
+/// Implements [ConversationalSearchService](super::stubs::ConversationalSearchService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ConversationalSearchService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ConversationalSearchService {
@@ -436,8 +436,8 @@ impl std::fmt::Debug for ConversationalSearchService {
 }
 
 impl ConversationalSearchService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -497,7 +497,7 @@ impl super::stubs::ConversationalSearchService for ConversationalSearchService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -515,7 +515,7 @@ impl super::stubs::ConversationalSearchService for ConversationalSearchService {
                     "/v1/{}",
                     req.conversation
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("conversation"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("conversation"))?
                         .name
                 ),
             )
@@ -531,7 +531,7 @@ impl super::stubs::ConversationalSearchService for ConversationalSearchService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -554,7 +554,7 @@ impl super::stubs::ConversationalSearchService for ConversationalSearchService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -580,7 +580,7 @@ impl super::stubs::ConversationalSearchService for ConversationalSearchService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -619,7 +619,7 @@ impl super::stubs::ConversationalSearchService for ConversationalSearchService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -660,7 +660,7 @@ impl super::stubs::ConversationalSearchService for ConversationalSearchService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -678,7 +678,7 @@ impl super::stubs::ConversationalSearchService for ConversationalSearchService {
                     "/v1/{}",
                     req.session
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("session"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("session"))?
                         .name
                 ),
             )
@@ -694,7 +694,7 @@ impl super::stubs::ConversationalSearchService for ConversationalSearchService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -717,7 +717,7 @@ impl super::stubs::ConversationalSearchService for ConversationalSearchService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -740,7 +740,7 @@ impl super::stubs::ConversationalSearchService for ConversationalSearchService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -762,7 +762,7 @@ impl super::stubs::ConversationalSearchService for ConversationalSearchService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -781,7 +781,7 @@ impl super::stubs::ConversationalSearchService for ConversationalSearchService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -803,10 +803,10 @@ impl super::stubs::ConversationalSearchService for ConversationalSearchService {
     }
 }
 
-/// Implements [DataStoreService](super::stubs::DataStoreService) using a [gclient::ReqwestClient].
+/// Implements [DataStoreService](super::stubs::DataStoreService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct DataStoreService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for DataStoreService {
@@ -818,8 +818,8 @@ impl std::fmt::Debug for DataStoreService {
 }
 
 impl DataStoreService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -869,7 +869,7 @@ impl super::stubs::DataStoreService for DataStoreService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -894,7 +894,7 @@ impl super::stubs::DataStoreService for DataStoreService {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -913,7 +913,7 @@ impl super::stubs::DataStoreService for DataStoreService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -931,7 +931,7 @@ impl super::stubs::DataStoreService for DataStoreService {
                     "/v1/{}",
                     req.data_store
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("data_store"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("data_store"))?
                         .name
                 ),
             )
@@ -947,7 +947,7 @@ impl super::stubs::DataStoreService for DataStoreService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -973,7 +973,7 @@ impl super::stubs::DataStoreService for DataStoreService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -992,7 +992,7 @@ impl super::stubs::DataStoreService for DataStoreService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1028,10 +1028,10 @@ impl super::stubs::DataStoreService for DataStoreService {
     }
 }
 
-/// Implements [DocumentService](super::stubs::DocumentService) using a [gclient::ReqwestClient].
+/// Implements [DocumentService](super::stubs::DocumentService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct DocumentService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for DocumentService {
@@ -1043,8 +1043,8 @@ impl std::fmt::Debug for DocumentService {
 }
 
 impl DocumentService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1065,7 +1065,7 @@ impl super::stubs::DocumentService for DocumentService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1089,7 +1089,7 @@ impl super::stubs::DocumentService for DocumentService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1130,7 +1130,7 @@ impl super::stubs::DocumentService for DocumentService {
                     "/v1/{}",
                     req.document
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("document"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("document"))?
                         .name
                 ),
             )
@@ -1147,7 +1147,7 @@ impl super::stubs::DocumentService for DocumentService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1170,7 +1170,7 @@ impl super::stubs::DocumentService for DocumentService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1238,11 +1238,11 @@ impl super::stubs::DocumentService for DocumentService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "matcher")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1264,7 +1264,7 @@ impl super::stubs::DocumentService for DocumentService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1283,7 +1283,7 @@ impl super::stubs::DocumentService for DocumentService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1319,10 +1319,10 @@ impl super::stubs::DocumentService for DocumentService {
     }
 }
 
-/// Implements [EngineService](super::stubs::EngineService) using a [gclient::ReqwestClient].
+/// Implements [EngineService](super::stubs::EngineService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct EngineService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for EngineService {
@@ -1334,8 +1334,8 @@ impl std::fmt::Debug for EngineService {
 }
 
 impl EngineService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1374,7 +1374,7 @@ impl super::stubs::EngineService for EngineService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1392,7 +1392,7 @@ impl super::stubs::EngineService for EngineService {
                     "/v1/{}",
                     req.engine
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("engine"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("engine"))?
                         .name
                 ),
             )
@@ -1408,7 +1408,7 @@ impl super::stubs::EngineService for EngineService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.engine), options).await
@@ -1429,7 +1429,7 @@ impl super::stubs::EngineService for EngineService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1451,7 +1451,7 @@ impl super::stubs::EngineService for EngineService {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1473,7 +1473,7 @@ impl super::stubs::EngineService for EngineService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1492,7 +1492,7 @@ impl super::stubs::EngineService for EngineService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1528,10 +1528,10 @@ impl super::stubs::EngineService for EngineService {
     }
 }
 
-/// Implements [GroundedGenerationService](super::stubs::GroundedGenerationService) using a [gclient::ReqwestClient].
+/// Implements [GroundedGenerationService](super::stubs::GroundedGenerationService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct GroundedGenerationService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for GroundedGenerationService {
@@ -1543,8 +1543,8 @@ impl std::fmt::Debug for GroundedGenerationService {
 }
 
 impl GroundedGenerationService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1608,7 +1608,7 @@ impl super::stubs::GroundedGenerationService for GroundedGenerationService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1627,7 +1627,7 @@ impl super::stubs::GroundedGenerationService for GroundedGenerationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1649,10 +1649,10 @@ impl super::stubs::GroundedGenerationService for GroundedGenerationService {
     }
 }
 
-/// Implements [ProjectService](super::stubs::ProjectService) using a [gclient::ReqwestClient].
+/// Implements [ProjectService](super::stubs::ProjectService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ProjectService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ProjectService {
@@ -1664,8 +1664,8 @@ impl std::fmt::Debug for ProjectService {
 }
 
 impl ProjectService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1706,7 +1706,7 @@ impl super::stubs::ProjectService for ProjectService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1725,7 +1725,7 @@ impl super::stubs::ProjectService for ProjectService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1761,10 +1761,10 @@ impl super::stubs::ProjectService for ProjectService {
     }
 }
 
-/// Implements [RankService](super::stubs::RankService) using a [gclient::ReqwestClient].
+/// Implements [RankService](super::stubs::RankService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct RankService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for RankService {
@@ -1776,8 +1776,8 @@ impl std::fmt::Debug for RankService {
 }
 
 impl RankService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1821,7 +1821,7 @@ impl super::stubs::RankService for RankService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1840,7 +1840,7 @@ impl super::stubs::RankService for RankService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1862,10 +1862,10 @@ impl super::stubs::RankService for RankService {
     }
 }
 
-/// Implements [RecommendationService](super::stubs::RecommendationService) using a [gclient::ReqwestClient].
+/// Implements [RecommendationService](super::stubs::RecommendationService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct RecommendationService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for RecommendationService {
@@ -1877,8 +1877,8 @@ impl std::fmt::Debug for RecommendationService {
 }
 
 impl RecommendationService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1922,7 +1922,7 @@ impl super::stubs::RecommendationService for RecommendationService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1941,7 +1941,7 @@ impl super::stubs::RecommendationService for RecommendationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1963,10 +1963,10 @@ impl super::stubs::RecommendationService for RecommendationService {
     }
 }
 
-/// Implements [SchemaService](super::stubs::SchemaService) using a [gclient::ReqwestClient].
+/// Implements [SchemaService](super::stubs::SchemaService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct SchemaService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for SchemaService {
@@ -1978,8 +1978,8 @@ impl std::fmt::Debug for SchemaService {
 }
 
 impl SchemaService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -2000,7 +2000,7 @@ impl super::stubs::SchemaService for SchemaService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2021,7 +2021,7 @@ impl super::stubs::SchemaService for SchemaService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2057,7 +2057,7 @@ impl super::stubs::SchemaService for SchemaService {
                     "/v1/{}",
                     req.schema
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("schema"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("schema"))?
                         .name
                 ),
             )
@@ -2085,7 +2085,7 @@ impl super::stubs::SchemaService for SchemaService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2107,7 +2107,7 @@ impl super::stubs::SchemaService for SchemaService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2126,7 +2126,7 @@ impl super::stubs::SchemaService for SchemaService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2162,10 +2162,10 @@ impl super::stubs::SchemaService for SchemaService {
     }
 }
 
-/// Implements [SearchService](super::stubs::SearchService) using a [gclient::ReqwestClient].
+/// Implements [SearchService](super::stubs::SearchService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct SearchService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for SearchService {
@@ -2177,8 +2177,8 @@ impl std::fmt::Debug for SearchService {
 }
 
 impl SearchService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -2242,7 +2242,7 @@ impl super::stubs::SearchService for SearchService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2261,7 +2261,7 @@ impl super::stubs::SearchService for SearchService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2283,10 +2283,10 @@ impl super::stubs::SearchService for SearchService {
     }
 }
 
-/// Implements [SearchTuningService](super::stubs::SearchTuningService) using a [gclient::ReqwestClient].
+/// Implements [SearchTuningService](super::stubs::SearchTuningService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct SearchTuningService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for SearchTuningService {
@@ -2298,8 +2298,8 @@ impl std::fmt::Debug for SearchTuningService {
 }
 
 impl SearchTuningService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -2343,7 +2343,7 @@ impl super::stubs::SearchTuningService for SearchTuningService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2365,7 +2365,7 @@ impl super::stubs::SearchTuningService for SearchTuningService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2384,7 +2384,7 @@ impl super::stubs::SearchTuningService for SearchTuningService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2420,10 +2420,10 @@ impl super::stubs::SearchTuningService for SearchTuningService {
     }
 }
 
-/// Implements [SiteSearchEngineService](super::stubs::SiteSearchEngineService) using a [gclient::ReqwestClient].
+/// Implements [SiteSearchEngineService](super::stubs::SiteSearchEngineService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct SiteSearchEngineService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for SiteSearchEngineService {
@@ -2435,8 +2435,8 @@ impl std::fmt::Debug for SiteSearchEngineService {
 }
 
 impl SiteSearchEngineService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -2457,7 +2457,7 @@ impl super::stubs::SiteSearchEngineService for SiteSearchEngineService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2518,7 +2518,7 @@ impl super::stubs::SiteSearchEngineService for SiteSearchEngineService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2536,7 +2536,7 @@ impl super::stubs::SiteSearchEngineService for SiteSearchEngineService {
                     "/v1/{}",
                     req.target_site
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("target_site"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("target_site"))?
                         .name
                 ),
             )
@@ -2565,7 +2565,7 @@ impl super::stubs::SiteSearchEngineService for SiteSearchEngineService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2589,7 +2589,7 @@ impl super::stubs::SiteSearchEngineService for SiteSearchEngineService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2696,7 +2696,7 @@ impl super::stubs::SiteSearchEngineService for SiteSearchEngineService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2718,7 +2718,7 @@ impl super::stubs::SiteSearchEngineService for SiteSearchEngineService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2737,7 +2737,7 @@ impl super::stubs::SiteSearchEngineService for SiteSearchEngineService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2773,10 +2773,10 @@ impl super::stubs::SiteSearchEngineService for SiteSearchEngineService {
     }
 }
 
-/// Implements [UserEventService](super::stubs::UserEventService) using a [gclient::ReqwestClient].
+/// Implements [UserEventService](super::stubs::UserEventService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct UserEventService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for UserEventService {
@@ -2788,8 +2788,8 @@ impl std::fmt::Debug for UserEventService {
 }
 
 impl UserEventService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -2845,7 +2845,7 @@ impl super::stubs::UserEventService for UserEventService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("ets", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2907,7 +2907,7 @@ impl super::stubs::UserEventService for UserEventService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2926,7 +2926,7 @@ impl super::stubs::UserEventService for UserEventService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/documentai/v1/Cargo.toml b/src/generated/cloud/documentai/v1/Cargo.toml
index 115944d8b..f15698f31 100644
--- a/src/generated/cloud/documentai/v1/Cargo.toml
+++ b/src/generated/cloud/documentai/v1/Cargo.toml
@@ -30,7 +30,7 @@ api        = { version = "0.2", path = "../../../../../src/generated/api/types",
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/documentai/v1/src/model.rs b/src/generated/cloud/documentai/v1/src/model.rs
index ff953b836..a590a0285 100755
--- a/src/generated/cloud/documentai/v1/src/model.rs
+++ b/src/generated/cloud/documentai/v1/src/model.rs
@@ -21,7 +21,7 @@ extern crate api;
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/documentai/v1/src/transport.rs b/src/generated/cloud/documentai/v1/src/transport.rs
index 54daf42d0..2b10a118a 100755
--- a/src/generated/cloud/documentai/v1/src/transport.rs
+++ b/src/generated/cloud/documentai/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [DocumentProcessorService](super::stubs::DocumentProcessorService) using a [gclient::ReqwestClient].
+/// Implements [DocumentProcessorService](super::stubs::DocumentProcessorService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct DocumentProcessorService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for DocumentProcessorService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for DocumentProcessorService {
 }
 
 impl DocumentProcessorService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -95,7 +95,7 @@ impl super::stubs::DocumentProcessorService for DocumentProcessorService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -119,7 +119,7 @@ impl super::stubs::DocumentProcessorService for DocumentProcessorService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -138,7 +138,7 @@ impl super::stubs::DocumentProcessorService for DocumentProcessorService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -162,7 +162,7 @@ impl super::stubs::DocumentProcessorService for DocumentProcessorService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -181,7 +181,7 @@ impl super::stubs::DocumentProcessorService for DocumentProcessorService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -220,7 +220,7 @@ impl super::stubs::DocumentProcessorService for DocumentProcessorService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -244,7 +244,7 @@ impl super::stubs::DocumentProcessorService for DocumentProcessorService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -263,7 +263,7 @@ impl super::stubs::DocumentProcessorService for DocumentProcessorService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -338,7 +338,7 @@ impl super::stubs::DocumentProcessorService for DocumentProcessorService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -451,7 +451,7 @@ impl super::stubs::DocumentProcessorService for DocumentProcessorService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -475,7 +475,7 @@ impl super::stubs::DocumentProcessorService for DocumentProcessorService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -497,7 +497,7 @@ impl super::stubs::DocumentProcessorService for DocumentProcessorService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -516,7 +516,7 @@ impl super::stubs::DocumentProcessorService for DocumentProcessorService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -538,7 +538,7 @@ impl super::stubs::DocumentProcessorService for DocumentProcessorService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -557,7 +557,7 @@ impl super::stubs::DocumentProcessorService for DocumentProcessorService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -576,7 +576,7 @@ impl super::stubs::DocumentProcessorService for DocumentProcessorService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/domains/v1/Cargo.toml b/src/generated/cloud/domains/v1/Cargo.toml
index 7f0707d62..5df0aa65e 100644
--- a/src/generated/cloud/domains/v1/Cargo.toml
+++ b/src/generated/cloud/domains/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/domains/v1/src/model.rs b/src/generated/cloud/domains/v1/src/model.rs
index 22a4c1264..e390ef08a 100755
--- a/src/generated/cloud/domains/v1/src/model.rs
+++ b/src/generated/cloud/domains/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate longrunning;
diff --git a/src/generated/cloud/domains/v1/src/transport.rs b/src/generated/cloud/domains/v1/src/transport.rs
index 25f11811b..063284736 100755
--- a/src/generated/cloud/domains/v1/src/transport.rs
+++ b/src/generated/cloud/domains/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [Domains](super::stubs::Domains) using a [gclient::ReqwestClient].
+/// Implements [Domains](super::stubs::Domains) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Domains {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Domains {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for Domains {
 }
 
 impl Domains {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -59,7 +59,7 @@ impl super::stubs::Domains for Domains {
             );
         let builder = builder.query(&[("query", &req.query)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -85,7 +85,7 @@ impl super::stubs::Domains for Domains {
             );
         let builder = builder.query(&[("domainName", &req.domain_name)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -131,7 +131,7 @@ impl super::stubs::Domains for Domains {
             );
         let builder = builder.query(&[("domainName", &req.domain_name)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -176,7 +176,7 @@ impl super::stubs::Domains for Domains {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -195,7 +195,7 @@ impl super::stubs::Domains for Domains {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -213,7 +213,7 @@ impl super::stubs::Domains for Domains {
                     "/v1/{}",
                     req.registration
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("registration"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("registration"))?
                         .name
                 ),
             )
@@ -229,7 +229,7 @@ impl super::stubs::Domains for Domains {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -329,7 +329,7 @@ impl super::stubs::Domains for Domains {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -351,7 +351,7 @@ impl super::stubs::Domains for Domains {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -393,7 +393,7 @@ impl super::stubs::Domains for Domains {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -412,7 +412,7 @@ impl super::stubs::Domains for Domains {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/edgecontainer/v1/Cargo.toml b/src/generated/cloud/edgecontainer/v1/Cargo.toml
index 8fd1c6d28..3af660db4 100644
--- a/src/generated/cloud/edgecontainer/v1/Cargo.toml
+++ b/src/generated/cloud/edgecontainer/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/edgecontainer/v1/src/model.rs b/src/generated/cloud/edgecontainer/v1/src/model.rs
index 0ed12f5fa..d0cbaf7ba 100755
--- a/src/generated/cloud/edgecontainer/v1/src/model.rs
+++ b/src/generated/cloud/edgecontainer/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate location;
 extern crate longrunning;
diff --git a/src/generated/cloud/edgecontainer/v1/src/transport.rs b/src/generated/cloud/edgecontainer/v1/src/transport.rs
index 5359fb667..5b9c7b034 100755
--- a/src/generated/cloud/edgecontainer/v1/src/transport.rs
+++ b/src/generated/cloud/edgecontainer/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [EdgeContainer](super::stubs::EdgeContainer) using a [gclient::ReqwestClient].
+/// Implements [EdgeContainer](super::stubs::EdgeContainer) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct EdgeContainer {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for EdgeContainer {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for EdgeContainer {
 }
 
 impl EdgeContainer {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -59,7 +59,7 @@ impl super::stubs::EdgeContainer for EdgeContainer {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -78,7 +78,7 @@ impl super::stubs::EdgeContainer for EdgeContainer {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -120,7 +120,7 @@ impl super::stubs::EdgeContainer for EdgeContainer {
                     "/v1/{}",
                     req.cluster
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("cluster"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("cluster"))?
                         .name
                 ),
             )
@@ -136,7 +136,7 @@ impl super::stubs::EdgeContainer for EdgeContainer {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -178,7 +178,7 @@ impl super::stubs::EdgeContainer for EdgeContainer {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -200,7 +200,7 @@ impl super::stubs::EdgeContainer for EdgeContainer {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -222,7 +222,7 @@ impl super::stubs::EdgeContainer for EdgeContainer {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -248,7 +248,7 @@ impl super::stubs::EdgeContainer for EdgeContainer {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -267,7 +267,7 @@ impl super::stubs::EdgeContainer for EdgeContainer {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -309,7 +309,7 @@ impl super::stubs::EdgeContainer for EdgeContainer {
                     "/v1/{}",
                     req.node_pool
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("node_pool"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("node_pool"))?
                         .name
                 ),
             )
@@ -325,7 +325,7 @@ impl super::stubs::EdgeContainer for EdgeContainer {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -350,7 +350,7 @@ impl super::stubs::EdgeContainer for EdgeContainer {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -373,7 +373,7 @@ impl super::stubs::EdgeContainer for EdgeContainer {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -392,7 +392,7 @@ impl super::stubs::EdgeContainer for EdgeContainer {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -418,7 +418,7 @@ impl super::stubs::EdgeContainer for EdgeContainer {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -437,7 +437,7 @@ impl super::stubs::EdgeContainer for EdgeContainer {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -481,7 +481,7 @@ impl super::stubs::EdgeContainer for EdgeContainer {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -503,7 +503,7 @@ impl super::stubs::EdgeContainer for EdgeContainer {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -525,7 +525,7 @@ impl super::stubs::EdgeContainer for EdgeContainer {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -544,7 +544,7 @@ impl super::stubs::EdgeContainer for EdgeContainer {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -566,7 +566,7 @@ impl super::stubs::EdgeContainer for EdgeContainer {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -585,7 +585,7 @@ impl super::stubs::EdgeContainer for EdgeContainer {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -604,7 +604,7 @@ impl super::stubs::EdgeContainer for EdgeContainer {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/edgenetwork/v1/Cargo.toml b/src/generated/cloud/edgenetwork/v1/Cargo.toml
index 2edeb0c0c..161d4710a 100644
--- a/src/generated/cloud/edgenetwork/v1/Cargo.toml
+++ b/src/generated/cloud/edgenetwork/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/edgenetwork/v1/src/model.rs b/src/generated/cloud/edgenetwork/v1/src/model.rs
index b7ad02b1c..248667fa3 100755
--- a/src/generated/cloud/edgenetwork/v1/src/model.rs
+++ b/src/generated/cloud/edgenetwork/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate location;
 extern crate longrunning;
diff --git a/src/generated/cloud/edgenetwork/v1/src/transport.rs b/src/generated/cloud/edgenetwork/v1/src/transport.rs
index 57753417f..8a37d8cff 100755
--- a/src/generated/cloud/edgenetwork/v1/src/transport.rs
+++ b/src/generated/cloud/edgenetwork/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [EdgeNetwork](super::stubs::EdgeNetwork) using a [gclient::ReqwestClient].
+/// Implements [EdgeNetwork](super::stubs::EdgeNetwork) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct EdgeNetwork {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for EdgeNetwork {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for EdgeNetwork {
 }
 
 impl EdgeNetwork {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -79,7 +79,7 @@ impl super::stubs::EdgeNetwork for EdgeNetwork {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -98,7 +98,7 @@ impl super::stubs::EdgeNetwork for EdgeNetwork {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -121,7 +121,7 @@ impl super::stubs::EdgeNetwork for EdgeNetwork {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -140,7 +140,7 @@ impl super::stubs::EdgeNetwork for EdgeNetwork {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -159,7 +159,7 @@ impl super::stubs::EdgeNetwork for EdgeNetwork {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -203,7 +203,7 @@ impl super::stubs::EdgeNetwork for EdgeNetwork {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -226,7 +226,7 @@ impl super::stubs::EdgeNetwork for EdgeNetwork {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -245,7 +245,7 @@ impl super::stubs::EdgeNetwork for EdgeNetwork {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -282,7 +282,7 @@ impl super::stubs::EdgeNetwork for EdgeNetwork {
                     "/v1/{}",
                     req.subnet
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("subnet"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("subnet"))?
                         .name
                 ),
             )
@@ -298,7 +298,7 @@ impl super::stubs::EdgeNetwork for EdgeNetwork {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -321,7 +321,7 @@ impl super::stubs::EdgeNetwork for EdgeNetwork {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -347,7 +347,7 @@ impl super::stubs::EdgeNetwork for EdgeNetwork {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -366,7 +366,7 @@ impl super::stubs::EdgeNetwork for EdgeNetwork {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -385,7 +385,7 @@ impl super::stubs::EdgeNetwork for EdgeNetwork {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -411,7 +411,7 @@ impl super::stubs::EdgeNetwork for EdgeNetwork {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -430,7 +430,7 @@ impl super::stubs::EdgeNetwork for EdgeNetwork {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -475,7 +475,7 @@ impl super::stubs::EdgeNetwork for EdgeNetwork {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -498,7 +498,7 @@ impl super::stubs::EdgeNetwork for EdgeNetwork {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -517,7 +517,7 @@ impl super::stubs::EdgeNetwork for EdgeNetwork {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -536,7 +536,7 @@ impl super::stubs::EdgeNetwork for EdgeNetwork {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -573,7 +573,7 @@ impl super::stubs::EdgeNetwork for EdgeNetwork {
                     "/v1/{}",
                     req.router
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("router"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("router"))?
                         .name
                 ),
             )
@@ -589,7 +589,7 @@ impl super::stubs::EdgeNetwork for EdgeNetwork {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -612,7 +612,7 @@ impl super::stubs::EdgeNetwork for EdgeNetwork {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -634,7 +634,7 @@ impl super::stubs::EdgeNetwork for EdgeNetwork {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -653,7 +653,7 @@ impl super::stubs::EdgeNetwork for EdgeNetwork {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -675,7 +675,7 @@ impl super::stubs::EdgeNetwork for EdgeNetwork {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -694,7 +694,7 @@ impl super::stubs::EdgeNetwork for EdgeNetwork {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -713,7 +713,7 @@ impl super::stubs::EdgeNetwork for EdgeNetwork {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/essentialcontacts/v1/Cargo.toml b/src/generated/cloud/essentialcontacts/v1/Cargo.toml
index a885bf898..3f93e50ce 100644
--- a/src/generated/cloud/essentialcontacts/v1/Cargo.toml
+++ b/src/generated/cloud/essentialcontacts/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
 serde      = { version = "1", features = ["serde_derive"] }
diff --git a/src/generated/cloud/essentialcontacts/v1/src/model.rs b/src/generated/cloud/essentialcontacts/v1/src/model.rs
index e65657654..821e922f5 100755
--- a/src/generated/cloud/essentialcontacts/v1/src/model.rs
+++ b/src/generated/cloud/essentialcontacts/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate reqwest;
 extern crate serde;
diff --git a/src/generated/cloud/essentialcontacts/v1/src/transport.rs b/src/generated/cloud/essentialcontacts/v1/src/transport.rs
index 85b056812..d1cc275aa 100755
--- a/src/generated/cloud/essentialcontacts/v1/src/transport.rs
+++ b/src/generated/cloud/essentialcontacts/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [EssentialContactsService](super::stubs::EssentialContactsService) using a [gclient::ReqwestClient].
+/// Implements [EssentialContactsService](super::stubs::EssentialContactsService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct EssentialContactsService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for EssentialContactsService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for EssentialContactsService {
 }
 
 impl EssentialContactsService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -76,7 +76,7 @@ impl super::stubs::EssentialContactsService for EssentialContactsService {
                     "/v1/{}",
                     req.contact
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("contact"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("contact"))?
                         .name
                 ),
             )
@@ -92,7 +92,7 @@ impl super::stubs::EssentialContactsService for EssentialContactsService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -117,7 +117,7 @@ impl super::stubs::EssentialContactsService for EssentialContactsService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -136,7 +136,7 @@ impl super::stubs::EssentialContactsService for EssentialContactsService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -155,7 +155,7 @@ impl super::stubs::EssentialContactsService for EssentialContactsService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -185,7 +185,7 @@ impl super::stubs::EssentialContactsService for EssentialContactsService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/eventarc/v1/Cargo.toml b/src/generated/cloud/eventarc/v1/Cargo.toml
index 8d91539de..9782d73eb 100644
--- a/src/generated/cloud/eventarc/v1/Cargo.toml
+++ b/src/generated/cloud/eventarc/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/eventarc/v1/src/model.rs b/src/generated/cloud/eventarc/v1/src/model.rs
index 50f1632bd..1d7ecd3f2 100755
--- a/src/generated/cloud/eventarc/v1/src/model.rs
+++ b/src/generated/cloud/eventarc/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/eventarc/v1/src/transport.rs b/src/generated/cloud/eventarc/v1/src/transport.rs
index 790059b34..a8ad47a99 100755
--- a/src/generated/cloud/eventarc/v1/src/transport.rs
+++ b/src/generated/cloud/eventarc/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [Eventarc](super::stubs::Eventarc) using a [gclient::ReqwestClient].
+/// Implements [Eventarc](super::stubs::Eventarc) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Eventarc {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Eventarc {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for Eventarc {
 }
 
 impl Eventarc {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -55,7 +55,7 @@ impl super::stubs::Eventarc for Eventarc {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -78,7 +78,7 @@ impl super::stubs::Eventarc for Eventarc {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -120,7 +120,7 @@ impl super::stubs::Eventarc for Eventarc {
                     "/v1/{}",
                     req.trigger
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("trigger"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("trigger"))?
                         .name
                 ),
             )
@@ -136,7 +136,7 @@ impl super::stubs::Eventarc for Eventarc {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("allowMissing", &req.allow_missing)]);
@@ -164,7 +164,7 @@ impl super::stubs::Eventarc for Eventarc {
         let builder = builder.query(&[("allowMissing", &req.allow_missing)]);
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -183,7 +183,7 @@ impl super::stubs::Eventarc for Eventarc {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -205,7 +205,7 @@ impl super::stubs::Eventarc for Eventarc {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -247,7 +247,7 @@ impl super::stubs::Eventarc for Eventarc {
                     "/v1/{}",
                     req.channel
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("channel"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("channel"))?
                         .name
                 ),
             )
@@ -263,7 +263,7 @@ impl super::stubs::Eventarc for Eventarc {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
@@ -288,7 +288,7 @@ impl super::stubs::Eventarc for Eventarc {
             );
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -307,7 +307,7 @@ impl super::stubs::Eventarc for Eventarc {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -333,7 +333,7 @@ impl super::stubs::Eventarc for Eventarc {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -352,7 +352,7 @@ impl super::stubs::Eventarc for Eventarc {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -376,7 +376,7 @@ impl super::stubs::Eventarc for Eventarc {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -418,7 +418,7 @@ impl super::stubs::Eventarc for Eventarc {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -437,7 +437,7 @@ impl super::stubs::Eventarc for Eventarc {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -455,7 +455,7 @@ impl super::stubs::Eventarc for Eventarc {
                     "/v1/{}",
                     req.google_channel_config
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("google_channel_config"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("google_channel_config"))?
                         .name
                 ),
             )
@@ -471,7 +471,7 @@ impl super::stubs::Eventarc for Eventarc {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -494,7 +494,7 @@ impl super::stubs::Eventarc for Eventarc {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -520,7 +520,7 @@ impl super::stubs::Eventarc for Eventarc {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -544,7 +544,7 @@ impl super::stubs::Eventarc for Eventarc {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -586,7 +586,7 @@ impl super::stubs::Eventarc for Eventarc {
                     "/v1/{}",
                     req.message_bus
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("message_bus"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("message_bus"))?
                         .name
                 ),
             )
@@ -602,7 +602,7 @@ impl super::stubs::Eventarc for Eventarc {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("allowMissing", &req.allow_missing)]);
@@ -630,7 +630,7 @@ impl super::stubs::Eventarc for Eventarc {
         let builder = builder.query(&[("allowMissing", &req.allow_missing)]);
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -649,7 +649,7 @@ impl super::stubs::Eventarc for Eventarc {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -675,7 +675,7 @@ impl super::stubs::Eventarc for Eventarc {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -717,7 +717,7 @@ impl super::stubs::Eventarc for Eventarc {
                     "/v1/{}",
                     req.enrollment
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("enrollment"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("enrollment"))?
                         .name
                 ),
             )
@@ -733,7 +733,7 @@ impl super::stubs::Eventarc for Eventarc {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("allowMissing", &req.allow_missing)]);
@@ -761,7 +761,7 @@ impl super::stubs::Eventarc for Eventarc {
         let builder = builder.query(&[("allowMissing", &req.allow_missing)]);
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -780,7 +780,7 @@ impl super::stubs::Eventarc for Eventarc {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -806,7 +806,7 @@ impl super::stubs::Eventarc for Eventarc {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -848,7 +848,7 @@ impl super::stubs::Eventarc for Eventarc {
                     "/v1/{}",
                     req.pipeline
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("pipeline"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("pipeline"))?
                         .name
                 ),
             )
@@ -864,7 +864,7 @@ impl super::stubs::Eventarc for Eventarc {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("allowMissing", &req.allow_missing)]);
@@ -892,7 +892,7 @@ impl super::stubs::Eventarc for Eventarc {
         let builder = builder.query(&[("allowMissing", &req.allow_missing)]);
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -911,7 +911,7 @@ impl super::stubs::Eventarc for Eventarc {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -937,7 +937,7 @@ impl super::stubs::Eventarc for Eventarc {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -979,7 +979,7 @@ impl super::stubs::Eventarc for Eventarc {
                     "/v1/{}",
                     req.google_api_source
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("google_api_source"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("google_api_source"))?
                         .name
                 ),
             )
@@ -995,7 +995,7 @@ impl super::stubs::Eventarc for Eventarc {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("allowMissing", &req.allow_missing)]);
@@ -1023,7 +1023,7 @@ impl super::stubs::Eventarc for Eventarc {
         let builder = builder.query(&[("allowMissing", &req.allow_missing)]);
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1045,7 +1045,7 @@ impl super::stubs::Eventarc for Eventarc {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1064,7 +1064,7 @@ impl super::stubs::Eventarc for Eventarc {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1112,11 +1112,11 @@ impl super::stubs::Eventarc for Eventarc {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1158,7 +1158,7 @@ impl super::stubs::Eventarc for Eventarc {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1177,7 +1177,7 @@ impl super::stubs::Eventarc for Eventarc {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1196,7 +1196,7 @@ impl super::stubs::Eventarc for Eventarc {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/filestore/v1/Cargo.toml b/src/generated/cloud/filestore/v1/Cargo.toml
index ff1e00ced..0afb8eef9 100644
--- a/src/generated/cloud/filestore/v1/Cargo.toml
+++ b/src/generated/cloud/filestore/v1/Cargo.toml
@@ -30,7 +30,7 @@ async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 cloud_common = { version = "0.2", path = "../../../../../src/generated/cloud/common", package = "google-cloud-common" }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/filestore/v1/src/model.rs b/src/generated/cloud/filestore/v1/src/model.rs
index 775438273..80cfc20d9 100755
--- a/src/generated/cloud/filestore/v1/src/model.rs
+++ b/src/generated/cloud/filestore/v1/src/model.rs
@@ -21,7 +21,7 @@ extern crate async_trait;
 extern crate bytes;
 extern crate cloud_common;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate location;
 extern crate longrunning;
diff --git a/src/generated/cloud/filestore/v1/src/transport.rs b/src/generated/cloud/filestore/v1/src/transport.rs
index d7dc7c9b6..dbbe52869 100755
--- a/src/generated/cloud/filestore/v1/src/transport.rs
+++ b/src/generated/cloud/filestore/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [CloudFilestoreManager](super::stubs::CloudFilestoreManager) using a [gclient::ReqwestClient].
+/// Implements [CloudFilestoreManager](super::stubs::CloudFilestoreManager) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct CloudFilestoreManager {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for CloudFilestoreManager {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for CloudFilestoreManager {
 }
 
 impl CloudFilestoreManager {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::CloudFilestoreManager for CloudFilestoreManager {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -81,7 +81,7 @@ impl super::stubs::CloudFilestoreManager for CloudFilestoreManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -122,7 +122,7 @@ impl super::stubs::CloudFilestoreManager for CloudFilestoreManager {
                     "/v1/{}",
                     req.instance
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("instance"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("instance"))?
                         .name
                 ),
             )
@@ -138,7 +138,7 @@ impl super::stubs::CloudFilestoreManager for CloudFilestoreManager {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -196,7 +196,7 @@ impl super::stubs::CloudFilestoreManager for CloudFilestoreManager {
             );
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -223,7 +223,7 @@ impl super::stubs::CloudFilestoreManager for CloudFilestoreManager {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("returnPartialSuccess", &req.return_partial_success)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -242,7 +242,7 @@ impl super::stubs::CloudFilestoreManager for CloudFilestoreManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -284,7 +284,7 @@ impl super::stubs::CloudFilestoreManager for CloudFilestoreManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -302,7 +302,7 @@ impl super::stubs::CloudFilestoreManager for CloudFilestoreManager {
                     "/v1/{}",
                     req.snapshot
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("snapshot"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("snapshot"))?
                         .name
                 ),
             )
@@ -318,7 +318,7 @@ impl super::stubs::CloudFilestoreManager for CloudFilestoreManager {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -345,7 +345,7 @@ impl super::stubs::CloudFilestoreManager for CloudFilestoreManager {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -364,7 +364,7 @@ impl super::stubs::CloudFilestoreManager for CloudFilestoreManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -401,7 +401,7 @@ impl super::stubs::CloudFilestoreManager for CloudFilestoreManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -419,7 +419,7 @@ impl super::stubs::CloudFilestoreManager for CloudFilestoreManager {
                     "/v1/{}",
                     req.backup
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("backup"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("backup"))?
                         .name
                 ),
             )
@@ -435,7 +435,7 @@ impl super::stubs::CloudFilestoreManager for CloudFilestoreManager {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.backup), options).await
@@ -479,7 +479,7 @@ impl super::stubs::CloudFilestoreManager for CloudFilestoreManager {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -498,7 +498,7 @@ impl super::stubs::CloudFilestoreManager for CloudFilestoreManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -520,7 +520,7 @@ impl super::stubs::CloudFilestoreManager for CloudFilestoreManager {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -539,7 +539,7 @@ impl super::stubs::CloudFilestoreManager for CloudFilestoreManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -558,7 +558,7 @@ impl super::stubs::CloudFilestoreManager for CloudFilestoreManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/financialservices/v1/Cargo.toml b/src/generated/cloud/financialservices/v1/Cargo.toml
index 0ce8504b4..086e4dd01 100644
--- a/src/generated/cloud/financialservices/v1/Cargo.toml
+++ b/src/generated/cloud/financialservices/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/financialservices/v1/src/model.rs b/src/generated/cloud/financialservices/v1/src/model.rs
index 691331cf6..3cb23bf28 100755
--- a/src/generated/cloud/financialservices/v1/src/model.rs
+++ b/src/generated/cloud/financialservices/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/financialservices/v1/src/transport.rs b/src/generated/cloud/financialservices/v1/src/transport.rs
index e20429d01..12a75eda0 100755
--- a/src/generated/cloud/financialservices/v1/src/transport.rs
+++ b/src/generated/cloud/financialservices/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [Aml](super::stubs::Aml) using a [gclient::ReqwestClient].
+/// Implements [Aml](super::stubs::Aml) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Aml {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Aml {
@@ -31,8 +31,8 @@ impl std::fmt::Debug for Aml {
 }
 
 impl Aml {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -60,7 +60,7 @@ impl super::stubs::Aml for Aml {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -79,7 +79,7 @@ impl super::stubs::Aml for Aml {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -121,7 +121,7 @@ impl super::stubs::Aml for Aml {
                     "/v1/{}",
                     req.instance
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("instance"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("instance"))?
                         .name
                 ),
             )
@@ -137,7 +137,7 @@ impl super::stubs::Aml for Aml {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -162,7 +162,7 @@ impl super::stubs::Aml for Aml {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -225,7 +225,7 @@ impl super::stubs::Aml for Aml {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -244,7 +244,7 @@ impl super::stubs::Aml for Aml {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -286,7 +286,7 @@ impl super::stubs::Aml for Aml {
                     "/v1/{}",
                     req.dataset
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("dataset"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("dataset"))?
                         .name
                 ),
             )
@@ -302,7 +302,7 @@ impl super::stubs::Aml for Aml {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -327,7 +327,7 @@ impl super::stubs::Aml for Aml {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -350,7 +350,7 @@ impl super::stubs::Aml for Aml {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -369,7 +369,7 @@ impl super::stubs::Aml for Aml {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -406,7 +406,7 @@ impl super::stubs::Aml for Aml {
                     "/v1/{}",
                     req.model
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("model"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("model"))?
                         .name
                 ),
             )
@@ -422,7 +422,7 @@ impl super::stubs::Aml for Aml {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -465,7 +465,7 @@ impl super::stubs::Aml for Aml {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -491,7 +491,7 @@ impl super::stubs::Aml for Aml {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -510,7 +510,7 @@ impl super::stubs::Aml for Aml {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -552,7 +552,7 @@ impl super::stubs::Aml for Aml {
                     "/v1/{}",
                     req.engine_config
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("engine_config"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("engine_config"))?
                         .name
                 ),
             )
@@ -568,7 +568,7 @@ impl super::stubs::Aml for Aml {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -613,7 +613,7 @@ impl super::stubs::Aml for Aml {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -632,7 +632,7 @@ impl super::stubs::Aml for Aml {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -658,7 +658,7 @@ impl super::stubs::Aml for Aml {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -684,7 +684,7 @@ impl super::stubs::Aml for Aml {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -703,7 +703,7 @@ impl super::stubs::Aml for Aml {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -745,7 +745,7 @@ impl super::stubs::Aml for Aml {
                     "/v1/{}",
                     req.prediction_result
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("prediction_result"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("prediction_result"))?
                         .name
                 ),
             )
@@ -761,7 +761,7 @@ impl super::stubs::Aml for Aml {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -806,7 +806,7 @@ impl super::stubs::Aml for Aml {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -832,7 +832,7 @@ impl super::stubs::Aml for Aml {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -851,7 +851,7 @@ impl super::stubs::Aml for Aml {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -893,7 +893,7 @@ impl super::stubs::Aml for Aml {
                     "/v1/{}",
                     req.backtest_result
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("backtest_result"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("backtest_result"))?
                         .name
                 ),
             )
@@ -909,7 +909,7 @@ impl super::stubs::Aml for Aml {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -954,7 +954,7 @@ impl super::stubs::Aml for Aml {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -976,7 +976,7 @@ impl super::stubs::Aml for Aml {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -995,7 +995,7 @@ impl super::stubs::Aml for Aml {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1017,7 +1017,7 @@ impl super::stubs::Aml for Aml {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1036,7 +1036,7 @@ impl super::stubs::Aml for Aml {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1055,7 +1055,7 @@ impl super::stubs::Aml for Aml {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/functions/v2/Cargo.toml b/src/generated/cloud/functions/v2/Cargo.toml
index f9d6e2537..86f8e5108 100644
--- a/src/generated/cloud/functions/v2/Cargo.toml
+++ b/src/generated/cloud/functions/v2/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
diff --git a/src/generated/cloud/functions/v2/src/model.rs b/src/generated/cloud/functions/v2/src/model.rs
index 1cf193806..daba38618 100755
--- a/src/generated/cloud/functions/v2/src/model.rs
+++ b/src/generated/cloud/functions/v2/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate iam_v1;
 extern crate lazy_static;
diff --git a/src/generated/cloud/functions/v2/src/transport.rs b/src/generated/cloud/functions/v2/src/transport.rs
index 22fe353a2..94335b600 100755
--- a/src/generated/cloud/functions/v2/src/transport.rs
+++ b/src/generated/cloud/functions/v2/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [FunctionService](super::stubs::FunctionService) using a [gclient::ReqwestClient].
+/// Implements [FunctionService](super::stubs::FunctionService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct FunctionService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for FunctionService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for FunctionService {
 }
 
 impl FunctionService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -56,7 +56,7 @@ impl super::stubs::FunctionService for FunctionService {
             );
         let builder = builder.query(&[("revision", &req.revision)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -82,7 +82,7 @@ impl super::stubs::FunctionService for FunctionService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -123,7 +123,7 @@ impl super::stubs::FunctionService for FunctionService {
                     "/v2/{}",
                     req.function
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("function"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("function"))?
                         .name
                 ),
             )
@@ -139,7 +139,7 @@ impl super::stubs::FunctionService for FunctionService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -162,7 +162,7 @@ impl super::stubs::FunctionService for FunctionService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -222,7 +222,7 @@ impl super::stubs::FunctionService for FunctionService {
             );
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -244,7 +244,7 @@ impl super::stubs::FunctionService for FunctionService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -292,11 +292,11 @@ impl super::stubs::FunctionService for FunctionService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -338,7 +338,7 @@ impl super::stubs::FunctionService for FunctionService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -357,7 +357,7 @@ impl super::stubs::FunctionService for FunctionService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/gkebackup/v1/Cargo.toml b/src/generated/cloud/gkebackup/v1/Cargo.toml
index 242597516..7d4e91f9e 100644
--- a/src/generated/cloud/gkebackup/v1/Cargo.toml
+++ b/src/generated/cloud/gkebackup/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
diff --git a/src/generated/cloud/gkebackup/v1/src/model.rs b/src/generated/cloud/gkebackup/v1/src/model.rs
index 9197aa786..ffb83f66d 100755
--- a/src/generated/cloud/gkebackup/v1/src/model.rs
+++ b/src/generated/cloud/gkebackup/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate iam_v1;
 extern crate lazy_static;
diff --git a/src/generated/cloud/gkebackup/v1/src/transport.rs b/src/generated/cloud/gkebackup/v1/src/transport.rs
index a9f952315..520cd7dda 100755
--- a/src/generated/cloud/gkebackup/v1/src/transport.rs
+++ b/src/generated/cloud/gkebackup/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [BackupForGKE](super::stubs::BackupForGKE) using a [gclient::ReqwestClient].
+/// Implements [BackupForGKE](super::stubs::BackupForGKE) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct BackupForGKE {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for BackupForGKE {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for BackupForGKE {
 }
 
 impl BackupForGKE {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -85,7 +85,7 @@ impl super::stubs::BackupForGKE for BackupForGKE {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -104,7 +104,7 @@ impl super::stubs::BackupForGKE for BackupForGKE {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -122,7 +122,7 @@ impl super::stubs::BackupForGKE for BackupForGKE {
                     "/v1/{}",
                     req.backup_plan
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("backup_plan"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("backup_plan"))?
                         .name
                 ),
             )
@@ -138,7 +138,7 @@ impl super::stubs::BackupForGKE for BackupForGKE {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -162,7 +162,7 @@ impl super::stubs::BackupForGKE for BackupForGKE {
             );
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -203,7 +203,7 @@ impl super::stubs::BackupForGKE for BackupForGKE {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -222,7 +222,7 @@ impl super::stubs::BackupForGKE for BackupForGKE {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -240,7 +240,7 @@ impl super::stubs::BackupForGKE for BackupForGKE {
                     "/v1/{}",
                     req.backup
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("backup"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("backup"))?
                         .name
                 ),
             )
@@ -256,7 +256,7 @@ impl super::stubs::BackupForGKE for BackupForGKE {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.backup), options).await
@@ -279,7 +279,7 @@ impl super::stubs::BackupForGKE for BackupForGKE {
         let builder = builder.query(&[("etag", &req.etag)]);
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -305,7 +305,7 @@ impl super::stubs::BackupForGKE for BackupForGKE {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -324,7 +324,7 @@ impl super::stubs::BackupForGKE for BackupForGKE {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -373,7 +373,7 @@ impl super::stubs::BackupForGKE for BackupForGKE {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -392,7 +392,7 @@ impl super::stubs::BackupForGKE for BackupForGKE {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -410,7 +410,7 @@ impl super::stubs::BackupForGKE for BackupForGKE {
                     "/v1/{}",
                     req.restore_plan
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("restore_plan"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("restore_plan"))?
                         .name
                 ),
             )
@@ -426,7 +426,7 @@ impl super::stubs::BackupForGKE for BackupForGKE {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -451,7 +451,7 @@ impl super::stubs::BackupForGKE for BackupForGKE {
         let builder = builder.query(&[("etag", &req.etag)]);
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -497,7 +497,7 @@ impl super::stubs::BackupForGKE for BackupForGKE {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -516,7 +516,7 @@ impl super::stubs::BackupForGKE for BackupForGKE {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -534,7 +534,7 @@ impl super::stubs::BackupForGKE for BackupForGKE {
                     "/v1/{}",
                     req.restore
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("restore"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("restore"))?
                         .name
                 ),
             )
@@ -550,7 +550,7 @@ impl super::stubs::BackupForGKE for BackupForGKE {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -575,7 +575,7 @@ impl super::stubs::BackupForGKE for BackupForGKE {
         let builder = builder.query(&[("etag", &req.etag)]);
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -601,7 +601,7 @@ impl super::stubs::BackupForGKE for BackupForGKE {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -620,7 +620,7 @@ impl super::stubs::BackupForGKE for BackupForGKE {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -642,7 +642,7 @@ impl super::stubs::BackupForGKE for BackupForGKE {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -664,7 +664,7 @@ impl super::stubs::BackupForGKE for BackupForGKE {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -683,7 +683,7 @@ impl super::stubs::BackupForGKE for BackupForGKE {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -731,11 +731,11 @@ impl super::stubs::BackupForGKE for BackupForGKE {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -777,7 +777,7 @@ impl super::stubs::BackupForGKE for BackupForGKE {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -796,7 +796,7 @@ impl super::stubs::BackupForGKE for BackupForGKE {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -815,7 +815,7 @@ impl super::stubs::BackupForGKE for BackupForGKE {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/gkeconnect/gateway/v1/Cargo.toml b/src/generated/cloud/gkeconnect/gateway/v1/Cargo.toml
index ba612702b..3fa9e82ff 100644
--- a/src/generated/cloud/gkeconnect/gateway/v1/Cargo.toml
+++ b/src/generated/cloud/gkeconnect/gateway/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
 serde      = { version = "1", features = ["serde_derive"] }
diff --git a/src/generated/cloud/gkeconnect/gateway/v1/src/model.rs b/src/generated/cloud/gkeconnect/gateway/v1/src/model.rs
index 39cc8b5bc..d194f52c4 100755
--- a/src/generated/cloud/gkeconnect/gateway/v1/src/model.rs
+++ b/src/generated/cloud/gkeconnect/gateway/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate reqwest;
 extern crate serde;
diff --git a/src/generated/cloud/gkeconnect/gateway/v1/src/transport.rs b/src/generated/cloud/gkeconnect/gateway/v1/src/transport.rs
index e516a32fb..37210e949 100755
--- a/src/generated/cloud/gkeconnect/gateway/v1/src/transport.rs
+++ b/src/generated/cloud/gkeconnect/gateway/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [GatewayControl](super::stubs::GatewayControl) using a [gclient::ReqwestClient].
+/// Implements [GatewayControl](super::stubs::GatewayControl) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct GatewayControl {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for GatewayControl {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for GatewayControl {
 }
 
 impl GatewayControl {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::GatewayControl for GatewayControl {
         let builder = builder.query(&[("kubernetesNamespace", &req.kubernetes_namespace)]);
         let builder = builder.query(&[("operatingSystem", &req.operating_system.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/cloud/gkehub/v1/Cargo.toml b/src/generated/cloud/gkehub/v1/Cargo.toml
index 0c984b17a..d1d2afa8d 100644
--- a/src/generated/cloud/gkehub/v1/Cargo.toml
+++ b/src/generated/cloud/gkehub/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gkehub_configmanagement_v1 = { version = "0.2", path = "../../../../../src/generated/cloud/gkehub/configmanagement/v1", package = "google-cloud-gkehub-configmanagement-v1" }
 gkehub_multiclusteringress_v1 = { version = "0.2", path = "../../../../../src/generated/cloud/gkehub/multiclusteringress/v1", package = "google-cloud-gkehub-multiclusteringress-v1" }
 lazy_static = { version = "1" }
diff --git a/src/generated/cloud/gkehub/v1/src/model.rs b/src/generated/cloud/gkehub/v1/src/model.rs
index 0afac9bdd..6c35e790b 100755
--- a/src/generated/cloud/gkehub/v1/src/model.rs
+++ b/src/generated/cloud/gkehub/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gkehub_configmanagement_v1;
 extern crate gkehub_multiclusteringress_v1;
 extern crate lazy_static;
diff --git a/src/generated/cloud/gkehub/v1/src/transport.rs b/src/generated/cloud/gkehub/v1/src/transport.rs
index 561bbf345..6016078be 100755
--- a/src/generated/cloud/gkehub/v1/src/transport.rs
+++ b/src/generated/cloud/gkehub/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [GkeHub](super::stubs::GkeHub) using a [gclient::ReqwestClient].
+/// Implements [GkeHub](super::stubs::GkeHub) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct GkeHub {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for GkeHub {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for GkeHub {
 }
 
 impl GkeHub {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::GkeHub for GkeHub {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -85,7 +85,7 @@ impl super::stubs::GkeHub for GkeHub {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -104,7 +104,7 @@ impl super::stubs::GkeHub for GkeHub {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -123,7 +123,7 @@ impl super::stubs::GkeHub for GkeHub {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -192,7 +192,7 @@ impl super::stubs::GkeHub for GkeHub {
         let builder = builder.query(&[("requestId", &req.request_id)]);
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -213,7 +213,7 @@ impl super::stubs::GkeHub for GkeHub {
         let builder = builder.query(&[("force", &req.force)]);
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -238,7 +238,7 @@ impl super::stubs::GkeHub for GkeHub {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -268,7 +268,7 @@ impl super::stubs::GkeHub for GkeHub {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -301,7 +301,7 @@ impl super::stubs::GkeHub for GkeHub {
         let builder = builder.query(&[("registry", &req.registry)]);
         let builder = builder.query(&[("imagePullSecretContent", &req.image_pull_secret_content)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -323,7 +323,7 @@ impl super::stubs::GkeHub for GkeHub {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -342,7 +342,7 @@ impl super::stubs::GkeHub for GkeHub {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -361,7 +361,7 @@ impl super::stubs::GkeHub for GkeHub {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/gkemulticloud/v1/Cargo.toml b/src/generated/cloud/gkemulticloud/v1/Cargo.toml
index ab5e33efc..db52da59b 100644
--- a/src/generated/cloud/gkemulticloud/v1/Cargo.toml
+++ b/src/generated/cloud/gkemulticloud/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/gkemulticloud/v1/src/model.rs b/src/generated/cloud/gkemulticloud/v1/src/model.rs
index d4930de60..e163202a4 100755
--- a/src/generated/cloud/gkemulticloud/v1/src/model.rs
+++ b/src/generated/cloud/gkemulticloud/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate longrunning;
diff --git a/src/generated/cloud/gkemulticloud/v1/src/transport.rs b/src/generated/cloud/gkemulticloud/v1/src/transport.rs
index bae5e31a4..27b2ecc4a 100755
--- a/src/generated/cloud/gkemulticloud/v1/src/transport.rs
+++ b/src/generated/cloud/gkemulticloud/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [AttachedClusters](super::stubs::AttachedClusters) using a [gclient::ReqwestClient].
+/// Implements [AttachedClusters](super::stubs::AttachedClusters) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct AttachedClusters {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for AttachedClusters {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for AttachedClusters {
 }
 
 impl AttachedClusters {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -78,7 +78,7 @@ impl super::stubs::AttachedClusters for AttachedClusters {
                     "/v1/{}",
                     req.attached_cluster
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("attached_cluster"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("attached_cluster"))?
                         .name
                 ),
             )
@@ -95,7 +95,7 @@ impl super::stubs::AttachedClusters for AttachedClusters {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -138,7 +138,7 @@ impl super::stubs::AttachedClusters for AttachedClusters {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -162,7 +162,7 @@ impl super::stubs::AttachedClusters for AttachedClusters {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -185,7 +185,7 @@ impl super::stubs::AttachedClusters for AttachedClusters {
         let builder = builder.query(&[("ignoreErrors", &req.ignore_errors)]);
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -204,7 +204,7 @@ impl super::stubs::AttachedClusters for AttachedClusters {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -234,11 +234,11 @@ impl super::stubs::AttachedClusters for AttachedClusters {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "proxyConfig")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -283,7 +283,7 @@ impl super::stubs::AttachedClusters for AttachedClusters {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -302,7 +302,7 @@ impl super::stubs::AttachedClusters for AttachedClusters {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -321,7 +321,7 @@ impl super::stubs::AttachedClusters for AttachedClusters {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -357,10 +357,10 @@ impl super::stubs::AttachedClusters for AttachedClusters {
     }
 }
 
-/// Implements [AwsClusters](super::stubs::AwsClusters) using a [gclient::ReqwestClient].
+/// Implements [AwsClusters](super::stubs::AwsClusters) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct AwsClusters {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for AwsClusters {
@@ -372,8 +372,8 @@ impl std::fmt::Debug for AwsClusters {
 }
 
 impl AwsClusters {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -417,7 +417,7 @@ impl super::stubs::AwsClusters for AwsClusters {
                     "/v1/{}",
                     req.aws_cluster
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("aws_cluster"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("aws_cluster"))?
                         .name
                 ),
             )
@@ -434,7 +434,7 @@ impl super::stubs::AwsClusters for AwsClusters {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -457,7 +457,7 @@ impl super::stubs::AwsClusters for AwsClusters {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -481,7 +481,7 @@ impl super::stubs::AwsClusters for AwsClusters {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -504,7 +504,7 @@ impl super::stubs::AwsClusters for AwsClusters {
         let builder = builder.query(&[("ignoreErrors", &req.ignore_errors)]);
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -546,7 +546,7 @@ impl super::stubs::AwsClusters for AwsClusters {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -588,7 +588,7 @@ impl super::stubs::AwsClusters for AwsClusters {
                     "/v1/{}",
                     req.aws_node_pool
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("aws_node_pool"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("aws_node_pool"))?
                         .name
                 ),
             )
@@ -605,7 +605,7 @@ impl super::stubs::AwsClusters for AwsClusters {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -645,7 +645,7 @@ impl super::stubs::AwsClusters for AwsClusters {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -669,7 +669,7 @@ impl super::stubs::AwsClusters for AwsClusters {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -692,7 +692,7 @@ impl super::stubs::AwsClusters for AwsClusters {
         let builder = builder.query(&[("ignoreErrors", &req.ignore_errors)]);
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -714,7 +714,7 @@ impl super::stubs::AwsClusters for AwsClusters {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -736,7 +736,7 @@ impl super::stubs::AwsClusters for AwsClusters {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -755,7 +755,7 @@ impl super::stubs::AwsClusters for AwsClusters {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -777,7 +777,7 @@ impl super::stubs::AwsClusters for AwsClusters {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -796,7 +796,7 @@ impl super::stubs::AwsClusters for AwsClusters {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -815,7 +815,7 @@ impl super::stubs::AwsClusters for AwsClusters {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -851,10 +851,10 @@ impl super::stubs::AwsClusters for AwsClusters {
     }
 }
 
-/// Implements [AzureClusters](super::stubs::AzureClusters) using a [gclient::ReqwestClient].
+/// Implements [AzureClusters](super::stubs::AzureClusters) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct AzureClusters {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for AzureClusters {
@@ -866,8 +866,8 @@ impl std::fmt::Debug for AzureClusters {
 }
 
 impl AzureClusters {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -912,7 +912,7 @@ impl super::stubs::AzureClusters for AzureClusters {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -936,7 +936,7 @@ impl super::stubs::AzureClusters for AzureClusters {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -957,7 +957,7 @@ impl super::stubs::AzureClusters for AzureClusters {
         let builder = builder.query(&[("allowMissing", &req.allow_missing)]);
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -999,7 +999,7 @@ impl super::stubs::AzureClusters for AzureClusters {
                     "/v1/{}",
                     req.azure_cluster
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("azure_cluster"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("azure_cluster"))?
                         .name
                 ),
             )
@@ -1016,7 +1016,7 @@ impl super::stubs::AzureClusters for AzureClusters {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1039,7 +1039,7 @@ impl super::stubs::AzureClusters for AzureClusters {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1063,7 +1063,7 @@ impl super::stubs::AzureClusters for AzureClusters {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1086,7 +1086,7 @@ impl super::stubs::AzureClusters for AzureClusters {
         let builder = builder.query(&[("etag", &req.etag)]);
         let builder = builder.query(&[("ignoreErrors", &req.ignore_errors)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1128,7 +1128,7 @@ impl super::stubs::AzureClusters for AzureClusters {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1170,7 +1170,7 @@ impl super::stubs::AzureClusters for AzureClusters {
                     "/v1/{}",
                     req.azure_node_pool
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("azure_node_pool"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("azure_node_pool"))?
                         .name
                 ),
             )
@@ -1187,7 +1187,7 @@ impl super::stubs::AzureClusters for AzureClusters {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1210,7 +1210,7 @@ impl super::stubs::AzureClusters for AzureClusters {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1234,7 +1234,7 @@ impl super::stubs::AzureClusters for AzureClusters {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1257,7 +1257,7 @@ impl super::stubs::AzureClusters for AzureClusters {
         let builder = builder.query(&[("etag", &req.etag)]);
         let builder = builder.query(&[("ignoreErrors", &req.ignore_errors)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1279,7 +1279,7 @@ impl super::stubs::AzureClusters for AzureClusters {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1301,7 +1301,7 @@ impl super::stubs::AzureClusters for AzureClusters {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1320,7 +1320,7 @@ impl super::stubs::AzureClusters for AzureClusters {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1342,7 +1342,7 @@ impl super::stubs::AzureClusters for AzureClusters {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1361,7 +1361,7 @@ impl super::stubs::AzureClusters for AzureClusters {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1380,7 +1380,7 @@ impl super::stubs::AzureClusters for AzureClusters {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/gsuiteaddons/v1/Cargo.toml b/src/generated/cloud/gsuiteaddons/v1/Cargo.toml
index 988b36f84..d7c4f056e 100644
--- a/src/generated/cloud/gsuiteaddons/v1/Cargo.toml
+++ b/src/generated/cloud/gsuiteaddons/v1/Cargo.toml
@@ -36,7 +36,7 @@ apps_script_type = { version = "0.2", path = "../../../../../src/generated/apps/
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
 serde      = { version = "1", features = ["serde_derive"] }
diff --git a/src/generated/cloud/gsuiteaddons/v1/src/model.rs b/src/generated/cloud/gsuiteaddons/v1/src/model.rs
index 0bf228000..81dc265ce 100755
--- a/src/generated/cloud/gsuiteaddons/v1/src/model.rs
+++ b/src/generated/cloud/gsuiteaddons/v1/src/model.rs
@@ -27,7 +27,7 @@ extern crate apps_script_type;
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate reqwest;
 extern crate serde;
diff --git a/src/generated/cloud/gsuiteaddons/v1/src/transport.rs b/src/generated/cloud/gsuiteaddons/v1/src/transport.rs
index 579f8a490..c06e82dee 100755
--- a/src/generated/cloud/gsuiteaddons/v1/src/transport.rs
+++ b/src/generated/cloud/gsuiteaddons/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [GSuiteAddOns](super::stubs::GSuiteAddOns) using a [gclient::ReqwestClient].
+/// Implements [GSuiteAddOns](super::stubs::GSuiteAddOns) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct GSuiteAddOns {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for GSuiteAddOns {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for GSuiteAddOns {
 }
 
 impl GSuiteAddOns {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -55,7 +55,7 @@ impl super::stubs::GSuiteAddOns for GSuiteAddOns {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -96,7 +96,7 @@ impl super::stubs::GSuiteAddOns for GSuiteAddOns {
                     "/v1/{}",
                     req.deployment
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("deployment"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("deployment"))?
                         .name
                 ),
             )
@@ -125,7 +125,7 @@ impl super::stubs::GSuiteAddOns for GSuiteAddOns {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -149,7 +149,7 @@ impl super::stubs::GSuiteAddOns for GSuiteAddOns {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -169,7 +169,7 @@ impl super::stubs::GSuiteAddOns for GSuiteAddOns {
             );
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -222,7 +222,7 @@ impl super::stubs::GSuiteAddOns for GSuiteAddOns {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/cloud/iap/v1/Cargo.toml b/src/generated/cloud/iap/v1/Cargo.toml
index 15e4e82e7..ba7d00fb5 100644
--- a/src/generated/cloud/iap/v1/Cargo.toml
+++ b/src/generated/cloud/iap/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
diff --git a/src/generated/cloud/iap/v1/src/model.rs b/src/generated/cloud/iap/v1/src/model.rs
index 5f6ef5d3e..d7e22d44a 100755
--- a/src/generated/cloud/iap/v1/src/model.rs
+++ b/src/generated/cloud/iap/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate reqwest;
diff --git a/src/generated/cloud/iap/v1/src/transport.rs b/src/generated/cloud/iap/v1/src/transport.rs
index 505397845..a78dd4a4a 100755
--- a/src/generated/cloud/iap/v1/src/transport.rs
+++ b/src/generated/cloud/iap/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [IdentityAwareProxyAdminService](super::stubs::IdentityAwareProxyAdminService) using a [gclient::ReqwestClient].
+/// Implements [IdentityAwareProxyAdminService](super::stubs::IdentityAwareProxyAdminService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct IdentityAwareProxyAdminService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for IdentityAwareProxyAdminService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for IdentityAwareProxyAdminService {
 }
 
 impl IdentityAwareProxyAdminService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -118,7 +118,7 @@ impl super::stubs::IdentityAwareProxyAdminService for IdentityAwareProxyAdminSer
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -136,7 +136,7 @@ impl super::stubs::IdentityAwareProxyAdminService for IdentityAwareProxyAdminSer
                     "/v1/{}:iapSettings",
                     req.iap_settings
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("iap_settings"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("iap_settings"))?
                         .name
                 ),
             )
@@ -152,7 +152,7 @@ impl super::stubs::IdentityAwareProxyAdminService for IdentityAwareProxyAdminSer
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -180,7 +180,7 @@ impl super::stubs::IdentityAwareProxyAdminService for IdentityAwareProxyAdminSer
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -222,7 +222,7 @@ impl super::stubs::IdentityAwareProxyAdminService for IdentityAwareProxyAdminSer
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -241,7 +241,7 @@ impl super::stubs::IdentityAwareProxyAdminService for IdentityAwareProxyAdminSer
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -259,7 +259,7 @@ impl super::stubs::IdentityAwareProxyAdminService for IdentityAwareProxyAdminSer
                     "/v1/{}",
                     req.tunnel_dest_group
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("tunnel_dest_group"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("tunnel_dest_group"))?
                         .name
                 ),
             )
@@ -275,7 +275,7 @@ impl super::stubs::IdentityAwareProxyAdminService for IdentityAwareProxyAdminSer
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -284,10 +284,10 @@ impl super::stubs::IdentityAwareProxyAdminService for IdentityAwareProxyAdminSer
     }
 }
 
-/// Implements [IdentityAwareProxyOAuthService](super::stubs::IdentityAwareProxyOAuthService) using a [gclient::ReqwestClient].
+/// Implements [IdentityAwareProxyOAuthService](super::stubs::IdentityAwareProxyOAuthService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct IdentityAwareProxyOAuthService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for IdentityAwareProxyOAuthService {
@@ -299,8 +299,8 @@ impl std::fmt::Debug for IdentityAwareProxyOAuthService {
 }
 
 impl IdentityAwareProxyOAuthService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -321,7 +321,7 @@ impl super::stubs::IdentityAwareProxyOAuthService for IdentityAwareProxyOAuthSer
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -357,7 +357,7 @@ impl super::stubs::IdentityAwareProxyOAuthService for IdentityAwareProxyOAuthSer
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -403,7 +403,7 @@ impl super::stubs::IdentityAwareProxyOAuthService for IdentityAwareProxyOAuthSer
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -422,7 +422,7 @@ impl super::stubs::IdentityAwareProxyOAuthService for IdentityAwareProxyOAuthSer
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -461,7 +461,7 @@ impl super::stubs::IdentityAwareProxyOAuthService for IdentityAwareProxyOAuthSer
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/cloud/ids/v1/Cargo.toml b/src/generated/cloud/ids/v1/Cargo.toml
index a5a97d6b2..c024a2b98 100644
--- a/src/generated/cloud/ids/v1/Cargo.toml
+++ b/src/generated/cloud/ids/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
 lro        = { version = "0.1", path = "../../../../../src/lro", package = "google-cloud-lro" }
diff --git a/src/generated/cloud/ids/v1/src/model.rs b/src/generated/cloud/ids/v1/src/model.rs
index f33e8d79b..e355b43ea 100755
--- a/src/generated/cloud/ids/v1/src/model.rs
+++ b/src/generated/cloud/ids/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate longrunning;
 extern crate lro;
diff --git a/src/generated/cloud/ids/v1/src/transport.rs b/src/generated/cloud/ids/v1/src/transport.rs
index 158ac6bd1..0c5574f23 100755
--- a/src/generated/cloud/ids/v1/src/transport.rs
+++ b/src/generated/cloud/ids/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [Ids](super::stubs::Ids) using a [gclient::ReqwestClient].
+/// Implements [Ids](super::stubs::Ids) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Ids {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Ids {
@@ -31,8 +31,8 @@ impl std::fmt::Debug for Ids {
 }
 
 impl Ids {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -60,7 +60,7 @@ impl super::stubs::Ids for Ids {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -79,7 +79,7 @@ impl super::stubs::Ids for Ids {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -123,7 +123,7 @@ impl super::stubs::Ids for Ids {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -145,7 +145,7 @@ impl super::stubs::Ids for Ids {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -164,7 +164,7 @@ impl super::stubs::Ids for Ids {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -183,7 +183,7 @@ impl super::stubs::Ids for Ids {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/kms/inventory/v1/Cargo.toml b/src/generated/cloud/kms/inventory/v1/Cargo.toml
index 21ef66d35..86d3c391c 100755
--- a/src/generated/cloud/kms/inventory/v1/Cargo.toml
+++ b/src/generated/cloud/kms/inventory/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
 kms        = { version = "0.2", path = "../../../../../../src/generated/cloud/kms/v1", package = "google-cloud-kms-v1" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
diff --git a/src/generated/cloud/kms/inventory/v1/src/model.rs b/src/generated/cloud/kms/inventory/v1/src/model.rs
index 806ddac51..d49ce6f21 100755
--- a/src/generated/cloud/kms/inventory/v1/src/model.rs
+++ b/src/generated/cloud/kms/inventory/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate kms;
 extern crate lazy_static;
 extern crate reqwest;
diff --git a/src/generated/cloud/kms/inventory/v1/src/transport.rs b/src/generated/cloud/kms/inventory/v1/src/transport.rs
index 25c7e264b..74d9575d0 100755
--- a/src/generated/cloud/kms/inventory/v1/src/transport.rs
+++ b/src/generated/cloud/kms/inventory/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [KeyDashboardService](super::stubs::KeyDashboardService) using a [gclient::ReqwestClient].
+/// Implements [KeyDashboardService](super::stubs::KeyDashboardService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct KeyDashboardService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for KeyDashboardService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for KeyDashboardService {
 }
 
 impl KeyDashboardService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -60,15 +60,15 @@ impl super::stubs::KeyDashboardService for KeyDashboardService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [KeyTrackingService](super::stubs::KeyTrackingService) using a [gclient::ReqwestClient].
+/// Implements [KeyTrackingService](super::stubs::KeyTrackingService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct KeyTrackingService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for KeyTrackingService {
@@ -80,8 +80,8 @@ impl std::fmt::Debug for KeyTrackingService {
 }
 
 impl KeyTrackingService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -105,7 +105,7 @@ impl super::stubs::KeyTrackingService for KeyTrackingService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -134,7 +134,7 @@ impl super::stubs::KeyTrackingService for KeyTrackingService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("resourceTypes", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/cloud/kms/v1/Cargo.toml b/src/generated/cloud/kms/v1/Cargo.toml
index bca1b84ab..b22989ed6 100644
--- a/src/generated/cloud/kms/v1/Cargo.toml
+++ b/src/generated/cloud/kms/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/kms/v1/src/model.rs b/src/generated/cloud/kms/v1/src/model.rs
index 180743731..142f9a0b2 100755
--- a/src/generated/cloud/kms/v1/src/model.rs
+++ b/src/generated/cloud/kms/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/kms/v1/src/transport.rs b/src/generated/cloud/kms/v1/src/transport.rs
index e302d0aa2..9d5fc29ac 100755
--- a/src/generated/cloud/kms/v1/src/transport.rs
+++ b/src/generated/cloud/kms/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [Autokey](super::stubs::Autokey) using a [gclient::ReqwestClient].
+/// Implements [Autokey](super::stubs::Autokey) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Autokey {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Autokey {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for Autokey {
 }
 
 impl Autokey {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -78,7 +78,7 @@ impl super::stubs::Autokey for Autokey {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -103,7 +103,7 @@ impl super::stubs::Autokey for Autokey {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -125,7 +125,7 @@ impl super::stubs::Autokey for Autokey {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -144,7 +144,7 @@ impl super::stubs::Autokey for Autokey {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -192,11 +192,11 @@ impl super::stubs::Autokey for Autokey {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -235,7 +235,7 @@ impl super::stubs::Autokey for Autokey {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -254,10 +254,10 @@ impl super::stubs::Autokey for Autokey {
     }
 }
 
-/// Implements [AutokeyAdmin](super::stubs::AutokeyAdmin) using a [gclient::ReqwestClient].
+/// Implements [AutokeyAdmin](super::stubs::AutokeyAdmin) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct AutokeyAdmin {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for AutokeyAdmin {
@@ -269,8 +269,8 @@ impl std::fmt::Debug for AutokeyAdmin {
 }
 
 impl AutokeyAdmin {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -290,7 +290,7 @@ impl super::stubs::AutokeyAdmin for AutokeyAdmin {
                     "/v1/{}",
                     req.autokey_config
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("autokey_config"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("autokey_config"))?
                         .name
                 ),
             )
@@ -306,7 +306,7 @@ impl super::stubs::AutokeyAdmin for AutokeyAdmin {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -329,7 +329,7 @@ impl super::stubs::AutokeyAdmin for AutokeyAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -351,7 +351,7 @@ impl super::stubs::AutokeyAdmin for AutokeyAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -373,7 +373,7 @@ impl super::stubs::AutokeyAdmin for AutokeyAdmin {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -392,7 +392,7 @@ impl super::stubs::AutokeyAdmin for AutokeyAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -440,11 +440,11 @@ impl super::stubs::AutokeyAdmin for AutokeyAdmin {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -483,15 +483,15 @@ impl super::stubs::AutokeyAdmin for AutokeyAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [EkmService](super::stubs::EkmService) using a [gclient::ReqwestClient].
+/// Implements [EkmService](super::stubs::EkmService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct EkmService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for EkmService {
@@ -503,8 +503,8 @@ impl std::fmt::Debug for EkmService {
 }
 
 impl EkmService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -532,7 +532,7 @@ impl super::stubs::EkmService for EkmService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -551,7 +551,7 @@ impl super::stubs::EkmService for EkmService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -592,7 +592,7 @@ impl super::stubs::EkmService for EkmService {
                     "/v1/{}",
                     req.ekm_connection
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("ekm_connection"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("ekm_connection"))?
                         .name
                 ),
             )
@@ -608,7 +608,7 @@ impl super::stubs::EkmService for EkmService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -631,7 +631,7 @@ impl super::stubs::EkmService for EkmService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -649,7 +649,7 @@ impl super::stubs::EkmService for EkmService {
                     "/v1/{}",
                     req.ekm_config
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("ekm_config"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("ekm_config"))?
                         .name
                 ),
             )
@@ -665,7 +665,7 @@ impl super::stubs::EkmService for EkmService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -691,7 +691,7 @@ impl super::stubs::EkmService for EkmService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -713,7 +713,7 @@ impl super::stubs::EkmService for EkmService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -732,7 +732,7 @@ impl super::stubs::EkmService for EkmService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -780,11 +780,11 @@ impl super::stubs::EkmService for EkmService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -823,15 +823,15 @@ impl super::stubs::EkmService for EkmService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [KeyManagementService](super::stubs::KeyManagementService) using a [gclient::ReqwestClient].
+/// Implements [KeyManagementService](super::stubs::KeyManagementService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct KeyManagementService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for KeyManagementService {
@@ -843,8 +843,8 @@ impl std::fmt::Debug for KeyManagementService {
 }
 
 impl KeyManagementService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -869,7 +869,7 @@ impl super::stubs::KeyManagementService for KeyManagementService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -896,7 +896,7 @@ impl super::stubs::KeyManagementService for KeyManagementService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -923,7 +923,7 @@ impl super::stubs::KeyManagementService for KeyManagementService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -949,7 +949,7 @@ impl super::stubs::KeyManagementService for KeyManagementService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -968,7 +968,7 @@ impl super::stubs::KeyManagementService for KeyManagementService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -987,7 +987,7 @@ impl super::stubs::KeyManagementService for KeyManagementService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1006,7 +1006,7 @@ impl super::stubs::KeyManagementService for KeyManagementService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1026,7 +1026,7 @@ impl super::stubs::KeyManagementService for KeyManagementService {
             );
         let builder = builder.query(&[("publicKeyFormat", &req.public_key_format.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1045,7 +1045,7 @@ impl super::stubs::KeyManagementService for KeyManagementService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1178,7 +1178,7 @@ impl super::stubs::KeyManagementService for KeyManagementService {
                     "/v1/{}",
                     req.crypto_key
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("crypto_key"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("crypto_key"))?
                         .name
                 ),
             )
@@ -1194,7 +1194,7 @@ impl super::stubs::KeyManagementService for KeyManagementService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1216,7 +1216,7 @@ impl super::stubs::KeyManagementService for KeyManagementService {
                     "/v1/{}",
                     req.crypto_key_version
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("crypto_key_version"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("crypto_key_version"))?
                         .name
                 ),
             )
@@ -1232,7 +1232,7 @@ impl super::stubs::KeyManagementService for KeyManagementService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1480,7 +1480,7 @@ impl super::stubs::KeyManagementService for KeyManagementService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1499,7 +1499,7 @@ impl super::stubs::KeyManagementService for KeyManagementService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1547,11 +1547,11 @@ impl super::stubs::KeyManagementService for KeyManagementService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1590,7 +1590,7 @@ impl super::stubs::KeyManagementService for KeyManagementService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/cloud/language/v2/Cargo.toml b/src/generated/cloud/language/v2/Cargo.toml
index 5c5e1b0e3..10f2a382f 100644
--- a/src/generated/cloud/language/v2/Cargo.toml
+++ b/src/generated/cloud/language/v2/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
 serde      = { version = "1", features = ["serde_derive"] }
diff --git a/src/generated/cloud/language/v2/src/model.rs b/src/generated/cloud/language/v2/src/model.rs
index 400fe17c8..1457df242 100755
--- a/src/generated/cloud/language/v2/src/model.rs
+++ b/src/generated/cloud/language/v2/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate reqwest;
 extern crate serde;
diff --git a/src/generated/cloud/language/v2/src/transport.rs b/src/generated/cloud/language/v2/src/transport.rs
index 111de037f..1472aba7c 100755
--- a/src/generated/cloud/language/v2/src/transport.rs
+++ b/src/generated/cloud/language/v2/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [LanguageService](super::stubs::LanguageService) using a [gclient::ReqwestClient].
+/// Implements [LanguageService](super::stubs::LanguageService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct LanguageService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for LanguageService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for LanguageService {
 }
 
 impl LanguageService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
diff --git a/src/generated/cloud/location/Cargo.toml b/src/generated/cloud/location/Cargo.toml
index 463d5546f..928d0e9dd 100644
--- a/src/generated/cloud/location/Cargo.toml
+++ b/src/generated/cloud/location/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
 serde      = { version = "1", features = ["serde_derive"] }
diff --git a/src/generated/cloud/location/src/model.rs b/src/generated/cloud/location/src/model.rs
index ee5a8aa96..8a6774642 100755
--- a/src/generated/cloud/location/src/model.rs
+++ b/src/generated/cloud/location/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate reqwest;
 extern crate serde;
diff --git a/src/generated/cloud/location/src/transport.rs b/src/generated/cloud/location/src/transport.rs
index 02c5fd03b..d5c399d04 100755
--- a/src/generated/cloud/location/src/transport.rs
+++ b/src/generated/cloud/location/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [Locations](super::stubs::Locations) using a [gclient::ReqwestClient].
+/// Implements [Locations](super::stubs::Locations) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Locations {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Locations {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for Locations {
 }
 
 impl Locations {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -58,7 +58,7 @@ impl super::stubs::Locations for Locations {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -77,7 +77,7 @@ impl super::stubs::Locations for Locations {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/cloud/managedidentities/v1/Cargo.toml b/src/generated/cloud/managedidentities/v1/Cargo.toml
index e21e464f4..3cc046d33 100644
--- a/src/generated/cloud/managedidentities/v1/Cargo.toml
+++ b/src/generated/cloud/managedidentities/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
 lro        = { version = "0.1", path = "../../../../../src/lro", package = "google-cloud-lro" }
diff --git a/src/generated/cloud/managedidentities/v1/src/model.rs b/src/generated/cloud/managedidentities/v1/src/model.rs
index dd555af42..7a307a3b1 100755
--- a/src/generated/cloud/managedidentities/v1/src/model.rs
+++ b/src/generated/cloud/managedidentities/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate longrunning;
 extern crate lro;
diff --git a/src/generated/cloud/managedidentities/v1/src/transport.rs b/src/generated/cloud/managedidentities/v1/src/transport.rs
index 37c5f8780..3ec5a3950 100755
--- a/src/generated/cloud/managedidentities/v1/src/transport.rs
+++ b/src/generated/cloud/managedidentities/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [ManagedIdentitiesService](super::stubs::ManagedIdentitiesService) using a [gclient::ReqwestClient].
+/// Implements [ManagedIdentitiesService](super::stubs::ManagedIdentitiesService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ManagedIdentitiesService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ManagedIdentitiesService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for ManagedIdentitiesService {
 }
 
 impl ManagedIdentitiesService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -97,7 +97,7 @@ impl super::stubs::ManagedIdentitiesService for ManagedIdentitiesService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -116,7 +116,7 @@ impl super::stubs::ManagedIdentitiesService for ManagedIdentitiesService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -134,7 +134,7 @@ impl super::stubs::ManagedIdentitiesService for ManagedIdentitiesService {
                     "/v1/{}",
                     req.domain
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("domain"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("domain"))?
                         .name
                 ),
             )
@@ -150,7 +150,7 @@ impl super::stubs::ManagedIdentitiesService for ManagedIdentitiesService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.domain), options).await
@@ -171,7 +171,7 @@ impl super::stubs::ManagedIdentitiesService for ManagedIdentitiesService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -273,7 +273,7 @@ impl super::stubs::ManagedIdentitiesService for ManagedIdentitiesService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -292,7 +292,7 @@ impl super::stubs::ManagedIdentitiesService for ManagedIdentitiesService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -311,7 +311,7 @@ impl super::stubs::ManagedIdentitiesService for ManagedIdentitiesService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/memcache/v1/Cargo.toml b/src/generated/cloud/memcache/v1/Cargo.toml
index 19b49b0f9..09b9e4ad9 100644
--- a/src/generated/cloud/memcache/v1/Cargo.toml
+++ b/src/generated/cloud/memcache/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/memcache/v1/src/model.rs b/src/generated/cloud/memcache/v1/src/model.rs
index d80a6248a..b48040cfc 100755
--- a/src/generated/cloud/memcache/v1/src/model.rs
+++ b/src/generated/cloud/memcache/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/memcache/v1/src/transport.rs b/src/generated/cloud/memcache/v1/src/transport.rs
index 5c862520f..3d5003e88 100755
--- a/src/generated/cloud/memcache/v1/src/transport.rs
+++ b/src/generated/cloud/memcache/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [CloudMemcache](super::stubs::CloudMemcache) using a [gclient::ReqwestClient].
+/// Implements [CloudMemcache](super::stubs::CloudMemcache) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct CloudMemcache {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for CloudMemcache {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for CloudMemcache {
 }
 
 impl CloudMemcache {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::CloudMemcache for CloudMemcache {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -81,7 +81,7 @@ impl super::stubs::CloudMemcache for CloudMemcache {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -122,7 +122,7 @@ impl super::stubs::CloudMemcache for CloudMemcache {
                     "/v1/{}",
                     req.instance
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("instance"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("instance"))?
                         .name
                 ),
             )
@@ -138,7 +138,7 @@ impl super::stubs::CloudMemcache for CloudMemcache {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -181,7 +181,7 @@ impl super::stubs::CloudMemcache for CloudMemcache {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -243,7 +243,7 @@ impl super::stubs::CloudMemcache for CloudMemcache {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -262,7 +262,7 @@ impl super::stubs::CloudMemcache for CloudMemcache {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -284,7 +284,7 @@ impl super::stubs::CloudMemcache for CloudMemcache {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -303,7 +303,7 @@ impl super::stubs::CloudMemcache for CloudMemcache {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -322,7 +322,7 @@ impl super::stubs::CloudMemcache for CloudMemcache {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/memorystore/v1/Cargo.toml b/src/generated/cloud/memorystore/v1/Cargo.toml
index b37adcc68..2f0f3374e 100644
--- a/src/generated/cloud/memorystore/v1/Cargo.toml
+++ b/src/generated/cloud/memorystore/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/memorystore/v1/src/model.rs b/src/generated/cloud/memorystore/v1/src/model.rs
index d8686bb9d..9a80afde7 100755
--- a/src/generated/cloud/memorystore/v1/src/model.rs
+++ b/src/generated/cloud/memorystore/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate location;
 extern crate longrunning;
diff --git a/src/generated/cloud/memorystore/v1/src/transport.rs b/src/generated/cloud/memorystore/v1/src/transport.rs
index 8ac00a4df..0b865f57d 100755
--- a/src/generated/cloud/memorystore/v1/src/transport.rs
+++ b/src/generated/cloud/memorystore/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [Memorystore](super::stubs::Memorystore) using a [gclient::ReqwestClient].
+/// Implements [Memorystore](super::stubs::Memorystore) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Memorystore {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Memorystore {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for Memorystore {
 }
 
 impl Memorystore {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::Memorystore for Memorystore {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -81,7 +81,7 @@ impl super::stubs::Memorystore for Memorystore {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -123,7 +123,7 @@ impl super::stubs::Memorystore for Memorystore {
                     "/v1/{}",
                     req.instance
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("instance"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("instance"))?
                         .name
                 ),
             )
@@ -139,7 +139,7 @@ impl super::stubs::Memorystore for Memorystore {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -164,7 +164,7 @@ impl super::stubs::Memorystore for Memorystore {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -186,7 +186,7 @@ impl super::stubs::Memorystore for Memorystore {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -208,7 +208,7 @@ impl super::stubs::Memorystore for Memorystore {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -227,7 +227,7 @@ impl super::stubs::Memorystore for Memorystore {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -249,7 +249,7 @@ impl super::stubs::Memorystore for Memorystore {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -268,7 +268,7 @@ impl super::stubs::Memorystore for Memorystore {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -287,7 +287,7 @@ impl super::stubs::Memorystore for Memorystore {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -306,7 +306,7 @@ impl super::stubs::Memorystore for Memorystore {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/metastore/v1/Cargo.toml b/src/generated/cloud/metastore/v1/Cargo.toml
index 4783c607e..4ad4b9219 100644
--- a/src/generated/cloud/metastore/v1/Cargo.toml
+++ b/src/generated/cloud/metastore/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
diff --git a/src/generated/cloud/metastore/v1/src/model.rs b/src/generated/cloud/metastore/v1/src/model.rs
index 8b7c9c330..b99554a4d 100755
--- a/src/generated/cloud/metastore/v1/src/model.rs
+++ b/src/generated/cloud/metastore/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate iam_v1;
 extern crate lazy_static;
diff --git a/src/generated/cloud/metastore/v1/src/transport.rs b/src/generated/cloud/metastore/v1/src/transport.rs
index f52612f98..3fc668aa7 100755
--- a/src/generated/cloud/metastore/v1/src/transport.rs
+++ b/src/generated/cloud/metastore/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [DataprocMetastore](super::stubs::DataprocMetastore) using a [gclient::ReqwestClient].
+/// Implements [DataprocMetastore](super::stubs::DataprocMetastore) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct DataprocMetastore {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for DataprocMetastore {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for DataprocMetastore {
 }
 
 impl DataprocMetastore {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -59,7 +59,7 @@ impl super::stubs::DataprocMetastore for DataprocMetastore {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -78,7 +78,7 @@ impl super::stubs::DataprocMetastore for DataprocMetastore {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -120,7 +120,7 @@ impl super::stubs::DataprocMetastore for DataprocMetastore {
                     "/v1/{}",
                     req.service
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("service"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("service"))?
                         .name
                 ),
             )
@@ -136,7 +136,7 @@ impl super::stubs::DataprocMetastore for DataprocMetastore {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -161,7 +161,7 @@ impl super::stubs::DataprocMetastore for DataprocMetastore {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -187,7 +187,7 @@ impl super::stubs::DataprocMetastore for DataprocMetastore {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -206,7 +206,7 @@ impl super::stubs::DataprocMetastore for DataprocMetastore {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -248,7 +248,7 @@ impl super::stubs::DataprocMetastore for DataprocMetastore {
                     "/v1/{}",
                     req.metadata_import
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("metadata_import"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("metadata_import"))?
                         .name
                 ),
             )
@@ -264,7 +264,7 @@ impl super::stubs::DataprocMetastore for DataprocMetastore {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -332,7 +332,7 @@ impl super::stubs::DataprocMetastore for DataprocMetastore {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -351,7 +351,7 @@ impl super::stubs::DataprocMetastore for DataprocMetastore {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -390,7 +390,7 @@ impl super::stubs::DataprocMetastore for DataprocMetastore {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -472,7 +472,7 @@ impl super::stubs::DataprocMetastore for DataprocMetastore {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -491,7 +491,7 @@ impl super::stubs::DataprocMetastore for DataprocMetastore {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -539,11 +539,11 @@ impl super::stubs::DataprocMetastore for DataprocMetastore {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -585,7 +585,7 @@ impl super::stubs::DataprocMetastore for DataprocMetastore {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -604,7 +604,7 @@ impl super::stubs::DataprocMetastore for DataprocMetastore {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -623,7 +623,7 @@ impl super::stubs::DataprocMetastore for DataprocMetastore {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -659,10 +659,10 @@ impl super::stubs::DataprocMetastore for DataprocMetastore {
     }
 }
 
-/// Implements [DataprocMetastoreFederation](super::stubs::DataprocMetastoreFederation) using a [gclient::ReqwestClient].
+/// Implements [DataprocMetastoreFederation](super::stubs::DataprocMetastoreFederation) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct DataprocMetastoreFederation {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for DataprocMetastoreFederation {
@@ -674,8 +674,8 @@ impl std::fmt::Debug for DataprocMetastoreFederation {
 }
 
 impl DataprocMetastoreFederation {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -703,7 +703,7 @@ impl super::stubs::DataprocMetastoreFederation for DataprocMetastoreFederation {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -722,7 +722,7 @@ impl super::stubs::DataprocMetastoreFederation for DataprocMetastoreFederation {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -764,7 +764,7 @@ impl super::stubs::DataprocMetastoreFederation for DataprocMetastoreFederation {
                     "/v1/{}",
                     req.federation
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("federation"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("federation"))?
                         .name
                 ),
             )
@@ -780,7 +780,7 @@ impl super::stubs::DataprocMetastoreFederation for DataprocMetastoreFederation {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -805,7 +805,7 @@ impl super::stubs::DataprocMetastoreFederation for DataprocMetastoreFederation {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -827,7 +827,7 @@ impl super::stubs::DataprocMetastoreFederation for DataprocMetastoreFederation {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -846,7 +846,7 @@ impl super::stubs::DataprocMetastoreFederation for DataprocMetastoreFederation {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -894,11 +894,11 @@ impl super::stubs::DataprocMetastoreFederation for DataprocMetastoreFederation {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -940,7 +940,7 @@ impl super::stubs::DataprocMetastoreFederation for DataprocMetastoreFederation {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -959,7 +959,7 @@ impl super::stubs::DataprocMetastoreFederation for DataprocMetastoreFederation {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -978,7 +978,7 @@ impl super::stubs::DataprocMetastoreFederation for DataprocMetastoreFederation {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/migrationcenter/v1/Cargo.toml b/src/generated/cloud/migrationcenter/v1/Cargo.toml
index f358d6b84..a8a46d341 100644
--- a/src/generated/cloud/migrationcenter/v1/Cargo.toml
+++ b/src/generated/cloud/migrationcenter/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/migrationcenter/v1/src/model.rs b/src/generated/cloud/migrationcenter/v1/src/model.rs
index 9ef37ad91..1c3e22962 100755
--- a/src/generated/cloud/migrationcenter/v1/src/model.rs
+++ b/src/generated/cloud/migrationcenter/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/migrationcenter/v1/src/transport.rs b/src/generated/cloud/migrationcenter/v1/src/transport.rs
index b37ee4ec3..42906aa1a 100755
--- a/src/generated/cloud/migrationcenter/v1/src/transport.rs
+++ b/src/generated/cloud/migrationcenter/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [MigrationCenter](super::stubs::MigrationCenter) using a [gclient::ReqwestClient].
+/// Implements [MigrationCenter](super::stubs::MigrationCenter) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct MigrationCenter {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for MigrationCenter {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for MigrationCenter {
 }
 
 impl MigrationCenter {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -60,7 +60,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -80,7 +80,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
             );
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -98,7 +98,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
                     "/v1/{}",
                     req.asset
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("asset"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("asset"))?
                         .name
                 ),
             )
@@ -114,7 +114,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -157,7 +157,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -269,7 +269,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -289,7 +289,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
             );
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -310,7 +310,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
         let builder = builder.query(&[("requestId", &req.request_id)]);
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -328,7 +328,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
                     "/v1/{}",
                     req.import_job
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("import_job"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("import_job"))?
                         .name
                 ),
             )
@@ -344,7 +344,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -402,7 +402,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -428,7 +428,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -472,7 +472,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -495,7 +495,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -514,7 +514,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -551,7 +551,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
                     "/v1/{}",
                     req.group
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("group"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("group"))?
                         .name
                 ),
             )
@@ -567,7 +567,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -590,7 +590,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -655,7 +655,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -675,7 +675,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
             );
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -698,7 +698,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -717,7 +717,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -754,7 +754,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
                     "/v1/{}",
                     req.source
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("source"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("source"))?
                         .name
                 ),
             )
@@ -770,7 +770,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -793,7 +793,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -818,7 +818,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -837,7 +837,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -879,7 +879,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
                     "/v1/{}",
                     req.preference_set
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("preference_set"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("preference_set"))?
                         .name
                 ),
             )
@@ -895,7 +895,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -920,7 +920,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -939,7 +939,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -957,7 +957,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
                     "/v1/{}",
                     req.settings
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("settings"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("settings"))?
                         .name
                 ),
             )
@@ -973,7 +973,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -1021,7 +1021,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1047,7 +1047,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1068,7 +1068,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
         let builder = builder.query(&[("requestId", &req.request_id)]);
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1107,7 +1107,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
             );
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1131,7 +1131,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1151,7 +1151,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1173,7 +1173,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1192,7 +1192,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1214,7 +1214,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1233,7 +1233,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1252,7 +1252,7 @@ impl super::stubs::MigrationCenter for MigrationCenter {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/modelarmor/v1/Cargo.toml b/src/generated/cloud/modelarmor/v1/Cargo.toml
index 15992df3f..8d7e96860 100644
--- a/src/generated/cloud/modelarmor/v1/Cargo.toml
+++ b/src/generated/cloud/modelarmor/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
 reqwest    = { version = "0.12", features = ["json"] }
diff --git a/src/generated/cloud/modelarmor/v1/src/model.rs b/src/generated/cloud/modelarmor/v1/src/model.rs
index 7e6bc20a4..3aecee106 100755
--- a/src/generated/cloud/modelarmor/v1/src/model.rs
+++ b/src/generated/cloud/modelarmor/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate location;
 extern crate reqwest;
diff --git a/src/generated/cloud/modelarmor/v1/src/transport.rs b/src/generated/cloud/modelarmor/v1/src/transport.rs
index 5f537321b..ba67bcf0c 100755
--- a/src/generated/cloud/modelarmor/v1/src/transport.rs
+++ b/src/generated/cloud/modelarmor/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [ModelArmor](super::stubs::ModelArmor) using a [gclient::ReqwestClient].
+/// Implements [ModelArmor](super::stubs::ModelArmor) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ModelArmor {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ModelArmor {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for ModelArmor {
 }
 
 impl ModelArmor {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::ModelArmor for ModelArmor {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -81,7 +81,7 @@ impl super::stubs::ModelArmor for ModelArmor {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -123,7 +123,7 @@ impl super::stubs::ModelArmor for ModelArmor {
                     "/v1/{}",
                     req.template
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("template"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("template"))?
                         .name
                 ),
             )
@@ -139,7 +139,7 @@ impl super::stubs::ModelArmor for ModelArmor {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -164,7 +164,7 @@ impl super::stubs::ModelArmor for ModelArmor {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -183,7 +183,7 @@ impl super::stubs::ModelArmor for ModelArmor {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -201,7 +201,7 @@ impl super::stubs::ModelArmor for ModelArmor {
                     "/v1/{}",
                     req.floor_setting
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("floor_setting"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("floor_setting"))?
                         .name
                 ),
             )
@@ -217,7 +217,7 @@ impl super::stubs::ModelArmor for ModelArmor {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -283,7 +283,7 @@ impl super::stubs::ModelArmor for ModelArmor {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -302,7 +302,7 @@ impl super::stubs::ModelArmor for ModelArmor {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/cloud/netapp/v1/Cargo.toml b/src/generated/cloud/netapp/v1/Cargo.toml
index 2ba0943fe..460c844c2 100644
--- a/src/generated/cloud/netapp/v1/Cargo.toml
+++ b/src/generated/cloud/netapp/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/netapp/v1/src/model.rs b/src/generated/cloud/netapp/v1/src/model.rs
index 58dcef151..ff6118042 100755
--- a/src/generated/cloud/netapp/v1/src/model.rs
+++ b/src/generated/cloud/netapp/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate location;
 extern crate longrunning;
diff --git a/src/generated/cloud/netapp/v1/src/transport.rs b/src/generated/cloud/netapp/v1/src/transport.rs
index bbba74a7e..cc3fe0d74 100755
--- a/src/generated/cloud/netapp/v1/src/transport.rs
+++ b/src/generated/cloud/netapp/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [NetApp](super::stubs::NetApp) using a [gclient::ReqwestClient].
+/// Implements [NetApp](super::stubs::NetApp) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct NetApp {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for NetApp {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for NetApp {
 }
 
 impl NetApp {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::NetApp for NetApp {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -104,7 +104,7 @@ impl super::stubs::NetApp for NetApp {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -122,7 +122,7 @@ impl super::stubs::NetApp for NetApp {
                     "/v1/{}",
                     req.storage_pool
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("storage_pool"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("storage_pool"))?
                         .name
                 ),
             )
@@ -138,7 +138,7 @@ impl super::stubs::NetApp for NetApp {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -161,7 +161,7 @@ impl super::stubs::NetApp for NetApp {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -221,7 +221,7 @@ impl super::stubs::NetApp for NetApp {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -240,7 +240,7 @@ impl super::stubs::NetApp for NetApp {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -276,7 +276,7 @@ impl super::stubs::NetApp for NetApp {
                     "/v1/{}",
                     req.volume
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("volume"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("volume"))?
                         .name
                 ),
             )
@@ -292,7 +292,7 @@ impl super::stubs::NetApp for NetApp {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.volume), options).await
@@ -314,7 +314,7 @@ impl super::stubs::NetApp for NetApp {
             );
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -357,7 +357,7 @@ impl super::stubs::NetApp for NetApp {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -376,7 +376,7 @@ impl super::stubs::NetApp for NetApp {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -418,7 +418,7 @@ impl super::stubs::NetApp for NetApp {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -436,7 +436,7 @@ impl super::stubs::NetApp for NetApp {
                     "/v1/{}",
                     req.snapshot
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("snapshot"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("snapshot"))?
                         .name
                 ),
             )
@@ -452,7 +452,7 @@ impl super::stubs::NetApp for NetApp {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -482,7 +482,7 @@ impl super::stubs::NetApp for NetApp {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -501,7 +501,7 @@ impl super::stubs::NetApp for NetApp {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -542,7 +542,7 @@ impl super::stubs::NetApp for NetApp {
                     "/v1/{}",
                     req.active_directory
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("active_directory"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("active_directory"))?
                         .name
                 ),
             )
@@ -558,7 +558,7 @@ impl super::stubs::NetApp for NetApp {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -581,7 +581,7 @@ impl super::stubs::NetApp for NetApp {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -607,7 +607,7 @@ impl super::stubs::NetApp for NetApp {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -649,7 +649,7 @@ impl super::stubs::NetApp for NetApp {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -667,7 +667,7 @@ impl super::stubs::NetApp for NetApp {
                     "/v1/{}",
                     req.kms_config
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("kms_config"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("kms_config"))?
                         .name
                 ),
             )
@@ -683,7 +683,7 @@ impl super::stubs::NetApp for NetApp {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -740,7 +740,7 @@ impl super::stubs::NetApp for NetApp {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -766,7 +766,7 @@ impl super::stubs::NetApp for NetApp {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -785,7 +785,7 @@ impl super::stubs::NetApp for NetApp {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -827,7 +827,7 @@ impl super::stubs::NetApp for NetApp {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -845,7 +845,7 @@ impl super::stubs::NetApp for NetApp {
                     "/v1/{}",
                     req.replication
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("replication"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("replication"))?
                         .name
                 ),
             )
@@ -861,7 +861,7 @@ impl super::stubs::NetApp for NetApp {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -998,7 +998,7 @@ impl super::stubs::NetApp for NetApp {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1024,7 +1024,7 @@ impl super::stubs::NetApp for NetApp {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1042,7 +1042,7 @@ impl super::stubs::NetApp for NetApp {
                     "/v1/{}",
                     req.backup_vault
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("backup_vault"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("backup_vault"))?
                         .name
                 ),
             )
@@ -1058,7 +1058,7 @@ impl super::stubs::NetApp for NetApp {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1081,7 +1081,7 @@ impl super::stubs::NetApp for NetApp {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1118,7 +1118,7 @@ impl super::stubs::NetApp for NetApp {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1141,7 +1141,7 @@ impl super::stubs::NetApp for NetApp {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1160,7 +1160,7 @@ impl super::stubs::NetApp for NetApp {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1178,7 +1178,7 @@ impl super::stubs::NetApp for NetApp {
                     "/v1/{}",
                     req.backup
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("backup"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("backup"))?
                         .name
                 ),
             )
@@ -1194,7 +1194,7 @@ impl super::stubs::NetApp for NetApp {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.backup), options).await
@@ -1238,7 +1238,7 @@ impl super::stubs::NetApp for NetApp {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1264,7 +1264,7 @@ impl super::stubs::NetApp for NetApp {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1282,7 +1282,7 @@ impl super::stubs::NetApp for NetApp {
                     "/v1/{}",
                     req.backup_policy
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("backup_policy"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("backup_policy"))?
                         .name
                 ),
             )
@@ -1298,7 +1298,7 @@ impl super::stubs::NetApp for NetApp {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1321,7 +1321,7 @@ impl super::stubs::NetApp for NetApp {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1347,7 +1347,7 @@ impl super::stubs::NetApp for NetApp {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1366,7 +1366,7 @@ impl super::stubs::NetApp for NetApp {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1407,7 +1407,7 @@ impl super::stubs::NetApp for NetApp {
                     "/v1/{}",
                     req.quota_rule
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("quota_rule"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("quota_rule"))?
                         .name
                 ),
             )
@@ -1423,7 +1423,7 @@ impl super::stubs::NetApp for NetApp {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1446,7 +1446,7 @@ impl super::stubs::NetApp for NetApp {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1468,7 +1468,7 @@ impl super::stubs::NetApp for NetApp {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1487,7 +1487,7 @@ impl super::stubs::NetApp for NetApp {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1509,7 +1509,7 @@ impl super::stubs::NetApp for NetApp {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1528,7 +1528,7 @@ impl super::stubs::NetApp for NetApp {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1547,7 +1547,7 @@ impl super::stubs::NetApp for NetApp {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/networkconnectivity/v1/Cargo.toml b/src/generated/cloud/networkconnectivity/v1/Cargo.toml
index 5b3937c7d..51417c881 100644
--- a/src/generated/cloud/networkconnectivity/v1/Cargo.toml
+++ b/src/generated/cloud/networkconnectivity/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/networkconnectivity/v1/src/model.rs b/src/generated/cloud/networkconnectivity/v1/src/model.rs
index 1ad07e6fe..63cbad660 100755
--- a/src/generated/cloud/networkconnectivity/v1/src/model.rs
+++ b/src/generated/cloud/networkconnectivity/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/networkconnectivity/v1/src/transport.rs b/src/generated/cloud/networkconnectivity/v1/src/transport.rs
index 506eb6117..287d5bb88 100755
--- a/src/generated/cloud/networkconnectivity/v1/src/transport.rs
+++ b/src/generated/cloud/networkconnectivity/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [HubService](super::stubs::HubService) using a [gclient::ReqwestClient].
+/// Implements [HubService](super::stubs::HubService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct HubService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for HubService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for HubService {
 }
 
 impl HubService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -59,7 +59,7 @@ impl super::stubs::HubService for HubService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -78,7 +78,7 @@ impl super::stubs::HubService for HubService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -115,7 +115,7 @@ impl super::stubs::HubService for HubService {
                     "/v1/{}",
                     req.hub
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("hub"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("hub"))?
                         .name
                 ),
             )
@@ -131,7 +131,7 @@ impl super::stubs::HubService for HubService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -154,7 +154,7 @@ impl super::stubs::HubService for HubService {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -181,7 +181,7 @@ impl super::stubs::HubService for HubService {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -208,7 +208,7 @@ impl super::stubs::HubService for HubService {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("groupBy", &req.group_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -231,7 +231,7 @@ impl super::stubs::HubService for HubService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -250,7 +250,7 @@ impl super::stubs::HubService for HubService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -287,7 +287,7 @@ impl super::stubs::HubService for HubService {
                     "/v1/{}",
                     req.spoke
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("spoke"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("spoke"))?
                         .name
                 ),
             )
@@ -303,7 +303,7 @@ impl super::stubs::HubService for HubService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -366,7 +366,7 @@ impl super::stubs::HubService for HubService {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -385,7 +385,7 @@ impl super::stubs::HubService for HubService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -404,7 +404,7 @@ impl super::stubs::HubService for HubService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -427,7 +427,7 @@ impl super::stubs::HubService for HubService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -453,7 +453,7 @@ impl super::stubs::HubService for HubService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -472,7 +472,7 @@ impl super::stubs::HubService for HubService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -495,7 +495,7 @@ impl super::stubs::HubService for HubService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -513,7 +513,7 @@ impl super::stubs::HubService for HubService {
                     "/v1/{}",
                     req.group
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("group"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("group"))?
                         .name
                 ),
             )
@@ -529,7 +529,7 @@ impl super::stubs::HubService for HubService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -554,7 +554,7 @@ impl super::stubs::HubService for HubService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -573,7 +573,7 @@ impl super::stubs::HubService for HubService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -621,11 +621,11 @@ impl super::stubs::HubService for HubService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -667,7 +667,7 @@ impl super::stubs::HubService for HubService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -686,7 +686,7 @@ impl super::stubs::HubService for HubService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -705,7 +705,7 @@ impl super::stubs::HubService for HubService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -741,10 +741,10 @@ impl super::stubs::HubService for HubService {
     }
 }
 
-/// Implements [PolicyBasedRoutingService](super::stubs::PolicyBasedRoutingService) using a [gclient::ReqwestClient].
+/// Implements [PolicyBasedRoutingService](super::stubs::PolicyBasedRoutingService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct PolicyBasedRoutingService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for PolicyBasedRoutingService {
@@ -756,8 +756,8 @@ impl std::fmt::Debug for PolicyBasedRoutingService {
 }
 
 impl PolicyBasedRoutingService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -785,7 +785,7 @@ impl super::stubs::PolicyBasedRoutingService for PolicyBasedRoutingService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -804,7 +804,7 @@ impl super::stubs::PolicyBasedRoutingService for PolicyBasedRoutingService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -848,7 +848,7 @@ impl super::stubs::PolicyBasedRoutingService for PolicyBasedRoutingService {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -870,7 +870,7 @@ impl super::stubs::PolicyBasedRoutingService for PolicyBasedRoutingService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -889,7 +889,7 @@ impl super::stubs::PolicyBasedRoutingService for PolicyBasedRoutingService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -937,11 +937,11 @@ impl super::stubs::PolicyBasedRoutingService for PolicyBasedRoutingService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -983,7 +983,7 @@ impl super::stubs::PolicyBasedRoutingService for PolicyBasedRoutingService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1002,7 +1002,7 @@ impl super::stubs::PolicyBasedRoutingService for PolicyBasedRoutingService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1021,7 +1021,7 @@ impl super::stubs::PolicyBasedRoutingService for PolicyBasedRoutingService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/networkmanagement/v1/Cargo.toml b/src/generated/cloud/networkmanagement/v1/Cargo.toml
index e8f5db413..77c0e7225 100644
--- a/src/generated/cloud/networkmanagement/v1/Cargo.toml
+++ b/src/generated/cloud/networkmanagement/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/networkmanagement/v1/src/model.rs b/src/generated/cloud/networkmanagement/v1/src/model.rs
index c22d12361..039edd36c 100755
--- a/src/generated/cloud/networkmanagement/v1/src/model.rs
+++ b/src/generated/cloud/networkmanagement/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/networkmanagement/v1/src/transport.rs b/src/generated/cloud/networkmanagement/v1/src/transport.rs
index 84c6ac89f..3e59ab8e0 100755
--- a/src/generated/cloud/networkmanagement/v1/src/transport.rs
+++ b/src/generated/cloud/networkmanagement/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [ReachabilityService](super::stubs::ReachabilityService) using a [gclient::ReqwestClient].
+/// Implements [ReachabilityService](super::stubs::ReachabilityService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ReachabilityService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ReachabilityService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for ReachabilityService {
 }
 
 impl ReachabilityService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::ReachabilityService for ReachabilityService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -81,7 +81,7 @@ impl super::stubs::ReachabilityService for ReachabilityService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -122,7 +122,7 @@ impl super::stubs::ReachabilityService for ReachabilityService {
                     "/v1/{}",
                     req.resource
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("resource"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("resource"))?
                         .name
                 ),
             )
@@ -138,7 +138,7 @@ impl super::stubs::ReachabilityService for ReachabilityService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -178,7 +178,7 @@ impl super::stubs::ReachabilityService for ReachabilityService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -200,7 +200,7 @@ impl super::stubs::ReachabilityService for ReachabilityService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -219,7 +219,7 @@ impl super::stubs::ReachabilityService for ReachabilityService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -267,11 +267,11 @@ impl super::stubs::ReachabilityService for ReachabilityService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -313,7 +313,7 @@ impl super::stubs::ReachabilityService for ReachabilityService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -332,7 +332,7 @@ impl super::stubs::ReachabilityService for ReachabilityService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -351,7 +351,7 @@ impl super::stubs::ReachabilityService for ReachabilityService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -387,10 +387,10 @@ impl super::stubs::ReachabilityService for ReachabilityService {
     }
 }
 
-/// Implements [VpcFlowLogsService](super::stubs::VpcFlowLogsService) using a [gclient::ReqwestClient].
+/// Implements [VpcFlowLogsService](super::stubs::VpcFlowLogsService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct VpcFlowLogsService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for VpcFlowLogsService {
@@ -402,8 +402,8 @@ impl std::fmt::Debug for VpcFlowLogsService {
 }
 
 impl VpcFlowLogsService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -431,7 +431,7 @@ impl super::stubs::VpcFlowLogsService for VpcFlowLogsService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -450,7 +450,7 @@ impl super::stubs::VpcFlowLogsService for VpcFlowLogsService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -491,7 +491,7 @@ impl super::stubs::VpcFlowLogsService for VpcFlowLogsService {
                     "/v1/{}",
                     req.vpc_flow_logs_config
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("vpc_flow_logs_config"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("vpc_flow_logs_config"))?
                         .name
                 ),
             )
@@ -507,7 +507,7 @@ impl super::stubs::VpcFlowLogsService for VpcFlowLogsService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -530,7 +530,7 @@ impl super::stubs::VpcFlowLogsService for VpcFlowLogsService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -552,7 +552,7 @@ impl super::stubs::VpcFlowLogsService for VpcFlowLogsService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -571,7 +571,7 @@ impl super::stubs::VpcFlowLogsService for VpcFlowLogsService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -619,11 +619,11 @@ impl super::stubs::VpcFlowLogsService for VpcFlowLogsService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -665,7 +665,7 @@ impl super::stubs::VpcFlowLogsService for VpcFlowLogsService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -684,7 +684,7 @@ impl super::stubs::VpcFlowLogsService for VpcFlowLogsService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -703,7 +703,7 @@ impl super::stubs::VpcFlowLogsService for VpcFlowLogsService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/networksecurity/v1/Cargo.toml b/src/generated/cloud/networksecurity/v1/Cargo.toml
index 1cce9be21..d8cf2a63c 100644
--- a/src/generated/cloud/networksecurity/v1/Cargo.toml
+++ b/src/generated/cloud/networksecurity/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/networksecurity/v1/src/model.rs b/src/generated/cloud/networksecurity/v1/src/model.rs
index 46d2770fe..835b96705 100755
--- a/src/generated/cloud/networksecurity/v1/src/model.rs
+++ b/src/generated/cloud/networksecurity/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/networksecurity/v1/src/transport.rs b/src/generated/cloud/networksecurity/v1/src/transport.rs
index 13e9e1c5c..72da91042 100755
--- a/src/generated/cloud/networksecurity/v1/src/transport.rs
+++ b/src/generated/cloud/networksecurity/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [NetworkSecurity](super::stubs::NetworkSecurity) using a [gclient::ReqwestClient].
+/// Implements [NetworkSecurity](super::stubs::NetworkSecurity) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct NetworkSecurity {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for NetworkSecurity {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for NetworkSecurity {
 }
 
 impl NetworkSecurity {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -60,7 +60,7 @@ impl super::stubs::NetworkSecurity for NetworkSecurity {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -79,7 +79,7 @@ impl super::stubs::NetworkSecurity for NetworkSecurity {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -120,7 +120,7 @@ impl super::stubs::NetworkSecurity for NetworkSecurity {
                     "/v1/{}",
                     req.authorization_policy
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("authorization_policy"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("authorization_policy"))?
                         .name
                 ),
             )
@@ -136,7 +136,7 @@ impl super::stubs::NetworkSecurity for NetworkSecurity {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -159,7 +159,7 @@ impl super::stubs::NetworkSecurity for NetworkSecurity {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -183,7 +183,7 @@ impl super::stubs::NetworkSecurity for NetworkSecurity {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -202,7 +202,7 @@ impl super::stubs::NetworkSecurity for NetworkSecurity {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -243,7 +243,7 @@ impl super::stubs::NetworkSecurity for NetworkSecurity {
                     "/v1/{}",
                     req.server_tls_policy
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("server_tls_policy"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("server_tls_policy"))?
                         .name
                 ),
             )
@@ -259,7 +259,7 @@ impl super::stubs::NetworkSecurity for NetworkSecurity {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -282,7 +282,7 @@ impl super::stubs::NetworkSecurity for NetworkSecurity {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -306,7 +306,7 @@ impl super::stubs::NetworkSecurity for NetworkSecurity {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -325,7 +325,7 @@ impl super::stubs::NetworkSecurity for NetworkSecurity {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -366,7 +366,7 @@ impl super::stubs::NetworkSecurity for NetworkSecurity {
                     "/v1/{}",
                     req.client_tls_policy
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("client_tls_policy"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("client_tls_policy"))?
                         .name
                 ),
             )
@@ -382,7 +382,7 @@ impl super::stubs::NetworkSecurity for NetworkSecurity {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -405,7 +405,7 @@ impl super::stubs::NetworkSecurity for NetworkSecurity {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -427,7 +427,7 @@ impl super::stubs::NetworkSecurity for NetworkSecurity {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -446,7 +446,7 @@ impl super::stubs::NetworkSecurity for NetworkSecurity {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -494,11 +494,11 @@ impl super::stubs::NetworkSecurity for NetworkSecurity {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -540,7 +540,7 @@ impl super::stubs::NetworkSecurity for NetworkSecurity {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -559,7 +559,7 @@ impl super::stubs::NetworkSecurity for NetworkSecurity {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -578,7 +578,7 @@ impl super::stubs::NetworkSecurity for NetworkSecurity {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/networkservices/v1/Cargo.toml b/src/generated/cloud/networkservices/v1/Cargo.toml
index 48a6b8044..90886afbf 100644
--- a/src/generated/cloud/networkservices/v1/Cargo.toml
+++ b/src/generated/cloud/networkservices/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/networkservices/v1/src/model.rs b/src/generated/cloud/networkservices/v1/src/model.rs
index 5b02d33db..7b8089c01 100755
--- a/src/generated/cloud/networkservices/v1/src/model.rs
+++ b/src/generated/cloud/networkservices/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/networkservices/v1/src/transport.rs b/src/generated/cloud/networkservices/v1/src/transport.rs
index b8d833a03..ea51bb4ac 100755
--- a/src/generated/cloud/networkservices/v1/src/transport.rs
+++ b/src/generated/cloud/networkservices/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [DepService](super::stubs::DepService) using a [gclient::ReqwestClient].
+/// Implements [DepService](super::stubs::DepService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct DepService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for DepService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for DepService {
 }
 
 impl DepService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::DepService for DepService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -81,7 +81,7 @@ impl super::stubs::DepService for DepService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -123,7 +123,7 @@ impl super::stubs::DepService for DepService {
                     "/v1/{}",
                     req.lb_traffic_extension
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("lb_traffic_extension"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("lb_traffic_extension"))?
                         .name
                 ),
             )
@@ -139,7 +139,7 @@ impl super::stubs::DepService for DepService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -164,7 +164,7 @@ impl super::stubs::DepService for DepService {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -190,7 +190,7 @@ impl super::stubs::DepService for DepService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -209,7 +209,7 @@ impl super::stubs::DepService for DepService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -251,7 +251,7 @@ impl super::stubs::DepService for DepService {
                     "/v1/{}",
                     req.lb_route_extension
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("lb_route_extension"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("lb_route_extension"))?
                         .name
                 ),
             )
@@ -267,7 +267,7 @@ impl super::stubs::DepService for DepService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -292,7 +292,7 @@ impl super::stubs::DepService for DepService {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -314,7 +314,7 @@ impl super::stubs::DepService for DepService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -333,7 +333,7 @@ impl super::stubs::DepService for DepService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -381,11 +381,11 @@ impl super::stubs::DepService for DepService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -427,7 +427,7 @@ impl super::stubs::DepService for DepService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -446,7 +446,7 @@ impl super::stubs::DepService for DepService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -465,7 +465,7 @@ impl super::stubs::DepService for DepService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -501,10 +501,10 @@ impl super::stubs::DepService for DepService {
     }
 }
 
-/// Implements [NetworkServices](super::stubs::NetworkServices) using a [gclient::ReqwestClient].
+/// Implements [NetworkServices](super::stubs::NetworkServices) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct NetworkServices {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for NetworkServices {
@@ -516,8 +516,8 @@ impl std::fmt::Debug for NetworkServices {
 }
 
 impl NetworkServices {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -543,7 +543,7 @@ impl super::stubs::NetworkServices for NetworkServices {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -562,7 +562,7 @@ impl super::stubs::NetworkServices for NetworkServices {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -603,7 +603,7 @@ impl super::stubs::NetworkServices for NetworkServices {
                     "/v1/{}",
                     req.endpoint_policy
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("endpoint_policy"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("endpoint_policy"))?
                         .name
                 ),
             )
@@ -619,7 +619,7 @@ impl super::stubs::NetworkServices for NetworkServices {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -642,7 +642,7 @@ impl super::stubs::NetworkServices for NetworkServices {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -663,7 +663,7 @@ impl super::stubs::NetworkServices for NetworkServices {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -682,7 +682,7 @@ impl super::stubs::NetworkServices for NetworkServices {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -723,7 +723,7 @@ impl super::stubs::NetworkServices for NetworkServices {
                     "/v1/{}",
                     req.gateway
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("gateway"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("gateway"))?
                         .name
                 ),
             )
@@ -739,7 +739,7 @@ impl super::stubs::NetworkServices for NetworkServices {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -762,7 +762,7 @@ impl super::stubs::NetworkServices for NetworkServices {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -786,7 +786,7 @@ impl super::stubs::NetworkServices for NetworkServices {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -805,7 +805,7 @@ impl super::stubs::NetworkServices for NetworkServices {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -846,7 +846,7 @@ impl super::stubs::NetworkServices for NetworkServices {
                     "/v1/{}",
                     req.grpc_route
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("grpc_route"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("grpc_route"))?
                         .name
                 ),
             )
@@ -862,7 +862,7 @@ impl super::stubs::NetworkServices for NetworkServices {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -885,7 +885,7 @@ impl super::stubs::NetworkServices for NetworkServices {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -909,7 +909,7 @@ impl super::stubs::NetworkServices for NetworkServices {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -928,7 +928,7 @@ impl super::stubs::NetworkServices for NetworkServices {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -969,7 +969,7 @@ impl super::stubs::NetworkServices for NetworkServices {
                     "/v1/{}",
                     req.http_route
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("http_route"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("http_route"))?
                         .name
                 ),
             )
@@ -985,7 +985,7 @@ impl super::stubs::NetworkServices for NetworkServices {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1008,7 +1008,7 @@ impl super::stubs::NetworkServices for NetworkServices {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1032,7 +1032,7 @@ impl super::stubs::NetworkServices for NetworkServices {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1051,7 +1051,7 @@ impl super::stubs::NetworkServices for NetworkServices {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1092,7 +1092,7 @@ impl super::stubs::NetworkServices for NetworkServices {
                     "/v1/{}",
                     req.tcp_route
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("tcp_route"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("tcp_route"))?
                         .name
                 ),
             )
@@ -1108,7 +1108,7 @@ impl super::stubs::NetworkServices for NetworkServices {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1131,7 +1131,7 @@ impl super::stubs::NetworkServices for NetworkServices {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1155,7 +1155,7 @@ impl super::stubs::NetworkServices for NetworkServices {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1174,7 +1174,7 @@ impl super::stubs::NetworkServices for NetworkServices {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1215,7 +1215,7 @@ impl super::stubs::NetworkServices for NetworkServices {
                     "/v1/{}",
                     req.tls_route
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("tls_route"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("tls_route"))?
                         .name
                 ),
             )
@@ -1231,7 +1231,7 @@ impl super::stubs::NetworkServices for NetworkServices {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1254,7 +1254,7 @@ impl super::stubs::NetworkServices for NetworkServices {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1278,7 +1278,7 @@ impl super::stubs::NetworkServices for NetworkServices {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1297,7 +1297,7 @@ impl super::stubs::NetworkServices for NetworkServices {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1339,7 +1339,7 @@ impl super::stubs::NetworkServices for NetworkServices {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1360,7 +1360,7 @@ impl super::stubs::NetworkServices for NetworkServices {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1379,7 +1379,7 @@ impl super::stubs::NetworkServices for NetworkServices {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1415,7 +1415,7 @@ impl super::stubs::NetworkServices for NetworkServices {
                     "/v1/{}",
                     req.mesh
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("mesh"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("mesh"))?
                         .name
                 ),
             )
@@ -1431,7 +1431,7 @@ impl super::stubs::NetworkServices for NetworkServices {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.mesh), options).await
@@ -1452,7 +1452,7 @@ impl super::stubs::NetworkServices for NetworkServices {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1474,7 +1474,7 @@ impl super::stubs::NetworkServices for NetworkServices {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1493,7 +1493,7 @@ impl super::stubs::NetworkServices for NetworkServices {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1541,11 +1541,11 @@ impl super::stubs::NetworkServices for NetworkServices {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1587,7 +1587,7 @@ impl super::stubs::NetworkServices for NetworkServices {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1606,7 +1606,7 @@ impl super::stubs::NetworkServices for NetworkServices {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1625,7 +1625,7 @@ impl super::stubs::NetworkServices for NetworkServices {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/notebooks/v2/Cargo.toml b/src/generated/cloud/notebooks/v2/Cargo.toml
index 2836898b2..4b2d15e7c 100644
--- a/src/generated/cloud/notebooks/v2/Cargo.toml
+++ b/src/generated/cloud/notebooks/v2/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/notebooks/v2/src/model.rs b/src/generated/cloud/notebooks/v2/src/model.rs
index 55d52e7d9..83d640c3f 100755
--- a/src/generated/cloud/notebooks/v2/src/model.rs
+++ b/src/generated/cloud/notebooks/v2/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/notebooks/v2/src/transport.rs b/src/generated/cloud/notebooks/v2/src/transport.rs
index df550dc4c..c5461f75a 100755
--- a/src/generated/cloud/notebooks/v2/src/transport.rs
+++ b/src/generated/cloud/notebooks/v2/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [NotebookService](super::stubs::NotebookService) using a [gclient::ReqwestClient].
+/// Implements [NotebookService](super::stubs::NotebookService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct NotebookService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for NotebookService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for NotebookService {
 }
 
 impl NotebookService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::NotebookService for NotebookService {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -81,7 +81,7 @@ impl super::stubs::NotebookService for NotebookService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -123,7 +123,7 @@ impl super::stubs::NotebookService for NotebookService {
                     "/v2/{}",
                     req.instance
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("instance"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("instance"))?
                         .name
                 ),
             )
@@ -139,7 +139,7 @@ impl super::stubs::NotebookService for NotebookService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -164,7 +164,7 @@ impl super::stubs::NotebookService for NotebookService {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -237,7 +237,7 @@ impl super::stubs::NotebookService for NotebookService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -310,7 +310,7 @@ impl super::stubs::NotebookService for NotebookService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -329,7 +329,7 @@ impl super::stubs::NotebookService for NotebookService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -377,11 +377,11 @@ impl super::stubs::NotebookService for NotebookService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -423,7 +423,7 @@ impl super::stubs::NotebookService for NotebookService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -442,7 +442,7 @@ impl super::stubs::NotebookService for NotebookService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -461,7 +461,7 @@ impl super::stubs::NotebookService for NotebookService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/optimization/v1/Cargo.toml b/src/generated/cloud/optimization/v1/Cargo.toml
index ccd7a3a14..884e01527 100644
--- a/src/generated/cloud/optimization/v1/Cargo.toml
+++ b/src/generated/cloud/optimization/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/optimization/v1/src/model.rs b/src/generated/cloud/optimization/v1/src/model.rs
index 16a1fbbd8..b2c97c480 100755
--- a/src/generated/cloud/optimization/v1/src/model.rs
+++ b/src/generated/cloud/optimization/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate longrunning;
diff --git a/src/generated/cloud/optimization/v1/src/transport.rs b/src/generated/cloud/optimization/v1/src/transport.rs
index ec0359779..7175865da 100755
--- a/src/generated/cloud/optimization/v1/src/transport.rs
+++ b/src/generated/cloud/optimization/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [FleetRouting](super::stubs::FleetRouting) using a [gclient::ReqwestClient].
+/// Implements [FleetRouting](super::stubs::FleetRouting) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct FleetRouting {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for FleetRouting {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for FleetRouting {
 }
 
 impl FleetRouting {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -95,7 +95,7 @@ impl super::stubs::FleetRouting for FleetRouting {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/oracledatabase/v1/Cargo.toml b/src/generated/cloud/oracledatabase/v1/Cargo.toml
index bdde69299..33bdbdac4 100644
--- a/src/generated/cloud/oracledatabase/v1/Cargo.toml
+++ b/src/generated/cloud/oracledatabase/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/oracledatabase/v1/src/model.rs b/src/generated/cloud/oracledatabase/v1/src/model.rs
index b261c2773..8fb50a13a 100755
--- a/src/generated/cloud/oracledatabase/v1/src/model.rs
+++ b/src/generated/cloud/oracledatabase/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/oracledatabase/v1/src/transport.rs b/src/generated/cloud/oracledatabase/v1/src/transport.rs
index 9f53dd4c4..659239c55 100755
--- a/src/generated/cloud/oracledatabase/v1/src/transport.rs
+++ b/src/generated/cloud/oracledatabase/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [OracleDatabase](super::stubs::OracleDatabase) using a [gclient::ReqwestClient].
+/// Implements [OracleDatabase](super::stubs::OracleDatabase) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct OracleDatabase {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for OracleDatabase {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for OracleDatabase {
 }
 
 impl OracleDatabase {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -60,7 +60,7 @@ impl super::stubs::OracleDatabase for OracleDatabase {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -79,7 +79,7 @@ impl super::stubs::OracleDatabase for OracleDatabase {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -127,7 +127,7 @@ impl super::stubs::OracleDatabase for OracleDatabase {
         let builder = builder.query(&[("requestId", &req.request_id)]);
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -152,7 +152,7 @@ impl super::stubs::OracleDatabase for OracleDatabase {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -171,7 +171,7 @@ impl super::stubs::OracleDatabase for OracleDatabase {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -216,7 +216,7 @@ impl super::stubs::OracleDatabase for OracleDatabase {
         let builder = builder.query(&[("requestId", &req.request_id)]);
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -240,7 +240,7 @@ impl super::stubs::OracleDatabase for OracleDatabase {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -264,7 +264,7 @@ impl super::stubs::OracleDatabase for OracleDatabase {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -285,7 +285,7 @@ impl super::stubs::OracleDatabase for OracleDatabase {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -309,7 +309,7 @@ impl super::stubs::OracleDatabase for OracleDatabase {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -333,7 +333,7 @@ impl super::stubs::OracleDatabase for OracleDatabase {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -359,7 +359,7 @@ impl super::stubs::OracleDatabase for OracleDatabase {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -378,7 +378,7 @@ impl super::stubs::OracleDatabase for OracleDatabase {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -422,7 +422,7 @@ impl super::stubs::OracleDatabase for OracleDatabase {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -483,7 +483,7 @@ impl super::stubs::OracleDatabase for OracleDatabase {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -508,7 +508,7 @@ impl super::stubs::OracleDatabase for OracleDatabase {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -533,7 +533,7 @@ impl super::stubs::OracleDatabase for OracleDatabase {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -555,7 +555,7 @@ impl super::stubs::OracleDatabase for OracleDatabase {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -574,7 +574,7 @@ impl super::stubs::OracleDatabase for OracleDatabase {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -596,7 +596,7 @@ impl super::stubs::OracleDatabase for OracleDatabase {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -615,7 +615,7 @@ impl super::stubs::OracleDatabase for OracleDatabase {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -634,7 +634,7 @@ impl super::stubs::OracleDatabase for OracleDatabase {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/orchestration/airflow/service/v1/Cargo.toml b/src/generated/cloud/orchestration/airflow/service/v1/Cargo.toml
index 3ba39e954..24a13bb32 100644
--- a/src/generated/cloud/orchestration/airflow/service/v1/Cargo.toml
+++ b/src/generated/cloud/orchestration/airflow/service/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/orchestration/airflow/service/v1/src/model.rs b/src/generated/cloud/orchestration/airflow/service/v1/src/model.rs
index 7a3deffa2..ea6d70025 100755
--- a/src/generated/cloud/orchestration/airflow/service/v1/src/model.rs
+++ b/src/generated/cloud/orchestration/airflow/service/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate longrunning;
diff --git a/src/generated/cloud/orchestration/airflow/service/v1/src/transport.rs b/src/generated/cloud/orchestration/airflow/service/v1/src/transport.rs
index ceec6e9a6..4ef78312a 100755
--- a/src/generated/cloud/orchestration/airflow/service/v1/src/transport.rs
+++ b/src/generated/cloud/orchestration/airflow/service/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [Environments](super::stubs::Environments) using a [gclient::ReqwestClient].
+/// Implements [Environments](super::stubs::Environments) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Environments {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Environments {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for Environments {
 }
 
 impl Environments {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -77,7 +77,7 @@ impl super::stubs::Environments for Environments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -101,7 +101,7 @@ impl super::stubs::Environments for Environments {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -126,7 +126,7 @@ impl super::stubs::Environments for Environments {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -149,7 +149,7 @@ impl super::stubs::Environments for Environments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -234,7 +234,7 @@ impl super::stubs::Environments for Environments {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -295,7 +295,7 @@ impl super::stubs::Environments for Environments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -319,7 +319,7 @@ impl super::stubs::Environments for Environments {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -337,7 +337,7 @@ impl super::stubs::Environments for Environments {
                     "/v1/{}",
                     req.user_workloads_secret
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("user_workloads_secret"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("user_workloads_secret"))?
                         .name
                 ),
             )
@@ -366,7 +366,7 @@ impl super::stubs::Environments for Environments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -407,7 +407,7 @@ impl super::stubs::Environments for Environments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -431,7 +431,7 @@ impl super::stubs::Environments for Environments {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -449,9 +449,7 @@ impl super::stubs::Environments for Environments {
                     "/v1/{}",
                     req.user_workloads_config_map
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing(
-                            "user_workloads_config_map"
-                        ))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("user_workloads_config_map"))?
                         .name
                 ),
             )
@@ -480,7 +478,7 @@ impl super::stubs::Environments for Environments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -562,7 +560,7 @@ impl super::stubs::Environments for Environments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -584,7 +582,7 @@ impl super::stubs::Environments for Environments {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -603,7 +601,7 @@ impl super::stubs::Environments for Environments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -622,7 +620,7 @@ impl super::stubs::Environments for Environments {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -641,10 +639,10 @@ impl super::stubs::Environments for Environments {
     }
 }
 
-/// Implements [ImageVersions](super::stubs::ImageVersions) using a [gclient::ReqwestClient].
+/// Implements [ImageVersions](super::stubs::ImageVersions) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ImageVersions {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ImageVersions {
@@ -656,8 +654,8 @@ impl std::fmt::Debug for ImageVersions {
 }
 
 impl ImageVersions {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -684,7 +682,7 @@ impl super::stubs::ImageVersions for ImageVersions {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("includePastReleases", &req.include_past_releases)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -706,7 +704,7 @@ impl super::stubs::ImageVersions for ImageVersions {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -725,7 +723,7 @@ impl super::stubs::ImageVersions for ImageVersions {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -744,7 +742,7 @@ impl super::stubs::ImageVersions for ImageVersions {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/cloud/orgpolicy/v2/Cargo.toml b/src/generated/cloud/orgpolicy/v2/Cargo.toml
index 8d5d4e976..8a1e2ed5e 100644
--- a/src/generated/cloud/orgpolicy/v2/Cargo.toml
+++ b/src/generated/cloud/orgpolicy/v2/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
diff --git a/src/generated/cloud/orgpolicy/v2/src/model.rs b/src/generated/cloud/orgpolicy/v2/src/model.rs
index 2329634ec..abbbd2e20 100755
--- a/src/generated/cloud/orgpolicy/v2/src/model.rs
+++ b/src/generated/cloud/orgpolicy/v2/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate reqwest;
diff --git a/src/generated/cloud/orgpolicy/v2/src/transport.rs b/src/generated/cloud/orgpolicy/v2/src/transport.rs
index b570c4ab7..095dbb182 100755
--- a/src/generated/cloud/orgpolicy/v2/src/transport.rs
+++ b/src/generated/cloud/orgpolicy/v2/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [OrgPolicy](super::stubs::OrgPolicy) using a [gclient::ReqwestClient].
+/// Implements [OrgPolicy](super::stubs::OrgPolicy) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct OrgPolicy {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for OrgPolicy {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for OrgPolicy {
 }
 
 impl OrgPolicy {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -60,7 +60,7 @@ impl super::stubs::OrgPolicy for OrgPolicy {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -81,7 +81,7 @@ impl super::stubs::OrgPolicy for OrgPolicy {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -100,7 +100,7 @@ impl super::stubs::OrgPolicy for OrgPolicy {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -122,7 +122,7 @@ impl super::stubs::OrgPolicy for OrgPolicy {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -160,7 +160,7 @@ impl super::stubs::OrgPolicy for OrgPolicy {
                     "/v2/{}",
                     req.policy
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("policy"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("policy"))?
                         .name
                 ),
             )
@@ -176,7 +176,7 @@ impl super::stubs::OrgPolicy for OrgPolicy {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.policy), options).await
@@ -198,7 +198,7 @@ impl super::stubs::OrgPolicy for OrgPolicy {
             );
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -238,7 +238,7 @@ impl super::stubs::OrgPolicy for OrgPolicy {
                     "/v2/{}",
                     req.custom_constraint
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("custom_constraint"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("custom_constraint"))?
                         .name
                 ),
             )
@@ -267,7 +267,7 @@ impl super::stubs::OrgPolicy for OrgPolicy {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -291,7 +291,7 @@ impl super::stubs::OrgPolicy for OrgPolicy {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -310,7 +310,7 @@ impl super::stubs::OrgPolicy for OrgPolicy {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/cloud/osconfig/v1/Cargo.toml b/src/generated/cloud/osconfig/v1/Cargo.toml
index 3131831ba..3ba170113 100644
--- a/src/generated/cloud/osconfig/v1/Cargo.toml
+++ b/src/generated/cloud/osconfig/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/osconfig/v1/src/model.rs b/src/generated/cloud/osconfig/v1/src/model.rs
index 4936e91f3..27274c13a 100755
--- a/src/generated/cloud/osconfig/v1/src/model.rs
+++ b/src/generated/cloud/osconfig/v1/src/model.rs
@@ -22,7 +22,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate longrunning;
diff --git a/src/generated/cloud/osconfig/v1/src/transport.rs b/src/generated/cloud/osconfig/v1/src/transport.rs
index 8bb638605..9b660bd53 100755
--- a/src/generated/cloud/osconfig/v1/src/transport.rs
+++ b/src/generated/cloud/osconfig/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [OsConfigService](super::stubs::OsConfigService) using a [gclient::ReqwestClient].
+/// Implements [OsConfigService](super::stubs::OsConfigService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct OsConfigService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for OsConfigService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for OsConfigService {
 }
 
 impl OsConfigService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -75,7 +75,7 @@ impl super::stubs::OsConfigService for OsConfigService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -117,7 +117,7 @@ impl super::stubs::OsConfigService for OsConfigService {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -142,7 +142,7 @@ impl super::stubs::OsConfigService for OsConfigService {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -184,7 +184,7 @@ impl super::stubs::OsConfigService for OsConfigService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -208,7 +208,7 @@ impl super::stubs::OsConfigService for OsConfigService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -227,7 +227,7 @@ impl super::stubs::OsConfigService for OsConfigService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -245,7 +245,7 @@ impl super::stubs::OsConfigService for OsConfigService {
                     "/v1/{}",
                     req.patch_deployment
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("patch_deployment"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("patch_deployment"))?
                         .name
                 ),
             )
@@ -261,7 +261,7 @@ impl super::stubs::OsConfigService for OsConfigService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -318,7 +318,7 @@ impl super::stubs::OsConfigService for OsConfigService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -340,10 +340,10 @@ impl super::stubs::OsConfigService for OsConfigService {
     }
 }
 
-/// Implements [OsConfigZonalService](super::stubs::OsConfigZonalService) using a [gclient::ReqwestClient].
+/// Implements [OsConfigZonalService](super::stubs::OsConfigZonalService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct OsConfigZonalService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for OsConfigZonalService {
@@ -355,8 +355,8 @@ impl std::fmt::Debug for OsConfigZonalService {
 }
 
 impl OsConfigZonalService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -399,7 +399,7 @@ impl super::stubs::OsConfigZonalService for OsConfigZonalService {
                     "/v1/{}",
                     req.os_policy_assignment
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("os_policy_assignment"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("os_policy_assignment"))?
                         .name
                 ),
             )
@@ -415,7 +415,7 @@ impl super::stubs::OsConfigZonalService for OsConfigZonalService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -438,7 +438,7 @@ impl super::stubs::OsConfigZonalService for OsConfigZonalService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -462,7 +462,7 @@ impl super::stubs::OsConfigZonalService for OsConfigZonalService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -486,7 +486,7 @@ impl super::stubs::OsConfigZonalService for OsConfigZonalService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -505,7 +505,7 @@ impl super::stubs::OsConfigZonalService for OsConfigZonalService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -524,7 +524,7 @@ impl super::stubs::OsConfigZonalService for OsConfigZonalService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -546,7 +546,7 @@ impl super::stubs::OsConfigZonalService for OsConfigZonalService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -566,7 +566,7 @@ impl super::stubs::OsConfigZonalService for OsConfigZonalService {
             );
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -592,7 +592,7 @@ impl super::stubs::OsConfigZonalService for OsConfigZonalService {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -611,7 +611,7 @@ impl super::stubs::OsConfigZonalService for OsConfigZonalService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -636,7 +636,7 @@ impl super::stubs::OsConfigZonalService for OsConfigZonalService {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -655,7 +655,7 @@ impl super::stubs::OsConfigZonalService for OsConfigZonalService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/oslogin/v1/Cargo.toml b/src/generated/cloud/oslogin/v1/Cargo.toml
index 46876cb6b..3fa56f69a 100644
--- a/src/generated/cloud/oslogin/v1/Cargo.toml
+++ b/src/generated/cloud/oslogin/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 oslogin_common = { version = "0.2", path = "../../../../../src/generated/oslogin/common", package = "google-cloud-oslogin-common" }
 reqwest    = { version = "0.12", features = ["json"] }
diff --git a/src/generated/cloud/oslogin/v1/src/model.rs b/src/generated/cloud/oslogin/v1/src/model.rs
index f9dd6924a..390a51911 100755
--- a/src/generated/cloud/oslogin/v1/src/model.rs
+++ b/src/generated/cloud/oslogin/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate oslogin_common;
 extern crate reqwest;
diff --git a/src/generated/cloud/oslogin/v1/src/transport.rs b/src/generated/cloud/oslogin/v1/src/transport.rs
index 705ffdb58..c8691ea07 100755
--- a/src/generated/cloud/oslogin/v1/src/transport.rs
+++ b/src/generated/cloud/oslogin/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [OsLoginService](super::stubs::OsLoginService) using a [gclient::ReqwestClient].
+/// Implements [OsLoginService](super::stubs::OsLoginService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct OsLoginService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for OsLoginService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for OsLoginService {
 }
 
 impl OsLoginService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -77,7 +77,7 @@ impl super::stubs::OsLoginService for OsLoginService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -96,7 +96,7 @@ impl super::stubs::OsLoginService for OsLoginService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -120,7 +120,7 @@ impl super::stubs::OsLoginService for OsLoginService {
         let builder = builder.query(&[("projectId", &req.project_id)]);
         let builder = builder.query(&[("systemId", &req.system_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -139,7 +139,7 @@ impl super::stubs::OsLoginService for OsLoginService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -191,7 +191,7 @@ impl super::stubs::OsLoginService for OsLoginService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
diff --git a/src/generated/cloud/parallelstore/v1/Cargo.toml b/src/generated/cloud/parallelstore/v1/Cargo.toml
index c013272a7..8c123fe42 100644
--- a/src/generated/cloud/parallelstore/v1/Cargo.toml
+++ b/src/generated/cloud/parallelstore/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/parallelstore/v1/src/model.rs b/src/generated/cloud/parallelstore/v1/src/model.rs
index f393a5216..42e57add1 100755
--- a/src/generated/cloud/parallelstore/v1/src/model.rs
+++ b/src/generated/cloud/parallelstore/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate location;
 extern crate longrunning;
diff --git a/src/generated/cloud/parallelstore/v1/src/transport.rs b/src/generated/cloud/parallelstore/v1/src/transport.rs
index 4923dcfed..a2465cae3 100755
--- a/src/generated/cloud/parallelstore/v1/src/transport.rs
+++ b/src/generated/cloud/parallelstore/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [Parallelstore](super::stubs::Parallelstore) using a [gclient::ReqwestClient].
+/// Implements [Parallelstore](super::stubs::Parallelstore) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Parallelstore {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Parallelstore {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for Parallelstore {
 }
 
 impl Parallelstore {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::Parallelstore for Parallelstore {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -81,7 +81,7 @@ impl super::stubs::Parallelstore for Parallelstore {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -123,7 +123,7 @@ impl super::stubs::Parallelstore for Parallelstore {
                     "/v1/{}",
                     req.instance
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("instance"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("instance"))?
                         .name
                 ),
             )
@@ -139,7 +139,7 @@ impl super::stubs::Parallelstore for Parallelstore {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -164,7 +164,7 @@ impl super::stubs::Parallelstore for Parallelstore {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -226,7 +226,7 @@ impl super::stubs::Parallelstore for Parallelstore {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -245,7 +245,7 @@ impl super::stubs::Parallelstore for Parallelstore {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -267,7 +267,7 @@ impl super::stubs::Parallelstore for Parallelstore {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -286,7 +286,7 @@ impl super::stubs::Parallelstore for Parallelstore {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -305,7 +305,7 @@ impl super::stubs::Parallelstore for Parallelstore {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/parametermanager/v1/Cargo.toml b/src/generated/cloud/parametermanager/v1/Cargo.toml
index d90513857..2c9ed0f42 100644
--- a/src/generated/cloud/parametermanager/v1/Cargo.toml
+++ b/src/generated/cloud/parametermanager/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/parametermanager/v1/src/model.rs b/src/generated/cloud/parametermanager/v1/src/model.rs
index 6e995da6b..d1aeb6d72 100755
--- a/src/generated/cloud/parametermanager/v1/src/model.rs
+++ b/src/generated/cloud/parametermanager/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/parametermanager/v1/src/transport.rs b/src/generated/cloud/parametermanager/v1/src/transport.rs
index 1d822a846..701f1756f 100755
--- a/src/generated/cloud/parametermanager/v1/src/transport.rs
+++ b/src/generated/cloud/parametermanager/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [ParameterManager](super::stubs::ParameterManager) using a [gclient::ReqwestClient].
+/// Implements [ParameterManager](super::stubs::ParameterManager) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ParameterManager {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ParameterManager {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for ParameterManager {
 }
 
 impl ParameterManager {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::ParameterManager for ParameterManager {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -81,7 +81,7 @@ impl super::stubs::ParameterManager for ParameterManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -123,7 +123,7 @@ impl super::stubs::ParameterManager for ParameterManager {
                     "/v1/{}",
                     req.parameter
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("parameter"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("parameter"))?
                         .name
                 ),
             )
@@ -139,7 +139,7 @@ impl super::stubs::ParameterManager for ParameterManager {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -164,7 +164,7 @@ impl super::stubs::ParameterManager for ParameterManager {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -187,7 +187,7 @@ impl super::stubs::ParameterManager for ParameterManager {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -207,7 +207,7 @@ impl super::stubs::ParameterManager for ParameterManager {
             );
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -226,7 +226,7 @@ impl super::stubs::ParameterManager for ParameterManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -268,7 +268,7 @@ impl super::stubs::ParameterManager for ParameterManager {
                     "/v1/{}",
                     req.parameter_version
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("parameter_version"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("parameter_version"))?
                         .name
                 ),
             )
@@ -284,7 +284,7 @@ impl super::stubs::ParameterManager for ParameterManager {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -309,7 +309,7 @@ impl super::stubs::ParameterManager for ParameterManager {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -331,7 +331,7 @@ impl super::stubs::ParameterManager for ParameterManager {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -350,7 +350,7 @@ impl super::stubs::ParameterManager for ParameterManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/cloud/policysimulator/v1/Cargo.toml b/src/generated/cloud/policysimulator/v1/Cargo.toml
index 7704b1a2f..b69e5464a 100644
--- a/src/generated/cloud/policysimulator/v1/Cargo.toml
+++ b/src/generated/cloud/policysimulator/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
diff --git a/src/generated/cloud/policysimulator/v1/src/model.rs b/src/generated/cloud/policysimulator/v1/src/model.rs
index d74e326e2..5e184ecee 100755
--- a/src/generated/cloud/policysimulator/v1/src/model.rs
+++ b/src/generated/cloud/policysimulator/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate iam_v1;
 extern crate lazy_static;
diff --git a/src/generated/cloud/policysimulator/v1/src/transport.rs b/src/generated/cloud/policysimulator/v1/src/transport.rs
index ef569ef40..31db7ded7 100755
--- a/src/generated/cloud/policysimulator/v1/src/transport.rs
+++ b/src/generated/cloud/policysimulator/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [Simulator](super::stubs::Simulator) using a [gclient::ReqwestClient].
+/// Implements [Simulator](super::stubs::Simulator) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Simulator {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Simulator {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for Simulator {
 }
 
 impl Simulator {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -55,7 +55,7 @@ impl super::stubs::Simulator for Simulator {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -93,7 +93,7 @@ impl super::stubs::Simulator for Simulator {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -115,7 +115,7 @@ impl super::stubs::Simulator for Simulator {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -134,7 +134,7 @@ impl super::stubs::Simulator for Simulator {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/policytroubleshooter/iam/v3/Cargo.toml b/src/generated/cloud/policytroubleshooter/iam/v3/Cargo.toml
index a3e32e234..387516102 100644
--- a/src/generated/cloud/policytroubleshooter/iam/v3/Cargo.toml
+++ b/src/generated/cloud/policytroubleshooter/iam/v3/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../../src/generated/type", package = "google-cloud-type" }
 iam_v1     = { version = "0.2", path = "../../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 iam_v2     = { version = "0.2", path = "../../../../../../src/generated/iam/v2", package = "google-cloud-iam-v2" }
diff --git a/src/generated/cloud/policytroubleshooter/iam/v3/src/model.rs b/src/generated/cloud/policytroubleshooter/iam/v3/src/model.rs
index 3f4ea9f29..594ec3a3e 100755
--- a/src/generated/cloud/policytroubleshooter/iam/v3/src/model.rs
+++ b/src/generated/cloud/policytroubleshooter/iam/v3/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate iam_v1;
 extern crate iam_v2;
diff --git a/src/generated/cloud/policytroubleshooter/iam/v3/src/transport.rs b/src/generated/cloud/policytroubleshooter/iam/v3/src/transport.rs
index 9fb9f7171..1187fce81 100755
--- a/src/generated/cloud/policytroubleshooter/iam/v3/src/transport.rs
+++ b/src/generated/cloud/policytroubleshooter/iam/v3/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [PolicyTroubleshooter](super::stubs::PolicyTroubleshooter) using a [gclient::ReqwestClient].
+/// Implements [PolicyTroubleshooter](super::stubs::PolicyTroubleshooter) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct PolicyTroubleshooter {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for PolicyTroubleshooter {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for PolicyTroubleshooter {
 }
 
 impl PolicyTroubleshooter {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
diff --git a/src/generated/cloud/policytroubleshooter/v1/Cargo.toml b/src/generated/cloud/policytroubleshooter/v1/Cargo.toml
index 88bb8d3ce..2fbca16f0 100644
--- a/src/generated/cloud/policytroubleshooter/v1/Cargo.toml
+++ b/src/generated/cloud/policytroubleshooter/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
diff --git a/src/generated/cloud/policytroubleshooter/v1/src/model.rs b/src/generated/cloud/policytroubleshooter/v1/src/model.rs
index 02c637e5a..d1c01b393 100755
--- a/src/generated/cloud/policytroubleshooter/v1/src/model.rs
+++ b/src/generated/cloud/policytroubleshooter/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate iam_v1;
 extern crate lazy_static;
diff --git a/src/generated/cloud/policytroubleshooter/v1/src/transport.rs b/src/generated/cloud/policytroubleshooter/v1/src/transport.rs
index fcf2f6049..6432bae7b 100755
--- a/src/generated/cloud/policytroubleshooter/v1/src/transport.rs
+++ b/src/generated/cloud/policytroubleshooter/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [IamChecker](super::stubs::IamChecker) using a [gclient::ReqwestClient].
+/// Implements [IamChecker](super::stubs::IamChecker) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct IamChecker {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for IamChecker {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for IamChecker {
 }
 
 impl IamChecker {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
diff --git a/src/generated/cloud/privilegedaccessmanager/v1/Cargo.toml b/src/generated/cloud/privilegedaccessmanager/v1/Cargo.toml
index 209afd47d..0d42c4f01 100644
--- a/src/generated/cloud/privilegedaccessmanager/v1/Cargo.toml
+++ b/src/generated/cloud/privilegedaccessmanager/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/privilegedaccessmanager/v1/src/model.rs b/src/generated/cloud/privilegedaccessmanager/v1/src/model.rs
index 714ef86bf..83de8c2e5 100755
--- a/src/generated/cloud/privilegedaccessmanager/v1/src/model.rs
+++ b/src/generated/cloud/privilegedaccessmanager/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate location;
 extern crate longrunning;
diff --git a/src/generated/cloud/privilegedaccessmanager/v1/src/transport.rs b/src/generated/cloud/privilegedaccessmanager/v1/src/transport.rs
index ab6eb2027..ab226e5d1 100755
--- a/src/generated/cloud/privilegedaccessmanager/v1/src/transport.rs
+++ b/src/generated/cloud/privilegedaccessmanager/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [PrivilegedAccessManager](super::stubs::PrivilegedAccessManager) using a [gclient::ReqwestClient].
+/// Implements [PrivilegedAccessManager](super::stubs::PrivilegedAccessManager) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct PrivilegedAccessManager {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for PrivilegedAccessManager {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for PrivilegedAccessManager {
 }
 
 impl PrivilegedAccessManager {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -58,7 +58,7 @@ impl super::stubs::PrivilegedAccessManager for PrivilegedAccessManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -84,7 +84,7 @@ impl super::stubs::PrivilegedAccessManager for PrivilegedAccessManager {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -110,7 +110,7 @@ impl super::stubs::PrivilegedAccessManager for PrivilegedAccessManager {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -129,7 +129,7 @@ impl super::stubs::PrivilegedAccessManager for PrivilegedAccessManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -174,7 +174,7 @@ impl super::stubs::PrivilegedAccessManager for PrivilegedAccessManager {
         let builder = builder.query(&[("requestId", &req.request_id)]);
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -192,7 +192,7 @@ impl super::stubs::PrivilegedAccessManager for PrivilegedAccessManager {
                     "/v1/{}",
                     req.entitlement
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("entitlement"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("entitlement"))?
                         .name
                 ),
             )
@@ -208,7 +208,7 @@ impl super::stubs::PrivilegedAccessManager for PrivilegedAccessManager {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -235,7 +235,7 @@ impl super::stubs::PrivilegedAccessManager for PrivilegedAccessManager {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -261,7 +261,7 @@ impl super::stubs::PrivilegedAccessManager for PrivilegedAccessManager {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -280,7 +280,7 @@ impl super::stubs::PrivilegedAccessManager for PrivilegedAccessManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -371,7 +371,7 @@ impl super::stubs::PrivilegedAccessManager for PrivilegedAccessManager {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -390,7 +390,7 @@ impl super::stubs::PrivilegedAccessManager for PrivilegedAccessManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -412,7 +412,7 @@ impl super::stubs::PrivilegedAccessManager for PrivilegedAccessManager {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -431,7 +431,7 @@ impl super::stubs::PrivilegedAccessManager for PrivilegedAccessManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -450,7 +450,7 @@ impl super::stubs::PrivilegedAccessManager for PrivilegedAccessManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/rapidmigrationassessment/v1/Cargo.toml b/src/generated/cloud/rapidmigrationassessment/v1/Cargo.toml
index 4d590f620..8dc830f13 100644
--- a/src/generated/cloud/rapidmigrationassessment/v1/Cargo.toml
+++ b/src/generated/cloud/rapidmigrationassessment/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/rapidmigrationassessment/v1/src/model.rs b/src/generated/cloud/rapidmigrationassessment/v1/src/model.rs
index 7844234b1..6cce610f2 100755
--- a/src/generated/cloud/rapidmigrationassessment/v1/src/model.rs
+++ b/src/generated/cloud/rapidmigrationassessment/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate location;
 extern crate longrunning;
diff --git a/src/generated/cloud/rapidmigrationassessment/v1/src/transport.rs b/src/generated/cloud/rapidmigrationassessment/v1/src/transport.rs
index 6423481d4..a0f8d397a 100755
--- a/src/generated/cloud/rapidmigrationassessment/v1/src/transport.rs
+++ b/src/generated/cloud/rapidmigrationassessment/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [RapidMigrationAssessment](super::stubs::RapidMigrationAssessment) using a [gclient::ReqwestClient].
+/// Implements [RapidMigrationAssessment](super::stubs::RapidMigrationAssessment) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct RapidMigrationAssessment {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for RapidMigrationAssessment {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for RapidMigrationAssessment {
 }
 
 impl RapidMigrationAssessment {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -102,7 +102,7 @@ impl super::stubs::RapidMigrationAssessment for RapidMigrationAssessment {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -128,7 +128,7 @@ impl super::stubs::RapidMigrationAssessment for RapidMigrationAssessment {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -147,7 +147,7 @@ impl super::stubs::RapidMigrationAssessment for RapidMigrationAssessment {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -165,7 +165,7 @@ impl super::stubs::RapidMigrationAssessment for RapidMigrationAssessment {
                     "/v1/{}",
                     req.collector
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("collector"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("collector"))?
                         .name
                 ),
             )
@@ -181,7 +181,7 @@ impl super::stubs::RapidMigrationAssessment for RapidMigrationAssessment {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -206,7 +206,7 @@ impl super::stubs::RapidMigrationAssessment for RapidMigrationAssessment {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -279,7 +279,7 @@ impl super::stubs::RapidMigrationAssessment for RapidMigrationAssessment {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -298,7 +298,7 @@ impl super::stubs::RapidMigrationAssessment for RapidMigrationAssessment {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -320,7 +320,7 @@ impl super::stubs::RapidMigrationAssessment for RapidMigrationAssessment {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -339,7 +339,7 @@ impl super::stubs::RapidMigrationAssessment for RapidMigrationAssessment {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -358,7 +358,7 @@ impl super::stubs::RapidMigrationAssessment for RapidMigrationAssessment {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/recaptchaenterprise/v1/Cargo.toml b/src/generated/cloud/recaptchaenterprise/v1/Cargo.toml
index dafc76bbd..fa9b30ceb 100644
--- a/src/generated/cloud/recaptchaenterprise/v1/Cargo.toml
+++ b/src/generated/cloud/recaptchaenterprise/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
 rpc        = { version = "0.2", path = "../../../../../src/generated/rpc/types", package = "google-cloud-rpc" }
diff --git a/src/generated/cloud/recaptchaenterprise/v1/src/model.rs b/src/generated/cloud/recaptchaenterprise/v1/src/model.rs
index 478832402..e9ffc512b 100755
--- a/src/generated/cloud/recaptchaenterprise/v1/src/model.rs
+++ b/src/generated/cloud/recaptchaenterprise/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate reqwest;
 extern crate rpc;
diff --git a/src/generated/cloud/recaptchaenterprise/v1/src/transport.rs b/src/generated/cloud/recaptchaenterprise/v1/src/transport.rs
index a440ecd5b..1871867ba 100755
--- a/src/generated/cloud/recaptchaenterprise/v1/src/transport.rs
+++ b/src/generated/cloud/recaptchaenterprise/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [RecaptchaEnterpriseService](super::stubs::RecaptchaEnterpriseService) using a [gclient::ReqwestClient].
+/// Implements [RecaptchaEnterpriseService](super::stubs::RecaptchaEnterpriseService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct RecaptchaEnterpriseService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for RecaptchaEnterpriseService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for RecaptchaEnterpriseService {
 }
 
 impl RecaptchaEnterpriseService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -113,7 +113,7 @@ impl super::stubs::RecaptchaEnterpriseService for RecaptchaEnterpriseService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -135,7 +135,7 @@ impl super::stubs::RecaptchaEnterpriseService for RecaptchaEnterpriseService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -154,7 +154,7 @@ impl super::stubs::RecaptchaEnterpriseService for RecaptchaEnterpriseService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -172,7 +172,7 @@ impl super::stubs::RecaptchaEnterpriseService for RecaptchaEnterpriseService {
                     "/v1/{}",
                     req.key
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("key"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("key"))?
                         .name
                 ),
             )
@@ -188,7 +188,7 @@ impl super::stubs::RecaptchaEnterpriseService for RecaptchaEnterpriseService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.key), options).await
@@ -209,7 +209,7 @@ impl super::stubs::RecaptchaEnterpriseService for RecaptchaEnterpriseService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -290,7 +290,7 @@ impl super::stubs::RecaptchaEnterpriseService for RecaptchaEnterpriseService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -309,7 +309,7 @@ impl super::stubs::RecaptchaEnterpriseService for RecaptchaEnterpriseService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -355,7 +355,7 @@ impl super::stubs::RecaptchaEnterpriseService for RecaptchaEnterpriseService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -374,7 +374,7 @@ impl super::stubs::RecaptchaEnterpriseService for RecaptchaEnterpriseService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -392,7 +392,7 @@ impl super::stubs::RecaptchaEnterpriseService for RecaptchaEnterpriseService {
                     "/v1/{}",
                     req.firewall_policy
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("firewall_policy"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("firewall_policy"))?
                         .name
                 ),
             )
@@ -408,7 +408,7 @@ impl super::stubs::RecaptchaEnterpriseService for RecaptchaEnterpriseService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -431,7 +431,7 @@ impl super::stubs::RecaptchaEnterpriseService for RecaptchaEnterpriseService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -475,7 +475,7 @@ impl super::stubs::RecaptchaEnterpriseService for RecaptchaEnterpriseService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -499,7 +499,7 @@ impl super::stubs::RecaptchaEnterpriseService for RecaptchaEnterpriseService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/recommender/v1/Cargo.toml b/src/generated/cloud/recommender/v1/Cargo.toml
index 682e1c836..b54c32b86 100644
--- a/src/generated/cloud/recommender/v1/Cargo.toml
+++ b/src/generated/cloud/recommender/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
diff --git a/src/generated/cloud/recommender/v1/src/model.rs b/src/generated/cloud/recommender/v1/src/model.rs
index 23bddb9fb..7b0b5e15e 100755
--- a/src/generated/cloud/recommender/v1/src/model.rs
+++ b/src/generated/cloud/recommender/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate reqwest;
diff --git a/src/generated/cloud/recommender/v1/src/transport.rs b/src/generated/cloud/recommender/v1/src/transport.rs
index 5438d019f..3921b8804 100755
--- a/src/generated/cloud/recommender/v1/src/transport.rs
+++ b/src/generated/cloud/recommender/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [Recommender](super::stubs::Recommender) using a [gclient::ReqwestClient].
+/// Implements [Recommender](super::stubs::Recommender) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Recommender {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Recommender {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for Recommender {
 }
 
 impl Recommender {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -58,7 +58,7 @@ impl super::stubs::Recommender for Recommender {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -77,7 +77,7 @@ impl super::stubs::Recommender for Recommender {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -122,7 +122,7 @@ impl super::stubs::Recommender for Recommender {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -141,7 +141,7 @@ impl super::stubs::Recommender for Recommender {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -240,7 +240,7 @@ impl super::stubs::Recommender for Recommender {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -258,7 +258,7 @@ impl super::stubs::Recommender for Recommender {
                     "/v1/{}",
                     req.recommender_config
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("recommender_config"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("recommender_config"))?
                         .name
                 ),
             )
@@ -274,7 +274,7 @@ impl super::stubs::Recommender for Recommender {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
@@ -298,7 +298,7 @@ impl super::stubs::Recommender for Recommender {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -316,7 +316,7 @@ impl super::stubs::Recommender for Recommender {
                     "/v1/{}",
                     req.insight_type_config
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("insight_type_config"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("insight_type_config"))?
                         .name
                 ),
             )
@@ -332,7 +332,7 @@ impl super::stubs::Recommender for Recommender {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
diff --git a/src/generated/cloud/redis/cluster/v1/Cargo.toml b/src/generated/cloud/redis/cluster/v1/Cargo.toml
index 9a4851cdf..d73e136b3 100644
--- a/src/generated/cloud/redis/cluster/v1/Cargo.toml
+++ b/src/generated/cloud/redis/cluster/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/redis/cluster/v1/src/model.rs b/src/generated/cloud/redis/cluster/v1/src/model.rs
index 34d6e79fd..a27ae1c57 100755
--- a/src/generated/cloud/redis/cluster/v1/src/model.rs
+++ b/src/generated/cloud/redis/cluster/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/redis/cluster/v1/src/transport.rs b/src/generated/cloud/redis/cluster/v1/src/transport.rs
index 33f9878e2..9fb8cd0df 100755
--- a/src/generated/cloud/redis/cluster/v1/src/transport.rs
+++ b/src/generated/cloud/redis/cluster/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [CloudRedisCluster](super::stubs::CloudRedisCluster) using a [gclient::ReqwestClient].
+/// Implements [CloudRedisCluster](super::stubs::CloudRedisCluster) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct CloudRedisCluster {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for CloudRedisCluster {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for CloudRedisCluster {
 }
 
 impl CloudRedisCluster {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -57,7 +57,7 @@ impl super::stubs::CloudRedisCluster for CloudRedisCluster {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -76,7 +76,7 @@ impl super::stubs::CloudRedisCluster for CloudRedisCluster {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -94,7 +94,7 @@ impl super::stubs::CloudRedisCluster for CloudRedisCluster {
                     "/v1/{}",
                     req.cluster
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("cluster"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("cluster"))?
                         .name
                 ),
             )
@@ -110,7 +110,7 @@ impl super::stubs::CloudRedisCluster for CloudRedisCluster {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -135,7 +135,7 @@ impl super::stubs::CloudRedisCluster for CloudRedisCluster {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -178,7 +178,7 @@ impl super::stubs::CloudRedisCluster for CloudRedisCluster {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -222,7 +222,7 @@ impl super::stubs::CloudRedisCluster for CloudRedisCluster {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -241,7 +241,7 @@ impl super::stubs::CloudRedisCluster for CloudRedisCluster {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -262,7 +262,7 @@ impl super::stubs::CloudRedisCluster for CloudRedisCluster {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -281,7 +281,7 @@ impl super::stubs::CloudRedisCluster for CloudRedisCluster {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -301,7 +301,7 @@ impl super::stubs::CloudRedisCluster for CloudRedisCluster {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -357,7 +357,7 @@ impl super::stubs::CloudRedisCluster for CloudRedisCluster {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -376,7 +376,7 @@ impl super::stubs::CloudRedisCluster for CloudRedisCluster {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -398,7 +398,7 @@ impl super::stubs::CloudRedisCluster for CloudRedisCluster {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -417,7 +417,7 @@ impl super::stubs::CloudRedisCluster for CloudRedisCluster {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -436,7 +436,7 @@ impl super::stubs::CloudRedisCluster for CloudRedisCluster {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -455,7 +455,7 @@ impl super::stubs::CloudRedisCluster for CloudRedisCluster {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/redis/v1/Cargo.toml b/src/generated/cloud/redis/v1/Cargo.toml
index f56ca718f..747d884f9 100644
--- a/src/generated/cloud/redis/v1/Cargo.toml
+++ b/src/generated/cloud/redis/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/redis/v1/src/model.rs b/src/generated/cloud/redis/v1/src/model.rs
index f309ab4a6..5ac1af410 100755
--- a/src/generated/cloud/redis/v1/src/model.rs
+++ b/src/generated/cloud/redis/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/redis/v1/src/transport.rs b/src/generated/cloud/redis/v1/src/transport.rs
index 0cc154589..64f9879f9 100755
--- a/src/generated/cloud/redis/v1/src/transport.rs
+++ b/src/generated/cloud/redis/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [CloudRedis](super::stubs::CloudRedis) using a [gclient::ReqwestClient].
+/// Implements [CloudRedis](super::stubs::CloudRedis) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct CloudRedis {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for CloudRedis {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for CloudRedis {
 }
 
 impl CloudRedis {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -60,7 +60,7 @@ impl super::stubs::CloudRedis for CloudRedis {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -79,7 +79,7 @@ impl super::stubs::CloudRedis for CloudRedis {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -98,7 +98,7 @@ impl super::stubs::CloudRedis for CloudRedis {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -139,7 +139,7 @@ impl super::stubs::CloudRedis for CloudRedis {
                     "/v1/{}",
                     req.instance
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("instance"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("instance"))?
                         .name
                 ),
             )
@@ -155,7 +155,7 @@ impl super::stubs::CloudRedis for CloudRedis {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -246,7 +246,7 @@ impl super::stubs::CloudRedis for CloudRedis {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -288,7 +288,7 @@ impl super::stubs::CloudRedis for CloudRedis {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -307,7 +307,7 @@ impl super::stubs::CloudRedis for CloudRedis {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -329,7 +329,7 @@ impl super::stubs::CloudRedis for CloudRedis {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -348,7 +348,7 @@ impl super::stubs::CloudRedis for CloudRedis {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -367,7 +367,7 @@ impl super::stubs::CloudRedis for CloudRedis {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -386,7 +386,7 @@ impl super::stubs::CloudRedis for CloudRedis {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/resourcemanager/v3/Cargo.toml b/src/generated/cloud/resourcemanager/v3/Cargo.toml
index ef6c5caff..99f7e60fa 100644
--- a/src/generated/cloud/resourcemanager/v3/Cargo.toml
+++ b/src/generated/cloud/resourcemanager/v3/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/resourcemanager/v3/src/model.rs b/src/generated/cloud/resourcemanager/v3/src/model.rs
index 0ff81e060..dff1d231c 100755
--- a/src/generated/cloud/resourcemanager/v3/src/model.rs
+++ b/src/generated/cloud/resourcemanager/v3/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate longrunning;
diff --git a/src/generated/cloud/resourcemanager/v3/src/transport.rs b/src/generated/cloud/resourcemanager/v3/src/transport.rs
index 9b06d08a6..7255651bd 100755
--- a/src/generated/cloud/resourcemanager/v3/src/transport.rs
+++ b/src/generated/cloud/resourcemanager/v3/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [Folders](super::stubs::Folders) using a [gclient::ReqwestClient].
+/// Implements [Folders](super::stubs::Folders) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Folders {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Folders {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for Folders {
 }
 
 impl Folders {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -55,7 +55,7 @@ impl super::stubs::Folders for Folders {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -78,7 +78,7 @@ impl super::stubs::Folders for Folders {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("showDeleted", &req.show_deleted)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -100,7 +100,7 @@ impl super::stubs::Folders for Folders {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("query", &req.query)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -135,7 +135,7 @@ impl super::stubs::Folders for Folders {
                     "/v3/{}",
                     req.folder
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("folder"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("folder"))?
                         .name
                 ),
             )
@@ -151,7 +151,7 @@ impl super::stubs::Folders for Folders {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.folder), options).await
@@ -189,7 +189,7 @@ impl super::stubs::Folders for Folders {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -285,7 +285,7 @@ impl super::stubs::Folders for Folders {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -304,10 +304,10 @@ impl super::stubs::Folders for Folders {
     }
 }
 
-/// Implements [Organizations](super::stubs::Organizations) using a [gclient::ReqwestClient].
+/// Implements [Organizations](super::stubs::Organizations) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Organizations {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Organizations {
@@ -319,8 +319,8 @@ impl std::fmt::Debug for Organizations {
 }
 
 impl Organizations {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -341,7 +341,7 @@ impl super::stubs::Organizations for Organizations {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -363,7 +363,7 @@ impl super::stubs::Organizations for Organizations {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("query", &req.query)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -442,15 +442,15 @@ impl super::stubs::Organizations for Organizations {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [Projects](super::stubs::Projects) using a [gclient::ReqwestClient].
+/// Implements [Projects](super::stubs::Projects) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Projects {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Projects {
@@ -462,8 +462,8 @@ impl std::fmt::Debug for Projects {
 }
 
 impl Projects {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -484,7 +484,7 @@ impl super::stubs::Projects for Projects {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -507,7 +507,7 @@ impl super::stubs::Projects for Projects {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("showDeleted", &req.show_deleted)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -529,7 +529,7 @@ impl super::stubs::Projects for Projects {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -566,7 +566,7 @@ impl super::stubs::Projects for Projects {
                     "/v3/{}",
                     req.project
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("project"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("project"))?
                         .name
                 ),
             )
@@ -582,7 +582,7 @@ impl super::stubs::Projects for Projects {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -622,7 +622,7 @@ impl super::stubs::Projects for Projects {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -718,7 +718,7 @@ impl super::stubs::Projects for Projects {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -737,10 +737,10 @@ impl super::stubs::Projects for Projects {
     }
 }
 
-/// Implements [TagBindings](super::stubs::TagBindings) using a [gclient::ReqwestClient].
+/// Implements [TagBindings](super::stubs::TagBindings) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct TagBindings {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for TagBindings {
@@ -752,8 +752,8 @@ impl std::fmt::Debug for TagBindings {
 }
 
 impl TagBindings {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -777,7 +777,7 @@ impl super::stubs::TagBindings for TagBindings {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -816,7 +816,7 @@ impl super::stubs::TagBindings for TagBindings {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -838,7 +838,7 @@ impl super::stubs::TagBindings for TagBindings {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -857,7 +857,7 @@ impl super::stubs::TagBindings for TagBindings {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -876,10 +876,10 @@ impl super::stubs::TagBindings for TagBindings {
     }
 }
 
-/// Implements [TagHolds](super::stubs::TagHolds) using a [gclient::ReqwestClient].
+/// Implements [TagHolds](super::stubs::TagHolds) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct TagHolds {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for TagHolds {
@@ -891,8 +891,8 @@ impl std::fmt::Debug for TagHolds {
 }
 
 impl TagHolds {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -937,7 +937,7 @@ impl super::stubs::TagHolds for TagHolds {
             );
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -959,7 +959,7 @@ impl super::stubs::TagHolds for TagHolds {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -978,7 +978,7 @@ impl super::stubs::TagHolds for TagHolds {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -997,10 +997,10 @@ impl super::stubs::TagHolds for TagHolds {
     }
 }
 
-/// Implements [TagKeys](super::stubs::TagKeys) using a [gclient::ReqwestClient].
+/// Implements [TagKeys](super::stubs::TagKeys) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct TagKeys {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for TagKeys {
@@ -1012,8 +1012,8 @@ impl std::fmt::Debug for TagKeys {
 }
 
 impl TagKeys {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1037,7 +1037,7 @@ impl super::stubs::TagKeys for TagKeys {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1056,7 +1056,7 @@ impl super::stubs::TagKeys for TagKeys {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1076,7 +1076,7 @@ impl super::stubs::TagKeys for TagKeys {
             );
         let builder = builder.query(&[("name", &req.name)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1114,7 +1114,7 @@ impl super::stubs::TagKeys for TagKeys {
                     "/v3/{}",
                     req.tag_key
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("tag_key"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("tag_key"))?
                         .name
                 ),
             )
@@ -1130,7 +1130,7 @@ impl super::stubs::TagKeys for TagKeys {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
@@ -1156,7 +1156,7 @@ impl super::stubs::TagKeys for TagKeys {
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1235,7 +1235,7 @@ impl super::stubs::TagKeys for TagKeys {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1254,10 +1254,10 @@ impl super::stubs::TagKeys for TagKeys {
     }
 }
 
-/// Implements [TagValues](super::stubs::TagValues) using a [gclient::ReqwestClient].
+/// Implements [TagValues](super::stubs::TagValues) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct TagValues {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for TagValues {
@@ -1269,8 +1269,8 @@ impl std::fmt::Debug for TagValues {
 }
 
 impl TagValues {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1294,7 +1294,7 @@ impl super::stubs::TagValues for TagValues {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1313,7 +1313,7 @@ impl super::stubs::TagValues for TagValues {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1333,7 +1333,7 @@ impl super::stubs::TagValues for TagValues {
             );
         let builder = builder.query(&[("name", &req.name)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1371,7 +1371,7 @@ impl super::stubs::TagValues for TagValues {
                     "/v3/{}",
                     req.tag_value
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("tag_value"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("tag_value"))?
                         .name
                 ),
             )
@@ -1387,7 +1387,7 @@ impl super::stubs::TagValues for TagValues {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
@@ -1413,7 +1413,7 @@ impl super::stubs::TagValues for TagValues {
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1492,7 +1492,7 @@ impl super::stubs::TagValues for TagValues {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/retail/v2/Cargo.toml b/src/generated/cloud/retail/v2/Cargo.toml
index 66a9b805c..079b69be9 100644
--- a/src/generated/cloud/retail/v2/Cargo.toml
+++ b/src/generated/cloud/retail/v2/Cargo.toml
@@ -30,7 +30,7 @@ api        = { version = "0.2", path = "../../../../../src/generated/api/types",
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/retail/v2/src/model.rs b/src/generated/cloud/retail/v2/src/model.rs
index c0ac14c4d..f8745d304 100755
--- a/src/generated/cloud/retail/v2/src/model.rs
+++ b/src/generated/cloud/retail/v2/src/model.rs
@@ -21,7 +21,7 @@ extern crate api;
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate longrunning;
diff --git a/src/generated/cloud/retail/v2/src/transport.rs b/src/generated/cloud/retail/v2/src/transport.rs
index 7b7d10afe..fc20a68ca 100755
--- a/src/generated/cloud/retail/v2/src/transport.rs
+++ b/src/generated/cloud/retail/v2/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [AnalyticsService](super::stubs::AnalyticsService) using a [gclient::ReqwestClient].
+/// Implements [AnalyticsService](super::stubs::AnalyticsService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct AnalyticsService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for AnalyticsService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for AnalyticsService {
 }
 
 impl AnalyticsService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -78,7 +78,7 @@ impl super::stubs::AnalyticsService for AnalyticsService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -97,7 +97,7 @@ impl super::stubs::AnalyticsService for AnalyticsService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -116,10 +116,10 @@ impl super::stubs::AnalyticsService for AnalyticsService {
     }
 }
 
-/// Implements [CatalogService](super::stubs::CatalogService) using a [gclient::ReqwestClient].
+/// Implements [CatalogService](super::stubs::CatalogService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct CatalogService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for CatalogService {
@@ -131,8 +131,8 @@ impl std::fmt::Debug for CatalogService {
 }
 
 impl CatalogService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -155,7 +155,7 @@ impl super::stubs::CatalogService for CatalogService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -173,7 +173,7 @@ impl super::stubs::CatalogService for CatalogService {
                     "/v2/{}",
                     req.catalog
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("catalog"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("catalog"))?
                         .name
                 ),
             )
@@ -189,7 +189,7 @@ impl super::stubs::CatalogService for CatalogService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -235,7 +235,7 @@ impl super::stubs::CatalogService for CatalogService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -254,7 +254,7 @@ impl super::stubs::CatalogService for CatalogService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -272,7 +272,7 @@ impl super::stubs::CatalogService for CatalogService {
                     "/v2/{}",
                     req.completion_config
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("completion_config"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("completion_config"))?
                         .name
                 ),
             )
@@ -288,7 +288,7 @@ impl super::stubs::CatalogService for CatalogService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -311,7 +311,7 @@ impl super::stubs::CatalogService for CatalogService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -329,7 +329,7 @@ impl super::stubs::CatalogService for CatalogService {
                     "/v2/{}",
                     req.attributes_config
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("attributes_config"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("attributes_config"))?
                         .name
                 ),
             )
@@ -345,7 +345,7 @@ impl super::stubs::CatalogService for CatalogService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -431,7 +431,7 @@ impl super::stubs::CatalogService for CatalogService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -450,15 +450,15 @@ impl super::stubs::CatalogService for CatalogService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [CompletionService](super::stubs::CompletionService) using a [gclient::ReqwestClient].
+/// Implements [CompletionService](super::stubs::CompletionService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct CompletionService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for CompletionService {
@@ -470,8 +470,8 @@ impl std::fmt::Debug for CompletionService {
 }
 
 impl CompletionService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -509,7 +509,7 @@ impl super::stubs::CompletionService for CompletionService {
         )]);
         let builder = builder.query(&[("entity", &req.entity)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -551,7 +551,7 @@ impl super::stubs::CompletionService for CompletionService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -570,7 +570,7 @@ impl super::stubs::CompletionService for CompletionService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -589,10 +589,10 @@ impl super::stubs::CompletionService for CompletionService {
     }
 }
 
-/// Implements [ControlService](super::stubs::ControlService) using a [gclient::ReqwestClient].
+/// Implements [ControlService](super::stubs::ControlService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ControlService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ControlService {
@@ -604,8 +604,8 @@ impl std::fmt::Debug for ControlService {
 }
 
 impl ControlService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -649,7 +649,7 @@ impl super::stubs::ControlService for ControlService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -667,7 +667,7 @@ impl super::stubs::ControlService for ControlService {
                     "/v2/{}",
                     req.control
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("control"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("control"))?
                         .name
                 ),
             )
@@ -683,7 +683,7 @@ impl super::stubs::ControlService for ControlService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -706,7 +706,7 @@ impl super::stubs::ControlService for ControlService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -728,7 +728,7 @@ impl super::stubs::ControlService for ControlService {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -750,7 +750,7 @@ impl super::stubs::ControlService for ControlService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -769,15 +769,15 @@ impl super::stubs::ControlService for ControlService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [GenerativeQuestionService](super::stubs::GenerativeQuestionService) using a [gclient::ReqwestClient].
+/// Implements [GenerativeQuestionService](super::stubs::GenerativeQuestionService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct GenerativeQuestionService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for GenerativeQuestionService {
@@ -789,8 +789,8 @@ impl std::fmt::Debug for GenerativeQuestionService {
 }
 
 impl GenerativeQuestionService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -810,7 +810,7 @@ impl super::stubs::GenerativeQuestionService for GenerativeQuestionService {
                     "/v2/{}/generativeQuestionFeature",
                     req.generative_questions_feature_config
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing(
+                        .ok_or_else(|| gaxi::path_parameter::missing(
                             "generative_questions_feature_config"
                         ))?
                         .catalog
@@ -828,7 +828,7 @@ impl super::stubs::GenerativeQuestionService for GenerativeQuestionService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -858,7 +858,7 @@ impl super::stubs::GenerativeQuestionService for GenerativeQuestionService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -880,7 +880,7 @@ impl super::stubs::GenerativeQuestionService for GenerativeQuestionService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -898,9 +898,7 @@ impl super::stubs::GenerativeQuestionService for GenerativeQuestionService {
                     "/v2/{}/generativeQuestion",
                     req.generative_question_config
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing(
-                            "generative_question_config"
-                        ))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("generative_question_config"))?
                         .catalog
                 ),
             )
@@ -916,7 +914,7 @@ impl super::stubs::GenerativeQuestionService for GenerativeQuestionService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -962,7 +960,7 @@ impl super::stubs::GenerativeQuestionService for GenerativeQuestionService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -981,15 +979,15 @@ impl super::stubs::GenerativeQuestionService for GenerativeQuestionService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [ModelService](super::stubs::ModelService) using a [gclient::ReqwestClient].
+/// Implements [ModelService](super::stubs::ModelService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ModelService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ModelService {
@@ -1001,8 +999,8 @@ impl std::fmt::Debug for ModelService {
 }
 
 impl ModelService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1041,7 +1039,7 @@ impl super::stubs::ModelService for ModelService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1094,7 +1092,7 @@ impl super::stubs::ModelService for ModelService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1115,7 +1113,7 @@ impl super::stubs::ModelService for ModelService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1133,7 +1131,7 @@ impl super::stubs::ModelService for ModelService {
                     "/v2/{}",
                     req.model
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("model"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("model"))?
                         .name
                 ),
             )
@@ -1149,7 +1147,7 @@ impl super::stubs::ModelService for ModelService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.model), options).await
@@ -1190,7 +1188,7 @@ impl super::stubs::ModelService for ModelService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1209,7 +1207,7 @@ impl super::stubs::ModelService for ModelService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1228,10 +1226,10 @@ impl super::stubs::ModelService for ModelService {
     }
 }
 
-/// Implements [PredictionService](super::stubs::PredictionService) using a [gclient::ReqwestClient].
+/// Implements [PredictionService](super::stubs::PredictionService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct PredictionService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for PredictionService {
@@ -1243,8 +1241,8 @@ impl std::fmt::Debug for PredictionService {
 }
 
 impl PredictionService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1288,7 +1286,7 @@ impl super::stubs::PredictionService for PredictionService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1307,15 +1305,15 @@ impl super::stubs::PredictionService for PredictionService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [ProductService](super::stubs::ProductService) using a [gclient::ReqwestClient].
+/// Implements [ProductService](super::stubs::ProductService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ProductService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ProductService {
@@ -1327,8 +1325,8 @@ impl std::fmt::Debug for ProductService {
 }
 
 impl ProductService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1372,7 +1370,7 @@ impl super::stubs::ProductService for ProductService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1400,11 +1398,11 @@ impl super::stubs::ProductService for ProductService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "readMask")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1422,7 +1420,7 @@ impl super::stubs::ProductService for ProductService {
                     "/v2/{}",
                     req.product
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("product"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("product"))?
                         .name
                 ),
             )
@@ -1438,7 +1436,7 @@ impl super::stubs::ProductService for ProductService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("allowMissing", &req.allow_missing)]);
@@ -1462,7 +1460,7 @@ impl super::stubs::ProductService for ProductService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1520,7 +1518,7 @@ impl super::stubs::ProductService for ProductService {
                     "/v2/{}:setInventory",
                     req.inventory
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("inventory"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("inventory"))?
                         .name
                 ),
             )
@@ -1630,7 +1628,7 @@ impl super::stubs::ProductService for ProductService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1649,7 +1647,7 @@ impl super::stubs::ProductService for ProductService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1668,10 +1666,10 @@ impl super::stubs::ProductService for ProductService {
     }
 }
 
-/// Implements [SearchService](super::stubs::SearchService) using a [gclient::ReqwestClient].
+/// Implements [SearchService](super::stubs::SearchService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct SearchService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for SearchService {
@@ -1683,8 +1681,8 @@ impl std::fmt::Debug for SearchService {
 }
 
 impl SearchService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1728,7 +1726,7 @@ impl super::stubs::SearchService for SearchService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1747,15 +1745,15 @@ impl super::stubs::SearchService for SearchService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [ServingConfigService](super::stubs::ServingConfigService) using a [gclient::ReqwestClient].
+/// Implements [ServingConfigService](super::stubs::ServingConfigService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ServingConfigService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ServingConfigService {
@@ -1767,8 +1765,8 @@ impl std::fmt::Debug for ServingConfigService {
 }
 
 impl ServingConfigService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1812,7 +1810,7 @@ impl super::stubs::ServingConfigService for ServingConfigService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1830,7 +1828,7 @@ impl super::stubs::ServingConfigService for ServingConfigService {
                     "/v2/{}",
                     req.serving_config
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("serving_config"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("serving_config"))?
                         .name
                 ),
             )
@@ -1846,7 +1844,7 @@ impl super::stubs::ServingConfigService for ServingConfigService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1869,7 +1867,7 @@ impl super::stubs::ServingConfigService for ServingConfigService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1893,7 +1891,7 @@ impl super::stubs::ServingConfigService for ServingConfigService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1955,7 +1953,7 @@ impl super::stubs::ServingConfigService for ServingConfigService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1974,15 +1972,15 @@ impl super::stubs::ServingConfigService for ServingConfigService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [UserEventService](super::stubs::UserEventService) using a [gclient::ReqwestClient].
+/// Implements [UserEventService](super::stubs::UserEventService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct UserEventService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for UserEventService {
@@ -1994,8 +1992,8 @@ impl std::fmt::Debug for UserEventService {
 }
 
 impl UserEventService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -2050,7 +2048,7 @@ impl super::stubs::UserEventService for UserEventService {
         let builder = builder.query(&[("ets", &req.ets)]);
         let builder = builder.query(&[("rawJson", &req.raw_json)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2132,7 +2130,7 @@ impl super::stubs::UserEventService for UserEventService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2151,7 +2149,7 @@ impl super::stubs::UserEventService for UserEventService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/run/v2/Cargo.toml b/src/generated/cloud/run/v2/Cargo.toml
index 0d6ce0016..b5d6d88ac 100644
--- a/src/generated/cloud/run/v2/Cargo.toml
+++ b/src/generated/cloud/run/v2/Cargo.toml
@@ -30,7 +30,7 @@ api        = { version = "0.2", path = "../../../../../src/generated/api/types",
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/run/v2/src/model.rs b/src/generated/cloud/run/v2/src/model.rs
index 4b1460d62..184ae2dc2 100755
--- a/src/generated/cloud/run/v2/src/model.rs
+++ b/src/generated/cloud/run/v2/src/model.rs
@@ -21,7 +21,7 @@ extern crate api;
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate longrunning;
diff --git a/src/generated/cloud/run/v2/src/transport.rs b/src/generated/cloud/run/v2/src/transport.rs
index ae1fccd81..08811a5af 100755
--- a/src/generated/cloud/run/v2/src/transport.rs
+++ b/src/generated/cloud/run/v2/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [Builds](super::stubs::Builds) using a [gclient::ReqwestClient].
+/// Implements [Builds](super::stubs::Builds) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Builds {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Builds {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for Builds {
 }
 
 impl Builds {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -78,7 +78,7 @@ impl super::stubs::Builds for Builds {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -97,7 +97,7 @@ impl super::stubs::Builds for Builds {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -116,7 +116,7 @@ impl super::stubs::Builds for Builds {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -138,10 +138,10 @@ impl super::stubs::Builds for Builds {
     }
 }
 
-/// Implements [Executions](super::stubs::Executions) using a [gclient::ReqwestClient].
+/// Implements [Executions](super::stubs::Executions) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Executions {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Executions {
@@ -153,8 +153,8 @@ impl std::fmt::Debug for Executions {
 }
 
 impl Executions {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -175,7 +175,7 @@ impl super::stubs::Executions for Executions {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -200,7 +200,7 @@ impl super::stubs::Executions for Executions {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("showDeleted", &req.show_deleted)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -221,7 +221,7 @@ impl super::stubs::Executions for Executions {
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -260,7 +260,7 @@ impl super::stubs::Executions for Executions {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -279,7 +279,7 @@ impl super::stubs::Executions for Executions {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -298,7 +298,7 @@ impl super::stubs::Executions for Executions {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -334,10 +334,10 @@ impl super::stubs::Executions for Executions {
     }
 }
 
-/// Implements [Jobs](super::stubs::Jobs) using a [gclient::ReqwestClient].
+/// Implements [Jobs](super::stubs::Jobs) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Jobs {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Jobs {
@@ -347,8 +347,8 @@ impl std::fmt::Debug for Jobs {
 }
 
 impl Jobs {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -388,7 +388,7 @@ impl super::stubs::Jobs for Jobs {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -410,7 +410,7 @@ impl super::stubs::Jobs for Jobs {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("showDeleted", &req.show_deleted)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -428,7 +428,7 @@ impl super::stubs::Jobs for Jobs {
                     "/v2/{}",
                     req.job
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("job"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("job"))?
                         .name
                 ),
             )
@@ -459,7 +459,7 @@ impl super::stubs::Jobs for Jobs {
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -504,11 +504,11 @@ impl super::stubs::Jobs for Jobs {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -570,7 +570,7 @@ impl super::stubs::Jobs for Jobs {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -589,7 +589,7 @@ impl super::stubs::Jobs for Jobs {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -608,7 +608,7 @@ impl super::stubs::Jobs for Jobs {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -644,10 +644,10 @@ impl super::stubs::Jobs for Jobs {
     }
 }
 
-/// Implements [Revisions](super::stubs::Revisions) using a [gclient::ReqwestClient].
+/// Implements [Revisions](super::stubs::Revisions) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Revisions {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Revisions {
@@ -659,8 +659,8 @@ impl std::fmt::Debug for Revisions {
 }
 
 impl Revisions {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -681,7 +681,7 @@ impl super::stubs::Revisions for Revisions {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -706,7 +706,7 @@ impl super::stubs::Revisions for Revisions {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("showDeleted", &req.show_deleted)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -727,7 +727,7 @@ impl super::stubs::Revisions for Revisions {
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -749,7 +749,7 @@ impl super::stubs::Revisions for Revisions {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -768,7 +768,7 @@ impl super::stubs::Revisions for Revisions {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -787,7 +787,7 @@ impl super::stubs::Revisions for Revisions {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -823,10 +823,10 @@ impl super::stubs::Revisions for Revisions {
     }
 }
 
-/// Implements [Services](super::stubs::Services) using a [gclient::ReqwestClient].
+/// Implements [Services](super::stubs::Services) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Services {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Services {
@@ -838,8 +838,8 @@ impl std::fmt::Debug for Services {
 }
 
 impl Services {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -884,7 +884,7 @@ impl super::stubs::Services for Services {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -906,7 +906,7 @@ impl super::stubs::Services for Services {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("showDeleted", &req.show_deleted)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -924,7 +924,7 @@ impl super::stubs::Services for Services {
                     "/v2/{}",
                     req.service
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("service"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("service"))?
                         .name
                 ),
             )
@@ -940,7 +940,7 @@ impl super::stubs::Services for Services {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
@@ -967,7 +967,7 @@ impl super::stubs::Services for Services {
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -995,11 +995,11 @@ impl super::stubs::Services for Services {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1061,7 +1061,7 @@ impl super::stubs::Services for Services {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1080,7 +1080,7 @@ impl super::stubs::Services for Services {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1099,7 +1099,7 @@ impl super::stubs::Services for Services {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1135,10 +1135,10 @@ impl super::stubs::Services for Services {
     }
 }
 
-/// Implements [Tasks](super::stubs::Tasks) using a [gclient::ReqwestClient].
+/// Implements [Tasks](super::stubs::Tasks) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Tasks {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Tasks {
@@ -1148,8 +1148,8 @@ impl std::fmt::Debug for Tasks {
 }
 
 impl Tasks {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1170,7 +1170,7 @@ impl super::stubs::Tasks for Tasks {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1192,7 +1192,7 @@ impl super::stubs::Tasks for Tasks {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("showDeleted", &req.show_deleted)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1214,7 +1214,7 @@ impl super::stubs::Tasks for Tasks {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1233,7 +1233,7 @@ impl super::stubs::Tasks for Tasks {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1252,7 +1252,7 @@ impl super::stubs::Tasks for Tasks {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/scheduler/v1/Cargo.toml b/src/generated/cloud/scheduler/v1/Cargo.toml
index be1a40901..435980ead 100644
--- a/src/generated/cloud/scheduler/v1/Cargo.toml
+++ b/src/generated/cloud/scheduler/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
 reqwest    = { version = "0.12", features = ["json"] }
diff --git a/src/generated/cloud/scheduler/v1/src/model.rs b/src/generated/cloud/scheduler/v1/src/model.rs
index db38d8ecf..40eb76d4a 100755
--- a/src/generated/cloud/scheduler/v1/src/model.rs
+++ b/src/generated/cloud/scheduler/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate location;
 extern crate reqwest;
diff --git a/src/generated/cloud/scheduler/v1/src/transport.rs b/src/generated/cloud/scheduler/v1/src/transport.rs
index 3cd6ee44a..4b3c6c2b2 100755
--- a/src/generated/cloud/scheduler/v1/src/transport.rs
+++ b/src/generated/cloud/scheduler/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [CloudScheduler](super::stubs::CloudScheduler) using a [gclient::ReqwestClient].
+/// Implements [CloudScheduler](super::stubs::CloudScheduler) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct CloudScheduler {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for CloudScheduler {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for CloudScheduler {
 }
 
 impl CloudScheduler {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -57,7 +57,7 @@ impl super::stubs::CloudScheduler for CloudScheduler {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -76,7 +76,7 @@ impl super::stubs::CloudScheduler for CloudScheduler {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -111,7 +111,7 @@ impl super::stubs::CloudScheduler for CloudScheduler {
                     "/v1/{}",
                     req.job
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("job"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("job"))?
                         .name
                 ),
             )
@@ -127,7 +127,7 @@ impl super::stubs::CloudScheduler for CloudScheduler {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.job), options).await
@@ -148,7 +148,7 @@ impl super::stubs::CloudScheduler for CloudScheduler {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -221,7 +221,7 @@ impl super::stubs::CloudScheduler for CloudScheduler {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -240,7 +240,7 @@ impl super::stubs::CloudScheduler for CloudScheduler {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/cloud/secretmanager/v1/Cargo.toml b/src/generated/cloud/secretmanager/v1/Cargo.toml
index 140b51fa6..4d22acbc7 100644
--- a/src/generated/cloud/secretmanager/v1/Cargo.toml
+++ b/src/generated/cloud/secretmanager/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/secretmanager/v1/src/model.rs b/src/generated/cloud/secretmanager/v1/src/model.rs
index 01e71e292..6d81cd8bb 100755
--- a/src/generated/cloud/secretmanager/v1/src/model.rs
+++ b/src/generated/cloud/secretmanager/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/secretmanager/v1/src/transport.rs b/src/generated/cloud/secretmanager/v1/src/transport.rs
index 08a5a2744..0b2a624e3 100755
--- a/src/generated/cloud/secretmanager/v1/src/transport.rs
+++ b/src/generated/cloud/secretmanager/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [SecretManagerService](super::stubs::SecretManagerService) using a [gclient::ReqwestClient].
+/// Implements [SecretManagerService](super::stubs::SecretManagerService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct SecretManagerService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for SecretManagerService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for SecretManagerService {
 }
 
 impl SecretManagerService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -58,7 +58,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -115,7 +115,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -133,7 +133,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
                     "/v1/{}",
                     req.secret
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("secret"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("secret"))?
                         .name
                 ),
             )
@@ -149,7 +149,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.secret), options).await
@@ -171,7 +171,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
             );
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -193,7 +193,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -212,7 +212,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -231,7 +231,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -330,11 +330,11 @@ impl super::stubs::SecretManagerService for SecretManagerService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -376,7 +376,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -395,7 +395,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/cloud/securesourcemanager/v1/Cargo.toml b/src/generated/cloud/securesourcemanager/v1/Cargo.toml
index 99f7bae6e..b368beebb 100644
--- a/src/generated/cloud/securesourcemanager/v1/Cargo.toml
+++ b/src/generated/cloud/securesourcemanager/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/securesourcemanager/v1/src/model.rs b/src/generated/cloud/securesourcemanager/v1/src/model.rs
index 67a3f1528..946e7fa8b 100755
--- a/src/generated/cloud/securesourcemanager/v1/src/model.rs
+++ b/src/generated/cloud/securesourcemanager/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/securesourcemanager/v1/src/transport.rs b/src/generated/cloud/securesourcemanager/v1/src/transport.rs
index 3aa2ee4db..c8d526cca 100755
--- a/src/generated/cloud/securesourcemanager/v1/src/transport.rs
+++ b/src/generated/cloud/securesourcemanager/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [SecureSourceManager](super::stubs::SecureSourceManager) using a [gclient::ReqwestClient].
+/// Implements [SecureSourceManager](super::stubs::SecureSourceManager) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct SecureSourceManager {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for SecureSourceManager {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for SecureSourceManager {
 }
 
 impl SecureSourceManager {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::SecureSourceManager for SecureSourceManager {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -81,7 +81,7 @@ impl super::stubs::SecureSourceManager for SecureSourceManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -125,7 +125,7 @@ impl super::stubs::SecureSourceManager for SecureSourceManager {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -151,7 +151,7 @@ impl super::stubs::SecureSourceManager for SecureSourceManager {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("instance", &req.instance)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -170,7 +170,7 @@ impl super::stubs::SecureSourceManager for SecureSourceManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -213,7 +213,7 @@ impl super::stubs::SecureSourceManager for SecureSourceManager {
             );
         let builder = builder.query(&[("allowMissing", &req.allow_missing)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -241,11 +241,11 @@ impl super::stubs::SecureSourceManager for SecureSourceManager {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -332,7 +332,7 @@ impl super::stubs::SecureSourceManager for SecureSourceManager {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -351,7 +351,7 @@ impl super::stubs::SecureSourceManager for SecureSourceManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -369,7 +369,7 @@ impl super::stubs::SecureSourceManager for SecureSourceManager {
                     "/v1/{}",
                     req.branch_rule
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("branch_rule"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("branch_rule"))?
                         .name
                 ),
             )
@@ -386,7 +386,7 @@ impl super::stubs::SecureSourceManager for SecureSourceManager {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -410,7 +410,7 @@ impl super::stubs::SecureSourceManager for SecureSourceManager {
             );
         let builder = builder.query(&[("allowMissing", &req.allow_missing)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -432,7 +432,7 @@ impl super::stubs::SecureSourceManager for SecureSourceManager {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -451,7 +451,7 @@ impl super::stubs::SecureSourceManager for SecureSourceManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -499,11 +499,11 @@ impl super::stubs::SecureSourceManager for SecureSourceManager {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -545,7 +545,7 @@ impl super::stubs::SecureSourceManager for SecureSourceManager {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -564,7 +564,7 @@ impl super::stubs::SecureSourceManager for SecureSourceManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -583,7 +583,7 @@ impl super::stubs::SecureSourceManager for SecureSourceManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/security/privateca/v1/Cargo.toml b/src/generated/cloud/security/privateca/v1/Cargo.toml
index 8522ec139..c5be6ab50 100644
--- a/src/generated/cloud/security/privateca/v1/Cargo.toml
+++ b/src/generated/cloud/security/privateca/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../../src/generated/type", package = "google-cloud-type" }
 iam_v1     = { version = "0.2", path = "../../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
diff --git a/src/generated/cloud/security/privateca/v1/src/model.rs b/src/generated/cloud/security/privateca/v1/src/model.rs
index 4412063e6..4cfaac687 100755
--- a/src/generated/cloud/security/privateca/v1/src/model.rs
+++ b/src/generated/cloud/security/privateca/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate iam_v1;
 extern crate lazy_static;
diff --git a/src/generated/cloud/security/privateca/v1/src/transport.rs b/src/generated/cloud/security/privateca/v1/src/transport.rs
index c48459472..87bbbb150 100755
--- a/src/generated/cloud/security/privateca/v1/src/transport.rs
+++ b/src/generated/cloud/security/privateca/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [CertificateAuthorityService](super::stubs::CertificateAuthorityService) using a [gclient::ReqwestClient].
+/// Implements [CertificateAuthorityService](super::stubs::CertificateAuthorityService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct CertificateAuthorityService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for CertificateAuthorityService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for CertificateAuthorityService {
 }
 
 impl CertificateAuthorityService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -84,7 +84,7 @@ impl super::stubs::CertificateAuthorityService for CertificateAuthorityService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -110,7 +110,7 @@ impl super::stubs::CertificateAuthorityService for CertificateAuthorityService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -145,7 +145,7 @@ impl super::stubs::CertificateAuthorityService for CertificateAuthorityService {
                     "/v1/{}",
                     req.certificate
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("certificate"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("certificate"))?
                         .name
                 ),
             )
@@ -161,7 +161,7 @@ impl super::stubs::CertificateAuthorityService for CertificateAuthorityService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -260,7 +260,7 @@ impl super::stubs::CertificateAuthorityService for CertificateAuthorityService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -279,7 +279,7 @@ impl super::stubs::CertificateAuthorityService for CertificateAuthorityService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -305,7 +305,7 @@ impl super::stubs::CertificateAuthorityService for CertificateAuthorityService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -347,7 +347,7 @@ impl super::stubs::CertificateAuthorityService for CertificateAuthorityService {
         let builder =
             builder.query(&[("ignoreDependentResources", &req.ignore_dependent_resources)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -365,7 +365,7 @@ impl super::stubs::CertificateAuthorityService for CertificateAuthorityService {
                     "/v1/{}",
                     req.certificate_authority
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("certificate_authority"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("certificate_authority"))?
                         .name
                 ),
             )
@@ -381,7 +381,7 @@ impl super::stubs::CertificateAuthorityService for CertificateAuthorityService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -425,7 +425,7 @@ impl super::stubs::CertificateAuthorityService for CertificateAuthorityService {
                     "/v1/{}",
                     req.ca_pool
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("ca_pool"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("ca_pool"))?
                         .name
                 ),
             )
@@ -441,7 +441,7 @@ impl super::stubs::CertificateAuthorityService for CertificateAuthorityService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -465,7 +465,7 @@ impl super::stubs::CertificateAuthorityService for CertificateAuthorityService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -488,7 +488,7 @@ impl super::stubs::CertificateAuthorityService for CertificateAuthorityService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -510,7 +510,7 @@ impl super::stubs::CertificateAuthorityService for CertificateAuthorityService {
         let builder =
             builder.query(&[("ignoreDependentResources", &req.ignore_dependent_resources)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -549,7 +549,7 @@ impl super::stubs::CertificateAuthorityService for CertificateAuthorityService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -575,7 +575,7 @@ impl super::stubs::CertificateAuthorityService for CertificateAuthorityService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -593,7 +593,7 @@ impl super::stubs::CertificateAuthorityService for CertificateAuthorityService {
                     "/v1/{}",
                     req.certificate_revocation_list
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing(
+                        .ok_or_else(|| gaxi::path_parameter::missing(
                             "certificate_revocation_list"
                         ))?
                         .name
@@ -611,7 +611,7 @@ impl super::stubs::CertificateAuthorityService for CertificateAuthorityService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -660,7 +660,7 @@ impl super::stubs::CertificateAuthorityService for CertificateAuthorityService {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -679,7 +679,7 @@ impl super::stubs::CertificateAuthorityService for CertificateAuthorityService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -705,7 +705,7 @@ impl super::stubs::CertificateAuthorityService for CertificateAuthorityService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -723,7 +723,7 @@ impl super::stubs::CertificateAuthorityService for CertificateAuthorityService {
                     "/v1/{}",
                     req.certificate_template
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("certificate_template"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("certificate_template"))?
                         .name
                 ),
             )
@@ -739,7 +739,7 @@ impl super::stubs::CertificateAuthorityService for CertificateAuthorityService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -766,7 +766,7 @@ impl super::stubs::CertificateAuthorityService for CertificateAuthorityService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -785,7 +785,7 @@ impl super::stubs::CertificateAuthorityService for CertificateAuthorityService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -833,11 +833,11 @@ impl super::stubs::CertificateAuthorityService for CertificateAuthorityService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -879,7 +879,7 @@ impl super::stubs::CertificateAuthorityService for CertificateAuthorityService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -898,7 +898,7 @@ impl super::stubs::CertificateAuthorityService for CertificateAuthorityService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -917,7 +917,7 @@ impl super::stubs::CertificateAuthorityService for CertificateAuthorityService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/security/publicca/v1/Cargo.toml b/src/generated/cloud/security/publicca/v1/Cargo.toml
index 2db47dfa6..48144d213 100644
--- a/src/generated/cloud/security/publicca/v1/Cargo.toml
+++ b/src/generated/cloud/security/publicca/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
 serde      = { version = "1", features = ["serde_derive"] }
diff --git a/src/generated/cloud/security/publicca/v1/src/model.rs b/src/generated/cloud/security/publicca/v1/src/model.rs
index 44cc922e7..6a8458402 100755
--- a/src/generated/cloud/security/publicca/v1/src/model.rs
+++ b/src/generated/cloud/security/publicca/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate reqwest;
 extern crate serde;
diff --git a/src/generated/cloud/security/publicca/v1/src/transport.rs b/src/generated/cloud/security/publicca/v1/src/transport.rs
index f7347cfb6..a1e67ec7b 100755
--- a/src/generated/cloud/security/publicca/v1/src/transport.rs
+++ b/src/generated/cloud/security/publicca/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [PublicCertificateAuthorityService](super::stubs::PublicCertificateAuthorityService) using a [gclient::ReqwestClient].
+/// Implements [PublicCertificateAuthorityService](super::stubs::PublicCertificateAuthorityService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct PublicCertificateAuthorityService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for PublicCertificateAuthorityService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for PublicCertificateAuthorityService {
 }
 
 impl PublicCertificateAuthorityService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
diff --git a/src/generated/cloud/securitycenter/v2/Cargo.toml b/src/generated/cloud/securitycenter/v2/Cargo.toml
index 716169ddf..a88230865 100644
--- a/src/generated/cloud/securitycenter/v2/Cargo.toml
+++ b/src/generated/cloud/securitycenter/v2/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/securitycenter/v2/src/model.rs b/src/generated/cloud/securitycenter/v2/src/model.rs
index 6df230568..37759f149 100755
--- a/src/generated/cloud/securitycenter/v2/src/model.rs
+++ b/src/generated/cloud/securitycenter/v2/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate longrunning;
diff --git a/src/generated/cloud/securitycenter/v2/src/transport.rs b/src/generated/cloud/securitycenter/v2/src/transport.rs
index 5caa4c6e6..a255e9405 100755
--- a/src/generated/cloud/securitycenter/v2/src/transport.rs
+++ b/src/generated/cloud/securitycenter/v2/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [SecurityCenter](super::stubs::SecurityCenter) using a [gclient::ReqwestClient].
+/// Implements [SecurityCenter](super::stubs::SecurityCenter) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct SecurityCenter {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for SecurityCenter {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for SecurityCenter {
 }
 
 impl SecurityCenter {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -204,7 +204,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -223,7 +223,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -242,7 +242,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -261,7 +261,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -280,7 +280,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -299,7 +299,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -318,7 +318,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -357,7 +357,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -376,7 +376,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -395,7 +395,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -414,7 +414,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -459,7 +459,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -483,7 +483,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -510,13 +510,13 @@ impl super::stubs::SecurityCenter for SecurityCenter {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "fieldMask")
             });
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -540,7 +540,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -564,7 +564,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -588,7 +588,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -609,7 +609,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -635,7 +635,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -727,7 +727,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
                     "/v2/{}",
                     req.big_query_export
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("big_query_export"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("big_query_export"))?
                         .name
                 ),
             )
@@ -743,7 +743,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -765,7 +765,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
                     "/v2/{}",
                     req.external_system
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("external_system"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("external_system"))?
                         .name
                 ),
             )
@@ -781,7 +781,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -803,7 +803,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
                     "/v2/{}",
                     req.finding
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("finding"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("finding"))?
                         .name
                 ),
             )
@@ -819,7 +819,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -841,7 +841,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
                     "/v2/{}",
                     req.mute_config
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("mute_config"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("mute_config"))?
                         .name
                 ),
             )
@@ -857,7 +857,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -879,7 +879,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
                     "/v2/{}",
                     req.notification_config
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("notification_config"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("notification_config"))?
                         .name
                 ),
             )
@@ -895,7 +895,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -917,7 +917,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
                     "/v2/{}",
                     req.resource_value_config
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("resource_value_config"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("resource_value_config"))?
                         .name
                 ),
             )
@@ -933,7 +933,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -955,7 +955,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
                     "/v2/{}",
                     req.security_marks
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("security_marks"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("security_marks"))?
                         .name
                 ),
             )
@@ -971,7 +971,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -993,7 +993,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
                     "/v2/{}",
                     req.source
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("source"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("source"))?
                         .name
                 ),
             )
@@ -1009,7 +1009,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.source), options).await
@@ -1033,7 +1033,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1052,7 +1052,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1071,7 +1071,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1090,7 +1090,7 @@ impl super::stubs::SecurityCenter for SecurityCenter {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/securityposture/v1/Cargo.toml b/src/generated/cloud/securityposture/v1/Cargo.toml
index 263bf7941..332cfb7c1 100644
--- a/src/generated/cloud/securityposture/v1/Cargo.toml
+++ b/src/generated/cloud/securityposture/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/securityposture/v1/src/model.rs b/src/generated/cloud/securityposture/v1/src/model.rs
index ace458aae..7165f85ed 100755
--- a/src/generated/cloud/securityposture/v1/src/model.rs
+++ b/src/generated/cloud/securityposture/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/securityposture/v1/src/transport.rs b/src/generated/cloud/securityposture/v1/src/transport.rs
index 55a5e8e33..6832eaa35 100755
--- a/src/generated/cloud/securityposture/v1/src/transport.rs
+++ b/src/generated/cloud/securityposture/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [SecurityPosture](super::stubs::SecurityPosture) using a [gclient::ReqwestClient].
+/// Implements [SecurityPosture](super::stubs::SecurityPosture) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct SecurityPosture {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for SecurityPosture {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for SecurityPosture {
 }
 
 impl SecurityPosture {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -57,7 +57,7 @@ impl super::stubs::SecurityPosture for SecurityPosture {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -81,7 +81,7 @@ impl super::stubs::SecurityPosture for SecurityPosture {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -101,7 +101,7 @@ impl super::stubs::SecurityPosture for SecurityPosture {
             );
         let builder = builder.query(&[("revisionId", &req.revision_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -142,7 +142,7 @@ impl super::stubs::SecurityPosture for SecurityPosture {
                     "/v1/{}",
                     req.posture
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("posture"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("posture"))?
                         .name
                 ),
             )
@@ -158,7 +158,7 @@ impl super::stubs::SecurityPosture for SecurityPosture {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("revisionId", &req.revision_id)]);
@@ -183,7 +183,7 @@ impl super::stubs::SecurityPosture for SecurityPosture {
             );
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -228,7 +228,7 @@ impl super::stubs::SecurityPosture for SecurityPosture {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -247,7 +247,7 @@ impl super::stubs::SecurityPosture for SecurityPosture {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -288,7 +288,7 @@ impl super::stubs::SecurityPosture for SecurityPosture {
                     "/v1/{}",
                     req.posture_deployment
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("posture_deployment"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("posture_deployment"))?
                         .name
                 ),
             )
@@ -304,7 +304,7 @@ impl super::stubs::SecurityPosture for SecurityPosture {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -328,7 +328,7 @@ impl super::stubs::SecurityPosture for SecurityPosture {
             );
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -353,7 +353,7 @@ impl super::stubs::SecurityPosture for SecurityPosture {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -373,7 +373,7 @@ impl super::stubs::SecurityPosture for SecurityPosture {
             );
         let builder = builder.query(&[("revisionId", &req.revision_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -395,7 +395,7 @@ impl super::stubs::SecurityPosture for SecurityPosture {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -414,7 +414,7 @@ impl super::stubs::SecurityPosture for SecurityPosture {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -436,7 +436,7 @@ impl super::stubs::SecurityPosture for SecurityPosture {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -455,7 +455,7 @@ impl super::stubs::SecurityPosture for SecurityPosture {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -474,7 +474,7 @@ impl super::stubs::SecurityPosture for SecurityPosture {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/servicedirectory/v1/Cargo.toml b/src/generated/cloud/servicedirectory/v1/Cargo.toml
index 9662eaddf..22980950f 100644
--- a/src/generated/cloud/servicedirectory/v1/Cargo.toml
+++ b/src/generated/cloud/servicedirectory/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/servicedirectory/v1/src/model.rs b/src/generated/cloud/servicedirectory/v1/src/model.rs
index 81426783b..a0e7c2902 100755
--- a/src/generated/cloud/servicedirectory/v1/src/model.rs
+++ b/src/generated/cloud/servicedirectory/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/servicedirectory/v1/src/transport.rs b/src/generated/cloud/servicedirectory/v1/src/transport.rs
index fde433d4a..d49b8f6f8 100755
--- a/src/generated/cloud/servicedirectory/v1/src/transport.rs
+++ b/src/generated/cloud/servicedirectory/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [LookupService](super::stubs::LookupService) using a [gclient::ReqwestClient].
+/// Implements [LookupService](super::stubs::LookupService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct LookupService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for LookupService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for LookupService {
 }
 
 impl LookupService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -75,7 +75,7 @@ impl super::stubs::LookupService for LookupService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -94,15 +94,15 @@ impl super::stubs::LookupService for LookupService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [RegistrationService](super::stubs::RegistrationService) using a [gclient::ReqwestClient].
+/// Implements [RegistrationService](super::stubs::RegistrationService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct RegistrationService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for RegistrationService {
@@ -114,8 +114,8 @@ impl std::fmt::Debug for RegistrationService {
 }
 
 impl RegistrationService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -166,7 +166,7 @@ impl super::stubs::RegistrationService for RegistrationService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -185,7 +185,7 @@ impl super::stubs::RegistrationService for RegistrationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -203,7 +203,7 @@ impl super::stubs::RegistrationService for RegistrationService {
                     "/v1/{}",
                     req.namespace
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("namespace"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("namespace"))?
                         .name
                 ),
             )
@@ -219,7 +219,7 @@ impl super::stubs::RegistrationService for RegistrationService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -242,7 +242,7 @@ impl super::stubs::RegistrationService for RegistrationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -288,7 +288,7 @@ impl super::stubs::RegistrationService for RegistrationService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -307,7 +307,7 @@ impl super::stubs::RegistrationService for RegistrationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -325,7 +325,7 @@ impl super::stubs::RegistrationService for RegistrationService {
                     "/v1/{}",
                     req.service
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("service"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("service"))?
                         .name
                 ),
             )
@@ -341,7 +341,7 @@ impl super::stubs::RegistrationService for RegistrationService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -364,7 +364,7 @@ impl super::stubs::RegistrationService for RegistrationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -413,7 +413,7 @@ impl super::stubs::RegistrationService for RegistrationService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -432,7 +432,7 @@ impl super::stubs::RegistrationService for RegistrationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -450,7 +450,7 @@ impl super::stubs::RegistrationService for RegistrationService {
                     "/v1/{}",
                     req.endpoint
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("endpoint"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("endpoint"))?
                         .name
                 ),
             )
@@ -466,7 +466,7 @@ impl super::stubs::RegistrationService for RegistrationService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -489,7 +489,7 @@ impl super::stubs::RegistrationService for RegistrationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -571,7 +571,7 @@ impl super::stubs::RegistrationService for RegistrationService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -590,7 +590,7 @@ impl super::stubs::RegistrationService for RegistrationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/cloud/servicehealth/v1/Cargo.toml b/src/generated/cloud/servicehealth/v1/Cargo.toml
index 082bfcafc..843d09e99 100644
--- a/src/generated/cloud/servicehealth/v1/Cargo.toml
+++ b/src/generated/cloud/servicehealth/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
 reqwest    = { version = "0.12", features = ["json"] }
diff --git a/src/generated/cloud/servicehealth/v1/src/model.rs b/src/generated/cloud/servicehealth/v1/src/model.rs
index fa26a8ed5..f9c1c73a3 100755
--- a/src/generated/cloud/servicehealth/v1/src/model.rs
+++ b/src/generated/cloud/servicehealth/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate location;
 extern crate reqwest;
diff --git a/src/generated/cloud/servicehealth/v1/src/transport.rs b/src/generated/cloud/servicehealth/v1/src/transport.rs
index 85e4c51f2..4c41a2739 100755
--- a/src/generated/cloud/servicehealth/v1/src/transport.rs
+++ b/src/generated/cloud/servicehealth/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [ServiceHealth](super::stubs::ServiceHealth) using a [gclient::ReqwestClient].
+/// Implements [ServiceHealth](super::stubs::ServiceHealth) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ServiceHealth {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ServiceHealth {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for ServiceHealth {
 }
 
 impl ServiceHealth {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -59,7 +59,7 @@ impl super::stubs::ServiceHealth for ServiceHealth {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -78,7 +78,7 @@ impl super::stubs::ServiceHealth for ServiceHealth {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -104,7 +104,7 @@ impl super::stubs::ServiceHealth for ServiceHealth {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -123,7 +123,7 @@ impl super::stubs::ServiceHealth for ServiceHealth {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -148,7 +148,7 @@ impl super::stubs::ServiceHealth for ServiceHealth {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -167,7 +167,7 @@ impl super::stubs::ServiceHealth for ServiceHealth {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -189,7 +189,7 @@ impl super::stubs::ServiceHealth for ServiceHealth {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -208,7 +208,7 @@ impl super::stubs::ServiceHealth for ServiceHealth {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/cloud/shell/v1/Cargo.toml b/src/generated/cloud/shell/v1/Cargo.toml
index 50056066b..122163da3 100644
--- a/src/generated/cloud/shell/v1/Cargo.toml
+++ b/src/generated/cloud/shell/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
 lro        = { version = "0.1", path = "../../../../../src/lro", package = "google-cloud-lro" }
diff --git a/src/generated/cloud/shell/v1/src/model.rs b/src/generated/cloud/shell/v1/src/model.rs
index 68a31b77c..cdc0a044d 100755
--- a/src/generated/cloud/shell/v1/src/model.rs
+++ b/src/generated/cloud/shell/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate longrunning;
 extern crate lro;
diff --git a/src/generated/cloud/shell/v1/src/transport.rs b/src/generated/cloud/shell/v1/src/transport.rs
index 5fd46fe2c..6a3ef22a6 100755
--- a/src/generated/cloud/shell/v1/src/transport.rs
+++ b/src/generated/cloud/shell/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [CloudShellService](super::stubs::CloudShellService) using a [gclient::ReqwestClient].
+/// Implements [CloudShellService](super::stubs::CloudShellService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct CloudShellService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for CloudShellService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for CloudShellService {
 }
 
 impl CloudShellService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -55,7 +55,7 @@ impl super::stubs::CloudShellService for CloudShellService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -148,7 +148,7 @@ impl super::stubs::CloudShellService for CloudShellService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/speech/v2/Cargo.toml b/src/generated/cloud/speech/v2/Cargo.toml
index a4750f7b6..5ea5bc35e 100644
--- a/src/generated/cloud/speech/v2/Cargo.toml
+++ b/src/generated/cloud/speech/v2/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/speech/v2/src/model.rs b/src/generated/cloud/speech/v2/src/model.rs
index 7e74ffeb7..3f7d72bd0 100755
--- a/src/generated/cloud/speech/v2/src/model.rs
+++ b/src/generated/cloud/speech/v2/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate location;
 extern crate longrunning;
diff --git a/src/generated/cloud/speech/v2/src/transport.rs b/src/generated/cloud/speech/v2/src/transport.rs
index a284ab96e..d401e9aac 100755
--- a/src/generated/cloud/speech/v2/src/transport.rs
+++ b/src/generated/cloud/speech/v2/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [Speech](super::stubs::Speech) using a [gclient::ReqwestClient].
+/// Implements [Speech](super::stubs::Speech) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Speech {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Speech {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for Speech {
 }
 
 impl Speech {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -85,7 +85,7 @@ impl super::stubs::Speech for Speech {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("showDeleted", &req.show_deleted)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -104,7 +104,7 @@ impl super::stubs::Speech for Speech {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -122,7 +122,7 @@ impl super::stubs::Speech for Speech {
                     "/v2/{}",
                     req.recognizer
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("recognizer"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("recognizer"))?
                         .name
                 ),
             )
@@ -138,7 +138,7 @@ impl super::stubs::Speech for Speech {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
@@ -165,7 +165,7 @@ impl super::stubs::Speech for Speech {
         let builder = builder.query(&[("allowMissing", &req.allow_missing)]);
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -241,7 +241,7 @@ impl super::stubs::Speech for Speech {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -259,7 +259,7 @@ impl super::stubs::Speech for Speech {
                     "/v2/{}",
                     req.config
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("config"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("config"))?
                         .name
                 ),
             )
@@ -275,7 +275,7 @@ impl super::stubs::Speech for Speech {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.config), options).await
@@ -326,7 +326,7 @@ impl super::stubs::Speech for Speech {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("showDeleted", &req.show_deleted)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -345,7 +345,7 @@ impl super::stubs::Speech for Speech {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -363,7 +363,7 @@ impl super::stubs::Speech for Speech {
                     "/v2/{}",
                     req.custom_class
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("custom_class"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("custom_class"))?
                         .name
                 ),
             )
@@ -379,7 +379,7 @@ impl super::stubs::Speech for Speech {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
@@ -406,7 +406,7 @@ impl super::stubs::Speech for Speech {
         let builder = builder.query(&[("allowMissing", &req.allow_missing)]);
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -472,7 +472,7 @@ impl super::stubs::Speech for Speech {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("showDeleted", &req.show_deleted)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -491,7 +491,7 @@ impl super::stubs::Speech for Speech {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -509,7 +509,7 @@ impl super::stubs::Speech for Speech {
                     "/v2/{}",
                     req.phrase_set
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("phrase_set"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("phrase_set"))?
                         .name
                 ),
             )
@@ -525,7 +525,7 @@ impl super::stubs::Speech for Speech {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
@@ -552,7 +552,7 @@ impl super::stubs::Speech for Speech {
         let builder = builder.query(&[("allowMissing", &req.allow_missing)]);
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -591,7 +591,7 @@ impl super::stubs::Speech for Speech {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -610,7 +610,7 @@ impl super::stubs::Speech for Speech {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -632,7 +632,7 @@ impl super::stubs::Speech for Speech {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -651,7 +651,7 @@ impl super::stubs::Speech for Speech {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -670,7 +670,7 @@ impl super::stubs::Speech for Speech {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/sql/v1/Cargo.toml b/src/generated/cloud/sql/v1/Cargo.toml
index 6bfc5c59b..1a5e4d2cb 100644
--- a/src/generated/cloud/sql/v1/Cargo.toml
+++ b/src/generated/cloud/sql/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
 serde      = { version = "1", features = ["serde_derive"] }
diff --git a/src/generated/cloud/sql/v1/src/model.rs b/src/generated/cloud/sql/v1/src/model.rs
index c56a7c6a7..54b8d7989 100755
--- a/src/generated/cloud/sql/v1/src/model.rs
+++ b/src/generated/cloud/sql/v1/src/model.rs
@@ -21,7 +21,7 @@ extern crate std;
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate reqwest;
 extern crate serde;
diff --git a/src/generated/cloud/sql/v1/src/transport.rs b/src/generated/cloud/sql/v1/src/transport.rs
index c4cb9778d..c2a40ae65 100755
--- a/src/generated/cloud/sql/v1/src/transport.rs
+++ b/src/generated/cloud/sql/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [SqlBackupRunsService](super::stubs::SqlBackupRunsService) using a [gclient::ReqwestClient].
+/// Implements [SqlBackupRunsService](super::stubs::SqlBackupRunsService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct SqlBackupRunsService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for SqlBackupRunsService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for SqlBackupRunsService {
 }
 
 impl SqlBackupRunsService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -61,7 +61,7 @@ impl super::stubs::SqlBackupRunsService for SqlBackupRunsService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -87,7 +87,7 @@ impl super::stubs::SqlBackupRunsService for SqlBackupRunsService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -139,17 +139,17 @@ impl super::stubs::SqlBackupRunsService for SqlBackupRunsService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
 
 }
 
-/// Implements [SqlConnectService](super::stubs::SqlConnectService) using a [gclient::ReqwestClient].
+/// Implements [SqlConnectService](super::stubs::SqlConnectService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct SqlConnectService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for SqlConnectService {
@@ -161,8 +161,8 @@ impl std::fmt::Debug for SqlConnectService {
 }
 
 impl SqlConnectService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -185,11 +185,11 @@ impl super::stubs::SqlConnectService for SqlConnectService {
             )
             .query(&[("$alt", "json;enum-encoding=int")])
             .header("x-goog-api-client", reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER));
-        let builder = req.read_time.as_ref().map(|p| serde_json::to_value(p).map_err(Error::serde) ).transpose()?.into_iter().fold(builder, |builder, v| { use gclient::query_parameter::QueryParameter; v.add(builder, "readTime") });
+        let builder = req.read_time.as_ref().map(|p| serde_json::to_value(p).map_err(Error::serde) ).transpose()?.into_iter().fold(builder, |builder, v| { use gaxi::query_parameter::QueryParameter; v.add(builder, "readTime") });
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -221,10 +221,10 @@ impl super::stubs::SqlConnectService for SqlConnectService {
 
 }
 
-/// Implements [SqlDatabasesService](super::stubs::SqlDatabasesService) using a [gclient::ReqwestClient].
+/// Implements [SqlDatabasesService](super::stubs::SqlDatabasesService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct SqlDatabasesService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for SqlDatabasesService {
@@ -236,8 +236,8 @@ impl std::fmt::Debug for SqlDatabasesService {
 }
 
 impl SqlDatabasesService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -264,7 +264,7 @@ impl super::stubs::SqlDatabasesService for SqlDatabasesService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -290,7 +290,7 @@ impl super::stubs::SqlDatabasesService for SqlDatabasesService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -340,7 +340,7 @@ impl super::stubs::SqlDatabasesService for SqlDatabasesService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -399,10 +399,10 @@ impl super::stubs::SqlDatabasesService for SqlDatabasesService {
 
 }
 
-/// Implements [SqlFlagsService](super::stubs::SqlFlagsService) using a [gclient::ReqwestClient].
+/// Implements [SqlFlagsService](super::stubs::SqlFlagsService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct SqlFlagsService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for SqlFlagsService {
@@ -414,8 +414,8 @@ impl std::fmt::Debug for SqlFlagsService {
 }
 
 impl SqlFlagsService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -439,17 +439,17 @@ impl super::stubs::SqlFlagsService for SqlFlagsService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
 
 }
 
-/// Implements [SqlInstancesService](super::stubs::SqlInstancesService) using a [gclient::ReqwestClient].
+/// Implements [SqlInstancesService](super::stubs::SqlInstancesService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct SqlInstancesService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for SqlInstancesService {
@@ -461,8 +461,8 @@ impl std::fmt::Debug for SqlInstancesService {
 }
 
 impl SqlInstancesService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -488,7 +488,7 @@ impl super::stubs::SqlInstancesService for SqlInstancesService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -538,7 +538,7 @@ impl super::stubs::SqlInstancesService for SqlInstancesService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -688,7 +688,7 @@ impl super::stubs::SqlInstancesService for SqlInstancesService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -764,7 +764,7 @@ impl super::stubs::SqlInstancesService for SqlInstancesService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -789,7 +789,7 @@ impl super::stubs::SqlInstancesService for SqlInstancesService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -840,7 +840,7 @@ impl super::stubs::SqlInstancesService for SqlInstancesService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -862,11 +862,11 @@ impl super::stubs::SqlInstancesService for SqlInstancesService {
             )
             .query(&[("$alt", "json;enum-encoding=int")])
             .header("x-goog-api-client", reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER));
-        let builder = req.db_timeout.as_ref().map(|p| serde_json::to_value(p).map_err(Error::serde) ).transpose()?.into_iter().fold(builder, |builder, v| { use gclient::query_parameter::QueryParameter; v.add(builder, "dbTimeout") });
+        let builder = req.db_timeout.as_ref().map(|p| serde_json::to_value(p).map_err(Error::serde) ).transpose()?.into_iter().fold(builder, |builder, v| { use gaxi::query_parameter::QueryParameter; v.add(builder, "dbTimeout") });
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -891,7 +891,7 @@ impl super::stubs::SqlInstancesService for SqlInstancesService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -916,7 +916,7 @@ impl super::stubs::SqlInstancesService for SqlInstancesService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -991,7 +991,7 @@ impl super::stubs::SqlInstancesService for SqlInstancesService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -1016,7 +1016,7 @@ impl super::stubs::SqlInstancesService for SqlInstancesService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -1216,7 +1216,7 @@ impl super::stubs::SqlInstancesService for SqlInstancesService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -1266,7 +1266,7 @@ impl super::stubs::SqlInstancesService for SqlInstancesService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -1316,17 +1316,17 @@ impl super::stubs::SqlInstancesService for SqlInstancesService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
 
 }
 
-/// Implements [SqlOperationsService](super::stubs::SqlOperationsService) using a [gclient::ReqwestClient].
+/// Implements [SqlOperationsService](super::stubs::SqlOperationsService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct SqlOperationsService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for SqlOperationsService {
@@ -1338,8 +1338,8 @@ impl std::fmt::Debug for SqlOperationsService {
 }
 
 impl SqlOperationsService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1365,7 +1365,7 @@ impl super::stubs::SqlOperationsService for SqlOperationsService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -1392,7 +1392,7 @@ impl super::stubs::SqlOperationsService for SqlOperationsService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -1417,17 +1417,17 @@ impl super::stubs::SqlOperationsService for SqlOperationsService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
 
 }
 
-/// Implements [SqlSslCertsService](super::stubs::SqlSslCertsService) using a [gclient::ReqwestClient].
+/// Implements [SqlSslCertsService](super::stubs::SqlSslCertsService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct SqlSslCertsService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for SqlSslCertsService {
@@ -1439,8 +1439,8 @@ impl std::fmt::Debug for SqlSslCertsService {
 }
 
 impl SqlSslCertsService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1467,7 +1467,7 @@ impl super::stubs::SqlSslCertsService for SqlSslCertsService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -1493,7 +1493,7 @@ impl super::stubs::SqlSslCertsService for SqlSslCertsService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -1543,17 +1543,17 @@ impl super::stubs::SqlSslCertsService for SqlSslCertsService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
 
 }
 
-/// Implements [SqlTiersService](super::stubs::SqlTiersService) using a [gclient::ReqwestClient].
+/// Implements [SqlTiersService](super::stubs::SqlTiersService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct SqlTiersService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for SqlTiersService {
@@ -1565,8 +1565,8 @@ impl std::fmt::Debug for SqlTiersService {
 }
 
 impl SqlTiersService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1591,17 +1591,17 @@ impl super::stubs::SqlTiersService for SqlTiersService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
 
 }
 
-/// Implements [SqlUsersService](super::stubs::SqlUsersService) using a [gclient::ReqwestClient].
+/// Implements [SqlUsersService](super::stubs::SqlUsersService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct SqlUsersService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for SqlUsersService {
@@ -1613,8 +1613,8 @@ impl std::fmt::Debug for SqlUsersService {
 }
 
 impl SqlUsersService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1642,7 +1642,7 @@ impl super::stubs::SqlUsersService for SqlUsersService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -1669,7 +1669,7 @@ impl super::stubs::SqlUsersService for SqlUsersService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
@@ -1719,7 +1719,7 @@ impl super::stubs::SqlUsersService for SqlUsersService {
         self.inner.execute(
             builder,
             
-            None::<gclient::NoBody>,
+            None::<gaxi::NoBody>,
             options,
         ).await
     }
diff --git a/src/generated/cloud/storageinsights/v1/Cargo.toml b/src/generated/cloud/storageinsights/v1/Cargo.toml
index 915926fe4..91cd87788 100644
--- a/src/generated/cloud/storageinsights/v1/Cargo.toml
+++ b/src/generated/cloud/storageinsights/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/storageinsights/v1/src/model.rs b/src/generated/cloud/storageinsights/v1/src/model.rs
index 945edd9e5..f14b23fa0 100755
--- a/src/generated/cloud/storageinsights/v1/src/model.rs
+++ b/src/generated/cloud/storageinsights/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/storageinsights/v1/src/transport.rs b/src/generated/cloud/storageinsights/v1/src/transport.rs
index 4c4f93c77..b1b5a6d83 100755
--- a/src/generated/cloud/storageinsights/v1/src/transport.rs
+++ b/src/generated/cloud/storageinsights/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [StorageInsights](super::stubs::StorageInsights) using a [gclient::ReqwestClient].
+/// Implements [StorageInsights](super::stubs::StorageInsights) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct StorageInsights {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for StorageInsights {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for StorageInsights {
 }
 
 impl StorageInsights {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::StorageInsights for StorageInsights {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -81,7 +81,7 @@ impl super::stubs::StorageInsights for StorageInsights {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -122,7 +122,7 @@ impl super::stubs::StorageInsights for StorageInsights {
                     "/v1/{}",
                     req.report_config
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("report_config"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("report_config"))?
                         .name
                 ),
             )
@@ -138,7 +138,7 @@ impl super::stubs::StorageInsights for StorageInsights {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -164,7 +164,7 @@ impl super::stubs::StorageInsights for StorageInsights {
         let builder = builder.query(&[("force", &req.force)]);
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -190,7 +190,7 @@ impl super::stubs::StorageInsights for StorageInsights {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -209,7 +209,7 @@ impl super::stubs::StorageInsights for StorageInsights {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -231,7 +231,7 @@ impl super::stubs::StorageInsights for StorageInsights {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -250,7 +250,7 @@ impl super::stubs::StorageInsights for StorageInsights {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -272,7 +272,7 @@ impl super::stubs::StorageInsights for StorageInsights {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -291,7 +291,7 @@ impl super::stubs::StorageInsights for StorageInsights {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -310,7 +310,7 @@ impl super::stubs::StorageInsights for StorageInsights {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/support/v2/Cargo.toml b/src/generated/cloud/support/v2/Cargo.toml
index 5729f061e..d7d32f6ed 100644
--- a/src/generated/cloud/support/v2/Cargo.toml
+++ b/src/generated/cloud/support/v2/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
 serde      = { version = "1", features = ["serde_derive"] }
diff --git a/src/generated/cloud/support/v2/src/model.rs b/src/generated/cloud/support/v2/src/model.rs
index badcce1b3..ab45ec481 100755
--- a/src/generated/cloud/support/v2/src/model.rs
+++ b/src/generated/cloud/support/v2/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate reqwest;
 extern crate serde;
diff --git a/src/generated/cloud/support/v2/src/transport.rs b/src/generated/cloud/support/v2/src/transport.rs
index 54dc85fcf..3390be6d6 100755
--- a/src/generated/cloud/support/v2/src/transport.rs
+++ b/src/generated/cloud/support/v2/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [CaseAttachmentService](super::stubs::CaseAttachmentService) using a [gclient::ReqwestClient].
+/// Implements [CaseAttachmentService](super::stubs::CaseAttachmentService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct CaseAttachmentService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for CaseAttachmentService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for CaseAttachmentService {
 }
 
 impl CaseAttachmentService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -60,15 +60,15 @@ impl super::stubs::CaseAttachmentService for CaseAttachmentService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [CaseService](super::stubs::CaseService) using a [gclient::ReqwestClient].
+/// Implements [CaseService](super::stubs::CaseService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct CaseService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for CaseService {
@@ -80,8 +80,8 @@ impl std::fmt::Debug for CaseService {
 }
 
 impl CaseService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -102,7 +102,7 @@ impl super::stubs::CaseService for CaseService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -124,7 +124,7 @@ impl super::stubs::CaseService for CaseService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -149,7 +149,7 @@ impl super::stubs::CaseService for CaseService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -184,7 +184,7 @@ impl super::stubs::CaseService for CaseService {
                     "/v2/{}",
                     req.case
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("case"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("case"))?
                         .name
                 ),
             )
@@ -200,7 +200,7 @@ impl super::stubs::CaseService for CaseService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.case), options).await
@@ -261,15 +261,15 @@ impl super::stubs::CaseService for CaseService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [CommentService](super::stubs::CommentService) using a [gclient::ReqwestClient].
+/// Implements [CommentService](super::stubs::CommentService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct CommentService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for CommentService {
@@ -281,8 +281,8 @@ impl std::fmt::Debug for CommentService {
 }
 
 impl CommentService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -305,7 +305,7 @@ impl super::stubs::CommentService for CommentService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/talent/v4/Cargo.toml b/src/generated/cloud/talent/v4/Cargo.toml
index 735e92b4a..f8ced92ca 100644
--- a/src/generated/cloud/talent/v4/Cargo.toml
+++ b/src/generated/cloud/talent/v4/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/talent/v4/src/model.rs b/src/generated/cloud/talent/v4/src/model.rs
index 7310e8f52..ca0a3ff96 100755
--- a/src/generated/cloud/talent/v4/src/model.rs
+++ b/src/generated/cloud/talent/v4/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate longrunning;
diff --git a/src/generated/cloud/talent/v4/src/transport.rs b/src/generated/cloud/talent/v4/src/transport.rs
index b7ccdbf39..8a7b9a2b2 100755
--- a/src/generated/cloud/talent/v4/src/transport.rs
+++ b/src/generated/cloud/talent/v4/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [CompanyService](super::stubs::CompanyService) using a [gclient::ReqwestClient].
+/// Implements [CompanyService](super::stubs::CompanyService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct CompanyService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for CompanyService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for CompanyService {
 }
 
 impl CompanyService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -77,7 +77,7 @@ impl super::stubs::CompanyService for CompanyService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -95,7 +95,7 @@ impl super::stubs::CompanyService for CompanyService {
                     "/v4/{}",
                     req.company
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("company"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("company"))?
                         .name
                 ),
             )
@@ -111,7 +111,7 @@ impl super::stubs::CompanyService for CompanyService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -134,7 +134,7 @@ impl super::stubs::CompanyService for CompanyService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -159,7 +159,7 @@ impl super::stubs::CompanyService for CompanyService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("requireOpenJobs", &req.require_open_jobs)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -178,15 +178,15 @@ impl super::stubs::CompanyService for CompanyService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [Completion](super::stubs::Completion) using a [gclient::ReqwestClient].
+/// Implements [Completion](super::stubs::Completion) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Completion {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Completion {
@@ -198,8 +198,8 @@ impl std::fmt::Debug for Completion {
 }
 
 impl Completion {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -232,7 +232,7 @@ impl super::stubs::Completion for Completion {
         let builder = builder.query(&[("scope", &req.scope.value())]);
         let builder = builder.query(&[("type", &req.r#type.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -251,15 +251,15 @@ impl super::stubs::Completion for Completion {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [EventService](super::stubs::EventService) using a [gclient::ReqwestClient].
+/// Implements [EventService](super::stubs::EventService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct EventService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for EventService {
@@ -271,8 +271,8 @@ impl std::fmt::Debug for EventService {
 }
 
 impl EventService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -315,15 +315,15 @@ impl super::stubs::EventService for EventService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [JobService](super::stubs::JobService) using a [gclient::ReqwestClient].
+/// Implements [JobService](super::stubs::JobService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct JobService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for JobService {
@@ -335,8 +335,8 @@ impl std::fmt::Debug for JobService {
 }
 
 impl JobService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -394,7 +394,7 @@ impl super::stubs::JobService for JobService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -412,7 +412,7 @@ impl super::stubs::JobService for JobService {
                     "/v4/{}",
                     req.job
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("job"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("job"))?
                         .name
                 ),
             )
@@ -428,7 +428,7 @@ impl super::stubs::JobService for JobService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.job), options).await
@@ -469,7 +469,7 @@ impl super::stubs::JobService for JobService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -512,7 +512,7 @@ impl super::stubs::JobService for JobService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("jobView", &req.job_view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -571,7 +571,7 @@ impl super::stubs::JobService for JobService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -590,10 +590,10 @@ impl super::stubs::JobService for JobService {
     }
 }
 
-/// Implements [TenantService](super::stubs::TenantService) using a [gclient::ReqwestClient].
+/// Implements [TenantService](super::stubs::TenantService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct TenantService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for TenantService {
@@ -605,8 +605,8 @@ impl std::fmt::Debug for TenantService {
 }
 
 impl TenantService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -644,7 +644,7 @@ impl super::stubs::TenantService for TenantService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -662,7 +662,7 @@ impl super::stubs::TenantService for TenantService {
                     "/v4/{}",
                     req.tenant
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("tenant"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("tenant"))?
                         .name
                 ),
             )
@@ -678,7 +678,7 @@ impl super::stubs::TenantService for TenantService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.tenant), options).await
@@ -699,7 +699,7 @@ impl super::stubs::TenantService for TenantService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -720,7 +720,7 @@ impl super::stubs::TenantService for TenantService {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -739,7 +739,7 @@ impl super::stubs::TenantService for TenantService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/cloud/tasks/v2/Cargo.toml b/src/generated/cloud/tasks/v2/Cargo.toml
index 05219a89c..e5d1b5643 100644
--- a/src/generated/cloud/tasks/v2/Cargo.toml
+++ b/src/generated/cloud/tasks/v2/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/tasks/v2/src/model.rs b/src/generated/cloud/tasks/v2/src/model.rs
index 7fdf955bf..b4b34b71f 100755
--- a/src/generated/cloud/tasks/v2/src/model.rs
+++ b/src/generated/cloud/tasks/v2/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/tasks/v2/src/transport.rs b/src/generated/cloud/tasks/v2/src/transport.rs
index e62706f4d..7e8898fa6 100755
--- a/src/generated/cloud/tasks/v2/src/transport.rs
+++ b/src/generated/cloud/tasks/v2/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [CloudTasks](super::stubs::CloudTasks) using a [gclient::ReqwestClient].
+/// Implements [CloudTasks](super::stubs::CloudTasks) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct CloudTasks {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for CloudTasks {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for CloudTasks {
 }
 
 impl CloudTasks {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -58,7 +58,7 @@ impl super::stubs::CloudTasks for CloudTasks {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -77,7 +77,7 @@ impl super::stubs::CloudTasks for CloudTasks {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -112,7 +112,7 @@ impl super::stubs::CloudTasks for CloudTasks {
                     "/v2/{}",
                     req.queue
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("queue"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("queue"))?
                         .name
                 ),
             )
@@ -128,7 +128,7 @@ impl super::stubs::CloudTasks for CloudTasks {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.queue), options).await
@@ -149,7 +149,7 @@ impl super::stubs::CloudTasks for CloudTasks {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -282,7 +282,7 @@ impl super::stubs::CloudTasks for CloudTasks {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -302,7 +302,7 @@ impl super::stubs::CloudTasks for CloudTasks {
             );
         let builder = builder.query(&[("responseView", &req.response_view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -338,7 +338,7 @@ impl super::stubs::CloudTasks for CloudTasks {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -377,7 +377,7 @@ impl super::stubs::CloudTasks for CloudTasks {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -396,7 +396,7 @@ impl super::stubs::CloudTasks for CloudTasks {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/cloud/telcoautomation/v1/Cargo.toml b/src/generated/cloud/telcoautomation/v1/Cargo.toml
index d684c83fe..07abd50a6 100644
--- a/src/generated/cloud/telcoautomation/v1/Cargo.toml
+++ b/src/generated/cloud/telcoautomation/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/telcoautomation/v1/src/model.rs b/src/generated/cloud/telcoautomation/v1/src/model.rs
index f675477fc..dc23651a2 100755
--- a/src/generated/cloud/telcoautomation/v1/src/model.rs
+++ b/src/generated/cloud/telcoautomation/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate location;
 extern crate longrunning;
diff --git a/src/generated/cloud/telcoautomation/v1/src/transport.rs b/src/generated/cloud/telcoautomation/v1/src/transport.rs
index a1c838b10..0cc087005 100755
--- a/src/generated/cloud/telcoautomation/v1/src/transport.rs
+++ b/src/generated/cloud/telcoautomation/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [TelcoAutomation](super::stubs::TelcoAutomation) using a [gclient::ReqwestClient].
+/// Implements [TelcoAutomation](super::stubs::TelcoAutomation) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct TelcoAutomation {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for TelcoAutomation {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for TelcoAutomation {
 }
 
 impl TelcoAutomation {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -81,7 +81,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -125,7 +125,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -148,7 +148,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -167,7 +167,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -211,7 +211,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -252,7 +252,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
                     "/v1/{}",
                     req.blueprint
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("blueprint"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("blueprint"))?
                         .name
                 ),
             )
@@ -268,7 +268,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -292,7 +292,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
             );
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -311,7 +311,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -336,7 +336,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -411,7 +411,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -436,7 +436,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -461,7 +461,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -502,7 +502,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -521,7 +521,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -562,7 +562,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
                     "/v1/{}",
                     req.deployment
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("deployment"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("deployment"))?
                         .name
                 ),
             )
@@ -578,7 +578,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -602,7 +602,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
             );
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -644,7 +644,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -668,7 +668,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -724,7 +724,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -760,7 +760,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -784,7 +784,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -802,7 +802,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
                     "/v1/{}",
                     req.hydrated_deployment
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("hydrated_deployment"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("hydrated_deployment"))?
                         .name
                 ),
             )
@@ -818,7 +818,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -861,7 +861,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -880,7 +880,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -902,7 +902,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -921,7 +921,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -940,7 +940,7 @@ impl super::stubs::TelcoAutomation for TelcoAutomation {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/texttospeech/v1/Cargo.toml b/src/generated/cloud/texttospeech/v1/Cargo.toml
index 3c5a88c8a..389c0fe91 100644
--- a/src/generated/cloud/texttospeech/v1/Cargo.toml
+++ b/src/generated/cloud/texttospeech/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
 lro        = { version = "0.1", path = "../../../../../src/lro", package = "google-cloud-lro" }
diff --git a/src/generated/cloud/texttospeech/v1/src/model.rs b/src/generated/cloud/texttospeech/v1/src/model.rs
index f677fb9f5..a94b0131f 100755
--- a/src/generated/cloud/texttospeech/v1/src/model.rs
+++ b/src/generated/cloud/texttospeech/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate longrunning;
 extern crate lro;
diff --git a/src/generated/cloud/texttospeech/v1/src/transport.rs b/src/generated/cloud/texttospeech/v1/src/transport.rs
index 1cd4d2be1..affa5ab6d 100755
--- a/src/generated/cloud/texttospeech/v1/src/transport.rs
+++ b/src/generated/cloud/texttospeech/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [TextToSpeech](super::stubs::TextToSpeech) using a [gclient::ReqwestClient].
+/// Implements [TextToSpeech](super::stubs::TextToSpeech) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct TextToSpeech {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for TextToSpeech {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for TextToSpeech {
 }
 
 impl TextToSpeech {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -56,7 +56,7 @@ impl super::stubs::TextToSpeech for TextToSpeech {
             );
         let builder = builder.query(&[("languageCode", &req.language_code)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -95,7 +95,7 @@ impl super::stubs::TextToSpeech for TextToSpeech {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -114,15 +114,15 @@ impl super::stubs::TextToSpeech for TextToSpeech {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [TextToSpeechLongAudioSynthesize](super::stubs::TextToSpeechLongAudioSynthesize) using a [gclient::ReqwestClient].
+/// Implements [TextToSpeechLongAudioSynthesize](super::stubs::TextToSpeechLongAudioSynthesize) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct TextToSpeechLongAudioSynthesize {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for TextToSpeechLongAudioSynthesize {
@@ -134,8 +134,8 @@ impl std::fmt::Debug for TextToSpeechLongAudioSynthesize {
 }
 
 impl TextToSpeechLongAudioSynthesize {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -179,7 +179,7 @@ impl super::stubs::TextToSpeechLongAudioSynthesize for TextToSpeechLongAudioSynt
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -198,7 +198,7 @@ impl super::stubs::TextToSpeechLongAudioSynthesize for TextToSpeechLongAudioSynt
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/timeseriesinsights/v1/Cargo.toml b/src/generated/cloud/timeseriesinsights/v1/Cargo.toml
index a22a609a4..bdf27ad36 100644
--- a/src/generated/cloud/timeseriesinsights/v1/Cargo.toml
+++ b/src/generated/cloud/timeseriesinsights/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
 rpc        = { version = "0.2", path = "../../../../../src/generated/rpc/types", package = "google-cloud-rpc" }
diff --git a/src/generated/cloud/timeseriesinsights/v1/src/model.rs b/src/generated/cloud/timeseriesinsights/v1/src/model.rs
index 38d88b316..3dfc8c7e1 100755
--- a/src/generated/cloud/timeseriesinsights/v1/src/model.rs
+++ b/src/generated/cloud/timeseriesinsights/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate reqwest;
 extern crate rpc;
diff --git a/src/generated/cloud/timeseriesinsights/v1/src/transport.rs b/src/generated/cloud/timeseriesinsights/v1/src/transport.rs
index af97c9337..df832425d 100755
--- a/src/generated/cloud/timeseriesinsights/v1/src/transport.rs
+++ b/src/generated/cloud/timeseriesinsights/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [TimeseriesInsightsController](super::stubs::TimeseriesInsightsController) using a [gclient::ReqwestClient].
+/// Implements [TimeseriesInsightsController](super::stubs::TimeseriesInsightsController) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct TimeseriesInsightsController {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for TimeseriesInsightsController {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for TimeseriesInsightsController {
 }
 
 impl TimeseriesInsightsController {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -57,7 +57,7 @@ impl super::stubs::TimeseriesInsightsController for TimeseriesInsightsController
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -98,7 +98,7 @@ impl super::stubs::TimeseriesInsightsController for TimeseriesInsightsController
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/tpu/v2/Cargo.toml b/src/generated/cloud/tpu/v2/Cargo.toml
index 36f381996..96980d2b7 100644
--- a/src/generated/cloud/tpu/v2/Cargo.toml
+++ b/src/generated/cloud/tpu/v2/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/tpu/v2/src/model.rs b/src/generated/cloud/tpu/v2/src/model.rs
index 70d67ac29..122c5ce62 100755
--- a/src/generated/cloud/tpu/v2/src/model.rs
+++ b/src/generated/cloud/tpu/v2/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/tpu/v2/src/transport.rs b/src/generated/cloud/tpu/v2/src/transport.rs
index 5aa9e0237..a310dde36 100755
--- a/src/generated/cloud/tpu/v2/src/transport.rs
+++ b/src/generated/cloud/tpu/v2/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [Tpu](super::stubs::Tpu) using a [gclient::ReqwestClient].
+/// Implements [Tpu](super::stubs::Tpu) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Tpu {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Tpu {
@@ -31,8 +31,8 @@ impl std::fmt::Debug for Tpu {
 }
 
 impl Tpu {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -55,7 +55,7 @@ impl super::stubs::Tpu for Tpu {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -74,7 +74,7 @@ impl super::stubs::Tpu for Tpu {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -111,7 +111,7 @@ impl super::stubs::Tpu for Tpu {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -163,7 +163,7 @@ impl super::stubs::Tpu for Tpu {
                     "/v2/{}",
                     req.node
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("node"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("node"))?
                         .name
                 ),
             )
@@ -179,7 +179,7 @@ impl super::stubs::Tpu for Tpu {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.node), options).await
@@ -205,7 +205,7 @@ impl super::stubs::Tpu for Tpu {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -224,7 +224,7 @@ impl super::stubs::Tpu for Tpu {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -269,7 +269,7 @@ impl super::stubs::Tpu for Tpu {
         let builder = builder.query(&[("requestId", &req.request_id)]);
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -332,7 +332,7 @@ impl super::stubs::Tpu for Tpu {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -351,7 +351,7 @@ impl super::stubs::Tpu for Tpu {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -377,7 +377,7 @@ impl super::stubs::Tpu for Tpu {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -396,7 +396,7 @@ impl super::stubs::Tpu for Tpu {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -438,7 +438,7 @@ impl super::stubs::Tpu for Tpu {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -457,7 +457,7 @@ impl super::stubs::Tpu for Tpu {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -479,7 +479,7 @@ impl super::stubs::Tpu for Tpu {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -498,7 +498,7 @@ impl super::stubs::Tpu for Tpu {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -517,7 +517,7 @@ impl super::stubs::Tpu for Tpu {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -536,7 +536,7 @@ impl super::stubs::Tpu for Tpu {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/translate/v3/Cargo.toml b/src/generated/cloud/translate/v3/Cargo.toml
index d02fb0841..de21e4bff 100644
--- a/src/generated/cloud/translate/v3/Cargo.toml
+++ b/src/generated/cloud/translate/v3/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/translate/v3/src/model.rs b/src/generated/cloud/translate/v3/src/model.rs
index 48c79d390..7dc4fc6a8 100755
--- a/src/generated/cloud/translate/v3/src/model.rs
+++ b/src/generated/cloud/translate/v3/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate location;
 extern crate longrunning;
diff --git a/src/generated/cloud/translate/v3/src/transport.rs b/src/generated/cloud/translate/v3/src/transport.rs
index f5d84f072..c96cbd763 100755
--- a/src/generated/cloud/translate/v3/src/transport.rs
+++ b/src/generated/cloud/translate/v3/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [TranslationService](super::stubs::TranslationService) using a [gclient::ReqwestClient].
+/// Implements [TranslationService](super::stubs::TranslationService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct TranslationService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for TranslationService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for TranslationService {
 }
 
 impl TranslationService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -120,7 +120,7 @@ impl super::stubs::TranslationService for TranslationService {
         let builder = builder.query(&[("displayLanguageCode", &req.display_language_code)]);
         let builder = builder.query(&[("model", &req.model)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -220,7 +220,7 @@ impl super::stubs::TranslationService for TranslationService {
                     "/v3/{}",
                     req.glossary
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("glossary"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("glossary"))?
                         .name
                 ),
             )
@@ -236,7 +236,7 @@ impl super::stubs::TranslationService for TranslationService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -265,7 +265,7 @@ impl super::stubs::TranslationService for TranslationService {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -284,7 +284,7 @@ impl super::stubs::TranslationService for TranslationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -303,7 +303,7 @@ impl super::stubs::TranslationService for TranslationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -322,7 +322,7 @@ impl super::stubs::TranslationService for TranslationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -346,7 +346,7 @@ impl super::stubs::TranslationService for TranslationService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -386,7 +386,7 @@ impl super::stubs::TranslationService for TranslationService {
                     "/v3/{}",
                     req.glossary_entry
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("glossary_entry"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("glossary_entry"))?
                         .name
                 ),
             )
@@ -415,7 +415,7 @@ impl super::stubs::TranslationService for TranslationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -456,7 +456,7 @@ impl super::stubs::TranslationService for TranslationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -477,7 +477,7 @@ impl super::stubs::TranslationService for TranslationService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -496,7 +496,7 @@ impl super::stubs::TranslationService for TranslationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -537,7 +537,7 @@ impl super::stubs::TranslationService for TranslationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -556,7 +556,7 @@ impl super::stubs::TranslationService for TranslationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -581,7 +581,7 @@ impl super::stubs::TranslationService for TranslationService {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -620,7 +620,7 @@ impl super::stubs::TranslationService for TranslationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -639,7 +639,7 @@ impl super::stubs::TranslationService for TranslationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -683,7 +683,7 @@ impl super::stubs::TranslationService for TranslationService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -707,7 +707,7 @@ impl super::stubs::TranslationService for TranslationService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -769,7 +769,7 @@ impl super::stubs::TranslationService for TranslationService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -808,7 +808,7 @@ impl super::stubs::TranslationService for TranslationService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -827,7 +827,7 @@ impl super::stubs::TranslationService for TranslationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -846,7 +846,7 @@ impl super::stubs::TranslationService for TranslationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -868,7 +868,7 @@ impl super::stubs::TranslationService for TranslationService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -887,7 +887,7 @@ impl super::stubs::TranslationService for TranslationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -909,7 +909,7 @@ impl super::stubs::TranslationService for TranslationService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -928,7 +928,7 @@ impl super::stubs::TranslationService for TranslationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -947,7 +947,7 @@ impl super::stubs::TranslationService for TranslationService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/video/livestream/v1/Cargo.toml b/src/generated/cloud/video/livestream/v1/Cargo.toml
index 205f741b2..717664200 100644
--- a/src/generated/cloud/video/livestream/v1/Cargo.toml
+++ b/src/generated/cloud/video/livestream/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/video/livestream/v1/src/model.rs b/src/generated/cloud/video/livestream/v1/src/model.rs
index 40c19c10f..66bf1c097 100755
--- a/src/generated/cloud/video/livestream/v1/src/model.rs
+++ b/src/generated/cloud/video/livestream/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/video/livestream/v1/src/transport.rs b/src/generated/cloud/video/livestream/v1/src/transport.rs
index cba0074c8..293d2197d 100755
--- a/src/generated/cloud/video/livestream/v1/src/transport.rs
+++ b/src/generated/cloud/video/livestream/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [LivestreamService](super::stubs::LivestreamService) using a [gclient::ReqwestClient].
+/// Implements [LivestreamService](super::stubs::LivestreamService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct LivestreamService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for LivestreamService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for LivestreamService {
 }
 
 impl LivestreamService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -83,7 +83,7 @@ impl super::stubs::LivestreamService for LivestreamService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -102,7 +102,7 @@ impl super::stubs::LivestreamService for LivestreamService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -123,7 +123,7 @@ impl super::stubs::LivestreamService for LivestreamService {
         let builder = builder.query(&[("requestId", &req.request_id)]);
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -141,7 +141,7 @@ impl super::stubs::LivestreamService for LivestreamService {
                     "/v1/{}",
                     req.channel
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("channel"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("channel"))?
                         .name
                 ),
             )
@@ -157,7 +157,7 @@ impl super::stubs::LivestreamService for LivestreamService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -238,7 +238,7 @@ impl super::stubs::LivestreamService for LivestreamService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -257,7 +257,7 @@ impl super::stubs::LivestreamService for LivestreamService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -277,7 +277,7 @@ impl super::stubs::LivestreamService for LivestreamService {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -295,7 +295,7 @@ impl super::stubs::LivestreamService for LivestreamService {
                     "/v1/{}",
                     req.input
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("input"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("input"))?
                         .name
                 ),
             )
@@ -311,7 +311,7 @@ impl super::stubs::LivestreamService for LivestreamService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -356,7 +356,7 @@ impl super::stubs::LivestreamService for LivestreamService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -375,7 +375,7 @@ impl super::stubs::LivestreamService for LivestreamService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -395,7 +395,7 @@ impl super::stubs::LivestreamService for LivestreamService {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -418,7 +418,7 @@ impl super::stubs::LivestreamService for LivestreamService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -437,7 +437,7 @@ impl super::stubs::LivestreamService for LivestreamService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -476,7 +476,7 @@ impl super::stubs::LivestreamService for LivestreamService {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -515,7 +515,7 @@ impl super::stubs::LivestreamService for LivestreamService {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -534,7 +534,7 @@ impl super::stubs::LivestreamService for LivestreamService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -557,7 +557,7 @@ impl super::stubs::LivestreamService for LivestreamService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -576,7 +576,7 @@ impl super::stubs::LivestreamService for LivestreamService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -594,7 +594,7 @@ impl super::stubs::LivestreamService for LivestreamService {
                     "/v1/{}",
                     req.pool
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("pool"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("pool"))?
                         .name
                 ),
             )
@@ -610,7 +610,7 @@ impl super::stubs::LivestreamService for LivestreamService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -635,7 +635,7 @@ impl super::stubs::LivestreamService for LivestreamService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -654,7 +654,7 @@ impl super::stubs::LivestreamService for LivestreamService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -676,7 +676,7 @@ impl super::stubs::LivestreamService for LivestreamService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -695,7 +695,7 @@ impl super::stubs::LivestreamService for LivestreamService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -714,7 +714,7 @@ impl super::stubs::LivestreamService for LivestreamService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/video/stitcher/v1/Cargo.toml b/src/generated/cloud/video/stitcher/v1/Cargo.toml
index fcc84ca84..22ae6d020 100644
--- a/src/generated/cloud/video/stitcher/v1/Cargo.toml
+++ b/src/generated/cloud/video/stitcher/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
 lro        = { version = "0.1", path = "../../../../../../src/lro", package = "google-cloud-lro" }
diff --git a/src/generated/cloud/video/stitcher/v1/src/model.rs b/src/generated/cloud/video/stitcher/v1/src/model.rs
index 8e264468e..28c7e908f 100755
--- a/src/generated/cloud/video/stitcher/v1/src/model.rs
+++ b/src/generated/cloud/video/stitcher/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate longrunning;
 extern crate lro;
diff --git a/src/generated/cloud/video/stitcher/v1/src/transport.rs b/src/generated/cloud/video/stitcher/v1/src/transport.rs
index 7da840bdb..ad6e5621a 100755
--- a/src/generated/cloud/video/stitcher/v1/src/transport.rs
+++ b/src/generated/cloud/video/stitcher/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [VideoStitcherService](super::stubs::VideoStitcherService) using a [gclient::ReqwestClient].
+/// Implements [VideoStitcherService](super::stubs::VideoStitcherService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct VideoStitcherService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for VideoStitcherService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for VideoStitcherService {
 }
 
 impl VideoStitcherService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -79,7 +79,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -98,7 +98,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -117,7 +117,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -135,7 +135,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
                     "/v1/{}",
                     req.cdn_key
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("cdn_key"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("cdn_key"))?
                         .name
                 ),
             )
@@ -151,7 +151,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -196,7 +196,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -220,7 +220,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -239,7 +239,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -263,7 +263,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -282,7 +282,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -306,7 +306,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -325,7 +325,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -367,7 +367,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -386,7 +386,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -404,7 +404,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
                     "/v1/{}",
                     req.slate
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("slate"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("slate"))?
                         .name
                 ),
             )
@@ -420,7 +420,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.slate), options).await
@@ -441,7 +441,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -482,7 +482,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -532,7 +532,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -551,7 +551,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -570,7 +570,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -588,7 +588,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
                     "/v1/{}",
                     req.live_config
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("live_config"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("live_config"))?
                         .name
                 ),
             )
@@ -604,7 +604,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -658,7 +658,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -677,7 +677,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -696,7 +696,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -714,7 +714,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
                     "/v1/{}",
                     req.vod_config
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("vod_config"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("vod_config"))?
                         .name
                 ),
             )
@@ -730,7 +730,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -756,7 +756,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -775,7 +775,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -794,7 +794,7 @@ impl super::stubs::VideoStitcherService for VideoStitcherService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/video/transcoder/v1/Cargo.toml b/src/generated/cloud/video/transcoder/v1/Cargo.toml
index 0a49b817d..10ca694cb 100644
--- a/src/generated/cloud/video/transcoder/v1/Cargo.toml
+++ b/src/generated/cloud/video/transcoder/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
 rpc        = { version = "0.2", path = "../../../../../../src/generated/rpc/types", package = "google-cloud-rpc" }
diff --git a/src/generated/cloud/video/transcoder/v1/src/model.rs b/src/generated/cloud/video/transcoder/v1/src/model.rs
index 980855510..78a871822 100755
--- a/src/generated/cloud/video/transcoder/v1/src/model.rs
+++ b/src/generated/cloud/video/transcoder/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate reqwest;
 extern crate rpc;
diff --git a/src/generated/cloud/video/transcoder/v1/src/transport.rs b/src/generated/cloud/video/transcoder/v1/src/transport.rs
index c5da07f2b..f95f76281 100755
--- a/src/generated/cloud/video/transcoder/v1/src/transport.rs
+++ b/src/generated/cloud/video/transcoder/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [TranscoderService](super::stubs::TranscoderService) using a [gclient::ReqwestClient].
+/// Implements [TranscoderService](super::stubs::TranscoderService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct TranscoderService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for TranscoderService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for TranscoderService {
 }
 
 impl TranscoderService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -76,7 +76,7 @@ impl super::stubs::TranscoderService for TranscoderService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -95,7 +95,7 @@ impl super::stubs::TranscoderService for TranscoderService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -115,7 +115,7 @@ impl super::stubs::TranscoderService for TranscoderService {
             );
         let builder = builder.query(&[("allowMissing", &req.allow_missing)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -164,7 +164,7 @@ impl super::stubs::TranscoderService for TranscoderService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -183,7 +183,7 @@ impl super::stubs::TranscoderService for TranscoderService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -203,7 +203,7 @@ impl super::stubs::TranscoderService for TranscoderService {
             );
         let builder = builder.query(&[("allowMissing", &req.allow_missing)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/cloud/videointelligence/v1/Cargo.toml b/src/generated/cloud/videointelligence/v1/Cargo.toml
index 0935b67d5..bfe1fa546 100644
--- a/src/generated/cloud/videointelligence/v1/Cargo.toml
+++ b/src/generated/cloud/videointelligence/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
 lro        = { version = "0.1", path = "../../../../../src/lro", package = "google-cloud-lro" }
diff --git a/src/generated/cloud/videointelligence/v1/src/model.rs b/src/generated/cloud/videointelligence/v1/src/model.rs
index 9ac33e24f..e3ae39b34 100755
--- a/src/generated/cloud/videointelligence/v1/src/model.rs
+++ b/src/generated/cloud/videointelligence/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate longrunning;
 extern crate lro;
diff --git a/src/generated/cloud/videointelligence/v1/src/transport.rs b/src/generated/cloud/videointelligence/v1/src/transport.rs
index c77ef4bd2..cff019ad8 100755
--- a/src/generated/cloud/videointelligence/v1/src/transport.rs
+++ b/src/generated/cloud/videointelligence/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [VideoIntelligenceService](super::stubs::VideoIntelligenceService) using a [gclient::ReqwestClient].
+/// Implements [VideoIntelligenceService](super::stubs::VideoIntelligenceService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct VideoIntelligenceService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for VideoIntelligenceService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for VideoIntelligenceService {
 }
 
 impl VideoIntelligenceService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -75,7 +75,7 @@ impl super::stubs::VideoIntelligenceService for VideoIntelligenceService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -94,7 +94,7 @@ impl super::stubs::VideoIntelligenceService for VideoIntelligenceService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -113,7 +113,7 @@ impl super::stubs::VideoIntelligenceService for VideoIntelligenceService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/vision/v1/Cargo.toml b/src/generated/cloud/vision/v1/Cargo.toml
index f3e4dc6c8..34c07b4b7 100644
--- a/src/generated/cloud/vision/v1/Cargo.toml
+++ b/src/generated/cloud/vision/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/vision/v1/src/model.rs b/src/generated/cloud/vision/v1/src/model.rs
index be9d181d1..a74bf377e 100755
--- a/src/generated/cloud/vision/v1/src/model.rs
+++ b/src/generated/cloud/vision/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate longrunning;
diff --git a/src/generated/cloud/vision/v1/src/transport.rs b/src/generated/cloud/vision/v1/src/transport.rs
index 834b4d547..9a132afb5 100755
--- a/src/generated/cloud/vision/v1/src/transport.rs
+++ b/src/generated/cloud/vision/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [ImageAnnotator](super::stubs::ImageAnnotator) using a [gclient::ReqwestClient].
+/// Implements [ImageAnnotator](super::stubs::ImageAnnotator) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ImageAnnotator {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ImageAnnotator {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for ImageAnnotator {
 }
 
 impl ImageAnnotator {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -129,7 +129,7 @@ impl super::stubs::ImageAnnotator for ImageAnnotator {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -148,10 +148,10 @@ impl super::stubs::ImageAnnotator for ImageAnnotator {
     }
 }
 
-/// Implements [ProductSearch](super::stubs::ProductSearch) using a [gclient::ReqwestClient].
+/// Implements [ProductSearch](super::stubs::ProductSearch) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ProductSearch {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ProductSearch {
@@ -163,8 +163,8 @@ impl std::fmt::Debug for ProductSearch {
 }
 
 impl ProductSearch {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -213,7 +213,7 @@ impl super::stubs::ProductSearch for ProductSearch {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -232,7 +232,7 @@ impl super::stubs::ProductSearch for ProductSearch {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -250,7 +250,7 @@ impl super::stubs::ProductSearch for ProductSearch {
                     "/v1/{}",
                     req.product_set
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("product_set"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("product_set"))?
                         .name
                 ),
             )
@@ -266,7 +266,7 @@ impl super::stubs::ProductSearch for ProductSearch {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -289,7 +289,7 @@ impl super::stubs::ProductSearch for ProductSearch {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -333,7 +333,7 @@ impl super::stubs::ProductSearch for ProductSearch {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -352,7 +352,7 @@ impl super::stubs::ProductSearch for ProductSearch {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -370,7 +370,7 @@ impl super::stubs::ProductSearch for ProductSearch {
                     "/v1/{}",
                     req.product
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("product"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("product"))?
                         .name
                 ),
             )
@@ -386,7 +386,7 @@ impl super::stubs::ProductSearch for ProductSearch {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -409,7 +409,7 @@ impl super::stubs::ProductSearch for ProductSearch {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -451,7 +451,7 @@ impl super::stubs::ProductSearch for ProductSearch {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -475,7 +475,7 @@ impl super::stubs::ProductSearch for ProductSearch {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -494,7 +494,7 @@ impl super::stubs::ProductSearch for ProductSearch {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -555,7 +555,7 @@ impl super::stubs::ProductSearch for ProductSearch {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -614,7 +614,7 @@ impl super::stubs::ProductSearch for ProductSearch {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/vmmigration/v1/Cargo.toml b/src/generated/cloud/vmmigration/v1/Cargo.toml
index ceb4d6467..3a37645ef 100644
--- a/src/generated/cloud/vmmigration/v1/Cargo.toml
+++ b/src/generated/cloud/vmmigration/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/vmmigration/v1/src/model.rs b/src/generated/cloud/vmmigration/v1/src/model.rs
index 57e36209f..4664479f4 100755
--- a/src/generated/cloud/vmmigration/v1/src/model.rs
+++ b/src/generated/cloud/vmmigration/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate location;
 extern crate longrunning;
diff --git a/src/generated/cloud/vmmigration/v1/src/transport.rs b/src/generated/cloud/vmmigration/v1/src/transport.rs
index 431679537..fc90fce1d 100755
--- a/src/generated/cloud/vmmigration/v1/src/transport.rs
+++ b/src/generated/cloud/vmmigration/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [VmMigration](super::stubs::VmMigration) using a [gclient::ReqwestClient].
+/// Implements [VmMigration](super::stubs::VmMigration) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct VmMigration {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for VmMigration {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for VmMigration {
 }
 
 impl VmMigration {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -59,7 +59,7 @@ impl super::stubs::VmMigration for VmMigration {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -78,7 +78,7 @@ impl super::stubs::VmMigration for VmMigration {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -115,7 +115,7 @@ impl super::stubs::VmMigration for VmMigration {
                     "/v1/{}",
                     req.source
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("source"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("source"))?
                         .name
                 ),
             )
@@ -131,7 +131,7 @@ impl super::stubs::VmMigration for VmMigration {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -154,7 +154,7 @@ impl super::stubs::VmMigration for VmMigration {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -177,7 +177,7 @@ impl super::stubs::VmMigration for VmMigration {
             );
         let builder = builder.query(&[("forceRefresh", &req.force_refresh)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -204,7 +204,7 @@ impl super::stubs::VmMigration for VmMigration {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -224,7 +224,7 @@ impl super::stubs::VmMigration for VmMigration {
             );
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -268,7 +268,7 @@ impl super::stubs::VmMigration for VmMigration {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -294,7 +294,7 @@ impl super::stubs::VmMigration for VmMigration {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -313,7 +313,7 @@ impl super::stubs::VmMigration for VmMigration {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -357,7 +357,7 @@ impl super::stubs::VmMigration for VmMigration {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -428,7 +428,7 @@ impl super::stubs::VmMigration for VmMigration {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -448,7 +448,7 @@ impl super::stubs::VmMigration for VmMigration {
             );
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -466,7 +466,7 @@ impl super::stubs::VmMigration for VmMigration {
                     "/v1/{}",
                     req.migrating_vm
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("migrating_vm"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("migrating_vm"))?
                         .name
                 ),
             )
@@ -482,7 +482,7 @@ impl super::stubs::VmMigration for VmMigration {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -506,7 +506,7 @@ impl super::stubs::VmMigration for VmMigration {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -653,7 +653,7 @@ impl super::stubs::VmMigration for VmMigration {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -672,7 +672,7 @@ impl super::stubs::VmMigration for VmMigration {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -739,7 +739,7 @@ impl super::stubs::VmMigration for VmMigration {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -758,7 +758,7 @@ impl super::stubs::VmMigration for VmMigration {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -781,7 +781,7 @@ impl super::stubs::VmMigration for VmMigration {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -800,7 +800,7 @@ impl super::stubs::VmMigration for VmMigration {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -837,7 +837,7 @@ impl super::stubs::VmMigration for VmMigration {
                     "/v1/{}",
                     req.group
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("group"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("group"))?
                         .name
                 ),
             )
@@ -853,7 +853,7 @@ impl super::stubs::VmMigration for VmMigration {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -876,7 +876,7 @@ impl super::stubs::VmMigration for VmMigration {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -942,7 +942,7 @@ impl super::stubs::VmMigration for VmMigration {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -961,7 +961,7 @@ impl super::stubs::VmMigration for VmMigration {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1003,7 +1003,7 @@ impl super::stubs::VmMigration for VmMigration {
                     "/v1/{}",
                     req.target_project
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("target_project"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("target_project"))?
                         .name
                 ),
             )
@@ -1019,7 +1019,7 @@ impl super::stubs::VmMigration for VmMigration {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -1044,7 +1044,7 @@ impl super::stubs::VmMigration for VmMigration {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1070,7 +1070,7 @@ impl super::stubs::VmMigration for VmMigration {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1089,7 +1089,7 @@ impl super::stubs::VmMigration for VmMigration {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1111,7 +1111,7 @@ impl super::stubs::VmMigration for VmMigration {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1130,7 +1130,7 @@ impl super::stubs::VmMigration for VmMigration {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1152,7 +1152,7 @@ impl super::stubs::VmMigration for VmMigration {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1171,7 +1171,7 @@ impl super::stubs::VmMigration for VmMigration {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1190,7 +1190,7 @@ impl super::stubs::VmMigration for VmMigration {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/vmwareengine/v1/Cargo.toml b/src/generated/cloud/vmwareengine/v1/Cargo.toml
index 4b12cec61..b5387c8c1 100644
--- a/src/generated/cloud/vmwareengine/v1/Cargo.toml
+++ b/src/generated/cloud/vmwareengine/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
diff --git a/src/generated/cloud/vmwareengine/v1/src/model.rs b/src/generated/cloud/vmwareengine/v1/src/model.rs
index 7e0af2cfc..2fc365e01 100755
--- a/src/generated/cloud/vmwareengine/v1/src/model.rs
+++ b/src/generated/cloud/vmwareengine/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate location;
diff --git a/src/generated/cloud/vmwareengine/v1/src/transport.rs b/src/generated/cloud/vmwareengine/v1/src/transport.rs
index cb93e2962..3c57747ed 100755
--- a/src/generated/cloud/vmwareengine/v1/src/transport.rs
+++ b/src/generated/cloud/vmwareengine/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [VmwareEngine](super::stubs::VmwareEngine) using a [gclient::ReqwestClient].
+/// Implements [VmwareEngine](super::stubs::VmwareEngine) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct VmwareEngine {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for VmwareEngine {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for VmwareEngine {
 }
 
 impl VmwareEngine {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -81,7 +81,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -124,7 +124,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                     "/v1/{}",
                     req.private_cloud
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("private_cloud"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("private_cloud"))?
                         .name
                 ),
             )
@@ -140,7 +140,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -170,7 +170,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("delayHours", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -210,7 +210,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -229,7 +229,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -272,7 +272,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                     "/v1/{}",
                     req.cluster
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("cluster"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("cluster"))?
                         .name
                 ),
             )
@@ -288,7 +288,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -314,7 +314,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -335,7 +335,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -354,7 +354,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -380,7 +380,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -404,7 +404,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -423,7 +423,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -465,7 +465,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                     "/v1/{}",
                     req.external_address
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("external_address"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("external_address"))?
                         .name
                 ),
             )
@@ -481,7 +481,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -506,7 +506,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -527,7 +527,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -546,7 +546,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -564,7 +564,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                     "/v1/{}",
                     req.subnet
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("subnet"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("subnet"))?
                         .name
                 ),
             )
@@ -580,7 +580,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.subnet), options).await
@@ -608,7 +608,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -627,7 +627,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -669,7 +669,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                     "/v1/{}",
                     req.external_access_rule
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("external_access_rule"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("external_access_rule"))?
                         .name
                 ),
             )
@@ -685,7 +685,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -710,7 +710,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -736,7 +736,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -755,7 +755,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -797,7 +797,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                     "/v1/{}",
                     req.logging_server
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("logging_server"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("logging_server"))?
                         .name
                 ),
             )
@@ -813,7 +813,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -838,7 +838,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -863,7 +863,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -882,7 +882,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -904,7 +904,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -927,7 +927,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
             );
         let builder = builder.query(&[("username", &req.username)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -986,7 +986,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1004,7 +1004,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                     "/v1/{}",
                     req.dns_forwarding
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("dns_forwarding"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("dns_forwarding"))?
                         .name
                 ),
             )
@@ -1020,7 +1020,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -1044,7 +1044,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1070,7 +1070,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1114,7 +1114,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1132,7 +1132,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                     "/v1/{}",
                     req.network_peering
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("network_peering"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("network_peering"))?
                         .name
                 ),
             )
@@ -1148,7 +1148,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -1178,7 +1178,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1226,7 +1226,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1245,7 +1245,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1264,7 +1264,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1290,7 +1290,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1332,7 +1332,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                     "/v1/{}",
                     req.network_policy
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("network_policy"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("network_policy"))?
                         .name
                 ),
             )
@@ -1348,7 +1348,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -1373,7 +1373,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1399,7 +1399,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1418,7 +1418,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1463,7 +1463,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                     "/v1/{}",
                     req.management_dns_zone_binding
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing(
+                        .ok_or_else(|| gaxi::path_parameter::missing(
                             "management_dns_zone_binding"
                         ))?
                         .name
@@ -1481,7 +1481,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -1506,7 +1506,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1565,7 +1565,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                     "/v1/{}",
                     req.vmware_engine_network
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("vmware_engine_network"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("vmware_engine_network"))?
                         .name
                 ),
             )
@@ -1581,7 +1581,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -1607,7 +1607,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
         let builder = builder.query(&[("requestId", &req.request_id)]);
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1626,7 +1626,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1652,7 +1652,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1695,7 +1695,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1721,7 +1721,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1739,7 +1739,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                     "/v1/{}",
                     req.private_connection
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("private_connection"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("private_connection"))?
                         .name
                 ),
             )
@@ -1755,7 +1755,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("requestId", &req.request_id)]);
@@ -1780,7 +1780,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
             );
         let builder = builder.query(&[("requestId", &req.request_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1804,7 +1804,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1840,7 +1840,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1879,7 +1879,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1898,7 +1898,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1946,11 +1946,11 @@ impl super::stubs::VmwareEngine for VmwareEngine {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1992,7 +1992,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2011,7 +2011,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -2030,7 +2030,7 @@ impl super::stubs::VmwareEngine for VmwareEngine {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/vpcaccess/v1/Cargo.toml b/src/generated/cloud/vpcaccess/v1/Cargo.toml
index 99ee3aac8..41fe5c034 100644
--- a/src/generated/cloud/vpcaccess/v1/Cargo.toml
+++ b/src/generated/cloud/vpcaccess/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/vpcaccess/v1/src/model.rs b/src/generated/cloud/vpcaccess/v1/src/model.rs
index 33aeff2bd..011e6ba50 100755
--- a/src/generated/cloud/vpcaccess/v1/src/model.rs
+++ b/src/generated/cloud/vpcaccess/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate location;
 extern crate longrunning;
diff --git a/src/generated/cloud/vpcaccess/v1/src/transport.rs b/src/generated/cloud/vpcaccess/v1/src/transport.rs
index 929e5bb26..d8bfd7e1d 100755
--- a/src/generated/cloud/vpcaccess/v1/src/transport.rs
+++ b/src/generated/cloud/vpcaccess/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [VpcAccessService](super::stubs::VpcAccessService) using a [gclient::ReqwestClient].
+/// Implements [VpcAccessService](super::stubs::VpcAccessService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct VpcAccessService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for VpcAccessService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for VpcAccessService {
 }
 
 impl VpcAccessService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -78,7 +78,7 @@ impl super::stubs::VpcAccessService for VpcAccessService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -102,7 +102,7 @@ impl super::stubs::VpcAccessService for VpcAccessService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -121,7 +121,7 @@ impl super::stubs::VpcAccessService for VpcAccessService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -143,7 +143,7 @@ impl super::stubs::VpcAccessService for VpcAccessService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -165,7 +165,7 @@ impl super::stubs::VpcAccessService for VpcAccessService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -184,7 +184,7 @@ impl super::stubs::VpcAccessService for VpcAccessService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/webrisk/v1/Cargo.toml b/src/generated/cloud/webrisk/v1/Cargo.toml
index dcdee1396..dc91cd41a 100644
--- a/src/generated/cloud/webrisk/v1/Cargo.toml
+++ b/src/generated/cloud/webrisk/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
 lro        = { version = "0.1", path = "../../../../../src/lro", package = "google-cloud-lro" }
diff --git a/src/generated/cloud/webrisk/v1/src/model.rs b/src/generated/cloud/webrisk/v1/src/model.rs
index 2cb02485e..8f532955b 100755
--- a/src/generated/cloud/webrisk/v1/src/model.rs
+++ b/src/generated/cloud/webrisk/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate longrunning;
 extern crate lro;
diff --git a/src/generated/cloud/webrisk/v1/src/transport.rs b/src/generated/cloud/webrisk/v1/src/transport.rs
index 982e780e1..1686ac209 100755
--- a/src/generated/cloud/webrisk/v1/src/transport.rs
+++ b/src/generated/cloud/webrisk/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [WebRiskService](super::stubs::WebRiskService) using a [gclient::ReqwestClient].
+/// Implements [WebRiskService](super::stubs::WebRiskService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct WebRiskService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for WebRiskService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for WebRiskService {
 }
 
 impl WebRiskService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -66,11 +66,11 @@ impl super::stubs::WebRiskService for WebRiskService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "constraints")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -93,7 +93,7 @@ impl super::stubs::WebRiskService for WebRiskService {
             builder.query(&[("threatTypes", p.value())])
         });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -116,7 +116,7 @@ impl super::stubs::WebRiskService for WebRiskService {
             builder.query(&[("threatTypes", p.value())])
         });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -180,7 +180,7 @@ impl super::stubs::WebRiskService for WebRiskService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -199,7 +199,7 @@ impl super::stubs::WebRiskService for WebRiskService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -218,7 +218,7 @@ impl super::stubs::WebRiskService for WebRiskService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/websecurityscanner/v1/Cargo.toml b/src/generated/cloud/websecurityscanner/v1/Cargo.toml
index 21fd012c2..57dbda300 100644
--- a/src/generated/cloud/websecurityscanner/v1/Cargo.toml
+++ b/src/generated/cloud/websecurityscanner/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
 serde      = { version = "1", features = ["serde_derive"] }
diff --git a/src/generated/cloud/websecurityscanner/v1/src/model.rs b/src/generated/cloud/websecurityscanner/v1/src/model.rs
index 9ebfa931c..58acf736d 100755
--- a/src/generated/cloud/websecurityscanner/v1/src/model.rs
+++ b/src/generated/cloud/websecurityscanner/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate reqwest;
 extern crate serde;
diff --git a/src/generated/cloud/websecurityscanner/v1/src/transport.rs b/src/generated/cloud/websecurityscanner/v1/src/transport.rs
index ee85e32f2..5dd2b8b7a 100755
--- a/src/generated/cloud/websecurityscanner/v1/src/transport.rs
+++ b/src/generated/cloud/websecurityscanner/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [WebSecurityScanner](super::stubs::WebSecurityScanner) using a [gclient::ReqwestClient].
+/// Implements [WebSecurityScanner](super::stubs::WebSecurityScanner) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct WebSecurityScanner {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for WebSecurityScanner {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for WebSecurityScanner {
 }
 
 impl WebSecurityScanner {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -77,7 +77,7 @@ impl super::stubs::WebSecurityScanner for WebSecurityScanner {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -96,7 +96,7 @@ impl super::stubs::WebSecurityScanner for WebSecurityScanner {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -120,7 +120,7 @@ impl super::stubs::WebSecurityScanner for WebSecurityScanner {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -138,7 +138,7 @@ impl super::stubs::WebSecurityScanner for WebSecurityScanner {
                     "/v1/{}",
                     req.scan_config
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("scan_config"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("scan_config"))?
                         .name
                 ),
             )
@@ -154,7 +154,7 @@ impl super::stubs::WebSecurityScanner for WebSecurityScanner {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -194,7 +194,7 @@ impl super::stubs::WebSecurityScanner for WebSecurityScanner {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -215,7 +215,7 @@ impl super::stubs::WebSecurityScanner for WebSecurityScanner {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -256,7 +256,7 @@ impl super::stubs::WebSecurityScanner for WebSecurityScanner {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -275,7 +275,7 @@ impl super::stubs::WebSecurityScanner for WebSecurityScanner {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -297,7 +297,7 @@ impl super::stubs::WebSecurityScanner for WebSecurityScanner {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -319,7 +319,7 @@ impl super::stubs::WebSecurityScanner for WebSecurityScanner {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/cloud/workflows/executions/v1/Cargo.toml b/src/generated/cloud/workflows/executions/v1/Cargo.toml
index df0203a4b..1d7646c1e 100644
--- a/src/generated/cloud/workflows/executions/v1/Cargo.toml
+++ b/src/generated/cloud/workflows/executions/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
 serde      = { version = "1", features = ["serde_derive"] }
diff --git a/src/generated/cloud/workflows/executions/v1/src/model.rs b/src/generated/cloud/workflows/executions/v1/src/model.rs
index 24da13df4..ebb7f24ff 100755
--- a/src/generated/cloud/workflows/executions/v1/src/model.rs
+++ b/src/generated/cloud/workflows/executions/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate reqwest;
 extern crate serde;
diff --git a/src/generated/cloud/workflows/executions/v1/src/transport.rs b/src/generated/cloud/workflows/executions/v1/src/transport.rs
index 2a2f0e9d9..d124a5876 100755
--- a/src/generated/cloud/workflows/executions/v1/src/transport.rs
+++ b/src/generated/cloud/workflows/executions/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [Executions](super::stubs::Executions) using a [gclient::ReqwestClient].
+/// Implements [Executions](super::stubs::Executions) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Executions {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Executions {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for Executions {
 }
 
 impl Executions {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -63,7 +63,7 @@ impl super::stubs::Executions for Executions {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -105,7 +105,7 @@ impl super::stubs::Executions for Executions {
             );
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/workflows/v1/Cargo.toml b/src/generated/cloud/workflows/v1/Cargo.toml
index 51b3a87db..37e5b6717 100644
--- a/src/generated/cloud/workflows/v1/Cargo.toml
+++ b/src/generated/cloud/workflows/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 location   = { version = "0.2", path = "../../../../../src/generated/cloud/location", package = "google-cloud-location" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/workflows/v1/src/model.rs b/src/generated/cloud/workflows/v1/src/model.rs
index 24d4c96c1..debe5ea56 100755
--- a/src/generated/cloud/workflows/v1/src/model.rs
+++ b/src/generated/cloud/workflows/v1/src/model.rs
@@ -22,7 +22,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate location;
 extern crate longrunning;
diff --git a/src/generated/cloud/workflows/v1/src/transport.rs b/src/generated/cloud/workflows/v1/src/transport.rs
index d45185597..e7785b690 100755
--- a/src/generated/cloud/workflows/v1/src/transport.rs
+++ b/src/generated/cloud/workflows/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [Workflows](super::stubs::Workflows) using a [gclient::ReqwestClient].
+/// Implements [Workflows](super::stubs::Workflows) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Workflows {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Workflows {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for Workflows {
 }
 
 impl Workflows {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::Workflows for Workflows {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -82,7 +82,7 @@ impl super::stubs::Workflows for Workflows {
             );
         let builder = builder.query(&[("revisionId", &req.revision_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -124,7 +124,7 @@ impl super::stubs::Workflows for Workflows {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -142,7 +142,7 @@ impl super::stubs::Workflows for Workflows {
                     "/v1/{}",
                     req.workflow
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("workflow"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("workflow"))?
                         .name
                 ),
             )
@@ -158,7 +158,7 @@ impl super::stubs::Workflows for Workflows {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -186,7 +186,7 @@ impl super::stubs::Workflows for Workflows {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -208,7 +208,7 @@ impl super::stubs::Workflows for Workflows {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -227,7 +227,7 @@ impl super::stubs::Workflows for Workflows {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -249,7 +249,7 @@ impl super::stubs::Workflows for Workflows {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -268,7 +268,7 @@ impl super::stubs::Workflows for Workflows {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -287,7 +287,7 @@ impl super::stubs::Workflows for Workflows {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/cloud/workstations/v1/Cargo.toml b/src/generated/cloud/workstations/v1/Cargo.toml
index 031502920..f4a522799 100644
--- a/src/generated/cloud/workstations/v1/Cargo.toml
+++ b/src/generated/cloud/workstations/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/cloud/workstations/v1/src/model.rs b/src/generated/cloud/workstations/v1/src/model.rs
index 4768fa07d..29e87f4a1 100755
--- a/src/generated/cloud/workstations/v1/src/model.rs
+++ b/src/generated/cloud/workstations/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate longrunning;
diff --git a/src/generated/cloud/workstations/v1/src/transport.rs b/src/generated/cloud/workstations/v1/src/transport.rs
index 01b31dc70..69e8824cf 100755
--- a/src/generated/cloud/workstations/v1/src/transport.rs
+++ b/src/generated/cloud/workstations/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [Workstations](super::stubs::Workstations) using a [gclient::ReqwestClient].
+/// Implements [Workstations](super::stubs::Workstations) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Workstations {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Workstations {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for Workstations {
 }
 
 impl Workstations {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -55,7 +55,7 @@ impl super::stubs::Workstations for Workstations {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -79,7 +79,7 @@ impl super::stubs::Workstations for Workstations {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -121,7 +121,7 @@ impl super::stubs::Workstations for Workstations {
                     "/v1/{}",
                     req.workstation_cluster
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("workstation_cluster"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("workstation_cluster"))?
                         .name
                 ),
             )
@@ -137,7 +137,7 @@ impl super::stubs::Workstations for Workstations {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
@@ -165,7 +165,7 @@ impl super::stubs::Workstations for Workstations {
         let builder = builder.query(&[("etag", &req.etag)]);
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -184,7 +184,7 @@ impl super::stubs::Workstations for Workstations {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -208,7 +208,7 @@ impl super::stubs::Workstations for Workstations {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -232,7 +232,7 @@ impl super::stubs::Workstations for Workstations {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -274,7 +274,7 @@ impl super::stubs::Workstations for Workstations {
                     "/v1/{}",
                     req.workstation_config
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("workstation_config"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("workstation_config"))?
                         .name
                 ),
             )
@@ -290,7 +290,7 @@ impl super::stubs::Workstations for Workstations {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
@@ -318,7 +318,7 @@ impl super::stubs::Workstations for Workstations {
         let builder = builder.query(&[("etag", &req.etag)]);
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -337,7 +337,7 @@ impl super::stubs::Workstations for Workstations {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -361,7 +361,7 @@ impl super::stubs::Workstations for Workstations {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -385,7 +385,7 @@ impl super::stubs::Workstations for Workstations {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -427,7 +427,7 @@ impl super::stubs::Workstations for Workstations {
                     "/v1/{}",
                     req.workstation
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("workstation"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("workstation"))?
                         .name
                 ),
             )
@@ -443,7 +443,7 @@ impl super::stubs::Workstations for Workstations {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
@@ -470,7 +470,7 @@ impl super::stubs::Workstations for Workstations {
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -572,11 +572,11 @@ impl super::stubs::Workstations for Workstations {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -618,7 +618,7 @@ impl super::stubs::Workstations for Workstations {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -637,7 +637,7 @@ impl super::stubs::Workstations for Workstations {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -656,7 +656,7 @@ impl super::stubs::Workstations for Workstations {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/container/v1/Cargo.toml b/src/generated/container/v1/Cargo.toml
index 7a75027ea..f3ea78366 100644
--- a/src/generated/container/v1/Cargo.toml
+++ b/src/generated/container/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
 rpc        = { version = "0.2", path = "../../../../src/generated/rpc/types", package = "google-cloud-rpc" }
diff --git a/src/generated/container/v1/src/model.rs b/src/generated/container/v1/src/model.rs
index dae99be1b..f375ee768 100755
--- a/src/generated/container/v1/src/model.rs
+++ b/src/generated/container/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate reqwest;
 extern crate rpc;
diff --git a/src/generated/container/v1/src/transport.rs b/src/generated/container/v1/src/transport.rs
index 735d5bcf5..369873acd 100755
--- a/src/generated/container/v1/src/transport.rs
+++ b/src/generated/container/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [ClusterManager](super::stubs::ClusterManager) using a [gclient::ReqwestClient].
+/// Implements [ClusterManager](super::stubs::ClusterManager) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ClusterManager {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ClusterManager {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for ClusterManager {
 }
 
 impl ClusterManager {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -57,7 +57,7 @@ impl super::stubs::ClusterManager for ClusterManager {
         let builder = builder.query(&[("projectId", &req.project_id)]);
         let builder = builder.query(&[("zone", &req.zone)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -79,7 +79,7 @@ impl super::stubs::ClusterManager for ClusterManager {
         let builder = builder.query(&[("zone", &req.zone)]);
         let builder = builder.query(&[("clusterId", &req.cluster_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -292,7 +292,7 @@ impl super::stubs::ClusterManager for ClusterManager {
         let builder = builder.query(&[("zone", &req.zone)]);
         let builder = builder.query(&[("clusterId", &req.cluster_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -316,7 +316,7 @@ impl super::stubs::ClusterManager for ClusterManager {
         let builder = builder.query(&[("projectId", &req.project_id)]);
         let builder = builder.query(&[("zone", &req.zone)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -338,7 +338,7 @@ impl super::stubs::ClusterManager for ClusterManager {
         let builder = builder.query(&[("zone", &req.zone)]);
         let builder = builder.query(&[("operationId", &req.operation_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -379,7 +379,7 @@ impl super::stubs::ClusterManager for ClusterManager {
         let builder = builder.query(&[("projectId", &req.project_id)]);
         let builder = builder.query(&[("zone", &req.zone)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -398,7 +398,7 @@ impl super::stubs::ClusterManager for ClusterManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -423,7 +423,7 @@ impl super::stubs::ClusterManager for ClusterManager {
         let builder = builder.query(&[("zone", &req.zone)]);
         let builder = builder.query(&[("clusterId", &req.cluster_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -446,7 +446,7 @@ impl super::stubs::ClusterManager for ClusterManager {
         let builder = builder.query(&[("clusterId", &req.cluster_id)]);
         let builder = builder.query(&[("nodePoolId", &req.node_pool_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -489,7 +489,7 @@ impl super::stubs::ClusterManager for ClusterManager {
         let builder = builder.query(&[("clusterId", &req.cluster_id)]);
         let builder = builder.query(&[("nodePoolId", &req.node_pool_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -708,7 +708,7 @@ impl super::stubs::ClusterManager for ClusterManager {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -730,7 +730,7 @@ impl super::stubs::ClusterManager for ClusterManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/datastore/admin/v1/Cargo.toml b/src/generated/datastore/admin/v1/Cargo.toml
index 9fe274b29..5a5eb3f57 100644
--- a/src/generated/datastore/admin/v1/Cargo.toml
+++ b/src/generated/datastore/admin/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
 lro        = { version = "0.1", path = "../../../../../src/lro", package = "google-cloud-lro" }
diff --git a/src/generated/datastore/admin/v1/src/model.rs b/src/generated/datastore/admin/v1/src/model.rs
index 69156a205..65999b767 100755
--- a/src/generated/datastore/admin/v1/src/model.rs
+++ b/src/generated/datastore/admin/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate longrunning;
 extern crate lro;
diff --git a/src/generated/datastore/admin/v1/src/transport.rs b/src/generated/datastore/admin/v1/src/transport.rs
index 8c19b21ad..8aeda4ff8 100755
--- a/src/generated/datastore/admin/v1/src/transport.rs
+++ b/src/generated/datastore/admin/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [DatastoreAdmin](super::stubs::DatastoreAdmin) using a [gclient::ReqwestClient].
+/// Implements [DatastoreAdmin](super::stubs::DatastoreAdmin) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct DatastoreAdmin {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for DatastoreAdmin {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for DatastoreAdmin {
 }
 
 impl DatastoreAdmin {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -118,7 +118,7 @@ impl super::stubs::DatastoreAdmin for DatastoreAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -140,7 +140,7 @@ impl super::stubs::DatastoreAdmin for DatastoreAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -165,7 +165,7 @@ impl super::stubs::DatastoreAdmin for DatastoreAdmin {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -187,7 +187,7 @@ impl super::stubs::DatastoreAdmin for DatastoreAdmin {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -206,7 +206,7 @@ impl super::stubs::DatastoreAdmin for DatastoreAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -225,7 +225,7 @@ impl super::stubs::DatastoreAdmin for DatastoreAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -244,7 +244,7 @@ impl super::stubs::DatastoreAdmin for DatastoreAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/devtools/artifactregistry/v1/Cargo.toml b/src/generated/devtools/artifactregistry/v1/Cargo.toml
index 772439abf..25dd52cd9 100644
--- a/src/generated/devtools/artifactregistry/v1/Cargo.toml
+++ b/src/generated/devtools/artifactregistry/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
diff --git a/src/generated/devtools/artifactregistry/v1/src/model.rs b/src/generated/devtools/artifactregistry/v1/src/model.rs
index 3bd8cb4bb..e526ff476 100755
--- a/src/generated/devtools/artifactregistry/v1/src/model.rs
+++ b/src/generated/devtools/artifactregistry/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate iam_v1;
 extern crate lazy_static;
diff --git a/src/generated/devtools/artifactregistry/v1/src/transport.rs b/src/generated/devtools/artifactregistry/v1/src/transport.rs
index f0843ce82..ac8d8e003 100755
--- a/src/generated/devtools/artifactregistry/v1/src/transport.rs
+++ b/src/generated/devtools/artifactregistry/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [ArtifactRegistry](super::stubs::ArtifactRegistry) using a [gclient::ReqwestClient].
+/// Implements [ArtifactRegistry](super::stubs::ArtifactRegistry) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ArtifactRegistry {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ArtifactRegistry {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for ArtifactRegistry {
 }
 
 impl ArtifactRegistry {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -61,7 +61,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -80,7 +80,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -104,7 +104,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -123,7 +123,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -147,7 +147,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -166,7 +166,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -190,7 +190,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -209,7 +209,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -275,7 +275,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -294,7 +294,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -335,7 +335,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
                     "/v1/{}",
                     req.repository
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("repository"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("repository"))?
                         .name
                 ),
             )
@@ -351,7 +351,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -374,7 +374,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -397,7 +397,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -416,7 +416,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -435,7 +435,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -459,7 +459,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -479,7 +479,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
             );
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -499,7 +499,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
             );
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -537,7 +537,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
                     "/v1/{}",
                     req.version
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("version"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("version"))?
                         .name
                 ),
             )
@@ -553,7 +553,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -580,7 +580,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -599,7 +599,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -618,7 +618,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -636,7 +636,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
                     "/v1/{}",
                     req.file
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("file"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("file"))?
                         .name
                 ),
             )
@@ -652,7 +652,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.file), options).await
@@ -676,7 +676,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -695,7 +695,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -731,7 +731,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
                     "/v1/{}",
                     req.tag
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("tag"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("tag"))?
                         .name
                 ),
             )
@@ -747,7 +747,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.tag), options).await
@@ -768,7 +768,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -807,7 +807,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -826,7 +826,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -844,7 +844,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
                     "/v1/{}",
                     req.rule
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("rule"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("rule"))?
                         .name
                 ),
             )
@@ -860,7 +860,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.rule), options).await
@@ -881,7 +881,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -929,11 +929,11 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -972,7 +972,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -990,7 +990,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
                     "/v1/{}",
                     req.project_settings
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("project_settings"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("project_settings"))?
                         .name
                 ),
             )
@@ -1006,7 +1006,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1029,7 +1029,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1047,7 +1047,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
                     "/v1/{}",
                     req.vpcsc_config
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("vpcsc_config"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("vpcsc_config"))?
                         .name
                 ),
             )
@@ -1063,7 +1063,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1085,7 +1085,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
                     "/v1/{}",
                     req.package
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("package"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("package"))?
                         .name
                 ),
             )
@@ -1101,7 +1101,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1130,7 +1130,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1149,7 +1149,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1191,7 +1191,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1213,7 +1213,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1232,7 +1232,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1251,7 +1251,7 @@ impl super::stubs::ArtifactRegistry for ArtifactRegistry {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/devtools/cloudbuild/v1/Cargo.toml b/src/generated/devtools/cloudbuild/v1/Cargo.toml
index 74acf8060..a5d341e52 100644
--- a/src/generated/devtools/cloudbuild/v1/Cargo.toml
+++ b/src/generated/devtools/cloudbuild/v1/Cargo.toml
@@ -30,7 +30,7 @@ api        = { version = "0.2", path = "../../../../../src/generated/api/types",
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
 lro        = { version = "0.1", path = "../../../../../src/lro", package = "google-cloud-lro" }
diff --git a/src/generated/devtools/cloudbuild/v1/src/model.rs b/src/generated/devtools/cloudbuild/v1/src/model.rs
index 702454217..ecff90c48 100755
--- a/src/generated/devtools/cloudbuild/v1/src/model.rs
+++ b/src/generated/devtools/cloudbuild/v1/src/model.rs
@@ -21,7 +21,7 @@ extern crate api;
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate longrunning;
 extern crate lro;
diff --git a/src/generated/devtools/cloudbuild/v1/src/transport.rs b/src/generated/devtools/cloudbuild/v1/src/transport.rs
index d823b3edd..eab714ad8 100755
--- a/src/generated/devtools/cloudbuild/v1/src/transport.rs
+++ b/src/generated/devtools/cloudbuild/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [CloudBuild](super::stubs::CloudBuild) using a [gclient::ReqwestClient].
+/// Implements [CloudBuild](super::stubs::CloudBuild) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct CloudBuild {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for CloudBuild {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for CloudBuild {
 }
 
 impl CloudBuild {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -80,7 +80,7 @@ impl super::stubs::CloudBuild for CloudBuild {
             );
         let builder = builder.query(&[("name", &req.name)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -106,7 +106,7 @@ impl super::stubs::CloudBuild for CloudBuild {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -212,7 +212,7 @@ impl super::stubs::CloudBuild for CloudBuild {
             );
         let builder = builder.query(&[("name", &req.name)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -237,7 +237,7 @@ impl super::stubs::CloudBuild for CloudBuild {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -263,7 +263,7 @@ impl super::stubs::CloudBuild for CloudBuild {
             );
         let builder = builder.query(&[("name", &req.name)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -294,7 +294,7 @@ impl super::stubs::CloudBuild for CloudBuild {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -390,7 +390,7 @@ impl super::stubs::CloudBuild for CloudBuild {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -412,7 +412,7 @@ impl super::stubs::CloudBuild for CloudBuild {
         let builder = builder.query(&[("allowMissing", &req.allow_missing)]);
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -430,7 +430,7 @@ impl super::stubs::CloudBuild for CloudBuild {
                     "/v1/{}",
                     req.worker_pool
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("worker_pool"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("worker_pool"))?
                         .name
                 ),
             )
@@ -446,7 +446,7 @@ impl super::stubs::CloudBuild for CloudBuild {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
@@ -475,7 +475,7 @@ impl super::stubs::CloudBuild for CloudBuild {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -494,7 +494,7 @@ impl super::stubs::CloudBuild for CloudBuild {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/devtools/cloudbuild/v2/Cargo.toml b/src/generated/devtools/cloudbuild/v2/Cargo.toml
index 661c50f32..b693a34f7 100644
--- a/src/generated/devtools/cloudbuild/v2/Cargo.toml
+++ b/src/generated/devtools/cloudbuild/v2/Cargo.toml
@@ -30,7 +30,7 @@ api        = { version = "0.2", path = "../../../../../src/generated/api/types",
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/devtools/cloudbuild/v2/src/model.rs b/src/generated/devtools/cloudbuild/v2/src/model.rs
index d5fc1fffa..c86d10283 100755
--- a/src/generated/devtools/cloudbuild/v2/src/model.rs
+++ b/src/generated/devtools/cloudbuild/v2/src/model.rs
@@ -21,7 +21,7 @@ extern crate api;
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate longrunning;
diff --git a/src/generated/devtools/cloudbuild/v2/src/transport.rs b/src/generated/devtools/cloudbuild/v2/src/transport.rs
index 05caeac5a..e6c0d50bb 100755
--- a/src/generated/devtools/cloudbuild/v2/src/transport.rs
+++ b/src/generated/devtools/cloudbuild/v2/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [RepositoryManager](super::stubs::RepositoryManager) using a [gclient::ReqwestClient].
+/// Implements [RepositoryManager](super::stubs::RepositoryManager) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct RepositoryManager {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for RepositoryManager {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for RepositoryManager {
 }
 
 impl RepositoryManager {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -78,7 +78,7 @@ impl super::stubs::RepositoryManager for RepositoryManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -102,7 +102,7 @@ impl super::stubs::RepositoryManager for RepositoryManager {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -120,7 +120,7 @@ impl super::stubs::RepositoryManager for RepositoryManager {
                     "/v2/{}",
                     req.connection
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("connection"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("connection"))?
                         .name
                 ),
             )
@@ -136,7 +136,7 @@ impl super::stubs::RepositoryManager for RepositoryManager {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         let builder = builder.query(&[("allowMissing", &req.allow_missing)]);
@@ -163,7 +163,7 @@ impl super::stubs::RepositoryManager for RepositoryManager {
         let builder = builder.query(&[("etag", &req.etag)]);
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -225,7 +225,7 @@ impl super::stubs::RepositoryManager for RepositoryManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -250,7 +250,7 @@ impl super::stubs::RepositoryManager for RepositoryManager {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -271,7 +271,7 @@ impl super::stubs::RepositoryManager for RepositoryManager {
         let builder = builder.query(&[("etag", &req.etag)]);
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -335,7 +335,7 @@ impl super::stubs::RepositoryManager for RepositoryManager {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -358,7 +358,7 @@ impl super::stubs::RepositoryManager for RepositoryManager {
             );
         let builder = builder.query(&[("refType", &req.ref_type.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -406,11 +406,11 @@ impl super::stubs::RepositoryManager for RepositoryManager {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -449,7 +449,7 @@ impl super::stubs::RepositoryManager for RepositoryManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/devtools/cloudprofiler/v2/Cargo.toml b/src/generated/devtools/cloudprofiler/v2/Cargo.toml
index dbf3c93e9..b2d1fdf90 100644
--- a/src/generated/devtools/cloudprofiler/v2/Cargo.toml
+++ b/src/generated/devtools/cloudprofiler/v2/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
 serde      = { version = "1", features = ["serde_derive"] }
diff --git a/src/generated/devtools/cloudprofiler/v2/src/model.rs b/src/generated/devtools/cloudprofiler/v2/src/model.rs
index 5be064924..778710a22 100755
--- a/src/generated/devtools/cloudprofiler/v2/src/model.rs
+++ b/src/generated/devtools/cloudprofiler/v2/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate reqwest;
 extern crate serde;
diff --git a/src/generated/devtools/cloudprofiler/v2/src/transport.rs b/src/generated/devtools/cloudprofiler/v2/src/transport.rs
index cf1421a72..4f1482274 100755
--- a/src/generated/devtools/cloudprofiler/v2/src/transport.rs
+++ b/src/generated/devtools/cloudprofiler/v2/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [ProfilerService](super::stubs::ProfilerService) using a [gclient::ReqwestClient].
+/// Implements [ProfilerService](super::stubs::ProfilerService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ProfilerService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ProfilerService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for ProfilerService {
 }
 
 impl ProfilerService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -96,7 +96,7 @@ impl super::stubs::ProfilerService for ProfilerService {
                     "/v2/{}",
                     req.profile
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("profile"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("profile"))?
                         .name
                 ),
             )
@@ -112,7 +112,7 @@ impl super::stubs::ProfilerService for ProfilerService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -121,10 +121,10 @@ impl super::stubs::ProfilerService for ProfilerService {
     }
 }
 
-/// Implements [ExportService](super::stubs::ExportService) using a [gclient::ReqwestClient].
+/// Implements [ExportService](super::stubs::ExportService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ExportService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ExportService {
@@ -136,8 +136,8 @@ impl std::fmt::Debug for ExportService {
 }
 
 impl ExportService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -160,7 +160,7 @@ impl super::stubs::ExportService for ExportService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/devtools/cloudtrace/v2/Cargo.toml b/src/generated/devtools/cloudtrace/v2/Cargo.toml
index f2c84250f..ea7218971 100644
--- a/src/generated/devtools/cloudtrace/v2/Cargo.toml
+++ b/src/generated/devtools/cloudtrace/v2/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
 rpc        = { version = "0.2", path = "../../../../../src/generated/rpc/types", package = "google-cloud-rpc" }
diff --git a/src/generated/devtools/cloudtrace/v2/src/model.rs b/src/generated/devtools/cloudtrace/v2/src/model.rs
index f96b7ab3b..b26dec48e 100755
--- a/src/generated/devtools/cloudtrace/v2/src/model.rs
+++ b/src/generated/devtools/cloudtrace/v2/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate reqwest;
 extern crate rpc;
diff --git a/src/generated/devtools/cloudtrace/v2/src/transport.rs b/src/generated/devtools/cloudtrace/v2/src/transport.rs
index a45ba0a1d..3db13c652 100755
--- a/src/generated/devtools/cloudtrace/v2/src/transport.rs
+++ b/src/generated/devtools/cloudtrace/v2/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [TraceService](super::stubs::TraceService) using a [gclient::ReqwestClient].
+/// Implements [TraceService](super::stubs::TraceService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct TraceService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for TraceService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for TraceService {
 }
 
 impl TraceService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
diff --git a/src/generated/devtools/containeranalysis/v1/Cargo.toml b/src/generated/devtools/containeranalysis/v1/Cargo.toml
index ddac502cb..ec3d24b21 100644
--- a/src/generated/devtools/containeranalysis/v1/Cargo.toml
+++ b/src/generated/devtools/containeranalysis/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 grafeas    = { version = "0.2", path = "../../../../../src/generated/grafeas/v1", package = "google-cloud-grafeas-v1" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
diff --git a/src/generated/devtools/containeranalysis/v1/src/model.rs b/src/generated/devtools/containeranalysis/v1/src/model.rs
index 229f46388..1cdd452bf 100755
--- a/src/generated/devtools/containeranalysis/v1/src/model.rs
+++ b/src/generated/devtools/containeranalysis/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate grafeas;
 extern crate iam_v1;
 extern crate lazy_static;
diff --git a/src/generated/devtools/containeranalysis/v1/src/transport.rs b/src/generated/devtools/containeranalysis/v1/src/transport.rs
index e4d93d7db..7431b28c2 100755
--- a/src/generated/devtools/containeranalysis/v1/src/transport.rs
+++ b/src/generated/devtools/containeranalysis/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [ContainerAnalysis](super::stubs::ContainerAnalysis) using a [gclient::ReqwestClient].
+/// Implements [ContainerAnalysis](super::stubs::ContainerAnalysis) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ContainerAnalysis {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ContainerAnalysis {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for ContainerAnalysis {
 }
 
 impl ContainerAnalysis {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -119,7 +119,7 @@ impl super::stubs::ContainerAnalysis for ContainerAnalysis {
             );
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/firestore/admin/v1/Cargo.toml b/src/generated/firestore/admin/v1/Cargo.toml
index 01a71f5b5..1b7175c8b 100644
--- a/src/generated/firestore/admin/v1/Cargo.toml
+++ b/src/generated/firestore/admin/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/firestore/admin/v1/src/model.rs b/src/generated/firestore/admin/v1/src/model.rs
index 887ae4806..4cb60e715 100755
--- a/src/generated/firestore/admin/v1/src/model.rs
+++ b/src/generated/firestore/admin/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate longrunning;
diff --git a/src/generated/firestore/admin/v1/src/transport.rs b/src/generated/firestore/admin/v1/src/transport.rs
index 00a406c24..feabe03ad 100755
--- a/src/generated/firestore/admin/v1/src/transport.rs
+++ b/src/generated/firestore/admin/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [FirestoreAdmin](super::stubs::FirestoreAdmin) using a [gclient::ReqwestClient].
+/// Implements [FirestoreAdmin](super::stubs::FirestoreAdmin) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct FirestoreAdmin {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for FirestoreAdmin {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for FirestoreAdmin {
 }
 
 impl FirestoreAdmin {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -75,7 +75,7 @@ impl super::stubs::FirestoreAdmin for FirestoreAdmin {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -94,7 +94,7 @@ impl super::stubs::FirestoreAdmin for FirestoreAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -113,7 +113,7 @@ impl super::stubs::FirestoreAdmin for FirestoreAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -132,7 +132,7 @@ impl super::stubs::FirestoreAdmin for FirestoreAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -150,7 +150,7 @@ impl super::stubs::FirestoreAdmin for FirestoreAdmin {
                     "/v1/{}",
                     req.field
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("field"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("field"))?
                         .name
                 ),
             )
@@ -166,7 +166,7 @@ impl super::stubs::FirestoreAdmin for FirestoreAdmin {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.field), options).await
@@ -190,7 +190,7 @@ impl super::stubs::FirestoreAdmin for FirestoreAdmin {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -292,7 +292,7 @@ impl super::stubs::FirestoreAdmin for FirestoreAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -315,7 +315,7 @@ impl super::stubs::FirestoreAdmin for FirestoreAdmin {
             );
         let builder = builder.query(&[("showDeleted", &req.show_deleted)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -333,7 +333,7 @@ impl super::stubs::FirestoreAdmin for FirestoreAdmin {
                     "/v1/{}",
                     req.database
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("database"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("database"))?
                         .name
                 ),
             )
@@ -349,7 +349,7 @@ impl super::stubs::FirestoreAdmin for FirestoreAdmin {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -373,7 +373,7 @@ impl super::stubs::FirestoreAdmin for FirestoreAdmin {
             );
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -392,7 +392,7 @@ impl super::stubs::FirestoreAdmin for FirestoreAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -412,7 +412,7 @@ impl super::stubs::FirestoreAdmin for FirestoreAdmin {
             );
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -431,7 +431,7 @@ impl super::stubs::FirestoreAdmin for FirestoreAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -492,7 +492,7 @@ impl super::stubs::FirestoreAdmin for FirestoreAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -514,7 +514,7 @@ impl super::stubs::FirestoreAdmin for FirestoreAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -532,7 +532,7 @@ impl super::stubs::FirestoreAdmin for FirestoreAdmin {
                     "/v1/{}",
                     req.backup_schedule
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("backup_schedule"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("backup_schedule"))?
                         .name
                 ),
             )
@@ -548,7 +548,7 @@ impl super::stubs::FirestoreAdmin for FirestoreAdmin {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -571,7 +571,7 @@ impl super::stubs::FirestoreAdmin for FirestoreAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -593,7 +593,7 @@ impl super::stubs::FirestoreAdmin for FirestoreAdmin {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -612,7 +612,7 @@ impl super::stubs::FirestoreAdmin for FirestoreAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -631,7 +631,7 @@ impl super::stubs::FirestoreAdmin for FirestoreAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/grafeas/v1/Cargo.toml b/src/generated/grafeas/v1/Cargo.toml
index 1063bf703..230ec959c 100644
--- a/src/generated/grafeas/v1/Cargo.toml
+++ b/src/generated/grafeas/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
 rpc        = { version = "0.2", path = "../../../../src/generated/rpc/types", package = "google-cloud-rpc" }
diff --git a/src/generated/grafeas/v1/src/model.rs b/src/generated/grafeas/v1/src/model.rs
index 8a71104ad..07326740b 100755
--- a/src/generated/grafeas/v1/src/model.rs
+++ b/src/generated/grafeas/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate reqwest;
 extern crate rpc;
diff --git a/src/generated/grafeas/v1/src/transport.rs b/src/generated/grafeas/v1/src/transport.rs
index a83284c0e..b7fd6d087 100755
--- a/src/generated/grafeas/v1/src/transport.rs
+++ b/src/generated/grafeas/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [Grafeas](super::stubs::Grafeas) using a [gclient::ReqwestClient].
+/// Implements [Grafeas](super::stubs::Grafeas) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Grafeas {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Grafeas {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for Grafeas {
 }
 
 impl Grafeas {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -55,7 +55,7 @@ impl super::stubs::Grafeas for Grafeas {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -80,7 +80,7 @@ impl super::stubs::Grafeas for Grafeas {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -99,7 +99,7 @@ impl super::stubs::Grafeas for Grafeas {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -166,7 +166,7 @@ impl super::stubs::Grafeas for Grafeas {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -189,7 +189,7 @@ impl super::stubs::Grafeas for Grafeas {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -208,7 +208,7 @@ impl super::stubs::Grafeas for Grafeas {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -230,7 +230,7 @@ impl super::stubs::Grafeas for Grafeas {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -249,7 +249,7 @@ impl super::stubs::Grafeas for Grafeas {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -312,7 +312,7 @@ impl super::stubs::Grafeas for Grafeas {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.note), options).await
@@ -339,7 +339,7 @@ impl super::stubs::Grafeas for Grafeas {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/iam/admin/v1/Cargo.toml b/src/generated/iam/admin/v1/Cargo.toml
index cd381d133..ae4ccb26e 100644
--- a/src/generated/iam/admin/v1/Cargo.toml
+++ b/src/generated/iam/admin/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
diff --git a/src/generated/iam/admin/v1/src/model.rs b/src/generated/iam/admin/v1/src/model.rs
index e4d0e083e..291605c4a 100755
--- a/src/generated/iam/admin/v1/src/model.rs
+++ b/src/generated/iam/admin/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate iam_v1;
 extern crate lazy_static;
diff --git a/src/generated/iam/admin/v1/src/transport.rs b/src/generated/iam/admin/v1/src/transport.rs
index ccaeb2799..e11e8d0e2 100755
--- a/src/generated/iam/admin/v1/src/transport.rs
+++ b/src/generated/iam/admin/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [Iam](super::stubs::Iam) using a [gclient::ReqwestClient].
+/// Implements [Iam](super::stubs::Iam) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Iam {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Iam {
@@ -31,8 +31,8 @@ impl std::fmt::Debug for Iam {
 }
 
 impl Iam {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -58,7 +58,7 @@ impl super::stubs::Iam for Iam {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -77,7 +77,7 @@ impl super::stubs::Iam for Iam {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -132,7 +132,7 @@ impl super::stubs::Iam for Iam {
                     "/v1/{}",
                     req.service_account
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("service_account"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("service_account"))?
                         .name
                 ),
             )
@@ -159,7 +159,7 @@ impl super::stubs::Iam for Iam {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -232,7 +232,7 @@ impl super::stubs::Iam for Iam {
             builder.query(&[("keyTypes", p.value())])
         });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -252,7 +252,7 @@ impl super::stubs::Iam for Iam {
             );
         let builder = builder.query(&[("publicKeyType", &req.public_key_type.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -308,7 +308,7 @@ impl super::stubs::Iam for Iam {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -404,11 +404,11 @@ impl super::stubs::Iam for Iam {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "options")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -492,7 +492,7 @@ impl super::stubs::Iam for Iam {
         let builder = builder.query(&[("view", &req.view.value())]);
         let builder = builder.query(&[("showDeleted", &req.show_deleted)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -511,7 +511,7 @@ impl super::stubs::Iam for Iam {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -553,7 +553,7 @@ impl super::stubs::Iam for Iam {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.role), options).await
@@ -575,7 +575,7 @@ impl super::stubs::Iam for Iam {
             );
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/iam/credentials/v1/Cargo.toml b/src/generated/iam/credentials/v1/Cargo.toml
index f65ef7f44..51a2ae403 100644
--- a/src/generated/iam/credentials/v1/Cargo.toml
+++ b/src/generated/iam/credentials/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
 serde      = { version = "1", features = ["serde_derive"] }
diff --git a/src/generated/iam/credentials/v1/src/model.rs b/src/generated/iam/credentials/v1/src/model.rs
index e06f77a25..04ac3acb6 100755
--- a/src/generated/iam/credentials/v1/src/model.rs
+++ b/src/generated/iam/credentials/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate reqwest;
 extern crate serde;
diff --git a/src/generated/iam/credentials/v1/src/transport.rs b/src/generated/iam/credentials/v1/src/transport.rs
index e1230effe..2ee6aeb88 100755
--- a/src/generated/iam/credentials/v1/src/transport.rs
+++ b/src/generated/iam/credentials/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [IAMCredentials](super::stubs::IAMCredentials) using a [gclient::ReqwestClient].
+/// Implements [IAMCredentials](super::stubs::IAMCredentials) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct IAMCredentials {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for IAMCredentials {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for IAMCredentials {
 }
 
 impl IAMCredentials {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
diff --git a/src/generated/iam/v1/Cargo.toml b/src/generated/iam/v1/Cargo.toml
index 4668a7330..c93bb6731 100644
--- a/src/generated/iam/v1/Cargo.toml
+++ b/src/generated/iam/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
diff --git a/src/generated/iam/v1/src/model.rs b/src/generated/iam/v1/src/model.rs
index 4d9167077..7c063c378 100755
--- a/src/generated/iam/v1/src/model.rs
+++ b/src/generated/iam/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate reqwest;
diff --git a/src/generated/iam/v1/src/transport.rs b/src/generated/iam/v1/src/transport.rs
index b48848b41..d8da682b3 100755
--- a/src/generated/iam/v1/src/transport.rs
+++ b/src/generated/iam/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [IAMPolicy](super::stubs::IAMPolicy) using a [gclient::ReqwestClient].
+/// Implements [IAMPolicy](super::stubs::IAMPolicy) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct IAMPolicy {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for IAMPolicy {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for IAMPolicy {
 }
 
 impl IAMPolicy {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
diff --git a/src/generated/iam/v2/Cargo.toml b/src/generated/iam/v2/Cargo.toml
index 2579e8f04..9e490c246 100644
--- a/src/generated/iam/v2/Cargo.toml
+++ b/src/generated/iam/v2/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/iam/v2/src/model.rs b/src/generated/iam/v2/src/model.rs
index 2aa41f7b0..78172eea5 100755
--- a/src/generated/iam/v2/src/model.rs
+++ b/src/generated/iam/v2/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate longrunning;
diff --git a/src/generated/iam/v2/src/transport.rs b/src/generated/iam/v2/src/transport.rs
index 6521d9394..f0d6a8e7c 100755
--- a/src/generated/iam/v2/src/transport.rs
+++ b/src/generated/iam/v2/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [Policies](super::stubs::Policies) using a [gclient::ReqwestClient].
+/// Implements [Policies](super::stubs::Policies) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Policies {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Policies {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for Policies {
 }
 
 impl Policies {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -57,7 +57,7 @@ impl super::stubs::Policies for Policies {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -76,7 +76,7 @@ impl super::stubs::Policies for Policies {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -112,7 +112,7 @@ impl super::stubs::Policies for Policies {
                     "/v2/{}",
                     req.policy
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("policy"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("policy"))?
                         .name
                 ),
             )
@@ -140,7 +140,7 @@ impl super::stubs::Policies for Policies {
             );
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -159,7 +159,7 @@ impl super::stubs::Policies for Policies {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/iam/v3/Cargo.toml b/src/generated/iam/v3/Cargo.toml
index b1720d151..5d9cd5ee3 100644
--- a/src/generated/iam/v3/Cargo.toml
+++ b/src/generated/iam/v3/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/iam/v3/src/model.rs b/src/generated/iam/v3/src/model.rs
index 79e61de3d..b9272bb38 100755
--- a/src/generated/iam/v3/src/model.rs
+++ b/src/generated/iam/v3/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate longrunning;
diff --git a/src/generated/iam/v3/src/transport.rs b/src/generated/iam/v3/src/transport.rs
index ff52720df..eae5987b5 100755
--- a/src/generated/iam/v3/src/transport.rs
+++ b/src/generated/iam/v3/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [PolicyBindings](super::stubs::PolicyBindings) using a [gclient::ReqwestClient].
+/// Implements [PolicyBindings](super::stubs::PolicyBindings) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct PolicyBindings {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for PolicyBindings {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for PolicyBindings {
 }
 
 impl PolicyBindings {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -79,7 +79,7 @@ impl super::stubs::PolicyBindings for PolicyBindings {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -97,7 +97,7 @@ impl super::stubs::PolicyBindings for PolicyBindings {
                     "/v3/{}",
                     req.policy_binding
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("policy_binding"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("policy_binding"))?
                         .name
                 ),
             )
@@ -114,7 +114,7 @@ impl super::stubs::PolicyBindings for PolicyBindings {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -139,7 +139,7 @@ impl super::stubs::PolicyBindings for PolicyBindings {
         let builder = builder.query(&[("etag", &req.etag)]);
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -164,7 +164,7 @@ impl super::stubs::PolicyBindings for PolicyBindings {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -192,7 +192,7 @@ impl super::stubs::PolicyBindings for PolicyBindings {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -211,7 +211,7 @@ impl super::stubs::PolicyBindings for PolicyBindings {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -230,10 +230,10 @@ impl super::stubs::PolicyBindings for PolicyBindings {
     }
 }
 
-/// Implements [PrincipalAccessBoundaryPolicies](super::stubs::PrincipalAccessBoundaryPolicies) using a [gclient::ReqwestClient].
+/// Implements [PrincipalAccessBoundaryPolicies](super::stubs::PrincipalAccessBoundaryPolicies) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct PrincipalAccessBoundaryPolicies {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for PrincipalAccessBoundaryPolicies {
@@ -245,8 +245,8 @@ impl std::fmt::Debug for PrincipalAccessBoundaryPolicies {
 }
 
 impl PrincipalAccessBoundaryPolicies {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -294,7 +294,7 @@ impl super::stubs::PrincipalAccessBoundaryPolicies for PrincipalAccessBoundaryPo
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -312,7 +312,7 @@ impl super::stubs::PrincipalAccessBoundaryPolicies for PrincipalAccessBoundaryPo
                     "/v3/{}",
                     req.principal_access_boundary_policy
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing(
+                        .ok_or_else(|| gaxi::path_parameter::missing(
                             "principal_access_boundary_policy"
                         ))?
                         .name
@@ -331,7 +331,7 @@ impl super::stubs::PrincipalAccessBoundaryPolicies for PrincipalAccessBoundaryPo
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -357,7 +357,7 @@ impl super::stubs::PrincipalAccessBoundaryPolicies for PrincipalAccessBoundaryPo
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -381,7 +381,7 @@ impl super::stubs::PrincipalAccessBoundaryPolicies for PrincipalAccessBoundaryPo
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -405,7 +405,7 @@ impl super::stubs::PrincipalAccessBoundaryPolicies for PrincipalAccessBoundaryPo
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -424,7 +424,7 @@ impl super::stubs::PrincipalAccessBoundaryPolicies for PrincipalAccessBoundaryPo
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/identity/accesscontextmanager/v1/Cargo.toml b/src/generated/identity/accesscontextmanager/v1/Cargo.toml
index c18a28bd8..abb1afaef 100644
--- a/src/generated/identity/accesscontextmanager/v1/Cargo.toml
+++ b/src/generated/identity/accesscontextmanager/v1/Cargo.toml
@@ -30,7 +30,7 @@ accesscontextmanager_type = { version = "0.2", path = "../../../../../src/genera
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 iam_v1     = { version = "0.2", path = "../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
diff --git a/src/generated/identity/accesscontextmanager/v1/src/model.rs b/src/generated/identity/accesscontextmanager/v1/src/model.rs
index fa9b27f25..6a490ba5a 100755
--- a/src/generated/identity/accesscontextmanager/v1/src/model.rs
+++ b/src/generated/identity/accesscontextmanager/v1/src/model.rs
@@ -21,7 +21,7 @@ extern crate accesscontextmanager_type;
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate iam_v1;
 extern crate lazy_static;
diff --git a/src/generated/identity/accesscontextmanager/v1/src/transport.rs b/src/generated/identity/accesscontextmanager/v1/src/transport.rs
index b38ae59d3..ab313b17b 100755
--- a/src/generated/identity/accesscontextmanager/v1/src/transport.rs
+++ b/src/generated/identity/accesscontextmanager/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [AccessContextManager](super::stubs::AccessContextManager) using a [gclient::ReqwestClient].
+/// Implements [AccessContextManager](super::stubs::AccessContextManager) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct AccessContextManager {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for AccessContextManager {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for AccessContextManager {
 }
 
 impl AccessContextManager {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -58,7 +58,7 @@ impl super::stubs::AccessContextManager for AccessContextManager {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -77,7 +77,7 @@ impl super::stubs::AccessContextManager for AccessContextManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -112,7 +112,7 @@ impl super::stubs::AccessContextManager for AccessContextManager {
                     "/v1/{}",
                     req.policy
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("policy"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("policy"))?
                         .name
                 ),
             )
@@ -128,7 +128,7 @@ impl super::stubs::AccessContextManager for AccessContextManager {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.policy), options).await
@@ -149,7 +149,7 @@ impl super::stubs::AccessContextManager for AccessContextManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -174,7 +174,7 @@ impl super::stubs::AccessContextManager for AccessContextManager {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("accessLevelFormat", &req.access_level_format.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -194,7 +194,7 @@ impl super::stubs::AccessContextManager for AccessContextManager {
             );
         let builder = builder.query(&[("accessLevelFormat", &req.access_level_format.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -234,7 +234,7 @@ impl super::stubs::AccessContextManager for AccessContextManager {
                     "/v1/{}",
                     req.access_level
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("access_level"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("access_level"))?
                         .name
                 ),
             )
@@ -250,7 +250,7 @@ impl super::stubs::AccessContextManager for AccessContextManager {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -273,7 +273,7 @@ impl super::stubs::AccessContextManager for AccessContextManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -317,7 +317,7 @@ impl super::stubs::AccessContextManager for AccessContextManager {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -336,7 +336,7 @@ impl super::stubs::AccessContextManager for AccessContextManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -376,7 +376,7 @@ impl super::stubs::AccessContextManager for AccessContextManager {
                     "/v1/{}",
                     req.service_perimeter
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("service_perimeter"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("service_perimeter"))?
                         .name
                 ),
             )
@@ -392,7 +392,7 @@ impl super::stubs::AccessContextManager for AccessContextManager {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -415,7 +415,7 @@ impl super::stubs::AccessContextManager for AccessContextManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -479,7 +479,7 @@ impl super::stubs::AccessContextManager for AccessContextManager {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -498,7 +498,7 @@ impl super::stubs::AccessContextManager for AccessContextManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -538,7 +538,7 @@ impl super::stubs::AccessContextManager for AccessContextManager {
                     "/v1/{}",
                     req.gcp_user_access_binding
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("gcp_user_access_binding"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("gcp_user_access_binding"))?
                         .name
                 ),
             )
@@ -554,7 +554,7 @@ impl super::stubs::AccessContextManager for AccessContextManager {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -577,7 +577,7 @@ impl super::stubs::AccessContextManager for AccessContextManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -656,7 +656,7 @@ impl super::stubs::AccessContextManager for AccessContextManager {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/logging/v2/Cargo.toml b/src/generated/logging/v2/Cargo.toml
index e0ec422f5..e118c2945 100644
--- a/src/generated/logging/v2/Cargo.toml
+++ b/src/generated/logging/v2/Cargo.toml
@@ -30,7 +30,7 @@ api        = { version = "0.2", path = "../../../../src/generated/api/types", pa
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 logging_type = { version = "0.2", path = "../../../../src/generated/logging/type", package = "google-cloud-logging-type" }
 longrunning = { version = "0.22", path = "../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/logging/v2/src/model.rs b/src/generated/logging/v2/src/model.rs
index 707b8d7a3..ea6090b4d 100755
--- a/src/generated/logging/v2/src/model.rs
+++ b/src/generated/logging/v2/src/model.rs
@@ -21,7 +21,7 @@ extern crate api;
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate logging_type;
 extern crate longrunning;
diff --git a/src/generated/logging/v2/src/transport.rs b/src/generated/logging/v2/src/transport.rs
index b2ebb7f25..76fdcce0d 100755
--- a/src/generated/logging/v2/src/transport.rs
+++ b/src/generated/logging/v2/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [LoggingServiceV2](super::stubs::LoggingServiceV2) using a [gclient::ReqwestClient].
+/// Implements [LoggingServiceV2](super::stubs::LoggingServiceV2) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct LoggingServiceV2 {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for LoggingServiceV2 {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for LoggingServiceV2 {
 }
 
 impl LoggingServiceV2 {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -55,7 +55,7 @@ impl super::stubs::LoggingServiceV2 for LoggingServiceV2 {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -113,7 +113,7 @@ impl super::stubs::LoggingServiceV2 for LoggingServiceV2 {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -138,7 +138,7 @@ impl super::stubs::LoggingServiceV2 for LoggingServiceV2 {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -160,7 +160,7 @@ impl super::stubs::LoggingServiceV2 for LoggingServiceV2 {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -179,7 +179,7 @@ impl super::stubs::LoggingServiceV2 for LoggingServiceV2 {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -201,10 +201,10 @@ impl super::stubs::LoggingServiceV2 for LoggingServiceV2 {
     }
 }
 
-/// Implements [ConfigServiceV2](super::stubs::ConfigServiceV2) using a [gclient::ReqwestClient].
+/// Implements [ConfigServiceV2](super::stubs::ConfigServiceV2) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ConfigServiceV2 {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ConfigServiceV2 {
@@ -216,8 +216,8 @@ impl std::fmt::Debug for ConfigServiceV2 {
 }
 
 impl ConfigServiceV2 {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -240,7 +240,7 @@ impl super::stubs::ConfigServiceV2 for ConfigServiceV2 {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -259,7 +259,7 @@ impl super::stubs::ConfigServiceV2 for ConfigServiceV2 {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -308,7 +308,7 @@ impl super::stubs::ConfigServiceV2 for ConfigServiceV2 {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.bucket), options).await
@@ -353,7 +353,7 @@ impl super::stubs::ConfigServiceV2 for ConfigServiceV2 {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.bucket), options).await
@@ -374,7 +374,7 @@ impl super::stubs::ConfigServiceV2 for ConfigServiceV2 {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -412,7 +412,7 @@ impl super::stubs::ConfigServiceV2 for ConfigServiceV2 {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -431,7 +431,7 @@ impl super::stubs::ConfigServiceV2 for ConfigServiceV2 {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -474,7 +474,7 @@ impl super::stubs::ConfigServiceV2 for ConfigServiceV2 {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.view), options).await
@@ -495,7 +495,7 @@ impl super::stubs::ConfigServiceV2 for ConfigServiceV2 {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -516,7 +516,7 @@ impl super::stubs::ConfigServiceV2 for ConfigServiceV2 {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -535,7 +535,7 @@ impl super::stubs::ConfigServiceV2 for ConfigServiceV2 {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -579,7 +579,7 @@ impl super::stubs::ConfigServiceV2 for ConfigServiceV2 {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.sink), options).await
@@ -600,7 +600,7 @@ impl super::stubs::ConfigServiceV2 for ConfigServiceV2 {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -637,7 +637,7 @@ impl super::stubs::ConfigServiceV2 for ConfigServiceV2 {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -658,7 +658,7 @@ impl super::stubs::ConfigServiceV2 for ConfigServiceV2 {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -677,7 +677,7 @@ impl super::stubs::ConfigServiceV2 for ConfigServiceV2 {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -701,7 +701,7 @@ impl super::stubs::ConfigServiceV2 for ConfigServiceV2 {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -720,7 +720,7 @@ impl super::stubs::ConfigServiceV2 for ConfigServiceV2 {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -767,7 +767,7 @@ impl super::stubs::ConfigServiceV2 for ConfigServiceV2 {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -790,7 +790,7 @@ impl super::stubs::ConfigServiceV2 for ConfigServiceV2 {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -812,7 +812,7 @@ impl super::stubs::ConfigServiceV2 for ConfigServiceV2 {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -840,7 +840,7 @@ impl super::stubs::ConfigServiceV2 for ConfigServiceV2 {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -863,7 +863,7 @@ impl super::stubs::ConfigServiceV2 for ConfigServiceV2 {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -888,7 +888,7 @@ impl super::stubs::ConfigServiceV2 for ConfigServiceV2 {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -931,7 +931,7 @@ impl super::stubs::ConfigServiceV2 for ConfigServiceV2 {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -950,7 +950,7 @@ impl super::stubs::ConfigServiceV2 for ConfigServiceV2 {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -986,10 +986,10 @@ impl super::stubs::ConfigServiceV2 for ConfigServiceV2 {
     }
 }
 
-/// Implements [MetricsServiceV2](super::stubs::MetricsServiceV2) using a [gclient::ReqwestClient].
+/// Implements [MetricsServiceV2](super::stubs::MetricsServiceV2) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct MetricsServiceV2 {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for MetricsServiceV2 {
@@ -1001,8 +1001,8 @@ impl std::fmt::Debug for MetricsServiceV2 {
 }
 
 impl MetricsServiceV2 {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1025,7 +1025,7 @@ impl super::stubs::MetricsServiceV2 for MetricsServiceV2 {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1044,7 +1044,7 @@ impl super::stubs::MetricsServiceV2 for MetricsServiceV2 {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1097,7 +1097,7 @@ impl super::stubs::MetricsServiceV2 for MetricsServiceV2 {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1119,7 +1119,7 @@ impl super::stubs::MetricsServiceV2 for MetricsServiceV2 {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1138,7 +1138,7 @@ impl super::stubs::MetricsServiceV2 for MetricsServiceV2 {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/longrunning/Cargo.toml b/src/generated/longrunning/Cargo.toml
index 6c559bcf2..1c53f6b3c 100644
--- a/src/generated/longrunning/Cargo.toml
+++ b/src/generated/longrunning/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
 rpc        = { version = "0.2", path = "../../../src/generated/rpc/types", package = "google-cloud-rpc" }
diff --git a/src/generated/longrunning/src/model.rs b/src/generated/longrunning/src/model.rs
index 7e16aa1d5..08241d626 100755
--- a/src/generated/longrunning/src/model.rs
+++ b/src/generated/longrunning/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate reqwest;
 extern crate rpc;
diff --git a/src/generated/longrunning/src/transport.rs b/src/generated/longrunning/src/transport.rs
index 2e4380a7b..a6fc46baf 100755
--- a/src/generated/longrunning/src/transport.rs
+++ b/src/generated/longrunning/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [Operations](super::stubs::Operations) using a [gclient::ReqwestClient].
+/// Implements [Operations](super::stubs::Operations) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct Operations {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for Operations {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for Operations {
 }
 
 impl Operations {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -58,7 +58,7 @@ impl super::stubs::Operations for Operations {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -77,7 +77,7 @@ impl super::stubs::Operations for Operations {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -96,7 +96,7 @@ impl super::stubs::Operations for Operations {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/monitoring/dashboard/v1/Cargo.toml b/src/generated/monitoring/dashboard/v1/Cargo.toml
index 6611851bf..af069c355 100644
--- a/src/generated/monitoring/dashboard/v1/Cargo.toml
+++ b/src/generated/monitoring/dashboard/v1/Cargo.toml
@@ -30,7 +30,7 @@ api        = { version = "0.2", path = "../../../../../src/generated/api/types",
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
diff --git a/src/generated/monitoring/dashboard/v1/src/model.rs b/src/generated/monitoring/dashboard/v1/src/model.rs
index d293c9e0e..84aef5736 100755
--- a/src/generated/monitoring/dashboard/v1/src/model.rs
+++ b/src/generated/monitoring/dashboard/v1/src/model.rs
@@ -21,7 +21,7 @@ extern crate api;
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate reqwest;
diff --git a/src/generated/monitoring/dashboard/v1/src/transport.rs b/src/generated/monitoring/dashboard/v1/src/transport.rs
index 24bd75852..1b63702d6 100755
--- a/src/generated/monitoring/dashboard/v1/src/transport.rs
+++ b/src/generated/monitoring/dashboard/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [DashboardsService](super::stubs::DashboardsService) using a [gclient::ReqwestClient].
+/// Implements [DashboardsService](super::stubs::DashboardsService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct DashboardsService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for DashboardsService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for DashboardsService {
 }
 
 impl DashboardsService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -83,7 +83,7 @@ impl super::stubs::DashboardsService for DashboardsService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -102,7 +102,7 @@ impl super::stubs::DashboardsService for DashboardsService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -121,7 +121,7 @@ impl super::stubs::DashboardsService for DashboardsService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -139,7 +139,7 @@ impl super::stubs::DashboardsService for DashboardsService {
                     "/v1/{}",
                     req.dashboard
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("dashboard"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("dashboard"))?
                         .name
                 ),
             )
diff --git a/src/generated/monitoring/metricsscope/v1/Cargo.toml b/src/generated/monitoring/metricsscope/v1/Cargo.toml
index de2b9c88f..473ba39b1 100644
--- a/src/generated/monitoring/metricsscope/v1/Cargo.toml
+++ b/src/generated/monitoring/metricsscope/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
 lro        = { version = "0.1", path = "../../../../../src/lro", package = "google-cloud-lro" }
diff --git a/src/generated/monitoring/metricsscope/v1/src/model.rs b/src/generated/monitoring/metricsscope/v1/src/model.rs
index ebac0e6e2..cd8d975a3 100755
--- a/src/generated/monitoring/metricsscope/v1/src/model.rs
+++ b/src/generated/monitoring/metricsscope/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate longrunning;
 extern crate lro;
diff --git a/src/generated/monitoring/metricsscope/v1/src/transport.rs b/src/generated/monitoring/metricsscope/v1/src/transport.rs
index f190d5301..d7ce9467c 100755
--- a/src/generated/monitoring/metricsscope/v1/src/transport.rs
+++ b/src/generated/monitoring/metricsscope/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [MetricsScopes](super::stubs::MetricsScopes) using a [gclient::ReqwestClient].
+/// Implements [MetricsScopes](super::stubs::MetricsScopes) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct MetricsScopes {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for MetricsScopes {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for MetricsScopes {
 }
 
 impl MetricsScopes {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -55,7 +55,7 @@ impl super::stubs::MetricsScopes for MetricsScopes {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -82,7 +82,7 @@ impl super::stubs::MetricsScopes for MetricsScopes {
             &req.monitored_resource_container,
         )]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -123,7 +123,7 @@ impl super::stubs::MetricsScopes for MetricsScopes {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -142,7 +142,7 @@ impl super::stubs::MetricsScopes for MetricsScopes {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/monitoring/v3/Cargo.toml b/src/generated/monitoring/v3/Cargo.toml
index 69a13ddc5..c7d7ec168 100644
--- a/src/generated/monitoring/v3/Cargo.toml
+++ b/src/generated/monitoring/v3/Cargo.toml
@@ -30,7 +30,7 @@ api        = { version = "0.2", path = "../../../../src/generated/api/types", pa
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
diff --git a/src/generated/monitoring/v3/src/model.rs b/src/generated/monitoring/v3/src/model.rs
index 6cdb8f188..9e018d1b7 100755
--- a/src/generated/monitoring/v3/src/model.rs
+++ b/src/generated/monitoring/v3/src/model.rs
@@ -21,7 +21,7 @@ extern crate api;
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate reqwest;
diff --git a/src/generated/monitoring/v3/src/transport.rs b/src/generated/monitoring/v3/src/transport.rs
index 50269dee7..8630060d0 100755
--- a/src/generated/monitoring/v3/src/transport.rs
+++ b/src/generated/monitoring/v3/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [AlertPolicyService](super::stubs::AlertPolicyService) using a [gclient::ReqwestClient].
+/// Implements [AlertPolicyService](super::stubs::AlertPolicyService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct AlertPolicyService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for AlertPolicyService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for AlertPolicyService {
 }
 
 impl AlertPolicyService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -62,7 +62,7 @@ impl super::stubs::AlertPolicyService for AlertPolicyService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -81,7 +81,7 @@ impl super::stubs::AlertPolicyService for AlertPolicyService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -122,7 +122,7 @@ impl super::stubs::AlertPolicyService for AlertPolicyService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -140,7 +140,7 @@ impl super::stubs::AlertPolicyService for AlertPolicyService {
                     "/v3/{}",
                     req.alert_policy
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("alert_policy"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("alert_policy"))?
                         .name
                 ),
             )
@@ -156,7 +156,7 @@ impl super::stubs::AlertPolicyService for AlertPolicyService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -165,10 +165,10 @@ impl super::stubs::AlertPolicyService for AlertPolicyService {
     }
 }
 
-/// Implements [GroupService](super::stubs::GroupService) using a [gclient::ReqwestClient].
+/// Implements [GroupService](super::stubs::GroupService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct GroupService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for GroupService {
@@ -180,8 +180,8 @@ impl std::fmt::Debug for GroupService {
 }
 
 impl GroupService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -222,7 +222,7 @@ impl super::stubs::GroupService for GroupService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -241,7 +241,7 @@ impl super::stubs::GroupService for GroupService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -277,7 +277,7 @@ impl super::stubs::GroupService for GroupService {
                     "/v3/{}",
                     req.group
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("group"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("group"))?
                         .name
                 ),
             )
@@ -306,7 +306,7 @@ impl super::stubs::GroupService for GroupService {
             );
         let builder = builder.query(&[("recursive", &req.recursive)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -334,19 +334,19 @@ impl super::stubs::GroupService for GroupService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "interval")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [MetricService](super::stubs::MetricService) using a [gclient::ReqwestClient].
+/// Implements [MetricService](super::stubs::MetricService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct MetricService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for MetricService {
@@ -358,8 +358,8 @@ impl std::fmt::Debug for MetricService {
 }
 
 impl MetricService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -386,7 +386,7 @@ impl super::stubs::MetricService for MetricService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -405,7 +405,7 @@ impl super::stubs::MetricService for MetricService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -431,7 +431,7 @@ impl super::stubs::MetricService for MetricService {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("activeOnly", &req.active_only)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -450,7 +450,7 @@ impl super::stubs::MetricService for MetricService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -491,7 +491,7 @@ impl super::stubs::MetricService for MetricService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -517,7 +517,7 @@ impl super::stubs::MetricService for MetricService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "interval")
             });
         let builder = req
@@ -527,7 +527,7 @@ impl super::stubs::MetricService for MetricService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "aggregation")
             });
         let builder = req
@@ -537,7 +537,7 @@ impl super::stubs::MetricService for MetricService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "secondaryAggregation")
             });
         let builder = builder.query(&[("orderBy", &req.order_by)]);
@@ -545,7 +545,7 @@ impl super::stubs::MetricService for MetricService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -590,10 +590,10 @@ impl super::stubs::MetricService for MetricService {
     }
 }
 
-/// Implements [NotificationChannelService](super::stubs::NotificationChannelService) using a [gclient::ReqwestClient].
+/// Implements [NotificationChannelService](super::stubs::NotificationChannelService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct NotificationChannelService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for NotificationChannelService {
@@ -605,8 +605,8 @@ impl std::fmt::Debug for NotificationChannelService {
 }
 
 impl NotificationChannelService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -632,7 +632,7 @@ impl super::stubs::NotificationChannelService for NotificationChannelService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -651,7 +651,7 @@ impl super::stubs::NotificationChannelService for NotificationChannelService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -677,7 +677,7 @@ impl super::stubs::NotificationChannelService for NotificationChannelService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -696,7 +696,7 @@ impl super::stubs::NotificationChannelService for NotificationChannelService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -736,7 +736,7 @@ impl super::stubs::NotificationChannelService for NotificationChannelService {
                     "/v3/{}",
                     req.notification_channel
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("notification_channel"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("notification_channel"))?
                         .name
                 ),
             )
@@ -752,7 +752,7 @@ impl super::stubs::NotificationChannelService for NotificationChannelService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -776,7 +776,7 @@ impl super::stubs::NotificationChannelService for NotificationChannelService {
             );
         let builder = builder.query(&[("force", &req.force)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -838,10 +838,10 @@ impl super::stubs::NotificationChannelService for NotificationChannelService {
     }
 }
 
-/// Implements [QueryService](super::stubs::QueryService) using a [gclient::ReqwestClient].
+/// Implements [QueryService](super::stubs::QueryService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct QueryService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for QueryService {
@@ -853,8 +853,8 @@ impl std::fmt::Debug for QueryService {
 }
 
 impl QueryService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -881,10 +881,10 @@ impl super::stubs::QueryService for QueryService {
     }
 }
 
-/// Implements [ServiceMonitoringService](super::stubs::ServiceMonitoringService) using a [gclient::ReqwestClient].
+/// Implements [ServiceMonitoringService](super::stubs::ServiceMonitoringService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct ServiceMonitoringService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for ServiceMonitoringService {
@@ -896,8 +896,8 @@ impl std::fmt::Debug for ServiceMonitoringService {
 }
 
 impl ServiceMonitoringService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -941,7 +941,7 @@ impl super::stubs::ServiceMonitoringService for ServiceMonitoringService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -963,7 +963,7 @@ impl super::stubs::ServiceMonitoringService for ServiceMonitoringService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -981,7 +981,7 @@ impl super::stubs::ServiceMonitoringService for ServiceMonitoringService {
                     "/v3/{}",
                     req.service
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("service"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("service"))?
                         .name
                 ),
             )
@@ -997,7 +997,7 @@ impl super::stubs::ServiceMonitoringService for ServiceMonitoringService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1020,7 +1020,7 @@ impl super::stubs::ServiceMonitoringService for ServiceMonitoringService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1064,7 +1064,7 @@ impl super::stubs::ServiceMonitoringService for ServiceMonitoringService {
             );
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1090,7 +1090,7 @@ impl super::stubs::ServiceMonitoringService for ServiceMonitoringService {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("view", &req.view.value())]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1108,7 +1108,7 @@ impl super::stubs::ServiceMonitoringService for ServiceMonitoringService {
                     "/v3/{}",
                     req.service_level_objective
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("service_level_objective"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("service_level_objective"))?
                         .name
                 ),
             )
@@ -1124,7 +1124,7 @@ impl super::stubs::ServiceMonitoringService for ServiceMonitoringService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1147,15 +1147,15 @@ impl super::stubs::ServiceMonitoringService for ServiceMonitoringService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
 
-/// Implements [SnoozeService](super::stubs::SnoozeService) using a [gclient::ReqwestClient].
+/// Implements [SnoozeService](super::stubs::SnoozeService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct SnoozeService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for SnoozeService {
@@ -1167,8 +1167,8 @@ impl std::fmt::Debug for SnoozeService {
 }
 
 impl SnoozeService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1209,7 +1209,7 @@ impl super::stubs::SnoozeService for SnoozeService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1228,7 +1228,7 @@ impl super::stubs::SnoozeService for SnoozeService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1246,7 +1246,7 @@ impl super::stubs::SnoozeService for SnoozeService {
                     "/v3/{}",
                     req.snooze
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("snooze"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("snooze"))?
                         .name
                 ),
             )
@@ -1262,17 +1262,17 @@ impl super::stubs::SnoozeService for SnoozeService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.snooze), options).await
     }
 }
 
-/// Implements [UptimeCheckService](super::stubs::UptimeCheckService) using a [gclient::ReqwestClient].
+/// Implements [UptimeCheckService](super::stubs::UptimeCheckService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct UptimeCheckService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for UptimeCheckService {
@@ -1284,8 +1284,8 @@ impl std::fmt::Debug for UptimeCheckService {
 }
 
 impl UptimeCheckService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -1312,7 +1312,7 @@ impl super::stubs::UptimeCheckService for UptimeCheckService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1331,7 +1331,7 @@ impl super::stubs::UptimeCheckService for UptimeCheckService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1371,7 +1371,7 @@ impl super::stubs::UptimeCheckService for UptimeCheckService {
                     "/v3/{}",
                     req.uptime_check_config
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("uptime_check_config"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("uptime_check_config"))?
                         .name
                 ),
             )
@@ -1387,7 +1387,7 @@ impl super::stubs::UptimeCheckService for UptimeCheckService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -1410,7 +1410,7 @@ impl super::stubs::UptimeCheckService for UptimeCheckService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1431,7 +1431,7 @@ impl super::stubs::UptimeCheckService for UptimeCheckService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 }
diff --git a/src/generated/openapi-validation/Cargo.toml b/src/generated/openapi-validation/Cargo.toml
index bfa4ba566..1a6a83668 100755
--- a/src/generated/openapi-validation/Cargo.toml
+++ b/src/generated/openapi-validation/Cargo.toml
@@ -30,7 +30,7 @@ publish              = false
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../src/http-client", package = "google-cloud-http-client" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
 serde      = { version = "1", features = ["serde_derive"] }
diff --git a/src/generated/openapi-validation/src/model.rs b/src/generated/openapi-validation/src/model.rs
index e6c00f8e5..ccd55ee8b 100755
--- a/src/generated/openapi-validation/src/model.rs
+++ b/src/generated/openapi-validation/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate lazy_static;
 extern crate reqwest;
 extern crate serde;
diff --git a/src/generated/openapi-validation/src/transport.rs b/src/generated/openapi-validation/src/transport.rs
index 453f348be..cfe98ee81 100755
--- a/src/generated/openapi-validation/src/transport.rs
+++ b/src/generated/openapi-validation/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [SecretManagerService](super::stubs::SecretManagerService) using a [gclient::ReqwestClient].
+/// Implements [SecretManagerService](super::stubs::SecretManagerService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct SecretManagerService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for SecretManagerService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for SecretManagerService {
 }
 
 impl SecretManagerService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -70,7 +70,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("pageToken", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -92,7 +92,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -126,7 +126,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("filter", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -186,7 +186,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("filter", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -280,7 +280,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -306,7 +306,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("etag", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -328,7 +328,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         let builder = {
-            use gclient::query_parameter::QueryParameter;
+            use gaxi::query_parameter::QueryParameter;
             serde_json::to_value(&req.update_mask)
                 .map_err(Error::serde)?
                 .add(builder, "updateMask")
@@ -359,7 +359,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -388,7 +388,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("etag", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -413,7 +413,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         let builder = {
-            use gclient::query_parameter::QueryParameter;
+            use gaxi::query_parameter::QueryParameter;
             serde_json::to_value(&req.update_mask)
                 .map_err(Error::serde)?
                 .add(builder, "updateMask")
@@ -456,7 +456,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("filter", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -493,7 +493,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
             .iter()
             .fold(builder, |builder, p| builder.query(&[("filter", p)]));
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -518,7 +518,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -543,7 +543,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -568,7 +568,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -593,7 +593,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -808,7 +808,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
                 builder.query(&[("options.requestedPolicyVersion", p)])
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -839,7 +839,7 @@ impl super::stubs::SecretManagerService for SecretManagerService {
                 builder.query(&[("options.requestedPolicyVersion", p)])
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/privacy/dlp/v2/Cargo.toml b/src/generated/privacy/dlp/v2/Cargo.toml
index 79b89c152..d65d656bc 100644
--- a/src/generated/privacy/dlp/v2/Cargo.toml
+++ b/src/generated/privacy/dlp/v2/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 reqwest    = { version = "0.12", features = ["json"] }
diff --git a/src/generated/privacy/dlp/v2/src/model.rs b/src/generated/privacy/dlp/v2/src/model.rs
index 9fd99ec62..6b4bbc22c 100755
--- a/src/generated/privacy/dlp/v2/src/model.rs
+++ b/src/generated/privacy/dlp/v2/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate reqwest;
diff --git a/src/generated/privacy/dlp/v2/src/transport.rs b/src/generated/privacy/dlp/v2/src/transport.rs
index 433d520fc..752f3fbc3 100755
--- a/src/generated/privacy/dlp/v2/src/transport.rs
+++ b/src/generated/privacy/dlp/v2/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [DlpService](super::stubs::DlpService) using a [gclient::ReqwestClient].
+/// Implements [DlpService](super::stubs::DlpService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct DlpService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for DlpService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for DlpService {
 }
 
 impl DlpService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -139,7 +139,7 @@ impl super::stubs::DlpService for DlpService {
         let builder = builder.query(&[("filter", &req.filter)]);
         let builder = builder.query(&[("locationId", &req.location_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -195,7 +195,7 @@ impl super::stubs::DlpService for DlpService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -221,7 +221,7 @@ impl super::stubs::DlpService for DlpService {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("locationId", &req.location_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -240,7 +240,7 @@ impl super::stubs::DlpService for DlpService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -296,7 +296,7 @@ impl super::stubs::DlpService for DlpService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -322,7 +322,7 @@ impl super::stubs::DlpService for DlpService {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("locationId", &req.location_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -341,7 +341,7 @@ impl super::stubs::DlpService for DlpService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -417,7 +417,7 @@ impl super::stubs::DlpService for DlpService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -445,7 +445,7 @@ impl super::stubs::DlpService for DlpService {
         let builder = builder.query(&[("type", &req.r#type.value())]);
         let builder = builder.query(&[("locationId", &req.location_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -464,7 +464,7 @@ impl super::stubs::DlpService for DlpService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -537,7 +537,7 @@ impl super::stubs::DlpService for DlpService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -562,7 +562,7 @@ impl super::stubs::DlpService for DlpService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -581,7 +581,7 @@ impl super::stubs::DlpService for DlpService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -623,7 +623,7 @@ impl super::stubs::DlpService for DlpService {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("locationId", &req.location_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -642,7 +642,7 @@ impl super::stubs::DlpService for DlpService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -661,7 +661,7 @@ impl super::stubs::DlpService for DlpService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -734,7 +734,7 @@ impl super::stubs::DlpService for DlpService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -760,7 +760,7 @@ impl super::stubs::DlpService for DlpService {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("locationId", &req.location_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -779,7 +779,7 @@ impl super::stubs::DlpService for DlpService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -805,7 +805,7 @@ impl super::stubs::DlpService for DlpService {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -831,7 +831,7 @@ impl super::stubs::DlpService for DlpService {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -857,7 +857,7 @@ impl super::stubs::DlpService for DlpService {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -876,7 +876,7 @@ impl super::stubs::DlpService for DlpService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -902,7 +902,7 @@ impl super::stubs::DlpService for DlpService {
         let builder = builder.query(&[("orderBy", &req.order_by)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -921,7 +921,7 @@ impl super::stubs::DlpService for DlpService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -940,7 +940,7 @@ impl super::stubs::DlpService for DlpService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -959,7 +959,7 @@ impl super::stubs::DlpService for DlpService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -978,7 +978,7 @@ impl super::stubs::DlpService for DlpService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -997,7 +997,7 @@ impl super::stubs::DlpService for DlpService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1073,7 +1073,7 @@ impl super::stubs::DlpService for DlpService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1098,7 +1098,7 @@ impl super::stubs::DlpService for DlpService {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1123,7 +1123,7 @@ impl super::stubs::DlpService for DlpService {
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         let builder = builder.query(&[("filter", &req.filter)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -1142,7 +1142,7 @@ impl super::stubs::DlpService for DlpService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/spanner/admin/database/v1/Cargo.toml b/src/generated/spanner/admin/database/v1/Cargo.toml
index 4ee4d9e80..78ab5974d 100644
--- a/src/generated/spanner/admin/database/v1/Cargo.toml
+++ b/src/generated/spanner/admin/database/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/spanner/admin/database/v1/src/model.rs b/src/generated/spanner/admin/database/v1/src/model.rs
index 2faae66f3..b4ce4b0df 100755
--- a/src/generated/spanner/admin/database/v1/src/model.rs
+++ b/src/generated/spanner/admin/database/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate longrunning;
diff --git a/src/generated/spanner/admin/database/v1/src/transport.rs b/src/generated/spanner/admin/database/v1/src/transport.rs
index 8d80412b2..cedd9b385 100755
--- a/src/generated/spanner/admin/database/v1/src/transport.rs
+++ b/src/generated/spanner/admin/database/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [DatabaseAdmin](super::stubs::DatabaseAdmin) using a [gclient::ReqwestClient].
+/// Implements [DatabaseAdmin](super::stubs::DatabaseAdmin) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct DatabaseAdmin {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for DatabaseAdmin {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for DatabaseAdmin {
 }
 
 impl DatabaseAdmin {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -60,7 +60,7 @@ impl super::stubs::DatabaseAdmin for DatabaseAdmin {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -99,7 +99,7 @@ impl super::stubs::DatabaseAdmin for DatabaseAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -117,7 +117,7 @@ impl super::stubs::DatabaseAdmin for DatabaseAdmin {
                     "/v1/{}",
                     req.database
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("database"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("database"))?
                         .name
                 ),
             )
@@ -133,7 +133,7 @@ impl super::stubs::DatabaseAdmin for DatabaseAdmin {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -173,7 +173,7 @@ impl super::stubs::DatabaseAdmin for DatabaseAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -192,7 +192,7 @@ impl super::stubs::DatabaseAdmin for DatabaseAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -278,7 +278,7 @@ impl super::stubs::DatabaseAdmin for DatabaseAdmin {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "encryptionConfig")
             });
         self.inner.execute(builder, Some(req.backup), options).await
@@ -319,7 +319,7 @@ impl super::stubs::DatabaseAdmin for DatabaseAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -337,7 +337,7 @@ impl super::stubs::DatabaseAdmin for DatabaseAdmin {
                     "/v1/{}",
                     req.backup
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("backup"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("backup"))?
                         .name
                 ),
             )
@@ -353,7 +353,7 @@ impl super::stubs::DatabaseAdmin for DatabaseAdmin {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner.execute(builder, Some(req.backup), options).await
@@ -374,7 +374,7 @@ impl super::stubs::DatabaseAdmin for DatabaseAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -396,7 +396,7 @@ impl super::stubs::DatabaseAdmin for DatabaseAdmin {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -441,7 +441,7 @@ impl super::stubs::DatabaseAdmin for DatabaseAdmin {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -466,7 +466,7 @@ impl super::stubs::DatabaseAdmin for DatabaseAdmin {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -490,7 +490,7 @@ impl super::stubs::DatabaseAdmin for DatabaseAdmin {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -552,7 +552,7 @@ impl super::stubs::DatabaseAdmin for DatabaseAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -570,7 +570,7 @@ impl super::stubs::DatabaseAdmin for DatabaseAdmin {
                     "/v1/{}",
                     req.backup_schedule
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("backup_schedule"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("backup_schedule"))?
                         .name
                 ),
             )
@@ -586,7 +586,7 @@ impl super::stubs::DatabaseAdmin for DatabaseAdmin {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -609,7 +609,7 @@ impl super::stubs::DatabaseAdmin for DatabaseAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -633,7 +633,7 @@ impl super::stubs::DatabaseAdmin for DatabaseAdmin {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -655,7 +655,7 @@ impl super::stubs::DatabaseAdmin for DatabaseAdmin {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -674,7 +674,7 @@ impl super::stubs::DatabaseAdmin for DatabaseAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -693,7 +693,7 @@ impl super::stubs::DatabaseAdmin for DatabaseAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -712,7 +712,7 @@ impl super::stubs::DatabaseAdmin for DatabaseAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/spanner/admin/instance/v1/Cargo.toml b/src/generated/spanner/admin/instance/v1/Cargo.toml
index c13ebd275..a9c8ea059 100644
--- a/src/generated/spanner/admin/instance/v1/Cargo.toml
+++ b/src/generated/spanner/admin/instance/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../../../src/http-client", package = "google-cloud-http-client" }
 iam_v1     = { version = "0.2", path = "../../../../../../src/generated/iam/v1", package = "google-cloud-iam-v1" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/spanner/admin/instance/v1/src/model.rs b/src/generated/spanner/admin/instance/v1/src/model.rs
index 4cc267236..d758f3589 100755
--- a/src/generated/spanner/admin/instance/v1/src/model.rs
+++ b/src/generated/spanner/admin/instance/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate iam_v1;
 extern crate lazy_static;
 extern crate longrunning;
diff --git a/src/generated/spanner/admin/instance/v1/src/transport.rs b/src/generated/spanner/admin/instance/v1/src/transport.rs
index e4d2e65a5..fd6ef9979 100755
--- a/src/generated/spanner/admin/instance/v1/src/transport.rs
+++ b/src/generated/spanner/admin/instance/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [InstanceAdmin](super::stubs::InstanceAdmin) using a [gclient::ReqwestClient].
+/// Implements [InstanceAdmin](super::stubs::InstanceAdmin) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct InstanceAdmin {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for InstanceAdmin {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for InstanceAdmin {
 }
 
 impl InstanceAdmin {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -60,7 +60,7 @@ impl super::stubs::InstanceAdmin for InstanceAdmin {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -79,7 +79,7 @@ impl super::stubs::InstanceAdmin for InstanceAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -117,7 +117,7 @@ impl super::stubs::InstanceAdmin for InstanceAdmin {
                     "/v1/{}",
                     req.instance_config
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("instance_config"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("instance_config"))?
                         .name
                 ),
             )
@@ -146,7 +146,7 @@ impl super::stubs::InstanceAdmin for InstanceAdmin {
         let builder = builder.query(&[("etag", &req.etag)]);
         let builder = builder.query(&[("validateOnly", &req.validate_only)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -171,7 +171,7 @@ impl super::stubs::InstanceAdmin for InstanceAdmin {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -202,11 +202,11 @@ impl super::stubs::InstanceAdmin for InstanceAdmin {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "instanceDeadline")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -236,11 +236,11 @@ impl super::stubs::InstanceAdmin for InstanceAdmin {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "instancePartitionDeadline")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -265,11 +265,11 @@ impl super::stubs::InstanceAdmin for InstanceAdmin {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "fieldMask")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -307,7 +307,7 @@ impl super::stubs::InstanceAdmin for InstanceAdmin {
                     "/v1/{}",
                     req.instance
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("instance"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("instance"))?
                         .name
                 ),
             )
@@ -334,7 +334,7 @@ impl super::stubs::InstanceAdmin for InstanceAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -413,7 +413,7 @@ impl super::stubs::InstanceAdmin for InstanceAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -453,7 +453,7 @@ impl super::stubs::InstanceAdmin for InstanceAdmin {
             );
         let builder = builder.query(&[("etag", &req.etag)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -471,7 +471,7 @@ impl super::stubs::InstanceAdmin for InstanceAdmin {
                     "/v1/{}",
                     req.instance_partition
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("instance_partition"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("instance_partition"))?
                         .name
                 ),
             )
@@ -510,11 +510,11 @@ impl super::stubs::InstanceAdmin for InstanceAdmin {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "instancePartitionDeadline")
             });
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -553,7 +553,7 @@ impl super::stubs::InstanceAdmin for InstanceAdmin {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -572,7 +572,7 @@ impl super::stubs::InstanceAdmin for InstanceAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -591,7 +591,7 @@ impl super::stubs::InstanceAdmin for InstanceAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -610,7 +610,7 @@ impl super::stubs::InstanceAdmin for InstanceAdmin {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
diff --git a/src/generated/storagetransfer/v1/Cargo.toml b/src/generated/storagetransfer/v1/Cargo.toml
index 9c852e0db..7a159f637 100644
--- a/src/generated/storagetransfer/v1/Cargo.toml
+++ b/src/generated/storagetransfer/v1/Cargo.toml
@@ -29,7 +29,7 @@ categories.workspace = true
 async-trait = { version = "0.1" }
 bytes      = { version = "1", features = ["serde"] }
 gax        = { version = "0.21", path = "../../../../src/gax", package = "google-cloud-gax", features = ["unstable-sdk-client"] }
-gclient    = { version = "0.1", path = "../../../../src/http-client", package = "google-cloud-http-client" }
+gaxi       = { version = "0.1", path = "../../../../src/http-client", package = "google-cloud-http-client" }
 gtype      = { version = "0.2", path = "../../../../src/generated/type", package = "google-cloud-type" }
 lazy_static = { version = "1" }
 longrunning = { version = "0.22", path = "../../../../src/generated/longrunning", package = "google-cloud-longrunning" }
diff --git a/src/generated/storagetransfer/v1/src/model.rs b/src/generated/storagetransfer/v1/src/model.rs
index 9444040a8..c904c4774 100755
--- a/src/generated/storagetransfer/v1/src/model.rs
+++ b/src/generated/storagetransfer/v1/src/model.rs
@@ -20,7 +20,7 @@
 extern crate async_trait;
 extern crate bytes;
 extern crate gax;
-extern crate gclient;
+extern crate gaxi;
 extern crate gtype;
 extern crate lazy_static;
 extern crate longrunning;
diff --git a/src/generated/storagetransfer/v1/src/transport.rs b/src/generated/storagetransfer/v1/src/transport.rs
index 9c4a85258..e638a8817 100755
--- a/src/generated/storagetransfer/v1/src/transport.rs
+++ b/src/generated/storagetransfer/v1/src/transport.rs
@@ -18,10 +18,10 @@ use crate::Result;
 #[allow(unused_imports)]
 use gax::error::Error;
 
-/// Implements [StorageTransferService](super::stubs::StorageTransferService) using a [gclient::ReqwestClient].
+/// Implements [StorageTransferService](super::stubs::StorageTransferService) using a [gaxi::ReqwestClient].
 #[derive(Clone)]
 pub struct StorageTransferService {
-    inner: gclient::ReqwestClient,
+    inner: gaxi::ReqwestClient,
 }
 
 impl std::fmt::Debug for StorageTransferService {
@@ -33,8 +33,8 @@ impl std::fmt::Debug for StorageTransferService {
 }
 
 impl StorageTransferService {
-    pub async fn new(config: gclient::ClientConfig) -> Result<Self> {
-        let inner = gclient::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
+    pub async fn new(config: gaxi::ClientConfig) -> Result<Self> {
+        let inner = gaxi::ReqwestClient::new(config, crate::DEFAULT_HOST).await?;
         Ok(Self { inner })
     }
 }
@@ -58,7 +58,7 @@ impl super::stubs::StorageTransferService for StorageTransferService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -114,7 +114,7 @@ impl super::stubs::StorageTransferService for StorageTransferService {
             );
         let builder = builder.query(&[("projectId", &req.project_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -136,7 +136,7 @@ impl super::stubs::StorageTransferService for StorageTransferService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -207,7 +207,7 @@ impl super::stubs::StorageTransferService for StorageTransferService {
             );
         let builder = builder.query(&[("projectId", &req.project_id)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -248,7 +248,7 @@ impl super::stubs::StorageTransferService for StorageTransferService {
                     "/v1/{}",
                     req.agent_pool
                         .as_ref()
-                        .ok_or_else(|| gclient::path_parameter::missing("agent_pool"))?
+                        .ok_or_else(|| gaxi::path_parameter::missing("agent_pool"))?
                         .name
                 ),
             )
@@ -264,7 +264,7 @@ impl super::stubs::StorageTransferService for StorageTransferService {
             .transpose()?
             .into_iter()
             .fold(builder, |builder, v| {
-                use gclient::query_parameter::QueryParameter;
+                use gaxi::query_parameter::QueryParameter;
                 v.add(builder, "updateMask")
             });
         self.inner
@@ -287,7 +287,7 @@ impl super::stubs::StorageTransferService for StorageTransferService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -312,7 +312,7 @@ impl super::stubs::StorageTransferService for StorageTransferService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -331,7 +331,7 @@ impl super::stubs::StorageTransferService for StorageTransferService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -353,7 +353,7 @@ impl super::stubs::StorageTransferService for StorageTransferService {
         let builder = builder.query(&[("pageSize", &req.page_size)]);
         let builder = builder.query(&[("pageToken", &req.page_token)]);
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }
 
@@ -372,7 +372,7 @@ impl super::stubs::StorageTransferService for StorageTransferService {
                 reqwest::header::HeaderValue::from_static(&crate::info::X_GOOG_API_CLIENT_HEADER),
             );
         self.inner
-            .execute(builder, None::<gclient::NoBody>, options)
+            .execute(builder, None::<gaxi::NoBody>, options)
             .await
     }